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 <lixianglai@loongson.cn>
(cherry picked from commit 3ec9f99b9e3286a298053975ed837c7a81f8bbe2)
This commit is contained in:
lixianglai 2023-09-12 02:36:44 -04:00 committed by Jiabo Feng
parent f9675b3ff7
commit efa8c73d73
2 changed files with 61 additions and 28 deletions

View File

@ -0,0 +1,30 @@
From 8b57ac24787afc0a94f3ba8e065f9524c986fa7f Mon Sep 17 00:00:00 2001
From: lixianglai <lixianglai@loongson.cn>
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 <lixianglai@loongson.cn>
---
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

View File

@ -489,29 +489,31 @@ Patch0376: selinux-adapt-to-libselinux.patch
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-Fix-incorrect-command-name-in-error-messages.patch
Patch0381: esx-call-freeaddrinfo-earlier-in-esxUtil_ResolveHost.patch
Patch0382: admin-fix-leak-of-typed-parameters-on-error.patch
Patch0383: Use-un-signed-printf-specifiers-correctly.patch
Patch0384: fix-the-issue-of-errors-when-saving-after-virsh-edit.patch
Patch0385: virrandom-Fix-printf-format-string-in-virRandomGener.patch
Patch0386: qemu_migration_cookie-Rename-ret-in-qemuDomainExtrac.patch
Patch0387: tests-upstream-Fixing-compiler-warning-in-cputest.patch
Patch0388: qemu-Return-perf-status-that-affect-next-boot-for-sh.patch
Patch0389: lxc-fix-lxcContainerMountAllFS-DEREF_BEFORE_CHECK.patch
Patch0390: Include-vdpa-devices-in-node-device-list.patch
Patch0391: node_device-fix-leak-of-DIR.patch
Patch0392: vdpa-Introduce-the-new-device-type-vdpa-to-hostdev.patch
Patch0393: vdpa-support-vdpa-device-hot-plug-unplug.patch
Patch0394: vdpa-support-vdpa-device-migrate.patch
Patch0395: vdpa-return-pcieFlags-when-calculate-vdpa-passthroug.patch
Patch0396: vdpa-Release-pci-slot-address-when-unplugging-vdpa-d.patch
Patch0396: virsh-Fix-off-by-one-error-in-udevListInterfacesBySt.patch
Patch0397: remote-check-for-negative-array-lengths-before-alloc.patch
Patch0398: interface-fix-udev_device_get_sysattr_value-return-v.patch
Patch0399: util-keep-track-of-full-GSource-object-not-source-ID.patch
Patch0400: rpc-mark-source-returned-by-virEventGLibAddSocketWat.patch
Patch0401: rpc-ensure-temporary-GSource-is-removed-from-client-.patch
Patch0380: qemu-command-Use-correct-tpm-device-for-all-non-x86.patch
Patch0381: Fixed-loongarch-qxl-device-not-displaying-during-sta.patch
Patch0382: qemu-Fix-incorrect-command-name-in-error-messages.patch
Patch0383: esx-call-freeaddrinfo-earlier-in-esxUtil_ResolveHost.patch
Patch0384: admin-fix-leak-of-typed-parameters-on-error.patch
Patch0385: Use-un-signed-printf-specifiers-correctly.patch
Patch0386: fix-the-issue-of-errors-when-saving-after-virsh-edit.patch
Patch0387: virrandom-Fix-printf-format-string-in-virRandomGener.patch
Patch0388: qemu_migration_cookie-Rename-ret-in-qemuDomainExtrac.patch
Patch0389: tests-upstream-Fixing-compiler-warning-in-cputest.patch
Patch0390: qemu-Return-perf-status-that-affect-next-boot-for-sh.patch
Patch0391: lxc-fix-lxcContainerMountAllFS-DEREF_BEFORE_CHECK.patch
Patch0392: Include-vdpa-devices-in-node-device-list.patch
Patch0393: node_device-fix-leak-of-DIR.patch
Patch0394: vdpa-Introduce-the-new-device-type-vdpa-to-hostdev.patch
Patch0395: vdpa-support-vdpa-device-hot-plug-unplug.patch
Patch0396: vdpa-support-vdpa-device-migrate.patch
Patch0397: vdpa-return-pcieFlags-when-calculate-vdpa-passthroug.patch
Patch0398: vdpa-Release-pci-slot-address-when-unplugging-vdpa-d.patch
Patch0399: virsh-Fix-off-by-one-error-in-udevListInterfacesBySt.patch
Patch0400: remote-check-for-negative-array-lengths-before-alloc.patch
Patch0401: interface-fix-udev_device_get_sysattr_value-return-v.patch
Patch0402: util-keep-track-of-full-GSource-object-not-source-ID.patch
Patch0403: rpc-mark-source-returned-by-virEventGLibAddSocketWat.patch
Patch0404: rpc-ensure-temporary-GSource-is-removed-from-client-.patch
Requires: libvirt-daemon = %{version}-%{release}
Requires: libvirt-daemon-config-network = %{version}-%{release}
@ -2258,14 +2260,12 @@ exit 0
- remote: check for negative array lengths before allocation (CVE-2024-2494)
- vish:Fix off-by-one error in udevListInterfacesByStatus (CVE-2024-1441)
* Wed Mar 20 2024 Jian Chunfu <chunfu.jian@shingroup.cn> - 6.2.0-62
- spec: Add support for the ppc64le platform
* Wed Mar 13 2024 jiangdongxu <jiangdongxu1@huawei.com> - 6.2.0-61
* Wed Mar 13 2024 jiangdongxu <jiangdongxu1@huawei.com> - 6.2.0-62
- vdpa: Release pci slot address when unplugging vdpa device
- vdpa: return pcieFlags when calculate vdpa passthrough devices.
* Wed Nov 29 2023 Jiabo Feng <fengjiabo1@huawei.com> - 6.2.0-60
* Wed Nov 29 2023 Jiabo Feng <fengjiabo1@huawei.com> - 6.2.0-61
- spec: Add support for the ppc64le platform
- vdpa: support vdpa device migrate
- vdpa: support vdpa device hot plug/unplug
- vdpa: Introduce the new device type vdpa to hostdev
@ -2282,6 +2282,9 @@ exit 0
- esx: call freeaddrinfo earlier in esxUtil_ResolveHostname Call freeaddrinfo() as soon as @result is not needed anymore, i.e. right after getnameinfo(); this avoids calling freeaddrinfo() in two branches.
- qemu: Fix incorrect command name in error messages
* Tue Sep 12 2023 lixianglai <lixianglai@loongson.cn> - 6.2.0-60
- Fixed loongarch qxl device not displaying during startup phase
- Synchronize upstream patches "Use correct tpm device for all non-x86"
* Wed Aug 9 2023 Jiabo Feng <fengjiabo1@huawei.com> - 6.2.0-59
- virnetsshsession: Adapt to change libssh2 API