59 lines
1.7 KiB
Diff
59 lines
1.7 KiB
Diff
From 66967ef343c40d91918384540f9868b43c90c433 Mon Sep 17 00:00:00 2001
|
|
From: Jim Fehlig <jfehlig@suse.com>
|
|
Date: Wed, 6 Jun 2018 14:58:00 -0600
|
|
Subject: [PATCH 11/17] Fix compilation with xenstore
|
|
|
|
The xenstore transport is worth keeping, so update it to
|
|
work with "modern" Xen. By modern I mean something like 4.4
|
|
or newer.
|
|
|
|
Signed-off-by: Jim Fehlig <jfehlig@suse.com>
|
|
---
|
|
configure.ac | 2 +-
|
|
libmetrics/libmetrics.c | 2 +-
|
|
vhostmd/xenstore-update.c | 2 +-
|
|
3 files changed, 3 insertions(+), 3 deletions(-)
|
|
|
|
diff --git a/configure.ac b/configure.ac
|
|
index 830c47f..c6b660e 100644
|
|
--- a/configure.ac
|
|
+++ b/configure.ac
|
|
@@ -48,7 +48,7 @@ AC_ARG_WITH([xenstore],
|
|
yes) with_xenstore=true;;
|
|
no) with_xenstore=false;;
|
|
*) AC_MSG_ERROR(bad value ${withval} for --with-xenstore) ;;
|
|
- esac],[AC_CHECK_HEADER(xs.h, with_xenstore=true)])
|
|
+ esac],[AC_CHECK_HEADER(xenstore.h, with_xenstore=true)])
|
|
AM_CONDITIONAL(WITH_XENSTORE, test x$with_xenstore = xtrue)
|
|
|
|
# Configure argument to support type of init system
|
|
diff --git a/libmetrics/libmetrics.c b/libmetrics/libmetrics.c
|
|
index 6d5c26f..81f4d1a 100644
|
|
--- a/libmetrics/libmetrics.c
|
|
+++ b/libmetrics/libmetrics.c
|
|
@@ -31,7 +31,7 @@
|
|
#include <arpa/inet.h>
|
|
#include <libxml/xpath.h>
|
|
#ifdef WITH_XENSTORE
|
|
-#include <xs.h>
|
|
+#include <xenstore.h>
|
|
#endif
|
|
|
|
#include "libmetrics.h"
|
|
diff --git a/vhostmd/xenstore-update.c b/vhostmd/xenstore-update.c
|
|
index f157f60..20fbde1 100644
|
|
--- a/vhostmd/xenstore-update.c
|
|
+++ b/vhostmd/xenstore-update.c
|
|
@@ -28,7 +28,7 @@
|
|
#include <errno.h>
|
|
#include <libxml/parser.h>
|
|
#include <libxml/xpath.h>
|
|
-#include <xs.h>
|
|
+#include <xenstore.h>
|
|
|
|
#include "util.h"
|
|
#include "metric.h"
|
|
--
|
|
2.19.0.rc0
|
|
|