[Qemu-devel] [PULL 0/1] Block patches
[Qemu-devel] [PULL 0/1] Block patches
1
The following changes since commit 64175afc695c0672876fbbfc31b299c86d562cb4:
1
The following changes since commit 474f3938d79ab36b9231c9ad3b5a9314c2aeacde:
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/amarkovic/tags/mips-queue-jun-21-2019' into staging (2019-06-21 15:40:50 +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
https://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 6c11dda922915aaaa032db4462294e8df45f7441:
10
10
11
block/gluster.c: Handle qdict_array_entries() failure (2017-06-09 08:41:29 -0400)
11
build: use $(DESTDIR)x instead of $(DESTDIR)/x (2019-06-28 14:12:14 +0100)
12
12
13
----------------------------------------------------------------
13
----------------------------------------------------------------
14
Gluster patch
14
Pull request
15
16
No user-visible changes.
17
15
----------------------------------------------------------------
18
----------------------------------------------------------------
16
19
17
Peter Maydell (1):
20
Stefan Hajnoczi (1):
18
block/gluster.c: Handle qdict_array_entries() failure
21
build: use $(DESTDIR)x instead of $(DESTDIR)/x
19
22
20
block/gluster.c | 3 +--
23
Makefile | 16 ++++++++--------
21
1 file changed, 1 insertion(+), 2 deletions(-)
24
1 file changed, 8 insertions(+), 8 deletions(-)
22
25
23
--
26
--
24
2.9.3
27
2.21.0
25
28
26
29
diff view generated by jsdifflib
[Qemu-devel] [PULL 1/1] block/gluster.c: Handle qdict_array_entries() failure
[Qemu-devel] [PULL 1/1] build: use $(DESTDIR)x instead of $(DESTDIR)/x
1
From: Peter Maydell <peter.maydell@linaro.org>
1
The GNU make manual[1] demonstrates $(DESTDIR)$(bindir)/foo and QEMU
2
mostly follows that. There are just a few instances of
3
$(DESTDIR)/$(bindir)/foo. Fix these inconsistencies.
2
4
3
In qemu_gluster_parse_json(), the call to qdict_array_entries()
5
[1] https://www.gnu.org/software/make/manual/html_node/DESTDIR.html
4
could return a negative error code, which we were ignoring
5
because we assigned the result to an unsigned variable.
6
Fix this by using the 'int' type instead, which matches the
7
return type of qdict_array_entries() and also the type
8
we use for the loop enumeration variable 'i'.
9
6
10
(Spotted by Coverity, CID 1360960.)
7
Cc: Daniel P. Berrange <berrange@redhat.com>
8
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
9
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
10
Message-id: 20190521145318.12787-1-stefanha@redhat.com
11
Message-Id: <20190521145318.12787-1-stefanha@redhat.com>
12
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
13
---
14
Makefile | 16 ++++++++--------
15
1 file changed, 8 insertions(+), 8 deletions(-)
11
16
12
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
17
diff --git a/Makefile b/Makefile
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
18
index XXXXXXX..XXXXXXX 100644
23
--- a/block/gluster.c
19
--- a/Makefile
24
+++ b/block/gluster.c
20
+++ b/Makefile
25
@@ -XXX,XX +XXX,XX @@ static int qemu_gluster_parse_json(BlockdevOptionsGluster *gconf,
21
@@ -XXX,XX +XXX,XX @@ ifneq ($(DESCS),)
26
Error *local_err = NULL;
22
    done
27
char *str = NULL;
23
endif
28
const char *ptr;
24
    for s in $(ICON_SIZES); do \
29
- size_t num_servers;
25
-        mkdir -p "$(DESTDIR)/$(qemu_icondir)/hicolor/$${s}/apps"; \
30
- int i, type;
26
+        mkdir -p "$(DESTDIR)$(qemu_icondir)/hicolor/$${s}/apps"; \
31
+ int i, type, num_servers;
27
        $(INSTALL_DATA) $(SRC_PATH)/ui/icons/qemu_$${s}.png \
32
28
-            "$(DESTDIR)/$(qemu_icondir)/hicolor/$${s}/apps/qemu.png"; \
33
/* create opts info from runtime_json_opts list */
29
+            "$(DESTDIR)$(qemu_icondir)/hicolor/$${s}/apps/qemu.png"; \
34
opts = qemu_opts_create(&runtime_json_opts, NULL, 0, &error_abort);
30
    done; \
31
-    mkdir -p "$(DESTDIR)/$(qemu_icondir)/hicolor/32x32/apps"; \
32
+    mkdir -p "$(DESTDIR)$(qemu_icondir)/hicolor/32x32/apps"; \
33
    $(INSTALL_DATA) $(SRC_PATH)/ui/icons/qemu_32x32.bmp \
34
-        "$(DESTDIR)/$(qemu_icondir)/hicolor/32x32/apps/qemu.bmp"; \
35
-    mkdir -p "$(DESTDIR)/$(qemu_icondir)/hicolor/scalable/apps"; \
36
+        "$(DESTDIR)$(qemu_icondir)/hicolor/32x32/apps/qemu.bmp"; \
37
+    mkdir -p "$(DESTDIR)$(qemu_icondir)/hicolor/scalable/apps"; \
38
    $(INSTALL_DATA) $(SRC_PATH)/ui/icons/qemu.svg \
39
-        "$(DESTDIR)/$(qemu_icondir)/hicolor/scalable/apps/qemu.svg"
40
-    mkdir -p "$(DESTDIR)/$(qemu_desktopdir)"
41
+        "$(DESTDIR)$(qemu_icondir)/hicolor/scalable/apps/qemu.svg"
42
+    mkdir -p "$(DESTDIR)$(qemu_desktopdir)"
43
    $(INSTALL_DATA) $(SRC_PATH)/ui/qemu.desktop \
44
-        "$(DESTDIR)/$(qemu_desktopdir)/qemu.desktop"
45
+        "$(DESTDIR)$(qemu_desktopdir)/qemu.desktop"
46
ifdef CONFIG_GTK
47
    $(MAKE) -C po $@
48
endif
35
--
49
--
36
2.9.3
50
2.21.0
37
51
38
52
diff view generated by jsdifflib

Patchew 2.1-devel-b67e4c2

© 2016 - 2025 Red Hat, Inc.