From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([2001:4830:134:3::10]:36932)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <ming.lei@canonical.com>) id 1X2Jd5-000357-85
	for qemu-devel@nongnu.org; Wed, 02 Jul 2014 08:27:21 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <ming.lei@canonical.com>) id 1X2Jcx-0006jI-Ht
	for qemu-devel@nongnu.org; Wed, 02 Jul 2014 08:27:15 -0400
Received: from youngberry.canonical.com ([91.189.89.112]:46474)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <ming.lei@canonical.com>) id 1X2Jcx-0006jD-CQ
	for qemu-devel@nongnu.org; Wed, 02 Jul 2014 08:27:07 -0400
Received: from mail-vc0-f174.google.com ([209.85.220.174])
	by youngberry.canonical.com with esmtpsa (TLS1.0:RSA_ARCFOUR_SHA1:16)
	(Exim 4.71) (envelope-from <ming.lei@canonical.com>)
	id 1X2Jcw-0003y6-Lg
	for qemu-devel@nongnu.org; Wed, 02 Jul 2014 12:27:06 +0000
Received: by mail-vc0-f174.google.com with SMTP id hy4so10175809vcb.5
	for <qemu-devel@nongnu.org>; Wed, 02 Jul 2014 05:27:05 -0700 (PDT)
MIME-Version: 1.0
In-Reply-To: <20140702095848.GA4567@redhat.com>
References: <1404144118-18316-1-git-send-email-ming.lei@canonical.com>
	<20140702095848.GA4567@redhat.com>
Date: Wed, 2 Jul 2014 20:27:05 +0800
Message-ID: <CACVXFVM0_uh7-yJV24-mqGNeZ3BO6urcRN_R_t_q+U+XaQqEjw@mail.gmail.com>
From: Ming Lei <ming.lei@canonical.com>
Content-Type: text/plain; charset=UTF-8
Subject: Re: [Qemu-devel] [PATCH v1] virtio: move common virtio properties
 to bus class device
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: "Michael S. Tsirkin" <mst@redhat.com>
Cc: Peter Maydell <peter.maydell@linaro.org>, qemu-devel <qemu-devel@nongnu.org>, Stefan Hajnoczi <stefanha@redhat.com>, Paolo Bonzini <pbonzini@redhat.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,