| Message ID | 1386594157-17535-1-git-send-email-pbonzini@redhat.com |
|---|---|
| State | New |
| Headers | show |
Paolo Bonzini <pbonzini@redhat.com> writes: > Anthony, > > The following changes since commit ac9524dc55dc32e492ac3e6fbc9785be7168f8a2: > > qemu-iotests: filter QEMU monitor \r\n (2013-12-06 16:53:51 +0100) > > are available in the git repository at: > > git://github.com/bonzini/qemu.git scsi-next What tree is this against? It looks like the block tree. It conflicts badly with current master. Regards, Anthony Liguori > > for you to fetch changes up to 2fe3798cd5fab65ee7c86758b1b7701d7fe3709f: > > help: add id suboption to -iscsi (2013-12-09 13:47:24 +0100) > > ---------------------------------------------------------------- > Paolo Bonzini (4): > scsi-bus: fix transfer length and direction for VERIFY command > scsi-disk: fix VERIFY emulation > scsi-disk: fix WRITE SAME with large non-zero payload > help: add id suboption to -iscsi > > Peter Lieven (1): > block/iscsi: introduce bdrv_co_{readv, writev, flush_to_disk} > > 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(-) > -- > 1.8.4.2
Il 11/12/2013 01:10, Anthony Liguori ha scritto: >> > >> > The following changes since commit ac9524dc55dc32e492ac3e6fbc9785be7168f8a2: >> > >> > qemu-iotests: filter QEMU monitor \r\n (2013-12-06 16:53:51 +0100) >> > >> > are available in the git repository at: >> > >> > git://github.com/bonzini/qemu.git scsi-next > What tree is this against? It looks like the block tree. > > It conflicts badly with current master. Since master was broken, it was against "some tree that built". I can rebase and resend, but I don't get any conflict against 6747f64 (Merge remote-tracking branch 'rth/tcg-temp-order' into staging, 2013-12-10). And there shouldn't be, since no one else should touch those files. Paolo
Anthony, The following changes since commit ac9524dc55dc32e492ac3e6fbc9785be7168f8a2: qemu-iotests: filter QEMU monitor \r\n (2013-12-06 16:53:51 +0100) are available in the git repository at: git://github.com/bonzini/qemu.git scsi-next for you to fetch changes up to 2fe3798cd5fab65ee7c86758b1b7701d7fe3709f: help: add id suboption to -iscsi (2013-12-09 13:47:24 +0100) ---------------------------------------------------------------- Paolo Bonzini (4): scsi-bus: fix transfer length and direction for VERIFY command scsi-disk: fix VERIFY emulation scsi-disk: fix WRITE SAME with large non-zero payload help: add id suboption to -iscsi Peter Lieven (1): block/iscsi: introduce bdrv_co_{readv, writev, flush_to_disk} 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(-)