[Qemu-devel] [PULL 0/4] Block patches for 2.5.0-rc1

[Qemu-devel] [PULL 0/4] Block patches for 2.5.0-rc1

[Kevin Wolf]

The following changes since commit ab9b872ab3147faf3c04e91d525815b9139dd996:

  Merge remote-tracking branch 'remotes/mdroth/tags/qga-pull-2015-11-13-v2-tag' into staging (2015-11-18 12:47:29 +0000)

are available in the git repository at:


  git://repo.or.cz/qemu/kevin.git tags/for-upstream

for you to fetch changes up to ca4fa82fe66076284f702adcfe7c319ebbf909ec:

  Merge remote-tracking branch 'mreitz/tags/pull-block-for-kevin-2015-11-18' into queue-block (2015-11-18 16:27:44 +0100)

----------------------------------------------------------------

Block layer patches

----------------------------------------------------------------
Alberto Garcia (1):
      block: Call external_snapshot_clean after blockdev-snapshot

John Snow (1):
      iotests: fix race in 030

Kevin Wolf (1):
      Merge remote-tracking branch 'mreitz/tags/pull-block-for-kevin-2015-11-18' into queue-block

Max Reitz (1):
      blockdev: Add missing bdrv_unref() in drive-backup

Rabin Vincent (1):
      nand: fix address overflow

 blockdev.c             | 2 ++
 hw/block/nand.c        | 4 ++--
 tests/qemu-iotests/030 | 5 ++++-
 3 files changed, 8 insertions(+), 3 deletions(-)

[Qemu-devel] [PULL 1/4] nand: fix address overflow

[Kevin Wolf]

From: Rabin Vincent <rabin.vincent@axis.com>

The shifts of the address mask and value shift beyond 32 bits when there
are 5 address cycles.

Cc: qemu-stable@nongnu.org
Signed-off-by: Rabin Vincent <rabin.vincent@axis.com>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Reviewed-by: Peter Crosthwaite <crosthwaite.peter@gmail.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---
 hw/block/nand.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/hw/block/nand.c b/hw/block/nand.c
