From b88e3808533a7280c85e570a1359efcba8dcc4bd Mon Sep 17 00:00:00 2001 From: Cristian Iorga Date: Wed, 6 May 2015 18:21:46 +0300 Subject: qemu: upgrade to 2.3.0 Qemu-Arm-versatilepb-Add-memory-size-checking.patch brought up to date; 37ed3bf1ee07bb1a26adca0df8718f601f231c0b.patch removed, integrated upstream; glx enable config option changed to opengl enable, update accordingly. Signed-off-by: Cristian Iorga Signed-off-by: Richard Purdie --- ...-Arm-versatilepb-Add-memory-size-checking.patch | 22 ++++---- meta/recipes-devtools/qemu/qemu.inc | 2 +- .../37ed3bf1ee07bb1a26adca0df8718f601f231c0b.patch | 59 ---------------------- meta/recipes-devtools/qemu/qemu_2.2.0.bb | 20 -------- meta/recipes-devtools/qemu/qemu_2.3.0.bb | 19 +++++++ 5 files changed, 32 insertions(+), 90 deletions(-) delete mode 100644 meta/recipes-devtools/qemu/qemu/37ed3bf1ee07bb1a26adca0df8718f601f231c0b.patch delete mode 100644 meta/recipes-devtools/qemu/qemu_2.2.0.bb create mode 100644 meta/recipes-devtools/qemu/qemu_2.3.0.bb diff --git a/meta/recipes-devtools/qemu/files/Qemu-Arm-versatilepb-Add-memory-size-checking.patch b/meta/recipes-devtools/qemu/files/Qemu-Arm-versatilepb-Add-memory-size-checking.patch index b0c2ea5be9..1a6cf5119b 100644 --- a/meta/recipes-devtools/qemu/files/Qemu-Arm-versatilepb-Add-memory-size-checking.patch +++ b/meta/recipes-devtools/qemu/files/Qemu-Arm-versatilepb-Add-memory-size-checking.patch @@ -18,27 +18,29 @@ Signed-off-by: Robert Yang Update it when upgrade qemu to 2.2.0 Signed-off-by: Kai Kang +Signed-off-by: Cristian Iorga --- - hw/arm/versatilepb.c | 6 ++++++ - 1 file changed, 6 insertions(+) + hw/arm/versatilepb.c | 7 +++++++ + 1 file changed, 7 insertions(+) diff --git a/hw/arm/versatilepb.c b/hw/arm/versatilepb.c -index b48d84c..ad2cd5a 100644 +index 6c69f4e..9278d90 100644 --- a/hw/arm/versatilepb.c +++ b/hw/arm/versatilepb.c -@@ -198,6 +198,12 @@ static void versatile_init(MachineState *machine, int board_id) - fprintf(stderr, "Unable to find CPU definition\n"); +@@ -204,6 +204,13 @@ static void versatile_init(MachineState *machine, int board_id) exit(1); } -+ if (ram_size > (256 << 20)) { + ++ if (machine->ram_size > (256 << 20)) { + fprintf(stderr, + "qemu: Too much memory for this machine: %d MB, maximum 256 MB\n", + ((unsigned int)ram_size / (1 << 20))); + exit(1); + } - memory_region_init_ram(ram, NULL, "versatile.ram", machine->ram_size, - &error_abort); - vmstate_register_ram_global(ram); ++ + cpuobj = object_new(object_class_get_name(cpu_oc)); + + /* By default ARM1176 CPUs have EL3 enabled. This board does not -- -1.7.10.4 +2.1.0 diff --git a/meta/recipes-devtools/qemu/qemu.inc b/meta/recipes-devtools/qemu/qemu.inc index 4225db7573..4274b252e5 100644 --- a/meta/recipes-devtools/qemu/qemu.inc +++ b/meta/recipes-devtools/qemu/qemu.inc @@ -115,7 +115,7 @@ PACKAGECONFIG[ssh2] = "--enable-libssh2,--disable-libssh2,libssh2," PACKAGECONFIG[libusb] = "--enable-libusb,--disable-libusb,libusb1" PACKAGECONFIG[fdt] = "--enable-fdt,--disable-fdt,dtc" PACKAGECONFIG[alsa] = ",,alsa-lib" -PACKAGECONFIG[glx] = "--enable-glx,--disable-glx,mesa" +PACKAGECONFIG[glx] = "--enable-opengl,--disable-opengl,mesa" PACKAGECONFIG[lzo] = "--enable-lzo,--disable-lzo,lzo" PACKAGECONFIG[numa] = "--enable-numa,--disable-numa,numactl" diff --git a/meta/recipes-devtools/qemu/qemu/37ed3bf1ee07bb1a26adca0df8718f601f231c0b.patch b/meta/recipes-devtools/qemu/qemu/37ed3bf1ee07bb1a26adca0df8718f601f231c0b.patch deleted file mode 100644 index 8609e3fe99..0000000000 --- a/meta/recipes-devtools/qemu/qemu/37ed3bf1ee07bb1a26adca0df8718f601f231c0b.patch +++ /dev/null @@ -1,59 +0,0 @@ -Without this patch, x86_64 images would show invalid EDSCA key errors -with sshd from openssh (but not dropbear) during init. - -This would cause problems with operation with some distros where EDSCA -keys were mandatory. The issue was present in qemu 2.2.1 and not in -2.3.0-rc0, bisected to this commit which was then backported. - -From 37ed3bf1ee07bb1a26adca0df8718f601f231c0b Mon Sep 17 00:00:00 2001 -From: Richard Henderson -Date: Fri, 20 Feb 2015 11:13:50 -0800 -Subject: [PATCH] tcg: Complete handling of ALWAYS and NEVER - -Missing from movcond - -Signed-off-by: Richard Henderson ---- - tcg/tcg-op.c | 22 +++++++++++++++++----- - 1 files changed, 17 insertions(+), 5 deletions(-) - -Upstream-Status: Backport -RP 2015/3/24 - -Index: qemu-2.2.0/tcg/tcg-op.h -=================================================================== ---- qemu-2.2.0.orig/tcg/tcg-op.h -+++ qemu-2.2.0/tcg/tcg-op.h -@@ -2186,7 +2186,11 @@ static inline void tcg_gen_movcond_i32(T - TCGv_i32 c1, TCGv_i32 c2, - TCGv_i32 v1, TCGv_i32 v2) - { -- if (TCG_TARGET_HAS_movcond_i32) { -+ if (cond == TCG_COND_ALWAYS) { -+ tcg_gen_mov_i32(ret, v1); -+ } else if (cond == TCG_COND_NEVER) { -+ tcg_gen_mov_i32(ret, v2); -+ } else if (TCG_TARGET_HAS_movcond_i32) { - tcg_gen_op6i_i32(INDEX_op_movcond_i32, ret, c1, c2, v1, v2, cond); - } else { - TCGv_i32 t0 = tcg_temp_new_i32(); -@@ -2205,6 +2209,11 @@ static inline void tcg_gen_movcond_i64(T - TCGv_i64 c1, TCGv_i64 c2, - TCGv_i64 v1, TCGv_i64 v2) - { -+ if (cond == TCG_COND_ALWAYS) { -+ tcg_gen_mov_i64(ret, v1); -+ } else if (cond == TCG_COND_NEVER) { -+ tcg_gen_mov_i64(ret, v2); -+ } else { - #if TCG_TARGET_REG_BITS == 32 - TCGv_i32 t0 = tcg_temp_new_i32(); - TCGv_i32 t1 = tcg_temp_new_i32(); -@@ -2246,6 +2255,7 @@ static inline void tcg_gen_movcond_i64(T - tcg_temp_free_i64(t1); - } - #endif -+ } - } - - static inline void tcg_gen_add2_i32(TCGv_i32 rl, TCGv_i32 rh, TCGv_i32 al, diff --git a/meta/recipes-devtools/qemu/qemu_2.2.0.bb b/meta/recipes-devtools/qemu/qemu_2.2.0.bb deleted file mode 100644 index 757de89640..0000000000 --- a/meta/recipes-devtools/qemu/qemu_2.2.0.bb +++ /dev/null @@ -1,20 +0,0 @@ -require qemu.inc - -LIC_FILES_CHKSUM = "file://COPYING;md5=441c28d2cf86e15a37fa47e15a72fbac \ - file://COPYING.LIB;endline=24;md5=c04def7ae38850e7d3ef548588159913" - -SRC_URI += "file://configure-fix-Darwin-target-detection.patch \ - file://qemu-enlarge-env-entry-size.patch \ - file://Qemu-Arm-versatilepb-Add-memory-size-checking.patch \ - file://37ed3bf1ee07bb1a26adca0df8718f601f231c0b.patch \ - " -SRC_URI_prepend = "http://wiki.qemu-project.org/download/${BP}.tar.bz2" -SRC_URI[md5sum] = "f7a5e2da22d057eb838a91da7aff43c8" -SRC_URI[sha256sum] = "b68c9b6c7c694f5489b5a6bffe993cd976ffbb78e7d178eb3bc016caf460039c" - -COMPATIBLE_HOST_class-target_mips64 = "null" - -do_install_append() { - # Prevent QA warnings about installed ${localstatedir}/run - if [ -d ${D}${localstatedir}/run ]; then rmdir ${D}${localstatedir}/run; fi -} diff --git a/meta/recipes-devtools/qemu/qemu_2.3.0.bb b/meta/recipes-devtools/qemu/qemu_2.3.0.bb new file mode 100644 index 0000000000..25c5e4d539 --- /dev/null +++ b/meta/recipes-devtools/qemu/qemu_2.3.0.bb @@ -0,0 +1,19 @@ +require qemu.inc + +LIC_FILES_CHKSUM = "file://COPYING;md5=441c28d2cf86e15a37fa47e15a72fbac \ + file://COPYING.LIB;endline=24;md5=c04def7ae38850e7d3ef548588159913" + +SRC_URI += "file://configure-fix-Darwin-target-detection.patch \ + file://qemu-enlarge-env-entry-size.patch \ + file://Qemu-Arm-versatilepb-Add-memory-size-checking.patch \ + " +SRC_URI_prepend = "http://wiki.qemu-project.org/download/${BP}.tar.bz2" +SRC_URI[md5sum] = "2fab3ea4460de9b57192e5b8b311f221" +SRC_URI[sha256sum] = "b6bab7f763d5be73e7cb5ee7d4c8365b7a8df2972c52fa5ded18893bd8281588" + +COMPATIBLE_HOST_class-target_mips64 = "null" + +do_install_append() { + # Prevent QA warnings about installed ${localstatedir}/run + if [ -d ${D}${localstatedir}/run ]; then rmdir ${D}${localstatedir}/run; fi +} -- cgit 1.2.3-korg