diff mbox

hw/9pfs: Include virtio-9p-device.o in build

Message ID 1393873716-9574-1-git-send-email-aneesh.kumar@linux.vnet.ibm.com
State New
Headers show

Commit Message

Aneesh Kumar K.V March 3, 2014, 7:08 p.m. UTC 
From: "Aneesh Kumar K.V" <aneesh.kumar@linux.vnet.ibm.com>

After commit ba1183da9a10b94611cad88c44a5c6df005f9b55 we are including
hw/Makefile.objs directly from Makefile.target. Hence we need to define
the config in Makefile.target too to include virtio-9p-device.o in
the build

Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
---
 Makefile.target | 4 ++++
 1 file changed, 4 insertions(+)

Comments

Paolo Bonzini March 3, 2014, 7:13 p.m. UTC | #1 
Il 03/03/2014 20:08, Aneesh Kumar K.V ha scritto:
> From: "Aneesh Kumar K.V" <aneesh.kumar@linux.vnet.ibm.com>
>
> After commit ba1183da9a10b94611cad88c44a5c6df005f9b55 we are including
> hw/Makefile.objs directly from Makefile.target. Hence we need to define
> the config in Makefile.target too to include virtio-9p-device.o in
> the build
>
> Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
> ---
>  Makefile.target | 4 ++++
>  1 file changed, 4 insertions(+)
>
> diff --git a/Makefile.target b/Makefile.target
> index ba1234063eae..da8daa82c39e 100644
> --- a/Makefile.target
> +++ b/Makefile.target
> @@ -137,6 +137,10 @@ endif # CONFIG_SOFTMMU
>  # Workaround for http://gcc.gnu.org/PR55489, see configure.
>  %/translate.o: QEMU_CFLAGS += $(TRANSLATE_OPT_CFLAGS)
>
> +ifeq ($(CONFIG_VIRTIO)$(CONFIG_VIRTFS)$(CONFIG_PCI),yyy)
> +CONFIG_REALLY_VIRTFS=y
> +endif
> +
>  dummy := $(call unnest-vars,,obj-y)
>
>  # we are making another call to unnest-vars with different vars, protect obj-y,
>

Can you just replace $(CONFIG_REALLY_VIRTFS) with

$(call land, $(call land, $(CONFIG_VIRTIO),
                           $(CONFIG_VIRTFS)),
                           $(CONFIG_PCI))

in hw/Makefile.objs, and remove it from Makefile.objs?

Paolo
Aneesh Kumar K.V March 3, 2014, 7:42 p.m. UTC | #2 
Paolo Bonzini <pbonzini@redhat.com> writes:

> Il 03/03/2014 20:08, Aneesh Kumar K.V ha scritto:
>> From: "Aneesh Kumar K.V" <aneesh.kumar@linux.vnet.ibm.com>
>>
>> After commit ba1183da9a10b94611cad88c44a5c6df005f9b55 we are including
>> hw/Makefile.objs directly from Makefile.target. Hence we need to define
>> the config in Makefile.target too to include virtio-9p-device.o in
>> the build
>>
>> Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
>> ---
>>  Makefile.target | 4 ++++
>>  1 file changed, 4 insertions(+)
>>
>> diff --git a/Makefile.target b/Makefile.target
>> index ba1234063eae..da8daa82c39e 100644
>> --- a/Makefile.target
>> +++ b/Makefile.target
>> @@ -137,6 +137,10 @@ endif # CONFIG_SOFTMMU
>>  # Workaround for http://gcc.gnu.org/PR55489, see configure.
>>  %/translate.o: QEMU_CFLAGS += $(TRANSLATE_OPT_CFLAGS)
>>
>> +ifeq ($(CONFIG_VIRTIO)$(CONFIG_VIRTFS)$(CONFIG_PCI),yyy)
>> +CONFIG_REALLY_VIRTFS=y
>> +endif
>> +
>>  dummy := $(call unnest-vars,,obj-y)
>>
>>  # we are making another call to unnest-vars with different vars, protect obj-y,
>>
>
> Can you just replace $(CONFIG_REALLY_VIRTFS) with
>
> $(call land, $(call land, $(CONFIG_VIRTIO),
>                            $(CONFIG_VIRTFS)),
>                            $(CONFIG_PCI))
>
> in hw/Makefile.objs, and remove it from Makefile.objs?

Like this ? That worked. Will update the patch

-devices-dirs-$(CONFIG_REALLY_VIRTFS) += 9pfs/
+devices-dirs-($call land,$(CONFIG_VIRTIO),$(CONFIG_VIRTFS),$(CONFIG_PCI)) += 9pfs/

-aneesh
Aneesh Kumar K.V March 3, 2014, 8:02 p.m. UTC | #3 
"Aneesh Kumar K.V" <aneesh.kumar@linux.vnet.ibm.com> writes:

> Paolo Bonzini <pbonzini@redhat.com> writes:
>
>> Il 03/03/2014 20:08, Aneesh Kumar K.V ha scritto:
>>> From: "Aneesh Kumar K.V" <aneesh.kumar@linux.vnet.ibm.com>
>>>
>>> After commit ba1183da9a10b94611cad88c44a5c6df005f9b55 we are including
>>> hw/Makefile.objs directly from Makefile.target. Hence we need to define
>>> the config in Makefile.target too to include virtio-9p-device.o in
>>> the build
>>>
>>> Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
>>> ---
>>>  Makefile.target | 4 ++++
>>>  1 file changed, 4 insertions(+)
>>>
>>> diff --git a/Makefile.target b/Makefile.target
>>> index ba1234063eae..da8daa82c39e 100644
>>> --- a/Makefile.target
>>> +++ b/Makefile.target
>>> @@ -137,6 +137,10 @@ endif # CONFIG_SOFTMMU
>>>  # Workaround for http://gcc.gnu.org/PR55489, see configure.
>>>  %/translate.o: QEMU_CFLAGS += $(TRANSLATE_OPT_CFLAGS)
>>>
>>> +ifeq ($(CONFIG_VIRTIO)$(CONFIG_VIRTFS)$(CONFIG_PCI),yyy)
>>> +CONFIG_REALLY_VIRTFS=y
>>> +endif
>>> +
>>>  dummy := $(call unnest-vars,,obj-y)
>>>
>>>  # we are making another call to unnest-vars with different vars, protect obj-y,
>>>
>>
>> Can you just replace $(CONFIG_REALLY_VIRTFS) with
>>
>> $(call land, $(call land, $(CONFIG_VIRTIO),
>>                            $(CONFIG_VIRTFS)),
>>                            $(CONFIG_PCI))
>>
>> in hw/Makefile.objs, and remove it from Makefile.objs?
>
> Like this ? That worked. Will update the patch
>
> -devices-dirs-$(CONFIG_REALLY_VIRTFS) += 9pfs/
> +devices-dirs-($call
> land,$(CONFIG_VIRTIO),$(CONFIG_VIRTFS),$(CONFIG_PCI)) += 9pfs/

That didn't really work with your suggested change i get

rules.mak:190: *** unterminated call to function `call': missing `)'.
Stop

-aneesh
Andreas Färber March 5, 2014, 3:50 p.m. UTC | #4 
Am 03.03.2014 20:13, schrieb Paolo Bonzini:
> Il 03/03/2014 20:08, Aneesh Kumar K.V ha scritto:
>> From: "Aneesh Kumar K.V" <aneesh.kumar@linux.vnet.ibm.com>
>>
>> After commit ba1183da9a10b94611cad88c44a5c6df005f9b55 we are including
>> hw/Makefile.objs directly from Makefile.target. Hence we need to define
>> the config in Makefile.target too to include virtio-9p-device.o in
>> the build
>>
>> Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
>> ---
>>  Makefile.target | 4 ++++
>>  1 file changed, 4 insertions(+)
>>
>> diff --git a/Makefile.target b/Makefile.target
>> index ba1234063eae..da8daa82c39e 100644
>> --- a/Makefile.target
>> +++ b/Makefile.target
>> @@ -137,6 +137,10 @@ endif # CONFIG_SOFTMMU
>>  # Workaround for http://gcc.gnu.org/PR55489, see configure.
>>  %/translate.o: QEMU_CFLAGS += $(TRANSLATE_OPT_CFLAGS)
>>
>> +ifeq ($(CONFIG_VIRTIO)$(CONFIG_VIRTFS)$(CONFIG_PCI),yyy)
>> +CONFIG_REALLY_VIRTFS=y
>> +endif
>> +
>>  dummy := $(call unnest-vars,,obj-y)
>>
>>  # we are making another call to unnest-vars with different vars,
>> protect obj-y,
>>
> 
> Can you just replace $(CONFIG_REALLY_VIRTFS) with
> 
> $(call land, $(call land, $(CONFIG_VIRTIO),
>                           $(CONFIG_VIRTFS)),
>                           $(CONFIG_PCI))
> 
> in hw/Makefile.objs, and remove it from Makefile.objs?

Is your trouble with the "REALLY" in there? I've been working on a
virtio-9p qtest, which was able to reuse $(CONFIG_REALLY_VIRTFS) before;
now I need to copy the full ifeq() expression.

Regards,
Andreas
Paolo Bonzini March 5, 2014, 6:19 p.m. UTC | #5 
Il 05/03/2014 16:50, Andreas Färber ha scritto:
> Am 03.03.2014 20:13, schrieb Paolo Bonzini:
>> Il 03/03/2014 20:08, Aneesh Kumar K.V ha scritto:
>>> From: "Aneesh Kumar K.V" <aneesh.kumar@linux.vnet.ibm.com>
>>>
>>> After commit ba1183da9a10b94611cad88c44a5c6df005f9b55 we are including
>>> hw/Makefile.objs directly from Makefile.target. Hence we need to define
>>> the config in Makefile.target too to include virtio-9p-device.o in
>>> the build
>>>
>>> Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
>>> ---
>>>  Makefile.target | 4 ++++
>>>  1 file changed, 4 insertions(+)
>>>
>>> diff --git a/Makefile.target b/Makefile.target
>>> index ba1234063eae..da8daa82c39e 100644
>>> --- a/Makefile.target
>>> +++ b/Makefile.target
>>> @@ -137,6 +137,10 @@ endif # CONFIG_SOFTMMU
>>>  # Workaround for http://gcc.gnu.org/PR55489, see configure.
>>>  %/translate.o: QEMU_CFLAGS += $(TRANSLATE_OPT_CFLAGS)
>>>
>>> +ifeq ($(CONFIG_VIRTIO)$(CONFIG_VIRTFS)$(CONFIG_PCI),yyy)
>>> +CONFIG_REALLY_VIRTFS=y
>>> +endif
>>> +
>>>  dummy := $(call unnest-vars,,obj-y)
>>>
>>>  # we are making another call to unnest-vars with different vars,
>>> protect obj-y,
>>>
>>
>> Can you just replace $(CONFIG_REALLY_VIRTFS) with
>>
>> $(call land, $(call land, $(CONFIG_VIRTIO),
>>                           $(CONFIG_VIRTFS)),
>>                           $(CONFIG_PCI))
>>
>> in hw/Makefile.objs, and remove it from Makefile.objs?
>
> Is your trouble with the "REALLY" in there? I've been working on a
> virtio-9p qtest, which was able to reuse $(CONFIG_REALLY_VIRTFS) before;
> now I need to copy the full ifeq() expression.

No, the trouble is more with the code duplication that the patch 
introduces between Makefile.objs and Makefile.target.

Paolo
diff mbox

Patch

diff --git a/Makefile.target b/Makefile.target
index ba1234063eae..da8daa82c39e 100644
--- a/Makefile.target
+++ b/Makefile.target
@@ -137,6 +137,10 @@  endif # CONFIG_SOFTMMU
 # Workaround for http://gcc.gnu.org/PR55489, see configure.
 %/translate.o: QEMU_CFLAGS += $(TRANSLATE_OPT_CFLAGS)
 
+ifeq ($(CONFIG_VIRTIO)$(CONFIG_VIRTFS)$(CONFIG_PCI),yyy)
+CONFIG_REALLY_VIRTFS=y
+endif
+
 dummy := $(call unnest-vars,,obj-y)
 
 # we are making another call to unnest-vars with different vars, protect obj-y,