On 05/31/2016 06:39 PM, John Ferlan wrote:
v1: http://www.redhat.com/archives/libvir-list/2016-May/msg02017.html
Changes in v2:
Patch 1 - Move function to a new src/util/virqemu.c with adjustments to other affected areas
Patches 2-4 - Similarly adjust the flow/name of the patches with an adjustment so that patch 2 is just the new code in virqemu.c and patch 3 shows how the master secret code would use the same function to build it's command line. Patch 4 just follows suit...
Based on the ongoing discussion in v1: http://www.redhat.com/archives/libvir-list/2016-June/msg00014.html I'll drop patches 2-4 (although I may add one to use virJSONValueObjectCreate rather than the current open code in qemuBuildMasterKeyCommandLine). John
Patch 5 was reviewed/ACK'd - this patch just shows the changes to remove the "virSecretPtr secret = NULL;" and "virObjectUnref(secret);"
Patch 6 is unchanged
John Ferlan (6): qemu: Move and rename qemuBuildObjectCommandlineFromJSON util: Introduce virQEMUBuildSecretObjectProps qemu: Use virQEMUBuildSecretObjectProps to build secret objects qemu: Rework secinfo command line building storage: Use virSecretGetSecretString secret: Move virStorageSecretType to secret_util and rename
cfg.mk | 2 +- po/POTFILES.in | 1 + src/Makefile.am | 2 + src/libvirt_private.syms | 5 + src/libxl/libxl_conf.c | 2 +- src/qemu/qemu_command.c | 219 +++++---------------- src/qemu/qemu_command.h | 4 - src/qemu/qemu_domain.c | 4 +- src/secret/secret_util.c | 18 +- src/secret/secret_util.h | 22 ++- src/storage/storage_backend_iscsi.c | 55 +----- src/storage/storage_backend_rbd.c | 49 +---- src/util/virqemu.c | 211 ++++++++++++++++++++ src/util/virqemu.h | 42 ++++ src/util/virstoragefile.c | 33 ++-- src/util/virstoragefile.h | 17 +- tests/qemuargv2xmltest.c | 4 +- tests/qemucommandutiltest.c | 9 +- ...muxml2argv-disk-drive-network-rbd-auth-AES.args | 3 +- .../qemuxml2argvdata/qemuxml2argv-master-key.args | 3 +- .../qemuxml2argvdata/qemuxml2argv-name-escape.args | 3 +- 21 files changed, 380 insertions(+), 328 deletions(-) create mode 100644 src/util/virqemu.c create mode 100644 src/util/virqemu.h