1f0277483b
- block: bugfix: Don't pause vm when NOSPACE EIO happened - block: enable cache mode of empty cdrom - block/mirror: fix file-system went to read-only after block-mirror - scsi-bus: fix incorrect call for blk_error_retry_reset_timeout() - scsi-bus: fix unmatched object_unref() - block: Add sanity check when setting retry parameters - block-backend: Stop retrying when draining - scsi-disk: Add support for retry on errors - scsi-bus: Refactor the code that retries requests - virtio_blk: Add support for retry on errors - block: Add error retry param setting - block-backend: Add timeout support for retry - block-backend: Enable retry action on errors - block-backend: Add device specific retry callback - block-backend: Introduce retry timer - qapi/block-core: Add retry option for error action - scsi: bugfix: fix division by zero - scsi: cdrom: Fix crash after remote cdrom detached - qemu-pr: fixed ioctl failed for multipath disk - scsi-disk: define props in scsi_block_disk to avoid memleaks - bugfix: fix possible memory leak - bugfix: fix some illegal memory access and memory leak - util/log: add CONFIG_DISABLE_QEMU_LOG macro - log: Add some logs on VM runtime path - bugfix: fix eventfds may double free when vm_id reused in ivshmem - hw/display/macfb: Fix missing ERRP_GUARD() in macfb_nubus_realize() - hw/cxl/cxl-host: Fix missing ERRP_GUARD() in cxl_fixed_memory_window_config() - qemu-img create: 'cache' paramter only use for reg file image - qemu-img: add qemu-img direct create - qemu-img block: set zero flags only when discard_zeros of the block supported - Revert "file-posix: Remove unused s->discard_zeroes" - pcie_sriov: Validate NumVFs (CVE-2024-26327) - hw/nvme: Use pcie_sriov_num_vfs() (CVE-2024-26328) - hw/acpi/cpu: Use CPUState typedef - target/i386/sev: Fix missing ERRP_GUARD() for error_prepend() - virtio-gpu: remove needless condition - hw/i2c/smbus_slave: Add object path on error prints - vfio/pci: Ascend710 change to bar2 quirk - vfio/pci: Ascend910 need 4Bytes quirk in bar0 - vfio/pci: Ascend710 need 4Bytes quirk in bar0 - vfio/pci: Ascend310 need 4Bytes quirk in bar4 - chardev/char-socket: Fix TLS io channels sending too much data to the backend - i386/cpuid: Move leaf 7 to correct group - i386/cpuid: Decrease cpuid_i when skipping CPUID leaf 1F - i386/cpu: Mask with XCR0/XSS mask for FEAT_XSAVE_XCR0_HI and FEAT_XSAVE_XSS_HI leafs - i386/cpu: Clear FEAT_XSAVE_XSS_LO/HI leafs when CPUID_EXT_XSAVE is not available - blkio: Respect memory-alignment for bounce buffer allocations - virtio-gpu: Correct virgl_renderer_resource_get_info() error check - hw/usb: Style cleanup - tests/qemu-iotests: resolved the problem that the 108 test cases in the container fail Signed-off-by: Jiabo Feng <fengjiabo1@huawei.com> (cherry picked from commit 404d45bf9147058a475a8031c454a6c8e0acc123)
74 lines
2.7 KiB
Diff
74 lines
2.7 KiB
Diff
From ffb0dcccbf5f6e662e7c0b6afa4fe7308d96cc06 Mon Sep 17 00:00:00 2001
|
|
From: dinglimin <dinglimin@cmss.chinamobile.com>
|
|
Date: Tue, 27 Feb 2024 17:06:01 +0800
|
|
Subject: [PATCH] virtio-gpu: Correct virgl_renderer_resource_get_info() error
|
|
check
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
cheery-pick from 574b64aa6754ba491f51024c5a823a674d48a658
|
|
|
|
virgl_renderer_resource_get_info() returns errno and not -1 on error.
|
|
Correct the return-value check.
|
|
|
|
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
|
|
Signed-off-by: Dmitry Osipenko <dmitry.osipenko@collabora.com>
|
|
Message-Id: <20240129073921.446869-1-dmitry.osipenko@collabora.com>
|
|
Cc: qemu-stable@nongnu.org
|
|
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
|
|
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
|
|
Signed-off-by: dinglimin <dinglimin@cmss.chinamobile.com>
|
|
---
|
|
contrib/vhost-user-gpu/virgl.c | 6 +++---
|
|
hw/display/virtio-gpu-virgl.c | 2 +-
|
|
2 files changed, 4 insertions(+), 4 deletions(-)
|
|
|
|
diff --git a/contrib/vhost-user-gpu/virgl.c b/contrib/vhost-user-gpu/virgl.c
|
|
index d1ccdf7d06..51da0e3667 100644
|
|
--- a/contrib/vhost-user-gpu/virgl.c
|
|
+++ b/contrib/vhost-user-gpu/virgl.c
|
|
@@ -327,7 +327,7 @@ virgl_get_resource_info_modifiers(uint32_t resource_id,
|
|
#ifdef VIRGL_RENDERER_RESOURCE_INFO_EXT_VERSION
|
|
struct virgl_renderer_resource_info_ext info_ext;
|
|
ret = virgl_renderer_resource_get_info_ext(resource_id, &info_ext);
|
|
- if (ret < 0) {
|
|
+ if (ret) {
|
|
return ret;
|
|
}
|
|
|
|
@@ -335,7 +335,7 @@ virgl_get_resource_info_modifiers(uint32_t resource_id,
|
|
*modifiers = info_ext.modifiers;
|
|
#else
|
|
ret = virgl_renderer_resource_get_info(resource_id, info);
|
|
- if (ret < 0) {
|
|
+ if (ret) {
|
|
return ret;
|
|
}
|
|
|
|
@@ -372,7 +372,7 @@ virgl_cmd_set_scanout(VuGpu *g,
|
|
uint64_t modifiers = 0;
|
|
ret = virgl_get_resource_info_modifiers(ss.resource_id, &info,
|
|
&modifiers);
|
|
- if (ret == -1) {
|
|
+ if (ret) {
|
|
g_critical("%s: illegal resource specified %d\n",
|
|
__func__, ss.resource_id);
|
|
cmd->error = VIRTIO_GPU_RESP_ERR_INVALID_RESOURCE_ID;
|
|
diff --git a/hw/display/virtio-gpu-virgl.c b/hw/display/virtio-gpu-virgl.c
|
|
index 8bb7a2c21f..9f34d0e661 100644
|
|
--- a/hw/display/virtio-gpu-virgl.c
|
|
+++ b/hw/display/virtio-gpu-virgl.c
|
|
@@ -181,7 +181,7 @@ static void virgl_cmd_set_scanout(VirtIOGPU *g,
|
|
memset(&info, 0, sizeof(info));
|
|
ret = virgl_renderer_resource_get_info(ss.resource_id, &info);
|
|
#endif
|
|
- if (ret == -1) {
|
|
+ if (ret) {
|
|
qemu_log_mask(LOG_GUEST_ERROR,
|
|
"%s: illegal resource specified %d\n",
|
|
__func__, ss.resource_id);
|
|
--
|
|
2.27.0
|
|
|