Author: waldi
Date: Thu Mar 17 12:04:04 2011
New Revision: 835
Log:
* debian/patches/series: Update.
* debian/patches/tools-libxl-nopidfile.diff: Don''t check xenstored pid
file.
Added:
trunk/xen/debian/patches/tools-libxl-nopidfile.diff
Modified:
trunk/xen/debian/patches/series
Modified: trunk/xen/debian/patches/series
=============================================================================---
trunk/xen/debian/patches/series Thu Mar 17 11:51:31 2011 (r834)
+++ trunk/xen/debian/patches/series Thu Mar 17 12:04:04 2011 (r835)
@@ -37,6 +37,7 @@
tools-python-xen-relative-path.diff
tools-misc-xend-startup.diff
+tools-libxl-nopidfile.diff
tools-disable.diff
tools-firmware-etherboot-packaged.diff
Added: trunk/xen/debian/patches/tools-libxl-nopidfile.diff
=============================================================================---
/dev/null 00:00:00 1970 (empty, because file is newly added)
+++ trunk/xen/debian/patches/tools-libxl-nopidfile.diff Thu Mar 17 12:04:04 2011
(r835)
@@ -0,0 +1,33 @@
+--- a/tools/libxl/libxl.c
++++ b/tools/libxl/libxl.c
+@@ -43,20 +43,12 @@
+
+ int libxl_ctx_init(libxl_ctx *ctx, int version, xentoollog_logger *lg)
+ {
+- struct stat stat_buf;
+-
+ if (version != LIBXL_VERSION)
+ return ERROR_VERSION;
+ memset(ctx, 0, sizeof(libxl_ctx));
+ ctx->lg = lg;
+ memset(&ctx->version_info, 0, sizeof(libxl_version_info));
+
+- if ( stat(XENSTORE_PID_FILE, &stat_buf) != 0 ) {
+- LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_ERROR, "Is xenstore daemon
running?\n"
+- "failed to stat %s", XENSTORE_PID_FILE);
+- return ERROR_FAIL;
+- }
+-
+ ctx->xch = xc_interface_open(lg,lg,0);
+ if (!ctx->xch) {
+ LIBXL__LOG_ERRNOVAL(ctx, LIBXL__LOG_ERROR, errno,
+--- a/tools/libxl/libxl_internal.h
++++ b/tools/libxl/libxl_internal.h
+@@ -110,7 +110,6 @@
+ #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/xenstored.pid"
+
+ #define PROC_PCI_NUM_RESOURCES 7
+ #define PCI_BAR_IO 0x01