From: Gerd Hoffmann <kraxel@redhat.com>
To: qemu-devel@nongnu.org
Cc: "Daniel P. Berrangé" <berrange@redhat.com>,
"Eduardo Habkost" <ehabkost@redhat.com>,
"Gerd Hoffmann" <kraxel@redhat.com>,
"Marc-André Lureau" <marcandre.lureau@redhat.com>,
dinechin@redhat.com, "Paolo Bonzini" <pbonzini@redhat.com>,
philmd@redhat.com
Subject: [PATCH v5 09/10] vga: build virtio-gpu as module
Date: Wed, 24 Jun 2020 15:10:44 +0200 [thread overview]
Message-ID: <20200624131045.14512-10-kraxel@redhat.com> (raw)
In-Reply-To: <20200624131045.14512-1-kraxel@redhat.com>
Drops libvirglrenderer.so dependency from core qemu.
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
util/module.c | 6 ++++++
hw/display/Makefile.objs | 23 +++++++++++++----------
2 files changed, 19 insertions(+), 10 deletions(-)
diff --git a/util/module.c b/util/module.c
index 7c76d2a84b94..a74214eac052 100644
--- a/util/module.c
+++ b/util/module.c
@@ -266,6 +266,12 @@ static struct {
{ "usb-redir", "hw-", "usb-redirect" },
{ "qxl-vga", "hw-", "display-qxl" },
{ "qxl", "hw-", "display-qxl" },
+ { "virtio-gpu-device", "hw-", "display-virtio-gpu" },
+ { "virtio-gpu-pci", "hw-", "display-virtio-gpu" },
+ { "virtio-vga", "hw-", "display-virtio-gpu" },
+ { "vhost-user-gpu-device", "hw-", "display-virtio-gpu" },
+ { "vhost-user-gpu-pci", "hw-", "display-virtio-gpu" },
+ { "vhost-user-vga", "hw-", "display-virtio-gpu" },
};
static bool module_loaded_qom_all;
diff --git a/hw/display/Makefile.objs b/hw/display/Makefile.objs
index d619594ad4d3..e907f3182b0c 100644
--- a/hw/display/Makefile.objs
+++ b/hw/display/Makefile.objs
@@ -49,16 +49,19 @@ common-obj-m += qxl.mo
qxl.mo-objs = qxl.o qxl-logger.o qxl-render.o
endif
-common-obj-$(CONFIG_VIRTIO_GPU) += virtio-gpu-base.o virtio-gpu.o virtio-gpu-3d.o
-common-obj-$(CONFIG_VHOST_USER_GPU) += vhost-user-gpu.o
-common-obj-$(call land,$(CONFIG_VIRTIO_GPU),$(CONFIG_VIRTIO_PCI)) += virtio-gpu-pci.o
-common-obj-$(call land,$(CONFIG_VHOST_USER_GPU),$(CONFIG_VIRTIO_PCI)) += vhost-user-gpu-pci.o
-common-obj-$(CONFIG_VIRTIO_VGA) += virtio-vga.o
-common-obj-$(CONFIG_VHOST_USER_VGA) += vhost-user-vga.o
-virtio-gpu.o-cflags := $(VIRGL_CFLAGS)
-virtio-gpu.o-libs += $(VIRGL_LIBS)
-virtio-gpu-3d.o-cflags := $(VIRGL_CFLAGS)
-virtio-gpu-3d.o-libs += $(VIRGL_LIBS)
+ifeq ($(CONFIG_VIRTIO_GPU),y)
+common-obj-m += virtio-gpu.mo
+virtio-gpu-obj-$(CONFIG_VIRTIO_GPU) += virtio-gpu-base.o virtio-gpu.o virtio-gpu-3d.o
+virtio-gpu-obj-$(CONFIG_VHOST_USER_GPU) += vhost-user-gpu.o
+virtio-gpu-obj-$(call land,$(CONFIG_VIRTIO_GPU),$(CONFIG_VIRTIO_PCI)) += virtio-gpu-pci.o
+virtio-gpu-obj-$(call land,$(CONFIG_VHOST_USER_GPU),$(CONFIG_VIRTIO_PCI)) += vhost-user-gpu-pci.o
+virtio-gpu-obj-$(CONFIG_VIRTIO_VGA) += virtio-vga.o
+virtio-gpu-obj-$(CONFIG_VHOST_USER_VGA) += vhost-user-vga.o
+virtio-gpu.mo-objs := $(virtio-gpu-obj-y)
+virtio-gpu.mo-cflags := $(VIRGL_CFLAGS)
+virtio-gpu.mo-libs := $(VIRGL_LIBS)
+endif
+
common-obj-$(CONFIG_DPCD) += dpcd.o
common-obj-$(CONFIG_XLNX_ZYNQMP_ARM) += xlnx_dp.o
--
2.18.4
next prev parent reply other threads:[~2020-06-24 13:16 UTC|newest]
Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-06-24 13:10 [PATCH v5 00/10] build some devices as modules Gerd Hoffmann
2020-06-24 13:10 ` [PATCH v5 01/10] module: qom module support Gerd Hoffmann
2020-07-20 14:16 ` Christophe de Dinechin
2020-07-21 14:16 ` Gerd Hoffmann
2022-09-05 9:17 ` Claudio Fontana
2022-09-05 14:21 ` Philippe Mathieu-Daudé via
2020-06-24 13:10 ` [PATCH v5 02/10] object: " Gerd Hoffmann
2020-07-20 14:20 ` Christophe de Dinechin
2020-07-21 14:26 ` Gerd Hoffmann
2020-07-21 14:35 ` Daniel P. Berrangé
2020-07-22 8:06 ` Christophe de Dinechin
2020-07-22 11:07 ` Gerd Hoffmann
2020-06-24 13:10 ` [PATCH v5 03/10] qdev: device " Gerd Hoffmann
2020-07-20 14:25 ` Christophe de Dinechin
2020-07-21 14:27 ` Gerd Hoffmann
2020-07-22 8:05 ` Christophe de Dinechin
2020-07-22 11:05 ` Gerd Hoffmann
2020-07-22 14:39 ` Christophe de Dinechin
2020-06-24 13:10 ` [PATCH v5 04/10] build: fix device module builds Gerd Hoffmann
2020-07-20 14:00 ` Christophe de Dinechin
2020-07-21 14:30 ` Gerd Hoffmann
2020-06-24 13:10 ` [PATCH v5 05/10] ccid: build smartcard as module Gerd Hoffmann
2020-07-20 14:30 ` Christophe de Dinechin
2020-07-21 14:33 ` Gerd Hoffmann
2020-07-22 8:08 ` Christophe de Dinechin
2020-06-24 13:10 ` [PATCH v5 06/10] usb: build usb-redir " Gerd Hoffmann
2020-07-20 14:43 ` Christophe de Dinechin
2020-06-24 13:10 ` [PATCH v5 07/10] vga: build qxl " Gerd Hoffmann
2020-07-20 15:01 ` Christophe de Dinechin
2020-06-24 13:10 ` [PATCH v5 08/10] vga: build virtio-gpu only once Gerd Hoffmann
2020-06-24 13:10 ` Gerd Hoffmann [this message]
2020-07-20 15:03 ` [PATCH v5 09/10] vga: build virtio-gpu as module Christophe de Dinechin
2020-06-24 13:10 ` [PATCH v5 10/10] chardev: enable modules, use for braille Gerd Hoffmann
2020-07-20 15:06 ` Christophe de Dinechin
2020-07-21 14:35 ` Gerd Hoffmann
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=20200624131045.14512-10-kraxel@redhat.com \
--to=kraxel@redhat.com \
--cc=berrange@redhat.com \
--cc=dinechin@redhat.com \
--cc=ehabkost@redhat.com \
--cc=marcandre.lureau@redhat.com \
--cc=pbonzini@redhat.com \
--cc=philmd@redhat.com \
--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).