[Qemu-commits] [qemu/qemu] af9573: snapshot: fix referencing wrong variable in while ...

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: af957387547b05ed6dc4d84c10cca42700a7aeda
      
https://github.com/qemu/qemu/commit/af957387547b05ed6dc4d84c10cca42700a7aeda
  Author: Zhang Haoyu <address@hidden>
  Date:   2014-10-03 (Fri, 03 Oct 2014)

  Changed paths:
    M savevm.c

  Log Message:
  -----------
  snapshot: fix referencing wrong variable in while loop in do_delvm

The while loop variabal is "bs1",
but "bs" is always passed to bdrv_snapshot_delete_by_id_or_name.
Broken in commit a89d89d, v1.7.0.

Signed-off-by: Zhang Haoyu <address@hidden>
Reviewed-by: Markus Armbruster <address@hidden>
Signed-off-by: Stefan Hajnoczi <address@hidden>


  Commit: 18fe46d79a6de61cb2c379fb610d834ef658d84b
      
https://github.com/qemu/qemu/commit/18fe46d79a6de61cb2c379fb610d834ef658d84b
  Author: Richard W.M. Jones <address@hidden>
  Date:   2014-10-03 (Fri, 03 Oct 2014)

  Changed paths:
    M block/ssh.c

  Log Message:
  -----------
  ssh: Don't crash if either host or path is not specified.

$ ./qemu-img create -f qcow2 overlay \
    -b 'json: { "file.driver":"ssh",
          "file.host":"localhost",
          "file.host_key_check":"no" }'
