Re: [Qemu-devel] [PATCH v1] virtio: move common virtio properties to bus class device

[Michael S. Tsirkin]

On Wed, Jul 02, 2014 at 07:27:45PM +0800, Ming Lei wrote:
> On Wed, Jul 2, 2014 at 5:58 PM, Michael S. Tsirkin <address@hidden> wrote:
> > On Tue, Jul 01, 2014 at 12:01:58AM +0800, Ming Lei wrote:
> >> The two common virtio features can be defined per bus, so move all
> >> into bus class device to make code more clean.
> >>
> >> As discussed with cornelia, s390-virtio-blk doesn't support
> >> the two features at all, so keep s390-virtio as it.
> >>
> >> Acked-by: Cornelia Huck <address@hidden> #for s390 ccw
> >> Suggested-by: Paolo Bonzini <address@hidden>
> >> Signed-off-by: Ming Lei <address@hidden>
> >
> > Looks like this got merged meanwhile:
> > commit caffdac363801cd2cf2bf01ad013a8c1e1e43800
> > Author: Stefan Hajnoczi <address@hidden>
> > Date:   Wed Jun 18 17:58:33 2014 +0800
> >
> >     virtio-blk: use aliases instead of duplicate qdev properties
> >
> > so there was a conflict again.
> >
> > I resolved it, but pls check out pci branch in my tree
> > and verify that it's all good to go.
> 
> Could you share me your tree?
> 
> Thanks,
> --
> Ming Lei



git://git.kernel.org/pub/scm/virt/kvm/mst/qemu.git pci