New upstream version 1.2.9~rc2

12 files changed, 26 insertions, 11 deletions

diff --git a/examples/apparmor/Makefile.in b/examples/apparmor/Makefile.in
index 845a9a808..9ebb7aa89 100644
--- a/examples/apparmor/Makefile.in
+++ b/examples/apparmor/Makefile.in
@@ -1352,6 +1352,8 @@ PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
 PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
+PARALLELS_SDK_CFLAGS = @PARALLELS_SDK_CFLAGS@
+PARALLELS_SDK_LIBS = @PARALLELS_SDK_LIBS@
 PARTED = @PARTED@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@
diff --git a/examples/dominfo/Makefile.in b/examples/dominfo/Makefile.in
index e823a8ad2..d780d4df4 100644
--- a/examples/dominfo/Makefile.in
+++ b/examples/dominfo/Makefile.in
@@ -1378,6 +1378,8 @@ PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
 PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
+PARALLELS_SDK_CFLAGS = @PARALLELS_SDK_CFLAGS@
+PARALLELS_SDK_LIBS = @PARALLELS_SDK_LIBS@
 PARTED = @PARTED@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@
diff --git a/examples/dommigrate/Makefile.in b/examples/dommigrate/Makefile.in
index 337ec5c30..008ee3560 100644
--- a/examples/dommigrate/Makefile.in
+++ b/examples/dommigrate/Makefile.in
@@ -1375,6 +1375,8 @@ PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
 PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
+PARALLELS_SDK_CFLAGS = @PARALLELS_SDK_CFLAGS@
+PARALLELS_SDK_LIBS = @PARALLELS_SDK_LIBS@
 PARTED = @PARTED@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@
diff --git a/examples/domsuspend/Makefile.in b/examples/domsuspend/Makefile.in
index f019281e2..5281bea77 100644
--- a/examples/domsuspend/Makefile.in
+++ b/examples/domsuspend/Makefile.in
@@ -1378,6 +1378,8 @@ PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
 PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
+PARALLELS_SDK_CFLAGS = @PARALLELS_SDK_CFLAGS@
+PARALLELS_SDK_LIBS = @PARALLELS_SDK_LIBS@
 PARTED = @PARTED@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@
diff --git a/examples/domtop/Makefile.in b/examples/domtop/Makefile.in
index a3a78196d..65a8ebd00 100644
--- a/examples/domtop/Makefile.in
+++ b/examples/domtop/Makefile.in
@@ -1379,6 +1379,8 @@ PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
 PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
+PARALLELS_SDK_CFLAGS = @PARALLELS_SDK_CFLAGS@
+PARALLELS_SDK_LIBS = @PARALLELS_SDK_LIBS@
 PARTED = @PARTED@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@
diff --git a/examples/hellolibvirt/Makefile.in b/examples/hellolibvirt/Makefile.in
index c17f9d097..2ac1da15c 100644
--- a/examples/hellolibvirt/Makefile.in
+++ b/examples/hellolibvirt/Makefile.in
@@ -1375,6 +1375,8 @@ PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
 PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
+PARALLELS_SDK_CFLAGS = @PARALLELS_SDK_CFLAGS@
+PARALLELS_SDK_LIBS = @PARALLELS_SDK_LIBS@
 PARTED = @PARTED@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@
diff --git a/examples/lxcconvert/Makefile.in b/examples/lxcconvert/Makefile.in
index 13e37b0f1..e60d84fc9 100644
--- a/examples/lxcconvert/Makefile.in
+++ b/examples/lxcconvert/Makefile.in
@@ -1321,6 +1321,8 @@ PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
 PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
+PARALLELS_SDK_CFLAGS = @PARALLELS_SDK_CFLAGS@
+PARALLELS_SDK_LIBS = @PARALLELS_SDK_LIBS@
 PARTED = @PARTED@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@
