v3: rebased on master
v2: addressed (hopefully) all of Peter's v1 comments (thanks Peter!)

Or Ozeri (5):
  qemu: add disk post parse to qemublocktest
  qemu: add rbd encryption capability probing
  conf: add luks2 encryption format
  conf: add encryption engine property
  qemu: add librbd encryption engine

 docs/formatstorageencryption.html.in          |   8 +-
 docs/schemas/domainbackup.rng                 |   7 +
 docs/schemas/storagecommon.rng                |   9 +
 src/conf/storage_encryption_conf.c            |  33 +++-
 src/conf/storage_encryption_conf.h            |  11 ++
 src/qemu/qemu_block.c                         |  33 ++++
 src/qemu/qemu_capabilities.c                  |   2 +
 src/qemu/qemu_capabilities.h                  |   1 +
 src/qemu/qemu_domain.c                        |  37 +++-
 src/qemu/qemu_domain.h                        |   3 +
 tests/qemublocktest.c                         |   3 +
 .../caps_6.1.0.x86_64.xml                     |   1 +
 tests/qemustatusxml2xmldata/upgrade-out.xml   |   6 +-
 ...sk-network-rbd-encryption.x86_64-6.0.0.err |   1 +
 ...-network-rbd-encryption.x86_64-latest.args |  49 ++++++
 .../disk-network-rbd-encryption.xml           |  75 +++++++++
 tests/qemuxml2argvtest.c                      |   2 +
 ...k-network-rbd-encryption.x86_64-latest.xml |  83 +++++++++
 tests/qemuxml2xmloutdata/disk-nvme.xml        |  65 ++++++-
 .../disk-slices.x86_64-latest.xml             |   4 +-
 .../encrypted-disk-usage.xml                  |  38 ++++-
 tests/qemuxml2xmloutdata/encrypted-disk.xml   |   2 +-
 .../luks-disks-source-qcow2.x86_64-latest.xml |  14 +-
 .../qemuxml2xmloutdata/luks-disks-source.xml  |  10 +-
 tests/qemuxml2xmloutdata/luks-disks.xml       |  47 +++++-
 tests/qemuxml2xmloutdata/user-aliases.xml     | 159 +++++++++++++++++-
 tests/qemuxml2xmltest.c                       |   1 +
 27 files changed, 677 insertions(+), 27 deletions(-)
 create mode 100644 
tests/qemuxml2argvdata/disk-network-rbd-encryption.x86_64-6.0.0.err
 create mode 100644 
tests/qemuxml2argvdata/disk-network-rbd-encryption.x86_64-latest.args
 create mode 100644 tests/qemuxml2argvdata/disk-network-rbd-encryption.xml
 create mode 100644 
tests/qemuxml2xmloutdata/disk-network-rbd-encryption.x86_64-latest.xml
 mode change 120000 => 100644 tests/qemuxml2xmloutdata/disk-nvme.xml
 mode change 120000 => 100644 tests/qemuxml2xmloutdata/encrypted-disk-usage.xml
 mode change 120000 => 100644 tests/qemuxml2xmloutdata/luks-disks.xml
 mode change 120000 => 100644 tests/qemuxml2xmloutdata/user-aliases.xml

-- 
2.25.1

Reply via email to