Series comparison

-[Qemu-devel] [PULL 0/2] Block patches
+[PULL for-7.1 0/1] Block patches
-The following changes since commit 285278ca785f5fa9a570927e1c0958a2ca2b2150:
+The following changes since commit 2480f3bbd03814b0651a1f74959f5c6631ee5819:
-  Merge remote-tracking branch 'remotes/famz/tags/testing-pull-request' into staging (2018-10-27 19:55:08 +0100)
+  Merge tag 'linux-user-for-7.1-pull-request' of https://gitlab.com/laurent_vivier/qemu into staging (2022-08-03 08:32:44 -0700)
 are available in the Git repository at:
-  git://github.com/stefanha/qemu.git tags/block-pull-request
+  https://gitlab.com/stefanha/qemu.git tags/block-pull-request
-for you to fetch changes up to bd54b11062c4baa7d2e4efadcf71b8cfd55311fd:
+for you to fetch changes up to 7b0ca313647532a2c7007379ff800c9a2415c95d:
-  nvdimm: Add docs hint for Linux driver name (2018-10-29 13:35:22 +0000)
+  virtiofsd: Fix format strings (2022-08-04 14:44:25 -0400)
 ----------------------------------------------------------------
 Pull request
-No changelog-worthy entries, just small tweaks.
+- Format string portability fix in virtiofsd
 ----------------------------------------------------------------
-Kees Cook (1):
+Stefan Weil (1):
-  nvdimm: Add docs hint for Linux driver name
+  virtiofsd: Fix format strings
-Li Qiang (1):
+ tools/virtiofsd/fuse_lowlevel.c | 4 ++--
-  util: aio-posix: fix a typo
+file changed, 2 insertions(+), 2 deletions(-)
  docs/nvdimm.txt  | 5 +++--
  util/aio-posix.c | 2 +-
 files changed, 4 insertions(+), 3 deletions(-)
 --
-.17.2
+.37.1

-[Qemu-devel] [PULL 1/2] util: aio-posix: fix a typo
+Deleted patch
-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 2/2] nvdimm: Add docs hint for Linux driver name
+[PULL for-7.1 1/1] virtiofsd: Fix format strings
-From: Kees Cook <keescook@chromium.org>
+From: Stefan Weil <sw@weilnetz.de>
-I spent way too much time trying to figure out why the emulated NVDIMM
+Signed-off-by: Stefan Weil <sw@weilnetz.de>
-was missing under Linux. In an effort to help others who might be looking
+Message-Id: <20220804074833.892604-1-sw@weilnetz.de>
 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 +++--
+ tools/virtiofsd/fuse_lowlevel.c | 4 ++--
-file changed, 3 insertions(+), 2 deletions(-)
+file changed, 2 insertions(+), 2 deletions(-)
-diff --git a/docs/nvdimm.txt b/docs/nvdimm.txt
+diff --git a/tools/virtiofsd/fuse_lowlevel.c b/tools/virtiofsd/fuse_lowlevel.c
 index XXXXXXX..XXXXXXX 100644
---- a/docs/nvdimm.txt
+--- a/tools/virtiofsd/fuse_lowlevel.c
-+++ b/docs/nvdimm.txt
++++ b/tools/virtiofsd/fuse_lowlevel.c
-@@ -XXX,XX +XXX,XX @@ Multiple vNVDIMM devices can be created if multiple pairs of "-object"
+@@ -XXX,XX +XXX,XX @@ static void do_init(fuse_req_t req, fuse_ino_t nodeid,
- and "-device" are provided.
+     fuse_log(FUSE_LOG_DEBUG, "INIT: %u.%u\n", arg->major, arg->minor);
- For above command line options, if the guest OS has the proper NVDIMM
+     if (arg->major == 7 && arg->minor >= 6) {
--driver, it should be able to detect a NVDIMM device which is in the
+-        fuse_log(FUSE_LOG_DEBUG, "flags=0x%016llx\n", flags);
--persistent memory mode and whose size is $NVDIMM_SIZE.
++        fuse_log(FUSE_LOG_DEBUG, "flags=0x%016" PRIx64 "\n", flags);
-+driver (e.g. "CONFIG_ACPI_NFIT=y" under Linux), it should be able to
+         fuse_log(FUSE_LOG_DEBUG, "max_readahead=0x%08x\n", arg->max_readahead);
-+detect a NVDIMM device which is in the persistent memory mode and whose
+     }
-+size is $NVDIMM_SIZE.
+     se->conn.proto_major = arg->major;
+@@ -XXX,XX +XXX,XX @@ static void do_init(fuse_req_t req, fuse_ino_t nodeid,
- Note:
+     if (se->conn.want & (~se->conn.capable)) {
+         fuse_log(FUSE_LOG_ERR,
                   "fuse: error: filesystem requested capabilities "
 -                 "0x%llx that are not supported by kernel, aborting.\n",
 +                 "0x%" PRIx64 " that are not supported by kernel, aborting.\n",
                   se->conn.want & (~se->conn.capable));
          fuse_reply_err(req, EPROTO);
          se->error = -EPROTO;
 --
-.17.2
+.37.1

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

From: Stefan Weil <sw@weilnetz.de>

Signed-off-by: Stefan Weil <sw@weilnetz.de>
Message-Id: <20220804074833.892604-1-sw@weilnetz.de>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
---
 tools/virtiofsd/fuse_lowlevel.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tools/virtiofsd/fuse_lowlevel.c b/tools/virtiofsd/fuse_lowlevel.c
index XXXXXXX..XXXXXXX 100644
--- a/tools/virtiofsd/fuse_lowlevel.c
+++ b/tools/virtiofsd/fuse_lowlevel.c
@@ -XXX,XX +XXX,XX @@ static void do_init(fuse_req_t req, fuse_ino_t nodeid,
 
     fuse_log(FUSE_LOG_DEBUG, "INIT: %u.%u\n", arg->major, arg->minor);
     if (arg->major == 7 && arg->minor >= 6) {
-        fuse_log(FUSE_LOG_DEBUG, "flags=0x%016llx\n", flags);
+        fuse_log(FUSE_LOG_DEBUG, "flags=0x%016" PRIx64 "\n", flags);
         fuse_log(FUSE_LOG_DEBUG, "max_readahead=0x%08x\n", arg->max_readahead);
     }
     se->conn.proto_major = arg->major;
@@ -XXX,XX +XXX,XX @@ static void do_init(fuse_req_t req, fuse_ino_t nodeid,
     if (se->conn.want & (~se->conn.capable)) {
         fuse_log(FUSE_LOG_ERR,
                  "fuse: error: filesystem requested capabilities "
-                 "0x%llx that are not supported by kernel, aborting.\n",
+                 "0x%" PRIx64 " that are not supported by kernel, aborting.\n",
                  se->conn.want & (~se->conn.capable));
         fuse_reply_err(req, EPROTO);
         se->error = -EPROTO;
-- 
2.37.1