[PATCH] libxl: xenstored check regression

[Christoph Egger <Christoph.Egger@amd.com>]

[-- Attachment #1: Type: text/plain, Size: 830 bytes --]


Hi!

Changset 22806:eefb8e971be5 broke 'xl'.

After starting the xenstored, xenconsoled, xenbackendd and do

     'xl create'

I get this:

libxl: error: libxl.c:53:libxl_ctx_init Is xenstore daemon running?
failed to stat /var/run/xenstore.pid: No such file or directory
cannot init xl context

The reason for the failure is that the NetBSD startup script
creates the file

/var/run/xenstored.pid

but libxl checks for

/var/run/xenstore.pid

Attached patch makes this consistent across Linux and NetBSD.

Signed-off-by: Christoph Egger <Christoph.Egger@amd.com>


-- 
---to satisfy European Law for business letters:
Advanced Micro Devices GmbH
Einsteinring 24, 85609 Dornach b. Muenchen
Geschaeftsfuehrer: Alberto Bozzo, Andrew Bowd
Sitz: Dornach, Gemeinde Aschheim, Landkreis Muenchen
Registergericht Muenchen, HRB Nr. 43632

[-- Attachment #2: xen_libxl_check.diff --]
[-- Type: text/x-diff, Size: 1217 bytes --]

diff -r ea77863d3be9 tools/hotplug/Linux/init.d/xencommons
--- a/tools/hotplug/Linux/init.d/xencommons	Wed Jan 26 12:53:17 2011 +0100
+++ b/tools/hotplug/Linux/init.d/xencommons	Wed Jan 26 15:15:19 2011 +0100
@@ -52,7 +52,7 @@ do_start () {
 		test -z "$XENSTORED_TRACE" || XENSTORED_ARGS=" -T /var/log/xen/xenstored-trace.log"
 
 		echo -n Starting xenstored...
-		xenstored --pid-file=/var/run/xenstore.pid $XENSTORED_ARGS
+		xenstored --pid-file=/var/run/xenstored.pid $XENSTORED_ARGS
 
 		# Wait for xenstored to actually come up, timing out after 30 seconds
                 while [ $time -lt $timeout ] && ! `xenstore-read -s / >/dev/null 2>&1` ; do
diff -r ea77863d3be9 tools/libxl/libxl_internal.h
--- a/tools/libxl/libxl_internal.h	Wed Jan 26 12:53:17 2011 +0100
+++ b/tools/libxl/libxl_internal.h	Wed Jan 26 15:15:19 2011 +0100
@@ -110,7 +110,7 @@ typedef struct {
 #define AUTO_PHP_SLOT          0x100
 #define SYSFS_PCI_DEV          "/sys/bus/pci/devices"
 #define SYSFS_PCIBACK_DRIVER   "/sys/bus/pci/drivers/pciback"
-#define XENSTORE_PID_FILE      "/var/run/xenstore.pid"
+#define XENSTORE_PID_FILE      "/var/run/xenstored.pid"
 
 #define PROC_PCI_NUM_RESOURCES 7
 #define PCI_BAR_IO             0x01

[-- Attachment #3: Type: text/plain, Size: 138 bytes --]

_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xensource.com
http://lists.xensource.com/xen-devel