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

[Ming Lei <ming.lei@canonical.com>]

On Wed, Jul 2, 2014 at 5:58 PM, Michael S. Tsirkin <mst@redhat.com> 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 <cornelia.huck@de.ibm.com> #for s390 ccw
>> Suggested-by: Paolo Bonzini <pbonzini@redhat.com>
>> Signed-off-by: Ming Lei <ming.lei@canonical.com>
>
> Looks like this got merged meanwhile:
> commit caffdac363801cd2cf2bf01ad013a8c1e1e43800
> Author: Stefan Hajnoczi <stefanha@redhat.com>
> 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.

Yes, it is good to go.

BTW, looks the patch for mmio isn't applied yet

Thanks,