<div dir="ltr">Will do, thanks.<br></div><div class="gmail_extra"><br><br><div class="gmail_quote">On Tue, Sep 17, 2013 at 1:34 AM, 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">Hi Chris<br>
<div class="im"><br>
On Mon, Sep 16, 2013 at 6:26 PM, Chris Patterson <<a href="mailto:cjp256@gmail.com">cjp256@gmail.com</a>> wrote:<br>
> This update also drops the following patches which appear to have been resolved upstream:<br>
> - ftd_header.patch<br>
> - target-i386-Fix-aflag-logic-for-CODE64-and-the-0x67-.patch<br>
><br>
<br>
</div>Thanks for the patch. I think its a tad late for 1.5 release since we<br>
use Qemu heavily<br>
but I would suggest to keep it current and submit it after the window<br>
for 1.6 is open after branch for 1.5 is cut out.<br>
<div><div class="h5"><br>
> Signed-off-by: Chris Patterson <<a href="mailto:cjp256@gmail.com">cjp256@gmail.com</a>><br>
> ---<br>
> meta/recipes-devtools/qemu/files/fdt_header.patch | 39 -----------<br>
> ...-Fix-aflag-logic-for-CODE64-and-the-0x67-.patch | 79 ----------------------<br>
> meta/recipes-devtools/qemu/qemu.inc | 2 +-<br>
> .../qemu/{<a href="http://qemu_1.5.0.bb" target="_blank">qemu_1.5.0.bb</a> => <a href="http://qemu_1.6.0.bb" target="_blank">qemu_1.6.0.bb</a>} | 14 ++--<br>
> 4 files changed, 9 insertions(+), 125 deletions(-)<br>
> delete mode 100644 meta/recipes-devtools/qemu/files/fdt_header.patch<br>
> delete mode 100644 meta/recipes-devtools/qemu/files/target-i386-Fix-aflag-logic-for-CODE64-and-the-0x67-.patch<br>
> rename meta/recipes-devtools/qemu/{<a href="http://qemu_1.5.0.bb" target="_blank">qemu_1.5.0.bb</a> => <a href="http://qemu_1.6.0.bb" target="_blank">qemu_1.6.0.bb</a>} (44%)<br>
><br>
> diff --git a/meta/recipes-devtools/qemu/files/fdt_header.patch b/meta/recipes-devtools/qemu/files/fdt_header.patch<br>
> deleted file mode 100644<br>
> index dccfe53..0000000<br>
> --- a/meta/recipes-devtools/qemu/files/fdt_header.patch<br>
> +++ /dev/null<br>
> @@ -1,39 +0,0 @@<br>
> -Upstream-Status: Pending<br>
> -<br>
> -qemu: define fdt types in libfdt_env.h from qemu<br>
> -<br>
> - * fixes<br>
> - In file included from /home/oe/setup-scripts/build/tmp-angstrom_next-uclibc/sysroots/x86_64-linux/usr/include/libfdt.h:55:0,<br>
> - 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:<br>
> - /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'<br>
> - /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'<br>
> - /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'<br>
> - /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'<br>
> - /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'<br>
> - /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'<br>
> - /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'<br>
> - /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'<br>
> - /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'<br>
> - /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'<br>
> - /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'<br>
> - /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'<br>
> - /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'<br>
> - /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'<br>
> - /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'<br>
> - /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'<br>
> -<br>
> -Index: qemu-1.4.0/include/libfdt_env.h<br>
> -===================================================================<br>
> ---- qemu-1.4.0.orig/include/libfdt_env.h 2013-02-15 23:05:35.000000000 +0000<br>
> -+++ qemu-1.4.0/include/libfdt_env.h 2013-04-13 14:17:27.918885225 +0000<br>
> -@@ -21,6 +21,10 @@<br>
> -<br>
> - #include "qemu/bswap.h"<br>
> -<br>
> -+typedef uint16_t fdt16_t;<br>
> -+typedef uint32_t fdt32_t;<br>
> -+typedef uint64_t fdt64_t;<br>
> -+<br>
> - #ifdef HOST_WORDS_BIGENDIAN<br>
> - #define fdt32_to_cpu(x) (x)<br>
> - #define cpu_to_fdt32(x) (x)<br>
> diff --git a/meta/recipes-devtools/qemu/files/target-i386-Fix-aflag-logic-for-CODE64-and-the-0x67-.patch b/meta/recipes-devtools/qemu/files/target-i386-Fix-aflag-logic-for-CODE64-and-the-0x67-.patch<br>
> deleted file mode 100644<br>
> index 852efd1..0000000<br>
> --- a/meta/recipes-devtools/qemu/files/target-i386-Fix-aflag-logic-for-CODE64-and-the-0x67-.patch<br>
> +++ /dev/null<br>
> @@ -1,79 +0,0 @@<br>
> -Upstream-Status: Backported<br>
> -<br>
> -From dec3fc9657e0682637de4d5a29d947284d01985c Mon Sep 17 00:00:00 2001<br>
> -From: Richard Henderson <<a href="mailto:rth@twiddle.net">rth@twiddle.net</a>><br>
> -Date: Wed, 29 May 2013 12:30:51 -0700<br>
> -Subject: [PATCH] target-i386: Fix aflag logic for CODE64 and the 0x67 prefix<br>
> -<br>
> -The code reorganization in commit 4a6fd938 broke handling of PREFIX_ADR.<br>
> -While fixing this, tidy and comment the code so that it's more obvious<br>
> -what's going on in setting both aflag and dflag.<br>
> -<br>
> -The TARGET_X86_64 ifdef can be eliminated because CODE64 expands to the<br>
> -constant zero when TARGET_X86_64 is undefined.<br>
> -<br>
> -Cc: Paolo Bonzini <<a href="mailto:pbonzini@redhat.com">pbonzini@redhat.com</a>><br>
> -Reported-by: Laszlo Ersek <<a href="mailto:lersek@redhat.com">lersek@redhat.com</a>><br>
> -Signed-off-by: Richard Henderson <<a href="mailto:rth@twiddle.net">rth@twiddle.net</a>><br>
> -Reviewed-by: Paolo Bonzini <<a href="mailto:pbonzini@redhat.com">pbonzini@redhat.com</a>><br>
> -Message-id: <a href="mailto:1369855851-21400-1-git-send-email-rth@twiddle.net">1369855851-21400-1-git-send-email-rth@twiddle.net</a><br>
> -Signed-off-by: Anthony Liguori <<a href="mailto:aliguori@us.ibm.com">aliguori@us.ibm.com</a>><br>
> ----<br>
> - target-i386/translate.c | 30 +++++++++++++++---------------<br>
> - 1 file changed, 15 insertions(+), 15 deletions(-)<br>
> -<br>
> -diff --git a/target-i386/translate.c b/target-i386/translate.c<br>
> -index 0aeccdb..14b0298 100644<br>
> ---- a/target-i386/translate.c<br>
> -+++ b/target-i386/translate.c<br>
> -@@ -4677,8 +4677,6 @@ static target_ulong disas_insn(CPUX86State *env, DisasContext *s,<br>
> - }<br>
> - s->pc = pc_start;<br>
> - prefixes = 0;<br>
> -- aflag = s->code32;<br>
> -- dflag = s->code32;<br>
> - s->override = -1;<br>
> - rex_w = -1;<br>
> - rex_r = 0;<br>
> -@@ -4801,23 +4799,25 @@ static target_ulong disas_insn(CPUX86State *env, DisasContext *s,<br>
> - }<br>
> -<br>
> - /* Post-process prefixes. */<br>
> -- if (prefixes & PREFIX_DATA) {<br>
> -- dflag ^= 1;<br>
> -- }<br>
> -- if (prefixes & PREFIX_ADR) {<br>
> -- aflag ^= 1;<br>
> -- }<br>
> --#ifdef TARGET_X86_64<br>
> - if (CODE64(s)) {<br>
> -- if (rex_w == 1) {<br>
> -- /* 0x66 is ignored if rex.w is set */<br>
> -- dflag = 2;<br>
> -+ /* In 64-bit mode, the default data size is 32-bit. Select 64-bit<br>
> -+ data with rex_w, and 16-bit data with 0x66; rex_w takes precedence<br>
> -+ over 0x66 if both are present. */<br>
> -+ dflag = (rex_w > 0 ? 2 : prefixes & PREFIX_DATA ? 0 : 1);<br>
> -+ /* In 64-bit mode, 0x67 selects 32-bit addressing. */<br>
> -+ aflag = (prefixes & PREFIX_ADR ? 1 : 2);<br>
> -+ } else {<br>
> -+ /* In 16/32-bit mode, 0x66 selects the opposite data size. */<br>
> -+ dflag = s->code32;<br>
> -+ if (prefixes & PREFIX_DATA) {<br>
> -+ dflag ^= 1;<br>
> - }<br>
> -- if (!(prefixes & PREFIX_ADR)) {<br>
> -- aflag = 2;<br>
> -+ /* In 16/32-bit mode, 0x67 selects the opposite addressing. */<br>
> -+ aflag = s->code32;<br>
> -+ if (prefixes & PREFIX_ADR) {<br>
> -+ aflag ^= 1;<br>
> - }<br>
> - }<br>
> --#endif<br>
> -<br>
> - s->prefix = prefixes;<br>
> - s->aflag = aflag;<br>
> ---<br>
> -1.7.9.5<br>
> -<br>
> diff --git a/meta/recipes-devtools/qemu/qemu.inc b/meta/recipes-devtools/qemu/qemu.inc<br>
> index 97e9b7b..296b405 100644<br>
> --- a/meta/recipes-devtools/qemu/qemu.inc<br>
> +++ b/meta/recipes-devtools/qemu/qemu.inc<br>
> @@ -54,7 +54,7 @@ do_configure() {<br>
> KVMOPTS="--enable-kvm"<br>
> fi<br>
><br>
> - ${S}/configure --prefix=${prefix} --sysconfdir=${sysconfdir} --libexecdir=${libexecdir} --disable-strip ${EXTRA_OECONF} $KVMOPTS<br>
> + ${S}/configure --prefix=${prefix} --sysconfdir=${sysconfdir} --libexecdir=${libexecdir} --localstatedir=${localstatedir} --disable-strip ${EXTRA_OECONF} $KVMOPTS<br>
> test ! -e ${S}/target-i386/beginend_funcs.sh || chmod a+x ${S}/target-i386/beginend_funcs.sh<br>
> }<br>
><br>
> diff --git a/meta/recipes-devtools/qemu/<a href="http://qemu_1.5.0.bb" target="_blank">qemu_1.5.0.bb</a> b/meta/recipes-devtools/qemu/<a href="http://qemu_1.6.0.bb" target="_blank">qemu_1.6.0.bb</a><br>
> similarity index 44%<br>
> rename from meta/recipes-devtools/qemu/<a href="http://qemu_1.5.0.bb" target="_blank">qemu_1.5.0.bb</a><br>
> rename to meta/recipes-devtools/qemu/<a href="http://qemu_1.6.0.bb" target="_blank">qemu_1.6.0.bb</a><br>
> index d6dd743..f8dbe6d 100644<br>
> --- a/meta/recipes-devtools/qemu/<a href="http://qemu_1.5.0.bb" target="_blank">qemu_1.5.0.bb</a><br>
> +++ b/meta/recipes-devtools/qemu/<a href="http://qemu_1.6.0.bb" target="_blank">qemu_1.6.0.bb</a><br>
> @@ -3,13 +3,15 @@ require qemu.inc<br>
> LIC_FILES_CHKSUM = "file://COPYING;md5=441c28d2cf86e15a37fa47e15a72fbac \<br>
> file://COPYING.LIB;endline=24;md5=c04def7ae38850e7d3ef548588159913"<br>
><br>
> -SRC_URI += "file://fdt_header.patch \<br>
> - file://target-i386-Fix-aflag-logic-for-CODE64-and-the-0x67-.patch \<br>
> - file://target-ppc_fix_bit_extraction.patch \<br>
> - "<br>
> +SRC_URI += "file://target-ppc_fix_bit_extraction.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] = "b6f3265b8ed39d77e8f354f35cc26e16"<br>
> -SRC_URI[sha256sum] = "b22b30ee9712568dfb4eedf76783f4a76546e1cbc41659b909646bcf0b4867bb"<br>
> +SRC_URI[md5sum] = "f3f39308472d629aca57a255a0c91ba9"<br>
> +SRC_URI[sha256sum] = "3132e58ada26d43b6924e8c2f07db80aa1e5022f3dcf03dee7d8bb9194b2cb48"<br>
><br>
> COMPATIBLE_HOST_class-target_mips64 = "null"<br>
> +<br>
> +do_install_append() {<br>
> + # Prevent QA warnings about installed ${localstatedir}/run<br>
> + if [ -d ${D}${localstatedir}/run ]; then rmdir ${D}${localstatedir}/run; fi<br>
> +}<br>
> --<br>
> 1.8.4.rc3<br>
><br>
</div></div>> _______________________________________________<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>
</blockquote></div><br></div>