From patchwork Tue Jun 26 16:27:36 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gerd Hoffmann X-Patchwork-Id: 140031 Delivered-To: patch@linaro.org Received: by 2002:a2e:970d:0:0:0:0:0 with SMTP id r13-v6csp5459908lji; Tue, 26 Jun 2018 09:36:40 -0700 (PDT) X-Google-Smtp-Source: AAOMgpcSdvpm9++CMmp/1ZA3e15VNznA/E++LZpbHE3aNOASt7aBklNtop3sE6Pxc4/eNBu9nMlj X-Received: by 2002:aed:2c63:: with SMTP id f90-v6mr2150900qtd.352.1530031000262; Tue, 26 Jun 2018 09:36:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1530031000; cv=none; d=google.com; s=arc-20160816; b=MIFnMAexcCyePu8RdQzjCtlymILlYoAGdb55C4pBPHfLSLaTGOntpo0cAiw2H/kWiV Fl1F9f8jYJrHziU8mpTK7zvjmgKN6J1T3872bmhXaDp+Ud0wqeuFV6cKXst7l90Tcf1m 6+tPTdpCkadHcpqL7qf66Ov83ugq0z+ggrafYXZ7/q5ZlO0fD8cMSb2tjcO4vk3TP87V 43k+eQ4M7ahn6VtTcyuOOqvHJSZltnDSmn0BjxeRKWlAtI3oUUeyJt2euKBr81Wju0YA SU3DHLjJ43G417sgaxT0aia8z5QrVTwwIu+QvxJkjJO8aPieh1wNFoy4D7SqxR0nT0Bq 0ARQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject:references:in-reply-to :message-id:date:to:from:arc-authentication-results; bh=JVoSWPdI2noK/AfBYbOH1i0s10LHzr8DYUvZOEUJwx8=; b=uBC40gIya03g9QyghYq3IwxqrdzmbwvzzduvIXzSeKErY0hyR0hk5nCscF2so4aEWU gaHqe2PDIEiW3hh+/nVRanOizlbxvMjqljLg25MXmtLK1Nt+q74CBQACYuM0VM4/Y9fK 8CU87hnE6wKB4LtEIlTS4CUjSe7F0Tz+3RPu6aVZTFte7PGx8P2On0ly2gwBTRfZEBM8 jI0Ss7mG9s2CNYAB4ITLXH7nK0eFELBawqWMjjbInihJADCRRvCyOLSQZNIvuFHsBel8 wMmCM299yEwa0nPXY+QK6sxDzeWSOTRUDw2+eJHtClq9vkZYbMG2sPpepfUv3Te+NKGq FjKQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id a25-v6si575147qvf.210.2018.06.26.09.36.40 for (version=TLS1 cipher=AES128-SHA bits=128/128); Tue, 26 Jun 2018 09:36:40 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Authentication-Results: mx.google.com; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from localhost ([::1]:53863 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fXqxL-0006OO-Em for patch@linaro.org; Tue, 26 Jun 2018 12:36:39 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44521) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fXqog-0007Zt-Ms for qemu-devel@nongnu.org; Tue, 26 Jun 2018 12:27:43 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fXqoc-0000Ox-RH for qemu-devel@nongnu.org; Tue, 26 Jun 2018 12:27:42 -0400 Received: from mx3-rdu2.redhat.com ([66.187.233.73]:59508 helo=mx1.redhat.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1fXqoc-0000Of-Lw for qemu-devel@nongnu.org; Tue, 26 Jun 2018 12:27:38 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 473BD7A7ED; Tue, 26 Jun 2018 16:27:38 +0000 (UTC) Received: from sirius.home.kraxel.org (ovpn-116-216.ams2.redhat.com [10.36.116.216]) by smtp.corp.redhat.com (Postfix) with ESMTP id 0C764213ED6A; Tue, 26 Jun 2018 16:27:38 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id E1A7F9B667; Tue, 26 Jun 2018 18:27:36 +0200 (CEST) From: Gerd Hoffmann To: qemu-devel@nongnu.org Date: Tue, 26 Jun 2018 18:27:36 +0200 Message-Id: <20180626162736.9749-4-kraxel@redhat.com> In-Reply-To: <20180626162736.9749-1-kraxel@redhat.com> References: <20180626162736.9749-1-kraxel@redhat.com> X-Scanned-By: MIMEDefang 2.78 on 10.11.54.6 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.2]); Tue, 26 Jun 2018 16:27:38 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.2]); Tue, 26 Jun 2018 16:27:38 +0000 (UTC) for IP:'10.11.54.6' DOMAIN:'int-mx06.intmail.prod.int.rdu2.redhat.com' HELO:'smtp.corp.redhat.com' FROM:'kraxel@redhat.com' RCPT:'' X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 66.187.233.73 Subject: [Qemu-devel] [PULL 3/3] virtio-gpu-3d: Drop workaround for VIRTIO_GPU_CAPSET_VIRGL2 define 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: Peter Maydell , Gerd Hoffmann , "Michael S. Tsirkin" Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Peter Maydell In commit a8bff79e9f27df we added a definition to hw/virtio/virtio-gpu.h for VIRTIO_GPU_CAPSET_VIRGL2, as a workaround for it not yet being in the Linux kernel headers. In commit 77d361b13c19 we updated our kernel headers to a version which does define the macro, so we can now remove our workaround. Signed-off-by: Peter Maydell Message-id: 20180622173249.29963-1-peter.maydell@linaro.org Signed-off-by: Gerd Hoffmann --- include/hw/virtio/virtio-gpu.h | 5 ----- 1 file changed, 5 deletions(-) -- 2.9.3 diff --git a/include/hw/virtio/virtio-gpu.h b/include/hw/virtio/virtio-gpu.h index d6ba61f2f1..9780f755ef 100644 --- a/include/hw/virtio/virtio-gpu.h +++ b/include/hw/virtio/virtio-gpu.h @@ -22,11 +22,6 @@ #include "standard-headers/linux/virtio_gpu.h" -/* Not yet(?) defined in standard-headers, remove when possible */ -#ifndef VIRTIO_GPU_CAPSET_VIRGL2 -#define VIRTIO_GPU_CAPSET_VIRGL2 2 -#endif - #define TYPE_VIRTIO_GPU "virtio-gpu-device" #define VIRTIO_GPU(obj) \ OBJECT_CHECK(VirtIOGPU, (obj), TYPE_VIRTIO_GPU)