From 4bbbffaef822d9153d7aa190daab3e1d1b0fbf8e Mon Sep 17 00:00:00 2001 From: lixianglai Date: Wed, 29 Mar 2023 03:33:08 -0400 Subject: [PATCH] fixup compile on loongarch64 machine. Add function kvm_arch_accel_class_init definition on loongarch64 machine. Signed-off-by: lixianglai (cherry picked from commit 6b685cefd08b2a46db9888d6e6e74510b6d62fd0) --- fixup-compile-on-loongarch64-machine.patch | 26 ++++++++++++++++++++++ qemu.spec | 8 +++++-- 2 files changed, 32 insertions(+), 2 deletions(-) create mode 100644 fixup-compile-on-loongarch64-machine.patch diff --git a/fixup-compile-on-loongarch64-machine.patch b/fixup-compile-on-loongarch64-machine.patch new file mode 100644 index 0000000..1dfe048 --- /dev/null +++ b/fixup-compile-on-loongarch64-machine.patch @@ -0,0 +1,26 @@ +From c952962cda3daf05323b383485d834ffc8e16f4f Mon Sep 17 00:00:00 2001 +From: lixianglai +Date: Wed, 29 Mar 2023 02:48:04 -0400 +Subject: [PATCH] fixup compile on loongarch64 machine. + +Add function kvm_arch_accel_class_init definition on loongarch64 machine. + +Signed-off-by: lixianglai +--- + target/loongarch64/kvm.c | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/target/loongarch64/kvm.c b/target/loongarch64/kvm.c +index 2b0159bb32..21f6d5695f 100644 +--- a/target/loongarch64/kvm.c ++++ b/target/loongarch64/kvm.c +@@ -1364,3 +1364,6 @@ int kvm_arch_msi_data_to_gsi(uint32_t data) + { + abort(); + } ++void kvm_arch_accel_class_init(ObjectClass *oc) ++{ ++} +-- +2.27.0 + diff --git a/qemu.spec b/qemu.spec index e65b901..557a487 100644 --- a/qemu.spec +++ b/qemu.spec @@ -3,7 +3,7 @@ Name: qemu Version: 6.2.0 -Release: 68 +Release: 69 Epoch: 10 Summary: QEMU is a generic and open source machine emulator and virtualizer License: GPLv2 and BSD and MIT and CC-BY-SA-4.0 @@ -478,6 +478,7 @@ Patch0463: block-backend-prevent-dangling-BDS-pointers-across-a.patch Patch0464: net-Fix-uninitialized-data-usage.patch Patch0465: net-eth-Don-t-consider-ESP-to-be-an-IPv6-option-head.patch Patch0466: hw-net-vmxnet3-Log-guest-triggerable-errors-using-LO.patch +Patch0467: fixup-compile-on-loongarch64-machine.patch BuildRequires: flex BuildRequires: gcc @@ -1049,7 +1050,10 @@ getent passwd qemu >/dev/null || \ %endif %changelog -* Wen Mar 29 2023 - 10:6.2.0-68 +* Wed Mar 29 2023 - 10:6.2.0-69 +- fixup compile error. Add function kvm_arch_accel_class_init definition on loongarch64 machine. + +* Wed Mar 29 2023 - 10:6.2.0-68 - modify qemu.spec to add (riscv virt) machine mapping to testenv from v7.0.0 * Tue Mar 28 2023 - 10:6.2.0-67 -- Gitee