Series comparison

-[Qemu-devel] [PULL for-2.9 0/1] Block patches
+[Qemu-devel] [PULL 0/1] Block patches
-The following changes since commit d84f714eafedd8bb9d4aaec8b76417bef8e3535e:
+The following changes since commit 64175afc695c0672876fbbfc31b299c86d562cb4:
-  Update version for v2.9.0-rc0 release (2017-03-14 19:18:23 +0000)
+  arm_gicv3: Fix ICC_BPR1 reset value when EL3 not implemented (2017-06-07 17:21:44 +0100)
 are available in the git repository at:
-  git://github.com/stefanha/qemu.git tags/block-pull-request
+  git://github.com/codyprime/qemu-kvm-jtc.git tags/block-pull-request
-for you to fetch changes up to 9dc44aa5829eb3131a01378a738dee28a382bbc1:
+for you to fetch changes up to 56faeb9bb6872b3f926b3b3e0452a70beea10af2:
-  os: don't corrupt pre-existing memory-backend data with prealloc (2017-03-15 11:55:41 +0800)
+  block/gluster.c: Handle qdict_array_entries() failure (2017-06-09 08:41:29 -0400)
 ----------------------------------------------------------------
+Gluster patch
 ----------------------------------------------------------------
-Daniel P. Berrange (1):
+Peter Maydell (1):
-  os: don't corrupt pre-existing memory-backend data with prealloc
+  block/gluster.c: Handle qdict_array_entries() failure
- util/oslib-posix.c | 14 +++++++++++++-
+ block/gluster.c | 3 +--
-file changed, 13 insertions(+), 1 deletion(-)
+file changed, 1 insertion(+), 2 deletions(-)
 --
 .9.3

-[Qemu-devel] [PULL for-2.9 1/1] os: don't corrupt pre-existing memory-backend data with prealloc
+[Qemu-devel] [PULL 1/1] block/gluster.c: Handle qdict_array_entries() failure
-From: "Daniel P. Berrange" <berrange@redhat.com>
+From: Peter Maydell <peter.maydell@linaro.org>
-When using a memory-backend object with prealloc turned on, QEMU
+In qemu_gluster_parse_json(), the call to qdict_array_entries()
-will memset() the first byte in every memory page to zero. While
+could return a negative error code, which we were ignoring
-this might have been acceptable for memory backends associated
+because we assigned the result to an unsigned variable.
-with RAM, this corrupts application data for NVDIMMs.
+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'.
-Instead of setting every page to zero, read the current byte
+(Spotted by Coverity, CID 1360960.)
 value and then just write that same value back, so we are not
 corrupting the original data. Directly write the value instead
 of memset()ing it, since there's no benefit to memset for a
 single byte write.
-Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
+Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
-Reviewed-by: Andrea Arcangeli <aarcange@redhat.com>
+Reviewed-by: Eric Blake <eblake@redhat.com>
-Message-id: 20170303113255.28262-1-berrange@redhat.com
+Reviewed-by: Jeff Cody <jcody@redhat.com>
-Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
+Message-id: 1496682098-1540-1-git-send-email-peter.maydell@linaro.org
 Signed-off-by: Jeff Cody <jcody@redhat.com>
 ---
- util/oslib-posix.c | 14 +++++++++++++-
+ block/gluster.c | 3 +--
-file changed, 13 insertions(+), 1 deletion(-)
+file changed, 1 insertion(+), 2 deletions(-)
-diff --git a/util/oslib-posix.c b/util/oslib-posix.c
+diff --git a/block/gluster.c b/block/gluster.c
 index XXXXXXX..XXXXXXX 100644
---- a/util/oslib-posix.c
+--- a/block/gluster.c
-+++ b/util/oslib-posix.c
++++ b/block/gluster.c
-@@ -XXX,XX +XXX,XX @@ static void *do_touch_pages(void *arg)
+@@ -XXX,XX +XXX,XX @@ static int qemu_gluster_parse_json(BlockdevOptionsGluster *gconf,
-         memset_thread_failed = true;
+     Error *local_err = NULL;
-     } else {
+     char *str = NULL;
-         for (i = 0; i < numpages; i++) {
+     const char *ptr;
--            memset(addr, 0, 1);
+-    size_t num_servers;
-+            /*
+-    int i, type;
-+             * Read & write back the same value, so we don't
++    int i, type, num_servers;
-+             * corrupt existing user/app data that might be
-+             * stored.
+     /* create opts info from runtime_json_opts list */
-+             *
+     opts = qemu_opts_create(&runtime_json_opts, NULL, 0, &error_abort);
 +             * 'volatile' to stop compiler optimizing this away
 +             * to a no-op
 +             *
 +             * TODO: get a better solution from kernel so we
 +             * don't need to write at all so we don't cause
 +             * wear on the storage backing the region...
 +             */
 +            *(volatile char *)addr = *addr;
              addr += hpagesize;
          }
      }
 --
 .9.3

From: "Daniel P. Berrange" <berrange@redhat.com>

When using a memory-backend object with prealloc turned on, QEMU
will memset() the first byte in every memory page to zero. While
this might have been acceptable for memory backends associated
with RAM, this corrupts application data for NVDIMMs.

Instead of setting every page to zero, read the current byte
value and then just write that same value back, so we are not
corrupting the original data. Directly write the value instead
of memset()ing it, since there's no benefit to memset for a
single byte write.

Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
Reviewed-by: Andrea Arcangeli <aarcange@redhat.com>
Message-id: 20170303113255.28262-1-berrange@redhat.com
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
---
 util/oslib-posix.c | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/util/oslib-posix.c b/util/oslib-posix.c
index XXXXXXX..XXXXXXX 100644
--- a/util/oslib-posix.c
+++ b/util/oslib-posix.c
@@ -XXX,XX +XXX,XX @@ static void *do_touch_pages(void *arg)
         memset_thread_failed = true;
     } else {
         for (i = 0; i < numpages; i++) {
-            memset(addr, 0, 1);
+            /*
+             * Read & write back the same value, so we don't
+             * corrupt existing user/app data that might be
+             * stored.
+             *
+             * 'volatile' to stop compiler optimizing this away
+             * to a no-op
+             *
+             * TODO: get a better solution from kernel so we
+             * don't need to write at all so we don't cause
+             * wear on the storage backing the region...
+             */
+            *(volatile char *)addr = *addr;
             addr += hpagesize;
         }
     }
-- 
2.9.3

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