Series comparison

-[PULL 0/2] Block patches
+[PULL 0/1] Block patches
-The following changes since commit 58560ad254fbda71d4daa6622d71683190070ee2:
+The following changes since commit 61c265f0660ee476985808c8aa7915617c44fd53:
-  Merge remote-tracking branch 'remotes/dgibson/tags/ppc-for-4.2-20191024' into staging (2019-10-24 16:22:58 +0100)
+  Merge remote-tracking branch 'remotes/dgilbert/tags/pull-migration-20200313a' into staging (2020-03-13 10:33:04 +0000)
 are available in the Git repository at:
   https://github.com/stefanha/qemu.git tags/block-pull-request
-for you to fetch changes up to d154ef37ff885918fa3e512fd7a8e42870291667:
+for you to fetch changes up to 4ab78b19189a81038e744728ed949d09aa477550:
-  yield_until_fd_readable: make it work with any AioContect (2019-10-25 14:38:29 +0200)
+  block/io: fix bdrv_co_do_copy_on_readv (2020-03-16 11:46:11 +0000)
 ----------------------------------------------------------------
 Pull request
 ----------------------------------------------------------------
-Dietmar Maurer (1):
+Vladimir Sementsov-Ogievskiy (1):
-  yield_until_fd_readable: make it work with any AioContect
+  block/io: fix bdrv_co_do_copy_on_readv
-Julia Suvorova (1):
+ block/io.c | 2 +-
-  virtio-blk: Add blk_drain() to virtio_blk_device_unrealize()
+file changed, 1 insertion(+), 1 deletion(-)
  hw/block/virtio-blk.c    | 1 +
  util/qemu-coroutine-io.c | 7 +++++--
 files changed, 6 insertions(+), 2 deletions(-)
 --
-.21.0
+.24.1

-[PULL 1/2] virtio-blk: Add blk_drain() to virtio_blk_device_unrealize()
+Deleted patch
-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

-[PULL 2/2] yield_until_fd_readable: make it work with any AioContect
+[PULL 1/1] block/io: fix bdrv_co_do_copy_on_readv
-From: Dietmar Maurer <dietmar@proxmox.com>
+From: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
-Simply use qemu_get_current_aio_context().
+Prior to 1143ec5ebf4 it was OK to qemu_iovec_from_buf() from aligned-up
 buffer to original qiov, as qemu_iovec_from_buf() will stop at qiov end
 anyway.
-Signed-off-by: Dietmar Maurer <dietmar@proxmox.com>
+But after 1143ec5ebf4 we assume that bdrv_co_do_copy_on_readv works on
-Message-Id: <20191024045610.9071-1-dietmar@proxmox.com>
+part of original qiov, defined by qiov_offset and bytes. So we must not
 touch qiov behind qiov_offset+bytes bound. Fix it.
 Cc: qemu-stable@nongnu.org # v4.2
 Fixes: 1143ec5ebf4
 Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
 Reviewed-by: John Snow <jsnow@redhat.com>
 Message-id: 20200312081949.5350-1-vsementsov@virtuozzo.com
 Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
 ---
- util/qemu-coroutine-io.c | 7 +++++--
+ block/io.c | 2 +-
-file changed, 5 insertions(+), 2 deletions(-)
+file changed, 1 insertion(+), 1 deletion(-)
-diff --git a/util/qemu-coroutine-io.c b/util/qemu-coroutine-io.c
+diff --git a/block/io.c b/block/io.c
 index XXXXXXX..XXXXXXX 100644
---- a/util/qemu-coroutine-io.c
+--- a/block/io.c
-+++ b/util/qemu-coroutine-io.c
++++ b/block/io.c
-@@ -XXX,XX +XXX,XX @@ qemu_co_send_recv(int sockfd, void *buf, size_t bytes, bool do_send)
+@@ -XXX,XX +XXX,XX @@ static int coroutine_fn bdrv_co_do_copy_on_readv(BdrvChild *child,
- }
+             if (!(flags & BDRV_REQ_PREFETCH)) {
+                 qemu_iovec_from_buf(qiov, qiov_offset + progress,
- typedef struct {
+                                     bounce_buffer + skip_bytes,
-+    AioContext *ctx;
+-                                    pnum - skip_bytes);
-     Coroutine *co;
++                                    MIN(pnum - skip_bytes, bytes - progress));
-     int fd;
+             }
- } FDYieldUntilData;
+         } else if (!(flags & BDRV_REQ_PREFETCH)) {
-@@ -XXX,XX +XXX,XX @@ typedef struct {
+             /* Read directly into the destination */
  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();
  }
 --
-.21.0
+.24.1

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

From: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>

Prior to 1143ec5ebf4 it was OK to qemu_iovec_from_buf() from aligned-up
buffer to original qiov, as qemu_iovec_from_buf() will stop at qiov end
anyway.

But after 1143ec5ebf4 we assume that bdrv_co_do_copy_on_readv works on
part of original qiov, defined by qiov_offset and bytes. So we must not
touch qiov behind qiov_offset+bytes bound. Fix it.

Cc: qemu-stable@nongnu.org # v4.2
Fixes: 1143ec5ebf4
Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Reviewed-by: John Snow <jsnow@redhat.com>
Message-id: 20200312081949.5350-1-vsementsov@virtuozzo.com
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
---
 block/io.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/block/io.c b/block/io.c
index XXXXXXX..XXXXXXX 100644
--- a/block/io.c
+++ b/block/io.c
@@ -XXX,XX +XXX,XX @@ static int coroutine_fn bdrv_co_do_copy_on_readv(BdrvChild *child,
             if (!(flags & BDRV_REQ_PREFETCH)) {
                 qemu_iovec_from_buf(qiov, qiov_offset + progress,
                                     bounce_buffer + skip_bytes,
-                                    pnum - skip_bytes);
+                                    MIN(pnum - skip_bytes, bytes - progress));
             }
         } else if (!(flags & BDRV_REQ_PREFETCH)) {
             /* Read directly into the destination */
-- 
2.24.1