diff --git a/Delete-the-default-vga-graphics-card.patch b/Delete-the-default-vga-graphics-card.patch new file mode 100644 index 0000000000000000000000000000000000000000..0ea8581a722c6bad9b70ef0ab557679056c5267b --- /dev/null +++ b/Delete-the-default-vga-graphics-card.patch @@ -0,0 +1,54 @@ +From 062ba40197a7a6da436e7c556c0ad007a0d75ced 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 - + configs/devices/loongarch64-softmmu/loongarch64-rh-devices.mak | 1 - + hw/loongarch/larch_3a.c | 2 -- + 3 files changed, 4 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/configs/devices/loongarch64-softmmu/loongarch64-rh-devices.mak b/configs/devices/loongarch64-softmmu/loongarch64-rh-devices.mak +index 696ee9b72..79fcc9e64 100644 +--- a/configs/devices/loongarch64-softmmu/loongarch64-rh-devices.mak ++++ b/configs/devices/loongarch64-softmmu/loongarch64-rh-devices.mak +@@ -97,7 +97,6 @@ CONFIG_VGA_ISA=y + CONFIG_VGA_ISA_MM=y + CONFIG_VGA_CIRRUS=y + CONFIG_VMWARE_VGA=y +-CONFIG_VIRTIO_VGA=y + CONFIG_SERIAL_ISA=y + CONFIG_PARALLEL=y + CONFIG_I8254=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/loongarch_bios.bin b/loongarch_bios.bin index d6330c6f0532effe458726efa18222166a444839..bba1c940a0502a2ae10adaf189e946cd3a459b61 100644 Binary files a/loongarch_bios.bin and b/loongarch_bios.bin differ diff --git a/qemu-kvm.spec b/qemu-kvm.spec index 433dd59356282e10331a6ab4d9d124ae726de1ae..0995a9586d8af2df4fb701c7ec988c0af5f6e703 100644 --- a/qemu-kvm.spec +++ b/qemu-kvm.spec @@ -1,4 +1,4 @@ -%define anolis_release .0.2 +%define anolis_release .0.3 %global SLOF_gittagdate 20191022 %global SLOF_gittagcommit 899d9883 @@ -696,6 +696,7 @@ Patch1027: Fix-LoongArch-KVM-header-macros.patch Patch1028: Fixed-the-issue-where-qemu-specifies-the-boot-order.patch # https://github.com/qemu/qemu/commit/10be627d2b5ec2d6b3dce045144aa739eef678b4 Patch1029: 1029-anolis-qemu-fix-CVE-2023-3354.patch +Patch1030: Delete-the-default-vga-graphics-card.patch BuildRequires: wget BuildRequires: rpm-build @@ -1588,7 +1589,7 @@ pxe_link() { ln -s ../ipxe.efi/$2.rom %{buildroot}%{_datadir}/%{name}/efi-$1.rom } -%ifnarch aarch64 s390x +%ifnarch aarch64 s390x loongarch64 pxe_link e1000 8086100e pxe_link ne2k_pci 10ec8029 pxe_link pcnet 10222000 @@ -1601,7 +1602,7 @@ rom_link() { ln -s $1 %{buildroot}%{_datadir}/%{name}/$2 } -%ifnarch aarch64 s390x +%ifnarch aarch64 s390x loongarch64 rom_link ../seavgabios/vgabios-isavga.bin vgabios.bin rom_link ../seavgabios/vgabios-cirrus.bin vgabios-cirrus.bin rom_link ../seavgabios/vgabios-qxl.bin vgabios-qxl.bin @@ -1798,7 +1799,7 @@ sh %{_sysconfdir}/sysconfig/modules/kvm.modules &> /dev/null || : %{_datadir}/%{name}/loongarch_bios.bin %{_datadir}/%{name}/loongarch_vars.bin %endif -%ifnarch aarch64 s390x +%ifnarch aarch64 s390x loongarch64 %{_datadir}/%{name}/vgabios.bin %{_datadir}/%{name}/vgabios-cirrus.bin %{_datadir}/%{name}/vgabios-qxl.bin @@ -1819,7 +1820,7 @@ sh %{_sysconfdir}/sysconfig/modules/kvm.modules &> /dev/null || : %ifnarch s390x %{_libdir}/%{name}/hw-display-virtio-gpu-pci-gl.so %endif -%ifarch x86_64 %{power64} loongarch64 +%ifarch x86_64 %{power64} %{_libdir}/%{name}/hw-display-virtio-vga-gl.so %endif %{_libdir}/%{name}/accel-qtest-%{kvm_target}.so @@ -1934,6 +1935,9 @@ sh %{_sysconfdir}/sysconfig/modules/kvm.modules &> /dev/null || : %endif %changelog +* Tue Nov 7 2023 lixianglai - 6.2.0-33.0.3 +- loongarch: Delete the default vga graphics card and update the firmware. + * Thu Aug 24 2023 lixianglai - 6.2.0-33.0.2 - loongarch: Fixed the issue where qemu specifies the boot order - Fix CVE-2023-3354 (Liwei Ge )