External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-07-11 12:25:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

schema: allow multiple seclabel for devices in domaincommon.rng

Browse Source 
In our RNG schema we do allow multiple (different) seclabels per-domain,
but don't allow this for devices, yet we neither have a check in our XML parser,
nor in a post-parse callback. In that case we should allow multiple
(different) seclabels for devices as well.
This commit is contained in:
Erik Skultety 2015-02-10 17:17:36 +01:00 committed by Ján Tomko
parent a7c9c7a6ab
commit 862bbf8a5a
3 changed files with 41 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
docs/schemas/domaincommon.rng
View File

@ -1344,9 +1344,9 @@
<optional>
<ref name="storageStartupPolicy"/>
</optional>
<optional>
<zeroOrMore>
<ref name='devSeclabel'/>
</optional>
</zeroOrMore>
</element>
</optional>
</interleave>
@ -1367,9 +1367,9 @@
<optional>
<ref name="storageStartupPolicy"/>
</optional>
<optional>
<zeroOrMore>
<ref name='devSeclabel'/>
</optional>
</zeroOrMore>
</element>
</optional>
</interleave>
@ -1497,9 +1497,9 @@
<optional>
<ref name="storageStartupPolicy"/>
</optional>
<optional>
<zeroOrMore>
<ref name='devSeclabel'/>
</optional>
</zeroOrMore>
</element>
</optional>
</interleave>
@ -3195,9 +3195,9 @@
<optional>
<attribute name="slave"/>
</optional>
<optional>
<zeroOrMore>
<ref name='devSeclabel'/>
</optional>
</zeroOrMore>
</element>
</zeroOrMore>
<optional>

32
tests/qemuxml2argvdata/qemuxml2argv-seclabel-device-multiple.xml Normal file
View File

@ -0,0 +1,32 @@
<domain type='qemu'>
<name>QEMUGuest1</name>
<uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
<memory unit='KiB'>219100</memory>
<currentMemory unit='KiB'>219100</currentMemory>
<vcpu placement='static' cpuset='1-4,8-20,525'>1</vcpu>
<os>
<type arch='i686' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<clock offset='utc'/>
<on_poweroff>destroy</on_poweroff>
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
<emulator>/usr/bin/qemu</emulator>
<disk type='block' device='disk'>
<source dev='/dev/HostVG/QEMUGuest1'>
<seclabel model='selinux' relabel='yes'>
<label>system_u:system_r:svirt_custom_t:s0:c192,c392</label>
</seclabel>
<seclabel model='dac' relabel='no'/>
</source>
<target dev='hda' bus='ide'/>
<address type='drive' controller='0' bus='0' target='0' unit='0'/>
</disk>
<controller type='usb' index='0'/>
<controller type='ide' index='0'/>
<controller type='pci' index='0' model='pci-root'/>
<memballoon model='virtio'/>
</devices>
</domain>

1
tests/qemuxml2xmltest.c
View File

@ -337,6 +337,7 @@ mymain(void)
DO_TEST_DIFFERENT("seclabel-none");
DO_TEST("seclabel-dac-none");
DO_TEST("seclabel-dynamic-none");
DO_TEST("seclabel-device-multiple");
DO_TEST_FULL("seclabel-dynamic-none-relabel", true, WHEN_INACTIVE);
DO_TEST("numad-static-vcpu-no-numatune");
DO_TEST("disk-scsi-lun-passthrough-sgio");