qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Gerd Hoffmann <kraxel@redhat.com>
To: qemu-devel@nongnu.org
Cc: Gerd Hoffmann <kraxel@redhat.com>,
	"Michael S. Tsirkin" <mst@redhat.com>,
	Peter Maydell <peter.maydell@linaro.org>
Subject: [Qemu-devel] [PULL 3/3] virtio-gpu-3d: Drop workaround for VIRTIO_GPU_CAPSET_VIRGL2 define
Date: Tue, 26 Jun 2018 18:27:36 +0200	[thread overview]
Message-ID: <20180626162736.9749-4-kraxel@redhat.com> (raw)
In-Reply-To: <20180626162736.9749-1-kraxel@redhat.com>

From: Peter Maydell <peter.maydell@linaro.org>

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 <peter.maydell@linaro.org>
Message-id: 20180622173249.29963-1-peter.maydell@linaro.org
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
 include/hw/virtio/virtio-gpu.h | 5 -----
 1 file changed, 5 deletions(-)

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)
-- 
2.9.3

  parent reply	other threads:[~2018-06-26 16:27 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-06-26 16:27 [Qemu-devel] [PULL 0/3] Vga 20180626 patches Gerd Hoffmann
2018-06-26 16:27 ` [Qemu-devel] [PULL 1/3] vga: set owner for mmio regions Gerd Hoffmann
2018-06-26 16:27 ` [Qemu-devel] [PULL 2/3] ramfb: fix overflow Gerd Hoffmann
2018-06-26 16:27 ` Gerd Hoffmann [this message]
2018-06-26 17:23 ` [Qemu-devel] [PULL 0/3] Vga 20180626 patches Peter Maydell

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20180626162736.9749-4-kraxel@redhat.com \
    --to=kraxel@redhat.com \
    --cc=mst@redhat.com \
    --cc=peter.maydell@linaro.org \
    --cc=qemu-devel@nongnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).