Patchwork [meta-fsl-ppc,12/39] qemu: update to QEMU 1.7

login
register
mail settings
Submitter Ting Liu
Date July 2, 2014, 3:01 a.m.
Message ID <1404270108-3448-13-git-send-email-ting.liu@freescale.com>
Download mbox | patch
Permalink /patch/74617/
State Superseded
Headers show

Comments

Ting Liu - July 2, 2014, 3:01 a.m.
From: Stuart Yoder <stuart.yoder@freescale.com>

Signed-off-by: Stuart Yoder <stuart.yoder@freescale.com>
---
 conf/machine/e500mc.inc                            |    2 +-
 conf/machine/e500v2.inc                            |    2 +-
 conf/machine/e5500-64b.inc                         |    2 +-
 conf/machine/e5500.inc                             |    2 +-
 conf/machine/e6500-64b.inc                         |    2 +-
 conf/machine/e6500.inc                             |    2 +-
 ...x-texinfo-table-markup-in-qemu-options.hx.patch |  201 --------------------
 ...x-generating-qemu-doc.html-with-texinfo-5.patch |   54 ------
 recipes-devtools/qemu/files/add-gtk-options.patch  |   13 --
 .../qemu/files/add-libssh2-options.patch           |   22 ---
 recipes-devtools/qemu/files/fdt_header.patch       |   39 ----
 .../fix-libcap-header-issue-on-some-distro.patch   |   84 --------
 recipes-devtools/qemu/files/relocatable_sdk.patch  |   34 ----
 recipes-devtools/qemu/qemu_fslgit.bb               |   16 +-
 14 files changed, 10 insertions(+), 465 deletions(-)
 delete mode 100644 recipes-devtools/qemu/files/0001-doc-Fix-texinfo-table-markup-in-qemu-options.hx.patch
 delete mode 100644 recipes-devtools/qemu/files/0002-docs-Fix-generating-qemu-doc.html-with-texinfo-5.patch
 delete mode 100644 recipes-devtools/qemu/files/add-gtk-options.patch
 delete mode 100644 recipes-devtools/qemu/files/add-libssh2-options.patch
 delete mode 100644 recipes-devtools/qemu/files/fdt_header.patch
 delete mode 100644 recipes-devtools/qemu/files/fix-libcap-header-issue-on-some-distro.patch
 delete mode 100644 recipes-devtools/qemu/files/relocatable_sdk.patch

Patch

diff --git a/conf/machine/e500mc.inc b/conf/machine/e500mc.inc
index c6571ea..2b06fd1 100644
--- a/conf/machine/e500mc.inc
+++ b/conf/machine/e500mc.inc
@@ -7,7 +7,7 @@  MACHINE_EXTRA_RRECOMMENDS = "u-boot udev-extraconf kernel-modules"
 
 PREFERRED_PROVIDER_virtual/kernel ?= "linux-qoriq-sdk"
 PREFERRED_VERSION_virtual/kernel ?= "3.0.34"
-PREFERRED_VERSION_qemu = "1.4+fsl"
+PREFERRED_VERSION_qemu = "1.7+fsl"
 
 KERNEL_IMAGETYPE ?= "uImage"
 # disable the images below for now
diff --git a/conf/machine/e500v2.inc b/conf/machine/e500v2.inc
index 107c9a7..cbdf3d9 100644
--- a/conf/machine/e500v2.inc
+++ b/conf/machine/e500v2.inc
@@ -5,7 +5,7 @@  MACHINE_EXTRA_RRECOMMENDS = "u-boot udev-extraconf kernel-modules"
 
 PREFERRED_PROVIDER_virtual/kernel ?= "linux-qoriq-sdk"
 PREFERRED_VERSION_virtual/kernel ?= "3.0.34"
-PREFERRED_VERSION_qemu = "1.4+fsl"
+PREFERRED_VERSION_qemu = "1.7+fsl"
 
 KERNEL_IMAGETYPE ?= "uImage"
 # disable the images below for now
