Browse Source

vfio: move hw/misc/vfio.c to hw/vfio/pci.c Move vfio.h into include/hw/vfio

This is done in preparation for the addition of VFIO platform
device support.

Signed-off-by: Kim Phillips <kim.phillips@linaro.org>
Signed-off-by: Alex Williamson <alex.williamson@redhat.com>
tags/v2.3.0-rc0
Kim Phillips 4 years ago
parent
commit
cf7087db10
8 changed files with 8 additions and 5 deletions
  1. 1
    1
      LICENSE
  2. 1
    1
      MAINTAINERS
  3. 1
    0
      hw/Makefile.objs
  4. 0
    1
      hw/misc/Makefile.objs
  5. 1
    1
      hw/ppc/spapr_pci_vfio.c
  6. 3
    0
      hw/vfio/Makefile.objs
  7. 1
    1
      hw/vfio/pci.c
  8. 0
    0
      include/hw/vfio/vfio.h

+ 1
- 1
LICENSE View File

@@ -11,7 +11,7 @@ option) any later version.
11 11
 
12 12
 As of July 2013, contributions under version 2 of the GNU General Public
13 13
 License (and no later version) are only accepted for the following files
14
-or directories: bsd-user/, linux-user/, hw/misc/vfio.c, hw/xen/xen_pt*.
14
+or directories: bsd-user/, linux-user/, hw/vfio/, hw/xen/xen_pt*.
15 15
 
16 16
 3) The Tiny Code Generator (TCG) is released under the BSD license
17 17
    (see license headers in files).

+ 1
- 1
MAINTAINERS View File

@@ -657,7 +657,7 @@ F: hw/usb/dev-serial.c
657 657
 VFIO
658 658
 M: Alex Williamson <alex.williamson@redhat.com>
659 659
 S: Supported
660
-F: hw/misc/vfio.c
660
+F: hw/vfio/*
661 661
 
662 662
 vhost
663 663
 M: Michael S. Tsirkin <mst@redhat.com>

+ 1
- 0
hw/Makefile.objs View File

@@ -26,6 +26,7 @@ devices-dirs-$(CONFIG_SOFTMMU) += ssi/
26 26
 devices-dirs-$(CONFIG_SOFTMMU) += timer/
27 27
 devices-dirs-$(CONFIG_TPM) += tpm/
28 28
 devices-dirs-$(CONFIG_SOFTMMU) += usb/
29
+devices-dirs-$(CONFIG_SOFTMMU) += vfio/
29 30
 devices-dirs-$(CONFIG_VIRTIO) += virtio/
30 31
 devices-dirs-$(CONFIG_SOFTMMU) += watchdog/
31 32
 devices-dirs-$(CONFIG_SOFTMMU) += xen/

+ 0
- 1
hw/misc/Makefile.objs View File

@@ -21,7 +21,6 @@ common-obj-$(CONFIG_MACIO) += macio/
21 21
 
22 22
 ifeq ($(CONFIG_PCI), y)
23 23
 obj-$(CONFIG_KVM) += ivshmem.o
24
-obj-$(CONFIG_LINUX) += vfio.o
25 24
 endif
26 25
 
27 26
 obj-$(CONFIG_REALVIEW) += arm_sysctl.o

+ 1
- 1
hw/ppc/spapr_pci_vfio.c View File

@@ -20,7 +20,7 @@
20 20
 #include "hw/ppc/spapr.h"
21 21
 #include "hw/pci-host/spapr.h"
22 22
 #include "linux/vfio.h"
23
-#include "hw/misc/vfio.h"
23
+#include "hw/vfio/vfio.h"
24 24
 
25 25
 static Property spapr_phb_vfio_properties[] = {
26 26
     DEFINE_PROP_INT32("iommu", sPAPRPHBVFIOState, iommugroupid, -1),

+ 3
- 0
hw/vfio/Makefile.objs View File

@@ -0,0 +1,3 @@
1
+ifeq ($(CONFIG_LINUX), y)
2
+obj-$(CONFIG_PCI) += pci.o
3
+endif

hw/misc/vfio.c → hw/vfio/pci.c View File

@@ -39,8 +39,8 @@
39 39
 #include "qemu/range.h"
40 40
 #include "sysemu/kvm.h"
41 41
 #include "sysemu/sysemu.h"
42
-#include "hw/misc/vfio.h"
43 42
 #include "trace.h"
43
+#include "hw/vfio/vfio.h"
44 44
 
45 45
 /* Extra debugging, trap acceleration paths for more logging */
46 46
 #define VFIO_ALLOW_MMAP 1

include/hw/misc/vfio.h → include/hw/vfio/vfio.h View File


Loading…
Cancel
Save