From: Wolfgang Bumiller <w.bumiller@proxmox.com>
Date: Mon, 13 Jul 2015 11:36:04 +0000 (+0200)
Subject: updating mirror-sleep patches again
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=d2aeae7605f0a9b4bba966d260697bb0cd478815;hp=fd4cd63e33e6b55f23cf287eab2030c3b47efb4d;p=pve-qemu-kvm.git

updating mirror-sleep patches again
---

diff --git a/debian/patches/mirror-sleep.patch b/debian/patches/mirror-sleep.patch
index 37dc939..0e2208d 100644
--- a/debian/patches/mirror-sleep.patch
+++ b/debian/patches/mirror-sleep.patch
@@ -21,7 +21,7 @@ diff --git a/block/mirror.c b/block/mirror.c
 index 4056164..0a05971 100644
 --- a/block/mirror.c
 +++ b/block/mirror.c
-@@ -432,11 +432,23 @@ static void coroutine_fn mirror_run(void *opaque)
+@@ -444,11 +444,23 @@ static void coroutine_fn mirror_run(void *opaque)
      sectors_per_chunk = s->granularity >> BDRV_SECTOR_BITS;
      mirror_free_init(s);
  
@@ -48,7 +48,7 @@ index 4056164..0a05971 100644
 @@ -455,7 +467,6 @@ static void coroutine_fn mirror_run(void *opaque)
      }
  
-     bdrv_dirty_iter_init(bs, s->dirty_bitmap, &s->hbi);
+     bdrv_dirty_iter_init(s->dirty_bitmap, &s->hbi);
 -    last_pause_ns = qemu_clock_get_ns(QEMU_CLOCK_REALTIME);
      for (;;) {
          uint64_t delay_ns = 0;
diff --git a/debian/patches/mirror-sleep2.patch b/debian/patches/mirror-sleep2.patch
index 8c3f503..d7e57bc 100644
--- a/debian/patches/mirror-sleep2.patch
+++ b/debian/patches/mirror-sleep2.patch
@@ -80,7 +80,7 @@ diff --git a/block/mirror.c b/block/mirror.c
 index ca55578..e8cb592 100644
 --- a/block/mirror.c
 +++ b/block/mirror.c
-@@ -371,7 +371,7 @@ static void coroutine_fn mirror_run(void *opaque)
+@@ -387,7 +387,7 @@ static void coroutine_fn mirror_run(void *opaque)
      MirrorBlockJob *s = opaque;
      MirrorExitData *data;
      BlockDriverState *bs = s->common.bs;
@@ -89,7 +89,7 @@ index ca55578..e8cb592 100644
      uint64_t last_pause_ns;
      BlockDriverInfo bdi;
      char backing_filename[2]; /* we only need 2 characters because we are only
-@@ -425,7 +425,6 @@ static void coroutine_fn mirror_run(void *opaque)
+@@ -441,7 +441,6 @@ static void coroutine_fn mirror_run(void *opaque)
          goto immediate_exit;
      }
  
@@ -97,7 +97,7 @@ index ca55578..e8cb592 100644
      mirror_free_init(s);
  
      last_pause_ns = qemu_clock_get_ns(QEMU_CLOCK_REALTIME);
-@@ -433,7 +432,9 @@ static void coroutine_fn mirror_run(void *opaque)
+@@ -449,7 +448,9 @@ static void coroutine_fn mirror_run(void *opaque)
          /* First part, loop on the sectors and initialize the dirty bitmap.  */
          BlockDriverState *base = s->base;
          for (sector_num = 0; sector_num < end; ) {
@@ -108,7 +108,7 @@ index ca55578..e8cb592 100644
              int64_t now = qemu_clock_get_ns(QEMU_CLOCK_REALTIME);
  
              if (now - last_pause_ns > SLICE_TIME) {
-@@ -444,9 +445,7 @@ static void coroutine_fn mirror_run(void *opaque)
+@@ -460,9 +461,7 @@ static void coroutine_fn mirror_run(void *opaque)
              if (block_job_is_cancelled(&s->common)) {
                  goto immediate_exit;
              }
@@ -119,10 +119,10 @@ index ca55578..e8cb592 100644
  
              if (ret < 0) {
                  goto immediate_exit;
-@@ -455,10 +454,8 @@ static void coroutine_fn mirror_run(void *opaque)
+@@ -471,10 +470,8 @@ static void coroutine_fn mirror_run(void *opaque)
              assert(n > 0);
              if (ret == 1) {
-                 bdrv_set_dirty_bitmap(bs, s->dirty_bitmap, sector_num, n);
+                 bdrv_set_dirty_bitmap(s->dirty_bitmap, sector_num, n);
 -                sector_num = next;
 -            } else {
 -                sector_num += n;