[Pkg-xen-changes] [xen] 13/128: Updated tools-disable.diff to use proper CONFIG_* names for qemu.

Ian Campbell ijc-guest at moszumanska.debian.org
Sat Jul 12 09:06:06 UTC 2014


This is an automated email from the git hooks/post-receive script.

ijc-guest pushed a commit to branch feature/4.4-updates
in repository xen.

commit c69ab1e4e666a0b9db498ee94a9bb74015779027
Merge: 76c60f5 348ef17
Author: Ian Campbell <ijc at hellion.org.uk>
Date:   Mon Jul 7 12:43:49 2014 +0100

    Updated tools-disable.diff to use proper CONFIG_* names for qemu.

 debian/.git-dpm                                       |  4 ++--
 debian/patches/0032-tools-disable.diff.patch          | 19 +++++++++----------
 ...033-tools-examples-xend-disable-network.diff.patch |  2 +-
 ...-tools-examples-xend-disable-relocation.diff.patch |  2 +-
 .../0035-tools-firmware-etherboot-packaged.diff.patch |  2 +-
 .../0036-tools-firmware-seabios-packaged.diff.patch   |  2 +-
 ...7-tools-pygrub-remove-static-solaris-support.patch |  2 +-
 debian/patches/0038-tools-include-install.diff.patch  |  2 +-
 debian/patches/0039-tools-xenmon-install.diff.patch   |  2 +-
 .../patches/0040-tools-hotplug-udevrules.diff.patch   |  2 +-
 debian/patches/0041-tools-python-shebang.diff.patch   |  2 +-
 debian/patches/0042-tools-ocaml-fix-build.diff.patch  |  2 +-
 .../0043-tools-xenstore-compatibility.diff.patch      |  2 +-
 tools/Makefile                                        |  4 ++--
 14 files changed, 24 insertions(+), 25 deletions(-)

diff --cc debian/.git-dpm
index f3d993a,0000000..767270f
mode 100644,000000..100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@@ -1,8 -1,0 +1,8 @@@
 +# see git-dpm(1) from git-dpm package
- 1924097f79ad75229638afc85aaaf6c604c2eba2
- 1924097f79ad75229638afc85aaaf6c604c2eba2
++348ef177a7b488e61cb8d9e5a12cda596ad50d1d
++348ef177a7b488e61cb8d9e5a12cda596ad50d1d
 +960b45d65509eb156ccdac8f50a31ffa28e963a1
 +960b45d65509eb156ccdac8f50a31ffa28e963a1
 +xen_4.4.0.orig.tar.xz
 +39aaa0627cd93920be8d12e4c63042c23d653c8c
 +3767352
diff --cc debian/patches/0032-tools-disable.diff.patch
index d7602b2,0000000..d2bec4b
mode 100644,000000..100644
--- a/debian/patches/0032-tools-disable.diff.patch
+++ b/debian/patches/0032-tools-disable.diff.patch
@@@ -1,53 -1,0 +1,52 @@@
- From 308779f063f3a220fb6f1ee837e3677c6fb13d55 Mon Sep 17 00:00:00 2001
++From 1f516eb869985a45b763379693ea4c0a51965d4d Mon Sep 17 00:00:00 2001
 +From: Bastian Blank <waldi at debian.org>
 +Date: Sat, 5 Jul 2014 11:47:23 +0200
 +Subject: tools-disable.diff
 +
 +---
-  tools/Makefile | 9 +++++----
++ tools/Makefile | 5 +++--
 + tools/Rules.mk | 4 ----
-  2 files changed, 5 insertions(+), 8 deletions(-)
++ 2 files changed, 3 insertions(+), 6 deletions(-)
 +
 +diff --git a/tools/Makefile b/tools/Makefile
- index 00c69ee..2c95cc6 100644
++index 00c69ee..0987b0b 100644
 +--- a/tools/Makefile
 ++++ b/tools/Makefile
 +@@ -19,8 +19,6 @@ SUBDIRS-$(CONFIG_Linux) += memshr
 + ifeq ($(CONFIG_X86)$(CONFIG_Linux),yy)
 + SUBDIRS-$(CONFIG_BLKTAP1) += blktap
 + endif
 +-SUBDIRS-$(CONFIG_Linux) += blktap2
 +-SUBDIRS-$(CONFIG_NetBSD) += blktap2
 + SUBDIRS-$(CONFIG_NetBSD) += xenbackendd
 + SUBDIRS-y += libfsimage
 + SUBDIRS-$(LIBXENAPI_BINDINGS) += libxen
- @@ -28,8 +26,11 @@ SUBDIRS-$(CONFIG_Linux) += libvchan
++@@ -28,9 +26,12 @@ SUBDIRS-$(CONFIG_Linux) += libvchan
 + 
 + # do not recurse in to a dir we are about to delete
 + ifneq "$(MAKECMDGOALS)" "distclean"
- -SUBDIRS-$(CONFIG_QEMU_TRAD) += qemu-xen-traditional-dir
- -SUBDIRS-$(CONFIG_QEMU_XEN) += qemu-xen-dir
 ++CONFIG_QEMU = $(CURDIR)/../qemu
 ++ifneq ($(wildcard $(CONFIG_QEMU)),)
- +SUBDIRS-$(CONFIG_IOEMU) += qemu-xen-traditional-dir
- +SUBDIRS-$(CONFIG_IOEMU) += qemu-xen-dir
- +endif
++ SUBDIRS-$(CONFIG_QEMU_TRAD) += qemu-xen-traditional-dir
++ SUBDIRS-$(CONFIG_QEMU_XEN) += qemu-xen-dir
 + endif
+++endif
 + 
 + SUBDIRS-y += xenpmd
++ SUBDIRS-y += libxl
 +diff --git a/tools/Rules.mk b/tools/Rules.mk
 +index 0d9d98c..74ce6bc 100644
 +--- a/tools/Rules.mk
 ++++ b/tools/Rules.mk
 +@@ -41,11 +41,7 @@ CFLAGS_libxenvchan = -I$(XEN_LIBVCHAN)
 + LDLIBS_libxenvchan = $(SHLIB_libxenctrl) $(SHLIB_libxenstore) -L$(XEN_LIBVCHAN) -lxenvchan
 + SHLIB_libxenvchan  = -Wl,-rpath-link=$(XEN_LIBVCHAN)
 + 
 +-ifeq ($(CONFIG_Linux),y)
 +-LIBXL_BLKTAP ?= y
 +-else
 + LIBXL_BLKTAP ?= n
 +-endif
 + 
 + ifeq ($(LIBXL_BLKTAP),y)
 + CFLAGS_libblktapctl = -I$(XEN_BLKTAP2)/control -I$(XEN_BLKTAP2)/include $(CFLAGS_xeninclude)
