Patchwork [08/23] block migration: Drop dead code

login
register
mail settings
Submitter Jan Kiszka
Date Nov. 30, 2009, 5:21 p.m.
Message ID <20091130172120.22889.33186.stgit@mchn012c.ww002.siemens.net>
Download mbox | patch
Permalink /patch/39837/
State New
Headers show

Comments

Jan Kiszka - Nov. 30, 2009, 5:21 p.m.
Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
---

 block-migration.c |   24 ------------------------
 block-migration.h |    2 +-
 2 files changed, 1 insertions(+), 25 deletions(-)

Patch

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 */