[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 7/9] migration: move qemu_fclose to process_incoming
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PATCH 7/9] migration: move qemu_fclose to process_incoming_migration |
Date: |
Fri, 21 Sep 2012 19:05:04 +0200 |
The common suffix is now just process_incoming_migration.
Signed-off-by: Paolo Bonzini <address@hidden>
---
migration-exec.c | 1 -
migration-fd.c | 1 -
migration-tcp.c | 1 -
migration-unix.c | 1 -
migration.c | 6 +++++-
5 file modificati, 5 inserzioni(+), 5 rimozioni(-)
diff --git a/migration-exec.c b/migration-exec.c
index 0964dbb..bb91917 100644
--- a/migration-exec.c
+++ b/migration-exec.c
@@ -99,7 +99,6 @@ static void exec_accept_incoming_migration(void *opaque)
qemu_set_fd_handler2(qemu_get_fd(f), NULL, NULL, NULL, NULL);
process_incoming_migration(f);
- qemu_fclose(f);
}
int exec_start_incoming_migration(const char *command)
diff --git a/migration-fd.c b/migration-fd.c
index 62ef593..97136cb 100644
--- a/migration-fd.c
+++ b/migration-fd.c
@@ -105,7 +105,6 @@ static void fd_accept_incoming_migration(void *opaque)
qemu_set_fd_handler2(qemu_get_fd(f), NULL, NULL, NULL, NULL);
process_incoming_migration(f);
- qemu_fclose(f);
}
int fd_start_incoming_migration(const char *infd)
diff --git a/migration-tcp.c b/migration-tcp.c
index 58d6884..a1766a4 100644
--- a/migration-tcp.c
+++ b/migration-tcp.c
@@ -132,7 +132,6 @@ static void tcp_accept_incoming_migration(void *opaque)
}
process_incoming_migration(f);
- qemu_fclose(f);
return;
out:
diff --git a/migration-unix.c b/migration-unix.c
index 57aca11..d8d5dfa 100644
--- a/migration-unix.c
+++ b/migration-unix.c
@@ -146,7 +146,6 @@ static void unix_accept_incoming_migration(void *opaque)
}
process_incoming_migration(f);
- qemu_fclose(f);
return;
out:
diff --git a/migration.c b/migration.c
index 2c29d04..2bc4bac 100644
--- a/migration.c
+++ b/migration.c
@@ -88,7 +88,11 @@ int qemu_start_incoming_migration(const char *uri, Error
**errp)
void process_incoming_migration(QEMUFile *f)
{
- if (qemu_loadvm_state(f) < 0) {
+ int ret;
+
+ ret = qemu_loadvm_state(f);
+ qemu_fclose(f);
+ if (ret < 0) {
fprintf(stderr, "load of migration failed\n");
exit(0);
}
--
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, 2012/09/21
- [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 <=
- [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