[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 15/17] ui/console: Do not return a value with ui_info
From: |
Gerd Hoffmann |
Subject: |
[PULL 15/17] ui/console: Do not return a value with ui_info |
Date: |
Fri, 10 Jun 2022 11:20:41 +0200 |
From: Akihiko Odaki <akihiko.odaki@gmail.com>
The returned value is not used and misleading.
Signed-off-by: Akihiko Odaki <akihiko.odaki@gmail.com>
Message-Id: <20220226115516.59830-2-akihiko.odaki@gmail.com>
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
include/ui/console.h | 2 +-
hw/display/virtio-gpu-base.c | 6 +++---
hw/display/virtio-vga.c | 5 ++---
hw/vfio/display.c | 8 +++-----
4 files changed, 9 insertions(+), 12 deletions(-)
diff --git a/include/ui/console.h b/include/ui/console.h
index c44b28a972ca..642d6f5248cf 100644
--- a/include/ui/console.h
+++ b/include/ui/console.h
@@ -432,7 +432,7 @@ typedef struct GraphicHwOps {
bool gfx_update_async; /* if true, calls graphic_hw_update_done() */
void (*text_update)(void *opaque, console_ch_t *text);
void (*update_interval)(void *opaque, uint64_t interval);
- int (*ui_info)(void *opaque, uint32_t head, QemuUIInfo *info);
+ void (*ui_info)(void *opaque, uint32_t head, QemuUIInfo *info);
void (*gl_block)(void *opaque, bool block);
} GraphicHwOps;
diff --git a/hw/display/virtio-gpu-base.c b/hw/display/virtio-gpu-base.c
index 790cec333c8c..b21d6e5b0be8 100644
--- a/hw/display/virtio-gpu-base.c
+++ b/hw/display/virtio-gpu-base.c
@@ -69,12 +69,12 @@ static void virtio_gpu_notify_event(VirtIOGPUBase *g,
uint32_t event_type)
virtio_notify_config(&g->parent_obj);
}
-static int virtio_gpu_ui_info(void *opaque, uint32_t idx, QemuUIInfo *info)
+static void virtio_gpu_ui_info(void *opaque, uint32_t idx, QemuUIInfo *info)
{
VirtIOGPUBase *g = opaque;
if (idx >= g->conf.max_outputs) {
- return -1;
+ return;
}
g->req_state[idx].x = info->xoff;
@@ -92,7 +92,7 @@ static int virtio_gpu_ui_info(void *opaque, uint32_t idx,
QemuUIInfo *info)
/* send event to guest */
virtio_gpu_notify_event(g, VIRTIO_GPU_EVENT_DISPLAY);
- return 0;
+ return;
}
static void
diff --git a/hw/display/virtio-vga.c b/hw/display/virtio-vga.c
index c206b5da384b..4dcb34c4a740 100644
--- a/hw/display/virtio-vga.c
+++ b/hw/display/virtio-vga.c
@@ -47,15 +47,14 @@ static void virtio_vga_base_text_update(void *opaque,
console_ch_t *chardata)
}
}
-static int virtio_vga_base_ui_info(void *opaque, uint32_t idx, QemuUIInfo
*info)
+static void virtio_vga_base_ui_info(void *opaque, uint32_t idx, QemuUIInfo
*info)
{
VirtIOVGABase *vvga = opaque;
VirtIOGPUBase *g = vvga->vgpu;
if (g->hw_ops->ui_info) {
- return g->hw_ops->ui_info(g, idx, info);
+ g->hw_ops->ui_info(g, idx, info);
}
- return -1;
}
static void virtio_vga_base_gl_block(void *opaque, bool block)
diff --git a/hw/vfio/display.c b/hw/vfio/display.c
index 89bc90508fb8..78f4d82c1c35 100644
--- a/hw/vfio/display.c
+++ b/hw/vfio/display.c
@@ -106,14 +106,14 @@ err:
return;
}
-static int vfio_display_edid_ui_info(void *opaque, uint32_t idx,
- QemuUIInfo *info)
+static void vfio_display_edid_ui_info(void *opaque, uint32_t idx,
+ QemuUIInfo *info)
{
VFIOPCIDevice *vdev = opaque;
VFIODisplay *dpy = vdev->dpy;
if (!dpy->edid_regs) {
- return 0;
+ return;
}
if (info->width && info->height) {
@@ -121,8 +121,6 @@ static int vfio_display_edid_ui_info(void *opaque, uint32_t
idx,
} else {
vfio_display_edid_update(vdev, false, 0, 0);
}
-
- return 0;
}
static void vfio_display_edid_init(VFIOPCIDevice *vdev)
--
2.36.1
- [PULL 06/17] hw/usb/canokey: Add trace events, (continued)
- [PULL 06/17] hw/usb/canokey: Add trace events, Gerd Hoffmann, 2022/06/10
- [PULL 05/17] hw/usb: Add CanoKey Implementation, Gerd Hoffmann, 2022/06/10
- [PULL 02/17] ui/gtk-gl-area: create the requested GL context version, Gerd Hoffmann, 2022/06/10
- [PULL 09/17] docs/system/devices/usb: Add CanoKey to USB devices examples, Gerd Hoffmann, 2022/06/10
- [PULL 10/17] MAINTAINERS: add myself as CanoKey maintainer, Gerd Hoffmann, 2022/06/10
- [PULL 13/17] virtio-gpu: update done only on the scanout associated with rect, Gerd Hoffmann, 2022/06/10
- [PULL 11/17] hw/usb/hcd-ehci: fix writeback order, Gerd Hoffmann, 2022/06/10
- [PULL 08/17] docs: Add CanoKey documentation, Gerd Hoffmann, 2022/06/10
- [PULL 12/17] usbredir: avoid queuing hello packet on snapshot restore, Gerd Hoffmann, 2022/06/10
- [PULL 14/17] ui: move 'pc-bios/keymaps' to 'ui/keymaps', Gerd Hoffmann, 2022/06/10
- [PULL 15/17] ui/console: Do not return a value with ui_info,
Gerd Hoffmann <=
- [PULL 17/17] virtio-gpu: Respect UI refresh rate for EDID, Gerd Hoffmann, 2022/06/10
- [PULL 16/17] ui: Deliver refresh rate via QemuUIInfo, Gerd Hoffmann, 2022/06/10
- Re: [PULL 00/17] Kraxel 20220610 patches, Richard Henderson, 2022/06/10