From: Paolo Bonzini <pbonzini@redhat.com>
To: Peter Maydell <peter.maydell@linaro.org>
Cc: QEMU Developers <qemu-devel@nongnu.org>, Greg Kurz <groug@kaod.org>
Subject: Re: [Qemu-devel] [PATCH] fsdev: fix compilation with VIRTIO but not VIRTIO_9P
Date: Mon, 2 Jul 2018 19:14:32 +0200 [thread overview]
Message-ID: <9872d42d-378d-123b-4b14-4698c8a68a84@redhat.com> (raw)
In-Reply-To: <CAFEAcA8=zvwfr=6pF+HuNkmD2HWwtSuLuepQwRR1+x8FyNNS=g@mail.gmail.com>
On 02/07/2018 18:56, Peter Maydell wrote:
> On 2 July 2018 at 17:31, Paolo Bonzini <pbonzini@redhat.com> wrote:
>> hw/9pfs/Makefile.objs uses CONFIG_VIRTIO_9P to guard the definition for
>> FileOperations structs, while fsdev/Makefile.objs uses CONFIG_VIRTIO
>> to guard the use. Mismatch causes linking to fail when CONFIG_VIRTIO
>> is set but CONFIG_VIRTIO_9P is not.
>>
>> Fix it and use if/else to clarify that the two lines are for opposite
>> conditions.
>>
>> Reported-by: Peter Maydell <peter.maydell@linaro.org>
>> Fixes: b5dfdb082fc350f3e68dfa61dc988d97cad28cfe
>> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
>> ---
>> fsdev/Makefile.objs | 7 +++++--
>> 1 file changed, 5 insertions(+), 2 deletions(-)
>
> Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
>
> I've also just noticed that hw/Makefile.objs guards the use
> of the hw/9pfs directory with
> devices-dirs-$(call land,$(CONFIG_VIRTFS),$(call
> lor,$(CONFIG_VIRTIO),$(CONFIG_XEN))) += 9pfs/
>
> so after b5dfdb082fc we're now somewhat redundantly guarding
> the object files with both this check and with the new one
> inside hw/9pfs/Makefile.objs. Maybe we should make the
> hw/Makefile.objs guard use CONFIG_VIRTIO_9P where it
> currently has CONFIG_VIRTIO and then drop the ifeq in
> hw/9pfs/Makefile.objs ?
Yes, that makes sense.
Paolo
next prev parent reply other threads:[~2018-07-02 17:14 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-07-02 16:31 [Qemu-devel] [PATCH] fsdev: fix compilation with VIRTIO but not VIRTIO_9P Paolo Bonzini
2018-07-02 16:56 ` Peter Maydell
2018-07-02 17:14 ` Paolo Bonzini [this message]
2018-07-03 8:00 ` Greg Kurz
2018-07-03 8:46 ` Peter Maydell
2018-07-03 9:45 ` Greg Kurz
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=9872d42d-378d-123b-4b14-4698c8a68a84@redhat.com \
--to=pbonzini@redhat.com \
--cc=groug@kaod.org \
--cc=peter.maydell@linaro.org \
--cc=qemu-devel@nongnu.org \
/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).