diff --cc debian/patches/0033-tools-examples-xend-disable-network.diff.patch
index afe5f31,0000000..b2e9cb7
mode 100644,000000..100644
--- a/debian/patches/0033-tools-examples-xend-disable-network.diff.patch
+++ b/debian/patches/0033-tools-examples-xend-disable-network.diff.patch
@@@ -1,33 -1,0 +1,33 @@@
- From 9f62a1c0bf3bac128e480bfce492c7402bdab6c7 Mon Sep 17 00:00:00 2001
++From d0db074eb3af458abed5572c60a97d245426d49d Mon Sep 17 00:00:00 2001
 +From: Bastian Blank <waldi at debian.org>
 +Date: Sat, 5 Jul 2014 11:47:24 +0200
 +Subject: tools-examples-xend-disable-network.diff
 +
 +---
 + tools/examples/xend-config.sxp | 6 +++++-
 + 1 file changed, 5 insertions(+), 1 deletion(-)
 +
 +diff --git a/tools/examples/xend-config.sxp b/tools/examples/xend-config.sxp
 +index 0896a27..f0cc520 100644
 +--- a/tools/examples/xend-config.sxp
 ++++ b/tools/examples/xend-config.sxp
 +@@ -132,6 +132,11 @@
 + #(console-limit 1024)
 + 
 + ##
 ++# NOTE:
 ++# Please read /usr/share/doc/xen-utils-common/README.Debian for Debian specific
 ++# informations about the network setup.
 ++
 ++##
 + # To bridge network traffic, like this:
 + #
 + # dom0: ----------------- bridge -> real eth0 -> the network
 +@@ -170,7 +175,6 @@
 + # two fake interfaces per guest domain.  To do things like this, write
 + # yourself a wrapper script, and call network-bridge from it, as appropriate.
 + #
 +-(network-script network-bridge)
 + 
 + # The script used to control virtual interfaces.  This can be overridden on a
 + # per-vif basis when creating a domain or a configuring a new vif.  The
diff --cc debian/patches/0034-tools-examples-xend-disable-relocation.diff.patch
index d81734a,0000000..1c45e46
mode 100644,000000..100644
--- a/debian/patches/0034-tools-examples-xend-disable-relocation.diff.patch
+++ b/debian/patches/0034-tools-examples-xend-disable-relocation.diff.patch
@@@ -1,29 -1,0 +1,29 @@@
- From e53e753244faea89a82e2d5a673cd23a082c0c9d Mon Sep 17 00:00:00 2001
++From 459df3bb28bc4d387017720ce40c6c5008f25a9b Mon Sep 17 00:00:00 2001
 +From: Bastian Blank <waldi at debian.org>
 +Date: Sat, 5 Jul 2014 11:47:25 +0200
 +Subject: tools-examples-xend-disable-relocation.diff
 +
 +---
 + tools/examples/xend-config.sxp | 2 --
 + 1 file changed, 2 deletions(-)
 +
 +diff --git a/tools/examples/xend-config.sxp b/tools/examples/xend-config.sxp
 +index f0cc520..93a24fd 100644
 +--- a/tools/examples/xend-config.sxp
 ++++ b/tools/examples/xend-config.sxp
 +@@ -62,7 +62,6 @@
 + #(xend-tcp-xmlrpc-server no)
 + #(xend-unix-xmlrpc-server yes)
 + #(xend-relocation-server no)
 +-(xend-relocation-server yes)
 + #(xend-relocation-ssl-server no)
 + #(xend-udev-event-server no)
 + 
 +@@ -126,7 +125,6 @@
 + #  (xend-relocation-hosts-allow '^localhost$ ^.*\\.example\\.org$')
 + #
 + #(xend-relocation-hosts-allow '')
 +-(xend-relocation-hosts-allow '^localhost$ ^localhost\\.localdomain$')
 + 
 + # The limit (in kilobytes) on the size of the console buffer
 + #(console-limit 1024)
diff --cc debian/patches/0035-tools-firmware-etherboot-packaged.diff.patch
index a6c74db,0000000..ac53bb9
mode 100644,000000..100644
--- a/debian/patches/0035-tools-firmware-etherboot-packaged.diff.patch
+++ b/debian/patches/0035-tools-firmware-etherboot-packaged.diff.patch
@@@ -1,45 -1,0 +1,45 @@@
- From 1e3b6aa19538340af4bdcc2d4e676950f7de3d57 Mon Sep 17 00:00:00 2001
++From fcfa52723909314512cc4ff2b3cf6fe00cff5f15 Mon Sep 17 00:00:00 2001
 +From: Bastian Blank <waldi at debian.org>
 +Date: Sat, 5 Jul 2014 11:47:26 +0200
 +Subject: tools-firmware-etherboot-packaged.diff
 +
 +---
 + tools/firmware/Makefile           | 4 ----
 + tools/firmware/hvmloader/Makefile | 2 +-
 + 2 files changed, 1 insertion(+), 5 deletions(-)
 +
 +diff --git a/tools/firmware/Makefile b/tools/firmware/Makefile
 +index cb13212..4a4a9bf 100644
 +--- a/tools/firmware/Makefile
 ++++ b/tools/firmware/Makefile
 +@@ -14,7 +14,6 @@ SUBDIRS-$(CONFIG_SEABIOS) += seabios-dir
 + endif
 + SUBDIRS-$(CONFIG_ROMBIOS) += rombios
 + SUBDIRS-$(CONFIG_ROMBIOS) += vgabios
 +-SUBDIRS-$(CONFIG_ROMBIOS) += etherboot
 + SUBDIRS-y += hvmloader
 + 
 + ovmf-dir:
 +@@ -50,9 +49,6 @@ clean: subdirs-clean
 + .PHONY: distclean
 + distclean: subdirs-distclean
 + 
 +-subdir-distclean-etherboot: .phony
 +-	$(MAKE) -C etherboot distclean
 +-
 + subdir-distclean-ovmf: .phony
 + 	rm -rf ovmf-dir ovmf-dir-remote
 + 
 +diff --git a/tools/firmware/hvmloader/Makefile b/tools/firmware/hvmloader/Makefile
 +index 00ee952..51b61a5 100644
 +--- a/tools/firmware/hvmloader/Makefile
 ++++ b/tools/firmware/hvmloader/Makefile
 +@@ -48,7 +48,7 @@ CIRRUSVGA_ROM := ../vgabios/VGABIOS-lgpl-latest.cirrus.debug.bin
 + else
 + CIRRUSVGA_ROM := ../vgabios/VGABIOS-lgpl-latest.cirrus.bin
 + endif
 +-ETHERBOOT_ROMS := $(addprefix ../etherboot/ipxe/src/bin/, $(addsuffix .rom, $(ETHERBOOT_NICS)))
 ++ETHERBOOT_ROMS := $(addprefix /usr/lib/ipxe/, $(addsuffix .rom, $(ETHERBOOT_NICS)))
 + endif
 + 
 + ROMS := 