diff --git a/conf/machine/e5500-64b.inc b/conf/machine/e5500-64b.inc
index 7dd1a47..c11c3c1 100644
--- a/conf/machine/e5500-64b.inc
+++ b/conf/machine/e5500-64b.inc
@@ -8,7 +8,7 @@  MACHINE_EXTRA_RRECOMMENDS = "u-boot udev-extraconf kernel-modules"
 
 PREFERRED_PROVIDER_virtual/kernel ?= "linux-qoriq-sdk"
 PREFERRED_VERSION_virtual/kernel ?= "3.0.34"
-PREFERRED_VERSION_qemu = "1.4+fsl"
+PREFERRED_VERSION_qemu = "1.7+fsl"
 
 KERNEL_IMAGETYPE ?= "uImage"
 # disable the images below for now
diff --git a/conf/machine/e5500.inc b/conf/machine/e5500.inc
index 198aa98..db51aa8 100644
--- a/conf/machine/e5500.inc
+++ b/conf/machine/e5500.inc
@@ -7,7 +7,7 @@  MACHINE_EXTRA_RRECOMMENDS = "u-boot udev-extraconf kernel-modules"
 
 PREFERRED_PROVIDER_virtual/kernel ?= "linux-qoriq-sdk"
 PREFERRED_VERSION_virtual/kernel ?= "3.0.34"
-PREFERRED_VERSION_qemu = "1.4+fsl"
+PREFERRED_VERSION_qemu = "1.7+fsl"
 
 KERNEL_IMAGETYPE ?= "uImage"
 # disable the images below for now
diff --git a/conf/machine/e6500-64b.inc b/conf/machine/e6500-64b.inc
index 9bbfa9e..8025103 100644
--- a/conf/machine/e6500-64b.inc
+++ b/conf/machine/e6500-64b.inc
@@ -8,7 +8,7 @@  MACHINE_EXTRA_RRECOMMENDS = "u-boot udev-extraconf kernel-modules"
 
 PREFERRED_PROVIDER_virtual/kernel ?= "linux-qoriq-sdk"
 PREFERRED_VERSION_virtual/kernel ?= "3.0.34"
-PREFERRED_VERSION_qemu = "1.4+fsl"
+PREFERRED_VERSION_qemu = "1.7+fsl"
 
 KERNEL_IMAGETYPE ?= "uImage"
 # disable the images below for now
diff --git a/conf/machine/e6500.inc b/conf/machine/e6500.inc
index 2d8a859..4401eb6 100644
--- a/conf/machine/e6500.inc
+++ b/conf/machine/e6500.inc
@@ -7,7 +7,7 @@  MACHINE_EXTRA_RRECOMMENDS = "u-boot udev-extraconf kernel-modules"
 
 PREFERRED_PROVIDER_virtual/kernel ?= "linux-qoriq-sdk"
 PREFERRED_VERSION_virtual/kernel ?= "3.0.34"
-PREFERRED_VERSION_qemu = "1.4+fsl"
+PREFERRED_VERSION_qemu = "1.7+fsl"
 
 KERNEL_IMAGETYPE ?= "uImage"
 # disable the images below for now
