qemu-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Qemu-commits] [qemu/qemu] bb9f8d: qcow2: fix encryption during cow of s


From: GitHub
Subject: [Qemu-commits] [qemu/qemu] bb9f8d: qcow2: fix encryption during cow of sectors
Date: Fri, 23 Sep 2016 10:00:04 -0700

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: bb9f8dd0e15a9744b8d09d06ecb6a18ca3dcc173
      
https://github.com/qemu/qemu/commit/bb9f8dd0e15a9744b8d09d06ecb6a18ca3dcc173
  Author: Daniel P. Berrange <address@hidden>
  Date:   2016-09-23 (Fri, 23 Sep 2016)

  Changed paths:
    M block/qcow2-cluster.c
    A tests/qemu-iotests/158
    A tests/qemu-iotests/158.out
    M tests/qemu-iotests/group

  Log Message:
  -----------
  qcow2: fix encryption during cow of sectors

Broken in previous commit:

  commit aaa4d20b4972bb1a811ce929502e6741835d584e
  Author: Kevin Wolf <address@hidden>
  Date:   Wed Jun 1 15:21:05 2016 +0200

      qcow2: Make copy_sectors() byte based

The copy_sectors() code was originally using the 'sector'
parameter for encryption, which was passed in by the caller
from the QCowL2Meta.offset field (aka the guest logical
offset).

After the change, the code is using 'cluster_offset' which
was passed in from QCow2L2Meta.alloc_offset field (aka the
host physical offset).

This would cause the data to be encrypted using an incorrect
initialization vector which will in turn cause later reads
to return garbage.

Although current qcow2 built-in encryption is blocked from
usage in the emulator, one could still hit this if writing
to the file via qemu-{img,io,nbd} commands.

Cc: address@hidden
Signed-off-by: Daniel P. Berrange <address@hidden>
Signed-off-by: Kevin Wolf <address@hidden>


  Commit: 1813d33015f0a6780609739999f3962f2dc56921
      
https://github.com/qemu/qemu/commit/1813d33015f0a6780609739999f3962f2dc56921
  Author: Kevin Wolf <address@hidden>
  Date:   2016-09-23 (Fri, 23 Sep 2016)

  Changed paths:
    M hmp.c

  Log Message:
  -----------
  hmp: Remove dead code in hmp_qemu_io()

blk can never be NULL, drop the check. This fixes a Coverity warning.

Signed-off-by: Kevin Wolf <address@hidden>
Reviewed-by: Marc-André Lureau <address@hidden>


  Commit: c2519009b428fb19a9fdbc707e786b1cebd4994f
      
https://github.com/qemu/qemu/commit/c2519009b428fb19a9fdbc707e786b1cebd4994f
  Author: Denis V. Lunev <address@hidden>
  Date:   2016-09-23 (Fri, 23 Sep 2016)

  Changed paths:
    M tests/check-block.sh

  Log Message:
  -----------
  tests: allow to specify list of formats to test for check-block.sh

This would make code better and allow to test specific format.

Signed-off-by: Denis V. Lunev <address@hidden>
CC: Stefan Hajnoczi <address@hidden>
CC: Kevin Wolf <address@hidden>
CC: Paolo Bonzini <address@hidden>
Signed-off-by: Kevin Wolf <address@hidden>


  Commit: 38b5e4c3dc6d713eae340341ee139c12d5c1a21e
      
https://github.com/qemu/qemu/commit/38b5e4c3dc6d713eae340341ee139c12d5c1a21e
  Author: Alberto Garcia <address@hidden>
  Date:   2016-09-23 (Fri, 23 Sep 2016)

  Changed paths:
    M block.c
    M include/block/block.h

  Log Message:
  -----------
  block: Remove bdrv_is_snapshot

This is unnecessary and has been unused since 5433c24f0f9306c82ad9bcc.

Signed-off-by: Alberto Garcia <address@hidden>
Reviewed-by: Kevin Wolf <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Signed-off-by: Kevin Wolf <address@hidden>


  Commit: 14499ea5413be45bbb3934dd6fd8fa27c54c1dd4
      
https://github.com/qemu/qemu/commit/14499ea5413be45bbb3934dd6fd8fa27c54c1dd4
  Author: Alberto Garcia <address@hidden>
  Date:   2016-09-23 (Fri, 23 Sep 2016)

  Changed paths:
    M block.c

  Log Message:
  -----------
  block: Set BDRV_O_ALLOW_RDWR and snapshot_options before storing the flags

