On Thu, Feb 25, 2010 at 01:25:46PM -0600, Anthony Liguori wrote:
> On 02/25/2010 12:27 PM, Michael S. Tsirkin wrote:
> >vhost needs physical addresses for ring and other queue fields,
> >so add APIs for these.
> >
> >Signed-off-by: Michael S. Tsirkin<m...@redhat.com>
> >---
> > hw/virtio.c | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++
> > hw/virtio.h | 10 +++++++++-
> > 2 files changed, 59 insertions(+), 1 deletions(-)
> >
> >diff --git a/hw/virtio.c b/hw/virtio.c
> >index 1f5e7be..b017d7b 100644
> >--- a/hw/virtio.c
> >+++ b/hw/virtio.c
> >@@ -74,6 +74,11 @@ struct VirtQueue
> > uint16_t vector;
> > void (*handle_output)(VirtIODevice *vdev, VirtQueue *vq);
> > VirtIODevice *vdev;
> >+<<<<<<< HEAD
> >+=======
> >+ EventNotifier guest_notifier;
> >+ EventNotifier host_notifier;
> >+>>>>>>> 8afa4fd... virtio: add APIs for queue fields
>
> That's clearly not right :-)
>
Merge conflict resolution is left as exercise for the reader.
--
Gleb.