diff --cc debian/patches/0036-tools-firmware-seabios-packaged.diff.patch
index 593ac4c,0000000..38c5e10
mode 100644,000000..100644
--- a/debian/patches/0036-tools-firmware-seabios-packaged.diff.patch
+++ b/debian/patches/0036-tools-firmware-seabios-packaged.diff.patch
@@@ -1,76 -1,0 +1,76 @@@
- From 7e543d74e32dd6b2c26a3ca1f45cf694b3191342 Mon Sep 17 00:00:00 2001
++From 9495e45ef51390636cbc6eb4a1ffa4b2a9498647 Mon Sep 17 00:00:00 2001
 +From: Bastian Blank <waldi at debian.org>
 +Date: Sat, 5 Jul 2014 11:47:27 +0200
 +Subject: tools-firmware-seabios-packaged.diff
 +
 +---
 + tools/firmware/Makefile           | 21 +++++++++++----------
 + tools/firmware/hvmloader/Makefile |  8 ++------
 + 2 files changed, 13 insertions(+), 16 deletions(-)
 +
 +diff --git a/tools/firmware/Makefile b/tools/firmware/Makefile
 +index 4a4a9bf..894bbb1 100644
 +--- a/tools/firmware/Makefile
 ++++ b/tools/firmware/Makefile
 +@@ -6,12 +6,7 @@ TARGET      := hvmloader/hvmloader
 + INST_DIR := $(DESTDIR)$(XENFIRMWAREDIR)
 + 
 + SUBDIRS-y :=
 +-ifeq ($(OVMF_PATH),)
 +-SUBDIRS-$(CONFIG_OVMF) += ovmf-dir
 +-endif
 +-ifeq ($(SEABIOS_PATH),)
 +-SUBDIRS-$(CONFIG_SEABIOS) += seabios-dir
 +-endif
 ++SUBDIRS-$(CONFIG_OVMF) += ovmf
 + SUBDIRS-$(CONFIG_ROMBIOS) += rombios
 + SUBDIRS-$(CONFIG_ROMBIOS) += vgabios
 + SUBDIRS-y += hvmloader
 +@@ -52,11 +47,17 @@ distclean: subdirs-distclean
 + subdir-distclean-ovmf: .phony
 + 	rm -rf ovmf-dir ovmf-dir-remote
 + 
 +-subdir-distclean-seabios-dir: .phony
 +-	rm -rf seabios-dir seabios-dir-remote
 ++.PHONY: ovmf-find
 ++ovmf-find:
 ++	if test -d $(OVMF_UPSTREAM_URL) ; then \
 ++	               mkdir -p ovmf; \
 ++        else \
 ++                export GIT=$(GIT); \
 ++                $(XEN_ROOT)/scripts/git-checkout.sh $(OVMF_UPSTREAM_URL) $(OVMF_UPSTREAM_REVISION) ovmf ; \
 ++        fi
 + 
 +-.PHONY: ovmf-dir-force-update
 +-ovmf-dir-force-update:
 ++.PHONY: ovmf-force-update
 ++ovmf-force-update:
 + 	set -ex; \
 + 	if [ "$(OVMF_UPSTREAM_REVISION)" ]; then \
 + 		cd ovmf-dir-remote; \
 +diff --git a/tools/firmware/hvmloader/Makefile b/tools/firmware/hvmloader/Makefile
 +index 51b61a5..7c67444 100644
 +--- a/tools/firmware/hvmloader/Makefile
 ++++ b/tools/firmware/hvmloader/Makefile
 +@@ -39,7 +39,7 @@ CIRRUSVGA_DEBUG ?= n
 + 
 + OVMF_DIR := ../ovmf-dir
 + ROMBIOS_DIR := ../rombios
 +-SEABIOS_DIR := ../seabios-dir
 ++SEABIOS_DIR := /usr/share/seabios
 + 
 + ifeq ($(CONFIG_ROMBIOS),y)
 + STDVGA_ROM    := ../vgabios/VGABIOS-lgpl-latest.bin
 +@@ -74,11 +74,7 @@ endif
 + ifeq ($(CONFIG_SEABIOS),y)
 + OBJS += seabios.o
 + CFLAGS += -DENABLE_SEABIOS
 +-ifeq ($(SEABIOS_PATH),)
 +-	SEABIOS_ROM := $(SEABIOS_DIR)/out/bios.bin
 +-else
 +-	SEABIOS_ROM := $(SEABIOS_PATH)
 +-endif
 ++SEABIOS_ROM := $(SEABIOS_DIR)/bios.bin
 + ROMS += $(SEABIOS_ROM)
 + endif
 + 
