[libvirt] [PATCH 6/8] conf: introduce virDomainVsockDefEquals

Ján Tomko jtomko at redhat.com
Wed May 30 14:57:55 UTC 2018


Introduce a function for comparing two vsock definitions.

https://bugzilla.redhat.com/show_bug.cgi?id=1291851

Signed-off-by: Ján Tomko <jtomko at redhat.com>
---
 src/conf/domain_conf.c   | 18 ++++++++++++++++++
 src/conf/domain_conf.h   |  3 +++
 src/libvirt_private.syms |  1 +
 3 files changed, 22 insertions(+)

diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index 27e2bd50eb..13023d80fd 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -17592,6 +17592,24 @@ virDomainInputDefFind(const virDomainDef *def,
 }
 
 
+bool
+virDomainVsockDefEquals(const virDomainVsockDef *a,
+                        const virDomainVsockDef *b)
+{
+    if (a->model != b->model)
+        return false;
+
+    if (a->auto_cid != b->auto_cid)
+        return false;
+
+    if (a->info.type != VIR_DOMAIN_DEVICE_ADDRESS_TYPE_NONE &&
+        !virDomainDeviceInfoAddressIsEqual(&a->info, &b->info))
+        return false;
+
+    return true;
+}
+
+
 char *
 virDomainDefGetDefaultEmulator(virDomainDefPtr def,
                                virCapsPtr caps)
diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h
index 6cc8f8a29b..b6c4090ea1 100644
--- a/src/conf/domain_conf.h
+++ b/src/conf/domain_conf.h
@@ -3312,6 +3312,9 @@ virDomainShmemDefPtr virDomainShmemDefRemove(virDomainDefPtr def, size_t idx)
 ssize_t virDomainInputDefFind(const virDomainDef *def,
                               const virDomainInputDef *input)
     ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_RETURN_CHECK;
+bool virDomainVsockDefEquals(const virDomainVsockDef *a,
+                             const virDomainVsockDef *b)
+    ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_RETURN_CHECK;
 
 VIR_ENUM_DECL(virDomainTaint)
 VIR_ENUM_DECL(virDomainVirt)
diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms
index 5405250ee9..b2decc12fb 100644
--- a/src/libvirt_private.syms
+++ b/src/libvirt_private.syms
@@ -574,6 +574,7 @@ virDomainVideoVGAConfTypeFromString;
 virDomainVideoVGAConfTypeToString;
 virDomainVirtTypeFromString;
 virDomainVirtTypeToString;
+virDomainVsockDefEquals;
 virDomainVsockDefFree;
 virDomainVsockDefNew;
 virDomainWatchdogActionTypeFromString;
-- 
2.16.1




More information about the libvir-list mailing list