Series comparison

-[Qemu-devel] [PULL 0/1] Block patches
+[Qemu-devel] [0 0/2] Block patches
-The following changes since commit 834eddf22ec762839b724538c7be1d1d3b2d9d3b:
+The following changes since commit 285278ca785f5fa9a570927e1c0958a2ca2b2150:
-  Merge remote-tracking branch 'remotes/stefanha/tags/block-pull-request' into staging (2018-03-13 10:49:02 +0000)
+  Merge remote-tracking branch 'remotes/famz/tags/testing-pull-request' into staging (2018-10-27 19:55:08 +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
+  git://github.com/stefanha/qemu.git tags/block-pull-request
-for you to fetch changes up to 44acd46f60ce6f16d369cd443e77949deca56a2c:
+for you to fetch changes up to bd54b11062c4baa7d2e4efadcf71b8cfd55311fd:
-  block: include original filename when reporting invalid URIs (2018-03-13 08:06:55 -0400)
+  nvdimm: Add docs hint for Linux driver name (2018-10-29 13:35:22 +0000)
 ----------------------------------------------------------------
-Block patch
+Pull request
 No changelog entries necessary, just small tweaks.
 ----------------------------------------------------------------
-Daniel P. Berrangé (1):
+Kees Cook (1):
-  block: include original filename when reporting invalid URIs
+  nvdimm: Add docs hint for Linux driver name
- block/gluster.c  | 2 +-
+Li Qiang (1):
- block/sheepdog.c | 2 +-
+  util: aio-posix: fix a typo
-files changed, 2 insertions(+), 2 deletions(-)
  docs/nvdimm.txt  | 5 +++--
  util/aio-posix.c | 2 +-
 files changed, 4 insertions(+), 3 deletions(-)
 --
-.13.6
+.17.2

-New patch
+[Qemu-devel] [0 1/2] util: aio-posix: fix a typo
+From: Li Qiang <liq3ea@gmail.com>
+Cc: qemu-trivial@nongnu.org
+Signed-off-by: Li Qiang <liq3ea@gmail.com>
+Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
+Reviewed-by: Fam Zheng <famz@redhat.com>
+Message-id: 1538964972-3223-1-git-send-email-liq3ea@gmail.com
+Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
+---
+ util/aio-posix.c | 2 +-
+file changed, 1 insertion(+), 1 deletion(-)
+diff --git a/util/aio-posix.c b/util/aio-posix.c
+index XXXXXXX..XXXXXXX 100644
+--- a/util/aio-posix.c
++++ b/util/aio-posix.c
+@@ -XXX,XX +XXX,XX @@ struct AioHandler
+ #ifdef CONFIG_EPOLL_CREATE1
+-/* The fd number threashold to switch to epoll */
++/* The fd number threshold to switch to epoll */
+ #define EPOLL_ENABLE_THRESHOLD 64
+ static void aio_epoll_disable(AioContext *ctx)
+--
+.17.2

-[Qemu-devel] [PULL 1/1] block: include original filename when reporting invalid URIs
+[Qemu-devel] [0 2/2] nvdimm: Add docs hint for Linux driver name
-From: Daniel P. Berrangé <berrange@redhat.com>
+From: Kees Cook <keescook@chromium.org>
-Consider passing a JSON based block driver to "qemu-img commit"
+I spent way too much time trying to figure out why the emulated NVDIMM
 was missing under Linux. In an effort to help others who might be looking
 for these kinds of things in the future, include a hint.
-$ qemu-img commit 'json:{"driver":"qcow2","file":{"driver":"gluster",\
+Signed-off-by: Kees Cook <keescook@chromium.org>
-                  "volume":"gv0","path":"sn1.qcow2",
+Message-id: 20181018201351.GA25286@beast
-                  "server":[{"type":\
+Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
-          "tcp","host":"10.73.199.197","port":"24007"}]},}'
+---
  docs/nvdimm.txt | 5 +++--
 file changed, 3 insertions(+), 2 deletions(-)
-Currently it will commit the content and then report an incredibly
+diff --git a/docs/nvdimm.txt b/docs/nvdimm.txt
 useless error message when trying to re-open the committed image:
   qemu-img: invalid URI
   Usage: file=gluster[+transport]://[host[:port]]volume/path[?socket=...][,file.debug=N][,file.logfile=/path/filename.log]
 With this fix we get:
   qemu-img: invalid URI json:{"server.0.host": "10.73.199.197",
       "driver": "gluster", "path": "luks.qcow2", "server.0.type":
       "tcp", "server.0.port": "24007", "volume": "gv0"}
 Of course the root cause problem still exists, but now we know
 what actually needs fixing.
 Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
 Reviewed-by: Eric Blake <eblake@redhat.com>
 Message-id: 20180206105204.14817-1-berrange@redhat.com
 Signed-off-by: Jeff Cody <jcody@redhat.com>
 ---
  block/gluster.c  | 2 +-
  block/sheepdog.c | 2 +-
 files changed, 2 insertions(+), 2 deletions(-)
 diff --git a/block/gluster.c b/block/gluster.c
 index XXXXXXX..XXXXXXX 100644
