On Tue, Feb 24, 2015 at 09:39:22PM +0100, Marc Marí wrote:
> El Thu, 19 Feb 2015 18:46:44 +0100
> Kevin Wolf <kw...@redhat.com> escribió:
> > Am 18.02.2015 um 18:07 hat Stefan Hajnoczi geschrieben:
> > > On Fri, Jan 23, 2015 at 05:38:48PM +0100, Marc Marí wrote:
> > > > Add virtio-mmio support to libqos and test case for virtio-blk.
> > > > 
> > > > Changes for version 3:
> > > >  - Fix leaks and minor bugs
> > > >  - Extract basic test case to a function
> > > > 
> > > > Changes for version 4:
> > > >  - Add format=raw to images, to avoid warnings
> > > >  - Solve bug with timeout in interrupt checking in virtio MMIO
> > > > due to a race condition
> > > > 
> > > > Marc Marí (5):
> > > >   libqos: Change use of pointers to uint64_t in virtio
> > > >   tests: Prepare virtio-blk-test for multi-arch implementation
> > > >   libqos: Remove PCI assumptions in constants of virtio driver
> > > >   libqos: Add malloc generic
> > > >   libqos: Add virtio MMIO support
> > > 
> > > CCed Kevin so this ARM virtio-blk (virtio-mmio) test can be merged
> > > through the block tree.
> > > 
> > > Reviewed-by: Stefan Hajnoczi <stefa...@redhat.com>
> > 
> > Thanks, applied to the block branch.
> > 
> > Kevin
> 
> I found that commit f6f363c1f4f962aee9f69c67ab2f3ff58c30f8c1, pushed a
> few days, ago breaks this patch. You might want to drop it from the
> block branch. I'll send a v5.

It's okay, I noticed that conflict and resolved it when rebasing block
branches:

https://github.com/stefanha/qemu/commit/fe319c1d5e98e4bc9d4b1bc9c761cc8feb52292e

Stefan

Attachment: pgpRZOwhlJzf3.pgp
Description: PGP signature

Reply via email to