Series comparison

-[Qemu-devel] [PULL 0/1] Block patches
+[PULL 0/2] Block patches
-The following changes since commit 64175afc695c0672876fbbfc31b299c86d562cb4:
+The following changes since commit 58560ad254fbda71d4daa6622d71683190070ee2:
-  arm_gicv3: Fix ICC_BPR1 reset value when EL3 not implemented (2017-06-07 17:21:44 +0100)
+  Merge remote-tracking branch 'remotes/dgibson/tags/ppc-for-4.2-20191024' into staging (2019-10-24 16:22:58 +0100)
-are available in the git repository at:
+are available in the Git repository at:
-  git://github.com/codyprime/qemu-kvm-jtc.git tags/block-pull-request
+  https://github.com/stefanha/qemu.git tags/block-pull-request
-for you to fetch changes up to 56faeb9bb6872b3f926b3b3e0452a70beea10af2:
+for you to fetch changes up to d154ef37ff885918fa3e512fd7a8e42870291667:
-  block/gluster.c: Handle qdict_array_entries() failure (2017-06-09 08:41:29 -0400)
+  yield_until_fd_readable: make it work with any AioContect (2019-10-25 14:38:29 +0200)
 ----------------------------------------------------------------
-Gluster patch
+Pull request
 ----------------------------------------------------------------
-Peter Maydell (1):
+Dietmar Maurer (1):
-  block/gluster.c: Handle qdict_array_entries() failure
+  yield_until_fd_readable: make it work with any AioContect
- block/gluster.c | 3 +--
+Julia Suvorova (1):
-file changed, 1 insertion(+), 2 deletions(-)
+  virtio-blk: Add blk_drain() to virtio_blk_device_unrealize()
  hw/block/virtio-blk.c    | 1 +
  util/qemu-coroutine-io.c | 7 +++++--
 files changed, 6 insertions(+), 2 deletions(-)
 --
-.9.3
+.21.0

-New patch
+[PULL 1/2] virtio-blk: Add blk_drain() to virtio_blk_device_unrealize()
+From: Julia Suvorova <jusual@redhat.com>
+QEMU does not wait for completed I/O requests, assuming that the guest
+driver will reset the device before calling unrealize(). This does not
+happen on Windows, and QEMU crashes in virtio_notify(), getting the
+result of a completed I/O request on hot-unplugged device.
+Signed-off-by: Julia Suvorova <jusual@redhat.com>
+Message-Id: <20191018142856.31870-1-jusual@redhat.com>
+Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
+---
+ hw/block/virtio-blk.c | 1 +
+file changed, 1 insertion(+)
+diff --git a/hw/block/virtio-blk.c b/hw/block/virtio-blk.c
+index XXXXXXX..XXXXXXX 100644
+--- a/hw/block/virtio-blk.c
++++ b/hw/block/virtio-blk.c
+@@ -XXX,XX +XXX,XX @@ static void virtio_blk_device_unrealize(DeviceState *dev, Error **errp)
+     VirtIODevice *vdev = VIRTIO_DEVICE(dev);
+     VirtIOBlock *s = VIRTIO_BLK(dev);
++    blk_drain(s->blk);
+     virtio_blk_data_plane_destroy(s->dataplane);
+     s->dataplane = NULL;
+     qemu_del_vm_change_state_handler(s->change);
+--
+.21.0

-[Qemu-devel] [PULL 1/1] block/gluster.c: Handle qdict_array_entries() failure
+[PULL 2/2] yield_until_fd_readable: make it work with any AioContect
-From: Peter Maydell <peter.maydell@linaro.org>
+From: Dietmar Maurer <dietmar@proxmox.com>
-In qemu_gluster_parse_json(), the call to qdict_array_entries()
+Simply use qemu_get_current_aio_context().
 could return a negative error code, which we were ignoring
 because we assigned the result to an unsigned variable.
 Fix this by using the 'int' type instead, which matches the
 return type of qdict_array_entries() and also the type
 we use for the loop enumeration variable 'i'.
-(Spotted by Coverity, CID 1360960.)
+Signed-off-by: Dietmar Maurer <dietmar@proxmox.com>
 Message-Id: <20191024045610.9071-1-dietmar@proxmox.com>
 Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
 ---
  util/qemu-coroutine-io.c | 7 +++++--
 file changed, 5 insertions(+), 2 deletions(-)
-Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
+diff --git a/util/qemu-coroutine-io.c b/util/qemu-coroutine-io.c
 Reviewed-by: Eric Blake <eblake@redhat.com>
 Reviewed-by: Jeff Cody <jcody@redhat.com>
 Message-id: 1496682098-1540-1-git-send-email-peter.maydell@linaro.org
 Signed-off-by: Jeff Cody <jcody@redhat.com>
 ---
  block/gluster.c | 3 +--
 file changed, 1 insertion(+), 2 deletions(-)
 diff --git a/block/gluster.c b/block/gluster.c
 index XXXXXXX..XXXXXXX 100644
