External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-03-07 17:28:15 +00:00
Code

conf: add boot order to filesystem

Browse Source 
Signed-off-by: Ján Tomko <jtomko@redhat.com>
Tested-by: Laszlo Ersek <lersek@redhat.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
This commit is contained in:
Ján Tomko 2021-01-05 19:39:46 +01:00
parent 082164f04b
commit baa4a4695c
3 changed files with 7 additions and 2 deletions
docs/schemas
domaincommon.rng
src/conf
domain_conf.c
tests/qemuxml2argvdata
vhost-user-fs-hugepages.xml

3
docs/schemas/domaincommon.rng

@ -2812,6 +2812,9 @@
<empty/> <empty/>
</element> </element>
</optional> </optional>
<optional>
<ref name="deviceBoot"/>
</optional>
<optional> <optional>
<ref name="alias"/> <ref name="alias"/>
</optional> </optional>

5
src/conf/domain_conf.c

@ -10298,7 +10298,8 @@ virDomainFSDefParseXML(virDomainXMLOptionPtr xmlopt,
def->src->path = g_steal_pointer(&source); def->src->path = g_steal_pointer(&source);
def->dst = g_steal_pointer(&target); def->dst = g_steal_pointer(&target);
if (virDomainDeviceInfoParseXML(xmlopt, node, &def->info, flags) < 0) if (virDomainDeviceInfoParseXML(xmlopt, node, &def->info,
flags | VIR_DOMAIN_DEF_PARSE_ALLOW_BOOT) < 0)
goto error; goto error;
return def; return def;
@ -24858,7 +24859,7 @@ virDomainFSDefFormat(virBufferPtr buf,
if (def->readonly) if (def->readonly)
virBufferAddLit(buf, "<readonly/>\n"); virBufferAddLit(buf, "<readonly/>\n");
virDomainDeviceInfoFormat(buf, &def->info, flags); virDomainDeviceInfoFormat(buf, &def->info, flags | VIR_DOMAIN_DEF_FORMAT_ALLOW_BOOT);
if (def->space_hard_limit) if (def->space_hard_limit)
virBufferAsprintf(buf, "<space_hard_limit unit='bytes'>" virBufferAsprintf(buf, "<space_hard_limit unit='bytes'>"

1
tests/qemuxml2argvdata/vhost-user-fs-hugepages.xml

@ -66,6 +66,7 @@
<binary path='/usr/libexec/virtiofsd'/> <binary path='/usr/libexec/virtiofsd'/>
<source dir='/path'/> <source dir='/path'/>
<target dir='mount_tag'/> <target dir='mount_tag'/>
<boot order='2'/>
<address type='pci' domain='0x0000' bus='0x01' slot='0x00' function='0x0'/> <address type='pci' domain='0x0000' bus='0x01' slot='0x00' function='0x0'/>
</filesystem> </filesystem>
<input type='mouse' bus='ps2'/> <input type='mouse' bus='ps2'/>