From patchwork Thu May 19 10:25:59 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Marc-Andr=C3=A9_Lureau?= X-Patchwork-Id: 9126191 Return-Path: X-Original-To: patchwork-qemu-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 8F64C9F1C3 for ; Thu, 19 May 2016 10:33:38 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id E6A5B20219 for ; Thu, 19 May 2016 10:33:37 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 46E5620165 for ; Thu, 19 May 2016 10:33:37 +0000 (UTC) Received: from localhost ([::1]:49327 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b3LGq-0002kh-FW for patchwork-qemu-devel@patchwork.kernel.org; Thu, 19 May 2016 06:33:36 -0400 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) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=CvgFj8tIqjmn6UC9ohAZ5c5jtkgkm10gfE8/SCRoxUo=; b=YYNvsJ8KPAQuYZ8Y3XLGEMbFKLT7RuV1h/yU4YUsWDirGIDqjmL66VL+infsOuu2Ky 9WYHNCslmgUD6vyIyDEOQNvrObb6MI1JAjggrcwdvGVjj8fd//xsuNeM/JuEqq9dlHLJ +iiLHwQGVwI+8r2XHP5hanv1AdcxGgiVb0yx5K+4qP+VAHMlYm9/R6CVZa9IoGt0qqg3 RDhjGhMyQsnLxklDs1PrJPX1ZPQW8TrVPaxaIEWN4TIMAnjkIUfZV6Y6rhX4o+qD9lzM x0pjSkTma9mysrqhWQS1vDp7P+vutlO2N2ccdqASNzbYDIS4oimExjqLENvqLJsHegoe /++A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=CvgFj8tIqjmn6UC9ohAZ5c5jtkgkm10gfE8/SCRoxUo=; b=la7IjYC7gUdtY97BZ6TisZAtUIBBOv9ssD1MhZ7Jr+swJUM693rJy4kaKEVileaIpb VedUH7B1gASEXPSxHghR5LTfrlQDZkdWep5eCmPXAgDbUDXq7lvZRAII8WvjIZbs5IT8 N9cVbAXxEeFS8262FUMMlteU7MkE3KSf3q9w2TmTFLJxpZFLW/J5cPu/2i7RHIFkjvJm zsMpDNFGUulrG9qcKGXGHQOAd+bN6QIlerVd20ol7N/jHW2HyEq4RSkn1yTuEr7l9emg jZYWjJ5wv1LbnA3wFE535WhrnHWjIAYb3XsGYLj78BEO0BW8yK9F4aAAUyqxFHo/AOAb qpWg== X-Gm-Message-State: AOPr4FUzK4EW1qd218yMHA1bgrzRmo7sEPHbM4fiJFFWLA4V4Kjv1ZxC1EWuA+mv6FxPiA== X-Received: by 10.140.38.111 with SMTP id s102mr12820098qgs.32.1463653576702; Thu, 19 May 2016 03:26:16 -0700 (PDT) Received: from localhost (bne75-h02-31-39-163-232.dsl.sta.abo.bbox.fr. [31.39.163.232]) by smtp.gmail.com with ESMTPSA id g19sm6272984qgd.49.2016.05.19.03.26.15 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 19 May 2016 03:26:16 -0700 (PDT) From: marcandre.lureau@redhat.com To: qemu-devel@nongnu.org Date: Thu, 19 May 2016 12:25:59 +0200 Message-Id: <1463653560-26958-6-git-send-email-marcandre.lureau@redhat.com> X-Mailer: git-send-email 2.7.4 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 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2607:f8b0:400d:c04::244 Subject: [Qemu-devel] [PATCH 5/6] virtio-gpu: use VIRTIO_GPU_MAX_SCANOUTS X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , kraxel@redhat.com Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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;