Series comparison

-[Qemu-devel] [PULL 0/1] Block patches
+[Qemu-devel] [PULL for-3.0 0/1] Block patches
-The following changes since commit 063833a6ec2a6747e27c5f9866bb44c7e8de1265:
+The following changes since commit 768cef2974fb1fa30dd188b043ea737e13fea477:
-  Merge remote-tracking branch 'remotes/mcayland/tags/qemu-sparc-signed' into staging (2017-10-19 18:42:51 +0100)
+  Merge remote-tracking branch 'remotes/ehabkost/tags/x86-next-pull-request' into staging (2018-07-24 10:37:52 +0100)
-are available in the git repository at:
+are available in the Git repository at:
   git://github.com/stefanha/qemu.git tags/block-pull-request
-for you to fetch changes up to e947d47da0b16e80d237c510e9d2e80799578c7f:
+for you to fetch changes up to 042b757cc77c9580b99ef2781cfb0a2d1bf495a6:
-  oslib-posix: Fix compiler warning and some data types (2017-10-20 11:16:27 +0200)
+  block/file-posix: add bdrv_attach_aio_context callback for host dev and cdrom (2018-07-24 14:27:41 +0100)
 ----------------------------------------------------------------
 Pull request
 Regression fix for host block devices with the file-posix driver when aio=native is in use.
 ----------------------------------------------------------------
-----------------------------------------------------------------
+Nishanth Aravamudan (1):
   block/file-posix: add bdrv_attach_aio_context callback for host dev
     and cdrom
-Stefan Weil (1):
+ block/file-posix.c | 3 +++
-  oslib-posix: Fix compiler warning and some data types
+file changed, 3 insertions(+)
  util/oslib-posix.c | 15 ++++++++-------
 file changed, 8 insertions(+), 7 deletions(-)
 --
-.13.6
+.17.1

-[Qemu-devel] [PULL 1/1] oslib-posix: Fix compiler warning and some data types
+[Qemu-devel] [PULL for-3.0 1/1] block/file-posix: add bdrv_attach_aio_context callback for host dev and cdrom
-From: Stefan Weil <sw@weilnetz.de>
+From: Nishanth Aravamudan <naravamudan@digitalocean.com>
-gcc warning:
+In ed6e2161 ("linux-aio: properly bubble up errors from initialzation"),
 I only added a bdrv_attach_aio_context callback for the bdrv_file
 driver. There are several other drivers that use the shared
 aio_plug callback, though, and they will trip the assertion added to
 aio_get_linux_aio because they did not call aio_setup_linux_aio first.
 Add the appropriate callback definition to the affected driver
 definitions.
-/qemu/util/oslib-posix.c:304:11: error:
+Fixes: ed6e2161 ("linux-aio: properly bubble up errors from initialization")
- variable ‘addr’ might be clobbered by ‘longjmp’ or ‘vfork’
+Reported-by: Farhan Ali <alifm@linux.ibm.com>
- [-Werror=clobbered]
+Signed-off-by: Nishanth Aravamudan <naravamudan@digitalocean.com>
+Reviewed-by: John Snow <jsnow@redhat.com>
-Fix also some related data types:
+Message-id: 20180718211256.29774-1-naravamudan@digitalocean.com
+Cc: Eric Blake <eblake@redhat.com>
-numpages, hpagesize are used as pointer offset.
+Cc: Kevin Wolf <kwolf@redhat.com>
-Always use size_t for them and also for the derived
+Cc: John Snow <jsnow@redhat.com>
-numpages_per_thread and size_per_thread.
+Cc: Max Reitz <mreitz@redhat.com>
+Cc: Stefan Hajnoczi <stefanha@redhat.com>
-Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
+Cc: Fam Zheng <famz@redhat.com>
-Signed-off-by: Stefan Weil <sw@weilnetz.de>
+Cc: Paolo Bonzini <pbonzini@redhat.com>
-Message-id: 20171016202912.1117-1-sw@weilnetz.de
+Cc: qemu-block@nongnu.org
 Cc: qemu-devel@nongnu.org
 Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
 ---
- util/oslib-posix.c | 15 ++++++++-------
+ block/file-posix.c | 3 +++
-file changed, 8 insertions(+), 7 deletions(-)
+file changed, 3 insertions(+)
-diff --git a/util/oslib-posix.c b/util/oslib-posix.c
+diff --git a/block/file-posix.c b/block/file-posix.c
 index XXXXXXX..XXXXXXX 100644
