From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([2001:4830:134:3::10]:49790)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <mst@redhat.com>) id 1X2Imi-0002jj-AJ
	for qemu-devel@nongnu.org; Wed, 02 Jul 2014 07:33:14 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <mst@redhat.com>) id 1X2Imc-0003zw-C5
	for qemu-devel@nongnu.org; Wed, 02 Jul 2014 07:33:08 -0400
Received: from mx1.redhat.com ([209.132.183.28]:36653)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <mst@redhat.com>) id 1X2Imc-0003z9-4L
	for qemu-devel@nongnu.org; Wed, 02 Jul 2014 07:33:02 -0400
Date: Wed, 2 Jul 2014 13:35:02 +0300
From: "Michael S. Tsirkin" <mst@redhat.com>
Message-ID: <20140702103502.GA5286@redhat.com>
References: <1404144118-18316-1-git-send-email-ming.lei@canonical.com>
	<20140702095848.GA4567@redhat.com>
	<CACVXFVPhcWAtObqL=_EQ7+5_y6CJ+5PtJD3xr1=fiFiVB_9-kQ@mail.gmail.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <CACVXFVPhcWAtObqL=_EQ7+5_y6CJ+5PtJD3xr1=fiFiVB_9-kQ@mail.gmail.com>
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: Ming Lei <ming.lei@canonical.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 02, 2014 at 07:27:45PM +0800, Ming Lei wrote:
> 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.
> 
> Could you share me your tree?
> 
> Thanks,
> --
> Ming Lei



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