Series comparison

 [Qemu-devel] [PULL 0/1] Block patches
-The following changes since commit 64175afc695c0672876fbbfc31b299c86d562cb4:
+The following changes since commit 0b5e750bea635b167eb03d86c3d9a09bbd43bc06:
-  arm_gicv3: Fix ICC_BPR1 reset value when EL3 not implemented (2017-06-07 17:21:44 +0100)
+  Merge remote-tracking branch 'remotes/stefanha/tags/block-pull-request' into staging (2019-02-12 10:53:37 +0000)
-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
+  git://github.com/stefanha/qemu.git tags/block-pull-request
-for you to fetch changes up to 56faeb9bb6872b3f926b3b3e0452a70beea10af2:
+for you to fetch changes up to 42824b4d16da56a50ff4027f6cd22378e0e2666e:
-  block/gluster.c: Handle qdict_array_entries() failure (2017-06-09 08:41:29 -0400)
+  virtio-blk: set correct config size for the host driver (2019-02-13 16:18:17 +0800)
 ----------------------------------------------------------------
-Gluster patch
+Pull request
 Fix a virtio-blk migration regression.
 ----------------------------------------------------------------
-Peter Maydell (1):
+Changpeng Liu (1):
-  block/gluster.c: Handle qdict_array_entries() failure
+  virtio-blk: set correct config size for the host driver
- block/gluster.c | 3 +--
+ hw/block/virtio-blk.c | 13 +++++++++----
-file changed, 1 insertion(+), 2 deletions(-)
+file changed, 9 insertions(+), 4 deletions(-)
 --
-.9.3
+.20.1

-[Qemu-devel] [PULL 1/1] block/gluster.c: Handle qdict_array_entries() failure
+[Qemu-devel] [PULL 1/1] virtio-blk: set correct config size for the host driver
-From: Peter Maydell <peter.maydell@linaro.org>
+From: Changpeng Liu <changpeng.liu@intel.com>
-In qemu_gluster_parse_json(), the call to qdict_array_entries()
+Commit caa1ee43 "vhost-user-blk: add discard/write zeroes features
-could return a negative error code, which we were ignoring
+support" added fields to struct virtio_blk_config. This changes
-because we assigned the result to an unsigned variable.
+the size of the config space and breaks migration from QEMU 3.1
-Fix this by using the 'int' type instead, which matches the
+and older:
 return type of qdict_array_entries() and also the type
 we use for the loop enumeration variable 'i'.
-(Spotted by Coverity, CID 1360960.)
+qemu-system-ppc64: get_pci_config_device: Bad config data: i=0x10 read: 41 device: 1 cmask: ff wmask: 80 w1cmask:0
 qemu-system-ppc64: Failed to load PCIDevice:config
 qemu-system-ppc64: Failed to load virtio-blk:virtio
 qemu-system-ppc64: error while loading state for instance 0x0 of device 'pci@800000020000000:01.0/virtio-blk'
 qemu-system-ppc64: load of migration failed: Invalid argument
-Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
+Since virtio-blk doesn't support the "discard" and "write zeroes"
-Reviewed-by: Eric Blake <eblake@redhat.com>
+features, it shouldn't even expose the associated fields in the
-Reviewed-by: Jeff Cody <jcody@redhat.com>
+config space actually. Just include all fields up to num_queues to
-Message-id: 1496682098-1540-1-git-send-email-peter.maydell@linaro.org
+match QEMU 3.1 and older.
-Signed-off-by: Jeff Cody <jcody@redhat.com>
 Signed-off-by: Changpeng Liu <changpeng.liu@intel.com>
 Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
 Message-id: 1550022537-27565-1-git-send-email-changpeng.liu@intel.com
 Message-Id: <1550022537-27565-1-git-send-email-changpeng.liu@intel.com>
 Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
 ---
- block/gluster.c | 3 +--
+ hw/block/virtio-blk.c | 13 +++++++++----
-file changed, 1 insertion(+), 2 deletions(-)
+file changed, 9 insertions(+), 4 deletions(-)
-diff --git a/block/gluster.c b/block/gluster.c
+diff --git a/hw/block/virtio-blk.c b/hw/block/virtio-blk.c
 index XXXXXXX..XXXXXXX 100644
---- a/block/gluster.c
+--- a/hw/block/virtio-blk.c
-+++ b/block/gluster.c
++++ b/hw/block/virtio-blk.c
-@@ -XXX,XX +XXX,XX @@ static int qemu_gluster_parse_json(BlockdevOptionsGluster *gconf,
+@@ -XXX,XX +XXX,XX @@
-     Error *local_err = NULL;
+ #include "hw/virtio/virtio-bus.h"
-     char *str = NULL;
+ #include "hw/virtio/virtio-access.h"
-     const char *ptr;
--    size_t num_servers;
++/* We don't support discard yet, hide associated config fields. */
--    int i, type;
++#define VIRTIO_BLK_CFG_SIZE offsetof(struct virtio_blk_config, \
-+    int i, type, num_servers;
++                                     max_discard_sectors)
++
-     /* create opts info from runtime_json_opts list */
+ static void virtio_blk_init_request(VirtIOBlock *s, VirtQueue *vq,
-     opts = qemu_opts_create(&runtime_json_opts, NULL, 0, &error_abort);
+                                     VirtIOBlockReq *req)
  {
@@ -XXX,XX +XXX,XX @@ static void virtio_blk_update_config(VirtIODevice *vdev, uint8_t *config)
      blkcfg.alignment_offset = 0;
      blkcfg.wce = blk_enable_write_cache(s->blk);
      virtio_stw_p(vdev, &blkcfg.num_queues, s->conf.num_queues);
 -    memcpy(config, &blkcfg, sizeof(struct virtio_blk_config));
 +    memcpy(config, &blkcfg, VIRTIO_BLK_CFG_SIZE);
 +    QEMU_BUILD_BUG_ON(VIRTIO_BLK_CFG_SIZE > sizeof(blkcfg));
  }
  static void virtio_blk_set_config(VirtIODevice *vdev, const uint8_t *config)
