qemu-commits
[Top][All Lists]
Advanced

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

[Qemu-commits] [qemu/qemu] 85a353: iotests: 205: support luks format


From: GitHub
Subject: [Qemu-commits] [qemu/qemu] 85a353: iotests: 205: support luks format
Date: Mon, 12 Feb 2018 04:59:00 -0800

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: 85a353a024dc8dcfbb3a3b8ec6061b1663d903d7
      
https://github.com/qemu/qemu/commit/85a353a024dc8dcfbb3a3b8ec6061b1663d903d7
  Author: Vladimir Sementsov-Ogievskiy <address@hidden>
  Date:   2018-02-09 (Fri, 09 Feb 2018)

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

  Log Message:
  -----------
  iotests: 205: support luks format

Support default luks options in VM.add_drive and in new library
function qemu_img_create. Use it in 205 iotests.

Signed-off-by: Vladimir Sementsov-Ogievskiy <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: Daniel P. Berrange <address@hidden>
Signed-off-by: Eric Blake <address@hidden>


  Commit: e24d813b29d3a478a9309078487efc8ce8599f22
      
https://github.com/qemu/qemu/commit/e24d813b29d3a478a9309078487efc8ce8599f22
  Author: Eric Blake <address@hidden>
  Date:   2018-02-09 (Fri, 09 Feb 2018)

  Changed paths:
    M block.c
    M block/crypto.c
    M block/file-posix.c
    M block/iscsi.c
    M block/nbd.c
    M block/qcow2.c
    M block/qed.c
    M include/block/block.h

  Log Message:
  -----------
  block: Simplify bdrv_can_write_zeroes_with_unmap()

We don't need the can_write_zeroes_with_unmap field in
BlockDriverInfo, because it is redundant information with
supported_zero_flags & BDRV_REQ_MAY_UNMAP.  Note that
BlockDriverInfo and supported_zero_flags are both per-device
settings, rather than global state about the driver as a
whole, which means one or both of these bits of information
can already be conditional.  Let's audit how they were set:

crypto: always setting can_write_ to false is pointless (the
struct starts life zero-initialized), no use of supported_

nbd: just recently fixed to set can_write_ if supported_
includes MAY_UNMAP (thus this commit effectively reverts
bca80059e and solves the problem mentioned there in a more
global way)

file-posix, iscsi, qcow2: can_write_ is conditional, while
supported_ was unconditional; but passing MAY_UNMAP would
fail with ENOTSUP if the condition wasn't met

qed: can_write_ is unconditional, but pwrite_zeroes lacks
support for MAY_UNMAP and supported_ is not set. Perhaps
support can be added later (since it would be similar to
qcow2), but for now claiming false is no real loss

all other drivers: can_write_ is not set, and supported_ is
either unset or a passthrough

Simplify the code by moving the conditional into
supported_zero_flags for all drivers, then dropping the
now-unused BDI field.  For callers that relied on
bdrv_can_write_zeroes_with_unmap(), we return the same
per-device settings for drivers that had conditions (no
observable change in behavior there); and can now return
true (instead of false) for drivers that support passthrough
(for example, the commit driver) which gives those drivers
the same fix as nbd just got in bca80059e.  For callers that
relied on supported_zero_flags, we now have a few more places
that can avoid a wasted call to pwrite_zeroes() that will
just fail with ENOTSUP.

Suggested-by: Paolo Bonzini <address@hidden>
Signed-off-by: Eric Blake <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: Stefan Hajnoczi <address@hidden>


  Commit: 019bb9ac98f51c3ce362978c6e0c82d853762aa0
      
https://github.com/qemu/qemu/commit/019bb9ac98f51c3ce362978c6e0c82d853762aa0
  Author: Peter Maydell <address@hidden>
  Date:   2018-02-12 (Mon, 12 Feb 2018)

  Changed paths:
    M block.c
    M block/crypto.c
    M block/file-posix.c
    M block/iscsi.c
    M block/nbd.c
    M block/qcow2.c
    M block/qed.c
    M include/block/block.h
    M tests/qemu-iotests/205
    M tests/qemu-iotests/iotests.py

  Log Message:
  -----------
  Merge remote-tracking branch 'remotes/ericb/tags/pull-nbd-2018-02-09' into 
staging

nbd patches for 2018-02-09

- Vladimir Sementsov-Ogievskiy: iotests: 205: support luks format
- Eric Blake: block: Simplify bdrv_can_write_zeroes_with_unmap()

# gpg: Signature made Fri 09 Feb 2018 18:34:20 GMT
# gpg:                using RSA key A7A16B4A2527436A
# gpg: Good signature from "Eric Blake <address@hidden>"
# gpg:                 aka "Eric Blake (Free Software Programmer) 
<address@hidden>"
# gpg:                 aka "[jpeg image of size 6874]"
# Primary key fingerprint: 71C2 CC22 B1C4 6029 27D2  F3AA A7A1 6B4A 2527 436A

* remotes/ericb/tags/pull-nbd-2018-02-09:
  block: Simplify bdrv_can_write_zeroes_with_unmap()
  iotests: 205: support luks format

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


Compare: https://github.com/qemu/qemu/compare/c7b02d7d032d...019bb9ac98f5

reply via email to

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