qobject atomics osdep: Make a few macros more hygienic

[mirror_qemu.git] / migration / block.c

diff --git a/migration/block.c b/migration/block.c
index 86c2256a2bfb3370aa93f901a4fc8a661a4b2edd..eb6aafeb9e6acf9c8cb2b0a65e695c0a610f660e 100644 (file)
--- a/migration/block.c
+++ b/migration/block.c
@@ -440,8 +440,8 @@ static int init_blk_migration(QEMUFile *f)
     /* Can only insert new BDSes now because doing so while iterating block
      * devices may end up in a deadlock (iterating the new BDSes, too). */
     for (i = 0; i < num_bs; i++) {
-        BlkMigDevState *bmds = bmds_bs[i].bmds;
-        BlockDriverState *bs = bmds_bs[i].bs;
+        bmds = bmds_bs[i].bmds;
+        bs = bmds_bs[i].bs;
 
         if (bmds) {
             ret = blk_insert_bs(bmds->blk, bs, &local_err);