diff --cc debian/patches/0037-tools-pygrub-remove-static-solaris-support.patch
index 518d4ed,0000000..41d76b4
mode 100644,000000..100644
--- a/debian/patches/0037-tools-pygrub-remove-static-solaris-support.patch
+++ b/debian/patches/0037-tools-pygrub-remove-static-solaris-support.patch
@@@ -1,85 -1,0 +1,85 @@@
- From e793a9f5ce7186d1f6dc89b0f166218dec931af2 Mon Sep 17 00:00:00 2001
++From 2d3956266e14f95f08c42b5d719f78b411cf101c Mon Sep 17 00:00:00 2001
 +From: Bastian Blank <waldi at debian.org>
 +Date: Sat, 5 Jul 2014 11:47:29 +0200
 +Subject: tools-pygrub-remove-static-solaris-support
 +
 +---
 + tools/pygrub/src/pygrub | 51 +------------------------------------------------
 + 1 file changed, 1 insertion(+), 50 deletions(-)
 +
 +diff --git a/tools/pygrub/src/pygrub b/tools/pygrub/src/pygrub
 +index 111750b..cd493b7 100644
 +--- a/tools/pygrub/src/pygrub
 ++++ b/tools/pygrub/src/pygrub
 +@@ -17,7 +17,6 @@ import os, sys, string, struct, tempfile, re, traceback
 + import copy
 + import logging
 + import platform
 +-import xen.lowlevel.xc
 + 
 + import curses, _curses, curses.wrapper, curses.textpad, curses.ascii
 + import getopt
 +@@ -640,51 +639,6 @@ def run_grub(file, entry, fs, cfg_args):
 + 
 +     return grubcfg
 + 
 +-def supports64bitPVguest():
 +-    xc = xen.lowlevel.xc.xc()
 +-    caps = xc.xeninfo()['xen_caps'].split(" ")
 +-    for cap in caps:
 +-        if cap == "xen-3.0-x86_64":
 +-            return True
 +-    return False
 +-
 +-# If nothing has been specified, look for a Solaris domU. If found, perform the
 +-# necessary tweaks.
 +-def sniff_solaris(fs, cfg):
 +-    if not fs.file_exists("/platform/i86xpv/kernel/unix") and \
 +-       not fs.file_exists("/platform/i86xpv/kernel/amd64/unix"):
 +-        return cfg
 +-
 +-    if not cfg["kernel"]:
 +-        if supports64bitPVguest() and \
 +-          fs.file_exists("/platform/i86xpv/kernel/amd64/unix"):
 +-            cfg["kernel"] = "/platform/i86xpv/kernel/amd64/unix"
 +-            cfg["ramdisk"] = "/platform/i86pc/amd64/boot_archive"
 +-        elif fs.file_exists("/platform/i86xpv/kernel/unix"):
 +-            cfg["kernel"] = "/platform/i86xpv/kernel/unix"
 +-            cfg["ramdisk"] = "/platform/i86pc/boot_archive"
 +-        else:
 +-            return cfg
 +-
 +-    # Unpleasant. Typically we'll have 'root=foo -k' or 'root=foo /kernel -k',
 +-    # and we need to maintain Xen properties (root= and ip=) and the kernel
 +-    # before any user args.
 +-    
 +-    xenargs = ""
 +-    userargs = ""
 +-    
 +-    if not cfg["args"]:
 +-        cfg["args"] = cfg["kernel"]
 +-    else:
 +-        for arg in cfg["args"].split():
 +-            if re.match("^root=", arg) or re.match("^ip=", arg):
 +-                xenargs += arg + " "
 +-            elif arg != cfg["kernel"]:
 +-                userargs += arg + " "
 +-        cfg["args"] = xenargs + " " + cfg["kernel"] + " " + userargs
 +-
 +-    return cfg
 +- 
 + def sniff_netware(fs, cfg):
 +     if not fs.file_exists("/nwserver/xnloader.sys"):
 +         return cfg
 +@@ -858,10 +812,7 @@ if __name__ == "__main__":
 +         try:
 +             fs = fsimage.open(file, offset, bootfsoptions)
 + 
 +-            chosencfg = sniff_solaris(fs, incfg)
 +-
 +-            if not chosencfg["kernel"]:
 +-                chosencfg = sniff_netware(fs, incfg)
 ++            chosencfg = sniff_netware(fs, incfg)
 + 
 +             if not chosencfg["kernel"]:
 +                 chosencfg = run_grub(file, entry, fs, incfg["args"])
