[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [PULL 00/30] virtio conversion to realize and hotplug/u
From: |
Paolo Bonzini |
Subject: |
Re: [Qemu-devel] [PULL 00/30] virtio conversion to realize and hotplug/unplug fixes |
Date: |
Fri, 13 Dec 2013 16:50:42 +0100 |
User-agent: |
Mozilla/5.0 (X11; Linux x86_64; rv:17.0) Gecko/20130923 Thunderbird/17.0.9 |
Il 11/12/2013 08:45, Paolo Bonzini ha scritto:
>>> >> Anthony,
>>> >>
>>> >> the following changes since commit
>>> >> 7dc65c02fe3fb8f3146ce0b9ff5fec5945329f0e:
>>> >>
>>> >> Open 2.0 development tree (2013-11-27 14:02:45 -0800)
>> >
>> > This also conflicts badly.
> This doesn't conflict here either. What files are conflicting exactly?
FWIW, I tried again merging and it all went smoothly:
$ git pull git://github.com/bonzini/qemu.git virtio
Da git://github.com/bonzini/qemu
* branch virtio -> FETCH_HEAD
Auto-merging hw/net/virtio-net.c
Merge made by the 'recursive' strategy.
hw/9pfs/virtio-9p-device.c | 43 +++++++-------
hw/block/dataplane/virtio-blk.c | 30 +++++-----
hw/block/dataplane/virtio-blk.h | 5 +-
hw/block/virtio-blk.c | 47 ++++++++++------
hw/char/virtio-serial-bus.c | 33 +++++------
hw/net/virtio-net.c | 36 ++++++------
hw/s390x/virtio-ccw.c | 83 +++++++++++++++------------
hw/s390x/virtio-ccw.h | 1 -
hw/scsi/vhost-scsi.c | 45 +++++++--------
hw/scsi/virtio-scsi.c | 57 +++++++++----------
hw/virtio/virtio-balloon.c | 32 +++++------
hw/virtio/virtio-bus.c | 80 +++++++++++++++-----------
hw/virtio/virtio-mmio.c | 9 +--
hw/virtio/virtio-pci.c | 122 ++++++++++++++++++++++++----------------
hw/virtio/virtio-pci.h | 1 -
hw/virtio/virtio-rng.c | 43 +++++++-------
hw/virtio/virtio.c | 40 ++++++++-----
include/hw/virtio/virtio-bus.h | 22 +++++---
include/hw/virtio/virtio-rng.h | 2 +
include/hw/virtio/virtio-scsi.h | 4 +-
include/hw/virtio/virtio.h | 8 ++-
tests/qdev-monitor-test.c | 4 +-
22 files changed, 413 insertions(+), 334 deletions(-)
$ git pull git://github.com/bonzini/qemu.git scsi-next
Da git://github.com/bonzini/qemu
* branch scsi-next -> FETCH_HEAD
Auto-merging qemu-options.hx
Auto-merging hw/scsi/scsi-bus.c
Auto-merging configure
Merge made by the 'recursive' strategy.
block/iscsi.c | 401 ++++++++++++++--------------------------------------
configure | 6 +-
hw/scsi/scsi-bus.c | 14 +-
hw/scsi/scsi-disk.c | 29 ++--
qemu-options.hx | 2 +-
5 files changed, 143 insertions(+), 309 deletions(-)
So I'm not going to resend these series. In particular the beginning of
the virtio series needs to be backported to 1.7.1 (it fixes a crash), which
is why I based it on an earlier commit than usual.
The SCSI patches might conflict with Kevin's 512-on-4K changes so I might
have to resend that one anyway, but that's a different story and I'll get
there when it happens. :)
Please confirm that it works for you, or describe your breakage. I'm using
git 1.8.4.2 in case that matters.
Paolo
- [Qemu-devel] [PULL 23/30] virtio-blk: Convert to QOM realize, (continued)
- [Qemu-devel] [PULL 23/30] virtio-blk: Convert to QOM realize, Paolo Bonzini, 2013/12/09
- [Qemu-devel] [PULL 24/30] virtio-serial: Convert to QOM realize, Paolo Bonzini, 2013/12/09
- [Qemu-devel] [PULL 25/30] virtio-net: Convert to QOM realize, Paolo Bonzini, 2013/12/09
- [Qemu-devel] [PULL 26/30] virtio-balloon: Convert to QOM realize, Paolo Bonzini, 2013/12/09
- [Qemu-devel] [PULL 27/30] virtio-rng: Convert to QOM realize, Paolo Bonzini, 2013/12/09
- [Qemu-devel] [PULL 28/30] virtio-scsi: Convert to QOM realize, Paolo Bonzini, 2013/12/09
- [Qemu-devel] [PULL 29/30] virtio: Complete converting VirtioDevice to QOM realize, Paolo Bonzini, 2013/12/09
- [Qemu-devel] [PULL 30/30] virtio: Convert exit to unrealize, Paolo Bonzini, 2013/12/09
- Re: [Qemu-devel] [PULL 00/30] virtio conversion to realize and hotplug/unplug fixes, Anthony Liguori, 2013/12/10