[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 14/16] virtio: split virtio gpu bits rom virtio-pci.
From: |
Juan Quintela |
Subject: |
[Qemu-devel] [PATCH 14/16] virtio: split virtio gpu bits rom virtio-pci.h |
Date: |
Wed, 29 Aug 2018 13:37:28 +0200 |
Signed-off-by: Juan Quintela <address@hidden>
---
hw/display/virtio-gpu-pci.c | 14 ++++++++++++++
hw/display/virtio-vga.c | 1 +
hw/virtio/virtio-pci.h | 14 --------------
tests/Makefile.include | 4 ++--
4 files changed, 17 insertions(+), 16 deletions(-)
diff --git a/hw/display/virtio-gpu-pci.c b/hw/display/virtio-gpu-pci.c
index cece4aa495..fa126cf3e4 100644
--- a/hw/display/virtio-gpu-pci.c
+++ b/hw/display/virtio-gpu-pci.c
@@ -19,6 +19,20 @@
#include "hw/virtio/virtio-pci.h"
#include "hw/virtio/virtio-gpu.h"
+typedef struct VirtIOGPUPCI VirtIOGPUPCI;
+
+/*
+ * virtio-gpu-pci: This extends VirtioPCIProxy.
+ */
+#define TYPE_VIRTIO_GPU_PCI "virtio-gpu-pci"
+#define VIRTIO_GPU_PCI(obj) \
+ OBJECT_CHECK(VirtIOGPUPCI, (obj), TYPE_VIRTIO_GPU_PCI)
+
+struct VirtIOGPUPCI {
+ VirtIOPCIProxy parent_obj;
+ VirtIOGPU vdev;
+};
+
static Property virtio_gpu_pci_properties[] = {
DEFINE_VIRTIO_GPU_PCI_PROPERTIES(VirtIOPCIProxy),
DEFINE_PROP_END_OF_LIST(),
diff --git a/hw/display/virtio-vga.c b/hw/display/virtio-vga.c
index 701d980872..15576be290 100644
--- a/hw/display/virtio-vga.c
+++ b/hw/display/virtio-vga.c
@@ -3,6 +3,7 @@
#include "hw/pci/pci.h"
#include "vga_int.h"
#include "hw/virtio/virtio-pci.h"
+#include "hw/virtio/virtio-gpu.h"
#include "qapi/error.h"
/*
diff --git a/hw/virtio/virtio-pci.h b/hw/virtio/virtio-pci.h
index 59016d553b..91981b39f9 100644
--- a/hw/virtio/virtio-pci.h
+++ b/hw/virtio/virtio-pci.h
@@ -17,11 +17,9 @@
#include "hw/pci/msi.h"
#include "hw/virtio/virtio-bus.h"
-#include "hw/virtio/virtio-gpu.h"
#include "hw/virtio/virtio-crypto.h"
typedef struct VirtIOPCIProxy VirtIOPCIProxy;
-typedef struct VirtIOGPUPCI VirtIOGPUPCI;
typedef struct VirtIOCryptoPCI VirtIOCryptoPCI;
/* virtio-pci-bus */
@@ -184,18 +182,6 @@ static inline void
virtio_pci_disable_modern(VirtIOPCIProxy *proxy)
*/
#define TYPE_VIRTIO_INPUT_PCI "virtio-input-pci"
-/*
- * virtio-gpu-pci: This extends VirtioPCIProxy.
- */
-#define TYPE_VIRTIO_GPU_PCI "virtio-gpu-pci"
-#define VIRTIO_GPU_PCI(obj) \
- OBJECT_CHECK(VirtIOGPUPCI, (obj), TYPE_VIRTIO_GPU_PCI)
-
-struct VirtIOGPUPCI {
- VirtIOPCIProxy parent_obj;
- VirtIOGPU vdev;
-};
-
/*
* virtio-crypto-pci: This extends VirtioPCIProxy.
*/
diff --git a/tests/Makefile.include b/tests/Makefile.include
index 2c36afe7d9..30c493190d 100644
--- a/tests/Makefile.include
+++ b/tests/Makefile.include
@@ -246,8 +246,8 @@ check-qtest-pci-y += tests/display-vga-test$(EXESUF)
gcov-files-pci-y += hw/display/vga.c
gcov-files-pci-y += hw/display/cirrus_vga.c
gcov-files-pci-y += hw/display/vga-pci.c
-gcov-files-pci-y += hw/display/virtio-gpu.c
-gcov-files-pci-y += hw/display/virtio-gpu-pci.c
+gcov-files-pci-$(CONFIG_VIRTIO_GPU) += hw/display/virtio-gpu.c
+gcov-files-pci-$(CONFIG_VIRTIO_GPU) += hw/display/virtio-gpu-pci.c
gcov-files-pci-$(CONFIG_VIRTIO_VGA) += hw/display/virtio-vga.c
check-qtest-pci-$(CONFIG_HDA) += tests/intel-hda-test$(EXESUF)
gcov-files-pci-$(CONFIG_HDA) += hw/audio/intel-hda.c hw/audio/hda-codec.c
--
2.17.1
- [Qemu-devel] [PATCH 00/16] Virtio devices split from virtio-pci, Juan Quintela, 2018/08/29
- [Qemu-devel] [PATCH 16/16] virtio: virtio 9p really requires CONFIG_VIRTFS to work, Juan Quintela, 2018/08/29
- [Qemu-devel] [PATCH 15/16] virtio: split virtio crypto bits rom virtio-pci.h, Juan Quintela, 2018/08/29
- [Qemu-devel] [PATCH 11/16] virtio: split virtio blk bits rom virtio-pci, Juan Quintela, 2018/08/29
- [Qemu-devel] [PATCH 10/16] virtio: split virtio scsi bits from virtio-pci, Juan Quintela, 2018/08/29
- [Qemu-devel] [PATCH 14/16] virtio: split virtio gpu bits rom virtio-pci.h,
Juan Quintela <=
- [Qemu-devel] [PATCH 12/16] virtio: split virtio net bits rom virtio-pci, Juan Quintela, 2018/08/29
- [Qemu-devel] [PATCH 13/16] virtio: split virtio serial bits rom virtio-pci, Juan Quintela, 2018/08/29
- [Qemu-devel] [PATCH 09/16] virtio: split vhost scsi bits from virtio-pci, Juan Quintela, 2018/08/29
- [Qemu-devel] [PATCH 08/16] virtio: split vhost user scsi bits from virtio-pci, Juan Quintela, 2018/08/29
- [Qemu-devel] [PATCH 05/16] virtio: split virtio balloon bits from virtio-pci, Juan Quintela, 2018/08/29
- [Qemu-devel] [PATCH 06/16] virtio: split virtio 9p bits from virtio-pci, Juan Quintela, 2018/08/29
- [Qemu-devel] [PATCH 03/16] virtio: split virtio input bits from virtio-pci, Juan Quintela, 2018/08/29
- [Qemu-devel] [PATCH 07/16] virtio: split vhost user blk bits from virtio-pci, Juan Quintela, 2018/08/29
- [Qemu-devel] [PATCH 01/16] virtio: split vhost vsock bits from virtio-pci, Juan Quintela, 2018/08/29
- [Qemu-devel] [PATCH 02/16] virtio: split virtio input host bits from virtio-pci, Juan Quintela, 2018/08/29