shaba/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-01-27 18:03:50 +03:00
Code Releases Activity

conf: support <dtb> tag in XML domain file

Browse Source
This commit is contained in:
Olivia Yin 2013-03-14 12:49:42 +08:00 committed by Eric Blake
parent 52ad612c1e
commit 9545acd9f0
4 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
docs/formatdomain.html.in
View File

@ -232,6 +232,7 @@
&lt;kernel&gt;/root/f8-i386-vmlinuz&lt;/kernel&gt;
&lt;initrd&gt;/root/f8-i386-initrd&lt;/initrd&gt;
&lt;cmdline&gt;console=ttyS0 ks=http://example.com/f8-i386/os/&lt;/cmdline&gt;
&lt;dtb&gt;/root/ppc.dtb&lt;/dtb&gt;
&lt;/os&gt;
...</pre>
@ -253,6 +254,10 @@
the kernel (or installer) at boottime. This is often used to
specify an alternate primary console (eg serial port), or the
installation media source / kickstart file</dd>
<dt><code>dtb</code></dt>
<dd>The contents of this element specify the fully-qualified path
to the (optional) device tree binary (dtb) image in the host OS.
<span class="since">Since 1.0.4</span></dd>
</dl>
<h4><a name="eleemntsOSContainer">Container boot</a></h4>

6
docs/schemas/domaincommon.rng
View File

@ -367,6 +367,7 @@
<value>g3beige</value>
<value>mac99</value>
<value>prep</value>
<value>ppce500v2</value>
</choice>
</attribute>
</optional>
@ -835,6 +836,11 @@
<text/>
</element>
</optional>
<optional>
<element name="dtb">
<ref name="absFilePath"/>
</element>
</optional>
</interleave>
</define>
<define name="osbootdev">

4
src/conf/domain_conf.c
View File

@ -1849,6 +1849,7 @@ void virDomainDefFree(virDomainDefPtr def)
VIR_FREE(def->os.kernel);
VIR_FREE(def->os.initrd);
VIR_FREE(def->os.cmdline);
VIR_FREE(def->os.dtb);
VIR_FREE(def->os.root);
VIR_FREE(def->os.loader);
VIR_FREE(def->os.bootloader);
@ -10247,6 +10248,7 @@ virDomainDefParseXML(virCapsPtr caps,
def->os.kernel = virXPathString("string(./os/kernel[1])", ctxt);
def->os.initrd = virXPathString("string(./os/initrd[1])", ctxt);
def->os.cmdline = virXPathString("string(./os/cmdline[1])", ctxt);
def->os.dtb = virXPathString("string(./os/dtb[1])", ctxt);
def->os.root = virXPathString("string(./os/root[1])", ctxt);
def->os.loader = virXPathString("string(./os/loader[1])", ctxt);
}
@ -14875,6 +14877,8 @@ virDomainDefFormatInternal(virDomainDefPtr def,
def->os.initrd);
virBufferEscapeString(buf, " <cmdline>%s</cmdline>\n",
def->os.cmdline);
virBufferEscapeString(buf, " <dtb>%s</dtb>\n",
def->os.dtb);
virBufferEscapeString(buf, " <root>%s</root>\n",
def->os.root);

1
src/conf/domain_conf.h
View File

@ -1550,6 +1550,7 @@ struct _virDomainOSDef {
char *kernel;
char *initrd;
char *cmdline;
char *dtb;
char *root;
char *loader;
char *bootloader;