Re: [Qemu-devel] [PATCH] hw/9pfs: Include virtio-9p-device.o in build

[Andreas Färber]

Am 04.03.2014 00:36, schrieb Serge E. Hallyn:
> Quoting Aneesh Kumar K.V (address@hidden):
>> commit 01041f5df94ff19988cbadd7bd3eefcc9d964e4e
>> Author: Aneesh Kumar K.V <address@hidden>
>> Date:   Tue Mar 4 00:35:32 2014 +0530
>>
>>     hw/9pfs: Include virtio-9p-device.o in build
>>     
>>     After commit ba1183da9a10b94611cad88c44a5c6df005f9b55 we are including
>>     hw/Makefile.objs directly from Makefile.target. Make sure 
>> hw/Makefile.objs
>>     rules doesn't depend on variable defined in Makefile.objs
>>     
>>     Signed-off-by: Aneesh Kumar K.V <address@hidden>
> 
> Thanks, Aneesh, this worked for me.
> 
> Tested-by: Serge Hallyn <address@hidden>

Tested-by: Andreas Färber <address@hidden>

Aneesh, could you please either properly submit a v2 so that Peter can
apply it or send a pull to somehow fix this?

Thanks,
Andreas

> 
>>
>> diff --git a/Makefile.objs b/Makefile.objs
>> index 4a62913a4d25..5cd3d816ffb0 100644
>> --- a/Makefile.objs
>> +++ b/Makefile.objs
>> @@ -21,11 +21,6 @@ block-obj-y += coroutine-$(CONFIG_COROUTINE_BACKEND).o
>>  
>>  block-obj-m = block/
>>  
>> -ifeq ($(CONFIG_VIRTIO)$(CONFIG_VIRTFS)$(CONFIG_PCI),yyy)
>> -# Lots of the fsdev/9pcode is pulled in by vl.c via qemu_fsdev_add.
>> -# only pull in the actual virtio-9p device if we also enabled virtio.
>> -CONFIG_REALLY_VIRTFS=y
>> -endif
>>  
>>  ######################################################################
>>  # smartcard
>> diff --git a/fsdev/Makefile.objs b/fsdev/Makefile.objs
>> index 206289c49f18..c27dad3f6dc7 100644
>> --- a/fsdev/Makefile.objs
>> +++ b/fsdev/Makefile.objs
>> @@ -1,4 +1,6 @@
>> -ifeq ($(CONFIG_REALLY_VIRTFS),y)
>> +ifeq ($(CONFIG_VIRTIO)$(CONFIG_VIRTFS)$(CONFIG_PCI),yyy)
>> +# Lots of the fsdev/9pcode is pulled in by vl.c via qemu_fsdev_add.
>> +# only pull in the actual virtio-9p device if we also enabled virtio.
>>  common-obj-y = qemu-fsdev.o virtio-9p-marshal.o
>>  else
>>  common-obj-y = qemu-fsdev-dummy.o
>> diff --git a/hw/Makefile.objs b/hw/Makefile.objs
>> index 05a00dc40133..d178b65de4d0 100644
>> --- a/hw/Makefile.objs
>> +++ b/hw/Makefile.objs
>> @@ -1,4 +1,4 @@
>> -devices-dirs-$(CONFIG_REALLY_VIRTFS) += 9pfs/
>> +devices-dirs-$(call land, $(CONFIG_VIRTIO),$(call 
>> land,$(CONFIG_VIRTFS),$(CONFIG_PCI))) += 9pfs/
>>  devices-dirs-$(CONFIG_ACPI) += acpi/
>>  devices-dirs-$(CONFIG_SOFTMMU) += audio/
>>  devices-dirs-$(CONFIG_SOFTMMU) += block/

-- 
SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 Nürnberg, Germany
GF: Jeff Hawn, Jennifer Guild, Felix Imendörffer; HRB 16746 AG Nürnberg