diff options
| author |   Jan Kiszka <jan.kiszka@siemens.com> | 2012-08-17 08:59:04 +0200 |
|---|---|---|
| committer |   Marcelo Tosatti <mtosatti@redhat.com> | 2012-08-23 17:02:35 -0300 |
| commit | b08cc3dcd2707223ece688905c822385a84def9a (patch) | |
| tree | 5b7e64e92b84257662302ff5e206c38bae16d9b5 | |
| parent | a710308c01fe5116120c0a7972a8c7bb9d915810 (diff) | |
pci-assign: Move and rename source file
Move device-assignment.c into hw/kvm, calling it pci-assign.c now, just
like its device name.
Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
| -rw-r--r-- | hw/i386/Makefile.objs | 3 | ||||
| -rw-r--r-- | hw/kvm/Makefile.objs | 2 | ||||
| -rw-r--r-- | hw/kvm/pci-assign.c (renamed from hw/device-assignment.c) | 10 |
3 files changed, 6 insertions, 9 deletions
diff --git a/hw/i386/Makefile.objs b/hw/i386/Makefile.objs index 29f3e6f95..523e224ac 100644 --- a/hw/i386/Makefile.objs +++ b/hw/i386/Makefile.objs @@ -14,7 +14,4 @@ obj-$(CONFIG_SPICE) += qxl.o qxl-logger.o qxl-render.o obj-y += testdev.o obj-y += acpi.o acpi_piix4.o -obj-$(CONFIG_KVM) += device-assignment.o - - obj-y := $(addprefix ../,$(obj-y)) diff --git a/hw/kvm/Makefile.objs b/hw/kvm/Makefile.objs index 226497a58..f620d7ff8 100644 --- a/hw/kvm/Makefile.objs +++ b/hw/kvm/Makefile.objs @@ -1 +1 @@ -obj-$(CONFIG_KVM) += clock.o apic.o i8259.o ioapic.o i8254.o +obj-$(CONFIG_KVM) += clock.o apic.o i8259.o ioapic.o i8254.o pci-assign.o diff --git a/hw/device-assignment.c b/hw/kvm/pci-assign.c index 5ef562993..361153919 100644 --- a/hw/device-assignment.c +++ b/hw/kvm/pci-assign.c @@ -31,16 +31,16 @@ #include <sys/mman.h> #include <sys/types.h> #include <sys/stat.h> -#include "hw.h" -#include "pc.h" +#include "hw/hw.h" +#include "hw/pc.h" #include "qemu-error.h" #include "console.h" -#include "loader.h" +#include "hw/loader.h" #include "monitor.h" #include "range.h" #include "sysemu.h" -#include "pci.h" -#include "msi.h" +#include "hw/pci.h" +#include "hw/msi.h" #include "kvm_i386.h" #define MSIX_PAGE_SIZE 0x1000 |