Re: [Qemu-devel] [PULL 00/12] Block patches

2019-09-03 Thread Peter Maydell 
On Tue, 27 Aug 2019 at 21:16, Stefan Hajnoczi  wrote:
>
> The following changes since commit dac03af5d5482ec7ee9c23db467bb7230b33c0d9:
>
>   Merge remote-tracking branch 'remotes/rth/tags/pull-axp-20190825' into 
> staging (2019-08-27 10:00:51 +0100)
>
> are available in the Git repository at:
>
>   https://github.com/stefanha/qemu.git tags/block-pull-request
>
> for you to fetch changes up to 5396234b96a2ac743f48644529771498e036e698:
>
>   block/qcow2: implement .bdrv_co_pwritev(_compressed)_part (2019-08-27 
> 14:58:42 +0100)
>
> 
> Pull request


Applied, thanks.

Please update the changelog at https://wiki.qemu.org/ChangeLog/4.2
for any user-visible changes.

-- PMM

[Qemu-devel] [PULL 00/12] Block patches

2019-08-27 Thread Stefan Hajnoczi 
The following changes since commit dac03af5d5482ec7ee9c23db467bb7230b33c0d9:

  Merge remote-tracking branch 'remotes/rth/tags/pull-axp-20190825' into 
staging (2019-08-27 10:00:51 +0100)

are available in the Git repository at:

  https://github.com/stefanha/qemu.git tags/block-pull-request

for you to fetch changes up to 5396234b96a2ac743f48644529771498e036e698:

  block/qcow2: implement .bdrv_co_pwritev(_compressed)_part (2019-08-27 
14:58:42 +0100)


Pull request



Vladimir Sementsov-Ogievskiy (12):
  util/iov: introduce qemu_iovec_init_extended
  util/iov: improve qemu_iovec_is_zero
  block/io: refactor padding
  block: define .*_part io handlers in BlockDriver
  block/io: bdrv_co_do_copy_on_readv: use and support qiov_offset
  block/io: bdrv_co_do_copy_on_readv: lazy allocation
  block/io: bdrv_aligned_preadv: use and support qiov_offset
  block/io: bdrv_aligned_pwritev: use and support qiov_offset
  block/io: introduce bdrv_co_p{read, write}v_part
  block/qcow2: refactor qcow2_co_preadv to use buffer-based io
  block/qcow2: implement .bdrv_co_preadv_part
  block/qcow2: implement .bdrv_co_pwritev(_compressed)_part

 block/qcow2.h |   1 +
 include/block/block_int.h |  21 ++
 include/qemu/iov.h|  10 +-
 block/backup.c|   2 +-
 block/io.c| 541 +++---
 block/qcow2-cluster.c |  14 +-
 block/qcow2.c | 131 +
 qemu-img.c|   4 +-
 util/iov.c| 153 +--
 9 files changed, 568 insertions(+), 309 deletions(-)

-- 
2.21.0

[Qemu-devel] [PULL 00/12] Block patches

2017-05-26 Thread Jeff Cody 
The following changes since commit 9964e96dccf7f7c936ee854a795415d19b60:

  Merge remote-tracking branch 'jasowang/tags/net-pull-request' into staging 
(2017-05-23 15:01:31 +0100)

are available in the git repository at:

  git://github.com/codyprime/qemu-kvm-jtc.git tags/block-pull-request

for you to fetch changes up to 223a23c198787328ae75bc65d84edf5fde33c0b6:

  block/gluster: glfs_lseek() workaround (2017-05-24 16:44:46 -0400)


Block patches


Jeff Cody (1):
  block/gluster: glfs_lseek() workaround

Paolo Bonzini (11):
  blockjob: remove unnecessary check
  blockjob: remove iostatus_reset callback
  blockjob: introduce block_job_early_fail
  blockjob: introduce block_job_pause/resume_all
  blockjob: separate monitor and blockjob APIs
  blockjob: move iostatus reset inside block_job_user_resume
  blockjob: introduce block_job_cancel_async, check iostatus invariants
  blockjob: group BlockJob transaction functions together
  blockjob: strengthen a bit test-blockjob-txn
  blockjob: reorganize block_job_completed_txn_abort
  blockjob: use deferred_to_main_loop to indicate the coroutine has
ended

 block/backup.c   |   2 +-
 block/commit.c   |   2 +-
 block/gluster.c  |  18 +-
 block/io.c   |  19 +-
 block/mirror.c   |   2 +-
 blockdev.c   |   1 -
 blockjob.c   | 750 ---
 include/block/blockjob.h |  16 -
 include/block/blockjob_int.h |  27 +-
 tests/test-blockjob-txn.c|   7 +-
 tests/test-blockjob.c|  10 +-
 11 files changed, 463 insertions(+), 391 deletions(-)

-- 
2.9.3

Re: [Qemu-devel] [PULL 00/12] Block patches

2017-04-21 Thread Peter Maydell 
On 21 April 2017 at 14:46, Jeff Cody  wrote:
> The following changes since commit bfec359afba088aaacc7d316f43302f28c6e642a:
>
>   Merge remote-tracking branch 'remotes/armbru/tags/pull-qdev-2017-04-21' 
> into staging (2017-04-21 11:42:03 +0100)
>
> are available in the git repository at:
>
>   git://github.com/codyprime/qemu-kvm-jtc.git tags/block-pull-request
>
> for you to fetch changes up to 1507631e438930bc07f776f303af127a9cdb4d41:
>
>   qemu-iotests: _cleanup_qemu must be called on exit (2017-04-21 08:32:44 
> -0400)
>
> 
>
> Block patches for 2.10
>

Hi, I'm afraid this runs into format string compile issues:

In file included from block/trace.c:4:
/Users/pm215/src/qemu-for-merges/build/all/block/trace.h:1465:42:
error: format specifies type 'unsigned long' but the argument has type
'uint64_t' (aka 'unsigned long long') [-Werror,-Wformat]
  , guid, iodir, size, off, acb, ret, err);
 ^~~~
/Users/pm215/src/qemu-for-merges/include/qemu/log.h:94:30: note:
expanded from macro 'qemu_log_mask'
qemu_log(FMT, ## __VA_ARGS__);  \
 ^
In file included from block/trace.c:4:
/Users/pm215/src/qemu-for-merges/build/all/block/trace.h:1465:48:
error: format specifies type 'unsigned long' but the argument has type
'uint64_t' (aka 'unsigned long long') [-Werror,-Wformat]
  , guid, iodir, size, off, acb, ret, err);
   ^~~
