[Qemu-devel] Re: [PATCH 01/17] Only build ivshmem when CONFIG_PCI && CONFIG_KVM

[Alexander Graf]

On 24.03.2011, at 22:46, Juan Quintela wrote:

> Alexander Graf <address@hidden> wrote:
>> The ivshmem depends on PCI and KVM, not only KVM. Reflect this
>> in the Makefile, so we don't get build errors on s390x.
>> 
>> Signed-off-by: Alexander Graf <address@hidden>
>> ---
>> Makefile.target |    8 +++++++-
>> 1 files changed, 7 insertions(+), 1 deletions(-)
>> 
>> diff --git a/Makefile.target b/Makefile.target
>> index f0df98e..17ad396 100644
>> --- a/Makefile.target
>> +++ b/Makefile.target
>> @@ -209,7 +209,13 @@ QEMU_CFLAGS += $(VNC_PNG_CFLAGS)
>> obj-$(CONFIG_XEN) += xen_machine_pv.o xen_domainbuild.o
>> 
>> # Inter-VM PCI shared memory
>> -obj-$(CONFIG_KVM) += ivshmem.o
>> +CONFIG_IVSHMEM =
>> +ifeq ($(CONFIG_KVM), y)
>> +  ifeq ($(CONFIG_PCI), y)
>> +    CONFIG_IVSHMEM = y
>> +  endif
>> +endif
>> +obj-$(CONFIG_IVSHMEM) += ivshmem.o
> 
> This shouldn't be here.  Proper place is at ./configure, or better yet
> at defaults/x86_64-softmmu.mak
> 
> CONFIG_IVSHMEM=y
> 
> It is complicated though, because we depend on PCI and KVM.

So what would you recommend? The current dependency is just plain wrong :).


Alex