---- a/block/gluster.c
+--- a/docs/nvdimm.txt
-+++ b/block/gluster.c
++++ b/docs/nvdimm.txt
-@@ -XXX,XX +XXX,XX @@ static int qemu_gluster_parse(BlockdevOptionsGluster *gconf,
+@@ -XXX,XX +XXX,XX @@ Multiple vNVDIMM devices can be created if multiple pairs of "-object"
-     if (filename) {
+ and "-device" are provided.
-         ret = qemu_gluster_parse_uri(gconf, filename);
-         if (ret < 0) {
+ For above command line options, if the guest OS has the proper NVDIMM
--            error_setg(errp, "invalid URI");
+-driver, it should be able to detect a NVDIMM device which is in the
-+            error_setg(errp, "invalid URI %s", filename);
+-persistent memory mode and whose size is $NVDIMM_SIZE.
-             error_append_hint(errp, "Usage: file=gluster[+transport]://"
++driver (e.g. "CONFIG_ACPI_NFIT=y" under Linux), it should be able to
-                                     "[host[:port]]volume/path[?socket=...]"
++detect a NVDIMM device which is in the persistent memory mode and whose
-                                     "[,file.debug=N]"
++size is $NVDIMM_SIZE.
-diff --git a/block/sheepdog.c b/block/sheepdog.c
-index XXXXXXX..XXXXXXX 100644
+ Note:
 --- a/block/sheepdog.c
 +++ b/block/sheepdog.c
@@ -XXX,XX +XXX,XX @@ static void sd_parse_uri(SheepdogConfig *cfg, const char *filename,
      cfg->uri = uri = uri_parse(filename);
      if (!uri) {
 -        error_setg(&err, "invalid URI");
 +        error_setg(&err, "invalid URI '%s'", filename);
          goto out;
      }
 --
-.13.6
+.17.2

From: Daniel P. Berrangé <berrange@redhat.com>

Consider passing a JSON based block driver to "qemu-img commit"

$ qemu-img commit 'json:{"driver":"qcow2","file":{"driver":"gluster",\
                  "volume":"gv0","path":"sn1.qcow2",
                  "server":[{"type":\
		  "tcp","host":"10.73.199.197","port":"24007"}]},}'

Currently it will commit the content and then report an incredibly
useless error message when trying to re-open the committed image:

qemu-img: invalid URI
  Usage: file=gluster[+transport]://[host[:port]]volume/path[?socket=...][,file.debug=N][,file.logfile=/path/filename.log]

With this fix we get:

qemu-img: invalid URI json:{"server.0.host": "10.73.199.197",
      "driver": "gluster", "path": "luks.qcow2", "server.0.type":
      "tcp", "server.0.port": "24007", "volume": "gv0"}

Of course the root cause problem still exists, but now we know
what actually needs fixing.

Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Message-id: 20180206105204.14817-1-berrange@redhat.com
Signed-off-by: Jeff Cody <jcody@redhat.com>
---
 block/gluster.c  | 2 +-
 block/sheepdog.c | 2 +-
 2 files changed, 2 insertions(+), 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(BlockdevOptionsGluster *gconf,
     if (filename) {
         ret = qemu_gluster_parse_uri(gconf, filename);
         if (ret < 0) {
-            error_setg(errp, "invalid URI");
+            error_setg(errp, "invalid URI %s", filename);
             error_append_hint(errp, "Usage: file=gluster[+transport]://"
                                     "[host[:port]]volume/path[?socket=...]"
                                     "[,file.debug=N]"
diff --git a/block/sheepdog.c b/block/sheepdog.c
index XXXXXXX..XXXXXXX 100644
--- a/block/sheepdog.c
+++ b/block/sheepdog.c
@@ -XXX,XX +XXX,XX @@ static void sd_parse_uri(SheepdogConfig *cfg, const char *filename,
 
     cfg->uri = uri = uri_parse(filename);
     if (!uri) {
-        error_setg(&err, "invalid URI");
+        error_setg(&err, "invalid URI '%s'", filename);
         goto out;
     }
 
-- 
2.13.6

From: Kees Cook <keescook@chromium.org>

I spent way too much time trying to figure out why the emulated NVDIMM
was missing under Linux. In an effort to help others who might be looking
for these kinds of things in the future, include a hint.

Signed-off-by: Kees Cook <keescook@chromium.org>
Message-id: 20181018201351.GA25286@beast
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
---
 docs/nvdimm.txt | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/docs/nvdimm.txt b/docs/nvdimm.txt
index XXXXXXX..XXXXXXX 100644
--- a/docs/nvdimm.txt
+++ b/docs/nvdimm.txt
@@ -XXX,XX +XXX,XX @@ Multiple vNVDIMM devices can be created if multiple pairs of "-object"
 and "-device" are provided.
 
 For above command line options, if the guest OS has the proper NVDIMM
-driver, it should be able to detect a NVDIMM device which is in the
-persistent memory mode and whose size is $NVDIMM_SIZE.
+driver (e.g. "CONFIG_ACPI_NFIT=y" under Linux), it should be able to
+detect a NVDIMM device which is in the persistent memory mode and whose
+size is $NVDIMM_SIZE.
 
 Note:
 
-- 
2.17.2