The following changes since commit b00a0ddb31a393b8386d30a9bef4d9bbb249e7ec:
Merge remote-tracking branch 'remotes/kraxel/tags/pull-input-20141002-1' into staging (2014-10-02 15:01:48 +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 767c86d3e752dfc68ff5d018c3b0b63b333371b2: blockdev-test: Test device_del after drive_del (2014-10-04 19:28:39 +0100) ---------------------------------------------------------------- ---------------------------------------------------------------- Fam Zheng (1): vmdk: Fix integer overflow in offset calculation John Snow (6): blockdev: Orphaned drive search blockdev: Allow overriding if_max_dev property pc/vl: Add units-per-default-bus property ide: Update ide_drive_get to be HBA agnostic qtest/bios-tables: Correct Q35 command line q35/ahci: Pick up -cdrom and -hda options Jun Li (1): Modify qemu_opt_rename to realize renaming all items in opts Kevin Wolf (2): make check-block: Use default cache modes qemu-iotests: Fix supported cache modes for 052 Markus Armbruster (8): block: Drop superfluous conditionals around qemu_opts_del() util: Emancipate id_wellformed() from QemuOpts drive_del-test: Merge of qdev-monitor-test, blockdev-test blockdev-test: Use single rather than double quotes in QMP blockdev-test: Clean up bogus drive_add argument blockdev-test: Simplify by using g_assert_cmpstr() blockdev-test: Factor out some common code into helpers blockdev-test: Test device_del after drive_del Max Reitz (3): iotests: Use _img_info qapi: Add corrupt field to ImageInfoSpecificQCow2 iotests: qemu-img info output for corrupt image Richard W.M. Jones (1): ssh: Don't crash if either host or path is not specified. Zhang Haoyu (1): snapshot: fix referencing wrong variable in while loop in do_delvm block.c | 9 +-- block/qcow2.c | 3 + block/ssh.c | 10 ++++ block/vmdk.c | 2 +- blockdev.c | 72 +++++++++++++++++++++-- hw/alpha/dp264.c | 2 +- hw/i386/pc.c | 1 + hw/i386/pc_piix.c | 2 +- hw/i386/pc_q35.c | 7 ++- hw/ide/ahci.c | 15 +++++ hw/ide/ahci.h | 2 + hw/ide/core.c | 22 +++++-- hw/mips/mips_fulong2e.c | 2 +- hw/mips/mips_malta.c | 2 +- hw/mips/mips_r4k.c | 2 +- hw/ppc/mac_newworld.c | 2 +- hw/ppc/mac_oldworld.c | 2 +- hw/ppc/prep.c | 2 +- hw/sparc64/sun4u.c | 2 +- include/hw/boards.h | 2 + include/qemu-common.h | 3 + include/qemu/option.h | 1 - include/sysemu/blockdev.h | 5 ++ qapi/block-core.json | 6 +- qemu-img.c | 4 +- qemu-nbd.c | 4 +- savevm.c | 11 ++-- tests/Makefile | 5 +- tests/bios-tables-test.c | 10 ++-- tests/blockdev-test.c | 59 ------------------- tests/drive_del-test.c | 137 ++++++++++++++++++++++++++++++++++++++++++++ tests/qdev-monitor-test.c | 77 ------------------------- tests/qemu-iotests-quick.sh | 2 +- tests/qemu-iotests/052 | 5 +- tests/qemu-iotests/060 | 3 + tests/qemu-iotests/060.out | 9 +++ tests/qemu-iotests/065 | 12 ++-- tests/qemu-iotests/067.out | 10 ++-- tests/qemu-iotests/070 | 2 +- tests/qemu-iotests/070.out | 5 +- tests/qemu-iotests/082 | 12 ++-- tests/qemu-iotests/082.out | 62 ++++++-------------- tests/qemu-iotests/089.out | 2 + tests/qemu-iotests/095 | 4 +- tests/qemu-iotests/095.out | 16 ++---- tests/qemu-iotests/105 | 70 ++++++++++++++++++++++ tests/qemu-iotests/105.out | 21 +++++++ tests/qemu-iotests/group | 1 + util/Makefile.objs | 1 + util/id.c | 28 +++++++++ util/qemu-option.c | 17 +----- vl.c | 18 +++++- 52 files changed, 500 insertions(+), 285 deletions(-) delete mode 100644 tests/blockdev-test.c create mode 100644 tests/drive_del-test.c delete mode 100644 tests/qdev-monitor-test.c create mode 100755 tests/qemu-iotests/105 create mode 100644 tests/qemu-iotests/105.out create mode 100644 util/id.c -- 1.9.3
