From: Kai Kang Date: Thu, 15 Jan 2026 07:54:36 +0000 (+0800) Subject: qemu: 10.1.3 -> 10.2.0 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=39fe1758ffc996cd482b907382afac932380d7c5;p=thirdparty%2Fopenembedded%2Fopenembedded-core.git qemu: 10.1.3 -> 10.2.0 Upgrade qemu from 10.1.3 to 10.2.0: * remove backported 0012 patch * update context for patches 0002 and 0010 Signed-off-by: Kai Kang Signed-off-by: Antonin Godard Signed-off-by: Richard Purdie --- diff --git a/meta/recipes-devtools/qemu/qemu-native_10.1.3.bb b/meta/recipes-devtools/qemu/qemu-native_10.2.0.bb similarity index 100% rename from meta/recipes-devtools/qemu/qemu-native_10.1.3.bb rename to meta/recipes-devtools/qemu/qemu-native_10.2.0.bb diff --git a/meta/recipes-devtools/qemu/qemu-system-native_10.1.3.bb b/meta/recipes-devtools/qemu/qemu-system-native_10.2.0.bb similarity index 100% rename from meta/recipes-devtools/qemu/qemu-system-native_10.1.3.bb rename to meta/recipes-devtools/qemu/qemu-system-native_10.2.0.bb diff --git a/meta/recipes-devtools/qemu/qemu.inc b/meta/recipes-devtools/qemu/qemu.inc index eb4a5f71bc3..d320b13ba78 100644 --- a/meta/recipes-devtools/qemu/qemu.inc +++ b/meta/recipes-devtools/qemu/qemu.inc @@ -32,7 +32,6 @@ SRC_URI = "https://download.qemu.org/${BPN}-${PV}.tar.xz \ file://0008-Define-MAP_SYNC-and-MAP_SHARED_VALIDATE-on-needed-li.patch \ file://0010-configure-lookup-meson-exutable-from-PATH.patch \ file://0011-qemu-Ensure-pip-and-the-python-venv-aren-t-used-for-.patch \ - file://0012-hw-sd-sdcard-Fix-size-check-for-backing-block-image.patch \ file://qemu-guest-agent.init \ file://qemu-guest-agent.udev \ " @@ -40,7 +39,7 @@ SRC_URI = "https://download.qemu.org/${BPN}-${PV}.tar.xz \ UPSTREAM_CHECK_URI = "https://www.qemu.org" UPSTREAM_CHECK_REGEX = "qemu-(?P\d+(\.\d+)+)\.tar" -SRC_URI[sha256sum] = "fbaa7a0d7a9a1deb5695b125916746ec28fe0de6275d4454f3e3bbaf8b339b53" +SRC_URI[sha256sum] = "9e30ad1b8b9f7b4463001582d1ab297f39cfccea5d08540c0ca6d6672785883a" CVE_STATUS[CVE-2007-0998] = "not-applicable-config: The VNC server can expose host files uder some circumstances. We don't enable it by default." diff --git a/meta/recipes-devtools/qemu/qemu/0002-apic-fixup-fallthrough-to-PIC.patch b/meta/recipes-devtools/qemu/qemu/0002-apic-fixup-fallthrough-to-PIC.patch index afbe1bd381e..bfc85f48420 100644 --- a/meta/recipes-devtools/qemu/qemu/0002-apic-fixup-fallthrough-to-PIC.patch +++ b/meta/recipes-devtools/qemu/qemu/0002-apic-fixup-fallthrough-to-PIC.patch @@ -24,16 +24,20 @@ serviced, is -1. Signed-off-by: Mark Asselstine Upstream-Status: Submitted [https://lists.gnu.org/archive/html/qemu-devel/2013-04/msg00878.html] Signed-off-by: He Zhe + +Update context for qemu 10.2.0. + +Signed-off-by: Kai Kang --- hw/intc/apic.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/intc/apic.c b/hw/intc/apic.c -index 143d08f1a..5bb008d59 100644 +index aad253a..212b01f 100644 --- a/hw/intc/apic.c +++ b/hw/intc/apic.c -@@ -756,7 +756,7 @@ int apic_accept_pic_intr(DeviceState *dev) - APICCommonState *s = APIC(dev); +@@ -740,7 +740,7 @@ int apic_accept_pic_intr(APICCommonState *s) + { uint32_t lvt0; - if (!s) diff --git a/meta/recipes-devtools/qemu/qemu/0010-configure-lookup-meson-exutable-from-PATH.patch b/meta/recipes-devtools/qemu/qemu/0010-configure-lookup-meson-exutable-from-PATH.patch index 6e9350ad740..db88766cf67 100644 --- a/meta/recipes-devtools/qemu/qemu/0010-configure-lookup-meson-exutable-from-PATH.patch +++ b/meta/recipes-devtools/qemu/qemu/0010-configure-lookup-meson-exutable-from-PATH.patch @@ -4,24 +4,26 @@ Date: Wed, 22 May 2024 14:02:55 +0200 Subject: [PATCH] configure: lookup meson exutable from PATH Upstream-Status: Inappropriate [workaround, would need a real fix for upstream] + +Update context for qemu 10.2.0. + +Signed-off-by: Kai Kang --- - configure | 7 +------ - 1 file changed, 1 insertion(+), 6 deletions(-) + configure | 5 +---- + 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/configure b/configure -index 274a77876..84e429409 100755 +index 82cace1..83bbda9 100755 --- a/configure +++ b/configure -@@ -995,12 +995,7 @@ mkvenv="$python ${source_path}/python/scripts/mkvenv.py" - $mkvenv ensuregroup --dir "${source_path}/python/wheels" \ - ${source_path}/pythondeps.toml meson || exit 1 +@@ -993,10 +993,7 @@ get_pwd() { + fi + } --# At this point, we expect Meson to be installed and available. --# We expect mkvenv or pip to have created pyvenv/bin/meson for us. --# We ignore PATH completely here: we want to use the venv's Meson --# *exclusively*. -- --meson="$(cd pyvenv/bin; pwd)/meson" +-meson="$(cd pyvenv/bin; get_pwd)/meson" +-if [ -f "$meson$EXESUF" ]; then +- meson="$meson$EXESUF" +-fi +meson=`which meson` # Conditionally ensure Sphinx is installed. diff --git a/meta/recipes-devtools/qemu/qemu/0012-hw-sd-sdcard-Fix-size-check-for-backing-block-image.patch b/meta/recipes-devtools/qemu/qemu/0012-hw-sd-sdcard-Fix-size-check-for-backing-block-image.patch deleted file mode 100644 index 431b49bad70..00000000000 --- a/meta/recipes-devtools/qemu/qemu/0012-hw-sd-sdcard-Fix-size-check-for-backing-block-image.patch +++ /dev/null @@ -1,123 +0,0 @@ -From 9b262cda68d2b687f803a8030d3a1ad29a93a41e Mon Sep 17 00:00:00 2001 -From: Jan Kiszka -Date: Sun, 24 Aug 2025 09:18:33 +0200 -Subject: [PATCH] hw/sd/sdcard: Fix size check for backing block image -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Alignment rules apply the the individual partitions (user, boot, later -on also RPMB) and depend both on the size of the image and the type of -the device. Up to and including 2GB, the power-of-2 rule applies to the -user data area. For larger images, multiples of 512 sectors must be used -for eMMC and multiples of 512K for SD-cards. Fix the check accordingly -and also detect if the image is too small to even hold the boot -partitions. - -Signed-off-by: Jan Kiszka -Reviewed-by: Cédric Le Goater -Reviewed-by: Philippe Mathieu-Daudé -Reviewed-by: Warner Losh -Message-ID: <591f6d8a9dc86428723cb6876df6e717cc41a70e.1762261430.git.jan.kiszka@siemens.com> -Tested-by: Cédric Le Goater -Signed-off-by: Philippe Mathieu-Daudé -Upstream-Status: Backport [https://gitlab.com/qemu-project/qemu/-/commit/a362b19a39e458256cc7e3acd0dc7825b0389b48] -Signed-off-by: Mathieu Dubois-Briand ---- - hw/sd/sd.c | 67 ++++++++++++++++++++++++++++++++++++++---------------- - 1 file changed, 47 insertions(+), 20 deletions(-) - -diff --git a/hw/sd/sd.c b/hw/sd/sd.c -index 8c290595f..58387440b 100644 ---- a/hw/sd/sd.c -+++ b/hw/sd/sd.c -@@ -2767,9 +2767,32 @@ static void sd_instance_finalize(Object *obj) - timer_free(sd->ocr_power_timer); - } - -+static void sd_blk_size_error(SDState *sd, int64_t blk_size, -+ int64_t blk_size_aligned, const char *rule, -+ Error **errp) -+{ -+ const char *dev_type = sd_is_emmc(sd) ? "eMMC" : "SD card"; -+ char *blk_size_str; -+ -+ blk_size_str = size_to_str(blk_size); -+ error_setg(errp, "Invalid %s size: %s", dev_type, blk_size_str); -+ g_free(blk_size_str); -+ -+ blk_size_str = size_to_str(blk_size_aligned); -+ error_append_hint(errp, -+ "%s size has to be %s, e.g. %s.\n" -+ "You can resize disk images with" -+ " 'qemu-img resize '\n" -+ "(note that this will lose data if you make the" -+ " image smaller than it currently is).\n", -+ dev_type, rule, blk_size_str); -+ g_free(blk_size_str); -+} -+ - static void sd_realize(DeviceState *dev, Error **errp) - { - SDState *sd = SDMMC_COMMON(dev); -+ int64_t blk_size = -ENOMEDIUM; - int ret; - - switch (sd->spec_version) { -@@ -2782,32 +2805,36 @@ static void sd_realize(DeviceState *dev, Error **errp) - } - - if (sd->blk) { -- int64_t blk_size; -- - if (!blk_supports_write_perm(sd->blk)) { - error_setg(errp, "Cannot use read-only drive as SD card"); - return; - } - - blk_size = blk_getlength(sd->blk); -- if (blk_size > 0 && !is_power_of_2(blk_size)) { -- int64_t blk_size_aligned = pow2ceil(blk_size); -- char *blk_size_str; -- -- blk_size_str = size_to_str(blk_size); -- error_setg(errp, "Invalid SD card size: %s", blk_size_str); -- g_free(blk_size_str); -- -- blk_size_str = size_to_str(blk_size_aligned); -- error_append_hint(errp, -- "SD card size has to be a power of 2, e.g. %s.\n" -- "You can resize disk images with" -- " 'qemu-img resize '\n" -- "(note that this will lose data if you make the" -- " image smaller than it currently is).\n", -- blk_size_str); -- g_free(blk_size_str); -- -+ } -+ if (blk_size >= 0) { -+ blk_size -= sd->boot_part_size * 2; -+ if (blk_size > SDSC_MAX_CAPACITY) { -+ if (sd_is_emmc(sd) && -+ !QEMU_IS_ALIGNED(blk_size, 1 << HWBLOCK_SHIFT)) { -+ int64_t blk_size_aligned = -+ ((blk_size >> HWBLOCK_SHIFT) + 1) << HWBLOCK_SHIFT; -+ sd_blk_size_error(sd, blk_size, blk_size_aligned, -+ "multiples of 512", errp); -+ return; -+ } else if (!sd_is_emmc(sd) && -+ !QEMU_IS_ALIGNED(blk_size, 512 * KiB)) { -+ int64_t blk_size_aligned = ((blk_size >> 19) + 1) << 19; -+ sd_blk_size_error(sd, blk_size, blk_size_aligned, -+ "multiples of 512K", errp); -+ return; -+ } -+ } else if (blk_size > 0 && !is_power_of_2(blk_size)) { -+ sd_blk_size_error(sd, blk_size, pow2ceil(blk_size), "a power of 2", -+ errp); -+ return; -+ } else if (blk_size < 0) { -+ error_setg(errp, "eMMC image smaller than boot partitions"); - return; - } - diff --git a/meta/recipes-devtools/qemu/qemu_10.1.3.bb b/meta/recipes-devtools/qemu/qemu_10.2.0.bb similarity index 100% rename from meta/recipes-devtools/qemu/qemu_10.1.3.bb rename to meta/recipes-devtools/qemu/qemu_10.2.0.bb