Gentle request for review. This change was previously queued, and then dropped from a PR:
https://mail.gnu.org/archive/html/qemu-devel/2025-10/msg04960.html This v4 PATCH addresses those comments. On Fri, Jan 9, 2026 at 3:31 PM Andrew Keesler <[email protected]> wrote: > Note - we use "xres" and "yres" (instead of, say, "width" and "height") > to match analogous virtio_gpu_base_conf.xres/yres. > > On Fri, Jan 9, 2026 at 3:27 PM Andrew Keesler <[email protected]> > wrote: > >> In 454f4b0f, we started down the path of supporting separate >> configurations per display head (e.g., you have 2 heads - one with >> EDID name "AAA" and the other with EDID name "BBB"). >> >> In this change, we add resolution to this configuration surface (e.g., >> you have 2 heads - one with resolution 111x222 and the other with >> resolution 333x444). >> >> -display vnc=localhost:0,id=aaa,display=vga,head=0 \ >> -display vnc=localhost:1,id=bbb,display=vga,head=1 \ >> -device '{"driver":"virtio-vga", >> "max_outputs":2, >> "id":"vga", >> "outputs":[ >> { >> "name":"AAA", >> "xres":111, >> "yres":222 >> }, >> { >> "name":"BBB", >> "xres":333, >> "yres":444 >> } >> ]}' >> >> Here is the behavior matrix of the current resolution configuration >> surface (xres/yres) with the new resolution configuration surface >> (outputs[i].xres/yres). >> >> Case: !(xres || yres) && !(outputs[i].has_xres && outputs[i].has_yres) >> Behavior: current behavior - outputs[0] enabled with default xres/yres >> >> Case: (xres || yres) && !(outputs[i].has_xres && outputs[i].has_yres) >> Behavior: current behavior - outputs[0] enabled with xres/yres >> >> Case: !(xres || yres) && (outputs[i].has_xres && outputs[i].has_yres) >> Behavior: new behavior - outputs[i] enabled with outputs[i].xres/yres >> >> Case: (xres || yres) && (outputs[i].has_xres && outputs[i].has_yres) >> Behavior: new behavior - outputs[i] enabled with outputs[i].xres/yres >> >> Signed-off-by: Andrew Keesler <[email protected]> >> --- >> hw/display/virtio-gpu-base.c | 10 ++++++++++ >> qapi/virtio.json | 13 +++++++++++-- >> 2 files changed, 21 insertions(+), 2 deletions(-) >> >> diff --git a/hw/display/virtio-gpu-base.c b/hw/display/virtio-gpu-base.c >> index 7269477a1c..6adb5312a4 100644 >> --- a/hw/display/virtio-gpu-base.c >> +++ b/hw/display/virtio-gpu-base.c >> @@ -233,6 +233,16 @@ virtio_gpu_base_device_realize(DeviceState *qdev, >> g->req_state[0].width = g->conf.xres; >> g->req_state[0].height = g->conf.yres; >> >> + for (output_idx = 0, node = g->conf.outputs; >> + node && output_idx < g->conf.max_outputs; >> + output_idx++, node = node->next) { >> + if (node->value->has_xres && node->value->has_yres) { >> + g->enabled_output_bitmask |= (1 << output_idx); >> + g->req_state[output_idx].width = node->value->xres; >> + g->req_state[output_idx].height = node->value->yres; >> + } >> + } >> + >> g->hw_ops = &virtio_gpu_ops; >> for (i = 0; i < g->conf.max_outputs; i++) { >> g->scanout[i].con = >> diff --git a/qapi/virtio.json b/qapi/virtio.json >> index cd67c4f52e..c1a1fb4997 100644 >> --- a/qapi/virtio.json >> +++ b/qapi/virtio.json >> @@ -970,15 +970,24 @@ >> ## >> # @VirtIOGPUOutput: >> # >> -# Describes configuration of a VirtIO GPU output. >> +# Describes configuration of a VirtIO GPU output. If both @xres and >> +# @yres are set, they take precedence over root virtio-gpu >> +# resolution configuration and enable the corresponding output. If >> +# only one or none of @xres or @yres is set, root virtio-gpu >> +# resolution configuration takes precedence and only the first output >> +# is enabled. >> # >> # @name: the name of the output >> # >> +# @xres: horizontal resolution of the output in pixels (since 10.2) >> +# >> +# @yres: vertical resolution of the output in pixels (since 10.2) >> +# >> # Since: 10.1 >> ## >> >> { 'struct': 'VirtIOGPUOutput', >> - 'data': { 'name': 'str' } } >> + 'data': { 'name': 'str', '*xres': 'uint16', '*yres': 'uint16' } } >> >> ## >> # @DummyVirtioForceArrays: >> -- >> 2.52.0.457.g6b5491de43-goog >> >>