/Users/pm215/src/qemu-for-merges/include/qemu/log.h:94:30: note:
expanded from macro 'qemu_log_mask'
qemu_log(FMT, ## __VA_ARGS__);  \
 ^
In file included from block/trace.c:4:
/Users/pm215/src/qemu-for-merges/build/all/block/trace.h:1493:41:
error: format specifies type 'unsigned long' but the argument has type
'uint64_t' (aka 'unsigned long long') [-Werror,-Wformat]
  , vdisk_guid, vdisk_size);
^~
/Users/pm215/src/qemu-for-merges/include/qemu/log.h:94:30: note:
expanded from macro 'qemu_log_mask'
qemu_log(FMT, ## __VA_ARGS__);  \
 ^
In file included from block/trace.c:4:
/Users/pm215/src/qemu-for-merges/build/all/block/trace.h:1507:34:
error: format specifies type 'long' but the argument has type
'uint64_t' (aka 'unsigned long long') [-Werror,-Wformat]
  , acb, ret);
 ^~~
/Users/pm215/src/qemu-for-merges/include/qemu/log.h:94:30: note:
expanded from macro 'qemu_log_mask'
qemu_log(FMT, ## __VA_ARGS__);  \
 ^
4 errors generated.


Those are the OSX errors, but the compile also fails for 32-bit
hosts (including w32).

thanks
-- PMM

[Qemu-devel] [PULL 00/12] Block patches

2017-04-21 Thread Jeff Cody 
The following changes since commit bfec359afba088aaacc7d316f43302f28c6e642a:

  Merge remote-tracking branch 'remotes/armbru/tags/pull-qdev-2017-04-21' into 
staging (2017-04-21 11:42:03 +0100)

are available in the git repository at:

  git://github.com/codyprime/qemu-kvm-jtc.git tags/block-pull-request

for you to fetch changes up to 1507631e438930bc07f776f303af127a9cdb4d41:

  qemu-iotests: _cleanup_qemu must be called on exit (2017-04-21 08:32:44 -0400)



Block patches for 2.10



Ashish Mittal (2):
  block/vxhs.c: Add support for a new block device type called "vxhs"
  block/vxhs.c: Add qemu-iotests for new block device type "vxhs"

Jeff Cody (10):
  qemu-iotests: exclude vxhs from image creation via protocol
  block: add bdrv_set_read_only() helper function
  block: do not set BDS read_only if copy_on_read enabled
  block: honor BDRV_O_ALLOW_RDWR when clearing bs->read_only
  block: code movement
  block: introduce bdrv_can_set_read_only()
  block: use bdrv_can_set_read_only() during reopen
  block/rbd - update variable names to more apt names
  block/rbd: Add support for reopen()
  qemu-iotests: _cleanup_qemu must be called on exit

 block.c  |  56 +++-
 block/Makefile.objs  |   2 +
 block/bochs.c|   5 +-
 block/cloop.c|   5 +-
 block/dmg.c  |   6 +-
 block/rbd.c  |  65 +++--
 block/trace-events   |  17 ++
 block/vvfat.c|  19 +-
 block/vxhs.c | 575 +++
 configure|  39 +++
 include/block/block.h|   2 +
 qapi/block-core.json |  23 +-
 tests/qemu-iotests/017   |   1 +
 tests/qemu-iotests/020   |   1 +
 tests/qemu-iotests/028   |   1 +
 tests/qemu-iotests/029   |   1 +
 tests/qemu-iotests/073   |   1 +
 tests/qemu-iotests/094   |  11 +-
 tests/qemu-iotests/102   |   5 +-
 tests/qemu-iotests/109   |   1 +
 tests/qemu-iotests/114   |   1 +
 tests/qemu-iotests/117   |   1 +
 tests/qemu-iotests/130   |   2 +
 tests/qemu-iotests/134   |   1 +
 tests/qemu-iotests/140   |   1 +
 tests/qemu-iotests/141   |   1 +
 tests/qemu-iotests/143   |   1 +
 tests/qemu-iotests/156   |   2 +
 tests/qemu-iotests/158   |   1 +
 tests/qemu-iotests/common|   6 +
 tests/qemu-iotests/common.config |  13 +
 tests/qemu-iotests/common.filter |   1 +
 tests/qemu-iotests/common.rc |  19 ++
 33 files changed, 844 insertions(+), 42 deletions(-)
 create mode 100644 block/vxhs.c

-- 
2.9.3

Re: [Qemu-devel] [PULL 00/12] Block patches

2016-06-07 Thread Peter Maydell 
On 7 June 2016 at 15:26, Stefan Hajnoczi  wrote:
> The following changes since commit 76462405809d29bab65a3699686998ba124ab942:
>
>   Merge remote-tracking branch 
> 'remotes/pmaydell/tags/pull-target-arm-20160606-1' into staging (2016-06-06 
> 17:02:42 +0100)
>
> are available in the git repository at:
>
>   git://github.com/stefanha/qemu.git tags/block-pull-request
>
> for you to fetch changes up to 8860eabdee32f78d9a34273a340b8f74476bc9a0:
>
>   throttle: refuse iops-size without iops-total/read/write (2016-06-07 
> 14:40:51 +0100)
>
> 
>
> 

Applied, thanks.

-- PMM

[Qemu-devel] [PULL 00/12] Block patches

2016-06-07 Thread Stefan Hajnoczi 
The following changes since commit 76462405809d29bab65a3699686998ba124ab942:

  Merge remote-tracking branch 
'remotes/pmaydell/tags/pull-target-arm-20160606-1' into staging (2016-06-06 
17:02:42 +0100)

are available in the git repository at:

  git://github.com/stefanha/qemu.git tags/block-pull-request

for you to fetch changes up to 8860eabdee32f78d9a34273a340b8f74476bc9a0:

  throttle: refuse iops-size without iops-total/read/write (2016-06-07 14:40:51 
+0100)





Changlong Xie (1):
  iostatus: fix comments for block_job_iostatus_reset

Eric Blake (1):
  block: Move BlockRequest type to io.c

Fam Zheng (5):
  blockdev-backup: Use bdrv_lookup_bs on target
  blockdev-backup: Don't move target AioContext if it's attached
  virtio-blk: Remove op blocker for dataplane
  virtio-scsi: Remove op blocker for dataplane
  block: Drop bdrv_ioctl_bh_cb

Kevin Wolf (1):
  block/io: Remove unused bdrv_aio_write_zeroes()

Peter Lieven (1):
  block/io: optimize bdrv_co_pwritev for small requests

Stefan Hajnoczi (3):
  tests: avoid coroutine pool test crash
  virtio: drop duplicate virtio_queue_get_id() function
  throttle: refuse iops-size without iops-total/read/write

 block/io.c  | 60 +++---
 blockdev.c  | 23 ---
 hw/block/dataplane/virtio-blk.c | 63 
 hw/scsi/virtio-scsi.c   | 64 +
 hw/virtio/virtio.c  |  7 -
 include/block/block.h   | 24 
 include/block/blockjob.h|  2 +-
 include/hw/virtio/virtio-scsi.h | 11 ---
 include/hw/virtio/virtio.h  |  1 -
 tests/qemu-iotests/077  | 12 +---
 tests/qemu-iotests/077.out  | 26 -
 tests/test-coroutine.c  | 10 ++-
 tests/test-throttle.c   | 10 +++
 trace-events|  1 -
 util/throttle.c |  8 ++
 15 files changed, 74 insertions(+), 248 deletions(-)

-- 
2.5.5

Re: [Qemu-devel] [PULL 00/12] Block patches

2016-03-01 Thread Peter Maydell 
On 29 February 2016 at 20:08, Jeff Cody  wrote:
> The following changes since commit 071608b519adf62bc29c914343a21c5407ab1ac9:
>
>   Merge remote-tracking branch 'remotes/kraxel/tags/pull-usb-20160229-1' into 
> staging (2016-02-29 12:24:26 +)
>
> are available in the git repository at:
>
>
>   g...@github.com:codyprime/qemu-kvm-jtc.git tags/block-pull-request
>
> for you to fetch changes up to cc199b16cf4cb9279aca73f5f5dce2cc337b9079:
>
>   iotests/124: Add cluster_size mismatch test (2016-02-29 14:55:14 -0500)
>
> 
> Block patches
> 
>

Applied, thanks.

-- PMM

[Qemu-devel] [PULL 00/12] Block patches

2016-02-29 Thread Jeff Cody 
The following changes since commit 071608b519adf62bc29c914343a21c5407ab1ac9:

  Merge remote-tracking branch 'remotes/kraxel/tags/pull-usb-20160229-1' into 
staging (2016-02-29 12:24:26 +)

are available in the git repository at:


  g...@github.com:codyprime/qemu-kvm-jtc.git tags/block-pull-request

for you to fetch changes up to cc199b16cf4cb9279aca73f5f5dce2cc337b9079:

  iotests/124: Add cluster_size mismatch test (2016-02-29 14:55:14 -0500)


Block patches


Daniel P. Berrange (3):
  rbd: add support for getting password from QCryptoSecret object
  curl: add support for HTTP authentication parameters
  iscsi: add support for getting CHAP password via QCryptoSecret API

Fam Zheng (2):
  mirror: Rewrite mirror_iteration
  mirror: Add mirror_wait_for_io

John Snow (3):
  block/backup: make backup cluster size configurable
  block/backup: avoid copying less than full target clusters
  iotests/124: Add cluster_size mismatch test

Max Reitz (2):
  vhdx: DIV_ROUND_UP() in vhdx_calc_bat_entries()
  vhdx: Simplify vhdx_set_shift_bits()

Peter Lieven (1):
  block/nfs: add support for setting debug level

Vasiliy Tolstov (1):
  sheepdog: allow to delete snapshot

 block/backup.c |  87 +++
 block/curl.c   |  66 +
 block/iscsi.c  |  24 ++-
 block/mirror.c | 353 +++--
 block/nfs.c|  12 ++
 block/rbd.c|  47 ++
 block/sheepdog.c   | 125 +++-
 block/vhdx.c   |  18 +--
 tests/qemu-iotests/109.out |  80 +-
 tests/qemu-iotests/124 |  58 +++-
 tests/qemu-iotests/124.out |   4 +-
 trace-events   |   1 -
 12 files changed, 641 insertions(+), 234 deletions(-)

-- 
1.9.3

Re: [Qemu-devel] [PULL 00/12] Block patches

2015-10-30 Thread Peter Maydell 
On 30 October 2015 at 17:37, Peter Maydell  wrote:
> On 30 October 2015 at 14:19, Markus Armbruster  wrote:
>> Peter Maydell  writes:
>>> I get an error on 64-bit ARM running the ivshmem tests:
>>>
>>> TEST: tests/ivshmem-test... (pid=22948)
>>>   /i386/ivshmem/single:OK
>>>   /i386/ivshmem/pair:  OK
>>>   /i386/ivshmem/server:**
>>> ERROR:/home/petmay01/qemu/tests/ivshmem-test.c:345:test_ivshmem_server:
>>> assertion failed (ret != 0): (0 != 0)
>>> FAIL
>>> GTester: last random seed: R02S51e68a84790014e86af5b8b7264d3e39
>>> (pid=23709)
>>>   /i386/ivshmem/hotplug:   OK
>>>   /i386/ivshmem/memdev:OK
>>> FAIL: tests/ivshmem-test
>>>
>>> Nothing obviously related in this patchset that would cause that,
>>> though...
>>
>> I've seen this, too, but throwing away my build tree made it go away, so
>> I blamed "make choking on stale build tree" syndrome.  Perhaps it's an
>> intermittent ivshmem bug instead.
>
> I didn't do a make clean before successfully applying other pulls,
> so I think my money is on "intermittent ivshmem issue". I'll have
> another go with this one once I've finished the rest of the queue...

Second try did indeed work fine, so I've applied it.

thanks
-- PMM

Re: [Qemu-devel] [PULL 00/12] Block patches

2015-10-30 Thread Peter Maydell 
On 30 October 2015 at 14:19, Markus Armbruster  wrote:
> Peter Maydell  writes:
>> I get an error on 64-bit ARM running the ivshmem tests:
>>
>> TEST: tests/ivshmem-test... (pid=22948)
>>   /i386/ivshmem/single:OK
>>   /i386/ivshmem/pair:  OK
>>   /i386/ivshmem/server:**
>> ERROR:/home/petmay01/qemu/tests/ivshmem-test.c:345:test_ivshmem_server:
>> assertion failed (ret != 0): (0 != 0)
>> FAIL
>> GTester: last random seed: R02S51e68a84790014e86af5b8b7264d3e39
>> (pid=23709)
>>   /i386/ivshmem/hotplug:   OK
>>   /i386/ivshmem/memdev:OK
>> FAIL: tests/ivshmem-test
>>
>> Nothing obviously related in this patchset that would cause that,
>> though...
>
> I've seen this, too, but throwing away my build tree made it go away, so
> I blamed "make choking on stale build tree" syndrome.  Perhaps it's an
> intermittent ivshmem bug instead.

I didn't do a make clean before successfully applying other pulls,
so I think my money is on "intermittent ivshmem issue". I'll have
another go with this one once I've finished the rest of the queue...

thanks
-- PMM

Re: [Qemu-devel] [PULL 00/12] Block patches

2015-10-30 Thread Markus Armbruster 
Peter Maydell  writes:

> On 29 October 2015 at 18:09, Stefan Hajnoczi  wrote:
>> The following changes since commit 7bc8e0c967a4ef77657174d28af775691e18b4ce:
>>
>>   Merge remote-tracking branch 'remotes/mst/tags/for_upstream' into
>> staging (2015-10-29 09:49:52 +)
>>
>> are available in the git repository at:
>>
>>   git://github.com/stefanha/qemu.git tags/block-pull-request
>>
>> for you to fetch changes up to 37a639a7fbc5c6b065c80e7e2de78d22af735496:
>>
>>   block: Consider all child nodes in bdrv_requests_pending()
>> (2015-10-29 17:59:27 +)
>>
>> 
>>
>> 
>
> I get an error on 64-bit ARM running the ivshmem tests:
>
> TEST: tests/ivshmem-test... (pid=22948)
>   /i386/ivshmem/single:OK
>   /i386/ivshmem/pair:  OK
>   /i386/ivshmem/server:**
> ERROR:/home/petmay01/qemu/tests/ivshmem-test.c:345:test_ivshmem_server:
> assertion failed (ret != 0): (0 != 0)
> FAIL
> GTester: last random seed: R02S51e68a84790014e86af5b8b7264d3e39
> (pid=23709)
>   /i386/ivshmem/hotplug:   OK
>   /i386/ivshmem/memdev:OK
> FAIL: tests/ivshmem-test
>
> Nothing obviously related in this patchset that would cause that,
> though...

I've seen this, too, but throwing away my build tree made it go away, so
I blamed "make choking on stale build tree" syndrome.  Perhaps it's an
intermittent ivshmem bug instead.

Re: [Qemu-devel] [PULL 00/12] Block patches

2015-10-30 Thread Peter Maydell 
On 29 October 2015 at 18:09, Stefan Hajnoczi  wrote:
> The following changes since commit 7bc8e0c967a4ef77657174d28af775691e18b4ce:
>
>   Merge remote-tracking branch 'remotes/mst/tags/for_upstream' into staging 
> (2015-10-29 09:49:52 +)
>
> are available in the git repository at:
>
>   git://github.com/stefanha/qemu.git tags/block-pull-request
>
> for you to fetch changes up to 37a639a7fbc5c6b065c80e7e2de78d22af735496:
>
>   block: Consider all child nodes in bdrv_requests_pending() (2015-10-29 
> 17:59:27 +)
>
> 
>
> 

I get an error on 64-bit ARM running the ivshmem tests:

TEST: tests/ivshmem-test... (pid=22948)
  /i386/ivshmem/single:OK
  /i386/ivshmem/pair:  OK
  /i386/ivshmem/server:**
ERROR:/home/petmay01/qemu/tests/ivshmem-test.c:345:test_ivshmem_server:
assertion failed (ret != 0): (0 != 0)
FAIL
GTester: last random seed: R02S51e68a84790014e86af5b8b7264d3e39
(pid=23709)
  /i386/ivshmem/hotplug:   OK
  /i386/ivshmem/memdev:OK
FAIL: tests/ivshmem-test

Nothing obviously related in this patchset that would cause that,
though...

thanks
-- PMM

[Qemu-devel] [PULL 00/12] Block patches

2015-10-29 Thread Stefan Hajnoczi 
The following changes since commit 7bc8e0c967a4ef77657174d28af775691e18b4ce:

  Merge remote-tracking branch 'remotes/mst/tags/for_upstream' into staging 
(2015-10-29 09:49:52 +)

are available in the git repository at:

  git://github.com/stefanha/qemu.git tags/block-pull-request

for you to fetch changes up to 37a639a7fbc5c6b065c80e7e2de78d22af735496:

  block: Consider all child nodes in bdrv_requests_pending() (2015-10-29 
17:59:27 +)





Cornelia Huck (3):
  s390x: include HW_COMPAT_* props
  ppc/spapr: add 2.4 compat props
  virtio-blk: switch off scsi-passthrough by default

Dr. David Alan Gilbert (1):
  gdb command: qemu handlers

Kevin Wolf (1):
  block: Consider all child nodes in bdrv_requests_pending()

Paolo Bonzini (3):
  qemu-gdb: allow using glibc_pointer_guard() on core dumps
  qemu-gdb: extract parts of "qemu coroutine" implementation
  qemu-gdb: add $qemu_coroutine_sp and $qemu_coroutine_pc

Pavel Butsykin (1):
  virtio: sync the dataplane vring state to the virtqueue before
virtio_save

Sai Pavan Boddu (3):
  sd.h: Move sd.h to include/hw/sd/
  sdhci: Split sdhci.h for public and internal device usage
  target-arm: xlnx-zynqmp: Add sdhci support.

 block/io.c   |  13 +-
 hw/arm/xlnx-zynqmp.c |  28 
 hw/block/virtio-blk.c|   7 +-
 hw/ppc/spapr.c   |   9 ++
 hw/s390x/s390-virtio-ccw.c   |   2 +
 hw/scsi/virtio-scsi.c|   5 +
 hw/sd/milkymist-memcard.c|   2 +-
 hw/sd/omap_mmc.c |   2 +-
 hw/sd/pl181.c|   2 +-
 hw/sd/pxa2xx_mmci.c  |   2 +-
 hw/sd/sd.c   |   2 +-
 hw/sd/sdhci-internal.h   | 232 +
 hw/sd/sdhci.c|   3 +-
 hw/sd/sdhci.h| 297 ---
 hw/sd/ssi-sd.c   |   2 +-
 include/hw/arm/xlnx-zynqmp.h |   3 +
 include/hw/compat.h  |   6 +-
 include/hw/sd.h  |  80 
 include/hw/sd/sd.h   |  80 
 include/hw/sd/sdhci.h|  94 ++
 scripts/qemu-gdb.py  |   6 +-
 scripts/qemugdb/aio.py   |  58 +
 scripts/qemugdb/coroutine.py |  90 -
 23 files changed, 601 insertions(+), 424 deletions(-)
 create mode 100644 hw/sd/sdhci-internal.h
 delete mode 100644 hw/sd/sdhci.h
 delete mode 100644 include/hw/sd.h
 create mode 100644 include/hw/sd/sd.h
 create mode 100644 include/hw/sd/sdhci.h
 create mode 100644 scripts/qemugdb/aio.py

-- 
2.4.3

Re: [Qemu-devel] [PULL 00/12] Block patches

2015-01-26 Thread Peter Maydell 
On 23 January 2015 at 18:20, Kevin Wolf  wrote:
> The following changes since commit c6441452b50c44fdbb362b239ce623f77cf3cd51:
>
>   Merge remote-tracking branch 'remotes/kraxel/tags/pull-audio-20150122-1' 
> into staging (2015-01-22 18:57:36 +)
>
> are available in the git repository at:
>
>
>   git://repo.or.cz/qemu/kevin.git tags/for-upstream
>
> for you to fetch changes up to bc63781ca350cad4c9eb142ce8f55bfaded4276e:
>
>   Merge remote-tracking branch 'mreitz/block' into queue-block (2015-01-23 
> 18:51:47 +0100)
>
> 
>
> Block patches for 2.3
>
> 

Applied, thanks.

-- PMM

[Qemu-devel] [PULL 00/12] Block patches

2015-01-23 Thread Kevin Wolf 
The following changes since commit c6441452b50c44fdbb362b239ce623f77cf3cd51:

  Merge remote-tracking branch 'remotes/kraxel/tags/pull-audio-20150122-1' into 
staging (2015-01-22 18:57:36 +)

are available in the git repository at:


  git://repo.or.cz/qemu/kevin.git tags/for-upstream

for you to fetch changes up to bc63781ca350cad4c9eb142ce8f55bfaded4276e:

  Merge remote-tracking branch 'mreitz/block' into queue-block (2015-01-23 
18:51:47 +0100)



Block patches for 2.3


Fam Zheng (2):
  virtio-blk: Pass req to virtio_blk_handle_scsi_req
  virtio-blk: Use blk_aio_ioctl

Jeff Cody (7):
  block: vmdk - make ret variable usage clear
  block: vmdk - move string allocations from stack to the heap
  block: qapi - move string allocation from stack to the heap
  block: remove unused variable in bdrv_commit
  block: mirror - change string allocation to 2-bytes
  block: update string sizes for filename,backing_file,exact_filename
  block: vhdx - force FileOffsetMB field to '0' for certain block states

Kevin Wolf (1):
  Merge remote-tracking branch 'mreitz/block' into queue-block

Max Reitz (3):
  qcow2: Add two more unalignment checks
  iotests: Add tests for more corruption cases
  iotests: Lower 064's memory usage

 block.c|   3 -
 block/mirror.c |   3 +-
 block/qapi.c   |   7 ++-
 block/qcow.c   |   2 +-
 block/qcow2-cluster.c  |  21 +++
 block/qcow2.c  |   3 +-
 block/vhdx.c   |  13 +++-
 block/vmdk.c   |  51 +---
 block/vvfat.c  |   4 +-
 hw/block/virtio-blk.c  | 134 ++---
 include/block/block_int.h  |   8 +--
 include/hw/virtio/virtio-blk.h |   3 -
 qemu-img.c |   4 +-
 tests/qemu-iotests/060 |  15 +
 tests/qemu-iotests/060.out |  13 
 tests/qemu-iotests/064 |  19 +-
 tests/qemu-iotests/064.out |  34 +--
 17 files changed, 239 insertions(+), 98 deletions(-)

Re: [Qemu-devel] [PULL 00/12] Block patches

2012-08-07 Thread Anthony Liguori 
Kevin Wolf  writes:

> The following changes since commit 26b9b5fe17cc1b6be2e8bf8b9d16094f420bb8ad:
>
>   virtio: fix vhost handling (2012-08-06 14:01:44 -0500)
>
> are available in the git repository at:
>   http://repo.or.cz/r/qemu/kevin.git for-anthony

Pulled. Thanks.

Regards,

Anthony Liguori

>
> Dong Xu Wang (1):
>   qemu-img: use QemuOpts instead of QEMUOptionParameter in resize function
>
> Kevin Wolf (1):
>   qemu-iotests: Be more flexible with image creation options
>
> Markus Armbruster (1):
>   ide scsi: Mess with geometry only for hard disk devices
>
> Paolo Bonzini (1):
>   qapi: generalize documentation of streaming commands
>
> Stefan Hajnoczi (8):
>   qemu-iotests: add qed.py image manipulation utility
>   docs: add dirty bit to qcow2 specification
>   qcow2: introduce dirty bit
>   docs: add lazy refcounts bit to qcow2 specification
>   qemu-iotests: ignore qemu-img create lazy_refcounts output
>   qcow2: implement lazy refcounts
>   qemu-io: add "abort" command to simulate program crash
>   qemu-iotests: add 039 qcow2 lazy refcounts test
>
>  block/qcow2-cluster.c|5 +-
>  block/qcow2.c|  123 +--
>  block/qcow2.h|   21 
>  block_int.h  |   26 +++--
>  docs/specs/qcow2.txt |   14 ++-
>  hmp-commands.hx  |2 +-
>  hw/ide/qdev.c|3 +-
>  hw/scsi-disk.c   |3 +-
>  qapi-schema.json |   17 ++--
>  qemu-img.c   |   28 +++--
>  qemu-io.c|   12 ++
>  tests/qemu-iotests/031.out   |   20 ++--
>  tests/qemu-iotests/036.out   |4 +-
>  tests/qemu-iotests/039   |  136 
>  tests/qemu-iotests/039.out   |   53 ++
>  tests/qemu-iotests/common.rc |7 +-
>  tests/qemu-iotests/group |1 +
>  tests/qemu-iotests/qed.py|  235 
> ++
>  18 files changed, 650 insertions(+), 60 deletions(-)
>  create mode 100755 tests/qemu-iotests/039
>  create mode 100644 tests/qemu-iotests/039.out
>  create mode 100755 tests/qemu-iotests/qed.py

Re: [Qemu-devel] [PULL 00/12] Block patches

2012-08-07 Thread Paolo Bonzini 
Il 06/08/2012 22:44, Kevin Wolf ha scritto:
> The following changes since commit 26b9b5fe17cc1b6be2e8bf8b9d16094f420bb8ad:
> 
>   virtio: fix vhost handling (2012-08-06 14:01:44 -0500)

I see the virtio caching patches are not included, should I resubmit
them together with the change of the default from writethrough to writeback?

Paolo

> are available in the git repository at:
>   http://repo.or.cz/r/qemu/kevin.git for-anthony
> 
> Dong Xu Wang (1):
>   qemu-img: use QemuOpts instead of QEMUOptionParameter in resize function
> 
> Kevin Wolf (1):
>   qemu-iotests: Be more flexible with image creation options
> 
> Markus Armbruster (1):
>   ide scsi: Mess with geometry only for hard disk devices
> 
> Paolo Bonzini (1):
>   qapi: generalize documentation of streaming commands
> 
> Stefan Hajnoczi (8):
>   qemu-iotests: add qed.py image manipulation utility
>   docs: add dirty bit to qcow2 specification
>   qcow2: introduce dirty bit
>   docs: add lazy refcounts bit to qcow2 specification
>   qemu-iotests: ignore qemu-img create lazy_refcounts output
>   qcow2: implement lazy refcounts
>   qemu-io: add "abort" command to simulate program crash
>   qemu-iotests: add 039 qcow2 lazy refcounts test
> 
>  block/qcow2-cluster.c|5 +-
>  block/qcow2.c|  123 +--
>  block/qcow2.h|   21 
>  block_int.h  |   26 +++--
>  docs/specs/qcow2.txt |   14 ++-
>  hmp-commands.hx  |2 +-
>  hw/ide/qdev.c|3 +-
>  hw/scsi-disk.c   |3 +-
>  qapi-schema.json |   17 ++--
>  qemu-img.c   |   28 +++--
>  qemu-io.c|   12 ++
>  tests/qemu-iotests/031.out   |   20 ++--
>  tests/qemu-iotests/036.out   |4 +-
>  tests/qemu-iotests/039   |  136 
>  tests/qemu-iotests/039.out   |   53 ++
>  tests/qemu-iotests/common.rc |7 +-
>  tests/qemu-iotests/group |1 +
>  tests/qemu-iotests/qed.py|  235 
> ++
>  18 files changed, 650 insertions(+), 60 deletions(-)
>  create mode 100755 tests/qemu-iotests/039
>  create mode 100644 tests/qemu-iotests/039.out
>  create mode 100755 tests/qemu-iotests/qed.py
> 
>

[Qemu-devel] [PULL 00/12] Block patches

2012-08-06 Thread Kevin Wolf 
The following changes since commit 26b9b5fe17cc1b6be2e8bf8b9d16094f420bb8ad:

  virtio: fix vhost handling (2012-08-06 14:01:44 -0500)

are available in the git repository at:
  http://repo.or.cz/r/qemu/kevin.git for-anthony

Dong Xu Wang (1):
  qemu-img: use QemuOpts instead of QEMUOptionParameter in resize function

Kevin Wolf (1):
  qemu-iotests: Be more flexible with image creation options

Markus Armbruster (1):
  ide scsi: Mess with geometry only for hard disk devices

Paolo Bonzini (1):
  qapi: generalize documentation of streaming commands

Stefan Hajnoczi (8):
  qemu-iotests: add qed.py image manipulation utility
  docs: add dirty bit to qcow2 specification
  qcow2: introduce dirty bit
  docs: add lazy refcounts bit to qcow2 specification
  qemu-iotests: ignore qemu-img create lazy_refcounts output
  qcow2: implement lazy refcounts
  qemu-io: add "abort" command to simulate program crash
  qemu-iotests: add 039 qcow2 lazy refcounts test

 block/qcow2-cluster.c|5 +-
 block/qcow2.c|  123 +--
 block/qcow2.h|   21 
 block_int.h  |   26 +++--
 docs/specs/qcow2.txt |   14 ++-
 hmp-commands.hx  |2 +-
 hw/ide/qdev.c|3 +-
 hw/scsi-disk.c   |3 +-
 qapi-schema.json |   17 ++--
 qemu-img.c   |   28 +++--
 qemu-io.c|   12 ++
 tests/qemu-iotests/031.out   |   20 ++--
 tests/qemu-iotests/036.out   |4 +-
 tests/qemu-iotests/039   |  136 
 tests/qemu-iotests/039.out   |   53 ++
 tests/qemu-iotests/common.rc |7 +-
 tests/qemu-iotests/group |1 +
 tests/qemu-iotests/qed.py|  235 ++
 18 files changed, 650 insertions(+), 60 deletions(-)
 create mode 100755 tests/qemu-iotests/039
 create mode 100644 tests/qemu-iotests/039.out
 create mode 100755 tests/qemu-iotests/qed.py

Re: [Qemu-devel] [PULL 00/12] Block patches

2012-06-08 Thread Kevin Wolf 
Am 08.06.2012 16:07, schrieb Anthony Liguori:
> On 06/08/2012 05:48 PM, Kevin Wolf wrote:
>> Am 07.06.2012 03:17, schrieb Anthony Liguori:
>>> On 06/04/2012 07:13 PM, Kevin Wolf wrote:
 The following changes since commit 
 8cc9b43f7c5f826b39af4b012ad89bb55faac29c:

 target-microblaze: lwx/swx: first implementation (2012-06-04 10:19:46 
 +0200)

 are available in the git repository at:
 git://repo.or.cz/qemu/kevin.git for-anthony
>>>
>>> Pulled.  Thanks.
>>
>> But not pushed?
> 
> I'm having a really hard time connecting to repo.or.cz here.  Looks like I 
> mistook a timeout for success and mistakenly merged nothing.
> 
> I'm still having trouble getting to repo.or.cz.  I'll be back in the States 
> Saturday evening so will process this pull Sunday or Monday.

Hm, when repo.or.cz started behaving bad, I started to use things like
'while ! git fetch repo.or.cz; do sleep 1; done' (it would always
succeed after a few attempts), but recently it never needed more than
one attempt.

> Do you want to update the branch in the interim to fix the build issue?

Sure, updated it now.

Kevin

Re: [Qemu-devel] [PULL 00/12] Block patches

2012-06-08 Thread Anthony Liguori 

On 06/08/2012 05:48 PM, Kevin Wolf wrote:

Am 07.06.2012 03:17, schrieb Anthony Liguori:

On 06/04/2012 07:13 PM, Kevin Wolf wrote:

The following changes since commit 8cc9b43f7c5f826b39af4b012ad89bb55faac29c:

target-microblaze: lwx/swx: first implementation (2012-06-04 10:19:46 +0200)

are available in the git repository at:
git://repo.or.cz/qemu/kevin.git for-anthony


Pulled.  Thanks.


But not pushed?


I'm having a really hard time connecting to repo.or.cz here.  Looks like I 
mistook a timeout for success and mistakenly merged nothing.


I'm still having trouble getting to repo.or.cz.  I'll be back in the States 
Saturday evening so will process this pull Sunday or Monday.


Do you want to update the branch in the interim to fix the build issue?

Regards,

Anthony Liguori



Kevin

Re: [Qemu-devel] [PULL 00/12] Block patches

2012-06-08 Thread Kevin Wolf 
Am 07.06.2012 03:17, schrieb Anthony Liguori:
> On 06/04/2012 07:13 PM, Kevin Wolf wrote:
>> The following changes since commit 8cc9b43f7c5f826b39af4b012ad89bb55faac29c:
>>
>>target-microblaze: lwx/swx: first implementation (2012-06-04 10:19:46 
>> +0200)
>>
>> are available in the git repository at:
>>git://repo.or.cz/qemu/kevin.git for-anthony
> 
> Pulled.  Thanks.

But not pushed?

Kevin

Re: [Qemu-devel] [PULL 00/12] Block patches

2012-06-06 Thread Anthony Liguori 

On 06/04/2012 07:13 PM, Kevin Wolf wrote:

The following changes since commit 8cc9b43f7c5f826b39af4b012ad89bb55faac29c:

   target-microblaze: lwx/swx: first implementation (2012-06-04 10:19:46 +0200)

are available in the git repository at:
   git://repo.or.cz/qemu/kevin.git for-anthony


Pulled.  Thanks.

Regards,

Anthony Liguori



Josh Durgin (1):
   rbd: hook up cache options

Kevin Wolf (3):
   qemu-img check -r for repairing images
   qemu-img check: Print fixed clusters and recheck
   qcow2: Support for fixing refcount inconsistencies

MORITA Kazutaka (1):
   sheepdog: add coroutine_fn markers to coroutine functions

Markus Armbruster (1):
   Un-inline fdctrl_init_isa()

Paolo Bonzini (4):
   block: implement is_allocated for raw
   stream: tweak usage of bdrv_co_is_allocated
   stream: move is_allocated_above to block.c
   stream: move rate limiting to a separate header file

Zhi Yong Wu (2):
   qcow2: remove a line of unnecessary code
   qcow2: fix the byte endian convertion

  block.c  |   53 +-
  block.h  |   13 +-
  block/qcow2-cluster.c|1 -
  block/qcow2-refcount.c   |   33 --
  block/qcow2.c|5 +-
  block/qcow2.h|3 +-
  block/qed-check.c|2 +
  block/qed.c  |5 +-
  block/raw-posix.c|   98 +
  block/raw.c  |8 +++
  block/rbd.c  |   19 
  block/sheepdog.c |9 ++--
  block/stream.c   |  109 +++---
  block/vdi.c  |7 +++-
  block_int.h  |3 +-
  hw/fdc.c |   20 
  hw/fdc.h |   24 +-
  hw/ide/piix.c|3 +-
  hw/isa.h |2 -
  hw/pc_sysfw.c|1 +
  include/qemu/ratelimit.h |   48 
  qemu-common.h|1 +
  qemu-img-cmds.hx |4 +-
  qemu-img.c   |   35 +-
  qemu-img.texi|7 +++-
  25 files changed, 369 insertions(+), 144 deletions(-)
  create mode 100644 include/qemu/ratelimit.h

[Qemu-devel] [PULL 00/12] Block patches

2012-06-04 Thread Kevin Wolf 
The following changes since commit 8cc9b43f7c5f826b39af4b012ad89bb55faac29c:

  target-microblaze: lwx/swx: first implementation (2012-06-04 10:19:46 +0200)

are available in the git repository at:
  git://repo.or.cz/qemu/kevin.git for-anthony

Josh Durgin (1):
  rbd: hook up cache options

Kevin Wolf (3):
  qemu-img check -r for repairing images
  qemu-img check: Print fixed clusters and recheck
  qcow2: Support for fixing refcount inconsistencies

MORITA Kazutaka (1):
  sheepdog: add coroutine_fn markers to coroutine functions

Markus Armbruster (1):
  Un-inline fdctrl_init_isa()

Paolo Bonzini (4):
  block: implement is_allocated for raw
  stream: tweak usage of bdrv_co_is_allocated
  stream: move is_allocated_above to block.c
  stream: move rate limiting to a separate header file

Zhi Yong Wu (2):
  qcow2: remove a line of unnecessary code
  qcow2: fix the byte endian convertion

 block.c  |   53 +-
 block.h  |   13 +-
 block/qcow2-cluster.c|1 -
 block/qcow2-refcount.c   |   33 --
 block/qcow2.c|5 +-
 block/qcow2.h|3 +-
 block/qed-check.c|2 +
 block/qed.c  |5 +-
 block/raw-posix.c|   98 +
 block/raw.c  |8 +++
 block/rbd.c  |   19 
 block/sheepdog.c |9 ++--
 block/stream.c   |  109 +++---
 block/vdi.c  |7 +++-
 block_int.h  |3 +-
 hw/fdc.c |   20 
 hw/fdc.h |   24 +-
 hw/ide/piix.c|3 +-
 hw/isa.h |2 -
 hw/pc_sysfw.c|1 +
 include/qemu/ratelimit.h |   48 
 qemu-common.h|1 +
 qemu-img-cmds.hx |4 +-
 qemu-img.c   |   35 +-
 qemu-img.texi|7 +++-
 25 files changed, 369 insertions(+), 144 deletions(-)
 create mode 100644 include/qemu/ratelimit.h

Re: [Qemu-devel] [PULL 00/12] Block patches for 1.0

2011-11-28 Thread Anthony Liguori 

On 11/25/2011 12:12 PM, Kevin Wolf wrote:

The following changes since commit 40897c9c160393df922dfdb59cfa210048d3071d:

   Update version for 1.0-rc3 release (2011-11-21 15:05:59 -0600)

are available in the git repository at:
   git://repo.or.cz/qemu/kevin.git for-anthony


Pulled.  Thanks.

Regards,

Anthony Liguori



Dong Xu Wang (1):
   sheepdog: Avoid deadlock in error path

Kevin Wolf (7):
   qcow: Add migration blocker
   vdi: Add migration blocker
   vmdk: Add migration blocker
   vpc: Add migration blocker
   vvfat: Add migration blocker
   vdi: Fix memory leak
   vpc: Add missing error handling in alloc_block

Paolo Bonzini (4):
   virtio-blk: fix cross-endian config space
   usb-msd: do not register twice in the boot order
   scsi: fix fw path
   scsi-generic: add as boot device

  block/qcow.c  |   12 
  block/sheepdog.c  |2 ++
  block/vdi.c   |   15 +++
  block/vmdk.c  |   16 +++-
  block/vpc.c   |   18 +-
  block/vvfat.c |   17 +
  hw/pci-hotplug.c  |3 ++-
  hw/scsi-bus.c |   11 +++
  hw/scsi-generic.c |5 +
  hw/scsi.h |2 +-
  hw/usb-msd.c  |4 ++--
  hw/virtio-blk.c   |7 ---
  12 files changed, 99 insertions(+), 13 deletions(-)

[Qemu-devel] [PULL 00/12] Block patches for 1.0

2011-11-25 Thread Kevin Wolf 
The following changes since commit 40897c9c160393df922dfdb59cfa210048d3071d:

  Update version for 1.0-rc3 release (2011-11-21 15:05:59 -0600)

are available in the git repository at:
  git://repo.or.cz/qemu/kevin.git for-anthony

Dong Xu Wang (1):
  sheepdog: Avoid deadlock in error path

Kevin Wolf (7):
  qcow: Add migration blocker
  vdi: Add migration blocker
  vmdk: Add migration blocker
  vpc: Add migration blocker
  vvfat: Add migration blocker
  vdi: Fix memory leak
  vpc: Add missing error handling in alloc_block

Paolo Bonzini (4):
  virtio-blk: fix cross-endian config space
  usb-msd: do not register twice in the boot order
  scsi: fix fw path
  scsi-generic: add as boot device

 block/qcow.c  |   12 
 block/sheepdog.c  |2 ++
 block/vdi.c   |   15 +++
 block/vmdk.c  |   16 +++-
 block/vpc.c   |   18 +-
 block/vvfat.c |   17 +
 hw/pci-hotplug.c  |3 ++-
 hw/scsi-bus.c |   11 +++
 hw/scsi-generic.c |5 +
 hw/scsi.h |2 +-
 hw/usb-msd.c  |4 ++--
 hw/virtio-blk.c   |7 ---
 12 files changed, 99 insertions(+), 13 deletions(-)

Re: [Qemu-devel] [PULL 00/12] Block patches

2011-06-09 Thread Anthony Liguori 

On 06/08/2011 08:48 AM, Kevin Wolf wrote:

The following changes since commit a90d4690074526f54ad0851fce19fa6783f06803:

   Add an isa device for SGA (2011-06-07 13:52:30 -0500)

are available in the git repository at:
   git://repo.or.cz/qemu/kevin.git for-anthony


Pulled.  Thanks.

Regards,

Anthony Liguori



Alexander Graf (1):
   vmdk: fix endianness bugs

Christoph Egger (2):
   block/raw-posix: use a character device if a block device is given
   block/raw-posix: get right partition size

Christoph Hellwig (1):
   block: clarify the meaning of BDRV_O_NOCACHE

Josh Durgin (4):
   rbd: use the higher level librbd instead of just librados
   rbd: allow configuration of rados from the rbd filename
   rbd: check return values when scheduling aio
   rbd: Add bdrv_truncate implementation

Kevin Wolf (4):
   ide/core: Remove explicit setting of BM_STATUS_INT
   qcow2: Fix memory leaks in error cases
   bdrv_img_create: Fix segfault
   qemu-img create: Fix displayed default cluster size

  block.c|   13 +-
  block/qcow2-cluster.c  |2 +-
  block/qcow2-refcount.c |9 +-
  block/qcow2.c  |7 +-
  block/qcow2.h  |2 +
  block/qed.c|3 +-
  block/raw-posix.c  |   77 -
  block/raw-win32.c  |   12 +-
  block/rbd.c|  896 ++--
  block/rbd_types.h  |   71 
  block/vdi.c|6 +-
  block/vmdk.c   |   22 +-
  blockdev.c |2 +-
  configure  |   33 +--
  hw/ide/core.c  |7 +-
  qemu-io.c  |4 +-
  qemu-nbd.c |2 +-
  17 files changed, 461 insertions(+), 707 deletions(-)
  delete mode 100644 block/rbd_types.h

[Qemu-devel] [PULL 00/12] Block patches

2011-06-08 Thread Kevin Wolf 
The following changes since commit a90d4690074526f54ad0851fce19fa6783f06803:

  Add an isa device for SGA (2011-06-07 13:52:30 -0500)

are available in the git repository at:
  git://repo.or.cz/qemu/kevin.git for-anthony

Alexander Graf (1):
  vmdk: fix endianness bugs

Christoph Egger (2):
  block/raw-posix: use a character device if a block device is given
  block/raw-posix: get right partition size

Christoph Hellwig (1):
  block: clarify the meaning of BDRV_O_NOCACHE

Josh Durgin (4):
  rbd: use the higher level librbd instead of just librados
  rbd: allow configuration of rados from the rbd filename
  rbd: check return values when scheduling aio
  rbd: Add bdrv_truncate implementation

Kevin Wolf (4):
  ide/core: Remove explicit setting of BM_STATUS_INT
  qcow2: Fix memory leaks in error cases
  bdrv_img_create: Fix segfault
  qemu-img create: Fix displayed default cluster size

 block.c|   13 +-
 block/qcow2-cluster.c  |2 +-
 block/qcow2-refcount.c |9 +-
 block/qcow2.c  |7 +-
 block/qcow2.h  |2 +
 block/qed.c|3 +-
 block/raw-posix.c  |   77 -
 block/raw-win32.c  |   12 +-
 block/rbd.c|  896 ++--
 block/rbd_types.h  |   71 
 block/vdi.c|6 +-
 block/vmdk.c   |   22 +-
 blockdev.c |2 +-
 configure  |   33 +--
 hw/ide/core.c  |7 +-
 qemu-io.c  |4 +-
 qemu-nbd.c |2 +-
 17 files changed, 461 insertions(+), 707 deletions(-)
 delete mode 100644 block/rbd_types.h