External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-01-05 12:35:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

qemu: allow conditional device property probing

Browse Source 
Do not probe for devices that QEMU does not know
when probing for device options.
This commit is contained in:
Ján Tomko 2017-03-20 16:08:48 +01:00
parent d34ac94351
commit 4ae59411fa
1 changed files with 68 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

99
src/qemu/qemu_capabilities.c
View File

@ -1712,71 +1712,103 @@ struct virQEMUCapsObjectTypeProps {
const char *type; const char *type;
struct virQEMUCapsStringFlags *props; struct virQEMUCapsStringFlags *props;
size_t nprops; size_t nprops;
int capsCondition;
}; };
static struct virQEMUCapsObjectTypeProps virQEMUCapsObjectProps[] = { static struct virQEMUCapsObjectTypeProps virQEMUCapsObjectProps[] = {
{ "virtio-blk-pci", virQEMUCapsObjectPropsVirtioBlk, { "virtio-blk-pci", virQEMUCapsObjectPropsVirtioBlk,
ARRAY_CARDINALITY(virQEMUCapsObjectPropsVirtioBlk) }, ARRAY_CARDINALITY(virQEMUCapsObjectPropsVirtioBlk),
-1 },
{ "virtio-net-pci", virQEMUCapsObjectPropsVirtioNet, { "virtio-net-pci", virQEMUCapsObjectPropsVirtioNet,
ARRAY_CARDINALITY(virQEMUCapsObjectPropsVirtioNet) }, ARRAY_CARDINALITY(virQEMUCapsObjectPropsVirtioNet),
-1 },
{ "virtio-scsi-pci", virQEMUCapsObjectPropsVirtioSCSI, { "virtio-scsi-pci", virQEMUCapsObjectPropsVirtioSCSI,
ARRAY_CARDINALITY(virQEMUCapsObjectPropsVirtioSCSI) }, ARRAY_CARDINALITY(virQEMUCapsObjectPropsVirtioSCSI),
-1 },
{ "virtio-blk-ccw", virQEMUCapsObjectPropsVirtioBlk, { "virtio-blk-ccw", virQEMUCapsObjectPropsVirtioBlk,
ARRAY_CARDINALITY(virQEMUCapsObjectPropsVirtioBlk) }, ARRAY_CARDINALITY(virQEMUCapsObjectPropsVirtioBlk),
-1 },
{ "virtio-net-ccw", virQEMUCapsObjectPropsVirtioNet, { "virtio-net-ccw", virQEMUCapsObjectPropsVirtioNet,
ARRAY_CARDINALITY(virQEMUCapsObjectPropsVirtioNet) }, ARRAY_CARDINALITY(virQEMUCapsObjectPropsVirtioNet),
-1 },
{ "virtio-scsi-ccw", virQEMUCapsObjectPropsVirtioSCSI, { "virtio-scsi-ccw", virQEMUCapsObjectPropsVirtioSCSI,
ARRAY_CARDINALITY(virQEMUCapsObjectPropsVirtioSCSI) }, ARRAY_CARDINALITY(virQEMUCapsObjectPropsVirtioSCSI),
-1 },
{ "virtio-blk-s390", virQEMUCapsObjectPropsVirtioBlk, { "virtio-blk-s390", virQEMUCapsObjectPropsVirtioBlk,
ARRAY_CARDINALITY(virQEMUCapsObjectPropsVirtioBlk) }, ARRAY_CARDINALITY(virQEMUCapsObjectPropsVirtioBlk),
-1 },
{ "virtio-net-s390", virQEMUCapsObjectPropsVirtioNet, { "virtio-net-s390", virQEMUCapsObjectPropsVirtioNet,
ARRAY_CARDINALITY(virQEMUCapsObjectPropsVirtioNet) }, ARRAY_CARDINALITY(virQEMUCapsObjectPropsVirtioNet),
-1 },
{ "pci-assign", virQEMUCapsObjectPropsPCIAssign, { "pci-assign", virQEMUCapsObjectPropsPCIAssign,
ARRAY_CARDINALITY(virQEMUCapsObjectPropsPCIAssign) }, ARRAY_CARDINALITY(virQEMUCapsObjectPropsPCIAssign),
-1 },
{ "kvm-pci-assign", virQEMUCapsObjectPropsPCIAssign, { "kvm-pci-assign", virQEMUCapsObjectPropsPCIAssign,
ARRAY_CARDINALITY(virQEMUCapsObjectPropsPCIAssign) }, ARRAY_CARDINALITY(virQEMUCapsObjectPropsPCIAssign),
-1 },
{ "vfio-pci", virQEMUCapsObjectPropsVfioPCI, { "vfio-pci", virQEMUCapsObjectPropsVfioPCI,
ARRAY_CARDINALITY(virQEMUCapsObjectPropsVfioPCI) }, ARRAY_CARDINALITY(virQEMUCapsObjectPropsVfioPCI),
-1 },
{ "scsi-disk", virQEMUCapsObjectPropsSCSIDisk, { "scsi-disk", virQEMUCapsObjectPropsSCSIDisk,
ARRAY_CARDINALITY(virQEMUCapsObjectPropsSCSIDisk) }, ARRAY_CARDINALITY(virQEMUCapsObjectPropsSCSIDisk),
-1 },
{ "ide-drive", virQEMUCapsObjectPropsIDEDrive, { "ide-drive", virQEMUCapsObjectPropsIDEDrive,
ARRAY_CARDINALITY(virQEMUCapsObjectPropsIDEDrive) }, ARRAY_CARDINALITY(virQEMUCapsObjectPropsIDEDrive),
-1 },
{ "PIIX4_PM", virQEMUCapsObjectPropsPiix4PM, { "PIIX4_PM", virQEMUCapsObjectPropsPiix4PM,
ARRAY_CARDINALITY(virQEMUCapsObjectPropsPiix4PM) }, ARRAY_CARDINALITY(virQEMUCapsObjectPropsPiix4PM),
-1 },
{ "usb-redir", virQEMUCapsObjectPropsUSBRedir, { "usb-redir", virQEMUCapsObjectPropsUSBRedir,
ARRAY_CARDINALITY(virQEMUCapsObjectPropsUSBRedir) }, ARRAY_CARDINALITY(virQEMUCapsObjectPropsUSBRedir),
-1 },
{ "usb-host", virQEMUCapsObjectPropsUSBHost, { "usb-host", virQEMUCapsObjectPropsUSBHost,
ARRAY_CARDINALITY(virQEMUCapsObjectPropsUSBHost) }, ARRAY_CARDINALITY(virQEMUCapsObjectPropsUSBHost),
-1 },
{ "scsi-generic", virQEMUCapsObjectPropsSCSIGeneric, { "scsi-generic", virQEMUCapsObjectPropsSCSIGeneric,
ARRAY_CARDINALITY(virQEMUCapsObjectPropsSCSIGeneric) }, ARRAY_CARDINALITY(virQEMUCapsObjectPropsSCSIGeneric),
-1 },
{ "i440FX-pcihost", virQEMUCapsObjectPropsI440FXPCIHost, { "i440FX-pcihost", virQEMUCapsObjectPropsI440FXPCIHost,
ARRAY_CARDINALITY(virQEMUCapsObjectPropsI440FXPCIHost) }, ARRAY_CARDINALITY(virQEMUCapsObjectPropsI440FXPCIHost),
-1 },
{ "q35-pcihost", virQEMUCapsObjectPropsQ35PCIHost, { "q35-pcihost", virQEMUCapsObjectPropsQ35PCIHost,
ARRAY_CARDINALITY(virQEMUCapsObjectPropsQ35PCIHost) }, ARRAY_CARDINALITY(virQEMUCapsObjectPropsQ35PCIHost),
-1 },
{ "usb-storage", virQEMUCapsObjectPropsUSBStorage, { "usb-storage", virQEMUCapsObjectPropsUSBStorage,
ARRAY_CARDINALITY(virQEMUCapsObjectPropsUSBStorage) }, ARRAY_CARDINALITY(virQEMUCapsObjectPropsUSBStorage),
-1 },
{ "kvm-pit", virQEMUCapsObjectPropsKVMPit, { "kvm-pit", virQEMUCapsObjectPropsKVMPit,
ARRAY_CARDINALITY(virQEMUCapsObjectPropsKVMPit) }, ARRAY_CARDINALITY(virQEMUCapsObjectPropsKVMPit),
-1 },
{ "VGA", virQEMUCapsObjectPropsVGA, { "VGA", virQEMUCapsObjectPropsVGA,
ARRAY_CARDINALITY(virQEMUCapsObjectPropsVGA) }, ARRAY_CARDINALITY(virQEMUCapsObjectPropsVGA),
-1 },
{ "vmware-svga", virQEMUCapsObjectPropsVmwareSvga, { "vmware-svga", virQEMUCapsObjectPropsVmwareSvga,
ARRAY_CARDINALITY(virQEMUCapsObjectPropsVmwareSvga) }, ARRAY_CARDINALITY(virQEMUCapsObjectPropsVmwareSvga),
-1 },
{ "qxl", virQEMUCapsObjectPropsQxl, { "qxl", virQEMUCapsObjectPropsQxl,
ARRAY_CARDINALITY(virQEMUCapsObjectPropsQxl) }, ARRAY_CARDINALITY(virQEMUCapsObjectPropsQxl),
-1 },
{ "virtio-gpu-pci", virQEMUCapsObjectPropsVirtioGpu, { "virtio-gpu-pci", virQEMUCapsObjectPropsVirtioGpu,
ARRAY_CARDINALITY(virQEMUCapsObjectPropsVirtioGpu) }, ARRAY_CARDINALITY(virQEMUCapsObjectPropsVirtioGpu),
-1 },
{ "virtio-gpu-device", virQEMUCapsObjectPropsVirtioGpu, { "virtio-gpu-device", virQEMUCapsObjectPropsVirtioGpu,
ARRAY_CARDINALITY(virQEMUCapsObjectPropsVirtioGpu) }, ARRAY_CARDINALITY(virQEMUCapsObjectPropsVirtioGpu),
-1 },
{ "ICH9-LPC", virQEMUCapsObjectPropsICH9, { "ICH9-LPC", virQEMUCapsObjectPropsICH9,
ARRAY_CARDINALITY(virQEMUCapsObjectPropsICH9) }, ARRAY_CARDINALITY(virQEMUCapsObjectPropsICH9),
-1 },
{ "virtio-balloon-pci", virQEMUCapsObjectPropsVirtioBalloon, { "virtio-balloon-pci", virQEMUCapsObjectPropsVirtioBalloon,
ARRAY_CARDINALITY(virQEMUCapsObjectPropsVirtioBalloon) }, ARRAY_CARDINALITY(virQEMUCapsObjectPropsVirtioBalloon),
-1 },
{ "virtio-balloon-ccw", virQEMUCapsObjectPropsVirtioBalloon, { "virtio-balloon-ccw", virQEMUCapsObjectPropsVirtioBalloon,
ARRAY_CARDINALITY(virQEMUCapsObjectPropsVirtioBalloon) }, ARRAY_CARDINALITY(virQEMUCapsObjectPropsVirtioBalloon),
-1 },
{ "virtio-balloon-device", virQEMUCapsObjectPropsVirtioBalloon, { "virtio-balloon-device", virQEMUCapsObjectPropsVirtioBalloon,
ARRAY_CARDINALITY(virQEMUCapsObjectPropsVirtioBalloon) }, ARRAY_CARDINALITY(virQEMUCapsObjectPropsVirtioBalloon),
-1 },
{ "nec-usb-xhci", virQEMUCapsObjectPropsUSBNECXHCI, { "nec-usb-xhci", virQEMUCapsObjectPropsUSBNECXHCI,
ARRAY_CARDINALITY(virQEMUCapsObjectPropsUSBNECXHCI) }, ARRAY_CARDINALITY(virQEMUCapsObjectPropsUSBNECXHCI),
-1 },
}; };
struct virQEMUCapsPropTypeObjects { struct virQEMUCapsPropTypeObjects {
@ -2689,6 +2721,11 @@ virQEMUCapsProbeQMPObjects(virQEMUCapsPtr qemuCaps,
for (i = 0; i < ARRAY_CARDINALITY(virQEMUCapsObjectProps); i++) { for (i = 0; i < ARRAY_CARDINALITY(virQEMUCapsObjectProps); i++) {
const char *type = virQEMUCapsObjectProps[i].type; const char *type = virQEMUCapsObjectProps[i].type;
int cap = virQEMUCapsObjectProps[i].capsCondition;
if (cap >= 0 && !virQEMUCapsGet(qemuCaps, cap))
continue;
if ((nvalues = qemuMonitorGetObjectProps(mon, if ((nvalues = qemuMonitorGetObjectProps(mon,
type, type,
&values)) < 0) &values)) < 0)