If an image is opened with snapshot=on, its flags are modified by
bdrv_backing_options() and then bs->open_flags is updated accordingly.
This last step is unnecessary if we calculate the new flags before
setting bs->open_flags.

Soon we'll introduce the "read-only" option, and then we'll need to
be able to modify its value in the QDict when snapshot=on. This is
more cumbersome if bs->options is already set. This patch simplifies
that. Other than that, there are no semantic changes. Although it
might seem that bs->options can have a different value now because
it is stored after calling bdrv_backing_options(), this call doesn't
actually modify them in this scenario.

The code that sets BDRV_O_ALLOW_RDWR is also moved for the same
reason.

Signed-off-by: Alberto Garcia <address@hidden>
Signed-off-by: Kevin Wolf <address@hidden>


  Commit: 9b7e8691670fab57c387b6955dc14a09696ae034
      
https://github.com/qemu/qemu/commit/9b7e8691670fab57c387b6955dc14a09696ae034
  Author: Alberto Garcia <address@hidden>
  Date:   2016-09-23 (Fri, 23 Sep 2016)

  Changed paths:
    M block.c

  Log Message:
  -----------
  block: Update bs->open_flags earlier in bdrv_open_common()

We're only doing this immediately before opening the image, but
bs->open_flags is used earlier in the function. At the moment this is
not causing problems because none of the checked flags are modified by
update_flags_from_options(), but this will change when we introduce
the "read-only" option.

This patch calls update_flags_from_options() at the beginning of the
function, immediately after creating the QemuOpts.

Signed-off-by: Alberto Garcia <address@hidden>
Reviewed-by: Kevin Wolf <address@hidden>
Signed-off-by: Kevin Wolf <address@hidden>


  Commit: f87a0e29a9814a7ab6ee92b238989fed6186c4f3
      
https://github.com/qemu/qemu/commit/f87a0e29a9814a7ab6ee92b238989fed6186c4f3
  Author: Alberto Garcia <address@hidden>
  Date:   2016-09-23 (Fri, 23 Sep 2016)

  Changed paths:
    M block.c
    M block/vvfat.c
    M blockdev.c
    M include/block/block.h

  Log Message:
  -----------
  block: Add "read-only" to the options QDict

This adds the "read-only" option to the QDict. One important effect of
this change is that when a child inherits options from its parent, the
existing "read-only" mode can be preserved if it was explicitly set
previously.

This addresses scenarios like this:

   [E] <- [D] <- [C] <- [B] <- [A]

In this case, if we reopen [D] with read-only=off, and later reopen
[B], then [D] will not inherit read-only=on from its parent during the
bdrv_reopen_queue_child() stage.

The BDRV_O_RDWR flag is not removed yet, but its keep in sync with the
value of the "read-only" option.

Signed-off-by: Alberto Garcia <address@hidden>
Signed-off-by: Kevin Wolf <address@hidden>


  Commit: 5b7ba05fe7313b03712e129a86fa70c2c215e908
      
https://github.com/qemu/qemu/commit/5b7ba05fe7313b03712e129a86fa70c2c215e908
  Author: Alberto Garcia <address@hidden>
  Date:   2016-09-23 (Fri, 23 Sep 2016)

  Changed paths:
    M block.c

  Log Message:
  -----------
  block: Don't queue the same BDS twice in bdrv_reopen_queue_child()

bdrv_reopen_queue_child() assumes that a BlockDriverState is never
added twice to BlockReopenQueue.

That's however not the case: commit_start() adds 'base' (and its
children) to a new reopen queue, and then 'overlay_bs' (and its
children, which include 'base') to the same queue. The effect of this
is that the first set of options is ignored and overriden by the
second.

We fixed this by swapping the order in which both BDSs were added to
the queue in 3db2bd5508c86a1605258bc77c9672d93b5c350e. This patch
checks if a BDS is already in the reopen queue and keeps its options.

Signed-off-by: Alberto Garcia <address@hidden>
Reviewed-by: Kevin Wolf <address@hidden>
Signed-off-by: Kevin Wolf <address@hidden>


  Commit: 0fe282bb4b29ad51adefc2e500bcecfb3c499e10
      
