https://bugzilla.redhat.com/show_bug.cgi?id=957295 This is an update of Osier's original patch: https://www.redhat.com/archives/libvir-list/2013-June/msg00673.html I initialially reviewed the patches, but now own the case since Osier is still temporarily out. Changes in v2: * Patch 1 - no change * Update patch 2 to add the missing test and clean up text as I noted * Split patch 3 into two parts Part A: Just the creation of virDomainDiskSourceIsBlockType() - Fixed the code to handle my code review comment regarding checking srcpool too early (before BLOCK) and fix grammar issues noted Part B: Adding 'pooltype' and adjusting qemuTranslateDiskSourcePool() in order to handle the "mode='uri'" so that when the disk is added via qemu_command the data is available for add the disk as ISCSI * Patch 5 (previously patch 4) dealt with changes to security backends; however, I found that those were unnecessary since according to the docs in formatdomain.html in the devices section "(NB, for "volume" type disk, seclabel is only valid when the specified storage volume is of 'file' or 'block' type)." However, since Dan requested to have some tests added for network and volume disk types to the securityselinuxlabeltest, I took the liberty to add those even though the net result is they don't add labels which I guess is an appropriate check - that is that no label is added. NOTE: I tried to figure out a way to add a 'file' storage pool that labels could be attached to, but was unsuccessful. * Patch 6 & 7 (formerly 5 & 6) - no change. Now that I know more about the code the issue I had with 6 is a no-op John Ferlan (3): conf: Introduce virDomainDiskSourceIsBlockType qemu: Translate the iscsi pool/volume disk source tests: Add various network and volume definitions Osier Yang (4): storage_iscsi: Reflect the default target port conf: Introduce new XML tag "mode" for disk source conf: Ignore the volume type disk if its mode is "uri" qemu: Translate the volume type disk source before cgroup setting docs/formatdomain.html.in | 9 +- docs/schemas/domaincommon.rng | 8 ++ src/conf/domain_conf.c | 68 +++++++++++- src/conf/domain_conf.h | 26 +++++ src/libvirt_private.syms | 1 + src/qemu/qemu_command.c | 20 +++- src/qemu/qemu_conf.c | 117 +++++++++++++++++---- src/qemu/qemu_process.c | 13 ++- src/storage/storage_backend_iscsi.c | 6 +- .../qemuxml2argv-disk-source-pool-mode.xml | 48 +++++++++ tests/qemuxml2xmltest.c | 1 + tests/securityselinuxlabeldata/netdisks.txt | 5 + tests/securityselinuxlabeldata/netdisks.xml | 58 ++++++++++ tests/securityselinuxlabeldata/voldisks.txt | 5 + tests/securityselinuxlabeldata/voldisks.xml | 45 ++++++++ tests/securityselinuxlabeltest.c | 2 + 16 files changed, 400 insertions(+), 32 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-source-pool-mode.xml create mode 100644 tests/securityselinuxlabeldata/netdisks.txt create mode 100644 tests/securityselinuxlabeldata/netdisks.xml create mode 100644 tests/securityselinuxlabeldata/voldisks.txt create mode 100644 tests/securityselinuxlabeldata/voldisks.xml -- 1.8.1.4 -- libvir-list mailing list libvir-list@xxxxxxxxxx https://www.redhat.com/mailman/listinfo/libvir-list