diff --git a/0001-sgx-stub-fix.patch b/0001-sgx-stub-fix.patch deleted file mode 100644 index ff31973ab889f66c9260ba4b70b4c5cfa041af0a..0000000000000000000000000000000000000000 --- a/0001-sgx-stub-fix.patch +++ /dev/null @@ -1,27 +0,0 @@ -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/0011-migration.json-add-AMD-SEV-specific-migration-parame.patch b/0011-migration.json-add-AMD-SEV-specific-migration-parame.patch index 40b8bdfb162f9015570f22eb1ab299fea6f9f281..7393a2065857d4607ccfe0b6f0fd9ddab1d597ec 100644 --- a/0011-migration.json-add-AMD-SEV-specific-migration-parame.patch +++ b/0011-migration.json-add-AMD-SEV-specific-migration-parame.patch @@ -82,8 +82,8 @@ index c19fb5cb3..0e8bb4837 100644 void qmp_migrate_set_parameters(MigrateSetParameters *params, Error **errp) @@ -1823,6 +1858,27 @@ void qmp_migrate_set_parameters(MigrateSetParameters *params, Error **errp) - params->tls_hostname->type = QTYPE_QSTRING; - params->tls_hostname->u.s = strdup(""); + params->tls_authz->type = QTYPE_QSTRING; + params->tls_authz->u.s = strdup(""); } + /* TODO Rewrite "" to null instead */ + if (params->has_sev_pdh diff --git a/0044-Fix-crash-when-loading-snapshot-on-inactive-node.patch b/0044-Fix-crash-when-loading-snapshot-on-inactive-node.patch deleted file mode 100644 index 68b84c683b0dbee768a32ae81cce01dba9f494a1..0000000000000000000000000000000000000000 --- a/0044-Fix-crash-when-loading-snapshot-on-inactive-node.patch +++ /dev/null @@ -1,52 +0,0 @@ -From a629fee99ba2189a7452a212f0a01696a65877ac Mon Sep 17 00:00:00 2001 -From: Kevin Wolf -Date: Fri, 1 Dec 2023 15:25:18 +0100 -Subject: [PATCH] block: Fix crash when loading snapshot on inactive node - -bdrv_is_read_only() only checks if the node is configured to be -read-only eventually, but even if it returns false, writing to the node -may not be permitted at the moment (because it's inactive). - -bdrv_is_writable() checks that the node can be written to right now, and -this is what the snapshot operations really need. - -Change bdrv_can_snapshot() to use bdrv_is_writable() to fix crashes like -the following: - -$ ./qemu-system-x86_64 -hda /tmp/test.qcow2 -loadvm foo -incoming defer -qemu-system-x86_64: ../block/io.c:1990: int bdrv_co_write_req_prepare(BdrvChild *, int64_t, int64_t, BdrvTrackedRequest *, int): Assertion `!(bs->open_flags & BDRV_O_INACTIVE)' failed. - -The resulting error message after this patch isn't perfect yet, but at -least it doesn't crash any more: - -$ ./qemu-system-x86_64 -hda /tmp/test.qcow2 -loadvm foo -incoming defer -qemu-system-x86_64: Device 'ide0-hd0' is writable but does not support snapshots - -Signed-off-by: Kevin Wolf -Message-ID: <20231201142520.32255-2-kwolf@redhat.com> -Signed-off-by: Kevin Wolf -(cherry picked from commit d3007d348adaaf04ee8b099a475282034a662414) -Signed-off-by: Michael Tokarev ---- - block/snapshot.c | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/block/snapshot.c b/block/snapshot.c -index e22ac3eac63..86e29ca59f9 100644 ---- a/block/snapshot.c -+++ b/block/snapshot.c -@@ -190,8 +190,10 @@ static BlockDriverState *bdrv_snapshot_fallback(BlockDriverState *bs) - int bdrv_can_snapshot(BlockDriverState *bs) - { - BlockDriver *drv = bs->drv; -+ - GLOBAL_STATE_CODE(); -- if (!drv || !bdrv_is_inserted(bs) || bdrv_is_read_only(bs)) { -+ -+ if (!drv || !bdrv_is_inserted(bs) || !bdrv_is_writable(bs)) { - return 0; - } - --- -GitLab - diff --git a/qemu-7.2.6.tar.xz b/qemu-7.2.10.tar.xz similarity index 89% rename from qemu-7.2.6.tar.xz rename to qemu-7.2.10.tar.xz index f00652849464df26a204f7e99a102771fe6ad126..74d7f60a100c144e95323774ddcb2acbee7f95f0 100644 Binary files a/qemu-7.2.6.tar.xz and b/qemu-7.2.10.tar.xz differ diff --git a/qemu.spec b/qemu.spec index 5453122508b7e6bd43d71e9f7aa295f1272116ec..a596b159edb5289901e011a1bcbf2a6f4e535031 100644 --- a/qemu.spec +++ b/qemu.spec @@ -1,4 +1,4 @@ -%define anolis_release 8 +%define anolis_release 1 %bcond_with check @@ -244,7 +244,7 @@ Obsoletes: %{name}-audio-sdl <= %{epoch}:%{version}-%{release} Summary: QEMU is a FAST! processor emulator Name: qemu -Version: 7.2.6 +Version: 7.2.10 Release: %{anolis_release}%{?dist} Epoch: 15 License: GPLv2 and BSD and MIT and CC-BY @@ -263,7 +263,6 @@ Source27: kvm.conf Source31: kvm-x86.conf Source36: README.tests -Patch0001: 0001-sgx-stub-fix.patch Patch0002: 0002-anolis-csv-i386-add-CSV-context.patch Patch0003: 0003-anolis-csv-i386-add-command-to-initialize-CSV-contex.patch Patch0004: 0004-anolis-csv-i386-add-command-to-load-data-to-guest-me.patch @@ -306,7 +305,6 @@ Patch0040: 0040-anolis-csv-i386-add-support-to-migrate-the-outgoing-.patch Patch0041: 0041-anolis-csv-i386-add-support-to-migrate-the-incoming-.patch Patch0042: 0042-anolis-csv-i386-add-support-to-migrate-the-outgoing-.patch Patch0043: 0043-anolis-csv-i386-add-support-to-migrate-the-incoming-.patch -Patch0044: 0044-Fix-crash-when-loading-snapshot-on-inactive-node.patch Patch0045: 0045-anolis-target-i386-sev-Add-support-for-reuse-ASID-fo.patch Patch0046: 0046-target-i386-sev-Fix-incompatibility-between-SEV-and-.patch @@ -981,8 +979,7 @@ platform. %prep -%setup -q -n qemu-%{version} -%autopatch -p1 +%autosetup -p1 -n qemu-%{version} %global qemu_kvm_build qemu_kvm_build mkdir -p %{qemu_kvm_build} @@ -1877,6 +1874,9 @@ useradd -r -u 107 -g qemu -G kvm -d / -s /sbin/nologin \ %endif %changelog +* Thu Mar 07 2024 Funda Wang - 15:7.2.10-1 +- New version 7.2.10 + * Sat Mar 06 2024 Liyang Han - 15:7.2.6-8 - Patch0046: 0046-target-i386-sev-Fix-incompatibility-between-SEV-and-.patch (Fix incompatibility between SEV and CSV on the GET_ID API) @@ -1897,7 +1897,7 @@ useradd -r -u 107 -g qemu -G kvm -d / -s /sbin/nologin \ - Patch0043: 0043-anolis-csv-i386-add-support-to-migrate-the-incoming-.patch (Support CSV3 live migration) -* Tue Nov 22 2023 Liyang Han - 15:7.2.6-4 +* Wed Nov 22 2023 Liyang Han - 15:7.2.6-4 - Patch0010: 0010-doc-update-AMD-SEV-to-include-Live-migration-flow.patch - Patch0011: 0011-migration.json-add-AMD-SEV-specific-migration-parame.patch - Patch0012: 0012-confidential-guest-support-introduce-ConfidentialGue.patch