From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60687) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1X37VD-0007aw-U8 for qemu-devel@nongnu.org; Fri, 04 Jul 2014 13:42:34 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1X37V7-0008Hn-MN for qemu-devel@nongnu.org; Fri, 04 Jul 2014 13:42:27 -0400 Received: from mx1.redhat.com ([209.132.183.28]:14737) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1X37V7-0008Ha-FP for qemu-devel@nongnu.org; Fri, 04 Jul 2014 13:42:21 -0400 From: "Dr. David Alan Gilbert (git)" Date: Fri, 4 Jul 2014 18:41:22 +0100 Message-Id: <1404495717-4239-12-git-send-email-dgilbert@redhat.com> In-Reply-To: <1404495717-4239-1-git-send-email-dgilbert@redhat.com> References: <1404495717-4239-1-git-send-email-dgilbert@redhat.com> Subject: [Qemu-devel] [PATCH 11/46] Return path: Send responses from destination to source 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, lilei@linux.vnet.ibm.com, quintela@redhat.com From: "Dr. David Alan Gilbert" Add migrate_send_rp_message to send a message from destination to source along the return path. (It uses a mutex to let it be called from multiple threads) Add migrate_send_rp_ack to send an 'ack' message Use it in the CMD_REQACK handler Signed-off-by: Dr. David Alan Gilbert --- include/migration/migration.h | 15 +++++++++++++++ migration.c | 27 +++++++++++++++++++++++++++ 2 files changed, 42 insertions(+) diff --git a/include/migration/migration.h b/include/migration/migration.h index 0e21c5d..375efec 100644 --- a/include/migration/migration.h +++ b/include/migration/migration.h @@ -40,6 +40,12 @@ struct MigrationParams { bool shared; }; +/* Commands sent on the return path from destination to source*/ +enum mig_rpcomm_cmd { + MIG_RPCOMM_INVALID = 0, /* Must be 0 */ + MIG_RPCOMM_ACK, /* data (seq: be32 ) */ + MIG_RPCOMM_AFTERLASTVALID +}; typedef struct MigrationState MigrationState; /* State for the incoming migration */ @@ -47,6 +53,7 @@ struct MigrationIncomingState { QEMUFile *file; QEMUFile *return_path; + QemuMutex rp_mutex; /* We send replies from multiple threads */ }; MigrationIncomingState *migration_incoming_state_init(QEMUFile *f); @@ -167,6 +174,14 @@ int64_t migrate_xbzrle_cache_size(void); int64_t xbzrle_cache_resize(int64_t new_size); +/* Sending on the return path - generic and then for each message type */ +void migrate_send_rp_message(MigrationIncomingState *mis, + enum mig_rpcomm_cmd cmd, + uint16_t len, uint8_t *data); +void migrate_send_rp_ack(MigrationIncomingState *mis, + uint32_t value); + + void ram_control_before_iterate(QEMUFile *f, uint64_t flags); void ram_control_after_iterate(QEMUFile *f, uint64_t flags); void ram_control_load_hook(QEMUFile *f, uint64_t flags); diff --git a/migration.c b/migration.c index c5b133d..74bffbc 100644 --- a/migration.c +++ b/migration.c @@ -77,6 +77,32 @@ MigrationState *migrate_get_current(void) return ¤t_migration; } +/* Send a message on the return channel back to the source + * of the migration. + */ +void migrate_send_rp_message(MigrationIncomingState *mis, + enum mig_rpcomm_cmd cmd, + uint16_t len, uint8_t *data) +{ + DPRINTF("migrate_send_rp_message: cmd=%d, len=%d\n", (int)cmd, len); + qemu_mutex_lock(&mis->rp_mutex); + qemu_put_be16(mis->return_path, (unsigned int)cmd); + qemu_put_be16(mis->return_path, len); + qemu_put_buffer(mis->return_path, data, len); + qemu_fflush(mis->return_path); + qemu_mutex_unlock(&mis->rp_mutex); +} + +/* Send an 'ACK' message on the return channel with the given value */ +void migrate_send_rp_ack(MigrationIncomingState *mis, + uint32_t value) +{ + uint32_t buf; + + buf = cpu_to_be32(value); + migrate_send_rp_message(mis, MIG_RPCOMM_ACK, 4, (uint8_t *)&buf); +} + void qemu_start_incoming_migration(const char *uri, Error **errp) { const char *p; @@ -104,6 +130,7 @@ MigrationIncomingState *migration_incoming_state_init(QEMUFile* f) { MigrationIncomingState *mis = g_malloc0(sizeof(MigrationIncomingState)); mis->file = f; + qemu_mutex_init(&mis->rp_mutex); return mis; } -- 1.9.3