From patchwork Thu Jul 25 20:18:10 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lei Li X-Patchwork-Id: 261921 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id BD9782C00D7 for ; Fri, 26 Jul 2013 06:20:11 +1000 (EST) Received: from localhost ([::1]:47057 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V2S1B-000083-JS for incoming@patchwork.ozlabs.org; Thu, 25 Jul 2013 16:20:09 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:38235) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V2S0a-0008W0-Dw for qemu-devel@nongnu.org; Thu, 25 Jul 2013 16:19:33 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1V2S0Z-0005Q7-Fc for qemu-devel@nongnu.org; Thu, 25 Jul 2013 16:19:32 -0400 Received: from e28smtp01.in.ibm.com ([122.248.162.1]:47549) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V2S0Y-0005PG-Rv for qemu-devel@nongnu.org; Thu, 25 Jul 2013 16:19:31 -0400 Received: from /spool/local by e28smtp01.in.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Fri, 26 Jul 2013 01:41:25 +0530 Received: from d28dlp03.in.ibm.com (9.184.220.128) by e28smtp01.in.ibm.com (192.168.1.131) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Fri, 26 Jul 2013 01:41:22 +0530 Received: from d28relay05.in.ibm.com (d28relay05.in.ibm.com [9.184.220.62]) by d28dlp03.in.ibm.com (Postfix) with ESMTP id 02EDF1258053 for ; Fri, 26 Jul 2013 01:48:47 +0530 (IST) Received: from d28av03.in.ibm.com (d28av03.in.ibm.com [9.184.220.65]) by d28relay05.in.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id r6PKJHTE38010964 for ; Fri, 26 Jul 2013 01:49:17 +0530 Received: from d28av03.in.ibm.com (loopback [127.0.0.1]) by d28av03.in.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id r6PKJKbF017664 for ; Fri, 26 Jul 2013 06:19:20 +1000 Received: from localhost.localdomain ([9.77.180.160]) by d28av03.in.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with ESMTP id r6PKJ7cA016868; Fri, 26 Jul 2013 06:19:18 +1000 From: Lei Li To: qemu-devel@nongnu.org Date: Fri, 26 Jul 2013 04:18:10 +0800 Message-Id: <1374783499-2550-4-git-send-email-lilei@linux.vnet.ibm.com> X-Mailer: git-send-email 1.7.7.6 In-Reply-To: <1374783499-2550-1-git-send-email-lilei@linux.vnet.ibm.com> References: <1374783499-2550-1-git-send-email-lilei@linux.vnet.ibm.com> X-TM-AS-MML: No X-Content-Scanned: Fidelis XPS MAILER x-cbid: 13072520-4790-0000-0000-000009771982 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4.x-2.6.x [generic] X-Received-From: 122.248.162.1 Cc: aarcange@redhat.com, aliguori@us.ibm.com, Lei Li , quintela@redhat.com, lagarcia@br.ibm.com, pbonzini@redhat.com, rcj@linux.vnet.ibm.com Subject: [Qemu-devel] [PATCH 03/12] rename is_active to is_block_active X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Signed-off-by: Lei Li --- block-migration.c | 2 +- include/migration/vmstate.h | 2 +- savevm.c | 16 ++++++++-------- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/block-migration.c b/block-migration.c index 2fd7699..171b8b8 100644 --- a/block-migration.c +++ b/block-migration.c @@ -814,7 +814,7 @@ SaveVMHandlers savevm_block_handlers = { .save_live_pending = block_save_pending, .load_state = block_load, .cancel = block_migration_cancel, - .is_active = block_is_active, + .is_block_active = block_is_active, }; void blk_mig_init(void) diff --git a/include/migration/vmstate.h b/include/migration/vmstate.h index ebc4d09..acf847b 100644 --- a/include/migration/vmstate.h +++ b/include/migration/vmstate.h @@ -40,7 +40,7 @@ typedef struct SaveVMHandlers { int (*save_live_complete)(QEMUFile *f, void *opaque); /* This runs both outside and inside the iothread lock. */ - bool (*is_active)(void *opaque); + bool (*is_block_active)(void *opaque); /* This runs outside the iothread lock in the migration case, and * within the lock in the savevm case. The callback had better only diff --git a/savevm.c b/savevm.c index 1695102..e18ca22 100644 --- a/savevm.c +++ b/savevm.c @@ -1817,8 +1817,8 @@ void qemu_savevm_state_begin(QEMUFile *f, if (!se->ops || !se->ops->save_live_setup) { continue; } - if (se->ops && se->ops->is_active) { - if (!se->ops->is_active(se->opaque)) { + if (se->ops && se->ops->is_block_active) { + if (!se->ops->is_block_active(se->opaque)) { continue; } } @@ -1857,8 +1857,8 @@ int qemu_savevm_state_iterate(QEMUFile *f) if (!se->ops || !se->ops->save_live_iterate) { continue; } - if (se->ops && se->ops->is_active) { - if (!se->ops->is_active(se->opaque)) { + if (se->ops && se->ops->is_block_active) { + if (!se->ops->is_block_active(se->opaque)) { continue; } } @@ -1898,8 +1898,8 @@ void qemu_savevm_state_complete(QEMUFile *f) if (!se->ops || !se->ops->save_live_complete) { continue; } - if (se->ops && se->ops->is_active) { - if (!se->ops->is_active(se->opaque)) { + if (se->ops && se->ops->is_block_active) { + if (!se->ops->is_block_active(se->opaque)) { continue; } } @@ -1952,8 +1952,8 @@ uint64_t qemu_savevm_state_pending(QEMUFile *f, uint64_t max_size) if (!se->ops || !se->ops->save_live_pending) { continue; } - if (se->ops && se->ops->is_active) { - if (!se->ops->is_active(se->opaque)) { + if (se->ops && se->ops->is_block_active) { + if (!se->ops->is_block_active(se->opaque)) { continue; } }