[libvirt PATCH 2/7] conf: add boot order to filesystem

Signed-off-by: Ján Tomko <jtomko(a)redhat.com&gt; --- docs/schemas/domaincommon.rng | 3 +++ src/conf/domain_conf.c | 5 +++-- tests/qemuxml2argvdata/vhost-user-fs-hugepages.xml | 1 + 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng index a4bddcf132..09e7747787 100644 --- a/docs/schemas/domaincommon.rng +++ b/docs/schemas/domaincommon.rng @@ -2812,6 +2812,9 @@ <empty/> </element> </optional> + <optional> + <ref name="deviceBoot"/> + </optional> <optional> <ref name="alias"/> </optional> diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index dab4f10326..b8cfadb70c 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -10345,7 +10345,8 @@ virDomainFSDefParseXML(virDomainXMLOptionPtr xmlopt, def->src->path = g_steal_pointer(&source); 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; return def; @@ -24896,7 +24897,7 @@ virDomainFSDefFormat(virBufferPtr buf, if (def->readonly) 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) virBufferAsprintf(buf, "<space_hard_limit unit='bytes'>" diff --git a/tests/qemuxml2argvdata/vhost-user-fs-hugepages.xml b/tests/qemuxml2argvdata/vhost-user-fs-hugepages.xml index e9982150c7..3f130dd152 100644 --- a/tests/qemuxml2argvdata/vhost-user-fs-hugepages.xml +++ b/tests/qemuxml2argvdata/vhost-user-fs-hugepages.xml @@ -66,6 +66,7 @@ <binary path='/usr/libexec/virtiofsd'/> <source dir='/path'/> <target dir='mount_tag'/> + <boot order='2'/> <address type='pci' domain='0x0000' bus='0x01' slot='0x00' function='0x0'/> </filesystem> <input type='mouse' bus='ps2'/> -- 2.29.2