This is essentially a wrapper for easily setting the variable name in virDomainDeviceDef that matches its associated VIR_DOMAIN_DEVICE_TYPE. Signed-off-by: Cole Robinson <crobinso@xxxxxxxxxx> --- src/conf/domain_conf.c | 93 ++++++++++++++++++++++++++++++++++++++++ src/conf/domain_conf.h | 3 ++ src/libvirt_private.syms | 1 + 3 files changed, 97 insertions(+) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index bcdb6b0a3a..8af1a4ae73 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -3702,6 +3702,99 @@ virDomainSkipBackcompatConsole(virDomainDefPtr def, } +/** + * virDomainDeviceSetData + * @device: virDomainDeviceDefPtr with ->type filled in + * @data: *DefPtr data for a device. Ex: virDomainDiskDefPtr + * + * Set the data.X variable for the device->type value. Basically + * a mapping of virDomainDeviceType to the associated name in + * the virDomainDeviceDef union + */ +void +virDomainDeviceSetData(virDomainDeviceDefPtr device, + void *devicedata) +{ + switch ((virDomainDeviceType) device->type) { + case VIR_DOMAIN_DEVICE_DISK: + device->data.disk = devicedata; + break; + case VIR_DOMAIN_DEVICE_NET: + device->data.net = devicedata; + break; + case VIR_DOMAIN_DEVICE_SOUND: + device->data.sound = devicedata; + break; + case VIR_DOMAIN_DEVICE_HOSTDEV: + device->data.hostdev = devicedata; + break; + case VIR_DOMAIN_DEVICE_VIDEO: + device->data.video = devicedata; + break; + case VIR_DOMAIN_DEVICE_CONTROLLER: + device->data.controller = devicedata; + break; + case VIR_DOMAIN_DEVICE_GRAPHICS: + device->data.graphics = devicedata; + break; + case VIR_DOMAIN_DEVICE_SMARTCARD: + device->data.smartcard = devicedata; + break; + case VIR_DOMAIN_DEVICE_CHR: + device->data.chr = devicedata; + break; + case VIR_DOMAIN_DEVICE_INPUT: + device->data.input = devicedata; + break; + case VIR_DOMAIN_DEVICE_FS: + device->data.fs = devicedata; + break; + case VIR_DOMAIN_DEVICE_WATCHDOG: + device->data.watchdog = devicedata; + break; + case VIR_DOMAIN_DEVICE_MEMBALLOON: + device->data.memballoon = devicedata; + break; + case VIR_DOMAIN_DEVICE_RNG: + device->data.rng = devicedata; + break; + case VIR_DOMAIN_DEVICE_NVRAM: + device->data.nvram = devicedata; + break; + case VIR_DOMAIN_DEVICE_HUB: + device->data.hub = devicedata; + break; + case VIR_DOMAIN_DEVICE_SHMEM: + device->data.shmem = devicedata; + break; + case VIR_DOMAIN_DEVICE_TPM: + device->data.tpm = devicedata; + break; + case VIR_DOMAIN_DEVICE_PANIC: + device->data.panic = devicedata; + break; + case VIR_DOMAIN_DEVICE_MEMORY: + device->data.memory = devicedata; + break; + case VIR_DOMAIN_DEVICE_REDIRDEV: + device->data.redirdev = devicedata; + break; + case VIR_DOMAIN_DEVICE_VSOCK: + device->data.vsock = devicedata; + break; + case VIR_DOMAIN_DEVICE_IOMMU: + device->data.iommu = devicedata; + break; + case VIR_DOMAIN_DEVICE_LEASE: + device->data.lease = devicedata; + break; + case VIR_DOMAIN_DEVICE_NONE: + case VIR_DOMAIN_DEVICE_LAST: + break; + } +} + + enum { DOMAIN_DEVICE_ITERATE_ALL_CONSOLES = 1 << 0, DOMAIN_DEVICE_ITERATE_GRAPHICS = 1 << 1 diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index 218aa4dd94..536b02ad3d 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -2937,6 +2937,9 @@ virDomainDeviceDefPtr virDomainDeviceDefCopy(virDomainDeviceDefPtr src, virDomainDeviceInfoPtr virDomainDeviceGetInfo(virDomainDeviceDefPtr device); void virDomainTPMDefFree(virDomainTPMDefPtr def); +void virDomainDeviceSetData(virDomainDeviceDefPtr device, + void *devicedata); + typedef int (*virDomainDeviceInfoCallback)(virDomainDefPtr def, virDomainDeviceDefPtr dev, virDomainDeviceInfoPtr info, diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 6f4809a68a..89b8ca3b4f 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -307,6 +307,7 @@ virDomainDeviceDefParse; virDomainDeviceFindSCSIController; virDomainDeviceGetInfo; virDomainDeviceInfoIterate; +virDomainDeviceSetData; virDomainDeviceTypeToString; virDomainDeviceValidateAliasForHotplug; virDomainDiskBusTypeToString; -- 2.20.1 -- libvir-list mailing list libvir-list@xxxxxxxxxx https://www.redhat.com/mailman/listinfo/libvir-list