[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 4/9] migration: replace qemu_stdio_fd with qemu_get_
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PATCH 4/9] migration: replace qemu_stdio_fd with qemu_get_fd |
Date: |
Fri, 21 Sep 2012 19:05:01 +0200 |
Signed-off-by: Paolo Bonzini <address@hidden>
---
migration-exec.c | 4 ++--
migration-fd.c | 2 +-
qemu-file.h | 1 -
savevm.c | 11 -----------
4 file modificati, 3 inserzioni(+), 15 rimozioni(-)
diff --git a/migration-exec.c b/migration-exec.c
index 6c97db9..f81e390 100644
--- a/migration-exec.c
+++ b/migration-exec.c
@@ -98,7 +98,7 @@ static void exec_accept_incoming_migration(void *opaque)
QEMUFile *f = opaque;
process_incoming_migration(f);
- qemu_set_fd_handler2(qemu_stdio_fd(f), NULL, NULL, NULL, NULL);
+ qemu_set_fd_handler2(qemu_get_fd(f), NULL, NULL, NULL, NULL);
qemu_fclose(f);
}
@@ -113,7 +113,7 @@ int exec_start_incoming_migration(const char *command)
return -errno;
}
- qemu_set_fd_handler2(qemu_stdio_fd(f), NULL,
+ qemu_set_fd_handler2(qemu_get_fd(f), NULL,
exec_accept_incoming_migration, NULL, f);
return 0;
diff --git a/migration-fd.c b/migration-fd.c
index 50138ed..7ad98d9 100644
--- a/migration-fd.c
+++ b/migration-fd.c
@@ -104,7 +104,7 @@ static void fd_accept_incoming_migration(void *opaque)
QEMUFile *f = opaque;
process_incoming_migration(f);
- qemu_set_fd_handler2(qemu_stdio_fd(f), NULL, NULL, NULL, NULL);
+ qemu_set_fd_handler2(qemu_get_fd(f), NULL, NULL, NULL, NULL);
qemu_fclose(f);
}
diff --git a/qemu-file.h b/qemu-file.h
index d552f5d..d64bdbb 100644
--- a/qemu-file.h
+++ b/qemu-file.h
@@ -80,7 +80,6 @@ QEMUFile *qemu_fopen_socket(int fd);
QEMUFile *qemu_popen(FILE *popen_file, const char *mode);
QEMUFile *qemu_popen_cmd(const char *command, const char *mode);
int qemu_get_fd(QEMUFile *f);
-int qemu_stdio_fd(QEMUFile *f);
int qemu_fclose(QEMUFile *f);
void qemu_put_buffer(QEMUFile *f, const uint8_t *buf, int size);
void qemu_put_byte(QEMUFile *f, int v);
diff --git a/savevm.c b/savevm.c
index 334848a..040068d 100644
--- a/savevm.c
+++ b/savevm.c
@@ -310,17 +310,6 @@ QEMUFile *qemu_popen_cmd(const char *command, const char
*mode)
return qemu_popen(popen_file, mode);
}
-int qemu_stdio_fd(QEMUFile *f)
-{
- QEMUFileStdio *p;
- int fd;
-
- p = (QEMUFileStdio *)f->opaque;
- fd = fileno(p->stdio_file);
-
- return fd;
-}
-
static const QEMUFileOps stdio_file_read_ops = {
.get_fd = stdio_get_fd,
.get_buffer = stdio_get_buffer,
--
1.7.12
- [Qemu-devel] [PATCH 0/9] Incoming migration coroutine, Paolo Bonzini, 2012/09/21
- [Qemu-devel] [PATCH 1/9] migration: unify stdio-based QEMUFile operations, Paolo Bonzini, 2012/09/21
- [Qemu-devel] [PATCH 3/9] migration: add qemu_get_fd, Paolo Bonzini, 2012/09/21
- [Qemu-devel] [PATCH 2/9] migration: consolidate QEMUFile methods in a single QEMUFileOps struct, Paolo Bonzini, 2012/09/21
- [Qemu-devel] [PATCH 4/9] migration: replace qemu_stdio_fd with qemu_get_fd,
Paolo Bonzini <=
- [Qemu-devel] [PATCH 5/9] migration: clean up server sockets and handlers before invoking process_incoming_migration, Paolo Bonzini, 2012/09/21
- [Qemu-devel] [PATCH 6/9] migration: close socket QEMUFile from socket_close, Paolo Bonzini, 2012/09/21
- [Qemu-devel] [PATCH 7/9] migration: move qemu_fclose to process_incoming_migration, Paolo Bonzini, 2012/09/21
- [Qemu-devel] [PATCH 8/9] migration: handle EAGAIN while reading QEMUFile, Paolo Bonzini, 2012/09/21
- [Qemu-devel] [PATCH 9/9] migration: move process_incoming_migration to a coroutine, Paolo Bonzini, 2012/09/21