index 61d2cec..a68266f 100644
--- a/hw/block/nand.c
+++ b/hw/block/nand.c
@@ -522,8 +522,8 @@ void nand_setio(DeviceState *dev, uint32_t value)
 
     if (s->ale) {
         unsigned int shift = s->addrlen * 8;
-        unsigned int mask = ~(0xff << shift);
-        unsigned int v = value << shift;
+        uint64_t mask = ~(0xffull << shift);
+        uint64_t v = (uint64_t)value << shift;
 
         s->addr = (s->addr & mask) | v;
         s->addrlen ++;
-- 
1.8.3.1

[Qemu-devel] [PULL 2/4] iotests: fix race in 030

[Kevin Wolf]

From: John Snow <jsnow@redhat.com>

the stop_test case tests that we can resume a block-stream
command after it has stopped/paused due to error. We cannot
always reliably query it before it finishes after resume, though,
so make this a conditional.

The important thing is that we are still testing that it has stopped,
and that it finishes successfully after we send a resume command.

Signed-off-by: John Snow <jsnow@redhat.com>
Reviewed-by: Fam Zheng <famz@redhat.com>
Reviewed-by: Alberto Garcia <berto@igalia.com>
Reviewed-by: Jeff Cody <jcody@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---
 tests/qemu-iotests/030 | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/tests/qemu-iotests/030 b/tests/qemu-iotests/030
index 952a524..32469ef 100755
--- a/tests/qemu-iotests/030
+++ b/tests/qemu-iotests/030
@@ -245,6 +245,7 @@ class TestEIO(TestErrors):
         while not completed:
             for event in self.vm.get_qmp_events(wait=True):
                 if event['event'] == 'BLOCK_JOB_ERROR':
+                    error = True
                     self.assert_qmp(event, 'data/device', 'drive0')
                     self.assert_qmp(event, 'data/operation', 'read')
 
@@ -257,9 +258,11 @@ class TestEIO(TestErrors):
                     self.assert_qmp(result, 'return', {})
 
                     result = self.vm.qmp('query-block-jobs')
+                    if result == {'return': []}:
+                        # Race; likely already finished. Check.
+                        continue
                     self.assert_qmp(result, 'return[0]/paused', False)
                     self.assert_qmp(result, 'return[0]/io-status', 'ok')
-                    error = True
                 elif event['event'] == 'BLOCK_JOB_COMPLETED':
                     self.assertTrue(error, 'job completed unexpectedly')
                     self.assert_qmp(event, 'data/type', 'stream')
-- 
1.8.3.1

[Qemu-devel] [PULL 3/4] blockdev: Add missing bdrv_unref() in drive-backup

[Kevin Wolf]

From: Max Reitz <mreitz@redhat.com>

All error paths after a successful bdrv_open() of target_bs should
contain a bdrv_unref(target_bs). This one did not yet, so add it.

Signed-off-by: Max Reitz <mreitz@redhat.com>
Reviewed-by: Alberto Garcia <berto@igalia.com>
Reviewed-by: Kevin Wolf <kwolf@redhat.com>
Reviewed-by: Fam Zheng <famz@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---
 blockdev.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/blockdev.c b/blockdev.c
index 917ae06..07c1741 100644
--- a/blockdev.c
+++ b/blockdev.c
@@ -3171,6 +3171,7 @@ static void do_drive_backup(const char *device, const char *target,
         bmap = bdrv_find_dirty_bitmap(bs, bitmap);
         if (!bmap) {
             error_setg(errp, "Bitmap '%s' could not be found", bitmap);
+            bdrv_unref(target_bs);
             goto out;
         }
     }
-- 
1.8.3.1

[Qemu-devel] [PULL 4/4] block: Call external_snapshot_clean after blockdev-snapshot

[Kevin Wolf]

From: Alberto Garcia <berto@igalia.com>

Otherwise the AioContext will never be released.

Signed-off-by: Alberto Garcia <berto@igalia.com>
Message-id: 1447419624-21918-1-git-send-email-berto@igalia.com
Reviewed-by: Fam Zheng <famz@redhat.com>
Signed-off-by: Max Reitz <mreitz@redhat.com>
---
 blockdev.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/blockdev.c b/blockdev.c
index 07c1741..313841b 100644
--- a/blockdev.c
+++ b/blockdev.c
@@ -2098,6 +2098,7 @@ static const BlkActionOps actions[] = {
         .prepare  = external_snapshot_prepare,
         .commit   = external_snapshot_commit,
         .abort = external_snapshot_abort,
+        .clean = external_snapshot_clean,
     },
     [TRANSACTION_ACTION_KIND_BLOCKDEV_SNAPSHOT_SYNC] = {
         .instance_size = sizeof(ExternalSnapshotState),
-- 
1.8.3.1

Re: [Qemu-devel] [PULL 0/4] Block patches for 2.5.0-rc1

[Peter Maydell]

On 18 November 2015 at 16:08, Kevin Wolf <kwolf@redhat.com> wrote:
> The following changes since commit ab9b872ab3147faf3c04e91d525815b9139dd996:
>
>   Merge remote-tracking branch 'remotes/mdroth/tags/qga-pull-2015-11-13-v2-tag' into staging (2015-11-18 12:47:29 +0000)
>
> are available in the git repository at:
>
>
>   git://repo.or.cz/qemu/kevin.git tags/for-upstream
>
> for you to fetch changes up to ca4fa82fe66076284f702adcfe7c319ebbf909ec:
>
>   Merge remote-tracking branch 'mreitz/tags/pull-block-for-kevin-2015-11-18' into queue-block (2015-11-18 16:27:44 +0100)
>
> ----------------------------------------------------------------
>
> Block layer patches
>
> ----------------------------------------------------------------
> Alberto Garcia (1):
>       block: Call external_snapshot_clean after blockdev-snapshot
>
> John Snow (1):
>       iotests: fix race in 030
>
> Kevin Wolf (1):
>       Merge remote-tracking branch 'mreitz/tags/pull-block-for-kevin-2015-11-18' into queue-block
>
> Max Reitz (1):
>       blockdev: Add missing bdrv_unref() in drive-backup
>
> Rabin Vincent (1):
>       nand: fix address overflow

Applied, thanks.

-- PMM