Re: [Qemu-devel] [PATCH] fsdev: fix compilation with VIRTIO but not VIRTIO_9P

[Greg Kurz]

On Tue, 3 Jul 2018 09:46:01 +0100
Peter Maydell <address@hidden> wrote:

> On 3 July 2018 at 09:00, Greg Kurz <address@hidden> wrote:
> > On Mon,  2 Jul 2018 18:31:25 +0200
> > Paolo Bonzini <address@hidden> 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 <address@hidden>
> >> Fixes: b5dfdb082fc350f3e68dfa61dc988d97cad28cfe
> >> Signed-off-by: Paolo Bonzini <address@hidden>
> >> ---  
> >
> > Acked-by: Greg Kurz <address@hidden>
> > Tested-by: Greg Kurz <address@hidden>
> >
> > Peter,
> >
> > I see this patch is needed for the latest RISC-V pull req.  
> 
> It isn't, because that pullreq only fails because of what
> looks to me like a rebase mismerge that made it change how
> the riscv default-configs enable virtio. The riscv pullreq
> should be fixed. This is just a cleanup, really.
> 

Ok, thanks for the clarification.

I've applied this to 9p-next.

> thanks
> -- PMM