https://github.com/qemu/qemu/commit/0fe282bb4b29ad51adefc2e500bcecfb3c499e10
  Author: Alberto Garcia <address@hidden>
  Date:   2016-09-23 (Fri, 23 Sep 2016)

  Changed paths:
    M block/commit.c

  Log Message:
  -----------
  commit: Add 'base' to the reopen queue before 'overlay_bs'

Now that we're checking for duplicates in the reopen queue, there's no
need to force a specific order in which the queue is constructed so we
can revert 3db2bd5508c86a1605258bc77c9672d93b5c350e.

Since both ways of constructing the queue are now valid, this patch
doesn't have any effect on the behavior of QEMU and is not strictly
necessary. However it can help us check that the fix for the reopen
queue is robust: if it stops working properly at some point, iotest
040 will break.

Signed-off-by: Alberto Garcia <address@hidden>
Reviewed-by: Kevin Wolf <address@hidden>
Signed-off-by: Kevin Wolf <address@hidden>


  Commit: 4e200cf8e64cc37abf00c53b299a794c80276360
      
https://github.com/qemu/qemu/commit/4e200cf8e64cc37abf00c53b299a794c80276360
  Author: Alberto Garcia <address@hidden>
  Date:   2016-09-23 (Fri, 23 Sep 2016)

  Changed paths:
    M blockdev.c

  Log Message:
  -----------
  block: rename "read-only" to BDRV_OPT_READ_ONLY

There were a few instances left. After this patch we're using the
macro in all places.

Signed-off-by: Alberto Garcia <address@hidden>
Reviewed-by: Kevin Wolf <address@hidden>
Signed-off-by: Kevin Wolf <address@hidden>


  Commit: 6bed02805666035a59daa6a46935074f6f6d507d
      
https://github.com/qemu/qemu/commit/6bed02805666035a59daa6a46935074f6f6d507d
  Author: Kevin Wolf <address@hidden>
  Date:   2016-09-23 (Fri, 23 Sep 2016)

  Changed paths:
    M qapi/block-core.json

  Log Message:
  -----------
  block: Fix 'since' for compressed Drive/BlockdevBackup

These patches missed 2.7, update the QAPI documentation.

Reported-by: Eric Blake <address@hidden>
Signed-off-by: Kevin Wolf <address@hidden>
Reviewed-by: Eric Blake <address@hidden>


  Commit: 1c89e1fa2fb1414f4485a01924032ad9cdb9073d
      
https://github.com/qemu/qemu/commit/1c89e1fa2fb1414f4485a01924032ad9cdb9073d
  Author: Kevin Wolf <address@hidden>
  Date:   2016-09-23 (Fri, 23 Sep 2016)

  Changed paths:
    M block/block-backend.c
    M include/sysemu/block-backend.h

  Log Message:
  -----------
  block: Add blk_by_dev()

This finds a BlockBackend given the device model that is attached to it.

Signed-off-by: Kevin Wolf <address@hidden>
Reviewed-by: Eric Blake <address@hidden>


  Commit: 6c1db528b0e1a68c342d49d032af1c707e9de87c
      
https://github.com/qemu/qemu/commit/6c1db528b0e1a68c342d49d032af1c707e9de87c
  Author: Kevin Wolf <address@hidden>
  Date:   2016-09-23 (Fri, 23 Sep 2016)

  Changed paths:
    M qdev-monitor.c

  Log Message:
  -----------
  qdev-monitor: Factor out find_device_state()

Signed-off-by: Kevin Wolf <address@hidden>
Reviewed-by: Eric Blake <address@hidden>


  Commit: 9680caee0fa530726809bc72d44e127ae676e251
      
https://github.com/qemu/qemu/commit/9680caee0fa530726809bc72d44e127ae676e251
  Author: Kevin Wolf <address@hidden>
  Date:   2016-09-23 (Fri, 23 Sep 2016)

  Changed paths:
    M include/sysemu/block-backend.h
    M qdev-monitor.c

  Log Message:
  -----------
  qdev-monitor: Add blk_by_qdev_id()

This finds the BlockBackend attached to the device model identified by
its qdev ID.

Signed-off-by: Kevin Wolf <address@hidden>
Reviewed-by: Eric Blake <address@hidden>


  Commit: b33945cfffcc3f847122dbf5db00fff28161c593
      
