summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/recipes-devtools/qemu/qemu/0001-sdl.c-allow-user-to-disable-pointer-grabs.patch (renamed from meta/recipes-devtools/qemu/qemu/disable-grabs.patch)25
-rw-r--r--meta/recipes-devtools/qemu/qemu/0002-qemu-Add-missing-wacom-HID-descriptor.patch (renamed from meta/recipes-devtools/qemu/qemu/wacom.patch)24
-rw-r--r--meta/recipes-devtools/qemu/qemu/0003-Add-subpackage-ptest-which-runs-all-unit-test-cases-.patch (renamed from meta/recipes-devtools/qemu/qemu/add-ptest-in-makefile-v10.patch)12
-rw-r--r--meta/recipes-devtools/qemu/qemu/0004-qemu-Add-addition-environment-space-to-boot-loader-q.patch (renamed from meta/recipes-devtools/qemu/qemu/qemu-enlarge-env-entry-size.patch)17
-rw-r--r--meta/recipes-devtools/qemu/qemu/0005-qemu-disable-Valgrind.patch33
-rw-r--r--meta/recipes-devtools/qemu/qemu/0006-qemu-Limit-paths-searched-during-user-mode-emulation.patch (renamed from meta/recipes-devtools/qemu/qemu/pathlimit.patch)34
-rw-r--r--meta/recipes-devtools/qemu/qemu/0007-qemu-native-set-ld.bfd-fix-cflags-and-set-some-envir.patch (renamed from meta/recipes-devtools/qemu/qemu/qemu-2.5.0-cflags.patch)12
-rw-r--r--meta/recipes-devtools/qemu/qemu/0008-chardev-connect-socket-to-a-spawned-command.patch (renamed from meta/recipes-devtools/qemu/qemu/chardev-connect-socket-to-a-spawned-command.patch)33
-rw-r--r--meta/recipes-devtools/qemu/qemu/0009-apic-fixup-fallthrough-to-PIC.patch (renamed from meta/recipes-devtools/qemu/qemu/apic-fixup-fallthrough-to-PIC.patch)14
-rw-r--r--meta/recipes-devtools/qemu/qemu/0010-linux-user-Fix-webkitgtk-hangs-on-32-bit-x86-target.patch (renamed from meta/recipes-devtools/qemu/qemu/linux-user-Fix-webkitgtk-hangs-on-32-bit-x86-target.patch)9
-rw-r--r--meta/recipes-devtools/qemu/qemu/0011-memfd-fix-configure-test.patch (renamed from meta/recipes-devtools/qemu/qemu/memfd.patch)15
-rw-r--r--meta/recipes-devtools/qemu/qemu/0012-arm-translate-a64-treat-DISAS_UPDATE-as-variant-of-D.patch (renamed from meta/recipes-devtools/qemu/qemu/0001-arm-translate-a64-treat-DISAS_UPDATE-as-variant-of-D.patch)9
-rw-r--r--meta/recipes-devtools/qemu/qemu/0013-ps2-check-PS2Queue-pointers-in-post_load-routine.patch (renamed from meta/recipes-devtools/qemu/qemu/check-PS2Queue-pointers-in-post_load-routine.patch)5
-rw-r--r--meta/recipes-devtools/qemu/qemu/0014-fix-libcap-header-issue-on-some-distro.patch (renamed from meta/recipes-devtools/qemu/qemu/fix-libcap-header-issue-on-some-distro.patch)15
-rw-r--r--meta/recipes-devtools/qemu/qemu/0015-cpus.c-Add-error-messages-when-qemi_cpu_kick_thread-.patch (renamed from meta/recipes-devtools/qemu/qemu/cpus.c-qemu_cpu_kick_thread_debugging.patch)11
-rw-r--r--meta/recipes-devtools/qemu/qemu/no-valgrind.patch19
-rw-r--r--meta/recipes-devtools/qemu/qemu_2.11.1.bb31
17 files changed, 173 insertions, 145 deletions
diff --git a/meta/recipes-devtools/qemu/qemu/disable-grabs.patch b/meta/recipes-devtools/qemu/qemu/0001-sdl.c-allow-user-to-disable-pointer-grabs.patch
index 77117890f4..add5d8b02f 100644
--- a/meta/recipes-devtools/qemu/qemu/disable-grabs.patch
+++ b/meta/recipes-devtools/qemu/qemu/0001-sdl.c-allow-user-to-disable-pointer-grabs.patch
@@ -1,3 +1,11 @@
1From 273e1af49d3e0a58bb9464369deb2652f243e649 Mon Sep 17 00:00:00 2001
2From: Ross Burton <ross.burton@intel.com>
3Date: Wed, 18 Sep 2013 14:04:54 +0100
4Subject: [PATCH] sdl.c: allow user to disable pointer grabs
5MIME-Version: 1.0
6Content-Type: text/plain; charset=UTF-8
7Content-Transfer-Encoding: 8bit
8
1When the pointer enters the Qemu window it calls SDL_WM_GrabInput, which calls 9When the pointer enters the Qemu window it calls SDL_WM_GrabInput, which calls
2XGrabPointer in a busyloop until it returns GrabSuccess. However if there's already 10XGrabPointer in a busyloop until it returns GrabSuccess. However if there's already
3a pointer grab (screen is locked, a menu is open) then qemu will hang until the 11a pointer grab (screen is locked, a menu is open) then qemu will hang until the
@@ -12,22 +20,15 @@ the current grabbing behaviour for everyone else.
12 20
13Upstream-Status: Pending 21Upstream-Status: Pending
14Signed-off-by: Ross Burton <ross.burton@intel.com> 22Signed-off-by: Ross Burton <ross.burton@intel.com>
15
16From 4b1988ecb01a178269ec0513a75f2ec620c7ef6a Mon Sep 17 00:00:00 2001
17From: Ross Burton <ross.burton@intel.com>
18Date: Wed, 18 Sep 2013 14:04:54 +0100
19Subject: [PATCH] sdl.c: allow user to disable pointer grabs
20
21Signed-off-by: Ross Burton <ross.burton@intel.com>
22Signed-off-by: Eric Bénard <eric@eukrea.com> 23Signed-off-by: Eric Bénard <eric@eukrea.com>
23--- 24---
24 ui/sdl.c | 12 ++++++++++-- 25 ui/sdl.c | 12 ++++++++++--
25 1 file changed, 10 insertions(+), 2 deletions(-) 26 1 file changed, 10 insertions(+), 2 deletions(-)
26 27
27Index: qemu-2.11.1/ui/sdl.c 28diff --git a/ui/sdl.c b/ui/sdl.c
28=================================================================== 29index 7b71a9a..29ce1b9 100644
29--- qemu-2.11.1.orig/ui/sdl.c 30--- a/ui/sdl.c
30+++ qemu-2.11.1/ui/sdl.c 31+++ b/ui/sdl.c
31@@ -63,6 +63,10 @@ static SDL_PixelFormat host_format; 32@@ -63,6 +63,10 @@ static SDL_PixelFormat host_format;
32 static int scaling_active = 0; 33 static int scaling_active = 0;
33 static Notifier mouse_mode_notifier; 34 static Notifier mouse_mode_notifier;
@@ -58,7 +59,7 @@ Index: qemu-2.11.1/ui/sdl.c
58 gui_grab = 0; 59 gui_grab = 0;
59 sdl_show_cursor(); 60 sdl_show_cursor();
60 sdl_update_caption(); 61 sdl_update_caption();
61@@ -986,6 +992,8 @@ void sdl_display_init(DisplayState *ds, 62@@ -986,6 +992,8 @@ void sdl_display_init(DisplayState *ds, int full_screen, int no_frame)
62 * This requires SDL >= 1.2.14. */ 63 * This requires SDL >= 1.2.14. */
63 setenv("SDL_DISABLE_LOCK_KEYS", "1", 1); 64 setenv("SDL_DISABLE_LOCK_KEYS", "1", 1);
64 65
diff --git a/meta/recipes-devtools/qemu/qemu/wacom.patch b/meta/recipes-devtools/qemu/qemu/0002-qemu-Add-missing-wacom-HID-descriptor.patch
index cd06aa4ac6..281803ecb5 100644
--- a/meta/recipes-devtools/qemu/qemu/wacom.patch
+++ b/meta/recipes-devtools/qemu/qemu/0002-qemu-Add-missing-wacom-HID-descriptor.patch
@@ -1,19 +1,27 @@
1From a42726e017605ed3ca2b3fc2b1cc8d01ccf34730 Mon Sep 17 00:00:00 2001
2From: Richard Purdie <richard.purdie@linuxfoundation.org>
3Date: Thu, 27 Nov 2014 14:04:29 +0000
4Subject: [PATCH] qemu: Add missing wacom HID descriptor
5
1The USB wacom device is missing a HID descriptor which causes it 6The USB wacom device is missing a HID descriptor which causes it
2to fail to operate with recent kernels (e.g. 3.17). 7to fail to operate with recent kernels (e.g. 3.17).
3 8
4This patch adds a HID desriptor to the device, based upon one from 9This patch adds a HID desriptor to the device, based upon one from
5real wcom device. 10real wcom device.
6 11
7Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> 12Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
8 13
9Upstream-Status: Submitted 14Upstream-Status: Submitted
102014/11/27 152014/11/27
16---
17 hw/usb/dev-wacom.c | 94 +++++++++++++++++++++++++++++++++++++++++++++++++++++-
18 1 file changed, 93 insertions(+), 1 deletion(-)
11 19
12Index: qemu-2.1.0/hw/usb/dev-wacom.c 20diff --git a/hw/usb/dev-wacom.c b/hw/usb/dev-wacom.c
13=================================================================== 21index bf70013..2f6e129 100644
14--- qemu-2.1.0.orig/hw/usb/dev-wacom.c 2014-08-01 15:12:17.000000000 +0100 22--- a/hw/usb/dev-wacom.c
15+++ qemu-2.1.0/hw/usb/dev-wacom.c 2014-10-12 12:13:30.540306042 +0100 23+++ b/hw/usb/dev-wacom.c
16@@ -68,6 +68,89 @@ 24@@ -72,6 +72,89 @@ static const USBDescStrings desc_strings = {
17 [STR_SERIALNUMBER] = "1", 25 [STR_SERIALNUMBER] = "1",
18 }; 26 };
19 27
@@ -103,7 +111,7 @@ Index: qemu-2.1.0/hw/usb/dev-wacom.c
103 static const USBDescIface desc_iface_wacom = { 111 static const USBDescIface desc_iface_wacom = {
104 .bInterfaceNumber = 0, 112 .bInterfaceNumber = 0,
105 .bNumEndpoints = 1, 113 .bNumEndpoints = 1,
106@@ -85,7 +168,7 @@ 114@@ -89,7 +172,7 @@ static const USBDescIface desc_iface_wacom = {
107 0x00, /* u8 country_code */ 115 0x00, /* u8 country_code */
108 0x01, /* u8 num_descriptors */ 116 0x01, /* u8 num_descriptors */
109 0x22, /* u8 type: Report */ 117 0x22, /* u8 type: Report */
@@ -112,7 +120,7 @@ Index: qemu-2.1.0/hw/usb/dev-wacom.c
112 }, 120 },
113 }, 121 },
114 }, 122 },
115@@ -265,6 +350,15 @@ 123@@ -269,6 +352,15 @@ static void usb_wacom_handle_control(USBDevice *dev, USBPacket *p,
116 } 124 }
117 125
118 switch (request) { 126 switch (request) {
diff --git a/meta/recipes-devtools/qemu/qemu/add-ptest-in-makefile-v10.patch b/meta/recipes-devtools/qemu/qemu/0003-Add-subpackage-ptest-which-runs-all-unit-test-cases-.patch
index e9639820be..dc073000c9 100644
--- a/meta/recipes-devtools/qemu/qemu/add-ptest-in-makefile-v10.patch
+++ b/meta/recipes-devtools/qemu/qemu/0003-Add-subpackage-ptest-which-runs-all-unit-test-cases-.patch
@@ -1,19 +1,23 @@
1From 4201a5791fc4798a45a9b9f881602d7bacb74ed1 Mon Sep 17 00:00:00 2001 1From fda1eee8bc717528d57f6ff454f72c5325043c31 Mon Sep 17 00:00:00 2001
2From: Juro Bystricky <juro.bystricky@intel.com> 2From: Juro Bystricky <juro.bystricky@intel.com>
3Date: Thu, 31 Aug 2017 11:06:56 -0700 3Date: Thu, 31 Aug 2017 11:06:56 -0700
4Subject: Add subpackage -ptest which runs all unit test cases for qemu. 4Subject: [PATCH] Add subpackage -ptest which runs all unit test cases for
5 qemu.
5 6
6Upstream-Status: Pending 7Upstream-Status: Pending
7 8
8Signed-off-by: Kai Kang <kai.kang@windriver.com> 9Signed-off-by: Kai Kang <kai.kang@windriver.com>
9 10
10Signed-off-by: Juro Bystricky <juro.bystricky@intel.com> 11Signed-off-by: Juro Bystricky <juro.bystricky@intel.com>
12---
13 tests/Makefile.include | 8 ++++++++
14 1 file changed, 8 insertions(+)
11 15
12diff --git a/tests/Makefile.include b/tests/Makefile.include 16diff --git a/tests/Makefile.include b/tests/Makefile.include
13index f08b741..3d1b3e9 100644 17index c002352..f557c26 100644
14--- a/tests/Makefile.include 18--- a/tests/Makefile.include
15+++ b/tests/Makefile.include 19+++ b/tests/Makefile.include
16@@ -924,4 +924,12 @@ all: $(QEMU_IOTESTS_HELPERS-y) 20@@ -935,4 +935,12 @@ all: $(QEMU_IOTESTS_HELPERS-y)
17 -include $(wildcard tests/*.d) 21 -include $(wildcard tests/*.d)
18 -include $(wildcard tests/libqos/*.d) 22 -include $(wildcard tests/libqos/*.d)
19 23
diff --git a/meta/recipes-devtools/qemu/qemu/qemu-enlarge-env-entry-size.patch b/meta/recipes-devtools/qemu/qemu/0004-qemu-Add-addition-environment-space-to-boot-loader-q.patch
index c7425ab8d4..4f28e1676b 100644
--- a/meta/recipes-devtools/qemu/qemu/qemu-enlarge-env-entry-size.patch
+++ b/meta/recipes-devtools/qemu/qemu/0004-qemu-Add-addition-environment-space-to-boot-loader-q.patch
@@ -1,4 +1,8 @@
1qemu: Add addition environment space to boot loader qemu-system-mips 1From ad70fdcaf75084da2e02474c61d1d441ca100ab2 Mon Sep 17 00:00:00 2001
2From: Jason Wessel <jason.wessel@windriver.com>
3Date: Fri, 28 Mar 2014 17:42:43 +0800
4Subject: [PATCH] qemu: Add addition environment space to boot loader
5 qemu-system-mips
2 6
3Upstream-Status: Inappropriate - OE uses deep paths 7Upstream-Status: Inappropriate - OE uses deep paths
4 8
@@ -10,14 +14,14 @@ to only 256 bytes. This patch expands the limit.
10Signed-off-by: Jason Wessel <jason.wessel@windriver.com> 14Signed-off-by: Jason Wessel <jason.wessel@windriver.com>
11Signed-off-by: Roy Li <rongqing.li@windriver.com> 15Signed-off-by: Roy Li <rongqing.li@windriver.com>
12--- 16---
13 hw/mips/mips_malta.c | 2 +- 17 hw/mips/mips_malta.c | 2 +-
14 1 files changed, 1 insertions(+), 1 deletions(-) 18 1 file changed, 1 insertion(+), 1 deletion(-)
15 19
16diff --git a/hw/mips/mips_malta.c b/hw/mips/mips_malta.c 20diff --git a/hw/mips/mips_malta.c b/hw/mips/mips_malta.c
17index 9d521cc..17c0391 100644 21index ec6af4a..6e76166 100644
18--- a/hw/mips/mips_malta.c 22--- a/hw/mips/mips_malta.c
19+++ b/hw/mips/mips_malta.c 23+++ b/hw/mips/mips_malta.c
20@@ -53,7 +53,7 @@ 24@@ -61,7 +61,7 @@
21 25
22 #define ENVP_ADDR 0x80002000l 26 #define ENVP_ADDR 0x80002000l
23 #define ENVP_NB_ENTRIES 16 27 #define ENVP_NB_ENTRIES 16
@@ -26,6 +30,3 @@ index 9d521cc..17c0391 100644
26 30
27 /* Hardware addresses */ 31 /* Hardware addresses */
28 #define FLASH_ADDRESS 0x1e000000ULL 32 #define FLASH_ADDRESS 0x1e000000ULL
29--
301.7.10.4
31
diff --git a/meta/recipes-devtools/qemu/qemu/0005-qemu-disable-Valgrind.patch b/meta/recipes-devtools/qemu/qemu/0005-qemu-disable-Valgrind.patch
new file mode 100644
index 0000000000..b9e01834ef
--- /dev/null
+++ b/meta/recipes-devtools/qemu/qemu/0005-qemu-disable-Valgrind.patch
@@ -0,0 +1,33 @@
1From e85ee3cc9988172662d6969af01f23fa8ffd5262 Mon Sep 17 00:00:00 2001
2From: Ross Burton <ross.burton@intel.com>
3Date: Tue, 20 Oct 2015 22:19:08 +0100
4Subject: [PATCH] qemu: disable Valgrind
5
6There isn't an option to enable or disable valgrind support, so disable it to avoid non-deterministic builds.
7
8Upstream-Status: Inappropriate
9Signed-off-by: Ross Burton <ross.burton@intel.com>
10---
11 configure | 9 ---------
12 1 file changed, 9 deletions(-)
13
14diff --git a/configure b/configure
15index 0c6e757..c30fd45 100755
16--- a/configure
17+++ b/configure
18@@ -4741,15 +4741,6 @@ fi
19 # check if we have valgrind/valgrind.h
20
21 valgrind_h=no
22-cat > $TMPC << EOF
23-#include <valgrind/valgrind.h>
24-int main(void) {
25- return 0;
26-}
27-EOF
28-if compile_prog "" "" ; then
29- valgrind_h=yes
30-fi
31
32 ########################################
33 # check if environ is declared
diff --git a/meta/recipes-devtools/qemu/qemu/pathlimit.patch b/meta/recipes-devtools/qemu/qemu/0006-qemu-Limit-paths-searched-during-user-mode-emulation.patch
index 57ab981c61..9315f8561a 100644
--- a/meta/recipes-devtools/qemu/qemu/pathlimit.patch
+++ b/meta/recipes-devtools/qemu/qemu/0006-qemu-Limit-paths-searched-during-user-mode-emulation.patch
@@ -1,3 +1,8 @@
1From c79c48a79710d0e2ef68062435596ac455cd9f71 Mon Sep 17 00:00:00 2001
2From: Richard Purdie <richard.purdie@linuxfoundation.org>
3Date: Wed, 9 Mar 2016 22:49:02 +0000
4Subject: [PATCH] qemu: Limit paths searched during user mode emulation
5
1By default qemu builds a complete list of directories within the user 6By default qemu builds a complete list of directories within the user
2emulation sysroot (-L option). The OE sysroot directory is large and 7emulation sysroot (-L option). The OE sysroot directory is large and
3this is confusing, for example it indexes all pkgdata. In particular this 8this is confusing, for example it indexes all pkgdata. In particular this
@@ -8,18 +13,21 @@ things if/as/when it needs to. This drastically reduces the files it
8reads and reduces memory usage and cleans up strace. 13reads and reduces memory usage and cleans up strace.
9 14
10It would also avoid the infinite directory traversal bug in [YOCTO #6996] 15It would also avoid the infinite directory traversal bug in [YOCTO #6996]
11although the code could still be vulnerable if it parsed those specific 16although the code could still be vulnerable if it parsed those specific
12paths. 17paths.
13 18
14RP 19RP
152016/3/9 202016/3/9
16Upstream-Status: Pending 21Upstream-Status: Pending
22---
23 util/path.c | 44 ++++++++++++++++++++++----------------------
24 1 file changed, 22 insertions(+), 22 deletions(-)
17 25
18Index: qemu-2.5.0/util/path.c 26diff --git a/util/path.c b/util/path.c
19=================================================================== 27index 7f9fc27..a416cd4 100644
20--- qemu-2.5.0.orig/util/path.c 28--- a/util/path.c
21+++ qemu-2.5.0/util/path.c 29+++ b/util/path.c
22@@ -19,6 +19,7 @@ struct pathelem 30@@ -15,6 +15,7 @@ struct pathelem
23 char *name; 31 char *name;
24 /* Full path name, eg. /usr/gnemul/x86-linux/lib. */ 32 /* Full path name, eg. /usr/gnemul/x86-linux/lib. */
25 char *pathname; 33 char *pathname;
@@ -27,7 +35,7 @@ Index: qemu-2.5.0/util/path.c
27 struct pathelem *parent; 35 struct pathelem *parent;
28 /* Children */ 36 /* Children */
29 unsigned int num_entries; 37 unsigned int num_entries;
30@@ -49,6 +50,7 @@ static struct pathelem *new_entry(const 38@@ -45,6 +46,7 @@ static struct pathelem *new_entry(const char *root,
31 new->name = g_strdup(name); 39 new->name = g_strdup(name);
32 new->pathname = g_strdup_printf("%s/%s", root, name); 40 new->pathname = g_strdup_printf("%s/%s", root, name);
33 new->num_entries = 0; 41 new->num_entries = 0;
@@ -35,7 +43,7 @@ Index: qemu-2.5.0/util/path.c
35 return new; 43 return new;
36 } 44 }
37 45
38@@ -57,15 +59,16 @@ static struct pathelem *new_entry(const 46@@ -53,15 +55,16 @@ static struct pathelem *new_entry(const char *root,
39 /* Not all systems provide this feature */ 47 /* Not all systems provide this feature */
40 #if defined(DT_DIR) && defined(DT_UNKNOWN) && defined(DT_LNK) 48 #if defined(DT_DIR) && defined(DT_UNKNOWN) && defined(DT_LNK)
41 # define dirent_type(dirent) ((dirent)->d_type) 49 # define dirent_type(dirent) ((dirent)->d_type)
@@ -55,7 +63,7 @@ Index: qemu-2.5.0/util/path.c
55 DIR *dir; 63 DIR *dir;
56 64
57 if ((dir = opendir(path->pathname)) != NULL) { 65 if ((dir = opendir(path->pathname)) != NULL) {
58@@ -78,6 +81,11 @@ static struct pathelem *add_dir_maybe(st 66@@ -74,6 +77,11 @@ static struct pathelem *add_dir_maybe(struct pathelem *path)
59 } 67 }
60 closedir(dir); 68 closedir(dir);
61 } 69 }
@@ -67,7 +75,7 @@ Index: qemu-2.5.0/util/path.c
67 return path; 75 return path;
68 } 76 }
69 77
70@@ -93,26 +101,16 @@ static struct pathelem *add_entry(struct 78@@ -89,26 +97,16 @@ static struct pathelem *add_entry(struct pathelem *root, const char *name,
71 e = &root->entries[root->num_entries-1]; 79 e = &root->entries[root->num_entries-1];
72 80
73 *e = new_entry(root->pathname, root, name); 81 *e = new_entry(root->pathname, root, name);
@@ -97,7 +105,7 @@ Index: qemu-2.5.0/util/path.c
97 { 105 {
98 unsigned int i, namelen; 106 unsigned int i, namelen;
99 107
100@@ -123,14 +121,18 @@ follow_path(const struct pathelem *curso 108@@ -119,14 +117,18 @@ follow_path(const struct pathelem *cursor, const char *name)
101 return cursor->pathname; 109 return cursor->pathname;
102 110
103 if (strneq(name, namelen, "..")) 111 if (strneq(name, namelen, ".."))
@@ -119,7 +127,7 @@ Index: qemu-2.5.0/util/path.c
119 127
120 /* Not found */ 128 /* Not found */
121 return NULL; 129 return NULL;
122@@ -164,8 +166,6 @@ void init_paths(const char *prefix) 130@@ -160,8 +162,6 @@ void init_paths(const char *prefix)
123 g_free(base->name); 131 g_free(base->name);
124 g_free(base); 132 g_free(base);
125 base = NULL; 133 base = NULL;
@@ -128,7 +136,7 @@ Index: qemu-2.5.0/util/path.c
128 } 136 }
129 } 137 }
130 138
131@@ -177,5 +177,5 @@ const char *path(const char *name) 139@@ -173,5 +173,5 @@ const char *path(const char *name)
132 if (!base || !name || name[0] != '/') 140 if (!base || !name || name[0] != '/')
133 return name; 141 return name;
134 142
diff --git a/meta/recipes-devtools/qemu/qemu/qemu-2.5.0-cflags.patch b/meta/recipes-devtools/qemu/qemu/0007-qemu-native-set-ld.bfd-fix-cflags-and-set-some-envir.patch
index eb99d14639..ad52f37d9b 100644
--- a/meta/recipes-devtools/qemu/qemu/qemu-2.5.0-cflags.patch
+++ b/meta/recipes-devtools/qemu/qemu/0007-qemu-native-set-ld.bfd-fix-cflags-and-set-some-envir.patch
@@ -1,8 +1,18 @@
1From 4b21a8db60c32f93df56e6111bb926c91680d6f2 Mon Sep 17 00:00:00 2001
2From: Stephen Arnold <sarnold@vctlabs.com>
3Date: Sun, 12 Jun 2016 18:09:56 -0700
4Subject: [PATCH] qemu-native: set ld.bfd, fix cflags, and set some environment
5
1Upstream-Status: Pending 6Upstream-Status: Pending
7---
8 configure | 4 ----
9 1 file changed, 4 deletions(-)
2 10
11diff --git a/configure b/configure
12index c30fd45..b5312f4 100755
3--- a/configure 13--- a/configure
4+++ b/configure 14+++ b/configure
5@@ -4468,10 +4468,6 @@ fi 15@@ -5115,10 +5115,6 @@ fi
6 if test "$gcov" = "yes" ; then 16 if test "$gcov" = "yes" ; then
7 CFLAGS="-fprofile-arcs -ftest-coverage -g $CFLAGS" 17 CFLAGS="-fprofile-arcs -ftest-coverage -g $CFLAGS"
8 LDFLAGS="-fprofile-arcs -ftest-coverage $LDFLAGS" 18 LDFLAGS="-fprofile-arcs -ftest-coverage $LDFLAGS"
diff --git a/meta/recipes-devtools/qemu/qemu/chardev-connect-socket-to-a-spawned-command.patch b/meta/recipes-devtools/qemu/qemu/0008-chardev-connect-socket-to-a-spawned-command.patch
index 6e6bf95c18..f0c0fa19b4 100644
--- a/meta/recipes-devtools/qemu/qemu/chardev-connect-socket-to-a-spawned-command.patch
+++ b/meta/recipes-devtools/qemu/qemu/0008-chardev-connect-socket-to-a-spawned-command.patch
@@ -1,4 +1,4 @@
1From 3bb3100c22eb30146a69656480bdffeef8663575 Mon Sep 17 00:00:00 2001 1From 55c9510311b7481a0c8f3f71b3ce130cc25563f9 Mon Sep 17 00:00:00 2001
2From: Alistair Francis <alistair.francis@xilinx.com> 2From: Alistair Francis <alistair.francis@xilinx.com>
3Date: Thu, 21 Dec 2017 11:35:16 -0800 3Date: Thu, 21 Dec 2017 11:35:16 -0800
4Subject: [PATCH] chardev: connect socket to a spawned command 4Subject: [PATCH] chardev: connect socket to a spawned command
@@ -45,13 +45,13 @@ Upstream-Status: Inappropriate [embedded specific]
45 45
46Signed-off-by: Patrick Ohly <patrick.ohly@intel.com> 46Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
47--- 47---
48 chardev/char-socket.c | 86 ++++++++++++++++++++++++++++++++++++++++++++++++--- 48 chardev/char-socket.c | 99 +++++++++++++++++++++++++++++++++++++++++++++++++++
49 chardev/char.c | 3 ++ 49 chardev/char.c | 3 ++
50 qapi/char.json | 5 +++ 50 qapi/char.json | 5 +++
51 3 files changed, 90 insertions(+), 4 deletions(-) 51 3 files changed, 107 insertions(+)
52 52
53diff --git a/chardev/char-socket.c b/chardev/char-socket.c 53diff --git a/chardev/char-socket.c b/chardev/char-socket.c
54index 53eda8ef00..f566107c35 100644 54index 53eda8e..6c63555 100644
55--- a/chardev/char-socket.c 55--- a/chardev/char-socket.c
56+++ b/chardev/char-socket.c 56+++ b/chardev/char-socket.c
57@@ -852,6 +852,68 @@ static gboolean socket_reconnect_timeout(gpointer opaque) 57@@ -852,6 +852,68 @@ static gboolean socket_reconnect_timeout(gpointer opaque)
@@ -123,7 +123,7 @@ index 53eda8ef00..f566107c35 100644
123 static void qmp_chardev_open_socket(Chardev *chr, 123 static void qmp_chardev_open_socket(Chardev *chr,
124 ChardevBackend *backend, 124 ChardevBackend *backend,
125 bool *be_opened, 125 bool *be_opened,
126@@ -859,6 +921,9 @@ 126@@ -859,6 +921,9 @@ static void qmp_chardev_open_socket(Chardev *chr,
127 { 127 {
128 SocketChardev *s = SOCKET_CHARDEV(chr); 128 SocketChardev *s = SOCKET_CHARDEV(chr);
129 ChardevSocket *sock = backend->u.socket.data; 129 ChardevSocket *sock = backend->u.socket.data;
@@ -133,15 +133,14 @@ index 53eda8ef00..f566107c35 100644
133 bool do_nodelay = sock->has_nodelay ? sock->nodelay : false; 133 bool do_nodelay = sock->has_nodelay ? sock->nodelay : false;
134 bool is_listen = sock->has_server ? sock->server : true; 134 bool is_listen = sock->has_server ? sock->server : true;
135 bool is_telnet = sock->has_telnet ? sock->telnet : false; 135 bool is_telnet = sock->has_telnet ? sock->telnet : false;
136@@ -925,7 +990,14 @@ 136@@ -925,7 +990,14 @@ static void qmp_chardev_open_socket(Chardev *chr,
137 } else if (reconnect > 0) { 137 } else if (reconnect > 0) {
138 s->reconnect_time = reconnect; 138 s->reconnect_time = reconnect;
139 } 139 }
140-
141+#ifndef _WIN32 140+#ifndef _WIN32
142+ if (cmd) { 141+ if (cmd) {
143+ chardev_open_socket_cmd(chr, cmd, errp); 142+ chardev_open_socket_cmd(chr, cmd, errp);
144+ 143
145+ /* everything ready (or failed permanently) before we return */ 144+ /* everything ready (or failed permanently) before we return */
146+ *be_opened = true; 145+ *be_opened = true;
147+ } else 146+ } else
@@ -149,7 +148,7 @@ index 53eda8ef00..f566107c35 100644
149 if (s->reconnect_time) { 148 if (s->reconnect_time) {
150 sioc = qio_channel_socket_new(); 149 sioc = qio_channel_socket_new();
151 tcp_chr_set_client_ioc_name(chr, sioc); 150 tcp_chr_set_client_ioc_name(chr, sioc);
152@@ -985,10 +1057,26 @@ 151@@ -985,10 +1057,26 @@ static void qemu_chr_parse_socket(QemuOpts *opts, ChardevBackend *backend,
153 const char *host = qemu_opt_get(opts, "host"); 152 const char *host = qemu_opt_get(opts, "host");
154 const char *port = qemu_opt_get(opts, "port"); 153 const char *port = qemu_opt_get(opts, "port");
155 const char *tls_creds = qemu_opt_get(opts, "tls-creds"); 154 const char *tls_creds = qemu_opt_get(opts, "tls-creds");
@@ -176,7 +175,7 @@ index 53eda8ef00..f566107c35 100644
176 if (!path) { 175 if (!path) {
177 if (!host) { 176 if (!host) {
178 error_setg(errp, "chardev: socket: no host given"); 177 error_setg(errp, "chardev: socket: no host given");
179@@ -1021,13 +1109,24 @@ 178@@ -1021,13 +1109,24 @@ static void qemu_chr_parse_socket(QemuOpts *opts, ChardevBackend *backend,
180 sock->has_reconnect = true; 179 sock->has_reconnect = true;
181 sock->reconnect = reconnect; 180 sock->reconnect = reconnect;
182 sock->tls_creds = g_strdup(tls_creds); 181 sock->tls_creds = g_strdup(tls_creds);
@@ -202,21 +201,21 @@ index 53eda8ef00..f566107c35 100644
202 addr->type = SOCKET_ADDRESS_LEGACY_KIND_INET; 201 addr->type = SOCKET_ADDRESS_LEGACY_KIND_INET;
203 addr->u.inet.data = g_new(InetSocketAddress, 1); 202 addr->u.inet.data = g_new(InetSocketAddress, 1);
204diff --git a/chardev/char.c b/chardev/char.c 203diff --git a/chardev/char.c b/chardev/char.c
205index 2ae4f465ec..5d52cd5de5 100644 204index 2ae4f46..5d52cd5 100644
206--- a/chardev/char.c 205--- a/chardev/char.c
207+++ b/chardev/char.c 206+++ b/chardev/char.c
208@@ -792,6 +792,9 @@ QemuOptsList qemu_chardev_opts = { 207@@ -793,6 +793,9 @@ QemuOptsList qemu_chardev_opts = {
209 },{
210 .name = "path", 208 .name = "path",
211 .type = QEMU_OPT_STRING, 209 .type = QEMU_OPT_STRING,
212+ },{ 210 },{
213+ .name = "cmd", 211+ .name = "cmd",
214+ .type = QEMU_OPT_STRING, 212+ .type = QEMU_OPT_STRING,
215 },{ 213+ },{
216 .name = "host", 214 .name = "host",
217 .type = QEMU_OPT_STRING, 215 .type = QEMU_OPT_STRING,
216 },{
218diff --git a/qapi/char.json b/qapi/char.json 217diff --git a/qapi/char.json b/qapi/char.json
219index ae19dcd1ed..6de0f29bcd 100644 218index ae19dcd..6de0f29 100644
220--- a/qapi/char.json 219--- a/qapi/char.json
221+++ b/qapi/char.json 220+++ b/qapi/char.json
222@@ -241,6 +241,10 @@ 221@@ -241,6 +241,10 @@
@@ -238,5 +237,3 @@ index ae19dcd1ed..6de0f29bcd 100644
238 '*tls-creds' : 'str', 237 '*tls-creds' : 'str',
239 '*server' : 'bool', 238 '*server' : 'bool',
240 '*wait' : 'bool', 239 '*wait' : 'bool',
241--
2422.14.1
diff --git a/meta/recipes-devtools/qemu/qemu/apic-fixup-fallthrough-to-PIC.patch b/meta/recipes-devtools/qemu/qemu/0009-apic-fixup-fallthrough-to-PIC.patch
index d6a3522eda..915bfdac58 100644
--- a/meta/recipes-devtools/qemu/qemu/apic-fixup-fallthrough-to-PIC.patch
+++ b/meta/recipes-devtools/qemu/qemu/0009-apic-fixup-fallthrough-to-PIC.patch
@@ -1,7 +1,7 @@
1From bef93bb81588b5323a52d2e1886f2a77b64a976b Mon Sep 17 00:00:00 2001 1From 945f428016f278fa8e38bc8d153397c3195f85a5 Mon Sep 17 00:00:00 2001
2From: Mark Asselstine <mark.asselstine@windriver.com> 2From: Mark Asselstine <mark.asselstine@windriver.com>
3Date: Tue, 26 Feb 2013 11:43:28 -0500 3Date: Tue, 26 Feb 2013 11:43:28 -0500
4Subject: [PATCH 03/18] apic: fixup fallthrough to PIC 4Subject: [PATCH] apic: fixup fallthrough to PIC
5 5
6Commit 0e21e12bb311c4c1095d0269dc2ef81196ccb60a [Don't route PIC 6Commit 0e21e12bb311c4c1095d0269dc2ef81196ccb60a [Don't route PIC
7interrupts through the local APIC if the local APIC config says so.] 7interrupts through the local APIC if the local APIC config says so.]
@@ -28,11 +28,11 @@ Signed-off-by: He Zhe <zhe.he@windriver.com>
28 hw/intc/apic.c | 2 +- 28 hw/intc/apic.c | 2 +-
29 1 file changed, 1 insertion(+), 1 deletion(-) 29 1 file changed, 1 insertion(+), 1 deletion(-)
30 30
31Index: qemu-2.11.1/hw/intc/apic.c 31diff --git a/hw/intc/apic.c b/hw/intc/apic.c
32=================================================================== 32index fe15fb6..8352c39 100644
33--- qemu-2.11.1.orig/hw/intc/apic.c 33--- a/hw/intc/apic.c
34+++ qemu-2.11.1/hw/intc/apic.c 34+++ b/hw/intc/apic.c
35@@ -591,7 +591,7 @@ int apic_accept_pic_intr(DeviceState *de 35@@ -591,7 +591,7 @@ int apic_accept_pic_intr(DeviceState *dev)
36 APICCommonState *s = APIC(dev); 36 APICCommonState *s = APIC(dev);
37 uint32_t lvt0; 37 uint32_t lvt0;
38 38
diff --git a/meta/recipes-devtools/qemu/qemu/linux-user-Fix-webkitgtk-hangs-on-32-bit-x86-target.patch b/meta/recipes-devtools/qemu/qemu/0010-linux-user-Fix-webkitgtk-hangs-on-32-bit-x86-target.patch
index d2c52252f6..ceb3980fc5 100644
--- a/meta/recipes-devtools/qemu/qemu/linux-user-Fix-webkitgtk-hangs-on-32-bit-x86-target.patch
+++ b/meta/recipes-devtools/qemu/qemu/0010-linux-user-Fix-webkitgtk-hangs-on-32-bit-x86-target.patch
@@ -1,4 +1,4 @@
1From 4fa4aae4176ef6d8f4d4b8323d061e2433918a26 Mon Sep 17 00:00:00 2001 1From 4333b2b269d997a719e19f00d044105e17700be2 Mon Sep 17 00:00:00 2001
2From: Alistair Francis <alistair.francis@xilinx.com> 2From: Alistair Francis <alistair.francis@xilinx.com>
3Date: Wed, 17 Jan 2018 10:51:49 -0800 3Date: Wed, 17 Jan 2018 10:51:49 -0800
4Subject: [PATCH] linux-user: Fix webkitgtk hangs on 32-bit x86 target 4Subject: [PATCH] linux-user: Fix webkitgtk hangs on 32-bit x86 target
@@ -18,10 +18,10 @@ Signed-off-by: Alistair Francis <alistair.francis@xilinx.com>
18 1 file changed, 1 insertion(+), 1 deletion(-) 18 1 file changed, 1 insertion(+), 1 deletion(-)
19 19
20diff --git a/linux-user/main.c b/linux-user/main.c 20diff --git a/linux-user/main.c b/linux-user/main.c
21index 450eb3ce65..c7cc0a184e 100644 21index 146ee3e..1332b5c 100644
22--- a/linux-user/main.c 22--- a/linux-user/main.c
23+++ b/linux-user/main.c 23+++ b/linux-user/main.c
24@@ -77,7 +77,7 @@ do { \ 24@@ -78,7 +78,7 @@ do { \
25 (TARGET_LONG_BITS == 32 || defined(TARGET_ABI32)) 25 (TARGET_LONG_BITS == 32 || defined(TARGET_ABI32))
26 /* There are a number of places where we assign reserved_va to a variable 26 /* There are a number of places where we assign reserved_va to a variable
27 of type abi_ulong and expect it to fit. Avoid the last page. */ 27 of type abi_ulong and expect it to fit. Avoid the last page. */
@@ -30,6 +30,3 @@ index 450eb3ce65..c7cc0a184e 100644
30 # else 30 # else
31 # define MAX_RESERVED_VA (1ul << TARGET_VIRT_ADDR_SPACE_BITS) 31 # define MAX_RESERVED_VA (1ul << TARGET_VIRT_ADDR_SPACE_BITS)
32 # endif 32 # endif
33--
342.14.1
35
diff --git a/meta/recipes-devtools/qemu/qemu/memfd.patch b/meta/recipes-devtools/qemu/qemu/0011-memfd-fix-configure-test.patch
index 62e8d3800b..880cb980a0 100644
--- a/meta/recipes-devtools/qemu/qemu/memfd.patch
+++ b/meta/recipes-devtools/qemu/qemu/0011-memfd-fix-configure-test.patch
@@ -1,7 +1,4 @@
1Upstream-Status: Backport 1From 0c8af3f651a125d636a71d93bafd35ff5240431a Mon Sep 17 00:00:00 2001
2Signed-off-by: Ross Burton <ross.burton@intel.com>
3
4From 75e5b70e6b5dcc4f2219992d7cffa462aa406af0 Mon Sep 17 00:00:00 2001
5From: Paolo Bonzini <pbonzini@redhat.com> 2From: Paolo Bonzini <pbonzini@redhat.com>
6Date: Tue, 28 Nov 2017 11:51:27 +0100 3Date: Tue, 28 Nov 2017 11:51:27 +0100
7Subject: [PATCH] memfd: fix configure test 4Subject: [PATCH] memfd: fix configure test
@@ -19,6 +16,8 @@ file actually does not exist---it is a typo in the memfd_create(2) man
19page. 16page.
20 17
21Cc: Marc-André Lureau <marcandre.lureau@redhat.com> 18Cc: Marc-André Lureau <marcandre.lureau@redhat.com>
19Upstream-Status: Backport
20Signed-off-by: Ross Burton <ross.burton@intel.com>
22Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> 21Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
23--- 22---
24 configure | 2 +- 23 configure | 2 +-
@@ -26,10 +25,10 @@ Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
26 2 files changed, 2 insertions(+), 4 deletions(-) 25 2 files changed, 2 insertions(+), 4 deletions(-)
27 26
28diff --git a/configure b/configure 27diff --git a/configure b/configure
29index 9c8aa5a98b..99ccc1725a 100755 28index b5312f4..ec12f36 100755
30--- a/configure 29--- a/configure
31+++ b/configure 30+++ b/configure
32@@ -3923,7 +3923,7 @@ fi 31@@ -3920,7 +3920,7 @@ fi
33 # check if memfd is supported 32 # check if memfd is supported
34 memfd=no 33 memfd=no
35 cat > $TMPC << EOF 34 cat > $TMPC << EOF
@@ -39,7 +38,7 @@ index 9c8aa5a98b..99ccc1725a 100755
39 int main(void) 38 int main(void)
40 { 39 {
41diff --git a/util/memfd.c b/util/memfd.c 40diff --git a/util/memfd.c b/util/memfd.c
42index 4571d1aba8..412e94a405 100644 41index 4571d1a..412e94a 100644
43--- a/util/memfd.c 42--- a/util/memfd.c
44+++ b/util/memfd.c 43+++ b/util/memfd.c
45@@ -31,9 +31,7 @@ 44@@ -31,9 +31,7 @@
@@ -53,5 +52,3 @@ index 4571d1aba8..412e94a405 100644
53 #include <sys/syscall.h> 52 #include <sys/syscall.h>
54 #include <asm/unistd.h> 53 #include <asm/unistd.h>
55 54
56--
572.11.0
diff --git a/meta/recipes-devtools/qemu/qemu/0001-arm-translate-a64-treat-DISAS_UPDATE-as-variant-of-D.patch b/meta/recipes-devtools/qemu/qemu/0012-arm-translate-a64-treat-DISAS_UPDATE-as-variant-of-D.patch
index f90cae694c..be92502095 100644
--- a/meta/recipes-devtools/qemu/qemu/0001-arm-translate-a64-treat-DISAS_UPDATE-as-variant-of-D.patch
+++ b/meta/recipes-devtools/qemu/qemu/0012-arm-translate-a64-treat-DISAS_UPDATE-as-variant-of-D.patch
@@ -1,4 +1,4 @@
1From a75a52d62418dafe462be4fe30485501d1010bb9 Mon Sep 17 00:00:00 2001 1From 7354b9b24c36ee712bb6e881d39504bf1b6a4c8b Mon Sep 17 00:00:00 2001
2From: Victor Kamensky <kamensky@cisco.com> 2From: Victor Kamensky <kamensky@cisco.com>
3Date: Fri, 23 Mar 2018 18:26:45 +0000 3Date: Fri, 23 Mar 2018 18:26:45 +0000
4Subject: [PATCH] arm/translate-a64: treat DISAS_UPDATE as variant of 4Subject: [PATCH] arm/translate-a64: treat DISAS_UPDATE as variant of
@@ -43,10 +43,10 @@ Upstream-Status: Backport
43 1 file changed, 3 insertions(+), 3 deletions(-) 43 1 file changed, 3 insertions(+), 3 deletions(-)
44 44
45diff --git a/target/arm/translate-a64.c b/target/arm/translate-a64.c 45diff --git a/target/arm/translate-a64.c b/target/arm/translate-a64.c
46index 31ff047..327513e 100644 46index 625ef2d..c381091 100644
47--- a/target/arm/translate-a64.c 47--- a/target/arm/translate-a64.c
48+++ b/target/arm/translate-a64.c 48+++ b/target/arm/translate-a64.c
49@@ -13378,12 +13378,12 @@ static void aarch64_tr_tb_stop(DisasContextBase *dcbase, CPUState *cpu) 49@@ -11384,12 +11384,12 @@ static void aarch64_tr_tb_stop(DisasContextBase *dcbase, CPUState *cpu)
50 case DISAS_UPDATE: 50 case DISAS_UPDATE:
51 gen_a64_set_pc_im(dc->pc); 51 gen_a64_set_pc_im(dc->pc);
52 /* fall through */ 52 /* fall through */
@@ -62,6 +62,3 @@ index 31ff047..327513e 100644
62 case DISAS_NORETURN: 62 case DISAS_NORETURN:
63 case DISAS_SWI: 63 case DISAS_SWI:
64 break; 64 break;
65--
662.7.4
67
diff --git a/meta/recipes-devtools/qemu/qemu/check-PS2Queue-pointers-in-post_load-routine.patch b/meta/recipes-devtools/qemu/qemu/0013-ps2-check-PS2Queue-pointers-in-post_load-routine.patch
index f8d7f66ace..d2bdf6b017 100644
--- a/meta/recipes-devtools/qemu/qemu/check-PS2Queue-pointers-in-post_load-routine.patch
+++ b/meta/recipes-devtools/qemu/qemu/0013-ps2-check-PS2Queue-pointers-in-post_load-routine.patch
@@ -1,4 +1,4 @@
1From ee9a17d0e12143971a9676227cce953c0dbe52fb Mon Sep 17 00:00:00 2001 1From 065061dca34fa5b91be6dce9a87a8755d8826c78 Mon Sep 17 00:00:00 2001
2From: Prasad J Pandit <pjp@fedoraproject.org> 2From: Prasad J Pandit <pjp@fedoraproject.org>
3Date: Thu, 16 Nov 2017 13:21:55 +0530 3Date: Thu, 16 Nov 2017 13:21:55 +0530
4Subject: [PATCH] ps2: check PS2Queue pointers in post_load routine 4Subject: [PATCH] ps2: check PS2Queue pointers in post_load routine
@@ -58,6 +58,3 @@ index f388a23..de171a2 100644
58 /* reset rptr/wptr/count */ 58 /* reset rptr/wptr/count */
59 q->rptr = 0; 59 q->rptr = 0;
60 q->wptr = size; 60 q->wptr = size;
61--
622.7.4
63
diff --git a/meta/recipes-devtools/qemu/qemu/fix-libcap-header-issue-on-some-distro.patch b/meta/recipes-devtools/qemu/qemu/0014-fix-libcap-header-issue-on-some-distro.patch
index cee6a676ab..b662a41508 100644
--- a/meta/recipes-devtools/qemu/qemu/fix-libcap-header-issue-on-some-distro.patch
+++ b/meta/recipes-devtools/qemu/qemu/0014-fix-libcap-header-issue-on-some-distro.patch
@@ -1,4 +1,7 @@
1fix libcap header issue on some distro 1From 47fdb0b6e2e393194a8c81544c647fdd997aec7f Mon Sep 17 00:00:00 2001
2From: Hongxu Jia <hongxu.jia@windriver.com>
3Date: Tue, 12 Mar 2013 09:54:06 +0800
4Subject: [PATCH] fix libcap header issue on some distro
2 5
31, When build qemu-native on SLED 11.2, there is an error: 61, When build qemu-native on SLED 11.2, there is an error:
4... 7...
@@ -52,13 +55,14 @@ http://patchwork.linuxtv.org/patch/12748/
52Upstream-Status: Pending 55Upstream-Status: Pending
53Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> 56Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
54--- 57---
55 fsdev/virtfs-proxy-helper.c | 7 +++++-- 58 fsdev/virtfs-proxy-helper.c | 7 +++++--
56 1 file changed, 5 insertions(+), 2 deletions(-) 59 1 file changed, 5 insertions(+), 2 deletions(-)
57 60
58diff --git a/fsdev/virtfs-proxy-helper.c b/fsdev/virtfs-proxy-helper.c 61diff --git a/fsdev/virtfs-proxy-helper.c b/fsdev/virtfs-proxy-helper.c
62index 8e48500..6490030 100644
59--- a/fsdev/virtfs-proxy-helper.c 63--- a/fsdev/virtfs-proxy-helper.c
60+++ b/fsdev/virtfs-proxy-helper.c 64+++ b/fsdev/virtfs-proxy-helper.c
61@@ -12,7 +12,6 @@ 65@@ -13,7 +13,6 @@
62 #include <sys/resource.h> 66 #include <sys/resource.h>
63 #include <getopt.h> 67 #include <getopt.h>
64 #include <syslog.h> 68 #include <syslog.h>
@@ -66,7 +70,7 @@ diff --git a/fsdev/virtfs-proxy-helper.c b/fsdev/virtfs-proxy-helper.c
66 #include <sys/fsuid.h> 70 #include <sys/fsuid.h>
67 #include <sys/vfs.h> 71 #include <sys/vfs.h>
68 #include <sys/ioctl.h> 72 #include <sys/ioctl.h>
69@@ -26,7 +25,11 @@ 73@@ -27,7 +26,11 @@
70 #include "9p-iov-marshal.h" 74 #include "9p-iov-marshal.h"
71 #include "hw/9pfs/9p-proxy.h" 75 #include "hw/9pfs/9p-proxy.h"
72 #include "fsdev/9p-iov-marshal.h" 76 #include "fsdev/9p-iov-marshal.h"
@@ -79,6 +83,3 @@ diff --git a/fsdev/virtfs-proxy-helper.c b/fsdev/virtfs-proxy-helper.c
79 #define PROGNAME "virtfs-proxy-helper" 83 #define PROGNAME "virtfs-proxy-helper"
80 84
81 #ifndef XFS_SUPER_MAGIC 85 #ifndef XFS_SUPER_MAGIC
82--
831.7.10.4
84
diff --git a/meta/recipes-devtools/qemu/qemu/cpus.c-qemu_cpu_kick_thread_debugging.patch b/meta/recipes-devtools/qemu/qemu/0015-cpus.c-Add-error-messages-when-qemi_cpu_kick_thread-.patch
index 6822132541..a5621caa95 100644
--- a/meta/recipes-devtools/qemu/qemu/cpus.c-qemu_cpu_kick_thread_debugging.patch
+++ b/meta/recipes-devtools/qemu/qemu/0015-cpus.c-Add-error-messages-when-qemi_cpu_kick_thread-.patch
@@ -1,4 +1,4 @@
1From 697a834c35d19447b7dcdb9e1d9434bc6ce17c21 Mon Sep 17 00:00:00 2001 1From db914e0f93a32b6731a636517002ecadc207718b Mon Sep 17 00:00:00 2001
2From: =?UTF-8?q?An=C3=ADbal=20Lim=C3=B3n?= <anibal.limon@linux.intel.com> 2From: =?UTF-8?q?An=C3=ADbal=20Lim=C3=B3n?= <anibal.limon@linux.intel.com>
3Date: Wed, 12 Aug 2015 15:11:30 -0500 3Date: Wed, 12 Aug 2015 15:11:30 -0500
4Subject: [PATCH] cpus.c: Add error messages when qemi_cpu_kick_thread fails. 4Subject: [PATCH] cpus.c: Add error messages when qemi_cpu_kick_thread fails.
@@ -19,10 +19,10 @@ Signed-off-by: Aníbal Limón <anibal.limon@linux.intel.com>
19 create mode 100644 custom_debug.h 19 create mode 100644 custom_debug.h
20 20
21diff --git a/cpus.c b/cpus.c 21diff --git a/cpus.c b/cpus.c
22index a822ce3..7e4786e 100644 22index 114c29b..c3dd2e0 100644
23--- a/cpus.c 23--- a/cpus.c
24+++ b/cpus.c 24+++ b/cpus.c
25@@ -1080,6 +1080,8 @@ static void *qemu_tcg_cpu_thread_fn(void *arg) 25@@ -1510,6 +1510,8 @@ static void *qemu_tcg_cpu_thread_fn(void *arg)
26 return NULL; 26 return NULL;
27 } 27 }
28 28
@@ -31,7 +31,7 @@ index a822ce3..7e4786e 100644
31 static void qemu_cpu_kick_thread(CPUState *cpu) 31 static void qemu_cpu_kick_thread(CPUState *cpu)
32 { 32 {
33 #ifndef _WIN32 33 #ifndef _WIN32
34@@ -1088,6 +1090,9 @@ static void qemu_cpu_kick_thread(CPUState *cpu) 34@@ -1522,6 +1524,9 @@ static void qemu_cpu_kick_thread(CPUState *cpu)
35 err = pthread_kill(cpu->thread->thread, SIG_IPI); 35 err = pthread_kill(cpu->thread->thread, SIG_IPI);
36 if (err) { 36 if (err) {
37 fprintf(stderr, "qemu:%s: %s", __func__, strerror(err)); 37 fprintf(stderr, "qemu:%s: %s", __func__, strerror(err));
@@ -71,6 +71,3 @@ index 0000000..f029e45
71+ 71+
72+ free(symbols); 72+ free(symbols);
73+} 73+}
74--
751.9.1
76
diff --git a/meta/recipes-devtools/qemu/qemu/no-valgrind.patch b/meta/recipes-devtools/qemu/qemu/no-valgrind.patch
deleted file mode 100644
index 91f728042d..0000000000
--- a/meta/recipes-devtools/qemu/qemu/no-valgrind.patch
+++ /dev/null
@@ -1,19 +0,0 @@
1There isn't an option to enable or disable valgrind support, so disable it to avoid non-deterministic builds.
2
3Upstream-Status: Inappropriate
4Signed-off-by: Ross Burton <ross.burton@intel.com>
5
6diff --git a/configure b/configure
7index b3c4f51..4d3929e 100755
8--- a/configure
9+++ b/configure
10@@ -4193,9 +4192,0 @@ valgrind_h=no
11-cat > $TMPC << EOF
12-#include <valgrind/valgrind.h>
13-int main(void) {
14- return 0;
15-}
16-EOF
17-if compile_prog "" "" ; then
18- valgrind_h=yes
19-fi
diff --git a/meta/recipes-devtools/qemu/qemu_2.11.1.bb b/meta/recipes-devtools/qemu/qemu_2.11.1.bb
index ab82c5fe56..2314262d7a 100644
--- a/meta/recipes-devtools/qemu/qemu_2.11.1.bb
+++ b/meta/recipes-devtools/qemu/qemu_2.11.1.bb
@@ -9,27 +9,26 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=441c28d2cf86e15a37fa47e15a72fbac \
9 9
10SRC_URI = "http://wiki.qemu-project.org/download/${BP}.tar.bz2 \ 10SRC_URI = "http://wiki.qemu-project.org/download/${BP}.tar.bz2 \
11 file://powerpc_rom.bin \ 11 file://powerpc_rom.bin \
12 file://disable-grabs.patch \ 12 file://0001-sdl.c-allow-user-to-disable-pointer-grabs.patch \
13 file://wacom.patch \ 13 file://0002-qemu-Add-missing-wacom-HID-descriptor.patch \
14 file://add-ptest-in-makefile-v10.patch \ 14 file://0003-Add-subpackage-ptest-which-runs-all-unit-test-cases-.patch \
15 file://run-ptest \ 15 file://run-ptest \
16 file://qemu-enlarge-env-entry-size.patch \ 16 file://0004-qemu-Add-addition-environment-space-to-boot-loader-q.patch \
17 file://no-valgrind.patch \ 17 file://0005-qemu-disable-Valgrind.patch \
18 file://pathlimit.patch \ 18 file://0006-qemu-Limit-paths-searched-during-user-mode-emulation.patch \
19 file://qemu-2.5.0-cflags.patch \ 19 file://0007-qemu-native-set-ld.bfd-fix-cflags-and-set-some-envir.patch \
20 file://chardev-connect-socket-to-a-spawned-command.patch \ 20 file://0008-chardev-connect-socket-to-a-spawned-command.patch \
21 file://apic-fixup-fallthrough-to-PIC.patch \ 21 file://0009-apic-fixup-fallthrough-to-PIC.patch \
22 file://linux-user-Fix-webkitgtk-hangs-on-32-bit-x86-target.patch \ 22 file://0010-linux-user-Fix-webkitgtk-hangs-on-32-bit-x86-target.patch \
23 file://memfd.patch \ 23 file://0011-memfd-fix-configure-test.patch \
24 file://0001-arm-translate-a64-treat-DISAS_UPDATE-as-variant-of-D.patch \ 24 file://0012-arm-translate-a64-treat-DISAS_UPDATE-as-variant-of-D.patch \
25 file://check-PS2Queue-pointers-in-post_load-routine.patch \ 25 file://0013-ps2-check-PS2Queue-pointers-in-post_load-routine.patch \
26 " 26 "
27UPSTREAM_CHECK_REGEX = "qemu-(?P<pver>\d+\..*)\.tar" 27UPSTREAM_CHECK_REGEX = "qemu-(?P<pver>\d+\..*)\.tar"
28 28
29
30SRC_URI_append_class-native = " \ 29SRC_URI_append_class-native = " \
31 file://fix-libcap-header-issue-on-some-distro.patch \ 30 file://0014-fix-libcap-header-issue-on-some-distro.patch \
32 file://cpus.c-qemu_cpu_kick_thread_debugging.patch \ 31 file://0015-cpus.c-Add-error-messages-when-qemi_cpu_kick_thread-.patch \
33 " 32 "
34 33
35SRC_URI[md5sum] = "61cf862b6007eba4ac98247776af2e27" 34SRC_URI[md5sum] = "61cf862b6007eba4ac98247776af2e27"