From 1c471d38bc71041e6537d9468a055e751708eae0 Mon Sep 17 00:00:00 2001 From: Daniel P. Berrangé Date: Jan 09 2024 17:48:49 +0000 Subject: Update to 8.2.0 release Signed-off-by: Daniel P. Berrangé --- diff --git a/0001-xen-fix-condition-for-enabling-the-Xen-accelerator.patch b/0001-xen-fix-condition-for-enabling-the-Xen-accelerator.patch deleted file mode 100644 index 5be3634..0000000 --- a/0001-xen-fix-condition-for-enabling-the-Xen-accelerator.patch +++ /dev/null @@ -1,83 +0,0 @@ -From 5fed25c696c0e32933d71b4133afe7856b82c11b Mon Sep 17 00:00:00 2001 -From: Paolo Bonzini -Date: Sat, 9 Dec 2023 15:32:22 +0100 -Subject: [PATCH] xen: fix condition for enabling the Xen accelerator -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -A misspelled condition in xen_native.h is hiding a bug in the enablement of -Xen for qemu-system-aarch64. The bug becomes apparent when building for -Xen 4.18. - -While the i386 emulator provides the xenpv machine type for multiple architectures, -and therefore can be compiled with Xen enabled even when the host is Arm, the -opposite is not true: qemu-system-aarch64 can only be compiled with Xen support -enabled when the host is Arm. - -Expand the computation of accelerator_targets['CONFIG_XEN'] similar to what is -already there for KVM, and fix xen_native.h. - -Cc: Stefano Stabellini -Cc: Richard W.M. Jones -Cc: Daniel P. Berrangé -Reported-by: Michael Young -Supersedes: <277e21fc78b75ec459efc7f5fde628a0222c63b0.1701989261.git.m.a.young@durham.ac.uk> -Signed-off-by: Paolo Bonzini ---- - include/hw/xen/xen_native.h | 2 +- - meson.build | 17 ++++++++++------- - 2 files changed, 11 insertions(+), 8 deletions(-) - -diff --git a/include/hw/xen/xen_native.h b/include/hw/xen/xen_native.h -index 6f09c48823..1a5ad693a4 100644 ---- a/include/hw/xen/xen_native.h -+++ b/include/hw/xen/xen_native.h -@@ -532,7 +532,7 @@ static inline int xendevicemodel_set_irq_level(xendevicemodel_handle *dmod, - } - #endif - --#if CONFIG_XEN_CTRL_INTERFACE_VERSION <= 41700 -+#if CONFIG_XEN_CTRL_INTERFACE_VERSION < 41700 - #define GUEST_VIRTIO_MMIO_BASE xen_mk_ullong(0x02000000) - #define GUEST_VIRTIO_MMIO_SIZE xen_mk_ullong(0x00100000) - #define GUEST_VIRTIO_MMIO_SPI_FIRST 33 -diff --git a/meson.build b/meson.build -index d2c4c2adb3..6c77d9687d 100644 ---- a/meson.build -+++ b/meson.build -@@ -123,21 +123,24 @@ if get_option('kvm').allowed() and targetos == 'linux' - kvm_targets_c = '"' + '" ,"'.join(kvm_targets) + '"' - endif - config_host_data.set('CONFIG_KVM_TARGETS', kvm_targets_c) -- - accelerator_targets = { 'CONFIG_KVM': kvm_targets } - -+if cpu in ['x86', 'x86_64'] -+ xen_targets = ['i386-softmmu', 'x86_64-softmmu'] -+elif cpu in ['arm', 'aarch64'] -+ # i386 emulator provides xenpv machine type for multiple architectures -+ xen_targets = ['i386-softmmu', 'x86_64-softmmu', 'aarch64-softmmu'] -+else -+ xen_targets = [] -+endif -+accelerator_targets += { 'CONFIG_XEN': xen_targets } -+ - if cpu in ['aarch64'] - accelerator_targets += { - 'CONFIG_HVF': ['aarch64-softmmu'] - } - endif - --if cpu in ['x86', 'x86_64', 'arm', 'aarch64'] -- # i386 emulator provides xenpv machine type for multiple architectures -- accelerator_targets += { -- 'CONFIG_XEN': ['i386-softmmu', 'x86_64-softmmu', 'aarch64-softmmu'], -- } --endif - if cpu in ['x86', 'x86_64'] - accelerator_targets += { - 'CONFIG_HVF': ['x86_64-softmmu'], --- -2.41.0 - diff --git a/qemu.spec b/qemu.spec index 66c788e..ee69a7d 100644 --- a/qemu.spec +++ b/qemu.spec @@ -350,14 +350,14 @@ Obsoletes: %{name}-system-unicore32-core <= %{epoch}:%{version}-%{release} \ Obsoletes: sgabios-bin <= 1:0.20180715git-10.fc38 # Release candidate version tracking -%global rcver rc2 +#global rcver rc2 %if 0%{?rcver:1} %global rcrel .%{rcver} %global rcstr -%{rcver} %endif # To prevent rpmdev-bumpspec breakage -%global baserelease 0.3 +%global baserelease 1 Summary: QEMU is a FAST! processor emulator Name: qemu @@ -373,8 +373,6 @@ Source0: https://download.qemu.org/%{name}-%{version}%{?rcstr}.tar.xz # Fix pvh.img ld build failure on fedora rawhide Patch: 0001-pc-bios-optionrom-Fix-pvh.img-ld-build-failure-on-fe.patch -# See https://lists.gnu.org/archive/html/qemu-devel/2023-12/msg01165.html -Patch: 0001-xen-fix-condition-for-enabling-the-Xen-accelerator.patch Source10: qemu-guest-agent.service Source11: 99-qemu-guest-agent.rules @@ -3125,6 +3123,9 @@ useradd -r -u 107 -g qemu -G kvm -d / -s /sbin/nologin \ %changelog +* Tue Jan 9 2024 Daniel P. Berrangé - 8.2.0-1 +- Update to 8.2.0 release + * Sat Dec 9 2023 Richard W.M. Jones - 2:8.2.0-0.3.rc2 - Further fix for Xen 4.18 diff --git a/sources b/sources index 5f93671..a38f0b3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (qemu-8.2.0-rc2.tar.xz) = d9385840599c66e9ab0e36509a1242dcf9db33f8a4d1971e078bcc645b75c792cdfd3470d98ccafc2f52da5b048eff4dc97c6092df5d359569cdabb1e2878bbf +SHA512 (qemu-8.2.0.tar.xz) = 92ec41196ff145cdbb98948f6b6e43214fa4b4419554a8a1927fb4527080c8212ccb703e184baf8ee0bdfa50ad7a84689e8f5a69eba1bd7bbbdfd69e3b91256c