[libvirt] [PATCH v2 11/41] util: mdev: define cleanup function using VIR_DEFINE_AUTOPTR_FUNC

Sukrit Bhatnagar skrtbhtngr at gmail.com
Tue Jul 24 15:52:12 UTC 2018


Using the new VIR_DEFINE_AUTOPTR_FUNC macro defined in
src/util/viralloc.h, define a new wrapper around an existing
cleanup function which will be called when a variable declared
with VIR_AUTOPTR macro goes out of scope. Also, drop the redundant
viralloc.h include, since that has moved from the source module into
the header.

When variables of type virMediatedDevicePtr and virMediatedDeviceTypePtr
are declared using VIR_AUTOPTR, the functions virMediatedDeviceFree
and virMediatedDeviceTypeFree, respectively, will be run automatically
on them when they go out of scope.

Signed-off-by: Sukrit Bhatnagar <skrtbhtngr at gmail.com>
Reviewed-by: Erik Skultety <eskultet at redhat.com>
---
 src/util/virmdev.c | 1 -
 src/util/virmdev.h | 4 ++++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/util/virmdev.c b/src/util/virmdev.c
index 6c51388..d7bcb1d 100644
--- a/src/util/virmdev.c
+++ b/src/util/virmdev.c
@@ -21,7 +21,6 @@
 #include "dirname.h"
 #include "virmdev.h"
 #include "virlog.h"
-#include "viralloc.h"
 #include "virerror.h"
 #include "virfile.h"
 #include "virstring.h"
diff --git a/src/util/virmdev.h b/src/util/virmdev.h
index cfda2ca..7c93c4d 100644
--- a/src/util/virmdev.h
+++ b/src/util/virmdev.h
@@ -22,6 +22,7 @@
 # include "internal.h"
 # include "virobject.h"
 # include "virutil.h"
+# include "viralloc.h"
 
 typedef enum {
     VIR_MDEV_MODEL_TYPE_VFIO_PCI = 0,
@@ -135,4 +136,7 @@ int
 virMediatedDeviceTypeReadAttrs(const char *sysfspath,
                                virMediatedDeviceTypePtr *type);
 
+VIR_DEFINE_AUTOPTR_FUNC(virMediatedDevice, virMediatedDeviceFree)
+VIR_DEFINE_AUTOPTR_FUNC(virMediatedDeviceType, virMediatedDeviceTypeFree)
+
 #endif /* __VIR_MDEV_H__ */
-- 
1.8.3.1




More information about the libvir-list mailing list