diff options
| author | Jan Kiszka <jan.kiszka@siemens.com> | 2011-06-21 22:59:09 +0200 |
|---|---|---|
| committer | Alexander Graf <agraf@suse.de> | 2011-07-17 01:54:24 +0200 |
| commit | 868bb33faa643c7ee291bb308a829122b72d4845 (patch) | |
| tree | e646309f8df4ff0666a8e872a87c30220ace1e55 /Makefile.target | |
| parent | e41d7c691ad7f4ad78573f72048eecb16f78974a (diff) | |
| download | qemu-868bb33faa643c7ee291bb308a829122b72d4845.zip qemu-868bb33faa643c7ee291bb308a829122b72d4845.tar.gz qemu-868bb33faa643c7ee291bb308a829122b72d4845.tar.bz2 | |
xen: Fold CONFIG_XEN_MAPCACHE into CONFIG_XEN
Xen won't be enabled if there is no backend support available for the
host. And that also means the map cache will work. So drop the separate
config switch and move the required stubs over to xen-stub.c.
Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
Signed-off-by: Alexander Graf <agraf@suse.de>
Diffstat (limited to 'Makefile.target')
| -rw-r--r-- | Makefile.target | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/Makefile.target b/Makefile.target index c347176..c566eb1 100644 --- a/Makefile.target +++ b/Makefile.target @@ -4,7 +4,6 @@ GENERATED_HEADERS = config-target.h CONFIG_NO_PCI = $(if $(subst n,,$(CONFIG_PCI)),n,y) CONFIG_NO_KVM = $(if $(subst n,,$(CONFIG_KVM)),n,y) CONFIG_NO_XEN = $(if $(subst n,,$(CONFIG_XEN)),n,y) -CONFIG_NO_XEN_MAPCACHE = $(if $(subst n,,$(CONFIG_XEN_MAPCACHE)),n,y) include ../config-host.mak include config-devices.mak @@ -207,10 +206,8 @@ QEMU_CFLAGS += $(VNC_JPEG_CFLAGS) QEMU_CFLAGS += $(VNC_PNG_CFLAGS) # xen support -obj-$(CONFIG_XEN) += xen-all.o xen_machine_pv.o xen_domainbuild.o +obj-$(CONFIG_XEN) += xen-all.o xen_machine_pv.o xen_domainbuild.o xen-mapcache.o obj-$(CONFIG_NO_XEN) += xen-stub.o -obj-i386-$(CONFIG_XEN_MAPCACHE) += xen-mapcache.o -obj-$(CONFIG_NO_XEN_MAPCACHE) += xen-mapcache-stub.o obj-i386-$(CONFIG_XEN) += xen_platform.o |