diff options
| author |   Marcelo Cerri <mhcerri@linux.vnet.ibm.com> | 2012-08-15 19:10:36 -0300 |
|---|---|---|
| committer |   Michal Privoznik <mprivozn@redhat.com> | 2012-08-20 19:13:33 +0200 |
| commit | e9377dda367b847b5a15dac1403bcdf19f05438a (patch) | |
| tree | 1ce227597dea52e33a0f945bd85521b2d63696e5 /tests/qemuxml2argvdata | |
| parent | Internal refactory of data structures (diff) | |
| download | libvirt-e9377dda367b847b5a15dac1403bcdf19f05438a.tar.gz libvirt-e9377dda367b847b5a15dac1403bcdf19f05438a.tar.bz2 libvirt-e9377dda367b847b5a15dac1403bcdf19f05438a.zip | |
Multiple security drivers in XML data
This patch updates the domain and capability XML parser and formatter to
support more than one "seclabel" element for each domain and device. The
RNG schema and the tests related to this are also updated by this patch.
Signed-off-by: Marcelo Cerri <mhcerri@linux.vnet.ibm.com>
Diffstat (limited to 'tests/qemuxml2argvdata')
| -rw-r--r-- | tests/qemuxml2argvdata/qemuxml2argv-seclabel-dynamic-override.xml | 4 | ||||
| -rw-r--r-- | tests/qemuxml2argvdata/qemuxml2argv-seclabel-dynamic.xml | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-seclabel-dynamic-override.xml b/tests/qemuxml2argvdata/qemuxml2argv-seclabel-dynamic-override.xml index 4de435b9d..426b663ce 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-seclabel-dynamic-override.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-seclabel-dynamic-override.xml @@ -16,14 +16,14 @@ <emulator>/usr/bin/qemu</emulator> <disk type='block' device='disk'> <source dev='/dev/HostVG/QEMUGuest1'> - <seclabel relabel='no'/> + <seclabel model='selinux' relabel='no'/> </source> <target dev='hda' bus='ide'/> <address type='drive' controller='0' bus='0' target='0' unit='0'/> </disk> <disk type='block' device='disk'> <source dev='/dev/HostVG/QEMUGuest2'> - <seclabel relabel='yes'> + <seclabel model='selinux' relabel='yes'> <label>system_u:system_r:public_content_t:s0</label> </seclabel> </source> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-seclabel-dynamic.xml b/tests/qemuxml2argvdata/qemuxml2argv-seclabel-dynamic.xml index 78a6b6a8a..36df9d489 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-seclabel-dynamic.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-seclabel-dynamic.xml @@ -22,5 +22,5 @@ <controller type='ide' index='0'/> <memballoon model='virtio'/> </devices> - <seclabel type='dynamic' relabel='yes'/> + <seclabel model='selinux' type='dynamic' relabel='yes'/> </domain> |