mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2024-12-23 21:34:54 +03:00
Add virtio-related options to video
https://bugzilla.redhat.com/show_bug.cgi?id=1283251 Reviewed-by: Pavel Hrdina <phrdina@redhat.com>
This commit is contained in:
parent
f65db1be12
commit
f5384fb402
@ -6136,6 +6136,18 @@ qemu-kvm -net nic,model=? /dev/null
|
||||
The optional <code>address</code> sub-element can be used to
|
||||
tie the video device to a particular PCI slot.
|
||||
</dd>
|
||||
|
||||
<dt><code>driver</code></dt>
|
||||
<dd>
|
||||
The subelement <code>driver</code> can be used to tune the device:
|
||||
<dl>
|
||||
<dt>virtio options</dt>
|
||||
<dd>
|
||||
<a href="#elementsVirtio">Virtio-specific options</a> can also be
|
||||
set. (<span class="since">Since 3.5.0</span>)
|
||||
</dd>
|
||||
</dl>
|
||||
</dd>
|
||||
</dl>
|
||||
|
||||
<h4><a name="elementsConsole">Consoles, serial, parallel & channel devices</a></h4>
|
||||
|
@ -3218,6 +3218,11 @@
|
||||
-->
|
||||
<define name="video">
|
||||
<element name="video">
|
||||
<optional>
|
||||
<element name="driver">
|
||||
<ref name="virtioOptions"/>
|
||||
</element>
|
||||
</optional>
|
||||
<optional>
|
||||
<element name="model">
|
||||
<choice>
|
||||
|
@ -2352,6 +2352,7 @@ void virDomainVideoDefFree(virDomainVideoDefPtr def)
|
||||
virDomainDeviceInfoClear(&def->info);
|
||||
|
||||
VIR_FREE(def->accel);
|
||||
VIR_FREE(def->virtio);
|
||||
VIR_FREE(def);
|
||||
}
|
||||
|
||||
@ -13525,11 +13526,13 @@ virDomainVideoAccelDefParseXML(xmlNodePtr node)
|
||||
|
||||
static virDomainVideoDefPtr
|
||||
virDomainVideoDefParseXML(xmlNodePtr node,
|
||||
xmlXPathContextPtr ctxt,
|
||||
const virDomainDef *dom,
|
||||
unsigned int flags)
|
||||
{
|
||||
virDomainVideoDefPtr def;
|
||||
xmlNodePtr cur;
|
||||
xmlNodePtr saved = ctxt->node;
|
||||
char *type = NULL;
|
||||
char *heads = NULL;
|
||||
char *vram = NULL;
|
||||
@ -13538,6 +13541,8 @@ virDomainVideoDefParseXML(xmlNodePtr node,
|
||||
char *vgamem = NULL;
|
||||
char *primary = NULL;
|
||||
|
||||
ctxt->node = node;
|
||||
|
||||
if (VIR_ALLOC(def) < 0)
|
||||
return NULL;
|
||||
|
||||
@ -13639,7 +13644,12 @@ virDomainVideoDefParseXML(xmlNodePtr node,
|
||||
if (virDomainDeviceInfoParseXML(node, NULL, &def->info, flags) < 0)
|
||||
goto error;
|
||||
|
||||
if (virDomainVirtioOptionsParseXML(ctxt, &def->virtio) < 0)
|
||||
goto error;
|
||||
|
||||
cleanup:
|
||||
ctxt->node = saved;
|
||||
|
||||
VIR_FREE(type);
|
||||
VIR_FREE(ram);
|
||||
VIR_FREE(vram);
|
||||
@ -14438,7 +14448,7 @@ virDomainDeviceDefParse(const char *xmlStr,
|
||||
goto error;
|
||||
break;
|
||||
case VIR_DOMAIN_DEVICE_VIDEO:
|
||||
if (!(dev->data.video = virDomainVideoDefParseXML(node, def, flags)))
|
||||
if (!(dev->data.video = virDomainVideoDefParseXML(node, ctxt, def, flags)))
|
||||
goto error;
|
||||
break;
|
||||
case VIR_DOMAIN_DEVICE_HOSTDEV:
|
||||
@ -18373,7 +18383,7 @@ virDomainDefParseXML(xmlDocPtr xml,
|
||||
virDomainVideoDefPtr video;
|
||||
ssize_t insertAt = -1;
|
||||
|
||||
if (!(video = virDomainVideoDefParseXML(nodes[i], def, flags)))
|
||||
if (!(video = virDomainVideoDefParseXML(nodes[i], ctxt, def, flags)))
|
||||
goto error;
|
||||
|
||||
if (video->primary) {
|
||||
@ -19440,6 +19450,10 @@ virDomainVideoDefCheckABIStability(virDomainVideoDefPtr src,
|
||||
}
|
||||
}
|
||||
|
||||
if (src->virtio && dst->virtio &&
|
||||
!virDomainVirtioOptionsCheckABIStability(src->virtio, dst->virtio))
|
||||
return false;
|
||||
|
||||
if (!virDomainDeviceInfoCheckABIStability(&src->info, &dst->info))
|
||||
return false;
|
||||
|
||||
@ -23376,6 +23390,7 @@ virDomainVideoDefFormat(virBufferPtr buf,
|
||||
unsigned int flags)
|
||||
{
|
||||
const char *model = virDomainVideoTypeToString(def->type);
|
||||
virBuffer driverBuf = VIR_BUFFER_INITIALIZER;
|
||||
|
||||
if (!model) {
|
||||
virReportError(VIR_ERR_INTERNAL_ERROR,
|
||||
@ -23385,6 +23400,14 @@ virDomainVideoDefFormat(virBufferPtr buf,
|
||||
|
||||
virBufferAddLit(buf, "<video>\n");
|
||||
virBufferAdjustIndent(buf, 2);
|
||||
virDomainVirtioOptionsFormat(&driverBuf, def->virtio);
|
||||
if (virBufferCheckError(&driverBuf) < 0)
|
||||
return -1;
|
||||
if (virBufferUse(&driverBuf)) {
|
||||
virBufferAddLit(buf, "<driver");
|
||||
virBufferAddBuffer(buf, &driverBuf);
|
||||
virBufferAddLit(buf, "/>\n");
|
||||
}
|
||||
virBufferAsprintf(buf, "<model type='%s'",
|
||||
model);
|
||||
if (def->ram)
|
||||
|
@ -1376,6 +1376,7 @@ struct _virDomainVideoDef {
|
||||
bool primary;
|
||||
virDomainVideoAccelDefPtr accel;
|
||||
virDomainDeviceInfo info;
|
||||
virDomainVirtioOptionsPtr virtio;
|
||||
};
|
||||
|
||||
/* graphics console modes */
|
||||
|
@ -69,6 +69,7 @@
|
||||
<input type='mouse' bus='ps2'/>
|
||||
<input type='keyboard' bus='ps2'/>
|
||||
<video>
|
||||
<driver iommu='on' ats='on'/>
|
||||
<model type='virtio' heads='1' primary='yes'>
|
||||
<acceleration accel3d='yes'/>
|
||||
</model>
|
||||
|
Loading…
Reference in New Issue
Block a user