[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 7/7] vga: build virtio-gpu as module
From: |
Gerd Hoffmann |
Subject: |
[PATCH v2 7/7] vga: build virtio-gpu as module |
Date: |
Thu, 4 Jun 2020 15:16:43 +0200 |
Drops libvirglrenderer.so dependency from core qemu.
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
hw/core/qdev.c | 6 ++++++
hw/display/Makefile.objs | 23 +++++++++++++----------
2 files changed, 19 insertions(+), 10 deletions(-)
diff --git a/hw/core/qdev.c b/hw/core/qdev.c
index 70cf84bb67d0..bc4485e93675 100644
--- a/hw/core/qdev.c
+++ b/hw/core/qdev.c
@@ -161,6 +161,12 @@ static struct {
{ .type = "usb-redir", .mod = "usb-redirect" },
{ .type = "qxl-vga", .mod = "display-qxl" },
{ .type = "qxl", .mod = "display-qxl" },
+ { .type = "virtio-gpu-device", .mod = "display-virtio-gpu" },
+ { .type = "virtio-gpu-pci", .mod = "display-virtio-gpu" },
+ { .type = "virtio-vga", .mod = "display-virtio-gpu" },
+ { .type = "vhost-user-gpu-device", .mod = "display-virtio-gpu" },
+ { .type = "vhost-user-gpu-pci", .mod = "display-virtio-gpu" },
+ { .type = "vhost-user-vga", .mod = "display-virtio-gpu" },
};
static bool qdev_module_loaded_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
- [PATCH v2 0/7] build some devices as modules., Gerd Hoffmann, 2020/06/04
- [PATCH v2 2/7] build: fix device module builds, Gerd Hoffmann, 2020/06/04
- [PATCH v2 5/7] vga: build qxl as module, Gerd Hoffmann, 2020/06/04
- [PATCH v2 6/7] vga: build virtio-gpu only once, Gerd Hoffmann, 2020/06/04
- [PATCH v2 7/7] vga: build virtio-gpu as module,
Gerd Hoffmann <=
- [PATCH v2 3/7] ccid: build smartcard as module, Gerd Hoffmann, 2020/06/04
- [PATCH v2 1/7] qdev: add support for device module loading, Gerd Hoffmann, 2020/06/04
- [PATCH v2 4/7] usb: build usb-redir as module, Gerd Hoffmann, 2020/06/04