---- a/block/gluster.c
+--- a/util/qemu-coroutine-io.c
-+++ b/block/gluster.c
++++ b/util/qemu-coroutine-io.c
-@@ -XXX,XX +XXX,XX @@ static int qemu_gluster_parse_json(BlockdevOptionsGluster *gconf,
+@@ -XXX,XX +XXX,XX @@ qemu_co_send_recv(int sockfd, void *buf, size_t bytes, bool do_send)
-     Error *local_err = NULL;
+ }
-     char *str = NULL;
-     const char *ptr;
+ typedef struct {
--    size_t num_servers;
++    AioContext *ctx;
--    int i, type;
+     Coroutine *co;
-+    int i, type, num_servers;
+     int fd;
+ } FDYieldUntilData;
-     /* create opts info from runtime_json_opts list */
+@@ -XXX,XX +XXX,XX @@ typedef struct {
-     opts = qemu_opts_create(&runtime_json_opts, NULL, 0, &error_abort);
+ static void fd_coroutine_enter(void *opaque)
  {
      FDYieldUntilData *data = opaque;
 -    qemu_set_fd_handler(data->fd, NULL, NULL, NULL);
 +    aio_set_fd_handler(data->ctx, data->fd, false, NULL, NULL, NULL, NULL);
      qemu_coroutine_enter(data->co);
  }
@@ -XXX,XX +XXX,XX @@ void coroutine_fn yield_until_fd_readable(int fd)
      FDYieldUntilData data;
      assert(qemu_in_coroutine());
 +    data.ctx = qemu_get_current_aio_context();
      data.co = qemu_coroutine_self();
      data.fd = fd;
 -    qemu_set_fd_handler(fd, fd_coroutine_enter, NULL, &data);
 +    aio_set_fd_handler(
 +        data.ctx, fd, false, fd_coroutine_enter, NULL, NULL, &data);
      qemu_coroutine_yield();
  }
 --
-.9.3
+.21.0

From: Peter Maydell <peter.maydell@linaro.org>

In qemu_gluster_parse_json(), the call to qdict_array_entries()
could return a negative error code, which we were ignoring
because we assigned the result to an unsigned variable.
Fix this by using the 'int' type instead, which matches the
return type of qdict_array_entries() and also the type
we use for the loop enumeration variable 'i'.

(Spotted by Coverity, CID 1360960.)

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Jeff Cody <jcody@redhat.com>
Message-id: 1496682098-1540-1-git-send-email-peter.maydell@linaro.org
Signed-off-by: Jeff Cody <jcody@redhat.com>
---
 block/gluster.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/block/gluster.c b/block/gluster.c
index XXXXXXX..XXXXXXX 100644
--- a/block/gluster.c
+++ b/block/gluster.c
@@ -XXX,XX +XXX,XX @@ static int qemu_gluster_parse_json(BlockdevOptionsGluster *gconf,
     Error *local_err = NULL;
     char *str = NULL;
     const char *ptr;
-    size_t num_servers;
-    int i, type;
+    int i, type, num_servers;
 
     /* create opts info from runtime_json_opts list */
     opts = qemu_opts_create(&runtime_json_opts, NULL, 0, &error_abort);
-- 
2.9.3

From: Julia Suvorova <jusual@redhat.com>

QEMU does not wait for completed I/O requests, assuming that the guest
driver will reset the device before calling unrealize(). This does not
happen on Windows, and QEMU crashes in virtio_notify(), getting the
result of a completed I/O request on hot-unplugged device.

Signed-off-by: Julia Suvorova <jusual@redhat.com>
Message-Id: <20191018142856.31870-1-jusual@redhat.com>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
---
 hw/block/virtio-blk.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/hw/block/virtio-blk.c b/hw/block/virtio-blk.c
index XXXXXXX..XXXXXXX 100644
--- a/hw/block/virtio-blk.c
+++ b/hw/block/virtio-blk.c
@@ -XXX,XX +XXX,XX @@ static void virtio_blk_device_unrealize(DeviceState *dev, Error **errp)
     VirtIODevice *vdev = VIRTIO_DEVICE(dev);
     VirtIOBlock *s = VIRTIO_BLK(dev);
 
+    blk_drain(s->blk);
     virtio_blk_data_plane_destroy(s->dataplane);
     s->dataplane = NULL;
     qemu_del_vm_change_state_handler(s->change);
-- 
2.21.0

From: Dietmar Maurer <dietmar@proxmox.com>

Simply use qemu_get_current_aio_context().

Signed-off-by: Dietmar Maurer <dietmar@proxmox.com>
Message-Id: <20191024045610.9071-1-dietmar@proxmox.com>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
---
 util/qemu-coroutine-io.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/util/qemu-coroutine-io.c b/util/qemu-coroutine-io.c
index XXXXXXX..XXXXXXX 100644
--- a/util/qemu-coroutine-io.c
+++ b/util/qemu-coroutine-io.c
@@ -XXX,XX +XXX,XX @@ qemu_co_send_recv(int sockfd, void *buf, size_t bytes, bool do_send)
 }
 
 typedef struct {
+    AioContext *ctx;
     Coroutine *co;
     int fd;
 } FDYieldUntilData;
@@ -XXX,XX +XXX,XX @@ typedef struct {
 static void fd_coroutine_enter(void *opaque)
 {
     FDYieldUntilData *data = opaque;
-    qemu_set_fd_handler(data->fd, NULL, NULL, NULL);
+    aio_set_fd_handler(data->ctx, data->fd, false, NULL, NULL, NULL, NULL);
     qemu_coroutine_enter(data->co);
 }
 
@@ -XXX,XX +XXX,XX @@ void coroutine_fn yield_until_fd_readable(int fd)
     FDYieldUntilData data;
 
     assert(qemu_in_coroutine());
+    data.ctx = qemu_get_current_aio_context();
     data.co = qemu_coroutine_self();
     data.fd = fd;
-    qemu_set_fd_handler(fd, fd_coroutine_enter, NULL, &data);
+    aio_set_fd_handler(
+        data.ctx, fd, false, fd_coroutine_enter, NULL, NULL, &data);
     qemu_coroutine_yield();
 }
-- 
2.21.0