Package upgrades
v3 cover Package upgrades
Changes in v3:
* target-i386-Fix-aflag-logic-for-CODE64-and-the-0x67-.patch was backported
* qemu was tested on core-image-sato all architectures. The tests were basic (output version qemu version information)
The following changes since commit 67864ca79da08df752487a3a4e1a975546da123d:
systemd: Remove systemd_unitdir if systemd is not in distro features (2013-07-24 11:35:39 +0100)
are available in the git repository at:
git://git.yoctoproject.org/poky-contrib ionutx/work
http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=ionutx/work
Ionut Radu (1):
qemu: Updated from 1.5.0 to 1.5.1
...-Fix-aflag-logic-for-CODE64-and-the-0x67-.patch | 79 --------------------
.../qemu/{qemu_1.5.0.bb => qemu_1.5.1.bb} | 7 +-
2 files changed, 3 insertions(+), 83 deletions(-)
delete mode 100644 meta/recipes-devtools/qemu/files/target-i386-Fix-aflag-logic-for-CODE64-and-the-0x67-.patch
rename meta/recipes-devtools/qemu/{qemu_1.5.0.bb => qemu_1.5.1.bb} (49%)Signature · 1 line
1.7.10.4
PATCH v3 1/1 qemu: Updated from 1.5.0 to 1.5.1
Patch target-i386-Fix-aflag-logic-for-CODE64-and-the-0x67-.patch was backported
Signed-off-by Ionut Radu <[email protected]>
---
...-Fix-aflag-logic-for-CODE64-and-the-0x67-.patch | 79 --------------------
.../qemu/{qemu_1.5.0.bb => qemu_1.5.1.bb} | 7 +-
2 files changed, 3 insertions(+), 83 deletions(-)
delete mode 100644 meta/recipes-devtools/qemu/files/target-i386-Fix-aflag-logic-for-CODE64-and-the-0x67-.patch
rename meta/recipes-devtools/qemu/{qemu_1.5.0.bb => qemu_1.5.1.bb} (49%)meta/recipes-devtools/qemu/files/target-i386-Fix-aflag-logic-for-CODE64-and-the-0x67-.patch deleted +0 -79
@@ -1,79 +0,0 @@ -Upstream-Status: Backported - -From dec3fc9657e0682637de4d5a29d947284d01985c Mon Sep 17 00:00:00 2001 -From: Richard Henderson <[email protected]> -Date: Wed, 29 May 2013 12:30:51 -0700 -Subject: [PATCH] target-i386: Fix aflag logic for CODE64 and the 0x67 prefix - -The code reorganization in commit 4a6fd938 broke handling of PREFIX_ADR. -While fixing this, tidy and comment the code so that it's more obvious -what's going on in setting both aflag and dflag. - -The TARGET_X86_64 ifdef can be eliminated because CODE64 expands to the -constant zero when TARGET_X86_64 is undefined. - -Cc: Paolo Bonzini <[email protected]> -Reported-by: Laszlo Ersek <[email protected]> -Signed-off-by: Richard Henderson <[email protected]> -Reviewed-by: Paolo Bonzini <[email protected]> -Message-id: [email protected] -Signed-off-by: Anthony Liguori <[email protected]> ---- - target-i386/translate.c | 30 +++++++++++++++--------------- - 1 file changed, 15 insertions(+), 15 deletions(-) - -diff --git a/target-i386/translate.c b/target-i386/translate.c -index 0aeccdb..14b0298 100644 ---- a/target-i386/translate.c -+++ b/target-i386/translate.c -@@ -4677,8 +4677,6 @@ static target_ulong disas_insn(CPUX86State *env, DisasContext *s, - } - s->pc = pc_start; - prefixes = 0; -- aflag = s->code32; -- dflag = s->code32; - s->override = -1; - rex_w = -1; - rex_r = 0; -@@ -4801,23 +4799,25 @@ static target_ulong disas_insn(CPUX86State *env, DisasContext *s, - } - - /* Post-process prefixes. */ -- if (prefixes & PREFIX_DATA) { -- dflag ^= 1; -- } -- if (prefixes & PREFIX_ADR) { -- aflag ^= 1; -- } --#ifdef TARGET_X86_64 - if (CODE64(s)) { -- if (rex_w == 1) { -- /* 0x66 is ignored if rex.w is set */ -- dflag = 2; -+ /* In 64-bit mode, the default data size is 32-bit. Select 64-bit -+ data with rex_w, and 16-bit data with 0x66; rex_w takes precedence -+ over 0x66 if both are present. */ -+ dflag = (rex_w > 0 ? 2 : prefixes & PREFIX_DATA ? 0 : 1); -+ /* In 64-bit mode, 0x67 selects 32-bit addressing. */ -+ aflag = (prefixes & PREFIX_ADR ? 1 : 2); -+ } else { -+ /* In 16/32-bit mode, 0x66 selects the opposite data size. */ -+ dflag = s->code32; -+ if (prefixes & PREFIX_DATA) { -+ dflag ^= 1; - } -- if (!(prefixes & PREFIX_ADR)) { -- aflag = 2; -+ /* In 16/32-bit mode, 0x67 selects the opposite addressing. */ -+ aflag = s->code32; -+ if (prefixes & PREFIX_ADR) { -+ aflag ^= 1; - } - } --#endif - - s->prefix = prefixes; - s->aflag = aflag; --- -1.7.9.5 -
meta/recipes-devtools/qemu/qemu_1.5.1.bb renamed from meta/recipes-devtools/qemu/qemu_1.5.0.bb +3 -4
@@ -3,9 +3,8 @@ require qemu.inc LIC_FILES_CHKSUM = "file://COPYING;md5=441c28d2cf86e15a37fa47e15a72fbac \ file://COPYING.LIB;endline=24;md5=c04def7ae38850e7d3ef548588159913" -SRC_URI += "file://fdt_header.patch \ - file://target-i386-Fix-aflag-logic-for-CODE64-and-the-0x67-.patch" +SRC_URI += "file://fdt_header.patch" SRC_URI_prepend = "http://wiki.qemu.org/download/qemu-${PV}.tar.bz2" -SRC_URI[md5sum] = "b6f3265b8ed39d77e8f354f35cc26e16" -SRC_URI[sha256sum] = "b22b30ee9712568dfb4eedf76783f4a76546e1cbc41659b909646bcf0b4867bb" +SRC_URI[md5sum] = "b56e73bdcfdb214d5c68e13111aca96f" +SRC_URI[sha256sum] = "4c15a1ee2f387983eb5c1497f66bf567c34d14ba48517148f6eafef8ae09e3e8"
Signature · 1 line
1.7.10.4
Re: [PATCH v3 1/1] qemu: Updated from 1.5.0 to 1.5.1
FYI: 1.5.2 gets released just we were up to date. :)
$ git log --oneline v1.5.1..v1.5.2 ff4be47 Update VERSION for 1.5.2 release be161ae qga: escape cmdline args when registering win32 service (CVE-2013-2231) bb31546 ga_install_service(): nest error paths more idiomatically af0bbf8 qga/service-win32.c: diagnostic output should go to stderr 31c6ed2 qga: save state directory in ga_install_service() c432c7d qga: remove undefined behavior in ga_install_service()
I'm not really a qemu expert but the CVE would be good to have.
// Randy
Quoted 116 lines · Ionut Radu
Patch target-i386-Fix-aflag-logic-for-CODE64-and-the-0x67-.patch was backported
Signed-off-by Ionut Radu <[email protected]>--- ...-Fix-aflag-logic-for-CODE64-and-the-0x67-.patch | 79 -------------------- .../qemu/{qemu_1.5.0.bb => qemu_1.5.1.bb} | 7 +- 2 files changed, 3 insertions(+), 83 deletions(-)delete mode 100644
meta/recipes-devtools/qemu/files/target-i386-Fix-aflag-logic-for-CODE64-and-the-0x67-.patchrename meta/recipes-devtools/qemu/{qemu_1.5.0.bb => qemu_1.5.1.bb} (49%)meta/recipes-devtools/qemu/files/target-i386-Fix-aflag-logic-for-CODE64-and-the-0x67-.patch deleted +0
-79@@ -1,79 +0,0 @@ -Upstream-Status: Backported - -From dec3fc9657e0682637de4d5a29d947284d01985c Mon Sep 17 00:00:00 2001 -From: Richard Henderson <[email protected]> -Date: Wed, 29 May 2013 12:30:51 -0700 -Subject: [PATCH] target-i386: Fix aflag logic for CODE64 and the 0x67 prefix - -The code reorganization in commit 4a6fd938 broke handling of PREFIX_ADR. -While fixing this, tidy and comment the code so that it's more obvious -what's going on in setting both aflag and dflag. - -The TARGET_X86_64 ifdef can be eliminated because CODE64 expands to the -constant zero when TARGET_X86_64 is undefined. - -Cc: Paolo Bonzini <[email protected]> -Reported-by: Laszlo Ersek <[email protected]> -Signed-off-by: Richard Henderson <[email protected]> -Reviewed-by: Paolo Bonzini <[email protected]> -Message-id: [email protected] -Signed-off-by: Anthony Liguori <[email protected]> ---- - target-i386/translate.c | 30 +++++++++++++++--------------- - 1 file changed, 15 insertions(+), 15 deletions(-) - -diff --git a/target-i386/translate.c b/target-i386/translate.c -index 0aeccdb..14b0298 100644 ---- a/target-i386/translate.c -+++ b/target-i386/translate.c -@@ -4677,8 +4677,6 @@ static target_ulong disas_insn(CPUX86State *env, DisasContext *s, - } - s->pc = pc_start; - prefixes = 0; -- aflag = s->code32; -- dflag = s->code32; - s->override = -1; - rex_w = -1; - rex_r = 0; -@@ -4801,23 +4799,25 @@ static target_ulong disas_insn(CPUX86State *env, DisasContext *s, - } - - /* Post-process prefixes. */ -- if (prefixes & PREFIX_DATA) { -- dflag ^= 1; -- } -- if (prefixes & PREFIX_ADR) { -- aflag ^= 1; -- } --#ifdef TARGET_X86_64 - if (CODE64(s)) { -- if (rex_w == 1) { -- /* 0x66 is ignored if rex.w is set */ -- dflag = 2; -+ /* In 64-bit mode, the default data size is 32-bit. Select 64-bit -+ data with rex_w, and 16-bit data with 0x66; rex_w takes precedence -+ over 0x66 if both are present. */ -+ dflag = (rex_w > 0 ? 2 : prefixes & PREFIX_DATA ? 0 : 1); -+ /* In 64-bit mode, 0x67 selects 32-bit addressing. */ -+ aflag = (prefixes & PREFIX_ADR ? 1 : 2); -+ } else { -+ /* In 16/32-bit mode, 0x66 selects the opposite data size. */ -+ dflag = s->code32; -+ if (prefixes & PREFIX_DATA) { -+ dflag ^= 1; - } -- if (!(prefixes & PREFIX_ADR)) { -- aflag = 2; -+ /* In 16/32-bit mode, 0x67 selects the opposite addressing. */ -+ aflag = s->code32; -+ if (prefixes & PREFIX_ADR) { -+ aflag ^= 1; - } - } --#endif - - s->prefix = prefixes; - s->aflag = aflag; --- -1.7.9.5 -meta/recipes-devtools/qemu/qemu_1.5.1.bb renamed from meta/recipes-devtools/qemu/qemu_1.5.0.bb +3
-4@@ -3,9 +3,8 @@ require qemu.inc LIC_FILES_CHKSUM = "file://COPYING;md5=441c28d2cf86e15a37fa47e15a72fbac \ file://COPYING.LIB;endline=24;md5=c04def7ae38850e7d3ef548588159913" -SRC_URI += "file://fdt_header.patch \ - file://target-i386-Fix-aflag-logic-for-CODE64-and-the-0x67-.patch" +SRC_URI += "file://fdt_header.patch" SRC_URI_prepend = "http://wiki.qemu.org/download/qemu-${PV}.tar.bz2" -SRC_URI[md5sum] = "b6f3265b8ed39d77e8f354f35cc26e16" -SRC_URI[sha256sum] = "b22b30ee9712568dfb4eedf76783f4a76546e1cbc41659b909646bcf0b4867bb" +SRC_URI[md5sum] = "b56e73bdcfdb214d5c68e13111aca96f" +SRC_URI[sha256sum] = "4c15a1ee2f387983eb5c1497f66bf567c34d14ba48517148f6eafef8ae09e3e8"
Signature · 2 lines
# Randy MacLeod. SMTS, Linux, Wind River Direct: 613.963.1350