falso
/
qemu-irix
mirror of https://github.com/n64decomp/qemu-irix.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Kim Phillips 2014-12-19 15:24:06 -07:00 committed by Alex Williamson
parent c67676711c
commit cf7087db10
8 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
LICENSE
View File

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

2
MAINTAINERS
View File

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

1
hw/Makefile.objs
View File

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

1
hw/misc/Makefile.objs
View File

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

2
hw/ppc/spapr_pci_vfio.c
View File

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

3
hw/vfio/Makefile.objs Normal file
View File

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

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

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

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