[libvirt] [PATCH v2 5/8] Add virDomainDefFindDevice for looking up a device by its alias
---
Notes:
Already ACKed in version 1
Version 2:
- no change
src/conf/domain_conf.c | 41 +++++++++++++++++++++++++++++++++++++++++
src/conf/domain_conf.h | 4 ++++
src/libvirt_private.syms | 1 +
3 files changed, 46 insertions(+)
diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index 44be81e..57cd9b1 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -18314,3 +18314,44 @@ virDomainDiskDefGenSecurityLabelDef(const char *model)
return seclabel;
}
+
+
+typedef struct {
+ const char *devAlias;
+ virDomainDeviceDefPtr dev;
+} virDomainDefFindDeviceCallbackData;
+
+static int
+virDomainDefFindDeviceCallback(virDomainDefPtr def ATTRIBUTE_UNUSED,
+ virDomainDeviceDefPtr dev,
+ virDomainDeviceInfoPtr info,
+ void *opaque)
+{
+ virDomainDefFindDeviceCallbackData *data = opaque;
+
+ if (STREQ_NULLABLE(info->alias, data->devAlias)) {
+ *data->dev = *dev;
+ return -1;
+ }
+ return 0;
+}
+
+int
+virDomainDefFindDevice(virDomainDefPtr def,
+ const char *devAlias,
+ virDomainDeviceDefPtr dev)
+{
+ virDomainDefFindDeviceCallbackData data = { devAlias, dev };
+
+ dev->type = VIR_DOMAIN_DEVICE_NONE;
+ virDomainDeviceInfoIterateInternal(def, virDomainDefFindDeviceCallback,
+ true, &data);
+
+ if (dev->type == VIR_DOMAIN_DEVICE_NONE) {
+ virReportError(VIR_ERR_INTERNAL_ERROR,
+ _("no device found with alias %s"), devAlias);
+ return -1;
+ }
+
+ return 0;
+}
diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h
index b14afd9..25dad16 100644
--- a/src/conf/domain_conf.h
+++ b/src/conf/domain_conf.h
@@ -2688,4 +2688,8 @@ virDomainDefMaybeAddController(virDomainDefPtr def,
char *virDomainDefGetDefaultEmulator(virDomainDefPtr def, virCapsPtr caps);
+int virDomainDefFindDevice(virDomainDefPtr def,
+ const char *devAlias,
+ virDomainDeviceDefPtr dev);
+
#endif /* __DOMAIN_CONF_H */
diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms
index d4bf8e3..b1c4032 100644
--- a/src/libvirt_private.syms
+++ b/src/libvirt_private.syms
@@ -153,6 +153,7 @@ virDomainDefClearDeviceAliases;
virDomainDefClearPCIAddresses;
virDomainDefCompatibleDevice;
virDomainDefCopy;
+virDomainDefFindDevice;
virDomainDefFormat;
virDomainDefFormatInternal;
virDomainDefFree;
--
1.8.3.2