| 1 | The following changes since commit 4871b51b9241b10f4fd8e04bbb21577886795e25: | 1 | The following changes since commit b05631954d6dfe93340d516660397e2c1a2a5dd6: |
|---|---|---|---|
| 2 | 2 | ||
| 3 | vmgenid-test: use boot-sector infrastructure (2017-07-14 17:03:03 +0100) | 3 | Merge remote-tracking branch 'remotes/rth/tags/pull-hppa-20180131' into staging (2018-01-31 15:50:29 +0000) |
| 4 | 4 | ||
| 5 | are available in the git repository at: | 5 | are available in the git repository at: |
| 6 | 6 | ||
| 7 | git://github.com/stefanha/qemu.git tags/block-pull-request | 7 | git://github.com/codyprime/qemu-kvm-jtc.git tags/block-pull-request |
| 8 | 8 | ||
| 9 | for you to fetch changes up to 593ed6f0a3c827a13a274e47f6fa980344234f9c: | 9 | for you to fetch changes up to 45a79646ea746fa3f32083d0aa70512aae29f6b3: |
| 10 | 10 | ||
| 11 | block: fix shadowed variable in bdrv_co_pdiscard (2017-07-17 15:58:37 +0100) | 11 | iotests: Make 200 run on tmpfs (2018-01-31 22:37:00 -0500) |
| 12 | 12 | ||
| 13 | ---------------------------------------------------------------- | 13 | ---------------------------------------------------------------- |
| 14 | 14 | Block patches | |
| 15 | ---------------------------------------------------------------- | 15 | ---------------------------------------------------------------- |
| 16 | 16 | ||
| 17 | Alistair Francis (1): | 17 | Max Reitz (1): |
| 18 | util/aio-win32: Only select on what we are actually waiting for | 18 | iotests: Make 200 run on tmpfs |
| 19 | 19 | ||
| 20 | Denis V. Lunev (1): | 20 | Murilo Opsfelder Araujo (1): |
| 21 | block: fix shadowed variable in bdrv_co_pdiscard | 21 | block/ssh: fix possible segmentation fault when .desc is not |
| 22 | null-terminated | ||
| 22 | 23 | ||
| 23 | block/io.c | 1 - | 24 | block/ssh.c | 1 + |
| 24 | util/aio-win32.c | 13 ++++++++++--- | 25 | tests/qemu-iotests/200 | 2 +- |
| 25 | 2 files changed, 10 insertions(+), 4 deletions(-) | 26 | 2 files changed, 2 insertions(+), 1 deletion(-) |
| 26 | 27 | ||
| 27 | -- | 28 | -- |
| 28 | 2.9.4 | 29 | 2.9.5 |
| 29 | 30 | ||
| 30 | 31 | diff view generated by jsdifflib |
| 1 | From: "Denis V. Lunev" <den@openvz.org> | 1 | From: Murilo Opsfelder Araujo <muriloo@linux.vnet.ibm.com> |
|---|---|---|---|
| 2 | 2 | ||
| 3 | We've had a shadowed 'ret' variable, which risks returning the wrong | 3 | This patch prevents a possible segmentation fault when .desc members are checked |
| 4 | value, introduced in commit b9c64947. | 4 | against NULL. |
| 5 | 5 | ||
| 6 | Signed-off-by: Denis V. Lunev <den@openvz.org> | 6 | The ssh_runtime_opts was added by commit |
| 7 | Reviewed-by: Fam Zheng <famz@redhat.com> | 7 | 8a6a80896d6af03b8ee0c17cdf37219eca2588a7 ("block/ssh: Use QemuOpts for runtime |
| 8 | options"). | ||
| 9 | |||
| 10 | This fix was inspired by | ||
| 11 | http://lists.nongnu.org/archive/html/qemu-devel/2018-01/msg00883.html. | ||
| 12 | |||
| 13 | Fixes: 8a6a80896d6af03b8ee0c17cdf37219eca2588a7 ("block/ssh: Use QemuOpts for runtime options") | ||
| 14 | Cc: Max Reitz <mreitz@redhat.com> | ||
| 15 | Cc: Eric Blake <eblake@redhat.com> | ||
| 16 | Signed-off-by: Murilo Opsfelder Araujo <muriloo@linux.vnet.ibm.com> | ||
| 8 | Reviewed-by: Eric Blake <eblake@redhat.com> | 17 | Reviewed-by: Eric Blake <eblake@redhat.com> |
| 9 | Message-id: 20170710150559.30163-1-den@openvz.org | 18 | Reviewed-by: Jeff Cody <jcody@redhat.com> |
| 10 | CC: Stefan Hajnoczi <stefanha@redhat.com> | 19 | Signed-off-by: Jeff Cody <jcody@redhat.com> |
| 11 | CC: Kevin Wolf <kwolf@redhat.com> | ||
| 12 | CC: Eric Blake <eblake@redhat.com> | ||
| 13 | Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com> | ||
| 14 | --- | 20 | --- |
| 15 | block/io.c | 1 - | 21 | block/ssh.c | 1 + |
| 16 | 1 file changed, 1 deletion(-) | 22 | 1 file changed, 1 insertion(+) |
| 17 | 23 | ||
| 18 | diff --git a/block/io.c b/block/io.c | 24 | diff --git a/block/ssh.c b/block/ssh.c |
| 19 | index XXXXXXX..XXXXXXX 100644 | 25 | index XXXXXXX..XXXXXXX 100644 |
| 20 | --- a/block/io.c | 26 | --- a/block/ssh.c |
| 21 | +++ b/block/io.c | 27 | +++ b/block/ssh.c |
| 22 | @@ -XXX,XX +XXX,XX @@ int coroutine_fn bdrv_co_pdiscard(BlockDriverState *bs, int64_t offset, | 28 | @@ -XXX,XX +XXX,XX @@ static QemuOptsList ssh_runtime_opts = { |
| 23 | assert(max_pdiscard >= bs->bl.request_alignment); | 29 | .type = QEMU_OPT_STRING, |
| 24 | 30 | .help = "Defines how and what to check the host key against", | |
| 25 | while (bytes > 0) { | 31 | }, |
| 26 | - int ret; | 32 | + { /* end of list */ } |
| 27 | int num = bytes; | 33 | }, |
| 28 | 34 | }; | |
| 29 | if (head) { | 35 | |
| 30 | -- | 36 | -- |
| 31 | 2.9.4 | 37 | 2.9.5 |
| 32 | 38 | ||
| 33 | 39 | diff view generated by jsdifflib |
| 1 | From: Alistair Francis <alistair.francis@xilinx.com> | 1 | From: Max Reitz <mreitz@redhat.com> |
|---|---|---|---|
| 2 | 2 | ||
| 3 | Signed-off-by: Alistair Francis <alistair.francis@xilinx.com> | 3 | 200 currently fails on tmpfs because it sets cache=none. However, |
| 4 | Acked-by: Edgar E. Iglesias <edgar.iglesias@xilinx.com> | 4 | without that (and aio=native), the test still works now and it fails |
| 5 | Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org> | 5 | before Jeff's series (on fc7dbc119e0852a70dc9fa68bb41a318e49e4cd6). So |
| 6 | Message-id: 9307b70e9876c4e9e3c4478524a32a23a3d5dd05.1499368180.git.alistair.francis@xilinx.com | 6 | we can probably remove the aio=native safely, and replace cache=none by |
| 7 | Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com> | 7 | cache=$CACHEMODE. |
| 8 | |||
| 9 | Signed-off-by: Max Reitz <mreitz@redhat.com> | ||
| 10 | Reviewed-by: Jeff Cody <jcody@redhat.com> | ||
| 11 | Message-id: 20180117135015.15051-1-mreitz@redhat.com | ||
| 12 | Signed-off-by: Jeff Cody <jcody@redhat.com> | ||
| 8 | --- | 13 | --- |
| 9 | util/aio-win32.c | 13 ++++++++++--- | 14 | tests/qemu-iotests/200 | 2 +- |
| 10 | 1 file changed, 10 insertions(+), 3 deletions(-) | 15 | 1 file changed, 1 insertion(+), 1 deletion(-) |
| 11 | 16 | ||
| 12 | diff --git a/util/aio-win32.c b/util/aio-win32.c | 17 | diff --git a/tests/qemu-iotests/200 b/tests/qemu-iotests/200 |
| 13 | index XXXXXXX..XXXXXXX 100644 | 18 | index XXXXXXX..XXXXXXX 100755 |
| 14 | --- a/util/aio-win32.c | 19 | --- a/tests/qemu-iotests/200 |
| 15 | +++ b/util/aio-win32.c | 20 | +++ b/tests/qemu-iotests/200 |
| 16 | @@ -XXX,XX +XXX,XX @@ void aio_set_fd_handler(AioContext *ctx, | 21 | @@ -XXX,XX +XXX,XX @@ qemu_comm_method="qmp" |
| 17 | } | 22 | _launch_qemu -device pci-bridge,id=bridge1,chassis_nr=1,bus=pci.0 \ |
| 18 | } else { | 23 | -object iothread,id=iothread0 \ |
| 19 | HANDLE event; | 24 | -device virtio-scsi-pci,bus=bridge1,addr=0x1f,id=scsi0,iothread=iothread0 \ |
| 20 | + long bitmask = 0; | 25 | - -drive file="${TEST_IMG}",media=disk,if=none,cache=none,id=drive_sysdisk,aio=native,format=$IMGFMT \ |
| 21 | 26 | + -drive file="${TEST_IMG}",media=disk,if=none,cache=$CACHEMODE,id=drive_sysdisk,format=$IMGFMT \ | |
| 22 | if (node == NULL) { | 27 | -device scsi-hd,drive=drive_sysdisk,bus=scsi0.0,id=sysdisk,bootindex=0 |
| 23 | /* Alloc and insert if it's not already there */ | 28 | h1=$QEMU_HANDLE |
| 24 | @@ -XXX,XX +XXX,XX @@ void aio_set_fd_handler(AioContext *ctx, | 29 | |
| 25 | node->io_write = io_write; | ||
| 26 | node->is_external = is_external; | ||
| 27 | |||
| 28 | + if (io_read) { | ||
| 29 | + bitmask |= FD_READ | FD_ACCEPT | FD_CLOSE; | ||
| 30 | + } | ||
| 31 | + | ||
| 32 | + if (io_write) { | ||
| 33 | + bitmask |= FD_WRITE | FD_CONNECT; | ||
| 34 | + } | ||
| 35 | + | ||
| 36 | event = event_notifier_get_handle(&ctx->notifier); | ||
| 37 | - WSAEventSelect(node->pfd.fd, event, | ||
| 38 | - FD_READ | FD_ACCEPT | FD_CLOSE | | ||
| 39 | - FD_CONNECT | FD_WRITE | FD_OOB); | ||
| 40 | + WSAEventSelect(node->pfd.fd, event, bitmask); | ||
| 41 | } | ||
| 42 | |||
| 43 | qemu_lockcnt_unlock(&ctx->list_lock); | ||
| 44 | -- | 30 | -- |
| 45 | 2.9.4 | 31 | 2.9.5 |
| 46 | 32 | ||
| 47 | 33 | diff view generated by jsdifflib |