qemu-img: qobject/qdict.c:193: qdict_get_obj: Assertion `obj != ((void *)0)' 
failed.
Aborted

A similar crash also happens if the file.host field is omitted.

https://bugzilla.redhat.com/show_bug.cgi?id=1147343

Bug found and reported by Jun Li.

Signed-off-by: Richard W.M. Jones <address@hidden>
Reviewed-by: Gonglei <address@hidden>
Signed-off-by: Stefan Hajnoczi <address@hidden>


  Commit: fbf28a4328123b3259d100eedc0e6f5b7f8bf186
      
https://github.com/qemu/qemu/commit/fbf28a4328123b3259d100eedc0e6f5b7f8bf186
  Author: Markus Armbruster <address@hidden>
  Date:   2014-10-03 (Fri, 03 Oct 2014)

  Changed paths:
    M blockdev.c
    M qemu-img.c
    M qemu-nbd.c

  Log Message:
  -----------
  block: Drop superfluous conditionals around qemu_opts_del()

Signed-off-by: Markus Armbruster <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Message-id: address@hidden
Signed-off-by: Stefan Hajnoczi <address@hidden>


  Commit: d1319b077a4bd980ca1b8a167b02b519330dd26b
      
https://github.com/qemu/qemu/commit/d1319b077a4bd980ca1b8a167b02b519330dd26b
  Author: Fam Zheng <address@hidden>
  Date:   2014-10-03 (Fri, 03 Oct 2014)

  Changed paths:
    M block/vmdk.c
    A tests/qemu-iotests/105
    A tests/qemu-iotests/105.out
    M tests/qemu-iotests/group

  Log Message:
  -----------
  vmdk: Fix integer overflow in offset calculation

This fixes the bug introduced by commit c6ac36e (vmdk: Optimize cluster
allocation).

$ ~/build/master/qemu-io /stor/vm/arch.vmdk -c 'write 2G 1k'
write failed: Invalid argument

Reported-by: Mark Cave-Ayland <address@hidden>
Reviewed-by: Max Reitz <address@hidden>
Signed-off-by: Fam Zheng <address@hidden>
Message-id: address@hidden
Signed-off-by: Stefan Hajnoczi <address@hidden>


  Commit: 20d6cd47d0459bdc6a8b64e7abe8f713e0d4718e
      
https://github.com/qemu/qemu/commit/20d6cd47d0459bdc6a8b64e7abe8f713e0d4718e
  Author: Jun Li <address@hidden>
  Date:   2014-10-03 (Fri, 03 Oct 2014)

  Changed paths:
    M blockdev.c

  Log Message:
  -----------
  Modify qemu_opt_rename to realize renaming all items in opts

Add realization of rename all items in opts for qemu_opt_rename.
e.g:
When add bps twice in command line, need to rename all bps to
throttling.bps-total.

This patch solved following bug:
Bug 1145586 - qemu-kvm will give strange hint when add bps twice for a drive
ref:https://bugzilla.redhat.com/show_bug.cgi?id=1145586

[Resolved conflict with commit 5abbf0ee4d87c695deb1c3fca9bb994b93a3e3be
("block: Catch simultaneous usage of options and their aliases").  Check
for simultaneous use first, and then loop over all options.
--Stefan]

Signed-off-by: Jun Li <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Message-id: address@hidden
Signed-off-by: Stefan Hajnoczi <address@hidden>


  Commit: d9323e9b20b1a74720f17e81387cffe013d9cf0b
      
https://github.com/qemu/qemu/commit/d9323e9b20b1a74720f17e81387cffe013d9cf0b
  Author: Kevin Wolf <address@hidden>
  Date:   2014-10-03 (Fri, 03 Oct 2014)

  Changed paths:
    M tests/qemu-iotests-quick.sh

  Log Message:
  -----------
  make check-block: Use default cache modes

When qemu-iotests only gave a choice between cache=none and
cache=writethrough, we picked cache=none because it was the option that
would complete the test in finite time. Some tests could only work for
one of the two options and would be skipped with cache=none, but that
was an acceptable trade-off at the time.

Today, however, qemu-iotests is a bit more flexible than that and you
can specify any of the cache modes supported by qemu. The default is
writeback, like in qemu, which is fast and (unlike cache=none) compatible
with any host filesystem. Test cases that have specific requirements for
the cache mode can also specify a different default.

In order to get a fast test run that works everywhere and doesn't skip
tests that need a different cache mode, not specifying any cache mode
and instead relying on the default is the best we can do today.

Signed-off-by: Kevin Wolf <address@hidden>
Reviewed-by: Markus Armbruster <address@hidden>
Message-id: address@hidden
Signed-off-by: Stefan Hajnoczi <address@hidden>


  Commit: cf77b2d25eeabe268412cf41d4ea38ec5de8c611
      
https://github.com/qemu/qemu/commit/cf77b2d25eeabe268412cf41d4ea38ec5de8c611
  Author: Kevin Wolf <address@hidden>
  Date:   2014-10-03 (Fri, 03 Oct 2014)

  Changed paths:
    M tests/qemu-iotests/052

  Log Message:
  -----------
  qemu-iotests: Fix supported cache modes for 052

The requirement for this test case is really "no O_DIRECT", because the
temporary snapshot for BDRV_O_SNAPSHOT is created in /tmp, which often
is a tmpfs.

Commit f210a83c ('qemu-iotests: Add _default_cache_mode and
_supported_cache_modes') turned the restriction into writethrough-only,
but that's not really necessary.

Allow to run the test for any non-O_DIRECT cache modes, and use the
global default of writeback if no cache mode is specified.

Signed-off-by: Kevin Wolf <address@hidden>
Reviewed-by: Markus Armbruster <address@hidden>
Message-id: address@hidden
Signed-off-by: Stefan Hajnoczi <address@hidden>


  Commit: a66c9dc734fb30de1e18e9dc217f2d37e16c492a
      
https://github.com/qemu/qemu/commit/a66c9dc734fb30de1e18e9dc217f2d37e16c492a
  Author: John Snow <address@hidden>
  Date:   2014-10-03 (Fri, 03 Oct 2014)

  Changed paths:
    M blockdev.c
    M include/sysemu/blockdev.h
    M vl.c

  Log Message:
  -----------
  blockdev: Orphaned drive search

When users use command line options like -hda, -cdrom,
or even -drive if=ide, it is up to the board initialization
routines to pick up these drives and create backing
devices for them.

Some boards, like Q35, have not been doing this.
However, there is no warning explaining why certain
drive specifications are just silently ignored,
so this function adds a check to print some warnings
to assist users in debugging these sorts of issues
in the future.

This patch will not warn about drives added with if_none,
for which it is not possible to tell in advance if
the omission of a backing device is an issue.

A warning in these cases is considered appropriate.

Signed-off-by: John Snow <address@hidden>
Reviewed-by: Markus Armbruster <address@hidden>
Message-id: address@hidden
Signed-off-by: Stefan Hajnoczi <address@hidden>


  Commit: 21dff8cf38d311a917ab33f19d5cea7696f0c354
      
https://github.com/qemu/qemu/commit/21dff8cf38d311a917ab33f19d5cea7696f0c354
  Author: John Snow <address@hidden>
  Date:   2014-10-03 (Fri, 03 Oct 2014)

  Changed paths:
    M blockdev.c
    M include/sysemu/blockdev.h

  Log Message:
  -----------
  blockdev: Allow overriding if_max_dev property

The if_max_devs table as in the past been an immutable
default that controls the mapping of index => (bus,unit)
for all boards and all HBAs for each interface type.

Since adding this mapping information to the HBA device
itself is currently unwieldly from the perspective of
retrieving this information at option parsing time
(e.g, within drive_new), we consider the alternative
of marking the if_max_devs table mutable so that
later configuration and initialization can adjust the
mapping at will, but only up until a drive is added,
at which point the mapping is finalized.

Signed-off-by: John Snow <address@hidden>
Reviewed-by: Markus Armbruster <address@hidden>
Message-id: address@hidden
Signed-off-by: Stefan Hajnoczi <address@hidden>


  Commit: 1602651833c081e32366c9e534ad72e4287840c5
      
https://github.com/qemu/qemu/commit/1602651833c081e32366c9e534ad72e4287840c5
  Author: John Snow <address@hidden>
  Date:   2014-10-03 (Fri, 03 Oct 2014)

  Changed paths:
    M hw/i386/pc.c
    M hw/i386/pc_q35.c
    M include/hw/boards.h
    M vl.c

  Log Message:
  -----------
  pc/vl: Add units-per-default-bus property

This patch adds the 'units_per_default_bus' property which
allows individual boards to declare their desired
index => (bus,unit) mapping for their default HBA, so that
boards such as Q35 can specify that its default if_ide HBA,
AHCI, only accepts one unit per bus.

This property only overrides the mapping for drives matching
the block_default_type interface.

This patch also adds this property to *all* past and present
Q35 machine types. This retroactive addition is justified
because the previous erroneous index=>(bus,unit) mappings
caused by lack of such a property were not utilized due to
lack of initialization code in the Q35 init routine.

Further, semantically, the Q35 board type has always had the
property that its default HBA, AHCI, only accepts one unit per
bus. The new code added to add devices to drives relies upon
the accuracy of this mapping. Thus, the property is applied
retroactively to reduce complexity of allowing IDE HBAs with
different units per bus.

Examples:

Prior to this patch, all IDE HBAs were assumed to use 2 units
per bus (Master, Slave). When using Q35 and AHCI, however, we
only allow one unit per bus.

-hdb foo.qcow2 would become index=1, or bus=0,unit=1.
-hdd foo.qcow2 would become index=3, or bus=1,unit=1.
-drive file=foo.qcow2,index=5 becomes bus=2,unit=1.

These are invalid for AHCI. They now become, under Q35 only:

-hdb foo.qcow2 --> index=1, bus=1, unit=0.
-hdd foo.qcow2 --> index=3, bus=3, unit=0.
-drive file=foo.qcow2,index=5 --> bus=5,unit=0.

The mapping is adjusted based on the fact that the default IF
for the Q35 machine type is IF_IDE, and units-per-default-bus
overrides the IDE mapping from its default of 2 units per bus
to just 1 unit per bus.

Signed-off-by: John Snow <address@hidden>
Reviewed-by: Markus Armbruster <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Message-id: address@hidden
Signed-off-by: Stefan Hajnoczi <address@hidden>


  Commit: d8f94e1bb275ab6a14a15220fd6afd0d04324aeb
      
https://github.com/qemu/qemu/commit/d8f94e1bb275ab6a14a15220fd6afd0d04324aeb
  Author: John Snow <address@hidden>
  Date:   2014-10-03 (Fri, 03 Oct 2014)

  Changed paths:
    M blockdev.c
    M hw/alpha/dp264.c
    M hw/i386/pc_piix.c
    M hw/ide/core.c
    M hw/mips/mips_fulong2e.c
    M hw/mips/mips_malta.c
    M hw/mips/mips_r4k.c
    M hw/ppc/mac_newworld.c
    M hw/ppc/mac_oldworld.c
    M hw/ppc/prep.c
    M hw/sparc64/sun4u.c
    M include/sysemu/blockdev.h

  Log Message:
  -----------
  ide: Update ide_drive_get to be HBA agnostic

Instead of duplicating the logic for the if_ide
(bus,unit) mappings, rely on the blockdev layer
for managing those mappings for us, and use the
drive_get_by_index call instead.

This allows ide_drive_get to work for AHCI HBAs
as well, and can be used in the Q35 initialization.

Lastly, change the nature of the argument to
ide_drive_get so that represents the number of
total drives we can support, and not the total
number of buses. This will prevent array overflows
if the units-per-default-bus property ever needs
to be adjusted for compatibility reasons.

Signed-off-by: John Snow <address@hidden>
Reviewed-by: Markus Armbruster <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Message-id: address@hidden
Signed-off-by: Stefan Hajnoczi <address@hidden>


  Commit: 6b9e03a4e7598765a6cebb7618f2eeb22e928f6e
      
https://github.com/qemu/qemu/commit/6b9e03a4e7598765a6cebb7618f2eeb22e928f6e
  Author: John Snow <address@hidden>
  Date:   2014-10-03 (Fri, 03 Oct 2014)

  Changed paths:
    M tests/bios-tables-test.c

  Log Message:
  -----------
  qtest/bios-tables: Correct Q35 command line

If the Q35 board types are to begin recognizing
and decoding syntactic sugar for drive/device
declarations, then workarounds found within
the qtests suite need to be adjusted to prevent
any test failures after the fix.

bios-tables-test improperly uses this cli:
-drive file=etc,id=hd -device ide-hd,drive=hd

Which will create a drive and device due to
the lack of specifying if=none. Then, it will
attempt to create a second device and fail.

This patch corrects this test to always use
the full, non-sugared -device/-drive syntax
for both PC and Q35.

Signed-off-by: John Snow <address@hidden>
Reviewed-by: Markus Armbruster <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Message-id: address@hidden
Signed-off-by: Stefan Hajnoczi <address@hidden>


  Commit: d93162e13c1f4a5b2a4de6b1997f32e3fca19e67
      
https://github.com/qemu/qemu/commit/d93162e13c1f4a5b2a4de6b1997f32e3fca19e67
  Author: John Snow <address@hidden>
  Date:   2014-10-03 (Fri, 03 Oct 2014)

  Changed paths:
    M hw/i386/pc_q35.c
    M hw/ide/ahci.c
    M hw/ide/ahci.h

  Log Message:
  -----------
  q35/ahci: Pick up -cdrom and -hda options

This patch implements the backend for the Q35 board
for us to be able to pick up and use drives defined
by the -cdrom, -hda, or -drive if=ide shorthand options.

Signed-off-by: John Snow <address@hidden>
Reviewed-by: Markus Armbruster <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Message-id: address@hidden
Signed-off-by: Stefan Hajnoczi <address@hidden>


  Commit: f5bebbbb28dc7a149a891f0f1e112fb50bb72664
      
https://github.com/qemu/qemu/commit/f5bebbbb28dc7a149a891f0f1e112fb50bb72664
  Author: Markus Armbruster <address@hidden>
  Date:   2014-10-03 (Fri, 03 Oct 2014)

  Changed paths:
    M block.c
    M include/qemu-common.h
    M include/qemu/option.h
    M util/Makefile.objs
    A util/id.c
    M util/qemu-option.c

  Log Message:
  -----------
  util: Emancipate id_wellformed() from QemuOpts

IDs have long spread beyond QemuOpts: not everything with an ID
necessarily goes through QemuOpts.  Commit 9aebf3b is about such a
case: block layer names are meant to be well-formed IDs, but some of
them don't go through QemuOpts, and thus weren't checked.  The commit
fixed that the straightforward way: rename the internal QemuOpts
helper id_wellformed() to qemu_opts_id_wellformed() and give it
external linkage.

Instead of using it directly in block.c, the commit adds wrapper
bdrv_is_valid_name(), probably to hide the connection to QemuOpts.

Go one logical step further: emancipate IDs from QemuOpts.  Rename the
function back to id_wellformed(), and put it in another file.  While
there, clean up its value to bool.  Peel off the bdrv_is_valid_name()
wrapper.

[Replaced stray return 0 with return false to match bool returns used
elsewhere in id_wellformed().
--Stefan]

Signed-off-by: Markus Armbruster <address@hidden>
Signed-off-by: Stefan Hajnoczi <address@hidden>


  Commit: 1b53eab270ee08e61e21c3fcc77e34c4b5484c30
      
https://github.com/qemu/qemu/commit/1b53eab270ee08e61e21c3fcc77e34c4b5484c30
  Author: Max Reitz <address@hidden>
  Date:   2014-10-04 (Sat, 04 Oct 2014)

  Changed paths:
    M tests/qemu-iotests/070
    M tests/qemu-iotests/070.out
    M tests/qemu-iotests/082
    M tests/qemu-iotests/082.out
    M tests/qemu-iotests/095
    M tests/qemu-iotests/095.out

  Log Message:
  -----------
  iotests: Use _img_info

qemu-img info should only be used directly if the format-specific
information or the name of the format is relevant (some tests explicitly
test format-specific information; test 082 uses qcow2-specific settings
to test the qemu-img interface); otherwise, tests should always use
_img_info instead.

Test 082 was touched only partially. It does test the qemu-img
interface; however, its invocations of qemu-img info are not real tests
but rather verifications, so if format-specific information is not
important for the test, there is no reason not to use _img_info. In
contrast to directly invoking qemu-img info, "qcow2" is replaced by
"IMGFMT"; but as "qcow2" is only mentioned once in test 082 (in
_supported_fmt), I consider this an improvement.

Signed-off-by: Max Reitz <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Message-id: address@hidden
Signed-off-by: Stefan Hajnoczi <address@hidden>


  Commit: 9009b1963c5ed9bb826c8116e8b1d3aa94d47f85
      
https://github.com/qemu/qemu/commit/9009b1963c5ed9bb826c8116e8b1d3aa94d47f85
  Author: Max Reitz <address@hidden>
  Date:   2014-10-04 (Sat, 04 Oct 2014)

  Changed paths:
    M block/qcow2.c
    M qapi/block-core.json
    M tests/qemu-iotests/065
    M tests/qemu-iotests/067.out
    M tests/qemu-iotests/082.out
    M tests/qemu-iotests/089.out

  Log Message:
  -----------
  qapi: Add corrupt field to ImageInfoSpecificQCow2

Just like lazy-refcounts, this field will be present iff the qcow2
compat level is 1.1 (or probably any future revision).

As expected, this breaks some tests due to the new field present in
qemu-img info output; so fix their output accordingly.

Suggested-by: Eric Blake <address@hidden>
Signed-off-by: Max Reitz <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Message-id: address@hidden
Signed-off-by: Stefan Hajnoczi <address@hidden>


  Commit: f383611a0a464e0bd06da9d98ab0d63f987cb885
      
https://github.com/qemu/qemu/commit/f383611a0a464e0bd06da9d98ab0d63f987cb885
  Author: Max Reitz <address@hidden>
  Date:   2014-10-04 (Sat, 04 Oct 2014)

  Changed paths:
    M tests/qemu-iotests/060
    M tests/qemu-iotests/060.out

  Log Message:
  -----------
  iotests: qemu-img info output for corrupt image

The "corrupt" entry in the format-specific information section should be
"true".

Signed-off-by: Max Reitz <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Message-id: address@hidden
Signed-off-by: Stefan Hajnoczi <address@hidden>


  Commit: e2f3f221885a90de766ce9a38b87badeb658635a
      
https://github.com/qemu/qemu/commit/e2f3f221885a90de766ce9a38b87badeb658635a
  Author: Markus Armbruster <address@hidden>
  Date:   2014-10-04 (Sat, 04 Oct 2014)

  Changed paths:
    M tests/Makefile
    R tests/blockdev-test.c
    A tests/drive_del-test.c
    R tests/qdev-monitor-test.c

  Log Message:
  -----------
  drive_del-test: Merge of qdev-monitor-test, blockdev-test

Each of qdev-monitor-test and blockdev-test has just one test case,
and both are about drive_del.

[Extended copyright from 2013 to 2013-2014 as requested by Eric Blake.
--Stefan]

Signed-off-by: Markus Armbruster <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Message-id: address@hidden
Signed-off-by: Stefan Hajnoczi <address@hidden>


  Commit: d0e386683779f09afe5bf198b957a780c960204b
      
https://github.com/qemu/qemu/commit/d0e386683779f09afe5bf198b957a780c960204b
  Author: Markus Armbruster <address@hidden>
  Date:   2014-10-04 (Sat, 04 Oct 2014)

  Changed paths:
    M tests/drive_del-test.c

  Log Message:
  -----------
  blockdev-test: Use single rather than double quotes in QMP

QMP accepts both single and double quotes.  This is the only test
using double quotes.  They need to be quoted in C strings.  Replace
them by single quotes.

Signed-off-by: Markus Armbruster <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Message-id: address@hidden
Signed-off-by: Stefan Hajnoczi <address@hidden>


  Commit: e319df669da92f6ba56595e486637108256da08f
      
https://github.com/qemu/qemu/commit/e319df669da92f6ba56595e486637108256da08f
  Author: Markus Armbruster <address@hidden>
  Date:   2014-10-04 (Sat, 04 Oct 2014)

  Changed paths:
    M tests/drive_del-test.c

  Log Message:
  -----------
  blockdev-test: Clean up bogus drive_add argument

The first argument should be a PCI address, which pci-addr=auto isn't.
Doesn't really matter, as drive_add ignores its first argument when
its second argument has if=none.  Clean it up anyway.

Signed-off-by: Markus Armbruster <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Message-id: address@hidden
Signed-off-by: Stefan Hajnoczi <address@hidden>


  Commit: 37e153fe45020c38229a113adc1eda05757e2c37
      
https://github.com/qemu/qemu/commit/37e153fe45020c38229a113adc1eda05757e2c37
  Author: Markus Armbruster <address@hidden>
  Date:   2014-10-04 (Sat, 04 Oct 2014)

  Changed paths:
    M tests/drive_del-test.c

  Log Message:
  -----------
  blockdev-test: Simplify by using g_assert_cmpstr()

Signed-off-by: Markus Armbruster <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Message-id: address@hidden
Signed-off-by: Stefan Hajnoczi <address@hidden>


  Commit: 2eea5cd452592ac9b31ed498555f36273b3e0a94
      
https://github.com/qemu/qemu/commit/2eea5cd452592ac9b31ed498555f36273b3e0a94
  Author: Markus Armbruster <address@hidden>
  Date:   2014-10-04 (Sat, 04 Oct 2014)

  Changed paths:
    M tests/drive_del-test.c

  Log Message:
  -----------
  blockdev-test: Factor out some common code into helpers

Signed-off-by: Markus Armbruster <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Message-id: address@hidden
Signed-off-by: Stefan Hajnoczi <address@hidden>


  Commit: 767c86d3e752dfc68ff5d018c3b0b63b333371b2
      
https://github.com/qemu/qemu/commit/767c86d3e752dfc68ff5d018c3b0b63b333371b2
  Author: Markus Armbruster <address@hidden>
  Date:   2014-10-04 (Sat, 04 Oct 2014)

  Changed paths:
    M tests/drive_del-test.c

  Log Message:
  -----------
  blockdev-test: Test device_del after drive_del

Executed in this order, drive_del and device_del's automatic drive
deletion take notoriously tricky special paths.

[Fixed "an device" -> "a device" typo as requested by Eric Blake.
--Stefan]

Signed-off-by: Markus Armbruster <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Message-id: address@hidden
Signed-off-by: Stefan Hajnoczi <address@hidden>


  Commit: 507ef2f9fab3e67ac6fefda4e20db7fc5f2bc186
      
https://github.com/qemu/qemu/commit/507ef2f9fab3e67ac6fefda4e20db7fc5f2bc186
  Author: Peter Maydell <address@hidden>
  Date:   2014-10-06 (Mon, 06 Oct 2014)

  Changed paths:
    M block.c
    M block/qcow2.c
    M block/ssh.c
    M block/vmdk.c
    M blockdev.c
    M hw/alpha/dp264.c
    M hw/i386/pc.c
    M hw/i386/pc_piix.c
    M hw/i386/pc_q35.c
    M hw/ide/ahci.c
    M hw/ide/ahci.h
    M hw/ide/core.c
    M hw/mips/mips_fulong2e.c
    M hw/mips/mips_malta.c
    M hw/mips/mips_r4k.c
    M hw/ppc/mac_newworld.c
    M hw/ppc/mac_oldworld.c
    M hw/ppc/prep.c
    M hw/sparc64/sun4u.c
    M include/hw/boards.h
    M include/qemu-common.h
    M include/qemu/option.h
    M include/sysemu/blockdev.h
    M qapi/block-core.json
    M qemu-img.c
    M qemu-nbd.c
    M savevm.c
    M tests/Makefile
    M tests/bios-tables-test.c
    R tests/blockdev-test.c
    A tests/drive_del-test.c
    R tests/qdev-monitor-test.c
    M tests/qemu-iotests-quick.sh
    M tests/qemu-iotests/052
    M tests/qemu-iotests/060
    M tests/qemu-iotests/060.out
    M tests/qemu-iotests/065
    M tests/qemu-iotests/067.out
    M tests/qemu-iotests/070
    M tests/qemu-iotests/070.out
    M tests/qemu-iotests/082
    M tests/qemu-iotests/082.out
    M tests/qemu-iotests/089.out
    M tests/qemu-iotests/095
    M tests/qemu-iotests/095.out
    A tests/qemu-iotests/105
    A tests/qemu-iotests/105.out
    M tests/qemu-iotests/group
    M util/Makefile.objs
    A util/id.c
    M util/qemu-option.c
    M vl.c

  Log Message:
  -----------
  Merge remote-tracking branch 'remotes/stefanha/tags/block-pull-request' into 
staging

# gpg: Signature made Sat 04 Oct 2014 21:24:46 BST using RSA key ID 81AB73C8
# gpg: Good signature from "Stefan Hajnoczi <address@hidden>"
# gpg:                 aka "Stefan Hajnoczi <address@hidden>"

* remotes/stefanha/tags/block-pull-request: (23 commits)
  blockdev-test: Test device_del after drive_del
  blockdev-test: Factor out some common code into helpers
  blockdev-test: Simplify by using g_assert_cmpstr()
  blockdev-test: Clean up bogus drive_add argument
  blockdev-test: Use single rather than double quotes in QMP
  drive_del-test: Merge of qdev-monitor-test, blockdev-test
  iotests: qemu-img info output for corrupt image
  qapi: Add corrupt field to ImageInfoSpecificQCow2
  iotests: Use _img_info
  util: Emancipate id_wellformed() from QemuOpts
  q35/ahci: Pick up -cdrom and -hda options
  qtest/bios-tables: Correct Q35 command line
  ide: Update ide_drive_get to be HBA agnostic
  pc/vl: Add units-per-default-bus property
  blockdev: Allow overriding if_max_dev property
  blockdev: Orphaned drive search
  qemu-iotests: Fix supported cache modes for 052
  make check-block: Use default cache modes
  Modify qemu_opt_rename to realize renaming all items in opts
  vmdk: Fix integer overflow in offset calculation
  ...

Signed-off-by: Peter Maydell <address@hidden>


Compare: https://github.com/qemu/qemu/compare/b00a0ddb31a3...507ef2f9fab3