From ad3f7e31bfc148135d93c176d1c9197933fa8344 Mon Sep 17 00:00:00 2001 From: Wei Liu Date: Wed, 7 May 2014 13:43:39 +0000 Subject: [PATCH] xen: move Xen HVM files under hw/i386/xen Signed-off-by: Wei Liu Signed-off-by: Stefano Stabellini --- hw/i386/Makefile.objs | 2 +- hw/i386/xen/Makefile.objs | 1 + hw/{ => i386}/xen/xen_apic.c | 0 hw/{ => i386}/xen/xen_platform.c | 0 hw/{ => i386}/xen/xen_pvdevice.c | 0 hw/xen/Makefile.objs | 1 - 6 files changed, 2 insertions(+), 2 deletions(-) create mode 100644 hw/i386/xen/Makefile.objs rename hw/{ => i386}/xen/xen_apic.c (100%) rename hw/{ => i386}/xen/xen_platform.c (100%) rename hw/{ => i386}/xen/xen_pvdevice.c (100%) diff --git a/hw/i386/Makefile.objs b/hw/i386/Makefile.objs index f9899a3e83..f66c349508 100644 --- a/hw/i386/Makefile.objs +++ b/hw/i386/Makefile.objs @@ -2,7 +2,7 @@ obj-$(CONFIG_KVM) += kvm/ obj-y += multiboot.o smbios.o obj-y += pc.o pc_piix.o pc_q35.o obj-y += pc_sysfw.o -obj-$(CONFIG_XEN) += ../xenpv/ +obj-$(CONFIG_XEN) += ../xenpv/ xen/ obj-y += kvmvapic.o obj-y += acpi-build.o diff --git a/hw/i386/xen/Makefile.objs b/hw/i386/xen/Makefile.objs new file mode 100644 index 0000000000..801a68d326 --- /dev/null +++ b/hw/i386/xen/Makefile.objs @@ -0,0 +1 @@ +obj-y += xen_platform.o xen_apic.o xen_pvdevice.o diff --git a/hw/xen/xen_apic.c b/hw/i386/xen/xen_apic.c similarity index 100% rename from hw/xen/xen_apic.c rename to hw/i386/xen/xen_apic.c diff --git a/hw/xen/xen_platform.c b/hw/i386/xen/xen_platform.c similarity index 100% rename from hw/xen/xen_platform.c rename to hw/i386/xen/xen_platform.c diff --git a/hw/xen/xen_pvdevice.c b/hw/i386/xen/xen_pvdevice.c similarity index 100% rename from hw/xen/xen_pvdevice.c rename to hw/i386/xen/xen_pvdevice.c diff --git a/hw/xen/Makefile.objs b/hw/xen/Makefile.objs index ce640c61a5..a0ca0aa3df 100644 --- a/hw/xen/Makefile.objs +++ b/hw/xen/Makefile.objs @@ -1,6 +1,5 @@ # xen backend driver support common-obj-$(CONFIG_XEN_BACKEND) += xen_backend.o xen_devconfig.o -obj-$(CONFIG_XEN_I386) += xen_platform.o xen_apic.o xen_pvdevice.o obj-$(CONFIG_XEN_PCI_PASSTHROUGH) += xen-host-pci-device.o obj-$(CONFIG_XEN_PCI_PASSTHROUGH) += xen_pt.o xen_pt_config_init.o xen_pt_msi.o