@@ -XXX,XX +XXX,XX @@ static void virtio_blk_set_config(VirtIODevice *vdev, const uint8_t *config)
      VirtIOBlock *s = VIRTIO_BLK(vdev);
      struct virtio_blk_config blkcfg;
 -    memcpy(&blkcfg, config, sizeof(blkcfg));
 +    memcpy(&blkcfg, config, VIRTIO_BLK_CFG_SIZE);
 +    QEMU_BUILD_BUG_ON(VIRTIO_BLK_CFG_SIZE > sizeof(blkcfg));
      aio_context_acquire(blk_get_aio_context(s->blk));
      blk_set_enable_write_cache(s->blk, blkcfg.wce != 0);
@@ -XXX,XX +XXX,XX @@ static void virtio_blk_device_realize(DeviceState *dev, Error **errp)
          return;
      }
 -    virtio_init(vdev, "virtio-blk", VIRTIO_ID_BLOCK,
 -                sizeof(struct virtio_blk_config));
 +    virtio_init(vdev, "virtio-blk", VIRTIO_ID_BLOCK, VIRTIO_BLK_CFG_SIZE);
      s->blk = conf->conf.blk;
      s->rq = NULL;
 --
-.9.3
+.20.1

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: Changpeng Liu <changpeng.liu@intel.com>

Commit caa1ee43 "vhost-user-blk: add discard/write zeroes features
support" added fields to struct virtio_blk_config. This changes
the size of the config space and breaks migration from QEMU 3.1
and older:

qemu-system-ppc64: get_pci_config_device: Bad config data: i=0x10 read: 41 device: 1 cmask: ff wmask: 80 w1cmask:0
qemu-system-ppc64: Failed to load PCIDevice:config
qemu-system-ppc64: Failed to load virtio-blk:virtio
qemu-system-ppc64: error while loading state for instance 0x0 of device 'pci@800000020000000:01.0/virtio-blk'
qemu-system-ppc64: load of migration failed: Invalid argument

Since virtio-blk doesn't support the "discard" and "write zeroes"
features, it shouldn't even expose the associated fields in the
config space actually. Just include all fields up to num_queues to
match QEMU 3.1 and older.

Signed-off-by: Changpeng Liu <changpeng.liu@intel.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Message-id: 1550022537-27565-1-git-send-email-changpeng.liu@intel.com
Message-Id: <1550022537-27565-1-git-send-email-changpeng.liu@intel.com>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
---
 hw/block/virtio-blk.c | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

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 @@
 #include "hw/virtio/virtio-bus.h"
 #include "hw/virtio/virtio-access.h"
 
+/* We don't support discard yet, hide associated config fields. */
+#define VIRTIO_BLK_CFG_SIZE offsetof(struct virtio_blk_config, \
+                                     max_discard_sectors)
+
 static void virtio_blk_init_request(VirtIOBlock *s, VirtQueue *vq,
                                     VirtIOBlockReq *req)
 {
@@ -XXX,XX +XXX,XX @@ static void virtio_blk_update_config(VirtIODevice *vdev, uint8_t *config)
     blkcfg.alignment_offset = 0;
     blkcfg.wce = blk_enable_write_cache(s->blk);
     virtio_stw_p(vdev, &blkcfg.num_queues, s->conf.num_queues);
-    memcpy(config, &blkcfg, sizeof(struct virtio_blk_config));
+    memcpy(config, &blkcfg, VIRTIO_BLK_CFG_SIZE);
+    QEMU_BUILD_BUG_ON(VIRTIO_BLK_CFG_SIZE > sizeof(blkcfg));
 }
 
 static void virtio_blk_set_config(VirtIODevice *vdev, const uint8_t *config)
@@ -XXX,XX +XXX,XX @@ static void virtio_blk_set_config(VirtIODevice *vdev, const uint8_t *config)
     VirtIOBlock *s = VIRTIO_BLK(vdev);
     struct virtio_blk_config blkcfg;
 
-    memcpy(&blkcfg, config, sizeof(blkcfg));
+    memcpy(&blkcfg, config, VIRTIO_BLK_CFG_SIZE);
+    QEMU_BUILD_BUG_ON(VIRTIO_BLK_CFG_SIZE > sizeof(blkcfg));
 
     aio_context_acquire(blk_get_aio_context(s->blk));
     blk_set_enable_write_cache(s->blk, blkcfg.wce != 0);
@@ -XXX,XX +XXX,XX @@ static void virtio_blk_device_realize(DeviceState *dev, Error **errp)
         return;
     }
 
-    virtio_init(vdev, "virtio-blk", VIRTIO_ID_BLOCK,
-                sizeof(struct virtio_blk_config));
+    virtio_init(vdev, "virtio-blk", VIRTIO_ID_BLOCK, VIRTIO_BLK_CFG_SIZE);
 
     s->blk = conf->conf.blk;
     s->rq = NULL;
-- 
2.20.1