[oe-commits] Kai Kang : qemu: upgrade to 2.2.0

[git at git.openembedded.org]

Module: openembedded-core.git
Branch: master-next
Commit: a693ccb1603be1125bea3b254bf4b6c4188890ac
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=a693ccb1603be1125bea3b254bf4b6c4188890ac

Author: Kai Kang <kai.kang at windriver.com>
Date:   Thu Dec 18 09:36:40 2014 +0800

qemu: upgrade to 2.2.0

Upgrade qemu from version 2.1.2 to 2.2.0.

Update Qemu-Arm-versatilepb-Add-memory-size-checking.patch for new
version qemu.

Signed-off-by: Kai Kang <kai.kang at windriver.com>
Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>

---

 .../files/Qemu-Arm-versatilepb-Add-memory-size-checking.patch  | 10 +++++++---
 meta/recipes-devtools/qemu/{qemu_2.1.2.bb => qemu_2.2.0.bb}    |  4 ++--
 2 files changed, 9 insertions(+), 5 deletions(-)

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 7f1c5a9..b0c2ea5 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
@@ -14,6 +14,10 @@ Signed-off-by: Jiang Lu <lu.jiang at windriver.com>
 Updated it on 2014-01-15 for rebasing
 
 Signed-off-by: Robert Yang <liezhi.yang at windriver.com>
+
+Update it when upgrade qemu to 2.2.0
+
+Signed-off-by: Kai Kang <kai.kang at windriver.com>
 ---
  hw/arm/versatilepb.c |    6 ++++++
  1 file changed, 6 insertions(+)
@@ -22,7 +26,7 @@ diff --git a/hw/arm/versatilepb.c b/hw/arm/versatilepb.c
 index b48d84c..ad2cd5a 100644
 --- a/hw/arm/versatilepb.c
 +++ b/hw/arm/versatilepb.c
-@@ -199,6 +199,12 @@ static void versatile_init(QEMUMachineInitArgs *args, int board_id)
+@@ -198,6 +198,12 @@ static void versatile_init(MachineState *machine, int board_id)
          fprintf(stderr, "Unable to find CPU definition\n");
          exit(1);
      }
@@ -32,9 +36,9 @@ index b48d84c..ad2cd5a 100644
 +                ((unsigned int)ram_size / (1 << 20)));
 +        exit(1);
 +    }
-     memory_region_init_ram(ram, NULL, "versatile.ram", machine->ram_size);
+     memory_region_init_ram(ram, NULL, "versatile.ram", machine->ram_size,
+                            &error_abort);
      vmstate_register_ram_global(ram);
-     /* ??? RAM should repeat to fill physical memory space.  */
 -- 
 1.7.10.4
 
diff --git a/meta/recipes-devtools/qemu/qemu_2.1.2.bb b/meta/recipes-devtools/qemu/qemu_2.2.0.bb
similarity index 82%
rename from meta/recipes-devtools/qemu/qemu_2.1.2.bb
rename to meta/recipes-devtools/qemu/qemu_2.2.0.bb
index 55ae7b6..209b910 100644
--- a/meta/recipes-devtools/qemu/qemu_2.1.2.bb
+++ b/meta/recipes-devtools/qemu/qemu_2.2.0.bb
@@ -8,8 +8,8 @@ SRC_URI += "file://configure-fix-Darwin-target-detection.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] = "0ff197c4ed4b695620bc4734e77c888f"
-SRC_URI[sha256sum] = "fd10f5e45cf5a736fa5a3e1c279ae9821534e700beb7d1aab88a07648a394885"
+SRC_URI[md5sum] = "f7a5e2da22d057eb838a91da7aff43c8"
+SRC_URI[sha256sum] = "b68c9b6c7c694f5489b5a6bffe993cd976ffbb78e7d178eb3bc016caf460039c"
 
 COMPATIBLE_HOST_class-target_mips64 = "null"