diff --git a/examples/object-events/Makefile.in b/examples/object-events/Makefile.in
index a95a39fe3..6033f57de 100644
--- a/examples/object-events/Makefile.in
+++ b/examples/object-events/Makefile.in
@@ -1376,6 +1376,8 @@ PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
 PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
+PARALLELS_SDK_CFLAGS = @PARALLELS_SDK_CFLAGS@
+PARALLELS_SDK_LIBS = @PARALLELS_SDK_LIBS@
 PARTED = @PARTED@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@
diff --git a/examples/object-events/event-test.c b/examples/object-events/event-test.c
index faf0cf272..0c6faf47f 100644
--- a/examples/object-events/event-test.c
+++ b/examples/object-events/event-test.c
@@ -476,15 +476,6 @@ myDomainEventTunableCallback(virConnectPtr conn ATTRIBUTE_UNUSED,
     printf("%s EVENT: Domain %s(%d) tunable updated:\n",
            __func__, virDomainGetName(dom), virDomainGetID(dom));
 
-#ifdef WIN32
-/* MinGW doesn't know the lld/llu so we have to use I64f/I64u instead. */
-# define LLD_FORMAT "%I64d"
-# define LLU_FORMAT "%I64u"
-#else /* WIN32 */
-# define LLD_FORMAT "%lld"
-# define LLU_FORMAT "%llu"
-#endif /* WIN32 */
-
     for (i = 0; i < nparams; i++) {
         switch (params[i].type) {
         case VIR_TYPED_PARAM_INT:
@@ -494,10 +485,12 @@ myDomainEventTunableCallback(virConnectPtr conn ATTRIBUTE_UNUSED,
             printf("\t%s: %u\n", params[i].field, params[i].value.ui);
             break;
         case VIR_TYPED_PARAM_LLONG:
-            printf("\t%s: " LLD_FORMAT "\n", params[i].field, params[i].value.l);
+            printf("\t%s: %" PRId64 "\n", params[i].field,
+                   (int64_t) params[i].value.l);
             break;
         case VIR_TYPED_PARAM_ULLONG:
-            printf("\t%s: " LLU_FORMAT "\n", params[i].field, params[i].value.ul);
+            printf("\t%s: %" PRIu64 "\n", params[i].field,
+                   (uint64_t) params[i].value.ul);
             break;
         case VIR_TYPED_PARAM_DOUBLE:
             printf("\t%s: %g\n", params[i].field, params[i].value.d);
diff --git a/examples/openauth/Makefile.in b/examples/openauth/Makefile.in
index 55b302223..584e37f12 100644
--- a/examples/openauth/Makefile.in
+++ b/examples/openauth/Makefile.in
@@ -1375,6 +1375,8 @@ PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
 PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
+PARALLELS_SDK_CFLAGS = @PARALLELS_SDK_CFLAGS@
+PARALLELS_SDK_LIBS = @PARALLELS_SDK_LIBS@
 PARTED = @PARTED@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@
diff --git a/examples/systemtap/Makefile.in b/examples/systemtap/Makefile.in
index 4cc3a0a06..21a1ce94f 100644
--- a/examples/systemtap/Makefile.in
+++ b/examples/systemtap/Makefile.in
@@ -1321,6 +1321,8 @@ PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
 PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
+PARALLELS_SDK_CFLAGS = @PARALLELS_SDK_CFLAGS@
+PARALLELS_SDK_LIBS = @PARALLELS_SDK_LIBS@
 PARTED = @PARTED@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@
diff --git a/examples/xml/nwfilter/Makefile.in b/examples/xml/nwfilter/Makefile.in
index f7ea3d2ea..7b02275dd 100644
--- a/examples/xml/nwfilter/Makefile.in
+++ b/examples/xml/nwfilter/Makefile.in
@@ -1321,6 +1321,8 @@ PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
 PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
+PARALLELS_SDK_CFLAGS = @PARALLELS_SDK_CFLAGS@
+PARALLELS_SDK_LIBS = @PARALLELS_SDK_LIBS@
 PARTED = @PARTED@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@