| Message ID | 1343316846-25860-10-git-send-email-stefano.stabellini@eu.citrix.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
>>> On 26.07.12 at 17:33, Stefano Stabellini <stefano.stabellini@eu.citrix.com> wrote: > --- a/drivers/xen/Makefile > +++ b/drivers/xen/Makefile > @@ -1,11 +1,15 @@ > -obj-y += grant-table.o features.o events.o manage.o balloon.o > +ifneq ($(CONFIG_ARM),y) > +obj-y += manage.o balloon.o While I assume that this part (and the cpu_hotplug one below) is temporary, ... > +obj-$(CONFIG_XEN_DOM0) += pci.o acpi.o ... at least this one should imo be solved with a proper long term mechanism, i.e. the usual var-$(CONFIG_...) approach, i.e. dom0-$(CONFIG_PCI) := pci.o dom0-$(CONFIG_ACPI) := acpi.o obj-$(CONFIG_XEN_DOM0) += $(dom0-y) Jan > +obj-$(CONFIG_HOTPLUG_CPU) += cpu_hotplug.o > +endif > +obj-y += grant-table.o features.o events.o > obj-y += xenbus/ > > nostackp := $(call cc-option, -fno-stack-protector) > CFLAGS_features.o := $(nostackp) > > obj-$(CONFIG_BLOCK) += biomerge.o > -obj-$(CONFIG_HOTPLUG_CPU) += cpu_hotplug.o > obj-$(CONFIG_XEN_XENCOMM) += xencomm.o > obj-$(CONFIG_XEN_BALLOON) += xen-balloon.o > obj-$(CONFIG_XEN_SELFBALLOONING) += xen-selfballoon.o > @@ -17,7 +21,6 @@ obj-$(CONFIG_XEN_SYS_HYPERVISOR) += sys-hypervisor.o > obj-$(CONFIG_XEN_PVHVM) += platform-pci.o > obj-$(CONFIG_XEN_TMEM) += tmem.o > obj-$(CONFIG_SWIOTLB_XEN) += swiotlb-xen.o > -obj-$(CONFIG_XEN_DOM0) += pci.o acpi.o > obj-$(CONFIG_XEN_PCIDEV_BACKEND) += xen-pciback/ > obj-$(CONFIG_XEN_PRIVCMD) += xen-privcmd.o > obj-$(CONFIG_XEN_ACPI_PROCESSOR) += xen-acpi-processor.o > -- > 1.7.2.5 > > > _______________________________________________ > Xen-devel mailing list > Xen-devel@lists.xen.org > http://lists.xen.org/xen-devel
On Fri, 27 Jul 2012, Jan Beulich wrote: > >>> On 26.07.12 at 17:33, Stefano Stabellini <stefano.stabellini@eu.citrix.com> wrote: > > --- a/drivers/xen/Makefile > > +++ b/drivers/xen/Makefile > > @@ -1,11 +1,15 @@ > > -obj-y += grant-table.o features.o events.o manage.o balloon.o > > +ifneq ($(CONFIG_ARM),y) > > +obj-y += manage.o balloon.o > > While I assume that this part (and the cpu_hotplug one below) is > temporary, ... > > > +obj-$(CONFIG_XEN_DOM0) += pci.o acpi.o > > ... at least this one should imo be solved with a proper long term > mechanism, i.e. the usual var-$(CONFIG_...) approach, i.e. > > dom0-$(CONFIG_PCI) := pci.o > dom0-$(CONFIG_ACPI) := acpi.o > obj-$(CONFIG_XEN_DOM0) += $(dom0-y) That's a good suggestion, thanks!
diff --git a/drivers/xen/Makefile b/drivers/xen/Makefile index fc34886..0cfa6c47 100644 --- a/drivers/xen/Makefile +++ b/drivers/xen/Makefile @@ -1,11 +1,15 @@ -obj-y += grant-table.o features.o events.o manage.o balloon.o +ifneq ($(CONFIG_ARM),y) +obj-y += manage.o balloon.o +obj-$(CONFIG_XEN_DOM0) += pci.o acpi.o +obj-$(CONFIG_HOTPLUG_CPU) += cpu_hotplug.o +endif +obj-y += grant-table.o features.o events.o obj-y += xenbus/ nostackp := $(call cc-option, -fno-stack-protector) CFLAGS_features.o := $(nostackp) obj-$(CONFIG_BLOCK) += biomerge.o -obj-$(CONFIG_HOTPLUG_CPU) += cpu_hotplug.o obj-$(CONFIG_XEN_XENCOMM) += xencomm.o obj-$(CONFIG_XEN_BALLOON) += xen-balloon.o obj-$(CONFIG_XEN_SELFBALLOONING) += xen-selfballoon.o @@ -17,7 +21,6 @@ obj-$(CONFIG_XEN_SYS_HYPERVISOR) += sys-hypervisor.o obj-$(CONFIG_XEN_PVHVM) += platform-pci.o obj-$(CONFIG_XEN_TMEM) += tmem.o obj-$(CONFIG_SWIOTLB_XEN) += swiotlb-xen.o -obj-$(CONFIG_XEN_DOM0) += pci.o acpi.o obj-$(CONFIG_XEN_PCIDEV_BACKEND) += xen-pciback/ obj-$(CONFIG_XEN_PRIVCMD) += xen-privcmd.o obj-$(CONFIG_XEN_ACPI_PROCESSOR) += xen-acpi-processor.o
Signed-off-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com> --- drivers/xen/Makefile | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-)