https://github.com/qemu/qemu/commit/b33945cfffcc3f847122dbf5db00fff28161c593
  Author: Kevin Wolf <address@hidden>
  Date:   2016-09-23 (Fri, 23 Sep 2016)

  Changed paths:
    M blockdev.c
    M docs/qmp-commands.txt
    M qapi/block-core.json

  Log Message:
  -----------
  block: Accept device model name for blockdev-open/close-tray

In order to remove the need for BlockBackend names in the external API,
we want to allow qdev device names in all device related commands.

This converts blockdev-open/close-tray to accept a qdev device name.

Signed-off-by: Kevin Wolf <address@hidden>


  Commit: 716df21707b9c95d61c86e1df9105d0cefe59a97
      
https://github.com/qemu/qemu/commit/716df21707b9c95d61c86e1df9105d0cefe59a97
  Author: Kevin Wolf <address@hidden>
  Date:   2016-09-23 (Fri, 23 Sep 2016)

  Changed paths:
    M blockdev.c
    M docs/qmp-commands.txt
    M qapi/block-core.json

  Log Message:
  -----------
  block: Accept device model name for x-blockdev-insert-medium

In order to remove the need for BlockBackend names in the external API,
we want to allow qdev device names in all device related commands.

This converts x-blockdev-insert-medium to accept a qdev device name.

As the command is experimental, we can still remove the 'device' option
that uses the BlockBackend name. This requires some test case changes
and is left for another series.

Signed-off-by: Kevin Wolf <address@hidden>


  Commit: 00949babe90c528df1ffb79439d632c7bd4f6c42
      
https://github.com/qemu/qemu/commit/00949babe90c528df1ffb79439d632c7bd4f6c42
  Author: Kevin Wolf <address@hidden>
  Date:   2016-09-23 (Fri, 23 Sep 2016)

  Changed paths:
    M blockdev.c
    M docs/qmp-commands.txt
    M qapi/block-core.json

  Log Message:
  -----------
  block: Accept device model name for x-blockdev-remove-medium

In order to remove the need for BlockBackend names in the external API,
we want to allow qdev device names in all device related commands.

This converts x-blockdev-remove-medium to accept a qdev device name.

As the command is experimental, we can still remove the 'device' option
that uses the BlockBackend name. This requires some test case changes
and is left for another series.

Signed-off-by: Kevin Wolf <address@hidden>


  Commit: fbe2d8163e8900fe22c67f55bd09ebc6f322f430
      
https://github.com/qemu/qemu/commit/fbe2d8163e8900fe22c67f55bd09ebc6f322f430
  Author: Kevin Wolf <address@hidden>
  Date:   2016-09-23 (Fri, 23 Sep 2016)

  Changed paths:
    M blockdev.c
    M docs/qmp-commands.txt
    M hmp.c
    M qapi/block.json
    M ui/cocoa.m

  Log Message:
  -----------
  block: Accept device model name for eject

In order to remove the need for BlockBackend names in the external API,
we want to allow qdev device names in all device related commands.

This converts eject to accept a qdev device name.

Signed-off-by: Kevin Wolf <address@hidden>


  Commit: 70e2cb3bd75fc7aa988f81eae854001e8fcbffe1
      
https://github.com/qemu/qemu/commit/70e2cb3bd75fc7aa988f81eae854001e8fcbffe1
  Author: Kevin Wolf <address@hidden>
  Date:   2016-09-23 (Fri, 23 Sep 2016)

  Changed paths:
    M blockdev.c
    M docs/qmp-commands.txt
    M hmp.c
    M qapi/block-core.json
    M qmp.c
    M ui/cocoa.m

  Log Message:
  -----------
  block: Accept device model name for blockdev-change-medium

In order to remove the need for BlockBackend names in the external API,
we want to allow qdev device names in all device related commands.

This converts blockdev-change-medium to accept a qdev device name.

Signed-off-by: Kevin Wolf <address@hidden>


  Commit: 7a9877a0263561f11bae116a7639eec53a625807
      
https://github.com/qemu/qemu/commit/7a9877a0263561f11bae116a7639eec53a625807
  Author: Kevin Wolf <address@hidden>
  Date:   2016-09-23 (Fri, 23 Sep 2016)

  Changed paths:
    M blockdev.c
    M docs/qmp-commands.txt
    M qapi/block-core.json

  Log Message:
  -----------
  block: Accept device model name for block_set_io_throttle

In order to remove the need for BlockBackend names in the external API,
we want to allow qdev device names in all device related commands.

This converts block_set_io_throttle to accept a qdev device name.

