From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34557) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YUrSm-0006hV-9D for qemu-devel@nongnu.org; Mon, 09 Mar 2015 02:46:57 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YUrSf-0005dM-Ur for qemu-devel@nongnu.org; Mon, 09 Mar 2015 02:46:52 -0400 Received: from szxga03-in.huawei.com ([119.145.14.66]:2152) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YUrSf-0005bp-60 for qemu-devel@nongnu.org; Mon, 09 Mar 2015 02:46:45 -0400 From: zhanghailiang Date: Mon, 9 Mar 2015 14:45:41 +0800 Message-ID: <1425883543-8852-3-git-send-email-zhang.zhanghailiang@huawei.com> In-Reply-To: <1425883543-8852-1-git-send-email-zhang.zhanghailiang@huawei.com> References: <1425883543-8852-1-git-send-email-zhang.zhanghailiang@huawei.com> MIME-Version: 1.0 Content-Type: text/plain Subject: [Qemu-devel] [PATCH v4 2/4] hmp: Rename 'MigrationStatus' to 'HMPMigrationStatus' List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: zhanghailiang , quintela@redhat.com, armbru@redhat.com, lcapitulino@redhat.com, amit.shah@redhat.com, peter.huangpeng@huawei.com, dgilbert@redhat.com 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 --- hmp.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/hmp.c b/hmp.c index 71c28bc..7300ddc 100644 --- a/hmp.c +++ b/hmp.c @@ -1331,16 +1331,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); @@ -1388,7 +1388,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 " -- 1.7.12.4