From 06a96ef6dd8913f5624551cda7036c8424be689a Mon Sep 17 00:00:00 2001 From: Paolo Bonzini Date: Feb 02 2022 09:47:02 +0000 Subject: Fix non-SGX builds --- diff --git a/0001-sgx-stub-fix.patch b/0001-sgx-stub-fix.patch new file mode 100644 index 0000000..ff31973 --- /dev/null +++ b/0001-sgx-stub-fix.patch @@ -0,0 +1,27 @@ +From 509b6078631ad2437e1a452f749831e401fb8afb Mon Sep 17 00:00:00 2001 +From: Paolo Bonzini +Date: Tue, 1 Feb 2022 20:09:37 +0100 +Subject: [PATCH] target/i386: the sgx_epc_get_section stub is reachable +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +The sgx_epc_get_section stub is reachable from cpu_x86_cpuid. It +should not assert, instead it should just return true just like +the "real" sgx_epc_get_section does when SGX is disabled. + +Reported-by: Vladimír Beneš +Cc: qemu-stable@nongnu.org +Signed-off-by: Paolo Bonzini + +diff --git a/hw/i386/sgx-stub.c b/hw/i386/sgx-stub.c +index 26833eb233..16b1dfd90b 100644 +--- a/hw/i386/sgx-stub.c ++++ b/hw/i386/sgx-stub.c +@@ -34,5 +34,5 @@ void pc_machine_init_sgx_epc(PCMachineState *pcms) + + bool sgx_epc_get_section(int section_nr, uint64_t *addr, uint64_t *size) + { +- g_assert_not_reached(); ++ return true; + } diff --git a/qemu.spec b/qemu.spec index bdc1169..fb67b7b 100644 --- a/qemu.spec +++ b/qemu.spec @@ -288,7 +288,7 @@ Obsoletes: %{name}-system-unicore32-core <= %{epoch}:%{version}-%{release} Summary: QEMU is a FAST! processor emulator Name: qemu Version: 6.2.0 -Release: 2%{?rcrel}%{?dist}.1 +Release: 3%{?rcrel}%{?dist}.1 Epoch: 2 License: GPLv2 and BSD and MIT and CC-BY URL: http://www.qemu.org/ @@ -306,6 +306,8 @@ Source30: kvm-s390x.conf Source31: kvm-x86.conf Source36: README.tests +Patch0001: 0001-sgx-stub-fix.patch + BuildRequires: meson >= %{meson_version} BuildRequires: zlib-devel BuildRequires: glib2-devel @@ -2244,6 +2246,9 @@ useradd -r -u 107 -g qemu -G kvm -d / -s /sbin/nologin \ %changelog +* Wed Feb 2 2022 Paolo Bonzini - 2:6.2.0-3 +- Fix non-SGX builds + * Fri Jan 21 2022 Fedora Release Engineering - 2:6.2.0-2.1 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild