From: "Andreas Färber" <afaerber@suse.de>
To: "Aneesh Kumar K.V" <aneesh.kumar@linux.vnet.ibm.com>
Cc: Peter Maydell <peter.maydell@linaro.org>,
Paolo Bonzini <pbonzini@redhat.com>, Fam Zheng <famz@redhat.com>,
qemu-devel@nongnu.org, "Serge E. Hallyn" <serge@hallyn.com>
Subject: Re: [Qemu-devel] [PATCH] hw/9pfs: Include virtio-9p-device.o in build
Date: Wed, 05 Mar 2014 19:48:15 +0100 [thread overview]
Message-ID: <5317716F.8040606@suse.de> (raw)
In-Reply-To: <20140303233652.GA12334@mail.hallyn.com>
Am 04.03.2014 00:36, schrieb Serge E. Hallyn:
> Quoting Aneesh Kumar K.V (aneesh.kumar@linux.vnet.ibm.com):
>> commit 01041f5df94ff19988cbadd7bd3eefcc9d964e4e
>> Author: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
>> 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 <aneesh.kumar@linux.vnet.ibm.com>
>
> Thanks, Aneesh, this worked for me.
>
> Tested-by: Serge Hallyn <serge.hallyn@ubuntu.com>
Tested-by: Andreas Färber <afaerber@suse.de>
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
next prev parent reply other threads:[~2014-03-05 18:48 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-03-03 19:08 [Qemu-devel] [PATCH] hw/9pfs: Include virtio-9p-device.o in build Aneesh Kumar K.V
2014-03-03 19:13 ` Paolo Bonzini
2014-03-03 19:42 ` Aneesh Kumar K.V
2014-03-03 20:02 ` Aneesh Kumar K.V
2014-03-03 20:32 ` Aneesh Kumar K.V
2014-03-03 23:36 ` Serge E. Hallyn
2014-03-05 18:48 ` Andreas Färber [this message]
2014-03-06 5:31 ` Aneesh Kumar K.V
2014-03-03 23:45 ` Peter Maydell
2014-03-05 15:50 ` Andreas Färber
2014-03-05 18:19 ` Paolo Bonzini
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=5317716F.8040606@suse.de \
--to=afaerber@suse.de \
--cc=aneesh.kumar@linux.vnet.ibm.com \
--cc=famz@redhat.com \
--cc=pbonzini@redhat.com \
--cc=peter.maydell@linaro.org \
--cc=qemu-devel@nongnu.org \
--cc=serge@hallyn.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).