mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2025-02-01 17:35:17 +00:00
add virtio-related options to memballoon
https://bugzilla.redhat.com/show_bug.cgi?id=1283251 Reviewed-by: Pavel Hrdina <phrdina@redhat.com>
This commit is contained in:
parent
fd51864340
commit
82223f9364
@ -6916,6 +6916,7 @@ qemu-kvm -net nic,model=? /dev/null
|
||||
<memballoon model='virtio'>
|
||||
<address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/>
|
||||
<stats period='10'/>
|
||||
<driver iommu='on' ats='on'/>
|
||||
</memballoon>
|
||||
</devices>
|
||||
</domain></pre>
|
||||
@ -6960,6 +6961,12 @@ qemu-kvm -net nic,model=? /dev/null
|
||||
<span class='since'>Since 1.1.1, requires QEMU 1.5</span>
|
||||
</p>
|
||||
</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>
|
||||
<h4><a name="elementsRng">Random number generator device</a></h4>
|
||||
|
||||
|
@ -3784,6 +3784,11 @@
|
||||
</attribute>
|
||||
</element>
|
||||
</optional>
|
||||
<optional>
|
||||
<element name="driver">
|
||||
<ref name="virtioOptions"/>
|
||||
</element>
|
||||
</optional>
|
||||
</interleave>
|
||||
</element>
|
||||
</define>
|
||||
|
@ -2305,6 +2305,7 @@ void virDomainMemballoonDefFree(virDomainMemballoonDefPtr def)
|
||||
return;
|
||||
|
||||
virDomainDeviceInfoClear(&def->info);
|
||||
VIR_FREE(def->virtio);
|
||||
|
||||
VIR_FREE(def);
|
||||
}
|
||||
@ -12997,6 +12998,9 @@ virDomainMemballoonDefParseXML(xmlNodePtr node,
|
||||
else if (virDomainDeviceInfoParseXML(node, NULL, &def->info, flags) < 0)
|
||||
goto error;
|
||||
|
||||
if (virDomainVirtioOptionsParseXML(ctxt, &def->virtio) < 0)
|
||||
goto error;
|
||||
|
||||
cleanup:
|
||||
VIR_FREE(model);
|
||||
VIR_FREE(deflate);
|
||||
@ -19608,6 +19612,10 @@ virDomainMemballoonDefCheckABIStability(virDomainMemballoonDefPtr src,
|
||||
return false;
|
||||
}
|
||||
|
||||
if (src->virtio && dst->virtio &&
|
||||
!virDomainVirtioOptionsCheckABIStability(src->virtio, dst->virtio))
|
||||
return false;
|
||||
|
||||
if (!virDomainDeviceInfoCheckABIStability(&src->info, &dst->info))
|
||||
return false;
|
||||
|
||||
@ -22978,6 +22986,22 @@ virDomainMemballoonDefFormat(virBufferPtr buf,
|
||||
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)) {
|
||||
virBufferAddLit(buf, "/>\n");
|
||||
} else {
|
||||
|
@ -1609,6 +1609,7 @@ struct _virDomainMemballoonDef {
|
||||
virDomainDeviceInfo info;
|
||||
int period; /* seconds between collections */
|
||||
int autodeflate; /* enum virTristateSwitch */
|
||||
virDomainVirtioOptionsPtr virtio;
|
||||
};
|
||||
|
||||
struct _virDomainNVRAMDef {
|
||||
|
@ -73,6 +73,7 @@
|
||||
</video>
|
||||
<memballoon model='virtio'>
|
||||
<address type='pci' domain='0x0000' bus='0x00' slot='0x0c' function='0x0'/>
|
||||
<driver iommu='on' ats='on'/>
|
||||
</memballoon>
|
||||
<rng model='virtio'>
|
||||
<backend model='random'>/dev/random</backend>
|
||||
|
Loading…
x
Reference in New Issue
Block a user