Signed-off-by: Kevin Wolf <address@hidden>


  Commit: 486b88bdc87eb70d26428624a1669824e093c861
      
https://github.com/qemu/qemu/commit/486b88bdc87eb70d26428624a1669824e093c861
  Author: Kevin Wolf <address@hidden>
  Date:   2016-09-23 (Fri, 23 Sep 2016)

  Changed paths:
    M tests/qemu-iotests/118
    M tests/qemu-iotests/iotests.py

  Log Message:
  -----------
  qemu-iotests/118: Test media change with qdev name

We just added the option to use qdev device names in all device related
block QMP commands. This patch converts some of the test cases in 118 to
use qdev device names instead of BlockBackend names to cover the new
way. It converts cases for each of the media change commands, but only
for CD-ROM and not everywhere, so that the old way is still tested, too.

Signed-off-by: Kevin Wolf <address@hidden>
Reviewed-by: Eric Blake <address@hidden>


  Commit: 476fb028bf21cd44f5e3a72c856147a00e74f670
      
https://github.com/qemu/qemu/commit/476fb028bf21cd44f5e3a72c856147a00e74f670
  Author: Kevin Wolf <address@hidden>
  Date:   2016-09-23 (Fri, 23 Sep 2016)

  Changed paths:
    M tests/qemu-iotests/041

  Log Message:
  -----------
  qemu-iotests/041: Avoid blockdev-add with id

We want to remove the 'id' option for blockdev-add. This removes one
user of the option and makes it use only node names.

Signed-off-by: Kevin Wolf <address@hidden>
Reviewed-by: Eric Blake <address@hidden>


  Commit: 522ce4ecd4e93f77ba4cd399b25db1fd5405c7e9
      
https://github.com/qemu/qemu/commit/522ce4ecd4e93f77ba4cd399b25db1fd5405c7e9
  Author: Kevin Wolf <address@hidden>
  Date:   2016-09-23 (Fri, 23 Sep 2016)

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

  Log Message:
  -----------
  qemu-iotests/067: Avoid blockdev-add with id

We want to remove the 'id' option for blockdev-add. This removes one
user of the option and makes it use only node names.

