<div dir="ltr">It also segfaults when building emacs for x86* architecture, so let's see if it gets also fixed by 1.5</div><div class="gmail_extra"><br><br><div class="gmail_quote">On Tue, Jun 11, 2013 at 11:33 PM, Khem Raj <span dir="ltr"><<a href="mailto:raj.khem@gmail.com" target="_blank">raj.khem@gmail.com</a>></span> wrote:<br>
<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><div class="HOEnZb"><div class="h5">On Tue, Jun 11, 2013 at 7:27 AM, Saul Wold <<a href="mailto:sgw@linux.intel.com">sgw@linux.intel.com</a>> wrote:<br>
> On 06/10/2013 04:37 AM, Riku Voipio wrote:<br>
>><br>
>> On 6 June 2013 16:54, Saul Wold <<a href="mailto:sgw@linux.intel.com">sgw@linux.intel.com</a>> wrote:<br>
>>><br>
>>> On 06/06/2013 05:08 AM, Riku Voipio wrote:<br>
>>>><br>
>>>><br>
>>>> Patches removed:<br>
>>>><br>
>>>> 0001-doc-Fix-texinfo-table-markup-in-qemu-options.hx.patch<br>
>>>> - applied<br>
>>>> 0002-docs-Fix-generating-qemu-doc.html-with-texinfo-5.patch<br>
>>>> - fixed different upstream<br>
>>>> Revert-vmware_vga-Add-back-some-info-in-local-state-.patch<br>
>>>> - fixed different upstream<br>
>>>> arm-bgr.patch<br>
>>>> - this should be also fixed upstream, if still issue please resend.<br>
>>>> fallback-to-safe-mmap_min_addr.patch<br>
>>>> - this should be also fixed upstream, if still issue please resend.<br>
>>>> linker-flags.patch<br>
>>>> - unneeded with makefile changes<br>
>>>><br>
>>>> from configure the obsolete --audio-cards-list option has been removed.<br>
>><br>
>><br>
>>> Please describe how this was tested, as Qemu is a core part of OE-core we<br>
>>> have seen past failures on version updates. It's important to do<br>
>>> multi-architecture builds and execution with graphics.<br>
>><br>
>><br>
>>> Also will it build target binaries (for example the build appliance uses<br>
>>> qemu on the target) we have seen failures there also on updates.<br>
>><br>
>><br>
>> I've only tested building ARMv5 and ARMv7 systemd-gnome-images (which<br>
>> use qemu-native at some point of build. I just tested also building<br>
>> qemu for arm target and it builds fine. Differences between 1.4.1 and<br>
>> 1.5 in upstream are not that major that they should cause breakage in<br>
>> typical usecases. Setting IMAGETEST="qemu" did start qemu but the<br>
>> image didn't start. That however didn't work with 1.4.1 either.<br>
>><br>
><br>
> It really needs to be tested on more ARCHs other than ARM.<br>
><br>
> What kind of failure do you see with IMAGETEST, this works as we use it all<br>
> the time for the Autobuilder Sanity Testing.<br>
><br>
<br>
</div></div>FWIW, I have tested this patch by booting angstrom/systemd-image on<br>
qemuarm/qemumips/qemumips64/qemuppc/<br>
qemux86/qemux86-6 without a problem.<br>
<br>
Secondly there is a qemu segmentation fault with 1.4.1 qemu when<br>
trying to emulate mips64 is now fixed with 1.5<br>
so thats an improvement.<br>
<br>
Tested-by: Khem Raj <<a href="mailto:raj.khem@gmail.com">raj.khem@gmail.com</a>><br>
<div class="HOEnZb"><div class="h5"><br>
<br>
> Sau!<br>
><br>
><br>
>> Riku<br>
>><br>
>>> Thanks<br>
>>><br>
>>> Sau!<br>
>>><br>
>>><br>
>>>> ---<br>
>>>> ...x-texinfo-table-markup-in-qemu-options.hx.patch | 213<br>
>>>> --------------------<br>
>>>> ...x-generating-qemu-doc.html-with-texinfo-5.patch | 54 -----<br>
>>>> ...re_vga-Add-back-some-info-in-local-state-.patch | 114 -----------<br>
>>>> meta/recipes-devtools/qemu/files/arm-bgr.patch | 30 ---<br>
>>>> .../files/fallback-to-safe-mmap_min_addr.patch | 39 ----<br>
>>>> .../recipes-devtools/qemu/files/linker-flags.patch | 25 ---<br>
>>>> meta/recipes-devtools/qemu/qemu.inc | 7 +-<br>
>>>> .../qemu/{<a href="http://qemu_1.4.1.bb" target="_blank">qemu_1.4.1.bb</a> => <a href="http://qemu_1.5.0.bb" target="_blank">qemu_1.5.0.bb</a>} | 4 +-<br>
>>>> 8 files changed, 3 insertions(+), 483 deletions(-)<br>
>>>> delete mode 100644<br>
>>>><br>
>>>> meta/recipes-devtools/qemu/files/0001-doc-Fix-texinfo-table-markup-in-qemu-options.hx.patch<br>
>>>> delete mode 100644<br>
>>>><br>
>>>> meta/recipes-devtools/qemu/files/0002-docs-Fix-generating-qemu-doc.html-with-texinfo-5.patch<br>
>>>> delete mode 100644<br>
>>>><br>
>>>> meta/recipes-devtools/qemu/files/Revert-vmware_vga-Add-back-some-info-in-local-state-.patch<br>
>>>> delete mode 100644 meta/recipes-devtools/qemu/files/arm-bgr.patch<br>
>>>> delete mode 100644<br>
>>>> meta/recipes-devtools/qemu/files/fallback-to-safe-mmap_min_addr.patch<br>
>>>> delete mode 100644<br>
>>>> meta/recipes-devtools/qemu/files/linker-flags.patch<br>
>>>> rename meta/recipes-devtools/qemu/{<a href="http://qemu_1.4.1.bb" target="_blank">qemu_1.4.1.bb</a> => <a href="http://qemu_1.5.0.bb" target="_blank">qemu_1.5.0.bb</a>}<br>
>>>> (67%)<br>
>>>><br>
>>>> diff --git<br>
>>>><br>
>>>> a/meta/recipes-devtools/qemu/files/0001-doc-Fix-texinfo-table-markup-in-qemu-options.hx.patch<br>
>>>><br>
>>>> b/meta/recipes-devtools/qemu/files/0001-doc-Fix-texinfo-table-markup-in-qemu-options.hx.patch<br>
>>>> deleted file mode 100644<br>
>>>> index 9435cfe..0000000<br>
>>>> ---<br>
>>>><br>
>>>> a/meta/recipes-devtools/qemu/files/0001-doc-Fix-texinfo-table-markup-in-qemu-options.hx.patch<br>
>>>> +++ /dev/null<br>
>>>> @@ -1,213 +0,0 @@<br>
>>>> -From 9a7146ca91c04d05af36684d8b3ca79c1254abc2 Mon Sep 17 00:00:00 2001<br>
>>>> -From: Markus Armbruster <<a href="mailto:armbru@redhat.com">armbru@redhat.com</a>><br>
>>>> -Date: Wed, 13 Feb 2013 19:49:40 +0100<br>
>>>> -Subject: [PATCH 1/2] doc: Fix texinfo @table markup in qemu-options.hx<br>
>>>> -<br>
>>>> -End tables before headings, start new ones afterwards. Fixes<br>
>>>> -incorrect indentation of headings "File system options" and "Virtual<br>
>>>> -File system pass-through options" in manual page and qemu-doc.<br>
>>>> -<br>
>>>> -Normalize markup some to increase chances it survives future edits.<br>
>>>> -<br>
>>>> -Upstream-Status: Backport<br>
>>>> -<br>
>>>> -Signed-off-by: Martin Jansa <<a href="mailto:Martin.Jansa@gmail.com">Martin.Jansa@gmail.com</a>><br>
>>>> -Signed-off-by: Markus Armbruster <<a href="mailto:armbru@redhat.com">armbru@redhat.com</a>><br>
>>>> -Reviewed-by: Stefan Hajnoczi <<a href="mailto:stefanha@redhat.com">stefanha@redhat.com</a>><br>
>>>> -Message-id: <a href="mailto:1360781383-28635-5-git-send-email-armbru@redhat.com">1360781383-28635-5-git-send-email-armbru@redhat.com</a><br>
>>>> -Signed-off-by: Anthony Liguori <<a href="mailto:aliguori@us.ibm.com">aliguori@us.ibm.com</a>><br>
>>>> ----<br>
>>>> - qemu-options.hx | 56<br>
>>>> +++++++++++++++++++++++++++++++++++++-------------------<br>
>>>> - 1 file changed, 37 insertions(+), 19 deletions(-)<br>
>>>> -<br>
>>>> -diff --git a/qemu-options.hx b/qemu-options.hx<br>
>>>> -index 9d7131a..54bd92a 100644<br>
>>>> ---- a/qemu-options.hx<br>
>>>> -+++ b/qemu-options.hx<br>
>>>> -@@ -537,13 +537,15 @@ STEXI<br>
>>>> - @end table<br>
>>>> - ETEXI<br>
>>>> -<br>
>>>> --DEF("usb", 0, QEMU_OPTION_usb,<br>
>>>> -- "-usb enable the USB driver (will be the default<br>
>>>> soon)\n",<br>
>>>> -- QEMU_ARCH_ALL)<br>
>>>> - STEXI<br>
>>>> - USB options:<br>
>>>> - @table @option<br>
>>>> -+ETEXI<br>
>>>> -<br>
>>>> -+DEF("usb", 0, QEMU_OPTION_usb,<br>
>>>> -+ "-usb enable the USB driver (will be the default<br>
>>>> soon)\n",<br>
>>>> -+ QEMU_ARCH_ALL)<br>
>>>> -+STEXI<br>
>>>> - @item -usb<br>
>>>> - @findex -usb<br>
>>>> - Enable the USB driver (will be the default soon)<br>
>>>> -@@ -610,9 +612,15 @@ possible drivers and properties, use @code{-device<br>
>>>> help} and<br>
>>>> - @code{-device @var{driver},help}.<br>
>>>> - ETEXI<br>
>>>> -<br>
>>>> -+STEXI<br>
>>>> -+@end table<br>
>>>> -+ETEXI<br>
>>>> - DEFHEADING()<br>
>>>> -<br>
>>>> - DEFHEADING(File system options:)<br>
>>>> -+STEXI<br>
>>>> -+@table @option<br>
>>>> -+ETEXI<br>
>>>> -<br>
>>>> - DEF("fsdev", HAS_ARG, QEMU_OPTION_fsdev,<br>
>>>> - "-fsdev<br>
>>>><br>
>>>> fsdriver,id=id[,path=path,][security_model={mapped-xattr|mapped-file|passthrough|none}]\n"<br>
>>>> -@@ -676,9 +684,15 @@ Specifies the tag name to be used by the guest to<br>
>>>> mount this export point<br>
>>>> -<br>
>>>> - ETEXI<br>
>>>> -<br>
>>>> -+STEXI<br>
>>>> -+@end table<br>
>>>> -+ETEXI<br>
>>>> - DEFHEADING()<br>
>>>> -<br>
>>>> - DEFHEADING(Virtual File system pass-through options:)<br>
>>>> -+STEXI<br>
>>>> -+@table @option<br>
>>>> -+ETEXI<br>
>>>> -<br>
>>>> - DEF("virtfs", HAS_ARG, QEMU_OPTION_virtfs,<br>
>>>> - "-virtfs<br>
>>>><br>
>>>> local,path=path,mount_tag=tag,security_model=[mapped-xattr|mapped-file|passthrough|none]\n"<br>
>>>> -@@ -769,11 +783,9 @@ ETEXI<br>
>>>> - STEXI<br>
>>>> - @end table<br>
>>>> - ETEXI<br>
>>>> --<br>
>>>> - DEFHEADING()<br>
>>>> -<br>
>>>> - DEFHEADING(Display options:)<br>
>>>> --<br>
>>>> - STEXI<br>
>>>> - @table @option<br>
>>>> - ETEXI<br>
>>>> -@@ -1215,7 +1227,6 @@ ETEXI<br>
>>>> - STEXI<br>
>>>> - @end table<br>
>>>> - ETEXI<br>
>>>> --<br>
>>>> - ARCHHEADING(, QEMU_ARCH_I386)<br>
>>>> -<br>
>>>> - ARCHHEADING(i386 target only:, QEMU_ARCH_I386)<br>
>>>> -@@ -1301,10 +1312,10 @@ Specify SMBIOS type 0 fields<br>
>>>> - Specify SMBIOS type 1 fields<br>
>>>> - ETEXI<br>
>>>> -<br>
>>>> --DEFHEADING()<br>
>>>> - STEXI<br>
>>>> - @end table<br>
>>>> - ETEXI<br>
>>>> -+DEFHEADING()<br>
>>>> -<br>
>>>> - DEFHEADING(Network options:)<br>
>>>> - STEXI<br>
>>>> -@@ -1718,13 +1729,19 @@ libpcap, so it can be analyzed with tools such<br>
>>>> as<br>
>>>> tcpdump or Wireshark.<br>
>>>> - Indicate that no network devices should be configured. It is used to<br>
>>>> - override the default configuration (@option{-net nic -net user}) which<br>
>>>> - is activated if no @option{-net} options are provided.<br>
>>>> -+ETEXI<br>
>>>> -<br>
>>>> -+STEXI<br>
>>>> - @end table<br>
>>>> - ETEXI<br>
>>>> --<br>
>>>> - DEFHEADING()<br>
>>>> -<br>
>>>> - DEFHEADING(Character device options:)<br>
>>>> -+STEXI<br>
>>>> -+<br>
>>>> -+The general form of a character device option is:<br>
>>>> -+@table @option<br>
>>>> -+ETEXI<br>
>>>> -<br>
>>>> - DEF("chardev", HAS_ARG, QEMU_OPTION_chardev,<br>
>>>> - "-chardev null,id=id[,mux=on|off]\n"<br>
>>>> -@@ -1766,10 +1783,6 @@ DEF("chardev", HAS_ARG, QEMU_OPTION_chardev,<br>
>>>> - )<br>
>>>> -<br>
>>>> - STEXI<br>
>>>> --<br>
>>>> --The general form of a character device option is:<br>
>>>> --@table @option<br>
>>>> --<br>
>>>> - @item -chardev @var{backend} ,id=@var{id} [,mux=on|off]<br>
>>>> [,@var{options}]<br>
>>>> - @findex -chardev<br>
>>>> - Backend is one of:<br>
>>>> -@@ -1990,14 +2003,15 @@ Connect to a spice virtual machine channel,<br>
>>>> such<br>
>>>> as vdiport.<br>
>>>> -<br>
>>>> - Connect to a spice port, allowing a Spice client to handle the traffic<br>
>>>> - identified by a name (preferably a fqdn).<br>
>>>> -+ETEXI<br>
>>>> -<br>
>>>> -+STEXI<br>
>>>> - @end table<br>
>>>> - ETEXI<br>
>>>> --<br>
>>>> - DEFHEADING()<br>
>>>> -<br>
>>>> --STEXI<br>
>>>> - DEFHEADING(Device URL Syntax:)<br>
>>>> -+STEXI<br>
>>>> -<br>
>>>> - In addition to using normal file images for the emulated storage<br>
>>>> devices,<br>
>>>> - QEMU can also use networked resources such as iSCSI devices. These are<br>
>>>> -@@ -2113,10 +2127,16 @@ qemu-system-x86_84 --drive<br>
>>>> file=gluster://<a href="http://192.0.2.1/testvol/a.img" target="_blank">192.0.2.1/testvol/a.img</a><br>
>>>> - @end example<br>
>>>> -<br>
>>>> - See also @url{<a href="http://www.gluster.org" target="_blank">http://www.gluster.org</a>}.<br>
>>>> -+ETEXI<br>
>>>> -+<br>
>>>> -+STEXI<br>
>>>> - @end table<br>
>>>> - ETEXI<br>
>>>> -<br>
>>>> - DEFHEADING(Bluetooth(R) options:)<br>
>>>> -+STEXI<br>
>>>> -+@table @option<br>
>>>> -+ETEXI<br>
>>>> -<br>
>>>> - DEF("bt", HAS_ARG, QEMU_OPTION_bt, \<br>
>>>> - "-bt hci,null dumb bluetooth HCI - doesn't respond to<br>
>>>> commands\n"<br>
>>>> \<br>
>>>> -@@ -2130,8 +2150,6 @@ DEF("bt", HAS_ARG, QEMU_OPTION_bt, \<br>
>>>> - " emulate a bluetooth device 'dev' in scatternet<br>
>>>> 'n'\n",<br>
>>>> - QEMU_ARCH_ALL)<br>
>>>> - STEXI<br>
>>>> --@table @option<br>
>>>> --<br>
>>>> - @item -bt hci[...]<br>
>>>> - @findex -bt<br>
>>>> - Defines the function of the corresponding Bluetooth HCI. -bt options<br>
>>>> -@@ -2183,9 +2201,11 @@ currently:<br>
>>>> - @item keyboard<br>
>>>> - Virtual wireless keyboard implementing the HIDP bluetooth profile.<br>
>>>> - @end table<br>
>>>> --@end table<br>
>>>> - ETEXI<br>
>>>> -<br>
>>>> -+STEXI<br>
>>>> -+@end table<br>
>>>> -+ETEXI<br>
>>>> - DEFHEADING()<br>
>>>> -<br>
>>>> - DEFHEADING(Linux/Multiboot boot specific:)<br>
>>>> -@@ -2242,11 +2262,9 @@ ETEXI<br>
>>>> - STEXI<br>
>>>> - @end table<br>
>>>> - ETEXI<br>
>>>> --<br>
>>>> - DEFHEADING()<br>
>>>> -<br>
>>>> - DEFHEADING(Debug/Expert options:)<br>
>>>> --<br>
>>>> - STEXI<br>
>>>> - @table @option<br>
>>>> - ETEXI<br>
>>>> ---<br>
>>>> -1.8.1.5<br>
>>>> -<br>
>>>> diff --git<br>
>>>><br>
>>>> a/meta/recipes-devtools/qemu/files/0002-docs-Fix-generating-qemu-doc.html-with-texinfo-5.patch<br>
>>>><br>
>>>> b/meta/recipes-devtools/qemu/files/0002-docs-Fix-generating-qemu-doc.html-with-texinfo-5.patch<br>
>>>> deleted file mode 100644<br>
>>>> index cabbf0e..0000000<br>
>>>> ---<br>
>>>><br>
>>>> a/meta/recipes-devtools/qemu/files/0002-docs-Fix-generating-qemu-doc.html-with-texinfo-5.patch<br>
>>>> +++ /dev/null<br>
>>>> @@ -1,54 +0,0 @@<br>
>>>> -From f983d4978e1c49ee936ad52bf2de0c531420f5f8 Mon Sep 17 00:00:00 2001<br>
>>>> -From: Cole Robinson <<a href="mailto:crobinso@redhat.com">crobinso@redhat.com</a>><br>
>>>> -Date: Wed, 20 Feb 2013 07:20:31 +0000<br>
>>>> -Subject: [PATCH 2/2] docs: Fix generating qemu-doc.html with texinfo 5<br>
>>>> -<br>
>>>> -LC_ALL=C makeinfo --no-headers --no-split --number-sections --html<br>
>>>> qemu-doc.texi -o qemu-doc.html<br>
>>>> -./qemu-options.texi:1521: unknown command `list'<br>
>>>> -./qemu-options.texi:1521: table requires an argument: the formatter for<br>
>>>> @item<br>
>>>> -./qemu-options.texi:1521: warning: @table has text but no @item<br>
>>>> -<br>
>>>> -Upstream-Status: Pending<br>
>>>> -<a href="http://patchwork.ozlabs.org/patch/222131/" target="_blank">http://patchwork.ozlabs.org/patch/222131/</a><br>
>>>> -<br>
>>>> -CC: <a href="mailto:qemu-stable@nongnu.org">qemu-stable@nongnu.org</a><br>
>>>> -Signed-off-by: Cole Robinson <<a href="mailto:crobinso@redhat.com">crobinso@redhat.com</a>><br>
>>>> -Signed-off-by: Martin Jansa <<a href="mailto:Martin.Jansa@gmail.com">Martin.Jansa@gmail.com</a>><br>
>>>> -Reviewed-by: Markus Armbruster <<a href="mailto:armbru@redhat.com">armbru@redhat.com</a>><br>
>>>> ----<br>
>>>> - qemu-options.hx | 19 +++++++------------<br>
>>>> - 1 file changed, 7 insertions(+), 12 deletions(-)<br>
>>>> -<br>
>>>> -diff --git a/qemu-options.hx b/qemu-options.hx<br>
>>>> -index 54bd92a..5d2d9b8 100644<br>
>>>> ---- a/qemu-options.hx<br>
>>>> -+++ b/qemu-options.hx<br>
>>>> -@@ -2089,18 +2089,13 @@ QEMU supports using either local sheepdog<br>
>>>> devices<br>
>>>> or remote networked<br>
>>>> - devices.<br>
>>>> -<br>
>>>> - Syntax for specifying a sheepdog device<br>
>>>> --@table @list<br>
>>>> --``sheepdog:<vdiname>''<br>
>>>> --<br>
>>>> --``sheepdog:<vdiname>:<snapid>''<br>
>>>> --<br>
>>>> --``sheepdog:<vdiname>:<tag>''<br>
>>>> --<br>
>>>> --``sheepdog:<host>:<port>:<vdiname>''<br>
>>>> --<br>
>>>> --``sheepdog:<host>:<port>:<vdiname>:<snapid>''<br>
>>>> --<br>
>>>> --``sheepdog:<host>:<port>:<vdiname>:<tag>''<br>
>>>> -+@table @code<br>
>>>> -+@item sheepdog:<vdiname><br>
>>>> -+@item sheepdog:<vdiname>:<snapid><br>
>>>> -+@item sheepdog:<vdiname>:<tag><br>
>>>> -+@item sheepdog:<host>:<port>:<vdiname><br>
>>>> -+@item sheepdog:<host>:<port>:<vdiname>:<snapid><br>
>>>> -+@item sheepdog:<host>:<port>:<vdiname>:<tag><br>
>>>> - @end table<br>
>>>> -<br>
>>>> - Example<br>
>>>> ---<br>
>>>> -1.8.1.5<br>
>>>> -<br>
>>>> diff --git<br>
>>>><br>
>>>> a/meta/recipes-devtools/qemu/files/Revert-vmware_vga-Add-back-some-info-in-local-state-.patch<br>
>>>><br>
>>>> b/meta/recipes-devtools/qemu/files/Revert-vmware_vga-Add-back-some-info-in-local-state-.patch<br>
>>>> deleted file mode 100644<br>
>>>> index d56256e..0000000<br>
>>>> ---<br>
>>>><br>
>>>> a/meta/recipes-devtools/qemu/files/Revert-vmware_vga-Add-back-some-info-in-local-state-.patch<br>
>>>> +++ /dev/null<br>
>>>> @@ -1,114 +0,0 @@<br>
>>>> -From 2cf7df441ce4c36525ba4d2d040f8cb0b0c75f14 Mon Sep 17 00:00:00 2001<br>
>>>> -From: Constantin Musca <<a href="mailto:constantinx.musca@intel.com">constantinx.musca@intel.com</a>><br>
>>>> -Date: Fri, 7 Dec 2012 12:33:42 +0200<br>
>>>> -Subject: [PATCH] Revert "vmware_vga: Add back some info in local state<br>
>>>> - partially reverting aa32b38c"<br>
>>>> -<br>
>>>> -- this reverts commit 1f202568e0553b416483e5993f1bde219c22cf72<br>
>>>> -- do not cache the DS depth (the depth might change)<br>
>>>> -<br>
>>>> -Upstream-Status: Pending<br>
>>>> -Signed-off-by: Constantin Musca <<a href="mailto:constantinx.musca@intel.com">constantinx.musca@intel.com</a>><br>
>>>> ----<br>
>>>> - hw/vmware_vga.c | 30 +++++++++---------------------<br>
>>>> - 1 file changed, 9 insertions(+), 21 deletions(-)<br>
>>>> -<br>
>>>> -diff --git a/hw/vmware_vga.c b/hw/vmware_vga.c<br>
>>>> -index 834588d..7c766fb 100644<br>
>>>> ---- a/hw/vmware_vga.c<br>
>>>> -+++ b/hw/vmware_vga.c<br>
>>>> -@@ -39,8 +39,6 @@ struct vmsvga_state_s {<br>
>>>> - VGACommonState vga;<br>
>>>> -<br>
>>>> - int invalidated;<br>
>>>> -- int depth;<br>
>>>> -- int bypp;<br>
>>>> - int enable;<br>
>>>> - int config;<br>
>>>> - struct {<br>
>>>> -@@ -57,9 +55,6 @@ struct vmsvga_state_s {<br>
>>>> - int new_height;<br>
>>>> - uint32_t guest;<br>
>>>> - uint32_t svgaid;<br>
>>>> -- uint32_t wred;<br>
>>>> -- uint32_t wgreen;<br>
>>>> -- uint32_t wblue;<br>
>>>> - int syncing;<br>
>>>> -<br>
>>>> - MemoryRegion fifo_ram;<br>
>>>> -@@ -723,25 +718,25 @@ static uint32_t vmsvga_value_read(void *opaque,<br>
>>>> uint32_t address)<br>
>>>> - return SVGA_MAX_HEIGHT;<br>
>>>> -<br>
>>>> - case SVGA_REG_DEPTH:<br>
>>>> -- return s->depth;<br>
>>>> -+ return ds_get_depth(s->vga.ds);<br>
>>>> -<br>
>>>> - case SVGA_REG_BITS_PER_PIXEL:<br>
>>>> -- return (s->depth + 7) & ~7;<br>
>>>> -+ return ds_get_bits_per_pixel(s->vga.ds);<br>
>>>> -<br>
>>>> - case SVGA_REG_PSEUDOCOLOR:<br>
>>>> - return 0x0;<br>
>>>> -<br>
>>>> - case SVGA_REG_RED_MASK:<br>
>>>> -- return s->wred;<br>
>>>> -+ return ds_get_rmask(s->vga.ds);<br>
>>>> -<br>
>>>> - case SVGA_REG_GREEN_MASK:<br>
>>>> -- return s->wgreen;<br>
>>>> -+ return ds_get_gmask(s->vga.ds);<br>
>>>> -<br>
>>>> - case SVGA_REG_BLUE_MASK:<br>
>>>> -- return s->wblue;<br>
>>>> -+ return ds_get_bmask(s->vga.ds);<br>
>>>> -<br>
>>>> - case SVGA_REG_BYTES_PER_LINE:<br>
>>>> -- return s->bypp * s->new_width;<br>
>>>> -+ return ds_get_bytes_per_pixel(s->vga.ds) * s->new_width;<br>
>>>> -<br>
>>>> - case SVGA_REG_FB_START: {<br>
>>>> - struct pci_vmsvga_state_s *pci_vmsvga<br>
>>>> -@@ -806,7 +801,7 @@ static uint32_t vmsvga_value_read(void *opaque,<br>
>>>> uint32_t address)<br>
>>>> - return s->cursor.on;<br>
>>>> -<br>
>>>> - case SVGA_REG_HOST_BITS_PER_PIXEL:<br>
>>>> -- return (s->depth + 7) & ~7;<br>
>>>> -+ return ds_get_bits_per_pixel(s->vga.ds);<br>
>>>> -<br>
>>>> - case SVGA_REG_SCRATCH_SIZE:<br>
>>>> - return s->scratch_size;<br>
>>>> -@@ -869,7 +864,7 @@ static void vmsvga_value_write(void *opaque,<br>
>>>> uint32_t<br>
>>>> address, uint32_t value)<br>
>>>> - break;<br>
>>>> -<br>
>>>> - case SVGA_REG_BITS_PER_PIXEL:<br>
>>>> -- if (value != s->depth) {<br>
>>>> -+ if (value != ds_get_bits_per_pixel(s->vga.ds)) {<br>
>>>> - printf("%s: Bad bits per pixel: %i bits\n", __func__,<br>
>>>> value);<br>
>>>> - s->config = 0;<br>
>>>> - }<br>
>>>> -@@ -1089,7 +1084,7 @@ static const VMStateDescription<br>
>>>> vmstate_vmware_vga_internal = {<br>
>>>> - .minimum_version_id_old = 0,<br>
>>>> - .post_load = vmsvga_post_load,<br>
>>>> - .fields = (VMStateField[]) {<br>
>>>> -- VMSTATE_INT32_EQUAL(depth, struct vmsvga_state_s),<br>
>>>> -+ VMSTATE_UNUSED(4), /* was depth */<br>
>>>> - VMSTATE_INT32(enable, struct vmsvga_state_s),<br>
>>>> - VMSTATE_INT32(config, struct vmsvga_state_s),<br>
>>>> - VMSTATE_INT32(<a href="http://cursor.id" target="_blank">cursor.id</a>, struct vmsvga_state_s),<br>
>>>> -@@ -1142,13 +1137,6 @@ static void vmsvga_init(struct vmsvga_state_s<br>
>>>> *s,<br>
>>>> - vga_common_init(&s->vga);<br>
>>>> - vga_init(&s->vga, address_space, io, true);<br>
>>>> - vmstate_register(NULL, 0, &vmstate_vga_common, &s->vga);<br>
>>>> -- /* Save some values here in case they are changed later.<br>
>>>> -- * This is suspicious and needs more though why it is needed. */<br>
>>>> -- s->depth = ds_get_bits_per_pixel(s->vga.ds);<br>
>>>> -- s->bypp = ds_get_bytes_per_pixel(s->vga.ds);<br>
>>>> -- s->wred = ds_get_rmask(s->vga.ds);<br>
>>>> -- s->wgreen = ds_get_gmask(s->vga.ds);<br>
>>>> -- s->wblue = ds_get_bmask(s->vga.ds);<br>
>>>> - }<br>
>>>> -<br>
>>>> - static uint64_t vmsvga_io_read(void *opaque, hwaddr addr, unsigned<br>
>>>> size)<br>
>>>> ---<br>
>>>> -1.7.11.7<br>
>>>> -<br>
>>>> diff --git a/meta/recipes-devtools/qemu/files/arm-bgr.patch<br>
>>>> b/meta/recipes-devtools/qemu/files/arm-bgr.patch<br>
>>>> deleted file mode 100644<br>
>>>> index f3ebde6..0000000<br>
>>>> --- a/meta/recipes-devtools/qemu/files/arm-bgr.patch<br>
>>>> +++ /dev/null<br>
>>>> @@ -1,30 +0,0 @@<br>
>>>> -After kernel commit:<br>
>>>> -<br>
>>>><br>
>>>><br>
>>>> -<a href="http://git.yoctoproject.org/cgit/cgit.cgi/linux-yocto-3.0/commit/?h=meta&id=9728c1b6a724daefc413b44e10253cdbb5e06d08" target="_blank">http://git.yoctoproject.org/cgit/cgit.cgi/linux-yocto-3.0/commit/?h=meta&id=9728c1b6a724daefc413b44e10253cdbb5e06d08</a><br>
>>>> -<br>
>>>> -It appears that the emulated colours in qemu are incorrect and that<br>
>>>> -the red and blue channels are reversed. This patch reverses that logic<br>
>>>> -so the colours are correctly displayed on the versatile platform which<br>
>>>> -doesn't support the BGR bit.<br>
>>>> -<br>
>>>> -RP 16/9/2011<br>
>>>> -<br>
>>>> -Upstream-Status: Pending<br>
>>>> -<br>
>>>> -Index: qemu-1.2.0/hw/pl110.c<br>
>>>> -===================================================================<br>
>>>> ---- qemu-1.2.0.orig/hw/pl110.c 2012-09-06 14:07:27.619821133 -0700<br>
>>>> -+++ qemu-1.2.0/hw/pl110.c 2012-09-06 14:12:07.699829648 -0700<br>
>>>> -@@ -168,7 +168,11 @@<br>
>>>> - fprintf(stderr, "pl110: Bad color depth\n");<br>
>>>> - exit(1);<br>
>>>> - }<br>
>>>> -- if (s->cr & PL110_CR_BGR)<br>
>>>> -+<br>
>>>> -+ if (s->version && s->bpp == BPP_16)<br>
>>>> -+ /* Code assumes BPP_16 == 565 and BGR is never set on the<br>
>>>> versatile in 565 mode */<br>
>>>> -+ bpp_offset = 0;<br>
>>>> -+ else if (s->cr & PL110_CR_BGR)<br>
>>>> - bpp_offset = 0;<br>
>>>> - else<br>
>>>> - bpp_offset = 24;<br>
>>>> diff --git<br>
>>>> a/meta/recipes-devtools/qemu/files/fallback-to-safe-mmap_min_addr.patch<br>
>>>> b/meta/recipes-devtools/qemu/files/fallback-to-safe-mmap_min_addr.patch<br>
>>>> deleted file mode 100644<br>
>>>> index 2075386..0000000<br>
>>>> ---<br>
>>>> a/meta/recipes-devtools/qemu/files/fallback-to-safe-mmap_min_addr.patch<br>
>>>> +++ /dev/null<br>
>>>> @@ -1,39 +0,0 @@<br>
>>>> -From c313f89c33217ac0e471554dace2144718f86669 Mon Sep 17 00:00:00 2001<br>
>>>> -From: Martin Jansa <<a href="mailto:Martin.Jansa@gmail.com">Martin.Jansa@gmail.com</a>><br>
>>>> -Date: Thu, 13 May 2010 12:23:40 +0200<br>
>>>> -Subject: [PATCH] linux-user: use default mmap_min_addr 65536 when<br>
>>>> /proc/sys/vm/mmap_min_addr cannot be read<br>
>>>> -<br>
>>>> -* 65536 is default at least for ubuntu and fedora.<br>
>>>> ----<br>
>>>> - linux-user/main.c | 5 +++++<br>
>>>> - 1 files changed, 5 insertions(+), 0 deletions(-)<br>
>>>> -<br>
>>>> -Upstream-Status: Pending<br>
>>>> -<br>
>>>> -Index: qemu-0.14.0/linux-user/main.c<br>
>>>> -===================================================================<br>
>>>> ---- qemu-0.14.0.orig/linux-user/main.c<br>
>>>> -+++ qemu-0.14.0/linux-user/main.c<br>
>>>> -@@ -36,6 +36,7 @@<br>
>>>> - #include "envlist.h"<br>
>>>> -<br>
>>>> - #define DEBUG_LOGFILE "/tmp/qemu.log"<br>
>>>> -+#define MMAP_MIN_ADDR_DEFAULT 65536<br>
>>>> -<br>
>>>> - char *exec_path;<br>
>>>> -<br>
>>>> -@@ -3010,8 +3011,14 @@ int main(int argc, char **argv, char **e<br>
>>>> - if (fscanf(fp, "%lu", &tmp) == 1) {<br>
>>>> - mmap_min_addr = tmp;<br>
>>>> - qemu_log("host mmap_min_addr=0x%lx\n", mmap_min_addr);<br>
>>>> -+ } else {<br>
>>>> -+ qemu_log("cannot read value from<br>
>>>> /proc/sys/vm/mmap_min_addr, assuming %d\n", MMAP_MIN_ADDR_DEFAULT);<br>
>>>> -+ mmap_min_addr = MMAP_MIN_ADDR_DEFAULT;<br>
>>>> - }<br>
>>>> - fclose(fp);<br>
>>>> -+ } else {<br>
>>>> -+ qemu_log("cannot open /proc/sys/vm/mmap_min_addr for<br>
>>>> reading, assuming %d\n", MMAP_MIN_ADDR_DEFAULT);<br>
>>>> -+ mmap_min_addr = MMAP_MIN_ADDR_DEFAULT;<br>
>>>> - }<br>
>>>> - }<br>
>>>> -<br>
>>>> diff --git a/meta/recipes-devtools/qemu/files/linker-flags.patch<br>
>>>> b/meta/recipes-devtools/qemu/files/linker-flags.patch<br>
>>>> deleted file mode 100644<br>
>>>> index 0106ae2..0000000<br>
>>>> --- a/meta/recipes-devtools/qemu/files/linker-flags.patch<br>
>>>> +++ /dev/null<br>
>>>> @@ -1,25 +0,0 @@<br>
>>>> -Fedora 13 switched the default behaviour of the linker to no longer<br>
>>>> -indirectly link to required libraries (i.e. dependencies of a library<br>
>>>> -already linked to). Therefore we need to explicitly pass the depended<br>
>>>> on<br>
>>>> -libraries into the linker for building to work on Fedora 13.<br>
>>>> -<br>
>>>> -More information is available on the Fedora Wiki:<br>
>>>> -<a href="https://fedoraproject.org/wiki/UnderstandingDSOLinkChange" target="_blank">https://fedoraproject.org/wiki/UnderstandingDSOLinkChange</a><br>
>>>> -<br>
>>>> -JL - 15/06/10<br>
>>>> -<br>
>>>> -Upstream-Status: Inappropriate [configuration]<br>
>>>> -<br>
>>>> -Index: qemu-1.2.0/Makefile.target<br>
>>>> -===================================================================<br>
>>>> ---- qemu-1.2.0.orig/Makefile.target 2012-09-05 07:03:06.000000000<br>
>>>> -0700<br>
>>>> -+++ qemu-1.2.0/Makefile.target 2012-09-06 13:42:24.819764288 -0700<br>
>>>> -@@ -130,7 +130,7 @@<br>
>>>> - obj-$(CONFIG_HAVE_CORE_DUMP) += dump.o<br>
>>>> - obj-$(CONFIG_NO_GET_MEMORY_MAPPING) += memory_mapping-stub.o<br>
>>>> - obj-$(CONFIG_NO_CORE_DUMP) += dump-stub.o<br>
>>>> --LIBS+=-lz<br>
>>>> -+LIBS+=-lz -lX11 -ldl<br>
>>>> -<br>
>>>> - QEMU_CFLAGS += $(VNC_TLS_CFLAGS)<br>
>>>> - QEMU_CFLAGS += $(VNC_SASL_CFLAGS)<br>
>>>> diff --git a/meta/recipes-devtools/qemu/qemu.inc<br>
>>>> b/meta/recipes-devtools/qemu/qemu.inc<br>
>>>> index 0a7dc4e..7caef6e 100644<br>
>>>> --- a/meta/recipes-devtools/qemu/qemu.inc<br>
>>>> +++ b/meta/recipes-devtools/qemu/qemu.inc<br>
>>>> @@ -20,13 +20,8 @@ SDL_class-nativesdk ?= ""<br>
>>>> SRC_URI = "\<br>
>>>> file://powerpc_rom.bin \<br>
>>>> file://no-strip.patch \<br>
>>>> - file://linker-flags.patch \<br>
>>>> file://fix-configure-checks.patch \<br>
>>>> - file://fallback-to-safe-mmap_min_addr.patch \<br>
>>>> file://larger_default_ram_size.patch \<br>
>>>> - file://arm-bgr.patch \<br>
>>>> - file://Revert-vmware_vga-Add-back-some-info-in-local-state-.patch \<br>
>>>> - file://0002-docs-Fix-generating-qemu-doc.html-with-texinfo-5.patch<br>
>>>> \<br>
>>>> "<br>
>>>><br>
>>>> SRC_URI_append_class-nativesdk = "\<br>
>>>> @@ -37,7 +32,7 @@ SRC_URI_append_class-native = "\<br>
>>>> file://fix-libcap-header-issue-on-some-distro.patch \<br>
>>>> "<br>
>>>><br>
>>>> -EXTRA_OECONF += "--target-list=${@get_qemu_target_list(d)}<br>
>>>> --disable-werror --disable-vnc-tls --audio-drv-list=oss,alsa<br>
>>>> --audio-card-list=ac97,es1370 ${SDL} --disable-curl --disable-vnc-jpeg<br>
>>>> --disable-bluez --with-system-pixman"<br>
>>>> +EXTRA_OECONF += "--target-list=${@get_qemu_target_list(d)}<br>
>>>> --disable-werror --disable-vnc-tls --audio-drv-list=oss,alsa<br>
>>>> --disable-curl<br>
>>>> --disable-vnc-jpeg --disable-bluez --with-system-pixman"<br>
>>>><br>
>>>> EXTRA_OECONF_class-nativesdk =<br>
>>>> "--target-list=${@get_qemu_target_list(d)} --disable-werror<br>
>>>> --disable-vnc-tls \<br>
>>>> --disable-curl \<br>
>>>> diff --git a/meta/recipes-devtools/qemu/<a href="http://qemu_1.4.1.bb" target="_blank">qemu_1.4.1.bb</a><br>
>>>> b/meta/recipes-devtools/qemu/<a href="http://qemu_1.5.0.bb" target="_blank">qemu_1.5.0.bb</a><br>
>>>> similarity index 67%<br>
>>>> rename from meta/recipes-devtools/qemu/<a href="http://qemu_1.4.1.bb" target="_blank">qemu_1.4.1.bb</a><br>
>>>> rename to meta/recipes-devtools/qemu/<a href="http://qemu_1.5.0.bb" target="_blank">qemu_1.5.0.bb</a><br>
>>>> index f59d28a..2ea4f12 100644<br>
>>>> --- a/meta/recipes-devtools/qemu/<a href="http://qemu_1.4.1.bb" target="_blank">qemu_1.4.1.bb</a><br>
>>>> +++ b/meta/recipes-devtools/qemu/<a href="http://qemu_1.5.0.bb" target="_blank">qemu_1.5.0.bb</a><br>
>>>> @@ -6,5 +6,5 @@ LIC_FILES_CHKSUM =<br>
>>>> "file://COPYING;md5=441c28d2cf86e15a37fa47e15a72fbac \<br>
>>>> SRC_URI += "file://fdt_header.patch"<br>
>>>><br>
>>>> SRC_URI_prepend = "<a href="http://wiki.qemu.org/download/qemu-${PV}.tar.bz2" target="_blank">http://wiki.qemu.org/download/qemu-${PV}.tar.bz2</a>"<br>
>>>> -SRC_URI[md5sum] = "eb2d696956324722b5ecfa46e41f9a75"<br>
>>>> -SRC_URI[sha256sum] =<br>
>>>> "75063a9326221607de3599e89fb5af80f2d8080ddc55ca253fff113843432df1"<br>
>>>> +SRC_URI[md5sum] = "b6f3265b8ed39d77e8f354f35cc26e16"<br>
>>>> +SRC_URI[sha256sum] =<br>
>>>> "b22b30ee9712568dfb4eedf76783f4a76546e1cbc41659b909646bcf0b4867bb"<br>
>>>><br>
>>><br>
>><br>
>><br>
> _______________________________________________<br>
> Openembedded-core mailing list<br>
> <a href="mailto:Openembedded-core@lists.openembedded.org">Openembedded-core@lists.openembedded.org</a><br>
> <a href="http://lists.openembedded.org/mailman/listinfo/openembedded-core" target="_blank">http://lists.openembedded.org/mailman/listinfo/openembedded-core</a><br>
_______________________________________________<br>
Openembedded-core mailing list<br>
<a href="mailto:Openembedded-core@lists.openembedded.org">Openembedded-core@lists.openembedded.org</a><br>
<a href="http://lists.openembedded.org/mailman/listinfo/openembedded-core" target="_blank">http://lists.openembedded.org/mailman/listinfo/openembedded-core</a><br>
</div></div></blockquote></div><br></div>