From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52423) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YXtSU-00037j-77 for qemu-devel@nongnu.org; Tue, 17 Mar 2015 11:31:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YXtSS-0003xu-RR for qemu-devel@nongnu.org; Tue, 17 Mar 2015 11:31:06 -0400 Received: from mx1.redhat.com ([209.132.183.28]:54263) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YXtSS-0003xd-H9 for qemu-devel@nongnu.org; Tue, 17 Mar 2015 11:31:04 -0400 From: Juan Quintela Date: Tue, 17 Mar 2015 16:30:33 +0100 Message-Id: <1426606235-7238-12-git-send-email-quintela@redhat.com> In-Reply-To: <1426606235-7238-1-git-send-email-quintela@redhat.com> References: <1426606235-7238-1-git-send-email-quintela@redhat.com> Subject: [Qemu-devel] [PULL 11/13] hmp: Rename 'MigrationStatus' to 'HMPMigrationStatus' List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: zhanghailiang From: zhanghailiang We will use the typename 'MigrationStatus' for publicly exported typename, So here we rename the internal-only 'MigrationStatus' to 'HMPMigrationStatus'. Signed-off-by: zhanghailiang Reviewed-by: Eric Blake Signed-off-by: Juan Quintela --- hmp.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/hmp.c b/hmp.c index 84fb585..8afce2d 100644 --- a/hmp.c +++ b/hmp.c @@ -1341,16 +1341,16 @@ void hmp_block_job_complete(Monitor *mon, const QDict *qdict) hmp_handle_error(mon, &error); } -typedef struct MigrationStatus +typedef struct HMPMigrationStatus { QEMUTimer *timer; Monitor *mon; bool is_block_migration; -} MigrationStatus; +} HMPMigrationStatus; static void hmp_migrate_status_cb(void *opaque) { - MigrationStatus *status = opaque; + HMPMigrationStatus *status = opaque; MigrationInfo *info; info = qmp_query_migrate(NULL); @@ -1398,7 +1398,7 @@ void hmp_migrate(Monitor *mon, const QDict *qdict) } if (!detach) { - MigrationStatus *status; + HMPMigrationStatus *status; if (monitor_suspend(mon) < 0) { monitor_printf(mon, "terminal does not allow synchronous " -- 2.1.0