diff --git a/Delete-the-default-vga-graphics-card.patch b/Delete-the-default-vga-graphics-card.patch new file mode 100644 index 0000000000000000000000000000000000000000..ac02245d6c80a34716d1dc4f3018f52348fd33fa --- /dev/null +++ b/Delete-the-default-vga-graphics-card.patch @@ -0,0 +1,41 @@ +From fe81de08ba8ebbacc6e55f5c638123eeff025048 Mon Sep 17 00:00:00 2001 +From: lixianglai +Date: Mon, 6 Nov 2023 21:55:55 -0500 +Subject: [PATCH] Delete the default vga graphics card + +Remove the default vga video card in qemu. + +Signed-off-by: lixianglai +--- + configs/devices/loongarch64-softmmu/default.mak | 1 - + hw/loongarch/larch_3a.c | 2 -- + 2 files changed, 3 deletions(-) + +diff --git a/configs/devices/loongarch64-softmmu/default.mak b/configs/devices/loongarch64-softmmu/default.mak +index b4994d8a6..be3cbbd6b 100644 +--- a/configs/devices/loongarch64-softmmu/default.mak ++++ b/configs/devices/loongarch64-softmmu/default.mak +@@ -95,7 +95,6 @@ CONFIG_VGA_ISA=y + CONFIG_VGA_ISA_MM=y + CONFIG_VGA_CIRRUS=y + CONFIG_VMWARE_VGA=y +-CONFIG_VIRTIO_VGA=y + CONFIG_SERIAL=y + CONFIG_SERIAL_ISA=y + CONFIG_PARALLEL=y +diff --git a/hw/loongarch/larch_3a.c b/hw/loongarch/larch_3a.c +index af1212ca5..5e8f60615 100644 +--- a/hw/loongarch/larch_3a.c ++++ b/hw/loongarch/larch_3a.c +@@ -1839,8 +1839,6 @@ static void ls3a5k_init(MachineState *args) + + /*network card*/ + network_init(pci_bus); +- /* VGA setup. Don't bother loading the bios. */ +- pci_vga_init(pci_bus); + + sysbus_realize_and_unref(SYS_BUS_DEVICE(qdev_new("iocsr")), &error_fatal); + +-- +2.27.0 + diff --git a/edk2-loongarch64-code.fd b/edk2-loongarch64-code.fd index d6330c6f0532effe458726efa18222166a444839..bba1c940a0502a2ae10adaf189e946cd3a459b61 100644 Binary files a/edk2-loongarch64-code.fd and b/edk2-loongarch64-code.fd differ diff --git a/qemu.spec b/qemu.spec index 8a842517ecf87eb968343fc1c96afe1791298858..de52e90a10a7e18e3f7fa8ae7e1c1d32e666a785 100644 --- a/qemu.spec +++ b/qemu.spec @@ -204,7 +204,7 @@ Obsoletes: %{name}-system-moxie-core <= %{epoch}:%{version}-%{release} \ Obsoletes: %{name}-system-unicore32 <= %{epoch}:%{version}-%{release} \ Obsoletes: %{name}-system-unicore32-core <= %{epoch}:%{version}-%{release} -%define anolis_release 3 +%define anolis_release 4 Summary: QEMU is a FAST! processor emulator Name: qemu @@ -265,6 +265,7 @@ Patch1022: Add-lbt-support-for-kvm.patch Patch1023: Modify-the-ioctl-command-of-kvm.patch Patch1024: Fixed-the-issue-where-qemu-specifies-the-boot-order.patch Patch1025: Fixed-a-compilation-error-caused-by-an-excessively-h.patch +Patch1026: Delete-the-default-vga-graphics-card.patch BuildRequires: meson >= %{meson_version} BuildRequires: zlib-devel @@ -1615,9 +1616,9 @@ rm -rf %{buildroot}%{_datadir}/%{name}/sgabios.bin rm -rf %{buildroot}%{_datadir}/%{name}/edk2* rm -rf %{buildroot}%{_datadir}/%{name}/firmware -%ifnarch loongarch64 -rm -f %{buildroot}%{_datadir}/%{name}/edk2-loongarch64-code.fd -rm -f %{buildroot}%{_datadir}/%{name}/edk2-loongarch64-vars.fd +%ifarch loongarch64 +cp -f %{SOURCE41} %{buildroot}%{_datadir}/%{name}/edk2-loongarch64-code.fd +cp -f %{SOURCE42} %{buildroot}%{_datadir}/%{name}/edk2-loongarch64-vars.fd %endif # Fedora specific stuff below @@ -2207,6 +2208,9 @@ useradd -r -u 107 -g qemu -G kvm -d / -s /sbin/nologin \ %changelog +* Fri Oct 23 2023 xianglai li - 6.2.0-4 +- Fixed a compilation error under loongarch. + * Sun Oct 8 2023 xianglai li - 6.2.0-3 - Add loongarch support for qemu.