45 lines
1.5 KiB
Diff
45 lines
1.5 KiB
Diff
|
From 77b2f29dce6ddedcc13488eb80add2f9023b4b89 Mon Sep 17 00:00:00 2001
|
||
|
|
From: dinglimin <dinglimin@cmss.chinamobile.com>
|
||
|
|
Date: Wed, 13 Mar 2024 11:23:35 +0800
|
||
|
|
Subject: [PATCH] virtio-gpu: remove needless condition
|
||
|
|
MIME-Version: 1.0
|
||
|
|
Content-Type: text/plain; charset=UTF-8
|
||
|
|
Content-Transfer-Encoding: 8bit
|
||
|
|
|
||
|
|
cheery-pick from cab47b210598c11b76053a01316df9835b94dc09
|
||
|
|
qemu_create_displaysurface_pixman() never returns NULL.
|
||
|
|
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
|
||
|
|
Signed-off-by: dinglimin <dinglimin@cmss.chinamobile.com>
|
||
|
|
---
|
||
|
|
hw/display/virtio-gpu.c | 7 -------
|
||
|
|
1 file changed, 7 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/hw/display/virtio-gpu.c b/hw/display/virtio-gpu.c
|
||
|
|
index b016d3bac8..b02d1e3a4c 100644
|
||
|
|
--- a/hw/display/virtio-gpu.c
|
||
|
|
+++ b/hw/display/virtio-gpu.c
|
||
|
|
@@ -679,10 +679,6 @@ static void virtio_gpu_do_set_scanout(VirtIOGPU *g,
|
||
|
|
|
||
|
|
/* realloc the surface ptr */
|
||
|
|
scanout->ds = qemu_create_displaysurface_pixman(rect);
|
||
|
|
- if (!scanout->ds) {
|
||
|
|
- *error = VIRTIO_GPU_RESP_ERR_UNSPEC;
|
||
|
|
- return;
|
||
|
|
- }
|
||
|
|
#ifdef WIN32
|
||
|
|
qemu_displaysurface_win32_set_handle(scanout->ds, res->handle, fb->offset);
|
||
|
|
#endif
|
||
|
|
@@ -1418,9 +1414,6 @@ static int virtio_gpu_post_load(void *opaque, int version_id)
|
||
|
|
return -EINVAL;
|
||
|
|
}
|
||
|
|
scanout->ds = qemu_create_displaysurface_pixman(res->image);
|
||
|
|
- if (!scanout->ds) {
|
||
|
|
- return -EINVAL;
|
||
|
|
- }
|
||
|
|
#ifdef WIN32
|
||
|
|
qemu_displaysurface_win32_set_handle(scanout->ds, res->handle, 0);
|
||
|
|
#endif
|
||
|
|
--
|
||
|
|
2.27.0
|
||
|
|
|