mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2025-03-07 17:28:15 +00:00
Add virtio-related options to input devices
https://bugzilla.redhat.com/show_bug.cgi?id=1283251 Reviewed-by: Pavel Hrdina <phrdina@redhat.com>
This commit is contained in:
parent
f5384fb402
commit
cc0933d350
@ -5715,6 +5715,13 @@ qemu-kvm -net nic,model=? /dev/null
|
|||||||
event device passed through to guests. (KVM only)
|
event device passed through to guests. (KVM only)
|
||||||
</p>
|
</p>
|
||||||
|
|
||||||
|
<p>
|
||||||
|
The subelement <code>driver</code> can be used to tune the virtio
|
||||||
|
options of the device:
|
||||||
|
<a href="#elementsVirtio">Virtio-specific options</a> can also be
|
||||||
|
set. (<span class="since">Since 3.5.0</span>)
|
||||||
|
</p>
|
||||||
|
|
||||||
<h4><a name="elementsHub">Hub devices</a></h4>
|
<h4><a name="elementsHub">Hub devices</a></h4>
|
||||||
|
|
||||||
<p>
|
<p>
|
||||||
|
@ -3990,6 +3990,11 @@
|
|||||||
|
|
||||||
<define name="input">
|
<define name="input">
|
||||||
<element name="input">
|
<element name="input">
|
||||||
|
<optional>
|
||||||
|
<element name="driver">
|
||||||
|
<ref name="virtioOptions"/>
|
||||||
|
</element>
|
||||||
|
</optional>
|
||||||
<choice>
|
<choice>
|
||||||
<group>
|
<group>
|
||||||
<attribute name="type">
|
<attribute name="type">
|
||||||
|
@ -1400,6 +1400,7 @@ void virDomainInputDefFree(virDomainInputDefPtr def)
|
|||||||
|
|
||||||
virDomainDeviceInfoClear(&def->info);
|
virDomainDeviceInfoClear(&def->info);
|
||||||
VIR_FREE(def->source.evdev);
|
VIR_FREE(def->source.evdev);
|
||||||
|
VIR_FREE(def->virtio);
|
||||||
VIR_FREE(def);
|
VIR_FREE(def);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -11614,6 +11615,9 @@ virDomainInputDefParseXML(const virDomainDef *dom,
|
|||||||
goto error;
|
goto error;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (virDomainVirtioOptionsParseXML(ctxt, &def->virtio) < 0)
|
||||||
|
goto error;
|
||||||
|
|
||||||
cleanup:
|
cleanup:
|
||||||
VIR_FREE(evdev);
|
VIR_FREE(evdev);
|
||||||
VIR_FREE(type);
|
VIR_FREE(type);
|
||||||
@ -19354,6 +19358,10 @@ virDomainInputDefCheckABIStability(virDomainInputDefPtr 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;
|
||||||
|
|
||||||
@ -23448,6 +23456,7 @@ virDomainInputDefFormat(virBufferPtr buf,
|
|||||||
const char *type = virDomainInputTypeToString(def->type);
|
const char *type = virDomainInputTypeToString(def->type);
|
||||||
const char *bus = virDomainInputBusTypeToString(def->bus);
|
const char *bus = virDomainInputBusTypeToString(def->bus);
|
||||||
virBuffer childbuf = VIR_BUFFER_INITIALIZER;
|
virBuffer childbuf = VIR_BUFFER_INITIALIZER;
|
||||||
|
virBuffer driverBuf = VIR_BUFFER_INITIALIZER;
|
||||||
|
|
||||||
/* don't format keyboard into migratable XML for backward compatibility */
|
/* don't format keyboard into migratable XML for backward compatibility */
|
||||||
if (flags & VIR_DOMAIN_DEF_FORMAT_MIGRATABLE &&
|
if (flags & VIR_DOMAIN_DEF_FORMAT_MIGRATABLE &&
|
||||||
@ -23471,6 +23480,15 @@ virDomainInputDefFormat(virBufferPtr buf,
|
|||||||
type, bus);
|
type, bus);
|
||||||
|
|
||||||
virBufferAdjustIndent(&childbuf, virBufferGetIndent(buf, false) + 2);
|
virBufferAdjustIndent(&childbuf, virBufferGetIndent(buf, false) + 2);
|
||||||
|
virDomainVirtioOptionsFormat(&driverBuf, def->virtio);
|
||||||
|
if (virBufferCheckError(&driverBuf) < 0)
|
||||||
|
return -1;
|
||||||
|
|
||||||
|
if (virBufferUse(&driverBuf)) {
|
||||||
|
virBufferAddLit(&childbuf, "<driver");
|
||||||
|
virBufferAddBuffer(&childbuf, &driverBuf);
|
||||||
|
virBufferAddLit(&childbuf, "/>\n");
|
||||||
|
}
|
||||||
virBufferEscapeString(&childbuf, "<source evdev='%s'/>\n", def->source.evdev);
|
virBufferEscapeString(&childbuf, "<source evdev='%s'/>\n", def->source.evdev);
|
||||||
if (virDomainDeviceInfoFormat(&childbuf, &def->info, flags) < 0)
|
if (virDomainDeviceInfoFormat(&childbuf, &def->info, flags) < 0)
|
||||||
return -1;
|
return -1;
|
||||||
|
@ -1282,6 +1282,7 @@ struct _virDomainInputDef {
|
|||||||
char *evdev;
|
char *evdev;
|
||||||
} source;
|
} source;
|
||||||
virDomainDeviceInfo info;
|
virDomainDeviceInfo info;
|
||||||
|
virDomainVirtioOptionsPtr virtio;
|
||||||
};
|
};
|
||||||
|
|
||||||
typedef enum {
|
typedef enum {
|
||||||
|
@ -54,15 +54,19 @@
|
|||||||
<address type='pci' domain='0x0000' bus='0x00' slot='0x06' function='0x0'/>
|
<address type='pci' domain='0x0000' bus='0x00' slot='0x06' function='0x0'/>
|
||||||
</interface>
|
</interface>
|
||||||
<input type='mouse' bus='virtio'>
|
<input type='mouse' bus='virtio'>
|
||||||
|
<driver iommu='on' ats='on'/>
|
||||||
<address type='pci' domain='0x0000' bus='0x00' slot='0x0e' function='0x0'/>
|
<address type='pci' domain='0x0000' bus='0x00' slot='0x0e' function='0x0'/>
|
||||||
</input>
|
</input>
|
||||||
<input type='keyboard' bus='virtio'>
|
<input type='keyboard' bus='virtio'>
|
||||||
|
<driver iommu='on' ats='on'/>
|
||||||
<address type='pci' domain='0x0000' bus='0x00' slot='0x10' function='0x0'/>
|
<address type='pci' domain='0x0000' bus='0x00' slot='0x10' function='0x0'/>
|
||||||
</input>
|
</input>
|
||||||
<input type='tablet' bus='virtio'>
|
<input type='tablet' bus='virtio'>
|
||||||
|
<driver iommu='on' ats='on'/>
|
||||||
<address type='pci' domain='0x0000' bus='0x00' slot='0x11' function='0x0'/>
|
<address type='pci' domain='0x0000' bus='0x00' slot='0x11' function='0x0'/>
|
||||||
</input>
|
</input>
|
||||||
<input type='passthrough' bus='virtio'>
|
<input type='passthrough' bus='virtio'>
|
||||||
|
<driver iommu='on' ats='on'/>
|
||||||
<source evdev='/dev/input/event1234'/>
|
<source evdev='/dev/input/event1234'/>
|
||||||
<address type='pci' domain='0x0000' bus='0x00' slot='0x12' function='0x0'/>
|
<address type='pci' domain='0x0000' bus='0x00' slot='0x12' function='0x0'/>
|
||||||
</input>
|
</input>
|
||||||
|
Loading…
x
Reference in New Issue
Block a user