mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2024-12-22 17:34:18 +03:00
Deprecate QEMU_CAPS_DEVICE
We support qemu version 0.12.0+, which has it.
This commit is contained in:
parent
e9488fcd20
commit
5572cd7f0e
@ -1171,8 +1171,6 @@ virQEMUCapsComputeCmdFlags(const char *help,
|
||||
if (strstr(help, "-chardev spiceport"))
|
||||
virQEMUCapsSet(qemuCaps, QEMU_CAPS_CHARDEV_SPICEPORT);
|
||||
}
|
||||
if (strstr(help, "-device"))
|
||||
virQEMUCapsSet(qemuCaps, QEMU_CAPS_DEVICE);
|
||||
if (strstr(help, "-nodefconfig"))
|
||||
virQEMUCapsSet(qemuCaps, QEMU_CAPS_NODEFCONFIG);
|
||||
if (strstr(help, "-no-user-config"))
|
||||
@ -3331,8 +3329,7 @@ virQEMUCapsInitHelp(virQEMUCapsPtr qemuCaps, uid_t runUid, gid_t runGid, const c
|
||||
|
||||
/* virQEMUCapsExtractDeviceStr will only set additional caps if qemu
|
||||
* understands the 0.13.0+ notion of "-device driver,". */
|
||||
if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE) &&
|
||||
strstr(help, "-device driver,?") &&
|
||||
if (strstr(help, "-device driver,?") &&
|
||||
virQEMUCapsExtractDeviceStr(qemuCaps->binary,
|
||||
qemuCaps, runUid, runGid) < 0) {
|
||||
goto cleanup;
|
||||
@ -3374,7 +3371,6 @@ virQEMUCapsInitQMPBasic(virQEMUCapsPtr qemuCaps)
|
||||
virQEMUCapsSet(qemuCaps, QEMU_CAPS_DRIVE_SERIAL);
|
||||
virQEMUCapsSet(qemuCaps, QEMU_CAPS_CHARDEV);
|
||||
virQEMUCapsSet(qemuCaps, QEMU_CAPS_MONITOR_JSON);
|
||||
virQEMUCapsSet(qemuCaps, QEMU_CAPS_DEVICE);
|
||||
virQEMUCapsSet(qemuCaps, QEMU_CAPS_SDL);
|
||||
virQEMUCapsSet(qemuCaps, QEMU_CAPS_SMP_TOPOLOGY);
|
||||
virQEMUCapsSet(qemuCaps, QEMU_CAPS_NETDEV);
|
||||
@ -4011,8 +4007,7 @@ virQEMUCapsSupportsChardev(const virDomainDef *def,
|
||||
virQEMUCapsPtr qemuCaps,
|
||||
virDomainChrDefPtr chr)
|
||||
{
|
||||
if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_CHARDEV) ||
|
||||
!virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE))
|
||||
if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_CHARDEV))
|
||||
return false;
|
||||
|
||||
if ((def->os.arch == VIR_ARCH_PPC) || ARCH_IS_PPC64(def->os.arch)) {
|
||||
@ -4214,8 +4209,7 @@ virQEMUCapsFillDomainDeviceHostdevCaps(virQEMUCapsPtr qemuCaps,
|
||||
VIR_DOMAIN_CAPS_ENUM_SET(hostdev->subsysType,
|
||||
VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_USB,
|
||||
VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_PCI);
|
||||
if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE) &&
|
||||
virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE_SCSI_GENERIC))
|
||||
if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE_SCSI_GENERIC))
|
||||
VIR_DOMAIN_CAPS_ENUM_SET(hostdev->subsysType,
|
||||
VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_SCSI);
|
||||
|
||||
@ -4230,9 +4224,7 @@ virQEMUCapsFillDomainDeviceHostdevCaps(virQEMUCapsPtr qemuCaps,
|
||||
VIR_DOMAIN_HOSTDEV_PCI_BACKEND_VFIO);
|
||||
}
|
||||
|
||||
if (supportsPassthroughKVM &&
|
||||
(virQEMUCapsGet(qemuCaps, QEMU_CAPS_PCIDEVICE) ||
|
||||
virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE))) {
|
||||
if (supportsPassthroughKVM) {
|
||||
VIR_DOMAIN_CAPS_ENUM_SET(hostdev->pciBackend,
|
||||
VIR_DOMAIN_HOSTDEV_PCI_BACKEND_DEFAULT,
|
||||
VIR_DOMAIN_HOSTDEV_PCI_BACKEND_KVM);
|
||||
|
@ -82,7 +82,7 @@ typedef enum {
|
||||
|
||||
/* 25 */
|
||||
X_QEMU_CAPS_BALLOON, /* -balloon available */
|
||||
QEMU_CAPS_DEVICE, /* Is the new -device arg available */
|
||||
X_QEMU_CAPS_DEVICE, /* Is the -device arg available */
|
||||
QEMU_CAPS_SDL, /* Is the new -sdl arg available */
|
||||
QEMU_CAPS_SMP_TOPOLOGY, /* -smp has sockets/cores/threads */
|
||||
QEMU_CAPS_NETDEV, /* -netdev flag & netdev_add/remove */
|
||||
|
@ -8,7 +8,6 @@
|
||||
<flag name='chardev'/>
|
||||
<flag name='enable-kvm'/>
|
||||
<flag name='monitor-json'/>
|
||||
<flag name='device'/>
|
||||
<flag name='sdl'/>
|
||||
<flag name='smp-topology'/>
|
||||
<flag name='netdev'/>
|
||||
|
@ -8,7 +8,6 @@
|
||||
<flag name='chardev'/>
|
||||
<flag name='enable-kvm'/>
|
||||
<flag name='monitor-json'/>
|
||||
<flag name='device'/>
|
||||
<flag name='sdl'/>
|
||||
<flag name='smp-topology'/>
|
||||
<flag name='netdev'/>
|
||||
|
@ -8,7 +8,6 @@
|
||||
<flag name='chardev'/>
|
||||
<flag name='enable-kvm'/>
|
||||
<flag name='monitor-json'/>
|
||||
<flag name='device'/>
|
||||
<flag name='sdl'/>
|
||||
<flag name='smp-topology'/>
|
||||
<flag name='netdev'/>
|
||||
|
@ -8,7 +8,6 @@
|
||||
<flag name='chardev'/>
|
||||
<flag name='enable-kvm'/>
|
||||
<flag name='monitor-json'/>
|
||||
<flag name='device'/>
|
||||
<flag name='sdl'/>
|
||||
<flag name='smp-topology'/>
|
||||
<flag name='netdev'/>
|
||||
|
@ -8,7 +8,6 @@
|
||||
<flag name='chardev'/>
|
||||
<flag name='enable-kvm'/>
|
||||
<flag name='monitor-json'/>
|
||||
<flag name='device'/>
|
||||
<flag name='sdl'/>
|
||||
<flag name='smp-topology'/>
|
||||
<flag name='netdev'/>
|
||||
|
@ -8,7 +8,6 @@
|
||||
<flag name='chardev'/>
|
||||
<flag name='enable-kvm'/>
|
||||
<flag name='monitor-json'/>
|
||||
<flag name='device'/>
|
||||
<flag name='sdl'/>
|
||||
<flag name='smp-topology'/>
|
||||
<flag name='netdev'/>
|
||||
|
@ -8,7 +8,6 @@
|
||||
<flag name='chardev'/>
|
||||
<flag name='enable-kvm'/>
|
||||
<flag name='monitor-json'/>
|
||||
<flag name='device'/>
|
||||
<flag name='sdl'/>
|
||||
<flag name='smp-topology'/>
|
||||
<flag name='netdev'/>
|
||||
|
@ -8,7 +8,6 @@
|
||||
<flag name='chardev'/>
|
||||
<flag name='enable-kvm'/>
|
||||
<flag name='monitor-json'/>
|
||||
<flag name='device'/>
|
||||
<flag name='sdl'/>
|
||||
<flag name='smp-topology'/>
|
||||
<flag name='netdev'/>
|
||||
|
@ -8,7 +8,6 @@
|
||||
<flag name='chardev'/>
|
||||
<flag name='enable-kvm'/>
|
||||
<flag name='monitor-json'/>
|
||||
<flag name='device'/>
|
||||
<flag name='sdl'/>
|
||||
<flag name='smp-topology'/>
|
||||
<flag name='netdev'/>
|
||||
|
@ -8,7 +8,6 @@
|
||||
<flag name='chardev'/>
|
||||
<flag name='enable-kvm'/>
|
||||
<flag name='monitor-json'/>
|
||||
<flag name='device'/>
|
||||
<flag name='sdl'/>
|
||||
<flag name='smp-topology'/>
|
||||
<flag name='netdev'/>
|
||||
|
@ -8,7 +8,6 @@
|
||||
<flag name='chardev'/>
|
||||
<flag name='enable-kvm'/>
|
||||
<flag name='monitor-json'/>
|
||||
<flag name='device'/>
|
||||
<flag name='sdl'/>
|
||||
<flag name='smp-topology'/>
|
||||
<flag name='netdev'/>
|
||||
|
@ -8,7 +8,6 @@
|
||||
<flag name='chardev'/>
|
||||
<flag name='enable-kvm'/>
|
||||
<flag name='monitor-json'/>
|
||||
<flag name='device'/>
|
||||
<flag name='sdl'/>
|
||||
<flag name='smp-topology'/>
|
||||
<flag name='netdev'/>
|
||||
|
@ -8,7 +8,6 @@
|
||||
<flag name='chardev'/>
|
||||
<flag name='enable-kvm'/>
|
||||
<flag name='monitor-json'/>
|
||||
<flag name='device'/>
|
||||
<flag name='sdl'/>
|
||||
<flag name='smp-topology'/>
|
||||
<flag name='netdev'/>
|
||||
|
@ -70,19 +70,17 @@ static int testHelpStrParsing(const void *data)
|
||||
virQEMUCapsSet(flags, QEMU_CAPS_MONITOR_JSON);
|
||||
# endif
|
||||
|
||||
if (virQEMUCapsGet(info->flags, QEMU_CAPS_DEVICE)) {
|
||||
VIR_FREE(path);
|
||||
VIR_FREE(help);
|
||||
if (virAsprintf(&path, "%s/qemuhelpdata/%s-device", abs_srcdir,
|
||||
info->name) < 0)
|
||||
goto cleanup;
|
||||
VIR_FREE(path);
|
||||
VIR_FREE(help);
|
||||
if (virAsprintf(&path, "%s/qemuhelpdata/%s-device", abs_srcdir,
|
||||
info->name) < 0)
|
||||
goto cleanup;
|
||||
|
||||
if (virtTestLoadFile(path, &help) < 0)
|
||||
goto cleanup;
|
||||
if (virtTestLoadFile(path, &help) < 0)
|
||||
goto cleanup;
|
||||
|
||||
if (virQEMUCapsParseDeviceStr(flags, help) < 0)
|
||||
goto cleanup;
|
||||
}
|
||||
if (virQEMUCapsParseDeviceStr(flags, help) < 0)
|
||||
goto cleanup;
|
||||
|
||||
got = virQEMUCapsFlagsString(flags);
|
||||
expected = virQEMUCapsFlagsString(info->flags);
|
||||
@ -156,7 +154,6 @@ mymain(void)
|
||||
QEMU_CAPS_ENABLE_KVM,
|
||||
QEMU_CAPS_SDL,
|
||||
QEMU_CAPS_CHARDEV,
|
||||
QEMU_CAPS_DEVICE,
|
||||
QEMU_CAPS_SMP_TOPOLOGY,
|
||||
QEMU_CAPS_RTC,
|
||||
QEMU_CAPS_NO_HPET,
|
||||
@ -177,7 +174,6 @@ mymain(void)
|
||||
QEMU_CAPS_CHARDEV,
|
||||
QEMU_CAPS_ENABLE_KVM,
|
||||
QEMU_CAPS_MONITOR_JSON,
|
||||
QEMU_CAPS_DEVICE,
|
||||
QEMU_CAPS_SMP_TOPOLOGY,
|
||||
QEMU_CAPS_NETDEV,
|
||||
QEMU_CAPS_RTC,
|
||||
@ -220,7 +216,6 @@ mymain(void)
|
||||
QEMU_CAPS_MEM_PATH,
|
||||
QEMU_CAPS_SDL,
|
||||
QEMU_CAPS_CHARDEV,
|
||||
QEMU_CAPS_DEVICE,
|
||||
QEMU_CAPS_SMP_TOPOLOGY,
|
||||
QEMU_CAPS_RTC,
|
||||
QEMU_CAPS_VHOST_NET,
|
||||
@ -247,7 +242,6 @@ mymain(void)
|
||||
QEMU_CAPS_CHARDEV,
|
||||
QEMU_CAPS_ENABLE_KVM,
|
||||
QEMU_CAPS_MONITOR_JSON,
|
||||
QEMU_CAPS_DEVICE,
|
||||
QEMU_CAPS_SMP_TOPOLOGY,
|
||||
QEMU_CAPS_NETDEV,
|
||||
QEMU_CAPS_RTC,
|
||||
@ -300,7 +294,6 @@ mymain(void)
|
||||
QEMU_CAPS_CHARDEV,
|
||||
QEMU_CAPS_ENABLE_KVM,
|
||||
QEMU_CAPS_MONITOR_JSON,
|
||||
QEMU_CAPS_DEVICE,
|
||||
QEMU_CAPS_SMP_TOPOLOGY,
|
||||
QEMU_CAPS_NETDEV,
|
||||
QEMU_CAPS_RTC,
|
||||
@ -351,7 +344,6 @@ mymain(void)
|
||||
QEMU_CAPS_CHARDEV,
|
||||
QEMU_CAPS_ENABLE_KVM,
|
||||
QEMU_CAPS_MONITOR_JSON,
|
||||
QEMU_CAPS_DEVICE,
|
||||
QEMU_CAPS_SMP_TOPOLOGY,
|
||||
QEMU_CAPS_NETDEV,
|
||||
QEMU_CAPS_RTC,
|
||||
@ -409,7 +401,6 @@ mymain(void)
|
||||
QEMU_CAPS_CHARDEV,
|
||||
QEMU_CAPS_ENABLE_KVM,
|
||||
QEMU_CAPS_MONITOR_JSON,
|
||||
QEMU_CAPS_DEVICE,
|
||||
QEMU_CAPS_SMP_TOPOLOGY,
|
||||
QEMU_CAPS_NETDEV,
|
||||
QEMU_CAPS_RTC,
|
||||
@ -483,7 +474,6 @@ mymain(void)
|
||||
QEMU_CAPS_CHARDEV,
|
||||
QEMU_CAPS_ENABLE_KVM,
|
||||
QEMU_CAPS_MONITOR_JSON,
|
||||
QEMU_CAPS_DEVICE,
|
||||
QEMU_CAPS_SMP_TOPOLOGY,
|
||||
QEMU_CAPS_NETDEV,
|
||||
QEMU_CAPS_RTC,
|
||||
|
@ -71,8 +71,6 @@ qemuHotplugCreateObjects(virDomainXMLOptionPtr xmlopt,
|
||||
if (!(priv->qemuCaps = virQEMUCapsNew()))
|
||||
goto cleanup;
|
||||
|
||||
/* for attach & detach qemu must support -device */
|
||||
virQEMUCapsSet(priv->qemuCaps, QEMU_CAPS_DEVICE);
|
||||
virQEMUCapsSet(priv->qemuCaps, QEMU_CAPS_VIRTIO_SCSI);
|
||||
virQEMUCapsSet(priv->qemuCaps, QEMU_CAPS_DEVICE_USB_STORAGE);
|
||||
if (event)
|
||||
|
@ -299,7 +299,6 @@ static int testCompareXMLToArgvFiles(const char *xml,
|
||||
|
||||
virQEMUCapsSetList(extraFlags,
|
||||
QEMU_CAPS_NO_ACPI,
|
||||
QEMU_CAPS_DEVICE,
|
||||
QEMU_CAPS_LAST);
|
||||
|
||||
if (STREQ(vm->def->os.machine, "pc") &&
|
||||
|
@ -201,7 +201,6 @@ testInfoSet(struct testInfo *info,
|
||||
goto error;
|
||||
|
||||
virQEMUCapsSetList(info->qemuCaps,
|
||||
QEMU_CAPS_DEVICE,
|
||||
QEMU_CAPS_LAST);
|
||||
|
||||
if (testQemuCapsSetGIC(info->qemuCaps, gic) < 0)
|
||||
|
Loading…
Reference in New Issue
Block a user