From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34435) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YQfCV-0007yH-8e for qemu-devel@nongnu.org; Wed, 25 Feb 2015 11:52:44 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YQfCT-00014P-QC for qemu-devel@nongnu.org; Wed, 25 Feb 2015 11:52:43 -0500 Received: from mx1.redhat.com ([209.132.183.28]:54452) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YQfCT-000148-A9 for qemu-devel@nongnu.org; Wed, 25 Feb 2015 11:52:41 -0500 From: "Dr. David Alan Gilbert (git)" Date: Wed, 25 Feb 2015 16:51:33 +0000 Message-Id: <1424883128-9841-11-git-send-email-dgilbert@redhat.com> In-Reply-To: <1424883128-9841-1-git-send-email-dgilbert@redhat.com> References: <1424883128-9841-1-git-send-email-dgilbert@redhat.com> Subject: [Qemu-devel] [PATCH v5 10/45] Return path: Control commands List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: aarcange@redhat.com, yamahata@private.email.ne.jp, quintela@redhat.com, amit.shah@redhat.com, pbonzini@redhat.com, yanghy@cn.fujitsu.com, david@gibson.dropbear.id.au From: "Dr. David Alan Gilbert" Add two src->dest commands: * OPEN_RETURN_PATH - To request that the destination open the return path * SEND_PING - Request an acknowledge from the destination Signed-off-by: Dr. David Alan Gilbert --- include/migration/migration.h | 2 ++ include/sysemu/sysemu.h | 6 ++++- savevm.c | 59 +++++++++++++++++++++++++++++++++++++++++++ trace-events | 2 ++ 4 files changed, 68 insertions(+), 1 deletion(-) diff --git a/include/migration/migration.h b/include/migration/migration.h index 1b1dc34..c514dd4 100644 --- a/include/migration/migration.h +++ b/include/migration/migration.h @@ -46,6 +46,8 @@ typedef struct MigrationState MigrationState; /* State for the incoming migration */ struct MigrationIncomingState { QEMUFile *file; + + QEMUFile *return_path; }; MigrationIncomingState *migration_incoming_get_current(void); diff --git a/include/sysemu/sysemu.h b/include/sysemu/sysemu.h index 88e5e76..8da879f 100644 --- a/include/sysemu/sysemu.h +++ b/include/sysemu/sysemu.h @@ -84,7 +84,9 @@ void qemu_announce_self(void); /* Subcommands for QEMU_VM_COMMAND */ enum qemu_vm_cmd { - MIG_CMD_INVALID = 0, /* Must be 0 */ + MIG_CMD_INVALID = 0, /* Must be 0 */ + MIG_CMD_OPEN_RETURN_PATH, /* Tell the dest to open the Return path */ + MIG_CMD_PING, /* Request a PONG on the RP */ }; bool qemu_savevm_state_blocked(Error **errp); @@ -97,6 +99,8 @@ void qemu_savevm_state_cancel(void); uint64_t qemu_savevm_state_pending(QEMUFile *f, uint64_t max_size); void qemu_savevm_command_send(QEMUFile *f, enum qemu_vm_cmd command, uint16_t len, uint8_t *data); +void qemu_savevm_send_ping(QEMUFile *f, uint32_t value); +void qemu_savevm_send_open_return_path(QEMUFile *f); int qemu_loadvm_state(QEMUFile *f); /* SLIRP */ diff --git a/savevm.c b/savevm.c index 3d04ba1..d082738 100644 --- a/savevm.c +++ b/savevm.c @@ -621,6 +621,20 @@ void qemu_savevm_command_send(QEMUFile *f, qemu_fflush(f); } +void qemu_savevm_send_ping(QEMUFile *f, uint32_t value) +{ + uint32_t buf; + + trace_savevm_send_ping(value); + buf = cpu_to_be32(value); + qemu_savevm_command_send(f, MIG_CMD_PING, 4, (uint8_t *)&buf); +} + +void qemu_savevm_send_open_return_path(QEMUFile *f) +{ + qemu_savevm_command_send(f, MIG_CMD_OPEN_RETURN_PATH, 0, NULL); +} + bool qemu_savevm_state_blocked(Error **errp) { SaveStateEntry *se; @@ -937,20 +951,65 @@ static SaveStateEntry *find_se(const char *idstr, int instance_id) return NULL; } +static int loadvm_process_command_simple_lencheck(const char *name, + unsigned int actual, + unsigned int expected) +{ + if (actual != expected) { + error_report("%s received with bad length - expecting %d, got %d", + name, expected, actual); + return -1; + } + + return 0; +} + /* * Process an incoming 'QEMU_VM_COMMAND' * negative return on error (will issue error message) */ static int loadvm_process_command(QEMUFile *f) { + MigrationIncomingState *mis = migration_incoming_get_current(); uint16_t com; uint16_t len; + uint32_t tmp32; com = qemu_get_be16(f); len = qemu_get_be16(f); trace_loadvm_process_command(com, len); switch (com) { + case MIG_CMD_OPEN_RETURN_PATH: + if (loadvm_process_command_simple_lencheck("CMD_OPEN_RETURN_PATH", + len, 0)) { + return -1; + } + if (mis->return_path) { + error_report("CMD_OPEN_RETURN_PATH called when RP already open"); + /* Not really a problem, so don't give up */ + return 0; + } + mis->return_path = qemu_file_get_return_path(f); + if (!mis->return_path) { + error_report("CMD_OPEN_RETURN_PATH failed"); + return -1; + } + break; + + case MIG_CMD_PING: + if (loadvm_process_command_simple_lencheck("CMD_PING", len, 4)) { + return -1; + } + tmp32 = qemu_get_be32(f); + trace_loadvm_process_command_ping(tmp32); + if (!mis->return_path) { + error_report("CMD_PING (0x%x) received with no return path", + tmp32); + return -1; + } + /* migrate_send_rp_pong(mis, tmp32); TODO: gets added later */ + break; default: error_report("VM_COMMAND 0x%x unknown (len 0x%x)", com, len); diff --git a/trace-events b/trace-events index 4e2fbc8..99e00b5 100644 --- a/trace-events +++ b/trace-events @@ -1168,8 +1168,10 @@ qemu_loadvm_state_section(unsigned int section_type) "%d" qemu_loadvm_state_section_partend(uint32_t section_id) "%u" qemu_loadvm_state_section_startfull(uint32_t section_id, const char *idstr, uint32_t instance_id, uint32_t version_id) "%u(%s) %u %u" loadvm_process_command(uint16_t com, uint16_t len) "com=0x%x len=%d" +loadvm_process_command_ping(uint32_t val) "%x" savevm_section_start(const char *id, unsigned int section_id) "%s, section_id %u" savevm_section_end(const char *id, unsigned int section_id, int ret) "%s, section_id %u -> %d" +savevm_send_ping(uint32_t val) "%x" savevm_state_begin(void) "" savevm_state_header(void) "" savevm_state_iterate(void) "" -- 2.1.0