mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2024-07-11 12:25:52 +00:00
qemu_command.c: move usb_redir validations to qemu_validate.c
Reviewed-by: Michal Privoznik <mprivozn@redhat.com> Signed-off-by: Daniel Henrique Barboza <danielhb413@gmail.com>
This commit is contained in:
parent
eb42c1313f
commit
d3dad77dd6
@ -8925,31 +8925,10 @@ qemuBuildRedirdevDevStr(const virDomainDef *def,
|
|||||||
g_auto(virBuffer) buf = VIR_BUFFER_INITIALIZER;
|
g_auto(virBuffer) buf = VIR_BUFFER_INITIALIZER;
|
||||||
virDomainRedirFilterDefPtr redirfilter = def->redirfilter;
|
virDomainRedirFilterDefPtr redirfilter = def->redirfilter;
|
||||||
|
|
||||||
if (dev->bus != VIR_DOMAIN_REDIRDEV_BUS_USB) {
|
|
||||||
virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
|
|
||||||
_("Redirection bus %s is not supported by QEMU"),
|
|
||||||
virDomainRedirdevBusTypeToString(dev->bus));
|
|
||||||
return NULL;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_USB_REDIR)) {
|
|
||||||
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
|
|
||||||
_("USB redirection is not supported "
|
|
||||||
"by this version of QEMU"));
|
|
||||||
return NULL;
|
|
||||||
}
|
|
||||||
|
|
||||||
virBufferAsprintf(&buf, "usb-redir,chardev=char%s,id=%s",
|
virBufferAsprintf(&buf, "usb-redir,chardev=char%s,id=%s",
|
||||||
dev->info.alias, dev->info.alias);
|
dev->info.alias, dev->info.alias);
|
||||||
|
|
||||||
if (redirfilter && redirfilter->nusbdevs) {
|
if (redirfilter && redirfilter->nusbdevs) {
|
||||||
if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_USB_REDIR_FILTER)) {
|
|
||||||
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
|
|
||||||
_("USB redirection filter is not "
|
|
||||||
"supported by this version of QEMU"));
|
|
||||||
return NULL;
|
|
||||||
}
|
|
||||||
|
|
||||||
virBufferAddLit(&buf, ",filter=");
|
virBufferAddLit(&buf, ",filter=");
|
||||||
|
|
||||||
for (i = 0; i < redirfilter->nusbdevs; i++) {
|
for (i = 0; i < redirfilter->nusbdevs; i++) {
|
||||||
|
@ -1770,12 +1770,35 @@ qemuValidateDomainRNGDef(const virDomainRNGDef *def,
|
|||||||
|
|
||||||
|
|
||||||
static int
|
static int
|
||||||
qemuValidateDomainRedirdevDef(const virDomainRedirdevDef *def,
|
qemuValidateDomainRedirdevDef(const virDomainRedirdevDef *dev,
|
||||||
|
const virDomainDef *def,
|
||||||
virQEMUCapsPtr qemuCaps)
|
virQEMUCapsPtr qemuCaps)
|
||||||
{
|
{
|
||||||
if (qemuValidateDomainChrSourceDef(def->source, qemuCaps) < 0)
|
if (qemuValidateDomainChrSourceDef(dev->source, qemuCaps) < 0)
|
||||||
return -1;
|
return -1;
|
||||||
|
|
||||||
|
if (dev->bus != VIR_DOMAIN_REDIRDEV_BUS_USB) {
|
||||||
|
virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
|
||||||
|
_("Redirection bus %s is not supported by QEMU"),
|
||||||
|
virDomainRedirdevBusTypeToString(dev->bus));
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_USB_REDIR)) {
|
||||||
|
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
|
||||||
|
_("USB redirection is not supported "
|
||||||
|
"by this version of QEMU"));
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (def->redirfilter && def->redirfilter->nusbdevs &&
|
||||||
|
!virQEMUCapsGet(qemuCaps, QEMU_CAPS_USB_REDIR_FILTER)) {
|
||||||
|
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
|
||||||
|
_("USB redirection filter is not "
|
||||||
|
"supported by this version of QEMU"));
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -4480,7 +4503,7 @@ qemuValidateDomainDeviceDef(const virDomainDeviceDef *dev,
|
|||||||
break;
|
break;
|
||||||
|
|
||||||
case VIR_DOMAIN_DEVICE_REDIRDEV:
|
case VIR_DOMAIN_DEVICE_REDIRDEV:
|
||||||
ret = qemuValidateDomainRedirdevDef(dev->data.redirdev, qemuCaps);
|
ret = qemuValidateDomainRedirdevDef(dev->data.redirdev, def, qemuCaps);
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case VIR_DOMAIN_DEVICE_WATCHDOG:
|
case VIR_DOMAIN_DEVICE_WATCHDOG:
|
||||||
|
@ -631,9 +631,13 @@ mymain(void)
|
|||||||
QEMU_CAPS_DEVICE_SPAPR_PCI_HOST_BRIDGE,
|
QEMU_CAPS_DEVICE_SPAPR_PCI_HOST_BRIDGE,
|
||||||
QEMU_CAPS_PIIX3_USB_UHCI);
|
QEMU_CAPS_PIIX3_USB_UHCI);
|
||||||
DO_TEST("usb-port-missing", QEMU_CAPS_USB_HUB);
|
DO_TEST("usb-port-missing", QEMU_CAPS_USB_HUB);
|
||||||
DO_TEST("usb-redir", NONE);
|
DO_TEST("usb-redir", QEMU_CAPS_USB_REDIR);
|
||||||
DO_TEST("usb-redir-filter", NONE);
|
DO_TEST("usb-redir-filter",
|
||||||
DO_TEST("usb-redir-filter-version", NONE);
|
QEMU_CAPS_USB_REDIR,
|
||||||
|
QEMU_CAPS_USB_REDIR_FILTER);
|
||||||
|
DO_TEST("usb-redir-filter-version",
|
||||||
|
QEMU_CAPS_USB_REDIR,
|
||||||
|
QEMU_CAPS_USB_REDIR_FILTER);
|
||||||
DO_TEST_CAPS_LATEST("blkdeviotune");
|
DO_TEST_CAPS_LATEST("blkdeviotune");
|
||||||
DO_TEST_CAPS_LATEST("blkdeviotune-max");
|
DO_TEST_CAPS_LATEST("blkdeviotune-max");
|
||||||
DO_TEST_CAPS_LATEST("blkdeviotune-group-num");
|
DO_TEST_CAPS_LATEST("blkdeviotune-group-num");
|
||||||
|
Loading…
Reference in New Issue
Block a user