From d8c0bdb6f6e685a8157f7f49360383c9334d93af Mon Sep 17 00:00:00 2001 From: lixianglai Date: Tue, 12 Sep 2023 02:36:44 -0400 Subject: [PATCH] Fixed loongarch qxl device not displaying during startup phase Fixed an issue where qxl devices could not be displayed in bios and grub stages due to a loongarch architecture string comparison error. Signed-off-by: lixianglai (cherry picked from commit 3ec9f99b9e3286a298053975ed837c7a81f8bbe2) --- ...qxl-device-not-displaying-during-sta.patch | 30 +++++++++++++++++++ libvirt.spec | 6 +++- 2 files changed, 35 insertions(+), 1 deletion(-) create mode 100644 Fixed-loongarch-qxl-device-not-displaying-during-sta.patch diff --git a/Fixed-loongarch-qxl-device-not-displaying-during-sta.patch b/Fixed-loongarch-qxl-device-not-displaying-during-sta.patch new file mode 100644 index 0000000..93709c6 --- /dev/null +++ b/Fixed-loongarch-qxl-device-not-displaying-during-sta.patch @@ -0,0 +1,30 @@ +From 8b57ac24787afc0a94f3ba8e065f9524c986fa7f Mon Sep 17 00:00:00 2001 +From: lixianglai +Date: Tue, 12 Sep 2023 02:08:31 -0400 +Subject: [PATCH] Fixed loongarch qxl device not displaying during startup + phase + +Fixed an issue where qxl devices could not be displayed in bios and grub +stages due to a loongarch architecture string comparison error. + +Signed-off-by: lixianglai +--- + src/qemu/qemu_domain.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c +index fbc665aff3..5933039f5c 100644 +--- a/src/qemu/qemu_domain.c ++++ b/src/qemu/qemu_domain.c +@@ -12998,7 +12998,7 @@ qemuDomainMachineIsLoongson(const char *machine, + return false; + + if (STREQ(machine, "loongson7a") || +- STRPREFIX(machine, "loongson7a-")) { ++ STRPREFIX(machine, "loongson7a")) { + return true; + } + +-- +2.27.0 + diff --git a/libvirt.spec b/libvirt.spec index b1493dc..031d386 100644 --- a/libvirt.spec +++ b/libvirt.spec @@ -101,7 +101,7 @@ Summary: Library providing a simple virtualization API Name: libvirt Version: 6.2.0 -Release: 59 +Release: 60 License: LGPLv2+ URL: https://libvirt.org/ @@ -490,6 +490,7 @@ Patch0377: Revert-selinux-adapt-to-libselinux.patch Patch0378: selinux-Reflect-context_str-type-change.patch Patch0379: virnetsshsession-Adapt-to-change-libssh2-API.patch Patch0380: qemu-command-Use-correct-tpm-device-for-all-non-x86.patch +Patch0381: Fixed-loongarch-qxl-device-not-displaying-during-sta.patch Requires: libvirt-daemon = %{version}-%{release} Requires: libvirt-daemon-config-network = %{version}-%{release} @@ -2226,6 +2227,9 @@ exit 0 %changelog +* Tue Sep 12 2023 lixianglai - 6.2.0-60 +- Fixed loongarch qxl device not displaying during startup phase + * Sat Aug 26 2023 lixianglai - 6.2.0-59 - Synchronize upstream patches "Use correct tpm device for all non-x86" -- Gitee