diff --git a/recipes-devtools/qemu/files/0001-doc-Fix-texinfo-table-markup-in-qemu-options.hx.patch b/recipes-devtools/qemu/files/0001-doc-Fix-texinfo-table-markup-in-qemu-options.hx.patch
deleted file mode 100644
index 30daf29..0000000
--- a/recipes-devtools/qemu/files/0001-doc-Fix-texinfo-table-markup-in-qemu-options.hx.patch
+++ /dev/null
@@ -1,201 +0,0 @@ 
-From 9a7146ca91c04d05af36684d8b3ca79c1254abc2 Mon Sep 17 00:00:00 2001
-From: Markus Armbruster <armbru@redhat.com>
-Date: Wed, 13 Feb 2013 19:49:40 +0100
-Subject: [PATCH 1/2] doc: Fix texinfo @table markup in qemu-options.hx
-
-End tables before headings, start new ones afterwards.  Fixes
-incorrect indentation of headings "File system options" and "Virtual
-File system pass-through options" in manual page and qemu-doc.
-
-Normalize markup some to increase chances it survives future edits.
-
-Upstream-Status: Backport
-
-Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
-Signed-off-by: Markus Armbruster <armbru@redhat.com>
-Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
-Message-id: 1360781383-28635-5-git-send-email-armbru@redhat.com
-Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
----
- qemu-options.hx | 56 +++++++++++++++++++++++++++++++++++++-------------------
- 1 file changed, 37 insertions(+), 19 deletions(-)
-
-diff --git a/qemu-options.hx b/qemu-options.hx
-index 9d7131a..54bd92a 100644
---- a/qemu-options.hx
-+++ b/qemu-options.hx
-@@ -537,13 +537,15 @@ STEXI
- @end table
- ETEXI
- 
--DEF("usb", 0, QEMU_OPTION_usb,
--    "-usb            enable the USB driver (will be the default soon)\n",
--    QEMU_ARCH_ALL)
- STEXI
- USB options:
- @table @option
-+ETEXI
- 
-+DEF("usb", 0, QEMU_OPTION_usb,
-+    "-usb            enable the USB driver (will be the default soon)\n",
-+    QEMU_ARCH_ALL)
-+STEXI
- @item -usb
- @findex -usb
- Enable the USB driver (will be the default soon)
-@@ -610,9 +612,15 @@ possible drivers and properties, use @code{-device help} and
- @code{-device @var{driver},help}.
- ETEXI
- 
-+STEXI
-+@end table
-+ETEXI
- DEFHEADING()
- 
- DEFHEADING(File system options:)
-+STEXI
-+@table @option
-+ETEXI
- 
- DEF("fsdev", HAS_ARG, QEMU_OPTION_fsdev,
-     "-fsdev fsdriver,id=id[,path=path,][security_model={mapped-xattr|mapped-file|passthrough|none}]\n"
-@@ -676,9 +684,15 @@ Specifies the tag name to be used by the guest to mount this export point
- 
- ETEXI
- 
-+STEXI
-+@end table
-+ETEXI
- DEFHEADING()
- 
- DEFHEADING(Virtual File system pass-through options:)
-+STEXI
-+@table @option
-+ETEXI
- 
- DEF("virtfs", HAS_ARG, QEMU_OPTION_virtfs,
-     "-virtfs local,path=path,mount_tag=tag,security_model=[mapped-xattr|mapped-file|passthrough|none]\n"
-@@ -769,11 +783,9 @@ ETEXI
- STEXI
- @end table
- ETEXI
--
- DEFHEADING()
- 
- DEFHEADING(Display options:)
--
- STEXI
- @table @option
- ETEXI
-@@ -1215,7 +1227,6 @@ ETEXI
- STEXI
- @end table
- ETEXI
--
- ARCHHEADING(, QEMU_ARCH_I386)
- 
- ARCHHEADING(i386 target only:, QEMU_ARCH_I386)
-@@ -1301,10 +1312,10 @@ Specify SMBIOS type 0 fields
- Specify SMBIOS type 1 fields
- ETEXI
- 
--DEFHEADING()
- STEXI
- @end table
- ETEXI
-+DEFHEADING()
- 
- DEFHEADING(Network options:)
- STEXI
-@@ -1718,13 +1729,19 @@ libpcap, so it can be analyzed with tools such as tcpdump or Wireshark.
- Indicate that no network devices should be configured. It is used to
- override the default configuration (@option{-net nic -net user}) which
- is activated if no @option{-net} options are provided.
-+ETEXI
- 
-+STEXI
- @end table
- ETEXI
--
- DEFHEADING()
- 
- DEFHEADING(Character device options:)
-+STEXI
-+
-+The general form of a character device option is:
-+@table @option
-+ETEXI
- 
- DEF("chardev", HAS_ARG, QEMU_OPTION_chardev,
-     "-chardev null,id=id[,mux=on|off]\n"
-@@ -1766,10 +1783,6 @@ DEF("chardev", HAS_ARG, QEMU_OPTION_chardev,
- )
- 
- STEXI
--
--The general form of a character device option is:
--@table @option
--
- @item -chardev @var{backend} ,id=@var{id} [,mux=on|off] [,@var{options}]
- @findex -chardev
- Backend is one of:
-@@ -1990,14 +2003,15 @@ Connect to a spice virtual machine channel, such as vdiport.
- 
- Connect to a spice port, allowing a Spice client to handle the traffic
- identified by a name (preferably a fqdn).
-+ETEXI
- 
-+STEXI
- @end table
- ETEXI
--
- DEFHEADING()
- 
--STEXI
- DEFHEADING(Device URL Syntax:)
-+STEXI
- 
- In addition to using normal file images for the emulated storage devices,
- QEMU can also use networked resources such as iSCSI devices. These are
-@@ -2113,10 +2127,16 @@ qemu-system-x86_84 --drive file=gluster://192.0.2.1/testvol/a.img
- @end example
- 
- See also @url{http://www.gluster.org}.
-+ETEXI
-+
-+STEXI
- @end table
- ETEXI
- 
- DEFHEADING(Bluetooth(R) options:)
-+STEXI
-+@table @option
-+ETEXI
- 
- DEF("bt", HAS_ARG, QEMU_OPTION_bt, \
-     "-bt hci,null    dumb bluetooth HCI - doesn't respond to commands\n" \
-@@ -2130,8 +2150,6 @@ DEF("bt", HAS_ARG, QEMU_OPTION_bt, \
-     "                emulate a bluetooth device 'dev' in scatternet 'n'\n",
-     QEMU_ARCH_ALL)
- STEXI
--@table @option
--
- @item -bt hci[...]
- @findex -bt
- Defines the function of the corresponding Bluetooth HCI.  -bt options
-@@ -2183,9 +2201,11 @@ currently:
- @item keyboard
- Virtual wireless keyboard implementing the HIDP bluetooth profile.
- @end table
--@end table
- ETEXI
- 
-+STEXI
-+@end table
-+ETEXI
- DEFHEADING()
- 
- DEFHEADING(Linux/Multiboot boot specific:)
--- 
-1.8.1.5
-
diff --git a/recipes-devtools/qemu/files/0002-docs-Fix-generating-qemu-doc.html-with-texinfo-5.patch b/recipes-devtools/qemu/files/0002-docs-Fix-generating-qemu-doc.html-with-texinfo-5.patch
deleted file mode 100644
index cabbf0e..0000000
--- a/recipes-devtools/qemu/files/0002-docs-Fix-generating-qemu-doc.html-with-texinfo-5.patch
+++ /dev/null
@@ -1,54 +0,0 @@ 
-From f983d4978e1c49ee936ad52bf2de0c531420f5f8 Mon Sep 17 00:00:00 2001
-From: Cole Robinson <crobinso@redhat.com>
-Date: Wed, 20 Feb 2013 07:20:31 +0000
-Subject: [PATCH 2/2] docs: Fix generating qemu-doc.html with texinfo 5
-
-LC_ALL=C makeinfo --no-headers --no-split --number-sections --html qemu-doc.texi -o qemu-doc.html
-./qemu-options.texi:1521: unknown command `list'
-./qemu-options.texi:1521: table requires an argument: the formatter for @item
-./qemu-options.texi:1521: warning: @table has text but no @item
-
-Upstream-Status: Pending
-http://patchwork.ozlabs.org/patch/222131/
-
-CC: qemu-stable@nongnu.org
-Signed-off-by: Cole Robinson <crobinso@redhat.com>
-Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
-Reviewed-by: Markus Armbruster <armbru@redhat.com>
----
- qemu-options.hx | 19 +++++++------------
- 1 file changed, 7 insertions(+), 12 deletions(-)
-
-diff --git a/qemu-options.hx b/qemu-options.hx
-index 54bd92a..5d2d9b8 100644
---- a/qemu-options.hx
-+++ b/qemu-options.hx
-@@ -2089,18 +2089,13 @@ QEMU supports using either local sheepdog devices or remote networked
- devices.
- 
- Syntax for specifying a sheepdog device
--@table @list
--``sheepdog:<vdiname>''
--
--``sheepdog:<vdiname>:<snapid>''
--
--``sheepdog:<vdiname>:<tag>''
--
--``sheepdog:<host>:<port>:<vdiname>''
--
--``sheepdog:<host>:<port>:<vdiname>:<snapid>''
--
--``sheepdog:<host>:<port>:<vdiname>:<tag>''
-+@table @code
-+@item sheepdog:<vdiname>
-+@item sheepdog:<vdiname>:<snapid>
-+@item sheepdog:<vdiname>:<tag>
-+@item sheepdog:<host>:<port>:<vdiname>
-+@item sheepdog:<host>:<port>:<vdiname>:<snapid>
-+@item sheepdog:<host>:<port>:<vdiname>:<tag>
- @end table
- 
- Example
--- 
-1.8.1.5
-
diff --git a/recipes-devtools/qemu/files/add-gtk-options.patch b/recipes-devtools/qemu/files/add-gtk-options.patch
deleted file mode 100644
index d8522de..0000000
--- a/recipes-devtools/qemu/files/add-gtk-options.patch
+++ /dev/null
@@ -1,13 +0,0 @@ 
---- a/configure.old	2013-12-11 21:24:44.422276752 -0600
-+++ b/configure	2013-12-11 21:27:26.954335983 -0600
-@@ -897,6 +897,10 @@
-   ;;
-   --enable-virtio-blk-data-plane) virtio_blk_data_plane="yes"
-   ;;
-+  --disable-gtk) gtk="no"
-+  ;;
-+  --enable-gtk) gtk="yes"
-+  ;;
-   *) echo "ERROR: unknown option $opt"; show_help="yes"
-   ;;
-   esac
diff --git a/recipes-devtools/qemu/files/add-libssh2-options.patch b/recipes-devtools/qemu/files/add-libssh2-options.patch
deleted file mode 100644
index 07b9350..0000000
--- a/recipes-devtools/qemu/files/add-libssh2-options.patch
+++ /dev/null
@@ -1,22 +0,0 @@ 
-Upstream-Status: Inappropriate [configuration]
-
-Freescale qemu configure do not include libssh2 options.
-In order to configure pass , dummy libssh2 options is added to 
-freescale qemu configure
-
-Signed-off-by: Chunrong Guo <b40290@freescale.com>
-
-
---- a/configure.old	2014-05-26 12:08:09.000000000 +0800
-+++ b/configure	2014-05-26 12:10:23.000000000 +0800
-@@ -897,6 +897,10 @@
-   ;;
-   --enable-virtio-blk-data-plane) virtio_blk_data_plane="yes"
-   ;;
-+  --disable-libssh2) libssh2="no"
-+  ;;
-+  --enable-libssh2) libssh2="yes"
-+  ;;
-   --disable-gtk) gtk="no"
-   ;;
-   --enable-gtk) gtk="yes"
diff --git a/recipes-devtools/qemu/files/fdt_header.patch b/recipes-devtools/qemu/files/fdt_header.patch
deleted file mode 100644
index dccfe53..0000000
--- a/recipes-devtools/qemu/files/fdt_header.patch
+++ /dev/null
@@ -1,39 +0,0 @@ 
-Upstream-Status: Pending 
-
-qemu: define fdt types in libfdt_env.h from qemu
-    
-    * fixes
-    In file included from /home/oe/setup-scripts/build/tmp-angstrom_next-uclibc/sysroots/x86_64-linux/usr/include/libfdt.h:55:0,
-                     from /home/oe/setup-scripts/build/tmp-angstrom_next-uclibc/work/x86_64-linux/qemu-native/1.4.0-r0/qemu-1.4.0/hw/arm/../../device_tree.c:28:
-    /home/oe/setup-scripts/build/tmp-angstrom_next-uclibc/sysroots/x86_64-linux/usr/include/fdt.h:58:2: error: unknown type name 'fdt32_t'
-    /home/oe/setup-scripts/build/tmp-angstrom_next-uclibc/sysroots/x86_64-linux/usr/include/fdt.h:59:2: error: unknown type name 'fdt32_t'
-    /home/oe/setup-scripts/build/tmp-angstrom_next-uclibc/sysroots/x86_64-linux/usr/include/fdt.h:60:2: error: unknown type name 'fdt32_t'
-    /home/oe/setup-scripts/build/tmp-angstrom_next-uclibc/sysroots/x86_64-linux/usr/include/fdt.h:61:2: error: unknown type name 'fdt32_t'
-    /home/oe/setup-scripts/build/tmp-angstrom_next-uclibc/sysroots/x86_64-linux/usr/include/fdt.h:62:2: error: unknown type name 'fdt32_t'
-    /home/oe/setup-scripts/build/tmp-angstrom_next-uclibc/sysroots/x86_64-linux/usr/include/fdt.h:63:2: error: unknown type name 'fdt32_t'
-    /home/oe/setup-scripts/build/tmp-angstrom_next-uclibc/sysroots/x86_64-linux/usr/include/fdt.h:64:2: error: unknown type name 'fdt32_t'
-    /home/oe/setup-scripts/build/tmp-angstrom_next-uclibc/sysroots/x86_64-linux/usr/include/fdt.h:67:2: error: unknown type name 'fdt32_t'
-    /home/oe/setup-scripts/build/tmp-angstrom_next-uclibc/sysroots/x86_64-linux/usr/include/fdt.h:70:2: error: unknown type name 'fdt32_t'
-    /home/oe/setup-scripts/build/tmp-angstrom_next-uclibc/sysroots/x86_64-linux/usr/include/fdt.h:73:2: error: unknown type name 'fdt32_t'
-    /home/oe/setup-scripts/build/tmp-angstrom_next-uclibc/sysroots/x86_64-linux/usr/include/fdt.h:77:2: error: unknown type name 'fdt64_t'
-    /home/oe/setup-scripts/build/tmp-angstrom_next-uclibc/sysroots/x86_64-linux/usr/include/fdt.h:78:2: error: unknown type name 'fdt64_t'
-    /home/oe/setup-scripts/build/tmp-angstrom_next-uclibc/sysroots/x86_64-linux/usr/include/fdt.h:82:2: error: unknown type name 'fdt32_t'
-    /home/oe/setup-scripts/build/tmp-angstrom_next-uclibc/sysroots/x86_64-linux/usr/include/fdt.h:87:2: error: unknown type name 'fdt32_t'
-    /home/oe/setup-scripts/build/tmp-angstrom_next-uclibc/sysroots/x86_64-linux/usr/include/fdt.h:88:2: error: unknown type name 'fdt32_t'
-    /home/oe/setup-scripts/build/tmp-angstrom_next-uclibc/sysroots/x86_64-linux/usr/include/fdt.h:89:2: error: unknown type name 'fdt32_t'
-
-Index: qemu-1.4.0/include/libfdt_env.h
-===================================================================
---- qemu-1.4.0.orig/include/libfdt_env.h	2013-02-15 23:05:35.000000000 +0000
-+++ qemu-1.4.0/include/libfdt_env.h	2013-04-13 14:17:27.918885225 +0000
-@@ -21,6 +21,10 @@
- 
- #include "qemu/bswap.h"
- 
-+typedef uint16_t fdt16_t;
-+typedef uint32_t fdt32_t;
-+typedef uint64_t fdt64_t;
-+
- #ifdef HOST_WORDS_BIGENDIAN
- #define fdt32_to_cpu(x)  (x)
- #define cpu_to_fdt32(x)  (x)
diff --git a/recipes-devtools/qemu/files/fix-libcap-header-issue-on-some-distro.patch b/recipes-devtools/qemu/files/fix-libcap-header-issue-on-some-distro.patch
deleted file mode 100644
index 13a6ea2..0000000
--- a/recipes-devtools/qemu/files/fix-libcap-header-issue-on-some-distro.patch
+++ /dev/null
@@ -1,84 +0,0 @@ 
-fix libcap header issue on some distro
-
-1, When build qemu-native on SLED 11.2, there is an error:
-...
-| In file included from /usr/include/bits/sigcontext.h:28,
-|  from /usr/include/signal.h:339,
-|  from /buildarea2/tmp/work/i686-linux/qemu-native/1.4.0-r0/
-qemu-1.4.0/include/qemu-common.h:42,
-|  from fsdev/virtfs-proxy-helper.c:23:
-|  /usr/include/asm/sigcontext.h:28: error: expected specifier-
-qualifier-list before '__u64'
-|  /usr/include/asm/sigcontext.h:191: error: expected specifier-
-qualifier-list before '__u64'
-...
-
-2, The virtfs-proxy-helper.c includes <sys/capability.h> and
-qemu-common.h in sequence. The header include map is:
-(`-->' presents `include')
-...
-"virtfs-proxy-helper.c" --> <sys/capability.h>
-...
-"virtfs-proxy-helper.c" --> "qemu-common.h" --> <signal.h> -->
-<bits/sigcontext.h> --> <asm/sigcontext.h> --> <linux/types.h> -->
-<asm/types.h> --> <asm-generic/types.h> --> <asm-generic/int-ll64.h>
-...
-
-3, The bug is found on SLED 11.2 x86. In libcap header file
-/usr/include/sys/capability.h, it does evil stuff like this:
-...
-  25 /*
-  26  * Make sure we can be included from userland by preventing
-  27  * capability.h from including other kernel headers
-  28  */
-  29 #define _LINUX_TYPES_H
-  30 #define _LINUX_FS_H
-  31 #define __LINUX_COMPILER_H
-  32 #define __user
-  33
-  34 typedef unsigned int __u32;
-  35 typedef __u32 __le32;
-...
-This completely prevents including /usr/include/linux/types.h.
-The above `<asm/sigcontext.h> --> <linux/types.h>' is prevented,
-and '__u64' is defined in <asm-generic/int-ll64.h>.
-
-4, Modify virtfs-proxy-helper.c to include <sys/capability.h>
-last to workaround the issue.
-
-http://www.linuxtv.org/pipermail/vdr/2009-August/021194.html
-http://patchwork.linuxtv.org/patch/12748/
-
-Upstream-Status: Pending
-Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
----
- fsdev/virtfs-proxy-helper.c |    7 +++++--
- 1 file changed, 5 insertions(+), 2 deletions(-)
-
-diff --git a/fsdev/virtfs-proxy-helper.c b/fsdev/virtfs-proxy-helper.c
---- a/fsdev/virtfs-proxy-helper.c
-+++ b/fsdev/virtfs-proxy-helper.c
-@@ -12,7 +12,6 @@
- #include <sys/resource.h>
- #include <getopt.h>
- #include <syslog.h>
--#include <sys/capability.h>
- #include <sys/fsuid.h>
- #include <sys/vfs.h>
- #include <sys/ioctl.h>
-@@ -26,7 +25,11 @@
- #include "virtio-9p-marshal.h"
- #include "hw/9pfs/virtio-9p-proxy.h"
- #include "fsdev/virtio-9p-marshal.h"
--
-+/*
-+ * Include this one last due to some versions of it being buggy:
-+ * http://www.linuxtv.org/pipermail/vdr/2009-August/021194.html
-+ */
-+#include <sys/capability.h>
- #define PROGNAME "virtfs-proxy-helper"
- 
- #ifndef XFS_SUPER_MAGIC
--- 
-1.7.10.4
-
diff --git a/recipes-devtools/qemu/files/relocatable_sdk.patch b/recipes-devtools/qemu/files/relocatable_sdk.patch
deleted file mode 100644
index 774a49c..0000000
--- a/recipes-devtools/qemu/files/relocatable_sdk.patch
+++ /dev/null
@@ -1,34 +0,0 @@ 
-Upstream-Status: Inappropriate [SDK specific]
-
-In order to be able to change the dynamic loader path when relocating
-binaries, the interp section has to be made big enough to accomodate
-the new path (4096 is the maximum path length in Linux).
-
-Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com>
-
-Index: qemu-1.4.0/ldscripts/i386.ld
-===================================================================
---- qemu-1.4.0.orig/ldscripts/i386.ld	2013-02-15 15:05:35.000000000 -0800
-+++ qemu-1.4.0/ldscripts/i386.ld	2013-02-28 22:55:36.138816418 -0800
-@@ -8,7 +8,7 @@
- {
-   /* Read-only sections, merged into text segment: */
-   . = 0x60000000 + SIZEOF_HEADERS;
--  .interp     : { *(.interp) 	}
-+  .interp     : { *(.interp); . = 0x1000; }
-   .hash          : { *(.hash)		}
-   .dynsym        : { *(.dynsym)		}
-   .dynstr        : { *(.dynstr)		}
-Index: qemu-1.4.0/ldscripts/x86_64.ld
-===================================================================
---- qemu-1.4.0.orig/ldscripts/x86_64.ld	2013-02-15 15:05:35.000000000 -0800
-+++ qemu-1.4.0/ldscripts/x86_64.ld	2013-02-28 22:55:36.138816418 -0800
-@@ -6,7 +6,7 @@
- {
-   /* Read-only sections, merged into text segment: */
-   . = 0x60000000 + SIZEOF_HEADERS;
--  .interp         : { *(.interp) }
-+  .interp         : { *(.interp); . = 0x1000; }
-   .hash           : { *(.hash) }
-   .dynsym         : { *(.dynsym) }
-   .dynstr         : { *(.dynstr) }
diff --git a/recipes-devtools/qemu/qemu_fslgit.bb b/recipes-devtools/qemu/qemu_fslgit.bb
index eab3db5..e76f350 100644
--- a/recipes-devtools/qemu/qemu_fslgit.bb
+++ b/recipes-devtools/qemu/qemu_fslgit.bb
@@ -3,24 +3,16 @@  require recipes-devtools/qemu/qemu.inc
 LIC_FILES_CHKSUM = "file://COPYING;md5=441c28d2cf86e15a37fa47e15a72fbac \
                     file://COPYING.LIB;endline=24;md5=c04def7ae38850e7d3ef548588159913"
 
-# This means v1.4 with FSL specific patches applied
-PV = "1.4+fsl"
+# This means QEMU v1.7 with FSL specific patches applied
+PV = "1.7+fsl"
 
 SRC_URI = "git://git.freescale.com/ppc/sdk/qemu.git;nobranch=1"
-SRCREV = "99231018edf75522aea2630e4089c9163566fb73"
-
-SRC_URI += " \
-   file://0001-doc-Fix-texinfo-table-markup-in-qemu-options.hx.patch \
-   file://0002-docs-Fix-generating-qemu-doc.html-with-texinfo-5.patch \
-   file://fdt_header.patch \
-   file://add-gtk-options.patch \
-   file://add-libssh2-options.patch \
-"
+SRCREV = "9e38e640275beabf6468a04cec5c403b2ac566ad"
 
 S = "${WORKDIR}/git"
 
 QEMU_TARGETS = "ppc"
-PPC_OECONF = '${SDL} --cross-prefix=${TARGET_PREFIX} --disable-werror --disable-vnc --audio-drv-list="" --audio-card-list="" --disable-bluez --disable-curl'
+PPC_OECONF = '${SDL} --cross-prefix=${TARGET_PREFIX} --disable-werror --disable-vnc --disable-bluez --disable-curl --enable-libusb'
 EXTRA_OECONF_e5500-64b = "--target-list=ppc64-softmmu ${PPC_OECONF}"
 EXTRA_OECONF_e6500-64b = "--target-list=ppc64-softmmu ${PPC_OECONF}"
 EXTRA_OECONF_e6500 = "--target-list=ppc64-softmmu ${PPC_OECONF}"