[Qemu-devel] [PULL 0/1] Block patches
[Qemu-devel] [PULL for-3.0 0/1] Block patches
1
The following changes since commit 64175afc695c0672876fbbfc31b299c86d562cb4:
1
The following changes since commit 768cef2974fb1fa30dd188b043ea737e13fea477:
2
2
3
arm_gicv3: Fix ICC_BPR1 reset value when EL3 not implemented (2017-06-07 17:21:44 +0100)
3
Merge remote-tracking branch 'remotes/ehabkost/tags/x86-next-pull-request' into staging (2018-07-24 10:37:52 +0100)
4
4
5
are available in the git repository at:
5
are available in the Git repository at:
6
6
7
git://github.com/codyprime/qemu-kvm-jtc.git tags/block-pull-request
7
git://github.com/stefanha/qemu.git tags/block-pull-request
8
8
9
for you to fetch changes up to 56faeb9bb6872b3f926b3b3e0452a70beea10af2:
9
for you to fetch changes up to 042b757cc77c9580b99ef2781cfb0a2d1bf495a6:
10
10
11
block/gluster.c: Handle qdict_array_entries() failure (2017-06-09 08:41:29 -0400)
11
block/file-posix: add bdrv_attach_aio_context callback for host dev and cdrom (2018-07-24 14:27:41 +0100)
12
12
13
----------------------------------------------------------------
13
----------------------------------------------------------------
14
Gluster patch
14
Pull request
15
16
Regression fix for host block devices with the file-posix driver when aio=native is in use.
17
15
----------------------------------------------------------------
18
----------------------------------------------------------------
16
19
17
Peter Maydell (1):
20
Nishanth Aravamudan (1):
18
block/gluster.c: Handle qdict_array_entries() failure
21
block/file-posix: add bdrv_attach_aio_context callback for host dev
22
and cdrom
19
23
20
block/gluster.c | 3 +--
24
block/file-posix.c | 3 +++
21
1 file changed, 1 insertion(+), 2 deletions(-)
25
1 file changed, 3 insertions(+)
22
26
23
--
27
--
24
2.9.3
28
2.17.1
25
29
26
30
diff view generated by jsdifflib
[Qemu-devel] [PULL 1/1] block/gluster.c: Handle qdict_array_entries() failure
[Qemu-devel] [PULL for-3.0 1/1] block/file-posix: add bdrv_attach_aio_context callback for host dev and cdrom
1
From: Peter Maydell <peter.maydell@linaro.org>
1
From: Nishanth Aravamudan <naravamudan@digitalocean.com>
2
2
3
In qemu_gluster_parse_json(), the call to qdict_array_entries()
3
In ed6e2161 ("linux-aio: properly bubble up errors from initialzation"),
4
could return a negative error code, which we were ignoring
4
I only added a bdrv_attach_aio_context callback for the bdrv_file
5
because we assigned the result to an unsigned variable.
5
driver. There are several other drivers that use the shared
6
Fix this by using the 'int' type instead, which matches the
6
aio_plug callback, though, and they will trip the assertion added to
7
return type of qdict_array_entries() and also the type
7
aio_get_linux_aio because they did not call aio_setup_linux_aio first.
8
we use for the loop enumeration variable 'i'.
8
Add the appropriate callback definition to the affected driver
9
definitions.
9
10
10
(Spotted by Coverity, CID 1360960.)
11
Fixes: ed6e2161 ("linux-aio: properly bubble up errors from initialization")
12
Reported-by: Farhan Ali <alifm@linux.ibm.com>
13
Signed-off-by: Nishanth Aravamudan <naravamudan@digitalocean.com>
14
Reviewed-by: John Snow <jsnow@redhat.com>
15
Message-id: 20180718211256.29774-1-naravamudan@digitalocean.com
16
Cc: Eric Blake <eblake@redhat.com>
17
Cc: Kevin Wolf <kwolf@redhat.com>
18
Cc: John Snow <jsnow@redhat.com>
19
Cc: Max Reitz <mreitz@redhat.com>
20
Cc: Stefan Hajnoczi <stefanha@redhat.com>
21
Cc: Fam Zheng <famz@redhat.com>
22
Cc: Paolo Bonzini <pbonzini@redhat.com>
23
Cc: qemu-block@nongnu.org
24
Cc: qemu-devel@nongnu.org
25
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
26
---
27
block/file-posix.c | 3 +++
28
1 file changed, 3 insertions(+)
11
29
12
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
30
diff --git a/block/file-posix.c b/block/file-posix.c
13
Reviewed-by: Eric Blake <eblake@redhat.com>
14
Reviewed-by: Jeff Cody <jcody@redhat.com>
15
Message-id: 1496682098-1540-1-git-send-email-peter.maydell@linaro.org
16
Signed-off-by: Jeff Cody <jcody@redhat.com>
17
---
18
block/gluster.c | 3 +--
19
1 file changed, 1 insertion(+), 2 deletions(-)
20
21
diff --git a/block/gluster.c b/block/gluster.c
22
index XXXXXXX..XXXXXXX 100644
31
index XXXXXXX..XXXXXXX 100644
23
--- a/block/gluster.c
32
--- a/block/file-posix.c
24
+++ b/block/gluster.c
33
+++ b/block/file-posix.c
25
@@ -XXX,XX +XXX,XX @@ static int qemu_gluster_parse_json(BlockdevOptionsGluster *gconf,
34
@@ -XXX,XX +XXX,XX @@ static BlockDriver bdrv_host_device = {
26
Error *local_err = NULL;
35
.bdrv_refresh_limits = raw_refresh_limits,
27
char *str = NULL;
36
.bdrv_io_plug = raw_aio_plug,
28
const char *ptr;
37
.bdrv_io_unplug = raw_aio_unplug,
29
- size_t num_servers;
38
+ .bdrv_attach_aio_context = raw_aio_attach_aio_context,
30
- int i, type;
39
31
+ int i, type, num_servers;
40
.bdrv_co_truncate = raw_co_truncate,
32
41
.bdrv_getlength    = raw_getlength,
33
/* create opts info from runtime_json_opts list */
42
@@ -XXX,XX +XXX,XX @@ static BlockDriver bdrv_host_cdrom = {
34
opts = qemu_opts_create(&runtime_json_opts, NULL, 0, &error_abort);
43
.bdrv_refresh_limits = raw_refresh_limits,
44
.bdrv_io_plug = raw_aio_plug,
45
.bdrv_io_unplug = raw_aio_unplug,
46
+ .bdrv_attach_aio_context = raw_aio_attach_aio_context,
47
48
.bdrv_co_truncate = raw_co_truncate,
49
.bdrv_getlength = raw_getlength,
50
@@ -XXX,XX +XXX,XX @@ static BlockDriver bdrv_host_cdrom = {
51
.bdrv_refresh_limits = raw_refresh_limits,
52
.bdrv_io_plug = raw_aio_plug,
53
.bdrv_io_unplug = raw_aio_unplug,
54
+ .bdrv_attach_aio_context = raw_aio_attach_aio_context,
55
56
.bdrv_co_truncate = raw_co_truncate,
57
.bdrv_getlength = raw_getlength,
35
--
58
--
36
2.9.3
59
2.17.1
37
60
38
61
diff view generated by jsdifflib

Patchew 2.1-devel-b67e4c2

© 2016 - 2025 Red Hat, Inc.