In order to keep the test meaningful, some instances of query-block that
want to check whether the node still exists and would now turn up empty
must be converted to query-named-block-nodes (which also return the
protocol level node, but that shouldn't hurt).

Signed-off-by: Kevin Wolf <address@hidden>
Reviewed-by: Eric Blake <address@hidden>


  Commit: ffec99f722b32933745e05be1a3a82e567506d36
      
https://github.com/qemu/qemu/commit/ffec99f722b32933745e05be1a3a82e567506d36
  Author: Kevin Wolf <address@hidden>
  Date:   2016-09-23 (Fri, 23 Sep 2016)

  Changed paths:
    M tests/qemu-iotests/071

  Log Message:
  -----------
  qemu-iotests/071: Avoid blockdev-add with id

We want to remove the 'id' option for blockdev-add. This removes one
user of the option and makes it use only node names.

Signed-off-by: Kevin Wolf <address@hidden>
Reviewed-by: Eric Blake <address@hidden>


  Commit: 26d5fa10ff9a0701bf5860e6548b9eda496b3474
      
https://github.com/qemu/qemu/commit/26d5fa10ff9a0701bf5860e6548b9eda496b3474
  Author: Kevin Wolf <address@hidden>
  Date:   2016-09-23 (Fri, 23 Sep 2016)

  Changed paths:
    M tests/qemu-iotests/081

  Log Message:
  -----------
  qemu-iotests/081: Avoid blockdev-add with id

We want to remove the 'id' option for blockdev-add. This removes one
user of the option and makes it use only node names.

Signed-off-by: Kevin Wolf <address@hidden>
Reviewed-by: Eric Blake <address@hidden>


  Commit: 5feb08ed8ff18e5fb43e795585c83b4cbdded508
      
https://github.com/qemu/qemu/commit/5feb08ed8ff18e5fb43e795585c83b4cbdded508
  Author: Kevin Wolf <address@hidden>
  Date:   2016-09-23 (Fri, 23 Sep 2016)

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

  Log Message:
  -----------
  qemu-iotests/087: Avoid blockdev-add with id

We want to remove the 'id' option for blockdev-add. This removes one
user of the option and makes it use only node names.

The test cases that test conflicts between the 'id' option to
blockdev-add and existing block devices or the 'node-name' of the same
command can be removed because it won't be possible to specify this at
the end of the series.

Signed-off-by: Kevin Wolf <address@hidden>
Reviewed-by: Eric Blake <address@hidden>


  Commit: 1f4c4d73617ac3501b44c67fbfe614482921574c
      
https://github.com/qemu/qemu/commit/1f4c4d73617ac3501b44c67fbfe614482921574c
  Author: Kevin Wolf <address@hidden>
  Date:   2016-09-23 (Fri, 23 Sep 2016)

  Changed paths:
    M tests/qemu-iotests/117

  Log Message:
  -----------
  qemu-iotests/117: Avoid blockdev-add with id

We want to remove the 'id' option for blockdev-add. This removes one
user of the option and makes it use only node names.

Signed-off-by: Kevin Wolf <address@hidden>
Reviewed-by: Eric Blake <address@hidden>


  Commit: e4fd2e9dfca0b592e329eec9ba753914e7941104
      
https://github.com/qemu/qemu/commit/e4fd2e9dfca0b592e329eec9ba753914e7941104
  Author: Kevin Wolf <address@hidden>
  Date:   2016-09-23 (Fri, 23 Sep 2016)

  Changed paths:
    M tests/qemu-iotests/118

  Log Message:
  -----------
  qemu-iotests/118: Avoid blockdev-add with id

We want to remove the 'id' option for blockdev-add. This removes one
user of the option and makes it use only node names.

Signed-off-by: Kevin Wolf <address@hidden>
Reviewed-by: Eric Blake <address@hidden>


  Commit: eed875838e8d667e1fad5f6f5872c3d60ee266dd
      
https://github.com/qemu/qemu/commit/eed875838e8d667e1fad5f6f5872c3d60ee266dd
  Author: Kevin Wolf <address@hidden>
  Date:   2016-09-23 (Fri, 23 Sep 2016)

  Changed paths:
    M tests/qemu-iotests/124

  Log Message:
  -----------
  qemu-iotests/124: Avoid blockdev-add with id

We want to remove the 'id' option for blockdev-add. This removes one
user of the option and makes it use only node names.

Signed-off-by: Kevin Wolf <address@hidden>
Reviewed-by: Eric Blake <address@hidden>


  Commit: 62acae8a9d20c872212aec59d4a0a634a97e87f0
      
https://github.com/qemu/qemu/commit/62acae8a9d20c872212aec59d4a0a634a97e87f0
  Author: Kevin Wolf <address@hidden>
  Date:   2016-09-23 (Fri, 23 Sep 2016)

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

  Log Message:
  -----------
  qemu-iotests/139: Avoid blockdev-add with id

We want to remove the 'id' option for blockdev-add. This removes one
user of the option and makes it use only node names.

Some test cases that used to work with an unattached BlockBackend are
removed, either because they don't make sense with an attached device or
because the equivalent test case with an attached device already exists.

Signed-off-by: Kevin Wolf <address@hidden>
Reviewed-by: Eric Blake <address@hidden>


  Commit: e467da7b92ca207f02d29f52583a1097440a83cc
      
https://github.com/qemu/qemu/commit/e467da7b92ca207f02d29f52583a1097440a83cc
  Author: Kevin Wolf <address@hidden>
  Date:   2016-09-23 (Fri, 23 Sep 2016)

  Changed paths:
    M blockdev.c
    M tests/qemu-iotests/085.out

  Log Message:
  -----------
  block: Avoid printing NULL string in error messages

Even for nodes that have a BlockBackend attached, bdrv_get_parent_name()
can return NULL if the BB is anonymous (e.g. it belongs to a block job
or a device that was created with a drive=<node-name> option).

Remove the information from the error message. The user probably knows
already why the node is still in use.

Signed-off-by: Kevin Wolf <address@hidden>
Reviewed-by: Eric Blake <address@hidden>


  Commit: 78645881508ebcfced97dc608b90179b264914e9
      
https://github.com/qemu/qemu/commit/78645881508ebcfced97dc608b90179b264914e9
  Author: Kevin Wolf <address@hidden>
  Date:   2016-09-23 (Fri, 23 Sep 2016)

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

  Log Message:
  -----------
  qemu-iotests/141: Avoid blockdev-add with id

We want to remove the 'id' option for blockdev-add. This removes one
user of the option and makes it use only node names.

Signed-off-by: Kevin Wolf <address@hidden>
Reviewed-by: Eric Blake <address@hidden>


  Commit: 9ec8873e684c2dae6fadb3a801057c613ccd2a6b
      
https://github.com/qemu/qemu/commit/9ec8873e684c2dae6fadb3a801057c613ccd2a6b
  Author: Kevin Wolf <address@hidden>
  Date:   2016-09-23 (Fri, 23 Sep 2016)

  Changed paths:
    M blockdev.c
    M docs/qmp-commands.txt
    M qapi/block-core.json
    M tests/qemu-iotests/087.out

  Log Message:
  -----------
  block: Remove BB interface from blockdev-add/del

With this patch, blockdev-add always works on a node level, i.e. it
creates a BDS, but no BB. Consequently, x-blockdev-del doesn't need the
'device' option any more, but 'node-name' becomes mandatory.

Signed-off-by: Kevin Wolf <address@hidden>
Reviewed-by: Eric Blake <address@hidden>


  Commit: 3b71ec8516bb50e9a743645bf139571de0b39f61
      
https://github.com/qemu/qemu/commit/3b71ec8516bb50e9a743645bf139571de0b39f61
  Author: Peter Maydell <address@hidden>
  Date:   2016-09-23 (Fri, 23 Sep 2016)

  Changed paths:
    M block.c
    M block/block-backend.c
    M block/commit.c
    M block/qcow2-cluster.c
    M block/vvfat.c
    M blockdev.c
    M docs/qmp-commands.txt
    M hmp.c
    M include/block/block.h
    M include/sysemu/block-backend.h
    M qapi/block-core.json
    M qapi/block.json
    M qdev-monitor.c
    M qmp.c
    M tests/check-block.sh
    M tests/qemu-iotests/041
    M tests/qemu-iotests/067
    M tests/qemu-iotests/067.out
    M tests/qemu-iotests/071
    M tests/qemu-iotests/081
    M tests/qemu-iotests/085.out
    M tests/qemu-iotests/087
    M tests/qemu-iotests/087.out
    M tests/qemu-iotests/117
    M tests/qemu-iotests/118
    M tests/qemu-iotests/124
    M tests/qemu-iotests/139
    M tests/qemu-iotests/139.out
    M tests/qemu-iotests/141
    M tests/qemu-iotests/141.out
    A tests/qemu-iotests/158
    A tests/qemu-iotests/158.out
    M tests/qemu-iotests/group
    M tests/qemu-iotests/iotests.py
    M ui/cocoa.m

  Log Message:
  -----------
  Merge remote-tracking branch 'remotes/kevin/tags/for-upstream' into staging

Block layer patches

# gpg: Signature made Fri 23 Sep 2016 12:59:46 BST
# gpg:                using RSA key 0x7F09B272C88F2FD6
# gpg: Good signature from "Kevin Wolf <address@hidden>"
# Primary key fingerprint: DC3D EB15 9A9A F95D 3D74  56FE 7F09 B272 C88F 2FD6

* remotes/kevin/tags/for-upstream: (33 commits)
  block: Remove BB interface from blockdev-add/del
  qemu-iotests/141: Avoid blockdev-add with id
  block: Avoid printing NULL string in error messages
  qemu-iotests/139: Avoid blockdev-add with id
  qemu-iotests/124: Avoid blockdev-add with id
  qemu-iotests/118: Avoid blockdev-add with id
  qemu-iotests/117: Avoid blockdev-add with id
  qemu-iotests/087: Avoid blockdev-add with id
  qemu-iotests/081: Avoid blockdev-add with id
  qemu-iotests/071: Avoid blockdev-add with id
  qemu-iotests/067: Avoid blockdev-add with id
  qemu-iotests/041: Avoid blockdev-add with id
  qemu-iotests/118: Test media change with qdev name
  block: Accept device model name for block_set_io_throttle
  block: Accept device model name for blockdev-change-medium
  block: Accept device model name for eject
  block: Accept device model name for x-blockdev-remove-medium
  block: Accept device model name for x-blockdev-insert-medium
  block: Accept device model name for blockdev-open/close-tray
  qdev-monitor: Add blk_by_qdev_id()
  ...

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


Compare: https://github.com/qemu/qemu/compare/eaff9c4367ac...3b71ec8516bb

reply via email to

[Prev in Thread] Current Thread [Next in Thread]