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: 39837 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 6BB46B6F14 for ; Tue, 1 Dec 2009 05:04:54 +1100 (EST) Received: from localhost ([127.0.0.1]:53636 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NFAcF-0006ye-HS for incoming@patchwork.ozlabs.org; Mon, 30 Nov 2009 13:04:51 -0500 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NFA2m-0003sj-DY for qemu-devel@nongnu.org; Mon, 30 Nov 2009 12:28:12 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NFA2a-0003kY-4t for qemu-devel@nongnu.org; Mon, 30 Nov 2009 12:28:06 -0500 Received: from [199.232.76.173] (port=36099 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NFA2Z-0003ji-T0 for qemu-devel@nongnu.org; Mon, 30 Nov 2009 12:27:59 -0500 Received: from david.siemens.de ([192.35.17.14]:22233) by monty-python.gnu.org with esmtps (TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1NFA2W-0004fs-8E 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 nAUHRp4N025463; Mon, 30 Nov 2009 18:27:51 +0100 Received: from [139.25.109.167] (mchn012c.mchp.siemens.de [139.25.109.167] (may be forged)) by mail1.siemens.de (8.12.11.20060308/8.12.11) with ESMTP id nAUHRoeP001970; Mon, 30 Nov 2009 18:27:50 +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.1040004@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.33186.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:06 -0500 Cc: qemu-devel@nongnu.org, Liran Schour , Pierre Riteau Subject: [Qemu-devel] [PATCH 08/23] block migration: Drop dead code 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 Signed-off-by: Jan Kiszka --- block-migration.c | 24 ------------------------ block-migration.h | 2 +- 2 files changed, 1 insertions(+), 25 deletions(-) diff --git a/block-migration.c b/block-migration.c index f6fac73..f81cf35 100644 --- a/block-migration.c +++ b/block-migration.c @@ -59,11 +59,8 @@ typedef struct BlkMigBlock { } BlkMigBlock; typedef struct BlkMigState { - int bulk_completed; int blk_enable; int shared_base; - int no_dirty; - QEMUFile *load_file; BlkMigDevState *bmds_first; BlkMigBlock *first_blk; BlkMigBlock *last_blk; @@ -245,10 +242,6 @@ static void send_blk(QEMUFile *f, BlkMigBlock * blk) qemu_put_buffer(f, blk->buf, BLOCK_SIZE); } -static void blk_mig_save_dev_info(QEMUFile *f, BlkMigDevState *bmds) -{ -} - static void set_dirty_tracking(int enable) { BlkMigDevState *bmds; @@ -283,8 +276,6 @@ static void init_blk_migration(QEMUFile *f) pbmds = &(*pbmds)->next; } *pbmds = bmds; - - blk_mig_save_dev_info(f, bmds); } } } @@ -311,8 +302,6 @@ 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; - return 0; } @@ -507,19 +496,6 @@ static void block_set_params(int blk_enable, int shared_base, void *opaque) block_mig_state.blk_enable |= shared_base; } -void blk_mig_info(void) -{ - BlockDriverState *bs; - - for (bs = bdrv_first; bs != NULL; bs = bs->next) { - printf("Device %s\n", bs->device_name); - if (bs->type == BDRV_TYPE_HD) { - printf("device %s format %s\n", - bs->device_name, bs->drv->format_name); - } - } -} - void blk_mig_init(void) { register_savevm_live("block", 0, 1, block_set_params, block_save_live, diff --git a/block-migration.h b/block-migration.h index 39ee889..a274d2d 100644 --- a/block-migration.h +++ b/block-migration.h @@ -15,5 +15,5 @@ #define BLOCK_MIGRATION_H void blk_mig_init(void); -void blk_mig_info(void); + #endif /* BLOCK_MIGRATION_H */