qemu-commits
[Top][All Lists]
Advanced

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

[Qemu-commits] [qemu/qemu] 5cf87f: block: forbid x-blockdev-del from act


From: GitHub
Subject: [Qemu-commits] [qemu/qemu] 5cf87f: block: forbid x-blockdev-del from acting on DriveI...
Date: Tue, 05 Apr 2016 10:00:06 -0700

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: 5cf87fd68e1ea06013594682cec6feb5488fb773
      
https://github.com/qemu/qemu/commit/5cf87fd68e1ea06013594682cec6feb5488fb773
  Author: Paolo Bonzini <address@hidden>
  Date:   2016-04-05 (Tue, 05 Apr 2016)

  Changed paths:
    M blockdev.c

  Log Message:
  -----------
  block: forbid x-blockdev-del from acting on DriveInfo

Failing on -drive/drive_add created BlockBackends was a
requirement for x-blockdev-del, but it sneaked through
the patch review.  Let's fix it now.

Example:

$ x86_64-softmmu/qemu-system-x86_64 -drive if=none,file=null-co://,id=null -qmp 
stdio
>> {'execute':'qmp_capabilities'}
<< {"return": {}}
>> {'execute':'x-blockdev-del','arguments':{'id':'null'}}
<< {"error": {"class": "GenericError", "desc": "Deleting block backend added 
with drive-add is not supported"}}

And without a DriveInfo:

>> { "execute": "blockdev-add", "arguments": { "options": { "driver":"null-co", 
>> "id":"null2"}}}
<< {"return": {}}
>> {'execute':'x-blockdev-del','arguments':{'id':'null2'}}
<< {"return": {}}

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


  Commit: 76b223200ef4fb09dd87f0e213159795eb68e7a5
      
https://github.com/qemu/qemu/commit/76b223200ef4fb09dd87f0e213159795eb68e7a5
  Author: Kevin Wolf <address@hidden>
  Date:   2016-04-05 (Tue, 05 Apr 2016)

  Changed paths:
    M block.c
    M blockdev.c

  Log Message:
  -----------
  block: Forbid I/O throttling on nodes with multiple parents for 2.6

As the patches to move I/O throttling to BlockBackend didn't make it in
time for the 2.6 release, but the release adds new ways of configuring
VMs whose behaviour would change once the move is done, we need to
outlaw such configurations temporarily.

The problem exists whenever a BDS has more users than just its BB, for
example it is used as a backing file for another node. (This wasn't
possible in 2.5 yet as we introduced node references to specify a
backing file only recently.) In these cases, the throttling would
apply to these other users now, but after moving throttling to the
BlockBackend the other users wouldn't be throttled any more.

This patch prevents making new references to a throttled node as well as
using monitor commands to throttle a node with multiple parents.

Compared to 2.5 this changes behaviour in some corner cases where
references were allowed before, like bs->file or Quorum children. It
seems reasonable to assume that users didn't use I/O throttling on such
low level nodes. With the upcoming move of throttling into BlockBackend,
such configurations won't be possible anyway.

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


  Commit: 08db36f6ec29aff59c11c0f7524c2481d8a27636
      
https://github.com/qemu/qemu/commit/08db36f6ec29aff59c11c0f7524c2481d8a27636
  Author: Fam Zheng <address@hidden>
  Date:   2016-04-05 (Tue, 05 Apr 2016)

  Changed paths:
    M tests/qemu-iotests/149

  Log Message:
  -----------
  qemu-iotests: 149: Use "/usr/bin/env python"

Do the same as other scripts, to pick the correct interpreter between
python2 and python3 from the environment.

Signed-off-by: Fam Zheng <address@hidden>
Message-id: address@hidden
Signed-off-by: Max Reitz <address@hidden>


  Commit: 95c3df5a24e2f18129b58691c2ebaf0d86808525
      
https://github.com/qemu/qemu/commit/95c3df5a24e2f18129b58691c2ebaf0d86808525
  Author: Eric Blake <address@hidden>
  Date:   2016-04-05 (Tue, 05 Apr 2016)

  Changed paths:
    M block/crypto.c

  Log Message:
  -----------
  crypto: Avoid memory leak on failure

Commit 7836857 introduced a memory leak due to invalid use of
Error vs. visit_type_end().  If visiting the intermediate
members fails, we clear the error and unconditionally use
visit_end_struct() on the same error object; but if that
cleanup succeeds, we then skip the qapi_free call.

Until a later patch adds visit_check_struct(), the only safe
approach is to use two separate error objects.

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


  Commit: 6a5c357fdbd4c91c5142f1b7ccf4658664b52ea2
      
https://github.com/qemu/qemu/commit/6a5c357fdbd4c91c5142f1b7ccf4658664b52ea2
  Author: Kevin Wolf <address@hidden>
  Date:   2016-04-05 (Tue, 05 Apr 2016)

  Changed paths:
    M block/crypto.c
    M tests/qemu-iotests/149

  Log Message:
  -----------
  Merge remote-tracking branch 'mreitz/tags/pull-block-for-kevin-2016-04-05' 
into queue-block

Block patches for the 2.6 release

# gpg: Signature made Tue Apr  5 17:23:48 2016 CEST using RSA key ID E838ACAD
# gpg: Good signature from "Max Reitz <address@hidden>"

* mreitz/tags/pull-block-for-kevin-2016-04-05:
  crypto: Avoid memory leak on failure
  qemu-iotests: 149: Use "/usr/bin/env python"

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


  Commit: 31370dbe5d68d146b8802933587d5341438646f0
      
https://github.com/qemu/qemu/commit/31370dbe5d68d146b8802933587d5341438646f0
  Author: Peter Maydell <address@hidden>
  Date:   2016-04-05 (Tue, 05 Apr 2016)

  Changed paths:
    M block.c
    M block/crypto.c
    M blockdev.c
    M tests/qemu-iotests/149

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

Block layer patches for 2.6

# gpg: Signature made Tue 05 Apr 2016 16:32:25 BST using RSA key ID C88F2FD6
# gpg: Good signature from "Kevin Wolf <address@hidden>"

* remotes/kevin/tags/for-upstream:
  crypto: Avoid memory leak on failure
  qemu-iotests: 149: Use "/usr/bin/env python"
  block: Forbid I/O throttling on nodes with multiple parents for 2.6
  block: forbid x-blockdev-del from acting on DriveInfo

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


Compare: https://github.com/qemu/qemu/compare/a226f7653620...31370dbe5d68

reply via email to

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