diff --cc debian/patches/0038-tools-include-install.diff.patch
index 53d7a9e,0000000..2a8a2ed
mode 100644,000000..100644
--- a/debian/patches/0038-tools-include-install.diff.patch
+++ b/debian/patches/0038-tools-include-install.diff.patch
@@@ -1,29 -1,0 +1,29 @@@
- From 005b973ce2aa9d4b5e882eb9b25f13e95150fc2f Mon Sep 17 00:00:00 2001
++From 4a7f0db9359bbcacb08c86994286af54e74078f9 Mon Sep 17 00:00:00 2001
 +From: Bastian Blank <waldi at debian.org>
 +Date: Sat, 5 Jul 2014 11:47:30 +0200
 +Subject: tools-include-install.diff
 +
 +---
 + tools/include/Makefile | 2 --
 + 1 file changed, 2 deletions(-)
 +
 +diff --git a/tools/include/Makefile b/tools/include/Makefile
 +index 9ed41f1..8f1546c 100644
 +--- a/tools/include/Makefile
 ++++ b/tools/include/Makefile
 +@@ -11,7 +11,6 @@ xen-foreign:
 + xen/.dir:
 + 	@rm -rf xen
 + 	mkdir -p xen/libelf
 +-	ln -sf $(XEN_ROOT)/xen/include/public/COPYING xen
 + 	ln -sf $(wildcard $(XEN_ROOT)/xen/include/public/*.h) xen
 + 	ln -sf $(addprefix $(XEN_ROOT)/xen/include/public/,arch-x86 hvm io xsm) xen
 + 	ln -sf ../xen-sys/$(XEN_OS) xen/sys
 +@@ -28,7 +27,6 @@ install: all
 + 	$(INSTALL_DIR) $(DESTDIR)$(INCLUDEDIR)/xen/io
 + 	$(INSTALL_DIR) $(DESTDIR)$(INCLUDEDIR)/xen/sys
 + 	$(INSTALL_DIR) $(DESTDIR)$(INCLUDEDIR)/xen/xsm
 +-	$(INSTALL_DATA) xen/COPYING $(DESTDIR)$(INCLUDEDIR)/xen
 + 	$(INSTALL_DATA) xen/*.h $(DESTDIR)$(INCLUDEDIR)/xen
 + 	$(INSTALL_DATA) xen/arch-x86/*.h $(DESTDIR)$(INCLUDEDIR)/xen/arch-x86
 + 	$(INSTALL_DATA) xen/arch-x86/hvm/*.h $(DESTDIR)$(INCLUDEDIR)/xen/arch-x86/hvm
diff --cc debian/patches/0039-tools-xenmon-install.diff.patch
index 09532eb,0000000..aa1ef7f
mode 100644,000000..100644
--- a/debian/patches/0039-tools-xenmon-install.diff.patch
+++ b/debian/patches/0039-tools-xenmon-install.diff.patch
@@@ -1,33 -1,0 +1,33 @@@
- From b02f25da4075f33a11d058a1ab4d72c267748d0b Mon Sep 17 00:00:00 2001
++From ed807be36a73533ffa3d6a73feb57b62a64e4170 Mon Sep 17 00:00:00 2001
 +From: Bastian Blank <waldi at debian.org>
 +Date: Sat, 5 Jul 2014 11:47:31 +0200
 +Subject: tools-xenmon-install.diff
 +
 +---
 + tools/xenmon/Makefile | 6 +++++-
 + 1 file changed, 5 insertions(+), 1 deletion(-)
 +
 +diff --git a/tools/xenmon/Makefile b/tools/xenmon/Makefile
 +index dab5415..7f7f99d 100644
 +--- a/tools/xenmon/Makefile
 ++++ b/tools/xenmon/Makefile
 +@@ -13,6 +13,10 @@
 + XEN_ROOT=$(CURDIR)/../..
 + include $(XEN_ROOT)/tools/Rules.mk
 + 
 ++DEFAULT_PYTHON_PATH := $(shell $(XEN_ROOT)/tools/python/get-path)
 ++PYTHON_PATH ?= $(DEFAULT_PYTHON_PATH)
 ++INSTALL_PYTHON_PROG = $(XEN_ROOT)/tools/python/install-wrap "$(PYTHON_PATH)" $(INSTALL_PROG)
 ++
 + CFLAGS  += -Werror
 + CFLAGS  += $(CFLAGS_libxenctrl)
 + LDLIBS  += $(LDLIBS_libxenctrl)
 +@@ -31,7 +35,7 @@ install: build
 + 	$(INSTALL_DIR) $(DESTDIR)$(PRIVATE_BINDIR)
 + 	$(INSTALL_PROG) xenbaked $(DESTDIR)$(PRIVATE_BINDIR)/xenbaked
 + 	$(INSTALL_PROG) xentrace_setmask  $(DESTDIR)$(PRIVATE_BINDIR)/xentrace_setmask
 +-	$(INSTALL_PROG) xenmon.py  $(DESTDIR)$(PRIVATE_BINDIR)/xenmon.py
 ++	$(INSTALL_PYTHON_PROG) xenmon.py  $(DESTDIR)$(PRIVATE_BINDIR)/xenmon
 + 	$(INSTALL_DIR) $(DESTDIR)$(DOCDIR)
 + 	$(INSTALL_DATA) README $(DESTDIR)$(DOCDIR)/README.xenmon
 + 
diff --cc debian/patches/0040-tools-hotplug-udevrules.diff.patch
index 6dffdd5,0000000..3c7045a
mode 100644,000000..100644
--- a/debian/patches/0040-tools-hotplug-udevrules.diff.patch
+++ b/debian/patches/0040-tools-hotplug-udevrules.diff.patch
@@@ -1,25 -1,0 +1,25 @@@
- From c39f6c6f8ea28791a2dab0570f2d5ed5c1fc1930 Mon Sep 17 00:00:00 2001
++From 4692141d994171f409a39ef9dbb8cf3c77287a69 Mon Sep 17 00:00:00 2001
 +From: Bastian Blank <waldi at debian.org>
 +Date: Sat, 5 Jul 2014 11:47:32 +0200
 +Subject: tools-hotplug-udevrules.diff
 +
 +---
 + tools/hotplug/Linux/xen-backend.rules | 7 -------
 + 1 file changed, 7 deletions(-)
 +
 +diff --git a/tools/hotplug/Linux/xen-backend.rules b/tools/hotplug/Linux/xen-backend.rules
 +index a0d409e..f0d9901 100644
 +--- a/tools/hotplug/Linux/xen-backend.rules
 ++++ b/tools/hotplug/Linux/xen-backend.rules
 +@@ -5,11 +5,4 @@ SUBSYSTEM=="xen-backend", KERNEL=="vif-*", ENV{UDEV_CALL}="1", ACTION=="online",
 + SUBSYSTEM=="xen-backend", KERNEL=="vif-*", ENV{UDEV_CALL}="1", ACTION=="offline", RUN+="/etc/xen/scripts/vif-setup offline type_if=vif"
 + SUBSYSTEM=="xen-backend", KERNEL=="vscsi*", RUN+="/etc/xen/scripts/vscsi $env{ACTION}"
 + SUBSYSTEM=="xen-backend", ACTION=="remove", ENV{UDEV_CALL}="1", RUN+="/etc/xen/scripts/xen-hotplug-cleanup"
 +-KERNEL=="evtchn", NAME="xen/%k"
 +-SUBSYSTEM=="xen", KERNEL=="blktap[0-9]*", NAME="xen/%k", MODE="0600"
 +-SUBSYSTEM=="blktap2", KERNEL=="blktap[0-9]*", NAME="xen/blktap-2/%k", MODE="0600"
 +-KERNEL=="blktap-control", NAME="xen/blktap-2/control", MODE="0600"
 +-KERNEL=="gntdev", NAME="xen/%k", MODE="0600"
 +-KERNEL=="pci_iomul", NAME="xen/%k", MODE="0600"
 +-KERNEL=="tapdev[a-z]*", NAME="xen/blktap-2/tapdev%m", MODE="0600"
 + SUBSYSTEM=="net", KERNEL=="vif*-emu", ACTION=="add", ENV{UDEV_CALL}="1", RUN+="/etc/xen/scripts/vif-setup $env{ACTION} type_if=tap"
diff --cc debian/patches/0041-tools-python-shebang.diff.patch
index b22b4af,0000000..54d7b16
mode 100644,000000..100644
--- a/debian/patches/0041-tools-python-shebang.diff.patch
+++ b/debian/patches/0041-tools-python-shebang.diff.patch
@@@ -1,175 -1,0 +1,175 @@@
- From 49833b2d922fdef698c8070c2da3fe9b2066d644 Mon Sep 17 00:00:00 2001
++From e8769fe3bf8a5b1db3950aa7c3cee7fba47965a2 Mon Sep 17 00:00:00 2001
 +From: Bastian Blank <waldi at debian.org>
 +Date: Sat, 5 Jul 2014 11:47:33 +0200
 +Subject: tools-python-shebang.diff
 +
 +---
 + tools/python/xen/remus/save.py                 | 2 --
 + tools/python/xen/remus/vm.py                   | 2 --
 + tools/python/xen/util/bugtool.py               | 2 --
 + tools/python/xen/util/pci.py                   | 2 --
 + tools/python/xen/util/vscsi_util.py            | 1 -
 + tools/python/xen/xend/XendBase.py              | 1 -
 + tools/python/xen/xend/XendClient.py            | 1 -
 + tools/python/xen/xend/XendLocalStorageRepo.py  | 1 -
 + tools/python/xen/xend/XendQCoWStorageRepo.py   | 1 -
 + tools/python/xen/xend/XendSXPDev.py            | 2 --
 + tools/python/xen/xend/XendStorageRepository.py | 1 -
 + tools/python/xen/xend/XendVDI.py               | 1 -
 + tools/python/xen/xend/arch.py                  | 2 --
 + tools/python/xen/xend/osdep.py                 | 2 --
 + tools/python/xen/xend/sxp.py                   | 1 -
 + tools/python/xen/xm/xenapi_create.py           | 1 -
 + 16 files changed, 23 deletions(-)
 +
 +diff --git a/tools/python/xen/remus/save.py b/tools/python/xen/remus/save.py
 +index 2193061..fdf78aa 100644
 +--- a/tools/python/xen/remus/save.py
 ++++ b/tools/python/xen/remus/save.py
 +@@ -1,5 +1,3 @@
 +-#!/usr/bin/env python
 +-
 + import os, select, socket, threading, time, signal, xmlrpclib
 + 
 + from xen.xend.XendClient import server
 +diff --git a/tools/python/xen/remus/vm.py b/tools/python/xen/remus/vm.py
 +index 90002e3..b9d1263 100644
 +--- a/tools/python/xen/remus/vm.py
 ++++ b/tools/python/xen/remus/vm.py
 +@@ -1,5 +1,3 @@
 +-#!/usr/bin/env python
 +-
 + import xmlrpclib
 + 
 + from xen.xend.XendClient import server
 +diff --git a/tools/python/xen/util/bugtool.py b/tools/python/xen/util/bugtool.py
 +index 2abcc86..43aede8 100644
 +--- a/tools/python/xen/util/bugtool.py
 ++++ b/tools/python/xen/util/bugtool.py
 +@@ -1,5 +1,3 @@
 +-#!/usr/bin/env python
 +-
 + # This library is free software; you can redistribute it and/or
 + # modify it under the terms of version 2.1 of the GNU Lesser General Public
 + # License as published by the Free Software Foundation.
 +diff --git a/tools/python/xen/util/pci.py b/tools/python/xen/util/pci.py
 +index adeca4b..bfd7c22 100644
 +--- a/tools/python/xen/util/pci.py
 ++++ b/tools/python/xen/util/pci.py
 +@@ -1,5 +1,3 @@
 +-#!/usr/bin/env python
 +-#
 + # PCI Device Information Class
 + # - Helps obtain information about which I/O resources a PCI device needs
 + #
 +diff --git a/tools/python/xen/util/vscsi_util.py b/tools/python/xen/util/vscsi_util.py
 +index 5872e65..6630527 100644
 +--- a/tools/python/xen/util/vscsi_util.py
 ++++ b/tools/python/xen/util/vscsi_util.py
 +@@ -1,4 +1,3 @@
 +-#!/usr/bin/env python
 + #  -*- mode: python; -*-
 + 
 + #============================================================================
 +diff --git a/tools/python/xen/xend/XendBase.py b/tools/python/xen/xend/XendBase.py
 +index 9244776..96b7720 100644
 +--- a/tools/python/xen/xend/XendBase.py
 ++++ b/tools/python/xen/xend/XendBase.py
 +@@ -1,4 +1,3 @@
 +-#!/usr/bin/python
 + #============================================================================
 + # This library is free software; you can redistribute it and/or
 + # modify it under the terms of version 2.1 of the GNU Lesser General Public
 +diff --git a/tools/python/xen/xend/XendClient.py b/tools/python/xen/xend/XendClient.py
 +index ef16699..2eb5095 100644
 +--- a/tools/python/xen/xend/XendClient.py
 ++++ b/tools/python/xen/xend/XendClient.py
 +@@ -1,4 +1,3 @@
 +-#!/usr/bin/env python
 + #============================================================================
 + # This library is free software; you can redistribute it and/or
 + # modify it under the terms of version 2.1 of the GNU Lesser General Public
 +diff --git a/tools/python/xen/xend/XendLocalStorageRepo.py b/tools/python/xen/xend/XendLocalStorageRepo.py
 +index 31b86f6..272f3a1 100644
 +--- a/tools/python/xen/xend/XendLocalStorageRepo.py
 ++++ b/tools/python/xen/xend/XendLocalStorageRepo.py
 +@@ -1,4 +1,3 @@
 +-#!/usr/bin/python
 + #============================================================================
 + # This library is free software; you can redistribute it and/or
 + # modify it under the terms of version 2.1 of the GNU Lesser General Public
 +diff --git a/tools/python/xen/xend/XendQCoWStorageRepo.py b/tools/python/xen/xend/XendQCoWStorageRepo.py
 +index 726df0b..53846b4 100644
 +--- a/tools/python/xen/xend/XendQCoWStorageRepo.py
 ++++ b/tools/python/xen/xend/XendQCoWStorageRepo.py
 +@@ -1,4 +1,3 @@
 +-#!/usr/bin/python
 + #============================================================================
 + # This library is free software; you can redistribute it and/or
 + # modify it under the terms of version 2.1 of the GNU Lesser General Public
 +diff --git a/tools/python/xen/xend/XendSXPDev.py b/tools/python/xen/xend/XendSXPDev.py
 +index f145701..13621f4 100644
 +--- a/tools/python/xen/xend/XendSXPDev.py
 ++++ b/tools/python/xen/xend/XendSXPDev.py
 +@@ -1,5 +1,3 @@
 +-#!/usr/bin/env python
 +-#
 + # Helper functions for dealing with the sxp representation of devices
 + 
 + import types
 +diff --git a/tools/python/xen/xend/XendStorageRepository.py b/tools/python/xen/xend/XendStorageRepository.py
 +index 6ac94d3..c67aa37 100644
 +--- a/tools/python/xen/xend/XendStorageRepository.py
 ++++ b/tools/python/xen/xend/XendStorageRepository.py
 +@@ -1,4 +1,3 @@
 +-#!/usr/bin/python
 + #============================================================================
 + # This library is free software; you can redistribute it and/or
 + # modify it under the terms of version 2.1 of the GNU Lesser General Public
 +diff --git a/tools/python/xen/xend/XendVDI.py b/tools/python/xen/xend/XendVDI.py
 +index f8abea6..778986f 100644
 +--- a/tools/python/xen/xend/XendVDI.py
 ++++ b/tools/python/xen/xend/XendVDI.py
 +@@ -1,4 +1,3 @@
 +-#!/usr/bin/python
 + #============================================================================
 + # This library is free software; you can redistribute it and/or
 + # modify it under the terms of version 2.1 of the GNU Lesser General Public
 +diff --git a/tools/python/xen/xend/arch.py b/tools/python/xen/xend/arch.py
 +index 6d789d9..4f82735 100644
 +--- a/tools/python/xen/xend/arch.py
 ++++ b/tools/python/xen/xend/arch.py
 +@@ -1,5 +1,3 @@
 +-#!/usr/bin/env python
 +-#
 + # This library is free software; you can redistribute it and/or
 + # modify it under the terms of version 2.1 of the GNU Lesser General Public
 + # License as published by the Free Software Foundation.
 +diff --git a/tools/python/xen/xend/osdep.py b/tools/python/xen/xend/osdep.py
 +index b51dd2e..d03247a 100644
 +--- a/tools/python/xen/xend/osdep.py
 ++++ b/tools/python/xen/xend/osdep.py
 +@@ -1,5 +1,3 @@
 +-#!/usr/bin/env python
 +-#
 + # This library is free software; you can redistribute it and/or
 + # modify it under the terms of version 2.1 of the GNU Lesser General Public
 + # License as published by the Free Software Foundation.
 +diff --git a/tools/python/xen/xend/sxp.py b/tools/python/xen/xend/sxp.py
 +index c87270f..21ed514 100644
 +--- a/tools/python/xen/xend/sxp.py
 ++++ b/tools/python/xen/xend/sxp.py
 +@@ -1,4 +1,3 @@
 +-#!/usr/bin/env python
 + #============================================================================
 + # This library is free software; you can redistribute it and/or
 + # modify it under the terms of version 2.1 of the GNU Lesser General Public
 +diff --git a/tools/python/xen/xm/xenapi_create.py b/tools/python/xen/xm/xenapi_create.py
 +index 346ff20..31d0130 100644
 +--- a/tools/python/xen/xm/xenapi_create.py
 ++++ b/tools/python/xen/xm/xenapi_create.py
 +@@ -1,4 +1,3 @@
 +-#!/usr/bin/python
 + #============================================================================
 + # This library is free software; you can redistribute it and/or
 + # modify it under the terms of version 2.1 of the GNU Lesser General Public
diff --cc debian/patches/0042-tools-ocaml-fix-build.diff.patch
index 316ccea,0000000..5b8a81a
mode 100644,000000..100644
--- a/debian/patches/0042-tools-ocaml-fix-build.diff.patch
+++ b/debian/patches/0042-tools-ocaml-fix-build.diff.patch
@@@ -1,116 -1,0 +1,116 @@@
- From 815f07c31a1aa2baa127cc3e7b30e02acf707026 Mon Sep 17 00:00:00 2001
++From d84affe162c222cd9c084bea6bc6ddcb9090fbcc Mon Sep 17 00:00:00 2001
 +From: Debian Xen Team <pkg-xen-devel at lists.alioth.debian.org>
 +Date: Tue, 29 Nov 2011 11:45:27 +0000
 +Subject: tools-ocaml-fix-build.diff
 +
 +Fix the build of the ocaml libraries
 +
 +Signed-off-by: Jon Ludlam <jonathan.ludlam at eu.citrix.com>
 +---
 + tools/Rules.mk                     |  2 ++
 + tools/ocaml/Makefile               |  2 +-
 + tools/ocaml/Makefile.rules         | 12 +++---------
 + tools/ocaml/libs/eventchn/Makefile |  1 +
 + tools/ocaml/libs/xc/Makefile       |  1 +
 + tools/ocaml/xenstored/Makefile     |  4 +++-
 + 6 files changed, 11 insertions(+), 11 deletions(-)
 +
 +diff --git a/tools/Rules.mk b/tools/Rules.mk
 +index 74ce6bc..a2fb32e 100644
 +--- a/tools/Rules.mk
 ++++ b/tools/Rules.mk
 +@@ -23,10 +23,12 @@ CFLAGS_xeninclude = -I$(XEN_INCLUDE)
 + 
 + CFLAGS_libxenctrl = -I$(XEN_LIBXC) $(CFLAGS_xeninclude)
 + LDLIBS_libxenctrl = $(XEN_LIBXC)/libxenctrl.so
 ++LDLIBS_libxenctrl_SYSTEM = -lxenctrl-$(XEN_VERSION)
 + SHLIB_libxenctrl  = -Wl,-rpath-link=$(XEN_LIBXC)
 + 
 + CFLAGS_libxenguest = -I$(XEN_LIBXC) $(CFLAGS_xeninclude)
 + LDLIBS_libxenguest = $(XEN_LIBXC)/libxenguest.so
 ++LDLIBS_libxenguest_SYSTEM = -lxenguest-$(XEN_VERSION)
 + SHLIB_libxenguest  = -Wl,-rpath-link=L$(XEN_LIBXC)
 + 
 + CFLAGS_libxenstore = -I$(XEN_XENSTORE) $(CFLAGS_xeninclude)
 +diff --git a/tools/ocaml/Makefile b/tools/ocaml/Makefile
 +index 8e4ca36..6b22bbe 100644
 +--- a/tools/ocaml/Makefile
 ++++ b/tools/ocaml/Makefile
 +@@ -1,7 +1,7 @@
 + XEN_ROOT = $(CURDIR)/../..
 + include $(XEN_ROOT)/tools/Rules.mk
 + 
 +-SUBDIRS_PROGRAMS = xenstored test
 ++SUBDIRS_PROGRAMS = xenstored
 + 
 + SUBDIRS = libs $(SUBDIRS_PROGRAMS)
 + 
 +diff --git a/tools/ocaml/Makefile.rules b/tools/ocaml/Makefile.rules
 +index 0745e83..5687eca 100644
 +--- a/tools/ocaml/Makefile.rules
 ++++ b/tools/ocaml/Makefile.rules
 +@@ -47,7 +47,7 @@ ALL_OCAML_OBJ_SOURCES=$(addsuffix .ml, $(ALL_OCAML_OBJS))
 + clean: $(CLEAN_HOOKS)
 + 	$(Q)rm -f .*.d *.o *.so *.a *.cmo *.cmi *.cma *.cmx *.cmxa *.annot *.spot *.spit $(LIBS) $(PROGRAMS) $(GENERATED_FILES) .ocamldep.make META
 + 
 +-quiet-command = $(if $(V),$1, at printf " %-8s %s\n" "$2" "$3" && $1)
 ++quiet-command = $1
 + 
 + mk-caml-lib-native = $(call quiet-command, $(OCAMLOPT) $(OCAMLOPTFLAGS) -a -o $1 $2 $3,MLA,$1)
 + mk-caml-lib-bytecode = $(call quiet-command, $(OCAMLC) $(OCAMLCFLAGS) -a -o $1 $2 $3,MLA,$1)
 +@@ -58,14 +58,8 @@ mk-caml-lib-stubs = \
 + 
 + # define a library target <name>.cmxa and <name>.cma
 + define OCAML_LIBRARY_template
 +- $(1).cmxa: lib$(1)_stubs.a $(foreach obj,$($(1)_OBJS),$(obj).cmx)
 +-	$(call mk-caml-lib-native,$$@, -cclib -l$(1)_stubs $(foreach lib,$(LIBS_$(1)),-cclib $(lib)), $(foreach obj,$($(1)_OBJS),$(obj).cmx))
 +- $(1).cma: $(foreach obj,$($(1)_OBJS),$(obj).cmo)
 +-	$(call mk-caml-lib-bytecode,$$@, -dllib dll$(1)_stubs.so -cclib -l$(1)_stubs, $$+)
 +- $(1)_stubs.a: $(foreach obj,$$($(1)_C_OBJS),$(obj).o)
 +-	$(call mk-caml-stubs,$$@, $$+)
 +- lib$(1)_stubs.a: $(foreach obj,$($(1)_C_OBJS),$(obj).o)
 +-	$(call mk-caml-lib-stubs,$$@, $$+)
 ++ $(1).cma: $(foreach obj,$($(1)_OBJS),$(obj).cmx $(obj).cmo) $(foreach obj,$($(1)_C_OBJS),$(obj).o)
 ++	$(OCAMLMKLIB) -o $1 -oc $(1)_stubs $(foreach obj,$($(1)_OBJS),$(obj).cmx $(obj).cmo) $(foreach obj,$($(1)_C_OBJS),$(obj).o) $(foreach lib, $(LIBS_$(1)_SYSTEM), -cclib $(lib)) $(foreach arg,$(LIBS_$(1)),-ldopt $(arg))
 + endef
 + 
 + define OCAML_NOC_LIBRARY_template
 +diff --git a/tools/ocaml/libs/eventchn/Makefile b/tools/ocaml/libs/eventchn/Makefile
 +index 2d8d618..ebbe777 100644
 +--- a/tools/ocaml/libs/eventchn/Makefile
 ++++ b/tools/ocaml/libs/eventchn/Makefile
 +@@ -9,6 +9,7 @@ INTF = $(foreach obj, $(OBJS),$(obj).cmi)
 + LIBS = xeneventchn.cma xeneventchn.cmxa
 + 
 + LIBS_xeneventchn = $(LDLIBS_libxenctrl)
 ++LIBS_xeneventchn_SYSTEM = $(LDLIBS_libxenctrl_SYSTEM)
 + 
 + all: $(INTF) $(LIBS) $(PROGRAMS)
 + 
 +diff --git a/tools/ocaml/libs/xc/Makefile b/tools/ocaml/libs/xc/Makefile
 +index 239c187..7cd17dc 100644
 +--- a/tools/ocaml/libs/xc/Makefile
 ++++ b/tools/ocaml/libs/xc/Makefile
 +@@ -10,6 +10,7 @@ INTF = xenctrl.cmi
 + LIBS = xenctrl.cma xenctrl.cmxa
 + 
 + LIBS_xenctrl = $(LDLIBS_libxenctrl) $(LDLIBS_libxenguest)
 ++LIBS_xenctrl_SYSTEM = $(LDLIBS_libxenctrl_SYSTEM) $(LDLIBS_libxenguest_SYSTEM)
 + 
 + xenctrl_OBJS = $(OBJS)
 + xenctrl_C_OBJS = xenctrl_stubs
 +diff --git a/tools/ocaml/xenstored/Makefile b/tools/ocaml/xenstored/Makefile
 +index b18f190..ee1c1ea 100644
 +--- a/tools/ocaml/xenstored/Makefile
 ++++ b/tools/ocaml/xenstored/Makefile
 +@@ -43,7 +43,9 @@ XENSTOREDLIBS = \
 + 	-ccopt -L -ccopt $(OCAML_TOPLEVEL)/libs/eventchn $(OCAML_TOPLEVEL)/libs/eventchn/xeneventchn.cmxa \
 + 	-ccopt -L -ccopt $(OCAML_TOPLEVEL)/libs/xc $(OCAML_TOPLEVEL)/libs/xc/xenctrl.cmxa \
 + 	-ccopt -L -ccopt $(OCAML_TOPLEVEL)/libs/xb $(OCAML_TOPLEVEL)/libs/xb/xenbus.cmxa \
 +-	-ccopt -L -ccopt $(XEN_ROOT)/tools/libxc
 ++	-ccopt -L -ccopt $(XEN_ROOT)/tools/libxc \
 ++	$(foreach obj, $(LDLIBS_libxenctrl), -ccopt $(obj)) \
 ++	$(foreach obj, $(LDLIBS_libxenguest), -ccopt $(obj))
 + 
 + PROGRAMS = oxenstored
 + 
diff --cc debian/patches/0043-tools-xenstore-compatibility.diff.patch
index fbf653d,0000000..0d9f4ee
mode 100644,000000..100644
--- a/debian/patches/0043-tools-xenstore-compatibility.diff.patch
+++ b/debian/patches/0043-tools-xenstore-compatibility.diff.patch
@@@ -1,61 -1,0 +1,61 @@@
- From 1924097f79ad75229638afc85aaaf6c604c2eba2 Mon Sep 17 00:00:00 2001
++From 348ef177a7b488e61cb8d9e5a12cda596ad50d1d Mon Sep 17 00:00:00 2001
 +From: Bastian Blank <waldi at debian.org>
 +Date: Sat, 5 Jul 2014 11:47:36 +0200
 +Subject: tools-xenstore-compatibility.diff
 +
 +---
 + tools/xenstore/xenstore.h        | 1 +
 + tools/xenstore/xenstore_client.c | 2 +-
 + tools/xenstore/xs.c              | 4 +++-
 + 3 files changed, 5 insertions(+), 2 deletions(-)
 +
 +diff --git a/tools/xenstore/xenstore.h b/tools/xenstore/xenstore.h
 +index fdf5e76..b45224b 100644
 +--- a/tools/xenstore/xenstore.h
 ++++ b/tools/xenstore/xenstore.h
 +@@ -26,6 +26,7 @@
 + 
 + #define XS_OPEN_READONLY	1UL<<0
 + #define XS_OPEN_SOCKETONLY      1UL<<1
 ++#define XS_OPEN_DOMAINONLY      1UL<<2
 + 
 + /*
 +  * Setting XS_UNWATCH_FILTER arranges that after xs_unwatch, no
 +diff --git a/tools/xenstore/xenstore_client.c b/tools/xenstore/xenstore_client.c
 +index 0ec103f..be70ab4 100644
 +--- a/tools/xenstore/xenstore_client.c
 ++++ b/tools/xenstore/xenstore_client.c
 +@@ -632,7 +632,7 @@ main(int argc, char **argv)
 + 	    max_width = ws.ws_col - 2;
 +     }
 + 
 +-    xsh = xs_open(socket ? XS_OPEN_SOCKETONLY : 0);
 ++    xsh = xs_open(socket ? XS_OPEN_SOCKETONLY : XS_OPEN_DOMAINONLY);
 +     if (xsh == NULL) err(1, "xs_open");
 + 
 + again:
 +diff --git a/tools/xenstore/xs.c b/tools/xenstore/xs.c
 +index dd03a85..15e65b8 100644
 +--- a/tools/xenstore/xs.c
 ++++ b/tools/xenstore/xs.c
 +@@ -282,17 +282,19 @@ struct xs_handle *xs_daemon_open_readonly(void)
 + 
 + struct xs_handle *xs_domain_open(void)
 + {
 +-	return xs_open(0);
 ++	return xs_open(XS_OPEN_DOMAINONLY);
 + }
 + 
 + struct xs_handle *xs_open(unsigned long flags)
 + {
 + 	struct xs_handle *xsh = NULL;
 + 
 ++	if (!(flags & XS_OPEN_DOMAINONLY)) {
 + 	if (flags & XS_OPEN_READONLY)
 + 		xsh = get_handle(xs_daemon_socket_ro());
 + 	else
 + 		xsh = get_handle(xs_daemon_socket());
 ++	}
 + 
 + 	if (!xsh && !(flags & XS_OPEN_SOCKETONLY))
 + 		xsh = get_handle(xs_domain_dev());

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-xen/xen.git



More information about the Pkg-xen-changes mailing list