[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 5/7] virtio-gpu: use VIRTIO_GPU_MAX_SCANOUTS
From: |
Gerd Hoffmann |
Subject: |
[Qemu-devel] [PULL 5/7] virtio-gpu: use VIRTIO_GPU_MAX_SCANOUTS |
Date: |
Mon, 23 May 2016 14:32:41 +0200 |
From: Marc-André Lureau <address@hidden>
The value is defined in virtio_gpu.h already (changing from 4 to 16).
Signed-off-by: Marc-André Lureau <address@hidden>
Message-id: address@hidden
Signed-off-by: Gerd Hoffmann <address@hidden>
---
hw/display/virtio-gpu.c | 4 ++--
include/hw/virtio/virtio-gpu.h | 6 ++----
2 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/hw/display/virtio-gpu.c b/hw/display/virtio-gpu.c
index 643dd92..bc10d5d 100644
--- a/hw/display/virtio-gpu.c
+++ b/hw/display/virtio-gpu.c
@@ -929,8 +929,8 @@ static void virtio_gpu_device_realize(DeviceState *qdev,
Error **errp)
bool have_virgl;
int i;
- if (g->conf.max_outputs > VIRTIO_GPU_MAX_SCANOUT) {
- error_setg(errp, "invalid max_outputs > %d", VIRTIO_GPU_MAX_SCANOUT);
+ if (g->conf.max_outputs > VIRTIO_GPU_MAX_SCANOUTS) {
+ error_setg(errp, "invalid max_outputs > %d", VIRTIO_GPU_MAX_SCANOUTS);
return;
}
diff --git a/include/hw/virtio/virtio-gpu.h b/include/hw/virtio/virtio-gpu.h
index 13b0ab0..1602a13 100644
--- a/include/hw/virtio/virtio-gpu.h
+++ b/include/hw/virtio/virtio-gpu.h
@@ -27,8 +27,6 @@
#define VIRTIO_ID_GPU 16
-#define VIRTIO_GPU_MAX_SCANOUT 4
-
struct virtio_gpu_simple_resource {
uint32_t resource_id;
uint32_t width;
@@ -98,8 +96,8 @@ typedef struct VirtIOGPU {
QTAILQ_HEAD(, virtio_gpu_ctrl_command) cmdq;
QTAILQ_HEAD(, virtio_gpu_ctrl_command) fenceq;
- struct virtio_gpu_scanout scanout[VIRTIO_GPU_MAX_SCANOUT];
- struct virtio_gpu_requested_state req_state[VIRTIO_GPU_MAX_SCANOUT];
+ struct virtio_gpu_scanout scanout[VIRTIO_GPU_MAX_SCANOUTS];
+ struct virtio_gpu_requested_state req_state[VIRTIO_GPU_MAX_SCANOUTS];
struct virtio_gpu_conf conf;
int enabled_output_bitmask;
--
1.8.3.1
- [Qemu-devel] [PULL 0/7] vga fixes, Gerd Hoffmann, 2016/05/23
- [Qemu-devel] [PULL 1/7] virtio-gpu: check early scanout id, Gerd Hoffmann, 2016/05/23
- [Qemu-devel] [PULL 5/7] virtio-gpu: use VIRTIO_GPU_MAX_SCANOUTS,
Gerd Hoffmann <=
- [Qemu-devel] [PULL 4/7] virtio-gpu: check max_outputs only, Gerd Hoffmann, 2016/05/23
- [Qemu-devel] [PULL 2/7] virtio-vga: propagate on gpu realized error, Gerd Hoffmann, 2016/05/23
- [Qemu-devel] [PULL 6/7] virtio-gpu: fix ui idx check, Gerd Hoffmann, 2016/05/23
- [Qemu-devel] [PULL 7/7] vga: add sr_vbe register set, Gerd Hoffmann, 2016/05/23
- [Qemu-devel] [PULL 3/7] virtio-gpu: check max_outputs value, Gerd Hoffmann, 2016/05/23
- Re: [Qemu-devel] [PULL 0/7] vga fixes, Peter Maydell, 2016/05/23