---- a/util/oslib-posix.c
+--- a/block/file-posix.c
-+++ b/util/oslib-posix.c
++++ b/block/file-posix.c
-@@ -XXX,XX +XXX,XX @@
+@@ -XXX,XX +XXX,XX @@ static BlockDriver bdrv_host_device = {
+     .bdrv_refresh_limits = raw_refresh_limits,
- struct MemsetThread {
+     .bdrv_io_plug = raw_aio_plug,
-     char *addr;
+     .bdrv_io_unplug = raw_aio_unplug,
--    uint64_t numpages;
++    .bdrv_attach_aio_context = raw_aio_attach_aio_context,
--    uint64_t hpagesize;
-+    size_t numpages;
+     .bdrv_co_truncate       = raw_co_truncate,
-+    size_t hpagesize;
+     .bdrv_getlength    = raw_getlength,
-     QemuThread pgthread;
+@@ -XXX,XX +XXX,XX @@ static BlockDriver bdrv_host_cdrom = {
-     sigjmp_buf env;
+     .bdrv_refresh_limits = raw_refresh_limits,
- };
+     .bdrv_io_plug = raw_aio_plug,
-@@ -XXX,XX +XXX,XX @@ static void sigbus_handler(int signal)
+     .bdrv_io_unplug = raw_aio_unplug,
- static void *do_touch_pages(void *arg)
++    .bdrv_attach_aio_context = raw_aio_attach_aio_context,
- {
-     MemsetThread *memset_args = (MemsetThread *)arg;
+     .bdrv_co_truncate    = raw_co_truncate,
--    char *addr = memset_args->addr;
+     .bdrv_getlength      = raw_getlength,
--    uint64_t numpages = memset_args->numpages;
+@@ -XXX,XX +XXX,XX @@ static BlockDriver bdrv_host_cdrom = {
--    uint64_t hpagesize = memset_args->hpagesize;
+     .bdrv_refresh_limits = raw_refresh_limits,
-     sigset_t set, oldset;
+     .bdrv_io_plug = raw_aio_plug,
--    int i = 0;
+     .bdrv_io_unplug = raw_aio_unplug,
++    .bdrv_attach_aio_context = raw_aio_attach_aio_context,
-     /* unblock SIGBUS */
-     sigemptyset(&set);
+     .bdrv_co_truncate    = raw_co_truncate,
-@@ -XXX,XX +XXX,XX @@ static void *do_touch_pages(void *arg)
+     .bdrv_getlength      = raw_getlength,
      if (sigsetjmp(memset_args->env, 1)) {
          memset_thread_failed = true;
      } else {
 +        char *addr = memset_args->addr;
 +        size_t numpages = memset_args->numpages;
 +        size_t hpagesize = memset_args->hpagesize;
 +        size_t i;
          for (i = 0; i < numpages; i++) {
              /*
               * Read & write back the same value, so we don't
@@ -XXX,XX +XXX,XX @@ static inline int get_memset_num_threads(int smp_cpus)
  static bool touch_all_pages(char *area, size_t hpagesize, size_t numpages,
                              int smp_cpus)
  {
 -    uint64_t numpages_per_thread, size_per_thread;
 +    size_t numpages_per_thread;
 +    size_t size_per_thread;
      char *addr = area;
      int i = 0;
 --
-.13.6
+.17.1

From: Stefan Weil <sw@weilnetz.de>

gcc warning:

/qemu/util/oslib-posix.c:304:11: error:
 variable ‘addr’ might be clobbered by ‘longjmp’ or ‘vfork’
 [-Werror=clobbered]

Fix also some related data types:

numpages, hpagesize are used as pointer offset.
Always use size_t for them and also for the derived
numpages_per_thread and size_per_thread.

Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Signed-off-by: Stefan Weil <sw@weilnetz.de>
Message-id: 20171016202912.1117-1-sw@weilnetz.de
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
---
 util/oslib-posix.c | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

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 @@
 
 struct MemsetThread {
     char *addr;
-    uint64_t numpages;
-    uint64_t hpagesize;
+    size_t numpages;
+    size_t hpagesize;
     QemuThread pgthread;
     sigjmp_buf env;
 };
@@ -XXX,XX +XXX,XX @@ static void sigbus_handler(int signal)
 static void *do_touch_pages(void *arg)
 {
     MemsetThread *memset_args = (MemsetThread *)arg;
-    char *addr = memset_args->addr;
-    uint64_t numpages = memset_args->numpages;
-    uint64_t hpagesize = memset_args->hpagesize;
     sigset_t set, oldset;
-    int i = 0;
 
     /* unblock SIGBUS */
     sigemptyset(&set);
@@ -XXX,XX +XXX,XX @@ static void *do_touch_pages(void *arg)
     if (sigsetjmp(memset_args->env, 1)) {
         memset_thread_failed = true;
     } else {
+        char *addr = memset_args->addr;
+        size_t numpages = memset_args->numpages;
+        size_t hpagesize = memset_args->hpagesize;
+        size_t i;
         for (i = 0; i < numpages; i++) {
             /*
              * Read & write back the same value, so we don't
@@ -XXX,XX +XXX,XX @@ static inline int get_memset_num_threads(int smp_cpus)
 static bool touch_all_pages(char *area, size_t hpagesize, size_t numpages,
                             int smp_cpus)
 {
-    uint64_t numpages_per_thread, size_per_thread;
+    size_t numpages_per_thread;
+    size_t size_per_thread;
     char *addr = area;
     int i = 0;
 
-- 
2.13.6

From: Nishanth Aravamudan <naravamudan@digitalocean.com>

In ed6e2161 ("linux-aio: properly bubble up errors from initialzation"),
I only added a bdrv_attach_aio_context callback for the bdrv_file
driver. There are several other drivers that use the shared
aio_plug callback, though, and they will trip the assertion added to
aio_get_linux_aio because they did not call aio_setup_linux_aio first.
Add the appropriate callback definition to the affected driver
definitions.

Fixes: ed6e2161 ("linux-aio: properly bubble up errors from initialization")
Reported-by: Farhan Ali <alifm@linux.ibm.com>
Signed-off-by: Nishanth Aravamudan <naravamudan@digitalocean.com>
Reviewed-by: John Snow <jsnow@redhat.com>
Message-id: 20180718211256.29774-1-naravamudan@digitalocean.com
Cc: Eric Blake <eblake@redhat.com>
Cc: Kevin Wolf <kwolf@redhat.com>
Cc: John Snow <jsnow@redhat.com>
Cc: Max Reitz <mreitz@redhat.com>
Cc: Stefan Hajnoczi <stefanha@redhat.com>
Cc: Fam Zheng <famz@redhat.com>
Cc: Paolo Bonzini <pbonzini@redhat.com>
Cc: qemu-block@nongnu.org
Cc: qemu-devel@nongnu.org
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
---
 block/file-posix.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/block/file-posix.c b/block/file-posix.c
index XXXXXXX..XXXXXXX 100644
--- a/block/file-posix.c
+++ b/block/file-posix.c
@@ -XXX,XX +XXX,XX @@ static BlockDriver bdrv_host_device = {
     .bdrv_refresh_limits = raw_refresh_limits,
     .bdrv_io_plug = raw_aio_plug,
     .bdrv_io_unplug = raw_aio_unplug,
+    .bdrv_attach_aio_context = raw_aio_attach_aio_context,
 
     .bdrv_co_truncate       = raw_co_truncate,
     .bdrv_getlength	= raw_getlength,
@@ -XXX,XX +XXX,XX @@ static BlockDriver bdrv_host_cdrom = {
     .bdrv_refresh_limits = raw_refresh_limits,
     .bdrv_io_plug = raw_aio_plug,
     .bdrv_io_unplug = raw_aio_unplug,
+    .bdrv_attach_aio_context = raw_aio_attach_aio_context,
 
     .bdrv_co_truncate    = raw_co_truncate,
     .bdrv_getlength      = raw_getlength,
@@ -XXX,XX +XXX,XX @@ static BlockDriver bdrv_host_cdrom = {
     .bdrv_refresh_limits = raw_refresh_limits,
     .bdrv_io_plug = raw_aio_plug,
     .bdrv_io_unplug = raw_aio_unplug,
+    .bdrv_attach_aio_context = raw_aio_attach_aio_context,
 
     .bdrv_co_truncate    = raw_co_truncate,
     .bdrv_getlength      = raw_getlength,
-- 
2.17.1