From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48502) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b3L9x-0005Hl-CW for qemu-devel@nongnu.org; Thu, 19 May 2016 06:26:32 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1b3L9l-0005Ti-5V for qemu-devel@nongnu.org; Thu, 19 May 2016 06:26:28 -0400 Received: from mail-qg0-x244.google.com ([2607:f8b0:400d:c04::244]:35038) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b3L9l-0005Tb-0v for qemu-devel@nongnu.org; Thu, 19 May 2016 06:26:17 -0400 Received: by mail-qg0-x244.google.com with SMTP id b14so6464429qge.2 for ; Thu, 19 May 2016 03:26:16 -0700 (PDT) Sender: =?UTF-8?B?TWFyYy1BbmRyw6kgTHVyZWF1?= From: marcandre.lureau@redhat.com Date: Thu, 19 May 2016 12:25:59 +0200 Message-Id: <1463653560-26958-6-git-send-email-marcandre.lureau@redhat.com> In-Reply-To: <1463653560-26958-1-git-send-email-marcandre.lureau@redhat.com> References: <1463653560-26958-1-git-send-email-marcandre.lureau@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subject: [Qemu-devel] [PATCH 5/6] virtio-gpu: use VIRTIO_GPU_MAX_SCANOUTS List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: kraxel@redhat.com, =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= From: Marc-André Lureau The value is defined in virtio_gpu.h already (changing from 4 to 16). Signed-off-by: Marc-André Lureau --- 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 17933cb..5811a2d 100644 --- a/hw/display/virtio-gpu.c +++ b/hw/display/virtio-gpu.c @@ -928,8 +928,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; -- 2.7.4