qemu 2.3.0 upgrade

PATCH In review Cristian Iorga 1 participant 4 messages May 6, 2015

lore

Share & tools

lore

Cristian Iorga

author

2015-05-06 15:21 UTC #0 lore raw

cover qemu 2.3.0 upgrade

The following changes since commit b2b59b14ecfe13ba794d92f97d1403d6503c7407:

poky.conf: remove SVK mirror (2015-05-05 22:18:23 +0100)

are available in the git repository at:

git://git.yoctoproject.org/poky-contrib Ciorga/qemu-upg
http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=Ciorga/qemu-upg

Cristian Iorga (2):
qemu: upgrade to 2.3.0
runqemu-internal: correctly set format for root FS as raw

 ...-Arm-versatilepb-Add-memory-size-checking.patch | 22 ++++----
 meta/recipes-devtools/qemu/qemu.inc                |  2 +-
 .../37ed3bf1ee07bb1a26adca0df8718f601f231c0b.patch | 59 ----------------------
 .../qemu/{qemu_2.2.0.bb => qemu_2.3.0.bb}          |  5 +-
 scripts/runqemu-internal                           |  4 +-
 5 files changed, 17 insertions(+), 75 deletions(-)
 delete mode 100644 meta/recipes-devtools/qemu/qemu/37ed3bf1ee07bb1a26adca0df8718f601f231c0b.patch
 rename meta/recipes-devtools/qemu/{qemu_2.2.0.bb => qemu_2.3.0.bb} (76%)

Signature · 1 line

2.1.0

Cristian Iorga

author

2015-05-06 15:21 UTC #1 lore raw

PATCH 1/2 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 <[email protected]>

---
 ...-Arm-versatilepb-Add-memory-size-checking.patch | 22 ++++----
 meta/recipes-devtools/qemu/qemu.inc                |  2 +-
 .../37ed3bf1ee07bb1a26adca0df8718f601f231c0b.patch | 59 ----------------------
 .../qemu/{qemu_2.2.0.bb => qemu_2.3.0.bb}          |  5 +-
 4 files changed, 15 insertions(+), 73 deletions(-)
 delete mode 100644 meta/recipes-devtools/qemu/qemu/37ed3bf1ee07bb1a26adca0df8718f601f231c0b.patch
 rename meta/recipes-devtools/qemu/{qemu_2.2.0.bb => qemu_2.3.0.bb} (76%)

meta/recipes-devtools/qemu/files/Qemu-Arm-versatilepb-Add-memory-size-checking.patch +12 ~~-10~~

index b0c2ea5..1a6cf51 100644
@@ -18,27 +18,29 @@ Signed-off-by: Robert Yang <[email protected]>
 Update it when upgrade qemu to 2.2.0
 
 Signed-off-by: Kai Kang <[email protected]>
+Signed-off-by: Cristian Iorga <[email protected]>
 ---
- 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

meta/recipes-devtools/qemu/qemu.inc +1 -1

index 4225db7..4274b25 100644
@@ -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"

meta/recipes-devtools/qemu/qemu/37ed3bf1ee07bb1a26adca0df8718f601f231c0b.patch deleted +0 ~~-59~~

59 lines not on this page · raw message

meta/recipes-devtools/qemu/qemu_2.3.0.bb renamed from meta/recipes-devtools/qemu/qemu_2.2.0.bb +2 -3

similarity index 76%
rename from meta/recipes-devtools/qemu/qemu_2.2.0.bb
rename to meta/recipes-devtools/qemu/qemu_2.3.0.bb
index 757de89..25c5e4d 100644
@@ -6,11 +6,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=441c28d2cf86e15a37fa47e15a72fbac \
 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"
+SRC_URI[md5sum] = "2fab3ea4460de9b57192e5b8b311f221"
+SRC_URI[sha256sum] = "b6bab7f763d5be73e7cb5ee7d4c8365b7a8df2972c52fa5ded18893bd8281588"
 
 COMPATIBLE_HOST_class-target_mips64 = "null"

Signature · 1 line

2.1.0

Cristian Iorga

author

2015-05-06 15:21 UTC #2 lore raw

PATCH 2/2 runqemu-internal: correctly set format for root FS as raw

In reply to Cristian Iorga

qemu guesses via probing the format of root FS, but gives a warning and restricts write operations on block 0. So fix it by setting correctly the format as raw.

Signed-off-by Cristian Iorga <[email protected]>

---
 scripts/runqemu-internal | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

scripts/runqemu-internal +2 -2

index 2db5566..bc2a355 100755
@@ -123,7 +123,7 @@ if [ "$SLIRP_ENABLED" = "yes" ]; then
     if [ "$KVM_ACTIVE" = "yes" ]; then
         QEMU_NETWORK_CMD=""
         DROOT="/dev/vda"
-        ROOTFS_OPTIONS="-drive file=$ROOTFS,if=virtio"
+        ROOTFS_OPTIONS="-drive file=$ROOTFS,if=virtio,format=raw"
     else
         QEMU_NETWORK_CMD=""
         DROOT="/dev/hda"

@@ -261,7 +261,7 @@ else
         if [ "$KVM_ACTIVE" = "yes" ]; then
             QEMU_NETWORK_CMD="-net nic,model=virtio $QEMU_TAP_CMD,vhost=on"
             DROOT="/dev/vda"
-            ROOTFS_OPTIONS="-drive file=$ROOTFS,if=virtio"
+            ROOTFS_OPTIONS="-drive file=$ROOTFS,if=virtio,format=raw"
         else
             QEMU_NETWORK_CMD="-net nic,vlan=0 $QEMU_TAP_CMD"
             DROOT="/dev/hda"

Signature · 1 line

2.1.0

Iorga, Cristian

author

2015-05-06 15:26 UTC #3 lore raw

In reply to Cristian Iorga

Hello,
Can other interested stakeholders test this upgrade to their own interest and variations?

I tested a lot of combinations, but my testing cannot be exhaustive when we are talking about qemu.

Thanks,
Cristian

-----Original Message-----
From: [email protected] [mailto:[email protected]] On Behalf Of Cristian Iorga
Sent: Wednesday, May 6, 2015 6:22 PM
To: [email protected]
Subject: [OE-core] [PATCH 0/2] qemu 2.3.0 upgrade

The following changes since commit b2b59b14ecfe13ba794d92f97d1403d6503c7407:

poky.conf: remove SVK mirror (2015-05-05 22:18:23 +0100)

are available in the git repository at:

git://git.yoctoproject.org/poky-contrib Ciorga/qemu-upg
http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=Ciorga/qemu-upg

Cristian Iorga (2):
qemu: upgrade to 2.3.0
runqemu-internal: correctly set format for root FS as raw

 ...-Arm-versatilepb-Add-memory-size-checking.patch | 22 ++++----
 meta/recipes-devtools/qemu/qemu.inc                |  2 +-
 .../37ed3bf1ee07bb1a26adca0df8718f601f231c0b.patch | 59 ----------------------
 .../qemu/{qemu_2.2.0.bb => qemu_2.3.0.bb}          |  5 +-
 scripts/runqemu-internal                           |  4 +-
 5 files changed, 17 insertions(+), 75 deletions(-)  delete mode 100644 meta/recipes-devtools/qemu/qemu/37ed3bf1ee07bb1a26adca0df8718f601f231c0b.patch
 rename meta/recipes-devtools/qemu/{qemu_2.2.0.bb => qemu_2.3.0.bb} (76%)

--
2.1.0

--
_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-core