提交 82223f93 编写于 作者: J Ján Tomko

add virtio-related options to memballoon

https://bugzilla.redhat.com/show_bug.cgi?id=1283251Reviewed-by: NPavel Hrdina <phrdina@redhat.com>
上级 fd518643
...@@ -6916,6 +6916,7 @@ qemu-kvm -net nic,model=? /dev/null ...@@ -6916,6 +6916,7 @@ qemu-kvm -net nic,model=? /dev/null
&lt;memballoon model='virtio'&gt; &lt;memballoon model='virtio'&gt;
&lt;address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/&gt; &lt;address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/&gt;
&lt;stats period='10'/&gt; &lt;stats period='10'/&gt;
&lt;driver iommu='on' ats='on'/&gt;
&lt;/memballoon&gt; &lt;/memballoon&gt;
&lt;/devices&gt; &lt;/devices&gt;
&lt;/domain&gt;</pre> &lt;/domain&gt;</pre>
...@@ -6960,6 +6961,12 @@ qemu-kvm -net nic,model=? /dev/null ...@@ -6960,6 +6961,12 @@ qemu-kvm -net nic,model=? /dev/null
<span class='since'>Since 1.1.1, requires QEMU 1.5</span> <span class='since'>Since 1.1.1, requires QEMU 1.5</span>
</p> </p>
</dd> </dd>
<dt><code>driver</code></dt>
<dd>
For model <code>virtio</code> memballoon,
<a href="#elementsVirtio">Virtio-specific options</a> can also be
set. (<span class="since">Since 3.5.0</span>)
</dd>
</dl> </dl>
<h4><a name="elementsRng">Random number generator device</a></h4> <h4><a name="elementsRng">Random number generator device</a></h4>
......
...@@ -3784,6 +3784,11 @@ ...@@ -3784,6 +3784,11 @@
</attribute> </attribute>
</element> </element>
</optional> </optional>
<optional>
<element name="driver">
<ref name="virtioOptions"/>
</element>
</optional>
</interleave> </interleave>
</element> </element>
</define> </define>
......
...@@ -2305,6 +2305,7 @@ void virDomainMemballoonDefFree(virDomainMemballoonDefPtr def) ...@@ -2305,6 +2305,7 @@ void virDomainMemballoonDefFree(virDomainMemballoonDefPtr def)
return; return;
virDomainDeviceInfoClear(&def->info); virDomainDeviceInfoClear(&def->info);
VIR_FREE(def->virtio);
VIR_FREE(def); VIR_FREE(def);
} }
...@@ -12997,6 +12998,9 @@ virDomainMemballoonDefParseXML(xmlNodePtr node, ...@@ -12997,6 +12998,9 @@ virDomainMemballoonDefParseXML(xmlNodePtr node,
else if (virDomainDeviceInfoParseXML(node, NULL, &def->info, flags) < 0) else if (virDomainDeviceInfoParseXML(node, NULL, &def->info, flags) < 0)
goto error; goto error;
if (virDomainVirtioOptionsParseXML(ctxt, &def->virtio) < 0)
goto error;
cleanup: cleanup:
VIR_FREE(model); VIR_FREE(model);
VIR_FREE(deflate); VIR_FREE(deflate);
...@@ -19608,6 +19612,10 @@ virDomainMemballoonDefCheckABIStability(virDomainMemballoonDefPtr src, ...@@ -19608,6 +19612,10 @@ virDomainMemballoonDefCheckABIStability(virDomainMemballoonDefPtr src,
return false; return false;
} }
if (src->virtio && dst->virtio &&
!virDomainVirtioOptionsCheckABIStability(src->virtio, dst->virtio))
return false;
if (!virDomainDeviceInfoCheckABIStability(&src->info, &dst->info)) if (!virDomainDeviceInfoCheckABIStability(&src->info, &dst->info))
return false; return false;
...@@ -22978,6 +22986,22 @@ virDomainMemballoonDefFormat(virBufferPtr buf, ...@@ -22978,6 +22986,22 @@ virDomainMemballoonDefFormat(virBufferPtr buf,
return -1; return -1;
} }
if (def->virtio) {
virBuffer driverBuf = VIR_BUFFER_INITIALIZER;
virDomainVirtioOptionsFormat(&driverBuf, def->virtio);
if (virBufferCheckError(&driverBuf) < 0) {
virBufferFreeAndReset(&childrenBuf);
return -1;
}
if (virBufferUse(&driverBuf)) {
virBufferAddLit(&childrenBuf, "<driver");
virBufferAddBuffer(&childrenBuf, &driverBuf);
virBufferAddLit(&childrenBuf, "/>\n");
}
}
if (!virBufferUse(&childrenBuf)) { if (!virBufferUse(&childrenBuf)) {
virBufferAddLit(buf, "/>\n"); virBufferAddLit(buf, "/>\n");
} else { } else {
......
...@@ -1609,6 +1609,7 @@ struct _virDomainMemballoonDef { ...@@ -1609,6 +1609,7 @@ struct _virDomainMemballoonDef {
virDomainDeviceInfo info; virDomainDeviceInfo info;
int period; /* seconds between collections */ int period; /* seconds between collections */
int autodeflate; /* enum virTristateSwitch */ int autodeflate; /* enum virTristateSwitch */
virDomainVirtioOptionsPtr virtio;
}; };
struct _virDomainNVRAMDef { struct _virDomainNVRAMDef {
......
...@@ -73,6 +73,7 @@ ...@@ -73,6 +73,7 @@
</video> </video>
<memballoon model='virtio'> <memballoon model='virtio'>
<address type='pci' domain='0x0000' bus='0x00' slot='0x0c' function='0x0'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x0c' function='0x0'/>
<driver iommu='on' ats='on'/>
</memballoon> </memballoon>
<rng model='virtio'> <rng model='virtio'>
<backend model='random'>/dev/random</backend> <backend model='random'>/dev/random</backend>
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册