[PATCH] Fix connection leaks
by Sharad Mishra
# HG changeset patch
# User Sharad Mishra <snmishra(a)us.ibm.com>
# Date 1305298464 25200
# Node ID d0ccdb5447c796123c0175873c6d108a77dc1e39
# Parent 8b428df21c360d1eaedba7157b0dfd429d2db121
Fix connection leaks.
libvirt-cim had few connection leaks which were causing it to crash.
Signed-off-by: Sharad Mishra <snmishra(a)us.ibm.com>
diff -r 8b428df21c36 -r d0ccdb5447c7 libxkutil/pool_parsing.c
--- a/libxkutil/pool_parsing.c Wed Apr 13 12:27:33 2011 -0700
+++ b/libxkutil/pool_parsing.c Fri May 13 07:54:24 2011 -0700
@@ -453,6 +453,7 @@
CU_DEBUG("Unable to refresh storage "
"pool");
}
+ virStoragePoolFree(pool_ptr);
ret = 1;
}
diff -r 8b428df21c36 -r d0ccdb5447c7 src/Virt_AllocationCapabilities.c
--- a/src/Virt_AllocationCapabilities.c Wed Apr 13 12:27:33 2011 -0700
+++ b/src/Virt_AllocationCapabilities.c Fri May 13 07:54:24 2011 -0700
@@ -79,7 +79,6 @@
const char *id,
struct inst_list *list)
{
- virConnectPtr conn = NULL;
CMPIInstance *alloc_cap_inst;
struct inst_list device_pool_list;
CMPIStatus s = {CMPI_RC_OK, NULL};
@@ -91,15 +90,6 @@
if (!provider_is_responsible(broker, ref, &s))
goto out;
- conn = connect_by_classname(broker, CLASSNAME(ref), &s);
- if (conn == NULL) {
- if (id)
- cu_statusf(broker, &s,
- CMPI_RC_ERR_NOT_FOUND,
- "Instance not found.");
- goto out;
- }
-
s = enum_pools(broker, ref, CIM_RES_TYPE_ALL, &device_pool_list);
if (s.rc != CMPI_RC_OK) {
cu_statusf(broker, &s,
@@ -141,7 +131,6 @@
}
out:
- virConnectClose(conn);
inst_list_free(&device_pool_list);
return s;
diff -r 8b428df21c36 -r d0ccdb5447c7 src/Virt_ComputerSystem.c
--- a/src/Virt_ComputerSystem.c Wed Apr 13 12:27:33 2011 -0700
+++ b/src/Virt_ComputerSystem.c Fri May 13 07:54:24 2011 -0700
@@ -938,12 +938,12 @@
goto out;
}
- dom = virDomainLookupByName(conn,
+ virDomainPtr dom2 = virDomainLookupByName(conn,
virDomainGetName(dom));
- if (dom == NULL) {
- dom = virDomainDefineXML(conn, xml);
- if (dom == NULL) {
+ if (dom2 == NULL) {
+ dom2 = virDomainDefineXML(conn, xml);
+ if (dom2 == NULL) {
CU_DEBUG("Failed to define domain from XML");
virt_set_status(_BROKER, &s,
CMPI_RC_ERR_FAILED,
@@ -953,10 +953,10 @@
}
}
- if (!domain_online(dom))
+ if (!domain_online(dom2))
CU_DEBUG("Guest is now offline");
- ret = virDomainCreate(dom);
+ ret = virDomainCreate(dom2);
if (ret != 0)
virt_set_status(_BROKER, &s,
CMPI_RC_ERR_FAILED,
@@ -965,6 +965,8 @@
out:
free(xml);
+ virDomainFree(dom2);
+ virConnectClose(conn);
return s;
}
diff -r 8b428df21c36 -r d0ccdb5447c7 src/Virt_ComputerSystemIndication.c
--- a/src/Virt_ComputerSystemIndication.c Wed Apr 13 12:27:33 2011 -0700
+++ b/src/Virt_ComputerSystemIndication.c Fri May 13 07:54:24 2011 -0700
@@ -422,7 +422,6 @@
}
static bool async_ind(CMPIContext *context,
- virConnectPtr conn,
int ind_type,
struct dom_xml prev_dom,
char *prefix,
@@ -557,7 +556,7 @@
for (i = 0; i < cur_count; i++) {
res = dom_in_list(cur_xml[i].uuid, prev_count, prev_xml);
if (!res)
- async_ind(context, conn, CS_CREATED,
+ async_ind(context, CS_CREATED,
cur_xml[i], prefix, args);
}
@@ -565,14 +564,14 @@
for (i = 0; i < prev_count; i++) {
res = dom_in_list(prev_xml[i].uuid, cur_count, cur_xml);
if (!res)
- async_ind(context, conn, CS_DELETED,
+ async_ind(context, CS_DELETED,
prev_xml[i], prefix, args);
}
for (i = 0; i < prev_count; i++) {
res = dom_changed(prev_xml[i], cur_xml, cur_count);
if (res) {
- async_ind(context, conn, CS_MODIFIED,
+ async_ind(context, CS_MODIFIED,
prev_xml[i], prefix, args);
}
diff -r 8b428df21c36 -r d0ccdb5447c7 src/Virt_DevicePool.c
--- a/src/Virt_DevicePool.c Wed Apr 13 12:27:33 2011 -0700
+++ b/src/Virt_DevicePool.c Fri May 13 07:54:24 2011 -0700
@@ -451,8 +451,8 @@
free(host);
free(dev);
+ virDomainFree(dom);
virConnectClose(conn);
- virDomainFree(dom);
return pool;
}
diff -r 8b428df21c36 -r d0ccdb5447c7 src/Virt_VSMigrationService.c
--- a/src/Virt_VSMigrationService.c Wed Apr 13 12:27:33 2011 -0700
+++ b/src/Virt_VSMigrationService.c Fri May 13 07:54:24 2011 -0700
@@ -1511,6 +1511,7 @@
out:
CMReturnData(results, (CMPIValue *)&retcode, CMPI_uint32);
+ virConnectClose(job->conn);
return s;
}
13 years, 7 months
[PATCH 0 of 5] libcmpiutil: "Cosmetics"
by Eduardo Lima (Etrunko)
This is a series of simple, straightforward patches intended to cleanup the
libcmpiutil source tree. Comments are welcome.
Best regards,
--
Eduardo de Barros Lima
Software Engineer, Open Virtualization
Linux Technology Center - IBM/Brazil
eblima(a)br.ibm.com
13 years, 7 months
[PATCH 0 of 5] (#2) libcmpiutil: "Cosmetics"
by Eduardo Lima (Etrunko)
Second version of the series. Nothing really changed, but the "Signed-off-by"
in each patch.
Best regards,
--
Eduardo de Barros Lima
Software Engineer, Open Virtualization
Linux Technology Center - IBM/Brazil
eblima(a)br.ibm.com
13 years, 7 months
[PATCH] --confirm
by Eduardo Lima (Etrunko)
# HG changeset patch
# User Eduardo Lima (Etrunko) <eblima(a)br.ibm.com>
# Date 1304971973 10800
# Node ID 845daca07eed6b26555f71a7c761ec945fdc644a
# Parent 8b428df21c360d1eaedba7157b0dfd429d2db121
Configure: Check for libuuid
This patch introduces a macro in acinclude.m4 to check for libuuid
development files and fixes the build accordingly.
Changes from v1:
Added specific check for libuuid version < 1.41.2
Changes from v2:
Respect 80 characters limit
Signed-off-by: Eduardo Lima (Etrunko) <eblima(a)br.ibm.com>
diff -r 8b428df21c36 -r 845daca07eed acinclude.m4
--- a/acinclude.m4 Wed Apr 13 12:27:33 2011 -0700
+++ b/acinclude.m4 Mon May 09 17:12:53 2011 -0300
@@ -238,10 +238,32 @@
AC_DEFUN([CHECK_LIBVIRT],
[
PKG_CHECK_MODULES([LIBVIRT], [libvirt >= 0.3.2])
+ AC_SUBST([LIBVIRT_CFLAGS])
+ AC_SUBST([LIBVIRT_LIBS])
CPPFLAGS="$CPPFLAGS $LIBVIRT_CFLAGS"
LDFLAGS="$LDFLAGS $LIBVIRT_LIBS"
])
+AC_DEFUN([CHECK_LIBUUID],
+ [
+ PKG_CHECK_MODULES([LIBUUID], [uuid >= 1.41.2],
+ [LIBUUID_FOUND=yes], [LIBUUID_FOUND=no])
+ if test "$LIBUUID_FOUND" = "no" ; then
+ PKG_CHECK_MODULES([LIBUUID], [uuid],
+ [LIBUUID_FOUND=yes], [LIBUUID_FOUND=no])
+ if test "$LIBUUID_FOUND" = "no" ; then
+ AC_MSG_ERROR([libuuid development files required])
+ else
+ LIBUUID_INCLUDEDIR=$(pkg-config --variable=includedir uuid)
+ LIBUUID_CFLAGS+=" -I$LIBUUID_INCLUDEDIR/uuid "
+ fi
+ fi
+ AC_SUBST([LIBUUID_CFLAGS])
+ AC_SUBST([LIBUUID_LIBS])
+ CPPFLAGS="$CPPFLAGS $LIBUUID_CFLAGS"
+ LDFLAGS="$LDFLAGS $LIBUUID_LIBS"
+ ])
+
# A convenience macro that spits out a fail message for a particular test
#
# AC_CHECK_FAIL($LIBNAME,$PACKAGE_SUGGEST,$URL,$EXTRA)
diff -r 8b428df21c36 -r 845daca07eed configure.ac
--- a/configure.ac Wed Apr 13 12:27:33 2011 -0700
+++ b/configure.ac Mon May 09 17:12:53 2011 -0300
@@ -148,10 +148,14 @@
# Check for presense of a CIM server (this macro is defined in acinclude.m4)
CHECK_CIMSERVER
+# Check pkg-config program
+PKG_PROG_PKG_CONFIG
+
# Check for presence of libraries
CHECK_LIBVIRT
CHECK_LIBXML2
CHECK_LIBCU
+CHECK_LIBUUID
CFLAGS_STRICT="-Werror"
diff -r 8b428df21c36 -r 845daca07eed libxkutil/Makefile.am
--- a/libxkutil/Makefile.am Wed Apr 13 12:27:33 2011 -0700
+++ b/libxkutil/Makefile.am Mon May 09 17:12:53 2011 -0300
@@ -1,7 +1,6 @@
# Copyright IBM Corp. 2007
SUBDIRS = tests
-
CFLAGS += $(CFLAGS_STRICT)
noinst_HEADERS = cs_util.h misc_util.h device_parsing.h xmlgen.h infostore.h \
@@ -9,14 +8,14 @@
lib_LTLIBRARIES = libxkutil.la
-AM_LDFLAGS = -lvirt -luuid
-
libxkutil_la_SOURCES = cs_util_instance.c misc_util.c device_parsing.c \
xmlgen.c infostore.c pool_parsing.c
+libxkutil_la_LIBADD = @LIBVIRT_LIBS@ \
+ @LIBUUID_LIBS@
+
noinst_PROGRAMS = xml_parse_test
xml_parse_test_SOURCES = xml_parse_test.c
-xml_parse_test_LDADD = -lvirt
-xml_parse_test_LDFLAGS = libxkutil.la
-xml_parse_test_DEPENDENCIES = libxkutil.la
+xml_parse_test_LDADD = libxkutil.la \
+ @LIBVIRT_LIBS@
diff -r 8b428df21c36 -r 845daca07eed libxkutil/xmlgen.c
--- a/libxkutil/xmlgen.c Wed Apr 13 12:27:33 2011 -0700
+++ b/libxkutil/xmlgen.c Mon May 09 17:12:53 2011 -0300
@@ -22,7 +22,7 @@
#include <string.h>
#include <stdlib.h>
#include <inttypes.h>
-#include <uuid/uuid.h>
+#include <uuid.h>
#include <libxml/tree.h>
#include <libxml/xmlsave.h>
diff -r 8b428df21c36 -r 845daca07eed src/Virt_SettingsDefineCapabilities.c
--- a/src/Virt_SettingsDefineCapabilities.c Wed Apr 13 12:27:33 2011 -0700
+++ b/src/Virt_SettingsDefineCapabilities.c Mon May 09 17:12:53 2011 -0300
@@ -26,7 +26,7 @@
#include <stdbool.h>
#include <sys/vfs.h>
#include <errno.h>
-#include <uuid/uuid.h>
+#include <uuid.h>
#include <libvirt/libvirt.h>
diff -r 8b428df21c36 -r 845daca07eed src/Virt_VSMigrationService.c
--- a/src/Virt_VSMigrationService.c Wed Apr 13 12:27:33 2011 -0700
+++ b/src/Virt_VSMigrationService.c Mon May 09 17:12:53 2011 -0300
@@ -29,7 +29,7 @@
#include <dirent.h>
#include <errno.h>
-#include <uuid/uuid.h>
+#include <uuid.h>
#include <libvirt/libvirt.h>
diff -r 8b428df21c36 -r 845daca07eed src/Virt_VirtualSystemSnapshotService.c
--- a/src/Virt_VirtualSystemSnapshotService.c Wed Apr 13 12:27:33 2011 -0700
+++ b/src/Virt_VirtualSystemSnapshotService.c Mon May 09 17:12:53 2011 -0300
@@ -24,7 +24,7 @@
#include <string.h>
#include <stdbool.h>
-#include <uuid/uuid.h>
+#include <uuid.h>
#include <cmpidt.h>
#include <cmpift.h>
13 years, 7 months
reg: CIM Classes availability
by Mohan Sundar
Hi all,
I am trying to manage KVM remotely through Libvirt & CIM.
I have Libvirt-CIM Providers and OpenPegasus CIMOM to acheive the same.
When i tried to get the below values , i could not find any CIM or Libvirt-CIM classes for it.
1. IPSubnet Mask of Host machine
2. DefaultIPGateway of Host machine
3. MACAddress of Guest machines
4. Os Details of Guest Machines
[ I need to know the CIM class for achieving this as well as Libvirt API methods to achieve the same.]
Thanks in advance
Mohan Sundar
________________________________
The contents of this e-mail and any attachment(s) may contain confidential or privileged information for the intended recipient(s). Unintended recipients are prohibited from taking action on the basis of information in this e-mail and using or disseminating the information, and must notify the sender and delete it from their system. L&T Infotech will not accept responsibility or liability for the accuracy or completeness of, or the presence of any virus or disabling code in this e-mail"
______________________________________________________________________
13 years, 7 months
[PATCH] (#2) Fix UUID in migration job lifecycle indications
by Chip Vincent
# HG changeset patch
# User Chip Vincent <cvincent(a)us.ibm.com>
# Date 1304034351 14400
# Node ID 2f8763c53407a186968adf1edc9a2f2a1adbc00e
# Parent 8b428df21c360d1eaedba7157b0dfd429d2db121
(#2) Fix UUID in migration job lifecycle indications.
Fixed the logic that fetches a VM UUID and adds it to the migration job's InstanceIdentifier property.
Siged-off-by: Chip Vincent <cvincent(a)us.ibm.com>
diff --git a/src/Virt_VSMigrationService.c b/src/Virt_VSMigrationService.c
--- a/src/Virt_VSMigrationService.c
+++ b/src/Virt_VSMigrationService.c
@@ -812,15 +812,20 @@
CMPIInstance *ind = NULL;
CMPIInstance *prev_inst = NULL;
const char *pfx = NULL;
+ virConnectPtr conn = NULL;
virDomainPtr dom = NULL;
char uuid[VIR_UUID_STRING_BUFLEN];
CMPIDateTime *timestamp = NULL;
+ conn = connect_by_classname(_BROKER, job->ref_cn, s);
+ if(conn == NULL)
+ goto out;
+
ind_name = ind_type_to_name(ind_type);
CU_DEBUG("Creating indication.");
- pfx = pfx_from_conn(job->conn);
+ pfx = pfx_from_conn(conn);
ind = get_typed_instance(broker,
pfx,
@@ -832,13 +837,15 @@
goto out;
}
- dom = virDomainLookupByName(job->conn, job->domain);
- if(dom == NULL) {
- CU_DEBUG("Failed to connect to domain %s", job->domain);
+ timestamp = CMNewDateTime(broker, s);
+ CMSetProperty(ind, "IndicationTime",
+ (CMPIValue *)×tamp, CMPI_dateTime);
+
+ dom = virDomainLookupByName(conn, job->domain);
+ if (dom == NULL)
goto out;
- }
- if(virDomainGetUUIDString(dom, uuid) != 0) {
+ if (virDomainGetUUIDString(dom, uuid) != 0) {
CU_DEBUG("Failed to get UUID from domain name");
goto out;
}
@@ -846,10 +853,6 @@
CMSetProperty(ind, "IndicationIdentifier",
(CMPIValue *)uuid, CMPI_chars);
- timestamp = CMNewDateTime(broker, s);
- CMSetProperty(ind, "IndicationTime",
- (CMPIValue *)×tamp, CMPI_dateTime);
-
if (ind_type == MIG_MODIFIED) {
/* Need to copy job inst before attaching as PreviousInstance
because otherwise the changes we are about to make to job
@@ -867,6 +870,7 @@
out:
virDomainFree(dom);
+ virConnectClose(conn);
return ind;
}
13 years, 7 months
[PATCH] [PATCH v2] Configure: Check for libuuid
by Eduardo Lima (Etrunko)
This patch introduces a macro in acinclude.m4 to check for libuuid
development files and fixes the build accordingly.
Signed-off-by: Eduardo Lima (Etrunko) <eblima(a)br.ibm.com>
---
acinclude.m4 | 19 +++++++++++++++++++
configure.ac | 4 ++++
libxkutil/Makefile.am | 11 +++++------
libxkutil/xmlgen.c | 2 +-
src/Virt_SettingsDefineCapabilities.c | 2 +-
src/Virt_VSMigrationService.c | 2 +-
src/Virt_VirtualSystemSnapshotService.c | 2 +-
7 files changed, 32 insertions(+), 10 deletions(-)
mode change 100755 => 100644 acinclude.m4
mode change 100755 => 100644 configure.ac
mode change 100755 => 100644 libxkutil/Makefile.am
mode change 100755 => 100644 libxkutil/xmlgen.c
mode change 100755 => 100644 src/Virt_SettingsDefineCapabilities.c
mode change 100755 => 100644 src/Virt_VSMigrationService.c
mode change 100755 => 100644 src/Virt_VirtualSystemSnapshotService.c
13 years, 7 months
[PATCH] Fix UUID in migration job lifecycle indications
by Chip Vincent
# HG changeset patch
# User Chip Vincent <cvincent(a)us.ibm.com>
# Date 1304034351 14400
# Node ID 454ce8f30a13881cc6f5206d8e8e6f42a2ff8621
# Parent 8b428df21c360d1eaedba7157b0dfd429d2db121
Fix UUID in migration job lifecycle indications.
Fixed the logic that fetches a VM UUID and adds it to the migration job's InstanceIdentifier property.
Siged-off-by: Chip Vincent <cvincent(a)us.ibm.com>
diff --git a/src/Virt_VSMigrationService.c b/src/Virt_VSMigrationService.c
--- a/src/Virt_VSMigrationService.c
+++ b/src/Virt_VSMigrationService.c
@@ -812,15 +812,20 @@
CMPIInstance *ind = NULL;
CMPIInstance *prev_inst = NULL;
const char *pfx = NULL;
+ virConnectPtr conn = NULL;
virDomainPtr dom = NULL;
char uuid[VIR_UUID_STRING_BUFLEN];
CMPIDateTime *timestamp = NULL;
+ conn = connect_by_classname(_BROKER, job->ref_cn, s);
+ if(conn == NULL)
+ goto out;
+
ind_name = ind_type_to_name(ind_type);
CU_DEBUG("Creating indication.");
- pfx = pfx_from_conn(job->conn);
+ pfx = pfx_from_conn(conn);
ind = get_typed_instance(broker,
pfx,
@@ -832,13 +837,15 @@
goto out;
}
- dom = virDomainLookupByName(job->conn, job->domain);
- if(dom == NULL) {
- CU_DEBUG("Failed to connect to domain %s", job->domain);
+ timestamp = CMNewDateTime(broker, s);
+ CMSetProperty(ind, "IndicationTime",
+ (CMPIValue *)×tamp, CMPI_dateTime);
+
+ dom = virDomainLookupByName(conn, job->domain);
+ if (dom == NULL)
goto out;
- }
- if(virDomainGetUUIDString(dom, uuid) != 0) {
+ if (virDomainGetUUIDString(dom, &uuid[0]) != 0) {
CU_DEBUG("Failed to get UUID from domain name");
goto out;
}
@@ -846,10 +853,6 @@
CMSetProperty(ind, "IndicationIdentifier",
(CMPIValue *)uuid, CMPI_chars);
- timestamp = CMNewDateTime(broker, s);
- CMSetProperty(ind, "IndicationTime",
- (CMPIValue *)×tamp, CMPI_dateTime);
-
if (ind_type == MIG_MODIFIED) {
/* Need to copy job inst before attaching as PreviousInstance
because otherwise the changes we are about to make to job
@@ -867,6 +870,7 @@
out:
virDomainFree(dom);
+ virConnectClose(conn);
return ind;
}
13 years, 7 months
[PATCH] Configure: Check for libuuid
by Eduardo Lima (Etrunko)
# HG changeset patch
# User Eduardo Lima (Etrunko) <eblima(a)br.ibm.com>
# Date 1304539509 10800
# Node ID 662adcc6b7d033ccfba6ce5471ab0c13e0f34235
# Parent 8b428df21c360d1eaedba7157b0dfd429d2db121
Configure: Check for libuuid
This patch introduces a macro in acinclude.m4 to check for libuuid development
files and fixes the build accordingly.
diff -r 8b428df21c36 -r 662adcc6b7d0 acinclude.m4
--- a/acinclude.m4 Wed Apr 13 12:27:33 2011 -0700
+++ b/acinclude.m4 Wed May 04 17:05:09 2011 -0300
@@ -238,10 +238,24 @@
AC_DEFUN([CHECK_LIBVIRT],
[
PKG_CHECK_MODULES([LIBVIRT], [libvirt >= 0.3.2])
+ AC_SUBST([LIBVIRT_CFLAGS])
+ AC_SUBST([LIBVIRT_LIBS])
CPPFLAGS="$CPPFLAGS $LIBVIRT_CFLAGS"
LDFLAGS="$LDFLAGS $LIBVIRT_LIBS"
])
+AC_DEFUN([CHECK_LIBUUID],
+ [
+ PKG_CHECK_MODULES([LIBUUID], [uuid], [LIBUUID_FOUND=yes], [LIBUUID_FOUND=no])
+ if test "$LIBUUID_FOUND" = "no" ; then
+ AC_MSG_ERROR([libuuid development files required])
+ fi
+ AC_SUBST([LIBUUID_CFLAGS])
+ AC_SUBST([LIBUUID_LIBS])
+ CPPFLAGS="$CPPFLAGS $LIBUUID_CFLAGS"
+ LDFLAGS="$LDFLAGS $LIBUUID_LIBS"
+ ])
+
# A convenience macro that spits out a fail message for a particular test
#
# AC_CHECK_FAIL($LIBNAME,$PACKAGE_SUGGEST,$URL,$EXTRA)
diff -r 8b428df21c36 -r 662adcc6b7d0 configure.ac
--- a/configure.ac Wed Apr 13 12:27:33 2011 -0700
+++ b/configure.ac Wed May 04 17:05:09 2011 -0300
@@ -148,10 +148,14 @@
# Check for presense of a CIM server (this macro is defined in acinclude.m4)
CHECK_CIMSERVER
+# Check pkg-config program
+PKG_PROG_PKG_CONFIG
+
# Check for presence of libraries
CHECK_LIBVIRT
CHECK_LIBXML2
CHECK_LIBCU
+CHECK_LIBUUID
CFLAGS_STRICT="-Werror"
diff -r 8b428df21c36 -r 662adcc6b7d0 libxkutil/Makefile.am
--- a/libxkutil/Makefile.am Wed Apr 13 12:27:33 2011 -0700
+++ b/libxkutil/Makefile.am Wed May 04 17:05:09 2011 -0300
@@ -1,7 +1,6 @@
# Copyright IBM Corp. 2007
SUBDIRS = tests
-
CFLAGS += $(CFLAGS_STRICT)
noinst_HEADERS = cs_util.h misc_util.h device_parsing.h xmlgen.h infostore.h \
@@ -9,14 +8,14 @@
lib_LTLIBRARIES = libxkutil.la
-AM_LDFLAGS = -lvirt -luuid
-
libxkutil_la_SOURCES = cs_util_instance.c misc_util.c device_parsing.c \
xmlgen.c infostore.c pool_parsing.c
+libxkutil_la_LIBADD = @LIBVIRT_LIBS@ \
+ @LIBUUID_LIBS@
+
noinst_PROGRAMS = xml_parse_test
xml_parse_test_SOURCES = xml_parse_test.c
-xml_parse_test_LDADD = -lvirt
-xml_parse_test_LDFLAGS = libxkutil.la
-xml_parse_test_DEPENDENCIES = libxkutil.la
+xml_parse_test_LDADD = libxkutil.la \
+ @LIBVIRT_LIBS@
diff -r 8b428df21c36 -r 662adcc6b7d0 libxkutil/xmlgen.c
--- a/libxkutil/xmlgen.c Wed Apr 13 12:27:33 2011 -0700
+++ b/libxkutil/xmlgen.c Wed May 04 17:05:09 2011 -0300
@@ -22,7 +22,7 @@
#include <string.h>
#include <stdlib.h>
#include <inttypes.h>
-#include <uuid/uuid.h>
+#include <uuid.h>
#include <libxml/tree.h>
#include <libxml/xmlsave.h>
diff -r 8b428df21c36 -r 662adcc6b7d0 src/Virt_SettingsDefineCapabilities.c
--- a/src/Virt_SettingsDefineCapabilities.c Wed Apr 13 12:27:33 2011 -0700
+++ b/src/Virt_SettingsDefineCapabilities.c Wed May 04 17:05:09 2011 -0300
@@ -26,7 +26,7 @@
#include <stdbool.h>
#include <sys/vfs.h>
#include <errno.h>
-#include <uuid/uuid.h>
+#include <uuid.h>
#include <libvirt/libvirt.h>
diff -r 8b428df21c36 -r 662adcc6b7d0 src/Virt_VSMigrationService.c
--- a/src/Virt_VSMigrationService.c Wed Apr 13 12:27:33 2011 -0700
+++ b/src/Virt_VSMigrationService.c Wed May 04 17:05:09 2011 -0300
@@ -29,7 +29,7 @@
#include <dirent.h>
#include <errno.h>
-#include <uuid/uuid.h>
+#include <uuid.h>
#include <libvirt/libvirt.h>
diff -r 8b428df21c36 -r 662adcc6b7d0 src/Virt_VirtualSystemSnapshotService.c
--- a/src/Virt_VirtualSystemSnapshotService.c Wed Apr 13 12:27:33 2011 -0700
+++ b/src/Virt_VirtualSystemSnapshotService.c Wed May 04 17:05:09 2011 -0300
@@ -24,7 +24,7 @@
#include <string.h>
#include <stdbool.h>
-#include <uuid/uuid.h>
+#include <uuid.h>
#include <cmpidt.h>
#include <cmpift.h>
13 years, 7 months