On Thu, Jun 06, 2013 at 06:02:54PM -0700, Geoff Levand wrote: > Commit d21a1c83c7595e387545632e44cd7797b76e19cc (ARM: KVM: define KVM_ARM_MAX_VCPUS > unconditionally) changed the Kconfig logic for KVM_ARM_MAX_VCPUS to work around a > build error arising from the use of KVM_ARM_MAX_VCPUS when CONFIG_KVM=n. The > resulting Kconfig logic is a bit awkward and leaves a KVM_ARM_MAX_VCPUS always > defined in the kernel config file. > > This change reverts the Kconfig logic back and adds a simple preprocessor > conditional in kvm_host.h to handle when CONFIG_KVM_ARM_MAX_VCPUS is undefined. > > Signed-off-by: Geoff Levand <geoff@xxxxxxxxxxxxx> > --- > Hi, > > This way seems a bit more straight forward, plus avoids the problem of > KVM_ARM_MAX_VCPUS not being prompted for when adding a CONFIG_KVM=y by > hand to the config file. > > -Geoff > > arch/arm/include/asm/kvm_host.h | 5 +++++ > arch/arm/kvm/Kconfig | 6 +++--- > 2 files changed, 8 insertions(+), 3 deletions(-) > > diff --git a/arch/arm/include/asm/kvm_host.h b/arch/arm/include/asm/kvm_host.h > index 57cb786..cbbf588 100644 > --- a/arch/arm/include/asm/kvm_host.h > +++ b/arch/arm/include/asm/kvm_host.h > @@ -25,7 +25,12 @@ > #include <asm/fpstate.h> > #include <asm/kvm_arch_timer.h> > > +#if defined(CONFIG_KVM_ARM_MAX_VCPUS) > #define KVM_MAX_VCPUS CONFIG_KVM_ARM_MAX_VCPUS > +#else > +#define KVM_MAX_VCPUS 0 > +#endif > + > #define KVM_USER_MEM_SLOTS 32 > #define KVM_PRIVATE_MEM_SLOTS 4 > #define KVM_COALESCED_MMIO_PAGE_OFFSET 1 > diff --git a/arch/arm/kvm/Kconfig b/arch/arm/kvm/Kconfig > index 370e1a8..49dd64e 100644 > --- a/arch/arm/kvm/Kconfig > +++ b/arch/arm/kvm/Kconfig > @@ -41,9 +41,9 @@ config KVM_ARM_HOST > Provides host support for ARM processors. > > config KVM_ARM_MAX_VCPUS > - int "Number maximum supported virtual CPUs per VM" if KVM_ARM_HOST > - default 4 if KVM_ARM_HOST > - default 0 > + int "Number maximum supported virtual CPUs per VM" > + depends on KVM_ARM_HOST > + default 4 > help > Static number of max supported virtual CPUs per VM. > > -- > 1.7.9.5 Looks reasonable enough to me, I always use menuconfig so I haven't seen an issue before, but if it helps others' workflow, I'd be happy to take it. -Christoffer _______________________________________________ kvmarm mailing list kvmarm@xxxxxxxxxxxxxxxxxxxxx https://lists.cs.columbia.edu/cucslists/listinfo/kvmarm
