diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2014-05-07 18:12:14 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2014-05-07 18:12:14 +0100 |
| commit | 5894145a26afd29c077452f7e93981b797c912a5 (patch) | |
| tree | eb6e51da96686770561777d80095828da3c1e81e /hw/i386/Makefile.objs | |
| parent | b18a990c3d5cb8f8dfe1a5e5b36c67857ce1cf86 (diff) | |
| parent | f31352041bdde436c3f6d07e1525a42e48dec215 (diff) | |
Merge remote-tracking branch 'remotes/sstabellini/xen-140507-2' into staging
* remotes/sstabellini/xen-140507-2:
xen_disk: add discard support
pass an inclusive address range to xc_domain_pin_memory_cacheattr
xen: factor out common functions
xen: move Xen HVM files under hw/i386/xen
xen: move Xen PV machine files to hw/xenpv
qemu-xen: free all the pirqs for msi/msix when driver unload
exec: Limit translation limiting in address_space_translate to xen
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw/i386/Makefile.objs')
| -rw-r--r-- | hw/i386/Makefile.objs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/hw/i386/Makefile.objs b/hw/i386/Makefile.objs index 3df1612651..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) += xen_domainbuild.o xen_machine_pv.o +obj-$(CONFIG_XEN) += ../xenpv/ xen/ obj-y += kvmvapic.o obj-y += acpi-build.o |