ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ui/console: Do not return a value with ui_info 

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>
This commit is contained in:
Akihiko Odaki 2022-02-26 20:55:14 +09:00 committed by Gerd Hoffmann
parent 45e64ab63d
commit 362239c05f
4 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
hw/display/virtio-gpu-base.c
View File

@ -69,12 +69,12 @@ static void virtio_gpu_notify_event(VirtIOGPUBase *g, uint32_t event_type)
virtio_notify_config(&g->parent_obj); 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; VirtIOGPUBase *g = opaque;
if (idx >= g->conf.max_outputs) { if (idx >= g->conf.max_outputs) {
return -1; return;
} }
g->req_state[idx].x = info->xoff; 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 */ /* send event to guest */
virtio_gpu_notify_event(g, VIRTIO_GPU_EVENT_DISPLAY); virtio_gpu_notify_event(g, VIRTIO_GPU_EVENT_DISPLAY);
return 0; return;
} }
static void static void

5
hw/display/virtio-vga.c
View File

@ -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; VirtIOVGABase *vvga = opaque;
VirtIOGPUBase *g = vvga->vgpu; VirtIOGPUBase *g = vvga->vgpu;
if (g->hw_ops->ui_info) { 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) static void virtio_vga_base_gl_block(void *opaque, bool block)

6
hw/vfio/display.c
View File

@ -106,14 +106,14 @@ err:
return; return;
} }
static int vfio_display_edid_ui_info(void *opaque, uint32_t idx, static void vfio_display_edid_ui_info(void *opaque, uint32_t idx,
QemuUIInfo *info) QemuUIInfo *info)
{ {
VFIOPCIDevice *vdev = opaque; VFIOPCIDevice *vdev = opaque;
VFIODisplay *dpy = vdev->dpy; VFIODisplay *dpy = vdev->dpy;
if (!dpy->edid_regs) { if (!dpy->edid_regs) {
return 0; return;
} }
if (info->width && info->height) { if (info->width && info->height) {
@ -121,8 +121,6 @@ static int vfio_display_edid_ui_info(void *opaque, uint32_t idx,
} else { } else {
vfio_display_edid_update(vdev, false, 0, 0); vfio_display_edid_update(vdev, false, 0, 0);
} }
return 0;
} }
static void vfio_display_edid_init(VFIOPCIDevice *vdev) static void vfio_display_edid_init(VFIOPCIDevice *vdev)

2
include/ui/console.h
View File

@ -432,7 +432,7 @@ typedef struct GraphicHwOps {
bool gfx_update_async; /* if true, calls graphic_hw_update_done() */ bool gfx_update_async; /* if true, calls graphic_hw_update_done() */
void (*text_update)(void *opaque, console_ch_t *text); void (*text_update)(void *opaque, console_ch_t *text);
void (*update_interval)(void *opaque, uint64_t interval); 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); void (*gl_block)(void *opaque, bool block);
} GraphicHwOps; } GraphicHwOps;