From patchwork Mon Nov 30 17:21:20 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kiszka X-Patchwork-Id: 39847 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id B14F81007D3 for ; Tue, 1 Dec 2009 05:24:17 +1100 (EST) Received: from localhost ([127.0.0.1]:36993 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NFAuz-0002Kn-6G for incoming@patchwork.ozlabs.org; Mon, 30 Nov 2009 13:24:13 -0500 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NFA2n-0003sf-0r for qemu-devel@nongnu.org; Mon, 30 Nov 2009 12:28:13 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NFA2b-0003k2-1l for qemu-devel@nongnu.org; Mon, 30 Nov 2009 12:28:07 -0500 Received: from [199.232.76.173] (port=36095 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NFA2Y-0003jH-WA for qemu-devel@nongnu.org; Mon, 30 Nov 2009 12:27:59 -0500 Received: from david.siemens.de ([192.35.17.14]:22232) by monty-python.gnu.org with esmtps (TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1NFA2W-0004fu-6R for qemu-devel@nongnu.org; Mon, 30 Nov 2009 12:27:57 -0500 Received: from mail1.siemens.de (localhost [127.0.0.1]) by david.siemens.de (8.12.11.20060308/8.12.11) with ESMTP id nAUHRqx5025489; Mon, 30 Nov 2009 18:27:52 +0100 Received: from [139.25.109.167] (mchn012c.ww002.siemens.net [139.25.109.167] (may be forged)) by mail1.siemens.de (8.12.11.20060308/8.12.11) with ESMTP id nAUHRolN001969; Mon, 30 Nov 2009 18:27:51 +0100 Resent-From: Jan Kiszka Resent-To: Anthony Liguori Resent-Cc: qemu-devel , Liran Schour , Pierre Riteau Resent-Date: Mon, 30 Nov 2009 18:27:50 +0100 Resent-Message-Id: <4B140096.5070909@siemens.com> Resent-User-Agent: Mozilla/5.0 (X11; U; Linux i686 (x86_64); de; rv:1.8.1.12) Gecko/20080226 SUSE/2.0.0.12-1.1 Thunderbird/2.0.0.12 Mnenhy/0.7.5.666 From: Jan Kiszka To: Anthony Liguori Date: Mon, 30 Nov 2009 18:21:20 +0100 Message-ID: <20091130172120.22889.25713.stgit@mchn012c.ww002.siemens.net> In-Reply-To: <20091130172119.22889.28114.stgit@mchn012c.ww002.siemens.net> References: <20091130172119.22889.28114.stgit@mchn012c.ww002.siemens.net> User-Agent: StGIT/0.14.3 MIME-Version: 1.0 X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.4-2.6 Resent-Date: Mon, 30 Nov 2009 12:28:07 -0500 Cc: qemu-devel@nongnu.org, Liran Schour , Pierre Riteau Subject: [Qemu-devel] [PATCH 07/23] block migration: Avoid indirection of block_mig_state X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org No need to push block_mig_state to the heap and, thus, establish an indirection. Signed-off-by: Jan Kiszka --- block-migration.c | 91 ++++++++++++++++++++++++++--------------------------- 1 files changed, 44 insertions(+), 47 deletions(-) diff --git a/block-migration.c b/block-migration.c index a0dcdad..f6fac73 100644 --- a/block-migration.c +++ b/block-migration.c @@ -73,7 +73,7 @@ typedef struct BlkMigState { int64_t print_completion; } BlkMigState; -static BlkMigState *block_mig_state = NULL; +static BlkMigState block_mig_state; static void blk_mig_read_cb(void *opaque, int ret) { @@ -82,17 +82,17 @@ static void blk_mig_read_cb(void *opaque, int ret) blk->ret = ret; /* insert at the end */ - if (block_mig_state->last_blk == NULL) { - block_mig_state->first_blk = blk; - block_mig_state->last_blk = blk; + if (block_mig_state.last_blk == NULL) { + block_mig_state.first_blk = blk; + block_mig_state.last_blk = blk; } else { - block_mig_state->last_blk->next = blk; - block_mig_state->last_blk = blk; + block_mig_state.last_blk->next = blk; + block_mig_state.last_blk = blk; } - block_mig_state->submitted--; - block_mig_state->read_done++; - assert(block_mig_state->submitted >= 0); + block_mig_state.submitted--; + block_mig_state.read_done++; + assert(block_mig_state.submitted >= 0); } static int mig_read_device_bulk(QEMUFile *f, BlkMigDevState *bms) @@ -123,10 +123,10 @@ static int mig_read_device_bulk(QEMUFile *f, BlkMigDevState *bms) return 1; } - if (cur_sector >= block_mig_state->print_completion) { + if (cur_sector >= block_mig_state.print_completion) { printf("Completed %" PRId64 " %%\r", cur_sector * 100 / total_sectors); fflush(stdout); - block_mig_state->print_completion += + block_mig_state.print_completion += (BDRV_SECTORS_PER_DIRTY_CHUNK * 10000); } @@ -159,7 +159,7 @@ static int mig_read_device_bulk(QEMUFile *f, BlkMigDevState *bms) } bdrv_reset_dirty(bms->bs, cur_sector, nr_sectors); - block_mig_state->submitted++; + block_mig_state.submitted++; return (bms->cur_sector >= total_sectors); } @@ -189,10 +189,10 @@ static int mig_save_device_bulk(QEMUFile *f, BlkMigDevState *bmds) return 1; } - if (cur_sector >= block_mig_state->print_completion) { + if (cur_sector >= block_mig_state.print_completion) { printf("Completed %" PRId64 " %%\r", cur_sector * 100 / total_sectors); fflush(stdout); - block_mig_state->print_completion += + block_mig_state.print_completion += (BDRV_SECTORS_PER_DIRTY_CHUNK * 10000); } @@ -252,7 +252,7 @@ static void blk_mig_save_dev_info(QEMUFile *f, BlkMigDevState *bmds) static void set_dirty_tracking(int enable) { BlkMigDevState *bmds; - for (bmds = block_mig_state->bmds_first; bmds != NULL; bmds = bmds->next) { + for (bmds = block_mig_state.bmds_first; bmds != NULL; bmds = bmds->next) { bdrv_set_dirty_tracking(bmds->bs, enable); } } @@ -268,7 +268,7 @@ static void init_blk_migration(QEMUFile *f) bmds->bs = bs; bmds->bulk_completed = 0; bmds->total_sectors = bdrv_getlength(bs) >> BDRV_SECTOR_BITS; - bmds->shared_base = block_mig_state->shared_base; + bmds->shared_base = block_mig_state.shared_base; if (bmds->shared_base) { printf("Start migration for %s with shared base image\n", @@ -278,7 +278,7 @@ static void init_blk_migration(QEMUFile *f) } /* insert at the end */ - pbmds = &block_mig_state->bmds_first; + pbmds = &block_mig_state.bmds_first; while (*pbmds != NULL) { pbmds = &(*pbmds)->next; } @@ -293,7 +293,7 @@ static int blk_mig_save_bulked_block(QEMUFile *f, int is_async) { BlkMigDevState *bmds; - for (bmds = block_mig_state->bmds_first; bmds != NULL; bmds = bmds->next) { + for (bmds = block_mig_state.bmds_first; bmds != NULL; bmds = bmds->next) { if (bmds->bulk_completed == 0) { if (is_async) { if (mig_read_device_bulk(f, bmds) == 1) { @@ -311,7 +311,7 @@ static int blk_mig_save_bulked_block(QEMUFile *f, int is_async) } /* we reached here means bulk is completed */ - block_mig_state->bulk_completed = 1; + block_mig_state.bulk_completed = 1; return 0; } @@ -327,7 +327,7 @@ static void blk_mig_save_dirty_blocks(QEMUFile *f) buf = qemu_malloc(BLOCK_SIZE); - for (bmds = block_mig_state->bmds_first; bmds != NULL; bmds = bmds->next) { + for (bmds = block_mig_state.bmds_first; bmds != NULL; bmds = bmds->next) { for (sector = 0; sector < bmds->cur_sector;) { if (bdrv_get_dirty(bmds->bs, sector)) { if (bdrv_read(bmds->bs, sector, buf, @@ -360,10 +360,11 @@ static void flush_blks(QEMUFile* f) { BlkMigBlock *blk, *next; - dprintf("%s Enter submitted %d read_done %d transfered\n", __FUNCTION__, - submitted, read_done, transfered); + dprintf("%s Enter submitted %d read_done %d transferred %d\n", + __FUNCTION__, block_mig_state.submitted, block_mig_state.read_done, + block_mig_state.transferred); - for (blk = block_mig_state->first_blk; + for (blk = block_mig_state.first_blk; blk != NULL && !qemu_file_rate_limit(f); blk = next) { send_blk(f, blk); @@ -372,30 +373,30 @@ static void flush_blks(QEMUFile* f) qemu_free(blk->buf); qemu_free(blk); - block_mig_state->read_done--; - block_mig_state->transferred++; - assert(block_mig_state->read_done >= 0); + block_mig_state.read_done--; + block_mig_state.transferred++; + assert(block_mig_state.read_done >= 0); } - block_mig_state->first_blk = blk; + block_mig_state.first_blk = blk; - if (block_mig_state->first_blk == NULL) { - block_mig_state->last_blk = NULL; + if (block_mig_state.first_blk == NULL) { + block_mig_state.last_blk = NULL; } - dprintf("%s Exit submitted %d read_done %d transferred%d\n", __FUNCTION__, - block_mig_state->submitted, block_mig_state->read_done, - block_mig_state->transferred); + dprintf("%s Exit submitted %d read_done %d transferred %d\n", __FUNCTION__, + block_mig_state.submitted, block_mig_state.read_done, + block_mig_state.transferred); } static int is_stage2_completed(void) { BlkMigDevState *bmds; - if (block_mig_state->submitted > 0) { + if (block_mig_state.submitted > 0) { return 0; } - for (bmds = block_mig_state->bmds_first; bmds != NULL; bmds = bmds->next) { + for (bmds = block_mig_state.bmds_first; bmds != NULL; bmds = bmds->next) { if (bmds->bulk_completed == 0) { return 0; } @@ -406,10 +407,10 @@ static int is_stage2_completed(void) static int block_save_live(QEMUFile *f, int stage, void *opaque) { - dprintf("Enter save live stage %d submitted %d transferred %d\n", stage, - submitted, transferred); + dprintf("Enter save live stage %d submitted %d transferred %d\n", + stage, block_mig_state.submitted, block_mig_state.transferred); - if (block_mig_state->blk_enable != 1) { + if (block_mig_state.blk_enable != 1) { /* no need to migrate storage */ qemu_put_be64(f, BLK_MIG_FLAG_EOS); return 1; @@ -425,8 +426,8 @@ static int block_save_live(QEMUFile *f, int stage, void *opaque) flush_blks(f); /* control the rate of transfer */ - while ((block_mig_state->submitted + - block_mig_state->read_done) * BLOCK_SIZE < + while ((block_mig_state.submitted + + block_mig_state.read_done) * BLOCK_SIZE < qemu_file_get_rate_limit(f)) { if (blk_mig_save_bulked_block(f, 1) == 0) { /* no more bulk blocks for now */ @@ -499,13 +500,11 @@ static int block_load(QEMUFile *f, void *opaque, int version_id) static void block_set_params(int blk_enable, int shared_base, void *opaque) { - assert(opaque == block_mig_state); - - block_mig_state->blk_enable = blk_enable; - block_mig_state->shared_base = shared_base; + block_mig_state.blk_enable = blk_enable; + block_mig_state.shared_base = shared_base; /* shared base means that blk_enable = 1 */ - block_mig_state->blk_enable |= shared_base; + block_mig_state.blk_enable |= shared_base; } void blk_mig_info(void) @@ -523,8 +522,6 @@ void blk_mig_info(void) void blk_mig_init(void) { - block_mig_state = qemu_mallocz(sizeof(BlkMigState)); - register_savevm_live("block", 0, 1, block_set_params, block_save_live, - NULL, block_load, block_mig_state); + NULL, block_load, &block_mig_state); }