[Pkg-xen-changes] [xen] 29/35: merge patched-feature/4.5.0-rc3 into feature/4.5.0-rc3
Bastian Blank
waldi at moszumanska.debian.org
Wed Dec 17 21:34:45 UTC 2014
This is an automated email from the git hooks/post-receive script.
waldi pushed a commit to branch develop
in repository xen.
commit 9aff85140e67c2d6df6c644fc5b6ca24ed0b88c2
Merge: 9c5d090 f1b16d7
Author: Bastian Blank <waldi at debian.org>
Date: Wed Dec 17 21:05:28 2014 +0100
merge patched-feature/4.5.0-rc3 into feature/4.5.0-rc3
.gitignore | 127 +-
.hgignore | 15 -
Config.mk | 97 +-
INSTALL | 341 ++
MAINTAINERS | 68 +-
Makefile | 182 +-
README | 96 +-
autogen.sh | 8 +-
buildconfigs/Rules.mk | 42 -
buildconfigs/enable-xen-config | 127 -
buildconfigs/interface.exclude | 7 -
buildconfigs/ketchup | 742 ----
buildconfigs/mk.linux-2.6 | 10 -
buildconfigs/mk.linux-2.6-common | 154 -
buildconfigs/mk.linux-2.6-git | 2 -
buildconfigs/mk.linux-2.6-mm | 2 -
buildconfigs/mk.linux-2.6-native | 5 -
buildconfigs/mk.linux-2.6-pvops | 17 -
buildconfigs/mk.linux-2.6-rc | 2 -
buildconfigs/mk.linux-2.6-tip | 2 -
buildconfigs/mk.linux-2.6-tip-latest | 17 -
buildconfigs/mk.linux-2.6-xen | 6 -
buildconfigs/mk.linux-2.6-xen0 | 2 -
buildconfigs/mk.linux-2.6-xenU | 2 -
buildconfigs/select-linux-arch | 30 -
buildconfigs/select-linux-image | 33 -
buildconfigs/select-repository | 69 -
buildconfigs/src.git-clone | 32 -
buildconfigs/src.hg-clone | 32 -
buildconfigs/src.tarball | 19 -
config/Docs.mk.in | 8 +-
config/FreeBSD.mk | 5 +
config/Linux.mk | 7 +-
config/MiniOS.mk | 1 +
config/NetBSD.mk | 5 -
config/NetBSDRump.mk | 9 +
config/Paths.mk.in | 64 +
config/StdGNU.mk | 32 +-
config/Stubdom.mk.in | 8 +-
config/SunOS.mk | 22 +-
config/Tools.mk.in | 29 +-
config/arm32.mk | 2 +
config/arm64.mk | 4 +
config/x86_32.mk | 6 +
config/x86_64.mk | 6 +
configure | 199 +-
configure.ac | 16 +-
debian/.git-dpm | 6 +-
debian/patches/CVE-2013-3495.diff | 44 -
debian/patches/CVE-2014-5146.diff | 657 ---
debian/patches/CVE-2014-6268.diff | 177 -
debian/patches/CVE-2014-7154.diff | 59 -
debian/patches/CVE-2014-7155.diff | 49 -
debian/patches/CVE-2014-7156.diff | 35 -
debian/patches/CVE-2014-7188.diff | 48 -
debian/patches/CVE-2014-8594.diff | 38 -
debian/patches/CVE-2014-8595.diff | 168 -
debian/patches/CVE-2014-8866.diff | 146 -
debian/patches/CVE-2014-8867.diff | 105 -
debian/patches/CVE-2014-9030.diff | 55 -
debian/patches/CVE-2014-9065.diff | 524 ---
debian/patches/config-prefix.diff | 66 +-
.../domain-builder-pv-kernel-memory-leak.diff | 244 --
.../patches/libxl-local-attach-diskpath-leak.diff | 39 -
debian/patches/libxl-parse-max-leak.diff | 50 -
debian/patches/series | 23 +-
debian/patches/tools-blktap2-prefix.diff | 33 +-
debian/patches/tools-console-prefix.diff | 10 +-
debian/patches/tools-disable.diff | 40 -
.../tools-examples-xend-disable-network.diff | 34 -
.../tools-examples-xend-disable-relocation.diff | 30 -
debian/patches/tools-hotplug-udevrules.diff | 26 +-
debian/patches/tools-include-install.diff | 2 +-
debian/patches/tools-libfsimage-abiname.diff | 8 +-
debian/patches/tools-libfsimage-prefix.diff | 14 +-
debian/patches/tools-libxc-abiname.diff | 68 +-
debian/patches/tools-libxl-abiname.diff | 52 +-
debian/patches/tools-libxl-prefix.diff | 47 +-
debian/patches/tools-misc-prefix.diff | 32 +-
debian/patches/tools-misc-xend-startup.diff | 47 -
debian/patches/tools-pygrub-prefix.diff | 23 +-
.../tools-pygrub-remove-static-solaris-support | 12 +-
debian/patches/tools-python-prefix.diff | 116 +-
debian/patches/tools-python-shebang.diff | 176 -
debian/patches/tools-python-xen-relative-path.diff | 184 -
debian/patches/tools-rpath.diff | 4 +-
debian/patches/tools-xcutils-rpath.diff | 8 +-
debian/patches/tools-xenmon-install.diff | 14 +-
debian/patches/tools-xenmon-prefix.diff | 12 +-
debian/patches/tools-xenpaging-prefix.diff | 25 +-
debian/patches/tools-xenpmd-prefix.diff | 25 +
debian/patches/tools-xenstat-abiname.diff | 15 +-
debian/patches/tools-xenstat-prefix.diff | 30 +-
debian/patches/tools-xenstore-compatibility.diff | 20 +-
debian/patches/tools-xenstore-prefix.diff | 36 +-
debian/patches/tools-xentrace-prefix.diff | 14 +-
debian/patches/version.diff | 14 +-
.../patches/xl-coredumps-to-var-lib-xen-dump.diff | 47 +-
docs/Makefile | 69 +-
docs/README.remus | 20 +
docs/configure | 76 +-
docs/configure.ac | 2 +
docs/man/xend-config.sxp.pod.5 | 158 -
docs/man/xl.cfg.pod.5 | 351 +-
docs/man/xl.conf.pod.5 | 6 +
docs/man/xl.pod.1 | 181 +-
docs/man/xm.pod.1 | 1004 -----
docs/man/xmdomain.cfg.pod.5 | 358 --
docs/misc/amd-ucode-container.txt | 90 +
docs/misc/arm/device-tree/booting.txt | 64 +-
docs/misc/arm/early-printk.txt | 3 +
docs/misc/channel.txt | 106 +
docs/misc/console.txt | 69 +-
docs/misc/distro_mapping.txt | 6 +-
docs/misc/efi.markdown | 38 +-
docs/misc/kexec_and_kdump.txt | 9 +-
docs/misc/printk-formats.txt | 10 +
docs/misc/pvh-readme.txt | 2 +
docs/misc/pvh.markdown | 377 ++
docs/misc/tmem-internals.html | 7 -
docs/misc/vbd-interface.txt | 6 +
docs/misc/vtpm-platforms.txt | 141 +
docs/misc/vtpm.txt | 249 +-
docs/misc/vtpmmgr.txt | 165 +
docs/misc/x86-xenpv-bootloader.markdown | 49 +
docs/misc/xen-command-line.markdown | 455 +-
docs/misc/xend.tex | 419 --
docs/misc/xenstore-paths.markdown | 28 +-
docs/misc/xenstore-ring.txt | 116 +
docs/misc/xl-disk-configuration.txt | 55 +
docs/misc/xl-numa-placement.markdown | 162 +-
docs/misc/xsm-flask.txt | 33 -
extras/mini-os/Config.mk | 2 +-
extras/mini-os/Makefile | 23 +-
extras/mini-os/README | 4 +-
extras/mini-os/arch/arm/arm32.S | 233 +
extras/mini-os/arch/arm/events.c | 31 +
extras/mini-os/arch/arm/hypercalls32.S | 64 +
extras/mini-os/arch/arm/minios-arm32.lds | 83 +
extras/mini-os/arch/arm/mm.c | 139 +
extras/mini-os/arch/arm/sched.c | 47 +
extras/mini-os/arch/arm/setup.c | 119 +
extras/mini-os/arch/x86/events.c | 35 +
extras/mini-os/arch/x86/mm.c | 13 +
extras/mini-os/arch/x86/sched.c | 3 +
extras/mini-os/arch/x86/setup.c | 44 +-
extras/mini-os/arch/x86/time.c | 2 +-
extras/mini-os/arch/x86/x86_32.S | 2 +-
extras/mini-os/arch/x86/x86_64.S | 2 +-
extras/mini-os/blkfront.c | 18 +-
extras/mini-os/console/console.c | 2 +-
extras/mini-os/events.c | 66 +-
extras/mini-os/gntmap.c | 35 +-
extras/mini-os/gnttab.c | 11 +-
extras/mini-os/hypervisor.c | 12 +-
extras/mini-os/include/arm/arch_endian.h | 7 +
extras/mini-os/include/arm/arch_limits.h | 9 +
extras/mini-os/include/arm/arch_mm.h | 38 +
extras/mini-os/include/arm/arch_sched.h | 19 +
extras/mini-os/include/arm/arch_spinlock.h | 36 +
extras/mini-os/include/arm/arm32/arch_wordsize.h | 1 +
extras/mini-os/include/arm/gic.h | 1 +
extras/mini-os/include/arm/hypercall-arm.h | 98 +
extras/mini-os/include/arm/os.h | 216 +
extras/mini-os/include/arm/traps.h | 20 +
extras/mini-os/include/compiler.h | 10 +
extras/mini-os/include/events.h | 7 +
extras/mini-os/include/gnttab.h | 1 +
extras/mini-os/include/hypervisor.h | 2 +
extras/mini-os/include/kernel.h | 6 +-
extras/mini-os/include/lib.h | 11 +-
extras/mini-os/include/mm.h | 5 +-
extras/mini-os/include/types.h | 24 +-
extras/mini-os/include/x86/arch_spinlock.h | 2 +-
extras/mini-os/include/x86/os.h | 16 +-
.../mini-os/include/x86/x86_32/hypercall-x86_32.h | 5 +
.../mini-os/include/x86/x86_64/hypercall-x86_64.h | 4 +
extras/mini-os/kernel.c | 49 +-
extras/mini-os/lib/math.c | 13 -
extras/mini-os/lock.c | 1 +
extras/mini-os/main.c | 3 +-
extras/mini-os/mm.c | 4 +-
extras/mini-os/sched.c | 37 +-
extras/mini-os/test.c | 16 +-
extras/mini-os/tpm_tis.c | 15 +-
extras/mini-os/tpmback.c | 12 +-
extras/mini-os/tpmfront.c | 1 +
extras/mini-os/xenbus/xenbus.c | 2 +-
install.sh | 3 -
m4/README.source | 36 +
m4/paths.m4 | 113 +
m4/pkg.m4 | 88 +-
m4/systemd.m4 | 127 +
m4/xenstored.m4 | 56 +
misc/coverity/model.c | 141 +
scripts/get_maintainer.pl | 2 +-
stubdom/Makefile | 35 +-
stubdom/README | 9 -
stubdom/c/minios.cfg | 1 -
stubdom/caml/minios.cfg | 1 -
stubdom/configure | 18 +-
stubdom/grub.patches/11graphics-keyboard.diff | 13 +
stubdom/grub/Makefile | 2 +-
stubdom/grub/kexec.c | 58 +-
stubdom/grub/mini-os.c | 10 +-
stubdom/grub/mini-os.h | 2 +
stubdom/lwip.dhcp_create_request-hwaddr_len.patch | 13 +
stubdom/newlib.patch | 22 -
stubdom/vtpm-cmake-Wextra.patch | 21 +
stubdom/vtpm-deepquote.patch | 187 +
stubdom/vtpm-parent-sign-ek.patch | 196 +
stubdom/vtpm/README | 75 -
stubdom/vtpm/vtpm.c | 40 +-
stubdom/vtpm/vtpm_cmd.c | 45 +
stubdom/vtpmmgr/Makefile | 9 +-
stubdom/vtpmmgr/README | 75 -
stubdom/vtpmmgr/calc.pl | 97 +
stubdom/vtpmmgr/disk_crypto.c | 231 +
stubdom/vtpmmgr/disk_crypto.h | 17 +
stubdom/vtpmmgr/disk_format.h | 193 +
stubdom/vtpmmgr/disk_io.c | 125 +
stubdom/vtpmmgr/disk_io.h | 25 +
stubdom/vtpmmgr/disk_read.c | 606 +++
stubdom/vtpmmgr/disk_tpm.c | 259 ++
stubdom/vtpmmgr/disk_tpm.h | 25 +
stubdom/vtpmmgr/disk_write.c | 410 ++
stubdom/vtpmmgr/endian_int.h | 72 +
stubdom/vtpmmgr/init.c | 110 +-
stubdom/vtpmmgr/log.h | 8 +-
stubdom/vtpmmgr/manage-vtpmmgr.pl | 160 +
stubdom/vtpmmgr/marshal.h | 910 ++--
stubdom/vtpmmgr/mgmt_authority.c | 323 ++
stubdom/vtpmmgr/mgmt_authority.h | 11 +
stubdom/vtpmmgr/tcg.h | 49 +
stubdom/vtpmmgr/tpm.c | 1352 +++---
stubdom/vtpmmgr/tpm.h | 112 +-
stubdom/vtpmmgr/tpmrsa.c | 25 +
stubdom/vtpmmgr/tpmrsa.h | 3 +
stubdom/vtpmmgr/vtpm_cmd_handler.c | 895 +++-
stubdom/vtpmmgr/vtpm_disk.c | 237 ++
stubdom/vtpmmgr/vtpm_disk.h | 233 +
stubdom/vtpmmgr/vtpm_manager.h | 391 +-
stubdom/vtpmmgr/vtpm_storage.c | 794 ----
stubdom/vtpmmgr/vtpm_storage.h | 68 -
stubdom/vtpmmgr/vtpmmgr.h | 18 +-
tools/Makefile | 99 +-
tools/Rules.mk | 33 +-
tools/blktap/drivers/Makefile | 2 +-
tools/blktap2/control/Makefile | 14 +-
tools/blktap2/drivers/Makefile | 16 +-
tools/blktap2/vhd/Makefile | 4 +-
tools/blktap2/vhd/lib/Makefile | 3 +-
tools/config.h.in | 15 +
tools/configure | 1259 ++++--
tools/configure.ac | 177 +-
tools/console/Makefile | 4 +-
tools/console/client/main.c | 18 +-
tools/console/daemon/io.c | 40 +-
tools/debugger/gdbsx/xg/xg_main.c | 4 +-
tools/debugger/kdd/Makefile | 2 +-
tools/examples/Makefile | 33 +-
tools/examples/README | 6 +-
tools/examples/xend-config.sxp | 306 --
tools/examples/xend-pci-permissive.sxp | 27 -
tools/examples/xend-pci-quirks.sxp | 96 -
tools/examples/xm-config.xml | 45 -
tools/examples/xmexample.hvm | 373 --
tools/examples/xmexample.hvm-stubdom | 317 --
tools/examples/xmexample.nbd | 26 -
tools/examples/xmexample.pv-grub | 172 -
tools/examples/xmexample1 | 197 -
tools/examples/xmexample2 | 232 -
tools/examples/xmexample3 | 218 -
tools/firmware/Makefile | 28 +-
tools/firmware/hvmloader/Makefile | 1 +
tools/firmware/hvmloader/acpi/build.c | 15 +-
tools/firmware/hvmloader/acpi/dsdt.asl | 60 +-
tools/firmware/hvmloader/cacheattr.c | 25 +-
tools/firmware/hvmloader/config.h | 3 +-
tools/firmware/hvmloader/hvm_param.c | 36 +
tools/firmware/hvmloader/hvmloader.c | 14 +-
tools/firmware/hvmloader/pci.c | 87 +-
tools/firmware/hvmloader/util.h | 11 +-
tools/firmware/hvmloader/xenbus.c | 62 +-
tools/firmware/seabios-config | 97 -
tools/flask/policy/Makefile | 2 +-
tools/flask/policy/policy/modules/xen/xen.if | 3 +-
tools/flask/policy/policy/modules/xen/xen.te | 6 +-
tools/flask/utils/Makefile | 2 +-
tools/flask/utils/loadpolicy.c | 2 +-
tools/hotplug/FreeBSD/Makefile | 42 +
tools/hotplug/FreeBSD/rc.d/xencommons.in | 120 +
tools/hotplug/FreeBSD/vif-bridge | 41 +
tools/hotplug/Linux/Makefile | 24 +-
tools/hotplug/Linux/block-drbd-probe | 87 +
tools/hotplug/Linux/init.d/sysconfig.xencommons | 33 -
tools/hotplug/Linux/init.d/sysconfig.xencommons.in | 42 +
tools/hotplug/Linux/init.d/xen-watchdog | 90 -
tools/hotplug/Linux/init.d/xen-watchdog.in | 90 +
tools/hotplug/Linux/init.d/xencommons | 167 -
tools/hotplug/Linux/init.d/xencommons.in | 148 +
tools/hotplug/Linux/init.d/xend | 82 -
tools/hotplug/Linux/init.d/xendomains | 585 ---
tools/hotplug/Linux/init.d/xendomains.in | 50 +
tools/hotplug/Linux/network-bridge | 339 --
tools/hotplug/Linux/network-nat | 124 -
tools/hotplug/Linux/network-route | 28 -
tools/hotplug/Linux/remus-netbuf-setup | 230 +
tools/hotplug/Linux/systemd/Makefile | 47 +
tools/hotplug/Linux/systemd/proc-xen.mount.in | 10 +
.../Linux/systemd/show_service_dependencies.sh | 31 +
.../Linux/systemd/var-lib-xenstored.mount.in | 14 +
.../hotplug/Linux/systemd/xen-init-dom0.service.in | 14 +
.../systemd/xen-qemu-dom0-disk-backend.service.in | 21 +
.../hotplug/Linux/systemd/xen-watchdog.service.in | 13 +
tools/hotplug/Linux/systemd/xenconsoled.service.in | 19 +
tools/hotplug/Linux/systemd/xendomains.service.in | 16 +
tools/hotplug/Linux/systemd/xenstored.service.in | 24 +
tools/hotplug/Linux/systemd/xenstored.socket.in | 13 +
tools/hotplug/Linux/systemd/xenstored_ro.socket.in | 13 +
tools/hotplug/Linux/vif-bridge | 8 +-
tools/hotplug/Linux/vif-common.sh | 4 +-
tools/hotplug/Linux/vif-nat | 4 -
tools/hotplug/Linux/vif-openvswitch | 4 -
tools/hotplug/Linux/vif-route | 4 -
tools/hotplug/Linux/vif-setup | 9 -
tools/hotplug/Linux/vif-setup.in | 9 +
tools/hotplug/Linux/xen-backend.rules | 8 -
tools/hotplug/Linux/xen-backend.rules.in | 10 +
tools/hotplug/Linux/xen-hotplug-common.sh | 120 -
tools/hotplug/Linux/xen-hotplug-common.sh.in | 120 +
tools/hotplug/Linux/xend.rules | 4 -
tools/hotplug/Linux/xendomains.in | 575 +++
tools/hotplug/Makefile | 1 +
tools/hotplug/NetBSD/Makefile | 11 +-
tools/hotplug/NetBSD/block | 2 +-
tools/hotplug/NetBSD/rc.d/xencommons | 125 -
tools/hotplug/NetBSD/rc.d/xencommons.in | 124 +
tools/hotplug/NetBSD/rc.d/xend | 71 -
tools/hotplug/NetBSD/rc.d/xendomains | 2 +-
tools/hotplug/NetBSD/vif-bridge | 2 +-
tools/hotplug/NetBSD/vif-ip | 2 +-
tools/hotplug/common/Makefile | 4 +-
tools/include/xen-sys/FreeBSD/evtchn.h | 87 +
tools/include/xen-sys/FreeBSD/privcmd.h | 64 +
tools/include/xen-sys/NetBSDRump/privcmd.h | 31 +
tools/libfsimage/Rules.mk | 2 +-
tools/libfsimage/common/Makefile | 8 +-
tools/libvchan/init.c | 8 +-
tools/libvchan/io.c | 6 +-
tools/libxc/Makefile | 60 +-
tools/libxc/include/xc_dom.h | 403 ++
tools/libxc/include/xenctrl.h | 2717 ++++++++++++
tools/libxc/include/xenctrlosdep.h | 173 +
tools/libxc/include/xenguest.h | 325 ++
tools/libxc/include/xentoollog.h | 137 +
tools/libxc/xc_bitops.h | 8 +
tools/libxc/xc_compression.c | 1 -
tools/libxc/xc_core.c | 2 +-
tools/libxc/xc_core_x86.c | 4 -
tools/libxc/xc_cpufeature.h | 5 +
tools/libxc/xc_cpuid_x86.c | 83 +-
tools/libxc/xc_dom.h | 395 --
tools/libxc/xc_dom_arm.c | 233 +-
tools/libxc/xc_dom_decompress_lz4.c | 1 -
tools/libxc/xc_dom_decompress_unsafe_lzo1x.c | 1 +
tools/libxc/xc_dom_decompress_unsafe_xz.c | 11 -
tools/libxc/xc_dom_x86.c | 4 +-
tools/libxc/xc_domain.c | 505 ++-
tools/libxc/xc_domain_restore.c | 248 +-
tools/libxc/xc_domain_save.c | 144 +-
tools/libxc/xc_flask.c | 2 -
tools/libxc/xc_foreign_memory.c | 2 +-
tools/libxc/xc_freebsd.c | 72 +
tools/libxc/xc_freebsd_osdep.c | 405 ++
tools/libxc/xc_gnttab.c | 3 +-
tools/libxc/xc_hvm_build_x86.c | 89 +-
tools/libxc/xc_linux_osdep.c | 22 +-
tools/libxc/xc_mem_access.c | 74 +-
tools/libxc/xc_mem_event.c | 120 +
tools/libxc/xc_mem_paging.c | 2 +-
tools/libxc/xc_minios.c | 5 +-
tools/libxc/xc_misc.c | 62 +-
tools/libxc/xc_msr_x86.h | 36 +
tools/libxc/xc_nomigrate.c | 6 +-
tools/libxc/xc_offline_page.c | 4 +-
tools/libxc/xc_pm.c | 51 +-
tools/libxc/xc_private.c | 41 +-
tools/libxc/xc_private.h | 140 +-
tools/libxc/xc_psr.c | 215 +
tools/libxc/xc_resource.c | 150 +
tools/libxc/xc_resume.c | 19 +-
tools/libxc/xc_rt.c | 65 +
tools/libxc/xc_suspend.c | 173 +-
tools/libxc/xc_tbuf.c | 4 +-
tools/libxc/xc_tmem.c | 10 -
tools/libxc/xenctrl.h | 2430 -----------
tools/libxc/xenctrl_osdep_ENOSYS.c | 36 +-
tools/libxc/xenctrlosdep.h | 172 -
tools/libxc/xenguest.h | 308 --
tools/libxc/xentoollog.h | 135 -
tools/libxc/xg_private.c | 1 -
tools/libxc/xg_private.h | 24 +-
tools/libxc/xg_save_restore.h | 24 +-
tools/libxc/xtl_logger_stdio.c | 20 +-
tools/libxen/COPYING | 510 ---
tools/libxen/Makefile | 74 -
tools/libxen/Makefile.dist | 115 -
tools/libxen/README | 55 -
tools/libxen/include/xen/api/xen_all.h | 40 -
tools/libxen/include/xen/api/xen_common.h | 211 -
tools/libxen/include/xen/api/xen_console.h | 247 --
tools/libxen/include/xen/api/xen_console_decl.h | 30 -
.../libxen/include/xen/api/xen_console_protocol.h | 82 -
tools/libxen/include/xen/api/xen_cpu_pool.h | 424 --
tools/libxen/include/xen/api/xen_cpu_pool_decl.h | 30 -
tools/libxen/include/xen/api/xen_crashdump.h | 199 -
tools/libxen/include/xen/api/xen_crashdump_decl.h | 30 -
tools/libxen/include/xen/api/xen_event.h | 102 -
tools/libxen/include/xen/api/xen_event_decl.h | 25 -
tools/libxen/include/xen/api/xen_event_operation.h | 82 -
tools/libxen/include/xen/api/xen_host.h | 505 ---
tools/libxen/include/xen/api/xen_host_cpu.h | 263 --
tools/libxen/include/xen/api/xen_host_cpu_decl.h | 30 -
tools/libxen/include/xen/api/xen_host_decl.h | 30 -
tools/libxen/include/xen/api/xen_host_metrics.h | 199 -
.../libxen/include/xen/api/xen_host_metrics_decl.h | 30 -
tools/libxen/include/xen/api/xen_int_float_map.h | 53 -
tools/libxen/include/xen/api/xen_int_int_map.h | 53 -
.../include/xen/api/xen_int_string_set_map.h | 53 -
tools/libxen/include/xen/api/xen_network.h | 276 --
tools/libxen/include/xen/api/xen_network_decl.h | 30 -
.../include/xen/api/xen_on_crash_behaviour.h | 97 -
tools/libxen/include/xen/api/xen_on_normal_exit.h | 77 -
tools/libxen/include/xen/api/xen_pbd.h | 223 -
tools/libxen/include/xen/api/xen_pbd_decl.h | 30 -
tools/libxen/include/xen/api/xen_pif.h | 277 --
tools/libxen/include/xen/api/xen_pif_decl.h | 30 -
tools/libxen/include/xen/api/xen_pif_metrics.h | 198 -
.../libxen/include/xen/api/xen_pif_metrics_decl.h | 30 -
tools/libxen/include/xen/api/xen_sr.h | 277 --
tools/libxen/include/xen/api/xen_sr_decl.h | 30 -
tools/libxen/include/xen/api/xen_string_set.h | 47 -
.../libxen/include/xen/api/xen_string_string_map.h | 53 -
tools/libxen/include/xen/api/xen_user.h | 204 -
tools/libxen/include/xen/api/xen_user_decl.h | 30 -
tools/libxen/include/xen/api/xen_vbd.h | 390 --
tools/libxen/include/xen/api/xen_vbd_decl.h | 30 -
tools/libxen/include/xen/api/xen_vbd_metrics.h | 198 -
.../libxen/include/xen/api/xen_vbd_metrics_decl.h | 30 -
tools/libxen/include/xen/api/xen_vbd_mode.h | 77 -
tools/libxen/include/xen/api/xen_vbd_type.h | 77 -
tools/libxen/include/xen/api/xen_vdi.h | 360 --
tools/libxen/include/xen/api/xen_vdi_decl.h | 30 -
tools/libxen/include/xen/api/xen_vdi_type.h | 92 -
tools/libxen/include/xen/api/xen_vif.h | 379 --
tools/libxen/include/xen/api/xen_vif_decl.h | 30 -
tools/libxen/include/xen/api/xen_vif_metrics.h | 198 -
.../libxen/include/xen/api/xen_vif_metrics_decl.h | 30 -
tools/libxen/include/xen/api/xen_vm.h | 931 ----
tools/libxen/include/xen/api/xen_vm_decl.h | 30 -
.../libxen/include/xen/api/xen_vm_guest_metrics.h | 234 --
.../include/xen/api/xen_vm_guest_metrics_decl.h | 30 -
tools/libxen/include/xen/api/xen_vm_metrics.h | 251 --
tools/libxen/include/xen/api/xen_vm_metrics_decl.h | 30 -
tools/libxen/include/xen/api/xen_vm_power_state.h | 97 -
tools/libxen/include/xen/api/xen_xspolicy.h | 293 --
tools/libxen/include/xen/api/xen_xspolicy_decl.h | 31 -
.../libxen/include/xen_console_protocol_internal.h | 37 -
.../libxen/include/xen_event_operation_internal.h | 37 -
tools/libxen/include/xen_internal.h | 188 -
.../include/xen_on_crash_behaviour_internal.h | 38 -
tools/libxen/include/xen_on_normal_exit_internal.h | 37 -
tools/libxen/include/xen_vbd_mode_internal.h | 37 -
tools/libxen/include/xen_vbd_type_internal.h | 37 -
tools/libxen/include/xen_vdi_type_internal.h | 37 -
tools/libxen/include/xen_vm_power_state_internal.h | 37 -
tools/libxen/src/xen_common.c | 1784 --------
tools/libxen/src/xen_console.c | 298 --
tools/libxen/src/xen_console_protocol.c | 82 -
tools/libxen/src/xen_cpu_pool.c | 671 ---
tools/libxen/src/xen_crashdump.c | 191 -
tools/libxen/src/xen_event.c | 123 -
tools/libxen/src/xen_event_operation.c | 75 -
tools/libxen/src/xen_host.c | 915 ----
tools/libxen/src/xen_host_cpu.c | 353 --
tools/libxen/src/xen_host_metrics.c | 190 -
tools/libxen/src/xen_int_float_map.c | 39 -
tools/libxen/src/xen_int_int_map.c | 39 -
tools/libxen/src/xen_int_string_set_map.c | 54 -
tools/libxen/src/xen_network.c | 371 --
tools/libxen/src/xen_on_crash_behaviour.c | 85 -
tools/libxen/src/xen_on_normal_exit.c | 81 -
tools/libxen/src/xen_pbd.c | 249 --
tools/libxen/src/xen_pif.c | 380 --
tools/libxen/src/xen_pif_metrics.c | 190 -
tools/libxen/src/xen_sr.c | 379 --
tools/libxen/src/xen_string_set.c | 48 -
tools/libxen/src/xen_string_set.h | 47 -
tools/libxen/src/xen_string_string_map.c | 52 -
tools/libxen/src/xen_user.c | 210 -
tools/libxen/src/xen_vbd.c | 626 ---
tools/libxen/src/xen_vbd_metrics.c | 190 -
tools/libxen/src/xen_vbd_mode.c | 81 -
tools/libxen/src/xen_vbd_type.c | 81 -
tools/libxen/src/xen_vdi.c | 575 ---
tools/libxen/src/xen_vdi_type.c | 84 -
tools/libxen/src/xen_vif.c | 616 ---
tools/libxen/src/xen_vif_metrics.c | 190 -
tools/libxen/src/xen_vm.c | 1837 --------
tools/libxen/src/xen_vm_guest_metrics.c | 279 --
tools/libxen/src/xen_vm_metrics.c | 318 --
tools/libxen/src/xen_vm_power_state.c | 85 -
tools/libxen/src/xen_xspolicy.c | 363 --
tools/libxen/test/test_bindings.c | 1453 -------
tools/libxen/test/test_event_handling.c | 210 -
tools/libxl/CODING_STYLE | 192 +-
tools/libxl/Makefile | 80 +-
tools/libxl/check-xl-disk-parse | 87 +-
tools/libxl/gentest.py | 66 +-
tools/libxl/gentypes.py | 303 +-
tools/libxl/idl.py | 47 +-
tools/libxl/idl.txt | 30 +-
tools/libxl/libxl.c | 1342 +++++-
tools/libxl/libxl.h | 325 +-
tools/libxl/libxl_aoutils.c | 170 +
tools/libxl/libxl_arm.c | 214 +-
tools/libxl/libxl_bootloader.c | 20 +-
tools/libxl/libxl_cpuid.c | 142 +-
tools/libxl/libxl_create.c | 281 +-
tools/libxl/libxl_device.c | 127 +-
tools/libxl/libxl_dm.c | 191 +-
tools/libxl/libxl_dom.c | 965 ++++-
tools/libxl/libxl_event.c | 174 +-
tools/libxl/libxl_exec.c | 55 +-
tools/libxl/libxl_freebsd.c | 133 +
tools/libxl/libxl_genid.c | 117 +
tools/libxl/libxl_internal.c | 191 +-
tools/libxl/libxl_internal.h | 757 +++-
tools/libxl/libxl_json.c | 467 ++-
tools/libxl/libxl_json.h | 3 +-
tools/libxl/libxl_netbuffer.c | 517 +++
tools/libxl/libxl_nocpuid.c | 18 +
tools/libxl/libxl_nonetbuffer.c | 54 +
tools/libxl/libxl_numa.c | 5 +
tools/libxl/libxl_osdeps.h | 7 +
tools/libxl/libxl_paths.c | 7 +-
tools/libxl/libxl_pci.c | 293 +-
tools/libxl/libxl_psr.c | 217 +
tools/libxl/libxl_qmp.c | 11 +-
tools/libxl/libxl_remus_device.c | 327 ++
tools/libxl/libxl_remus_disk_drbd.c | 258 ++
tools/libxl/libxl_save_callout.c | 16 +-
tools/libxl/libxl_save_helper.c | 109 +-
tools/libxl/libxl_save_msgs_gen.pl | 13 +-
tools/libxl/libxl_types.idl | 148 +-
tools/libxl/libxl_types_internal.idl | 9 +-
tools/libxl/libxl_utils.c | 100 +-
tools/libxl/libxl_utils.h | 32 +
tools/libxl/libxl_uuid.c | 64 +-
tools/libxl/libxl_uuid.h | 29 +-
tools/libxl/libxlu_cfg_y.c | 538 +--
tools/libxl/libxlu_cfg_y.h | 14 +-
tools/libxl/libxlu_disk_l.c | 707 ++--
tools/libxl/libxlu_disk_l.h | 2 +-
tools/libxl/libxlu_disk_l.l | 3 +
tools/libxl/libxlu_pci.c | 2 +
tools/libxl/xen-init-dom0.c | 120 +
tools/libxl/xl.c | 41 +-
tools/libxl/xl.h | 23 +-
tools/libxl/xl_cmdimpl.c | 1526 +++++--
tools/libxl/xl_cmdtable.c | 54 +-
tools/libxl/xl_sxp.c | 13 +-
tools/memshr/Makefile | 1 -
tools/misc/Makefile | 15 +-
tools/misc/mkdeb | 31 +-
tools/misc/mkrpm | 76 +
tools/misc/mktarball | 38 +
tools/misc/nsplitd/Makefile | 25 -
tools/misc/nsplitd/nsplitd.c | 686 ---
tools/misc/sxp-pretty | 37 -
tools/misc/xen-hptool.c | 24 +-
tools/misc/xen-mfndump.c | 72 +-
tools/misc/xen-python-path | 24 -
tools/misc/xenpm.c | 95 +-
tools/ocaml/Makefile | 7 +-
tools/ocaml/libs/eventchn/xeneventchn.mli | 2 +-
tools/ocaml/libs/xb/Makefile | 1 +
tools/ocaml/libs/xb/xb.ml | 21 +
tools/ocaml/libs/xb/xb.mli | 4 +-
tools/ocaml/libs/xb/xs_ring.ml | 28 +
tools/ocaml/libs/xb/xs_ring_stubs.c | 118 +-
tools/ocaml/libs/xc/Makefile | 1 +
tools/ocaml/libs/xc/xenctrl_stubs.c | 8 +-
tools/ocaml/libs/xentoollog/Makefile | 3 +-
tools/ocaml/libs/xentoollog/genlevels.py | 2 +-
tools/ocaml/libs/xl/Makefile | 1 +
tools/ocaml/libs/xl/genwrap.py | 1 +
tools/ocaml/libs/xl/xenlight_stubs.c | 25 +
tools/ocaml/test/Makefile | 1 +
tools/ocaml/xenstored/Makefile | 24 +-
tools/ocaml/xenstored/connection.ml | 20 +-
tools/ocaml/xenstored/connections.ml | 61 +-
tools/ocaml/xenstored/domain.ml | 12 +-
tools/ocaml/xenstored/logging.ml | 11 +-
tools/ocaml/xenstored/oxenstored.conf | 3 +
tools/ocaml/xenstored/parse_arg.ml | 8 +-
tools/ocaml/xenstored/process.ml | 14 +-
tools/ocaml/xenstored/quota.ml | 5 +
tools/ocaml/xenstored/select.ml | 77 +
tools/ocaml/xenstored/select.mli | 27 +
tools/ocaml/xenstored/select_stubs.c | 80 +
tools/ocaml/xenstored/store.ml | 19 +-
tools/ocaml/xenstored/systemd.ml | 17 +
tools/ocaml/xenstored/systemd.mli | 24 +
tools/ocaml/xenstored/systemd_stubs.c | 152 +
tools/ocaml/xenstored/transaction.ml | 4 +-
tools/ocaml/xenstored/utils.ml | 21 +-
tools/ocaml/xenstored/xenstored.ml | 86 +-
tools/pygrub/Makefile | 12 +-
tools/pygrub/src/GrubConf.py | 10 +-
tools/pygrub/src/pygrub | 102 +-
tools/python/Makefile | 35 +-
tools/python/README.XendConfig | 160 -
tools/python/README.sxpcfg | 114 -
tools/python/logging/logging-0.4.9.2/PKG-INFO | 25 -
tools/python/logging/logging-0.4.9.2/README.txt | 311 --
tools/python/logging/logging-0.4.9.2/default.css | 32 -
.../python/logging/logging-0.4.9.2/liblogging.tex | 1281 ------
.../logging/logging-0.4.9.2/logging/__init__.py | 1225 ------
.../logging/logging-0.4.9.2/logging/config.py | 301 --
.../logging/logging-0.4.9.2/logging/handlers.py | 787 ----
.../logging/logging-0.4.9.2/python_logging.html | 1183 ------
tools/python/logging/logging-0.4.9.2/setup.py | 29 -
tools/python/logging/logging-0.4.9.2/test/app.py | 5 -
.../logging/logging-0.4.9.2/test/critical.ini | 60 -
.../python/logging/logging-0.4.9.2/test/debug.ini | 60 -
.../python/logging/logging-0.4.9.2/test/error.ini | 60 -
.../python/logging/logging-0.4.9.2/test/events.xml | 31 -
.../logging/logging-0.4.9.2/test/log_test.py | 158 -
.../logging/logging-0.4.9.2/test/log_test0.py | 118 -
.../logging/logging-0.4.9.2/test/log_test1.py | 85 -
.../logging/logging-0.4.9.2/test/log_test10.py | 87 -
.../logging/logging-0.4.9.2/test/log_test11.py | 72 -
.../logging/logging-0.4.9.2/test/log_test12.py | 47 -
.../logging/logging-0.4.9.2/test/log_test13.py | 106 -
.../logging/logging-0.4.9.2/test/log_test14.py | 108 -
.../logging/logging-0.4.9.2/test/log_test15.py | 70 -
.../logging/logging-0.4.9.2/test/log_test16.py | 73 -
.../logging/logging-0.4.9.2/test/log_test17.py | 111 -
.../logging/logging-0.4.9.2/test/log_test18.py | 102 -
.../logging/logging-0.4.9.2/test/log_test19.py | 57 -
.../logging/logging-0.4.9.2/test/log_test2.py | 119 -
.../logging/logging-0.4.9.2/test/log_test20.py | 84 -
.../logging/logging-0.4.9.2/test/log_test21.py | 141 -
.../logging/logging-0.4.9.2/test/log_test22.py | 50 -
.../logging/logging-0.4.9.2/test/log_test3.ini | 95 -
.../logging/logging-0.4.9.2/test/log_test3.py | 70 -
.../logging/logging-0.4.9.2/test/log_test4.py | 168 -
.../logging/logging-0.4.9.2/test/log_test5.py | 44 -
.../logging/logging-0.4.9.2/test/log_test6.py | 47 -
.../logging/logging-0.4.9.2/test/log_test7.py | 48 -
.../logging/logging-0.4.9.2/test/log_test8.py | 69 -
.../logging/logging-0.4.9.2/test/log_test9.py | 71 -
.../logging/logging-0.4.9.2/test/logconf.ini | 180 -
.../python/logging/logging-0.4.9.2/test/logconf.py | 1738 --------
.../logging/logging-0.4.9.2/test/logging.dtd | 19 -
.../logging/logging-0.4.9.2/test/logging.xml | 5 -
.../logging/logging-0.4.9.2/test/logrecv.ini | 36 -
.../python/logging/logging-0.4.9.2/test/logrecv.py | 443 --
tools/python/logging/logging-0.4.9.2/test/myapp.py | 13 -
.../logging/logging-0.4.9.2/test/mymodule.py | 8 -
.../python/logging/logging-0.4.9.2/test/stderr.exp | 566 ---
.../python/logging/logging-0.4.9.2/test/stdout.exp | 24 -
tools/python/logging/logging-0.4.9.2/test/warn.ini | 60 -
tools/python/logging/setup.py | 11 -
tools/python/ptsname/ptsname.c | 44 -
tools/python/scripts/README | 49 -
tools/python/scripts/README.lifecycle | 136 -
tools/python/scripts/test_hvm_create.py | 178 -
tools/python/scripts/test_vm_create.py | 211 -
tools/python/scripts/xapi.domcfg.py | 37 -
tools/python/scripts/xapi.py | 854 ----
tools/python/scripts/xapi.vbdcfg.py | 12 -
tools/python/scripts/xapi.vdicfg.py | 6 -
tools/python/scripts/xapi.vifcfg.py | 10 -
tools/python/scripts/xapi.vtpmcfg.py | 3 -
tools/python/setup.py | 107 +-
tools/python/xen/lowlevel/checkpoint/checkpoint.c | 371 --
tools/python/xen/lowlevel/checkpoint/checkpoint.h | 61 -
.../python/xen/lowlevel/checkpoint/libcheckpoint.c | 847 ----
tools/python/xen/lowlevel/flask/flask.c | 292 --
tools/python/xen/lowlevel/netlink/libnetlink.c | 585 ---
tools/python/xen/lowlevel/netlink/libnetlink.h | 58 -
tools/python/xen/lowlevel/netlink/netlink.c | 215 -
tools/python/xen/lowlevel/process/process.c | 164 -
tools/python/xen/lowlevel/scf/scf.c | 156 -
tools/python/xen/lowlevel/xc/xc.c | 63 +-
tools/python/xen/remus/__init__.py | 0
tools/python/xen/remus/blkdev.py | 31 -
tools/python/xen/remus/device.py | 397 --
tools/python/xen/remus/image.py | 227 -
tools/python/xen/remus/netlink.py | 318 --
tools/python/xen/remus/profile.py | 56 -
tools/python/xen/remus/qdisc.py | 189 -
tools/python/xen/remus/save.py | 184 -
tools/python/xen/remus/tapdisk.py | 4 -
tools/python/xen/remus/util.py | 82 -
tools/python/xen/remus/vbd.py | 9 -
tools/python/xen/remus/vdi.py | 121 -
tools/python/xen/remus/vif.py | 18 -
tools/python/xen/remus/vm.py | 166 -
tools/python/xen/util/Brctl.py | 186 -
tools/python/xen/util/SSHTransport.py | 102 -
tools/python/xen/util/__init__.py | 1 -
tools/python/xen/util/acmpolicy.py | 1622 -------
tools/python/xen/util/asserts.py | 27 -
tools/python/xen/util/auxbin.py | 49 -
tools/python/xen/util/blkif.py | 107 -
tools/python/xen/util/bootloader.py | 626 ---
tools/python/xen/util/bugtool.py | 232 -
tools/python/xen/util/diagnose.py | 185 -
tools/python/xen/util/dictio.py | 50 -
tools/python/xen/util/fileuri.py | 156 -
tools/python/xen/util/ip.py | 121 -
tools/python/xen/util/mac.py | 11 -
tools/python/xen/util/mkdir.py | 44 -
tools/python/xen/util/oshelp.py | 33 -
tools/python/xen/util/pci.py | 1414 -------
tools/python/xen/util/rwlock.py | 137 -
tools/python/xen/util/sxputils.py | 64 -
tools/python/xen/util/utils.py | 78 -
tools/python/xen/util/vscsi_util.py | 303 --
tools/python/xen/util/vusb_util.py | 338 --
tools/python/xen/util/xmlrpcclient.py | 129 -
tools/python/xen/util/xmlrpclib2.py | 220 -
tools/python/xen/util/xpopen.py | 182 -
tools/python/xen/util/xsconstants.py | 115 -
tools/python/xen/util/xsm/__init__.py | 2 -
tools/python/xen/util/xsm/acm/__init__.py | 1 -
tools/python/xen/util/xsm/acm/acm.py | 1627 -------
tools/python/xen/util/xsm/dummy/__init__.py | 1 -
tools/python/xen/util/xsm/dummy/dummy.py | 136 -
tools/python/xen/util/xsm/flask/__init__.py | 1 -
tools/python/xen/util/xsm/flask/flask.py | 65 -
tools/python/xen/util/xsm/xsm.py | 20 -
tools/python/xen/util/xsm/xsm_core.py | 7 -
tools/python/xen/util/xspolicy.py | 66 -
tools/python/xen/web/SrvBase.py | 98 -
tools/python/xen/web/SrvDir.py | 126 -
tools/python/xen/web/__init__.py | 17 -
tools/python/xen/web/connection.py | 333 --
tools/python/xen/web/http.py | 518 ---
tools/python/xen/web/httpserver.py | 367 --
tools/python/xen/web/protocol.py | 40 -
tools/python/xen/web/resource.py | 108 -
tools/python/xen/web/static.py | 61 -
tools/python/xen/web/tcp.py | 212 -
tools/python/xen/web/unix.py | 69 -
tools/python/xen/xend/Args.py | 166 -
tools/python/xen/xend/MemoryPool.py | 118 -
tools/python/xen/xend/PrettyPrint.py | 323 --
tools/python/xen/xend/Vifctl.py | 35 -
tools/python/xen/xend/XendAPI.py | 2812 -------------
tools/python/xen/xend/XendAPIConstants.py | 82 -
tools/python/xen/xend/XendAPIStore.py | 83 -
tools/python/xen/xend/XendAPIVersion.py | 22 -
tools/python/xen/xend/XendAuthSessions.py | 131 -
tools/python/xen/xend/XendBase.py | 125 -
tools/python/xen/xend/XendBootloader.py | 230 -
tools/python/xen/xend/XendCPUPool.py | 910 ----
tools/python/xen/xend/XendCheckpoint.py | 425 --
tools/python/xen/xend/XendClient.py | 39 -
tools/python/xen/xend/XendConfig.py | 2265 ----------
tools/python/xen/xend/XendConstants.py | 164 -
tools/python/xen/xend/XendDPCI.py | 165 -
tools/python/xen/xend/XendDSCSI.py | 299 --
tools/python/xen/xend/XendDevices.py | 85 -
tools/python/xen/xend/XendDmesg.py | 41 -
tools/python/xen/xend/XendDomain.py | 1958 ---------
tools/python/xen/xend/XendDomainInfo.py | 4429 --------------------
tools/python/xen/xend/XendError.py | 252 --
tools/python/xen/xend/XendLocalStorageRepo.py | 92 -
tools/python/xen/xend/XendLogging.py | 149 -
tools/python/xen/xend/XendMonitor.py | 340 --
tools/python/xen/xend/XendNetwork.py | 238 --
tools/python/xen/xend/XendNode.py | 1183 ------
tools/python/xen/xend/XendOptions.py | 567 ---
tools/python/xen/xend/XendPBD.py | 99 -
tools/python/xen/xend/XendPIF.py | 390 --
tools/python/xen/xend/XendPIFMetrics.py | 59 -
tools/python/xen/xend/XendPPCI.py | 160 -
tools/python/xen/xend/XendPSCSI.py | 211 -
tools/python/xen/xend/XendProtocol.py | 225 -
tools/python/xen/xend/XendQCoWStorageRepo.py | 339 --
tools/python/xen/xend/XendSXPDev.py | 11 -
tools/python/xen/xend/XendStateStore.py | 234 --
tools/python/xen/xend/XendStorageRepository.py | 117 -
tools/python/xen/xend/XendTask.py | 224 -
tools/python/xen/xend/XendTaskManager.py | 110 -
tools/python/xen/xend/XendVDI.py | 213 -
tools/python/xen/xend/XendVMMetrics.py | 146 -
tools/python/xen/xend/XendVnet.py | 181 -
tools/python/xen/xend/XendXSPolicy.py | 305 --
tools/python/xen/xend/XendXSPolicyAdmin.py | 386 --
tools/python/xen/xend/__init__.py | 1 -
tools/python/xen/xend/arch.py | 30 -
tools/python/xen/xend/balloon.py | 244 --
tools/python/xen/xend/encode.py | 180 -
tools/python/xen/xend/image.py | 1103 -----
tools/python/xen/xend/osdep.py | 266 --
tools/python/xen/xend/server/BlktapController.py | 313 --
tools/python/xen/xend/server/ConsoleController.py | 38 -
tools/python/xen/xend/server/DevConstants.py | 49 -
tools/python/xen/xend/server/DevController.py | 677 ---
tools/python/xen/xend/server/SSLXMLRPCServer.py | 103 -
tools/python/xen/xend/server/SrvDaemon.py | 420 --
tools/python/xen/xend/server/SrvDmesg.py | 52 -
tools/python/xen/xend/server/SrvDomain.py | 329 --
tools/python/xen/xend/server/SrvDomainDir.py | 222 -
tools/python/xen/xend/server/SrvNode.py | 64 -
tools/python/xen/xend/server/SrvRoot.py | 43 -
tools/python/xen/xend/server/SrvServer.py | 261 --
tools/python/xen/xend/server/SrvVnetDir.py | 128 -
tools/python/xen/xend/server/SrvXendLog.py | 37 -
tools/python/xen/xend/server/XMLRPCServer.py | 273 --
tools/python/xen/xend/server/__init__.py | 1 -
tools/python/xen/xend/server/blkif.py | 221 -
tools/python/xen/xend/server/iopif.py | 102 -
tools/python/xen/xend/server/irqif.py | 95 -
tools/python/xen/xend/server/netif.py | 218 -
tools/python/xen/xend/server/netif2.py | 163 -
tools/python/xen/xend/server/params.py | 46 -
tools/python/xen/xend/server/pciif.py | 596 ---
tools/python/xen/xend/server/pciquirk.py | 149 -
tools/python/xen/xend/server/relocate.py | 173 -
tools/python/xen/xend/server/tests/__init__.py | 1 -
.../xen/xend/server/tests/test_controllers.py | 81 -
tools/python/xen/xend/server/udevevent.py | 92 -
tools/python/xen/xend/server/vfbif.py | 91 -
tools/python/xen/xend/server/vscsiif.py | 246 --
tools/python/xen/xend/server/vusbif.py | 126 -
tools/python/xen/xend/sxp.py | 764 ----
tools/python/xen/xend/tests/__init__.py | 1 -
tools/python/xen/xend/tests/test_XendConfig.py | 42 -
tools/python/xen/xend/tests/test_sxp.py | 39 -
tools/python/xen/xend/tests/test_uuid.py | 30 -
tools/python/xen/xend/tests/xend-config.sxp | 131 -
tools/python/xen/xend/uuid.py | 69 -
tools/python/xen/xend/xend | 101 -
tools/python/xen/xend/xenstore/__init__.py | 16 -
tools/python/xen/xend/xenstore/tests/__init__.py | 2 -
tools/python/xen/xend/xenstore/tests/stress_xs.py | 121 -
tools/python/xen/xend/xenstore/xstransact.py | 368 --
tools/python/xen/xend/xenstore/xsutil.py | 32 -
tools/python/xen/xend/xenstore/xswatch.py | 80 -
tools/python/xen/xm/XenAPI.py | 206 -
tools/python/xen/xm/__init__.py | 0
tools/python/xen/xm/addlabel.py | 274 --
tools/python/xen/xm/console.py | 88 -
tools/python/xen/xm/cpupool-create.py | 51 -
tools/python/xen/xm/cpupool-new.py | 50 -
tools/python/xen/xm/cpupool.py | 236 --
tools/python/xen/xm/create.dtd | 154 -
tools/python/xen/xm/create.py | 1524 -------
tools/python/xen/xm/dry-run.py | 161 -
tools/python/xen/xm/dumppolicy.py | 69 -
tools/python/xen/xm/getenforce.py | 66 -
tools/python/xen/xm/getlabel.py | 157 -
tools/python/xen/xm/getpolicy.py | 135 -
tools/python/xen/xm/help.py | 100 -
tools/python/xen/xm/labels.py | 89 -
tools/python/xen/xm/main.py | 4030 ------------------
tools/python/xen/xm/migrate.py | 87 -
tools/python/xen/xm/new.py | 79 -
tools/python/xen/xm/opts.py | 627 ---
tools/python/xen/xm/resetpolicy.py | 106 -
tools/python/xen/xm/resources.py | 65 -
tools/python/xen/xm/rmlabel.py | 216 -
tools/python/xen/xm/setenforce.py | 74 -
tools/python/xen/xm/setpolicy.py | 181 -
tools/python/xen/xm/shutdown.py | 164 -
tools/python/xen/xm/tests/__init__.py | 2 -
tools/python/xen/xm/tests/test_create.py | 206 -
tools/python/xen/xm/xenapi_create.py | 1128 -----
tools/python/xen/xm/xm | 20 -
tools/remus/Makefile | 15 -
tools/remus/README | 4 -
tools/remus/remus | 230 -
tools/tests/mce-test/tools/Makefile | 8 +-
tools/tests/mce-test/tools/xen-mceinj.c | 277 +-
tools/tests/utests/run_all_tests.py | 10 +-
tools/tests/utests/ut_util/ut_fileuri.py | 209 -
tools/tests/utests/ut_xend/ut_XendConfig.py | 117 -
tools/tests/utests/ut_xend/ut_image.py | 147 -
tools/tests/vhpet/.gitignore | 4 +
tools/tests/vhpet/Makefile | 36 +
tools/tests/vhpet/emul.h | 416 ++
tools/tests/vhpet/main.c | 776 ++++
tools/tests/x86_emulator/test_x86_emulator.c | 8 +-
tools/tests/x86_emulator/x86_emulate.c | 2 +
tools/tests/xen-access/xen-access.c | 136 +-
tools/xcutils/Makefile | 17 +-
tools/xcutils/xc_restore.c | 72 -
tools/xcutils/xc_save.c | 227 -
tools/xenmon/Makefile | 8 +-
tools/xenmon/xenbaked.c | 2 +-
tools/xenpaging/Makefile | 10 +-
tools/xenpaging/xenpaging.c | 2 +-
tools/xenpmd/Makefile | 4 +-
tools/xenstat/libxenstat/Makefile | 11 +-
tools/xenstat/libxenstat/src/xenstat.c | 2 +-
tools/xenstat/libxenstat/src/xenstat_freebsd.c | 47 +
tools/xenstat/libxenstat/src/xenstat_linux.c | 42 +-
tools/xenstat/xentop/Makefile | 9 +-
tools/xenstat/xentop/xentop.1 | 4 +
tools/xenstat/xentop/xentop.c | 74 +-
tools/xenstore/Makefile | 55 +-
tools/xenstore/{ => include}/compat/xs.h | 0
tools/xenstore/{ => include}/compat/xs_lib.h | 0
tools/xenstore/{ => include}/xenstore.h | 0
tools/xenstore/{ => include}/xenstore_lib.h | 0
tools/xenstore/init-xenstore-domain.c | 14 +-
tools/xenstore/xenstore_client.c | 21 +-
tools/xenstore/xenstored_core.c | 109 +-
tools/xenstore/xenstored_core.h | 3 +
tools/xenstore/xenstored_domain.c | 3 +-
tools/xenstore/xenstored_linux.c | 73 -
tools/xenstore/xenstored_minios.c | 2 +-
tools/xenstore/xenstored_netbsd.c | 73 -
tools/xenstore/xenstored_osdep.h | 20 +
tools/xenstore/xenstored_posix.c | 54 +
tools/xenstore/xs.c | 5 +-
tools/xenstore/xs_lib.c | 7 +-
tools/xenstore/xs_tdb_dump.c | 1 +
tools/xentrace/Makefile | 6 +-
tools/xentrace/formats | 18 +
tools/xentrace/xenctx.c | 594 ++-
tools/xentrace/xentrace.8 | 4 +-
tools/xm-test/COPYING | 340 --
tools/xm-test/ChangeLog | 11 -
tools/xm-test/Makefile.am | 18 -
tools/xm-test/README | 310 --
tools/xm-test/TODO | 3 -
tools/xm-test/Writing_Tests_HOWTO | 136 -
tools/xm-test/autogen | 9 -
tools/xm-test/configure.ac | 155 -
tools/xm-test/grouptest/cpupool | 1 -
tools/xm-test/grouptest/create | 1 -
tools/xm-test/grouptest/default | 30 -
tools/xm-test/grouptest/medium | 24 -
tools/xm-test/grouptest/quick | 4 -
tools/xm-test/grouptest/xapi | 1 -
tools/xm-test/lib/XmTestLib/Console.py | 302 --
tools/xm-test/lib/XmTestLib/DomainTracking.py | 61 -
tools/xm-test/lib/XmTestLib/NetConfig.py | 268 --
tools/xm-test/lib/XmTestLib/Test.py | 203 -
tools/xm-test/lib/XmTestLib/XenAPIDomain.py | 183 -
tools/xm-test/lib/XmTestLib/XenDevice.py | 275 --
tools/xm-test/lib/XmTestLib/XenDomain.py | 385 --
tools/xm-test/lib/XmTestLib/XenMemory.py | 68 -
tools/xm-test/lib/XmTestLib/Xm.py | 245 --
tools/xm-test/lib/XmTestLib/__init__.py | 27 -
tools/xm-test/lib/XmTestLib/arch.py | 126 -
tools/xm-test/lib/XmTestLib/block_utils.py | 53 -
tools/xm-test/lib/XmTestLib/config.py.in | 7 -
tools/xm-test/lib/XmTestLib/network_utils.py | 60 -
tools/xm-test/lib/XmTestLib/xapi.py | 54 -
tools/xm-test/lib/XmTestReport/OSReport.py | 248 --
tools/xm-test/lib/XmTestReport/ProgReport.py | 119 -
tools/xm-test/lib/XmTestReport/Report.py | 156 -
tools/xm-test/lib/XmTestReport/ResultReport.py | 157 -
tools/xm-test/lib/XmTestReport/arch.py | 46 -
tools/xm-test/lib/XmTestReport/utils.py | 31 -
tools/xm-test/lib/XmTestReport/xmtest.py.in | 15 -
tools/xm-test/mergereport | 25 -
tools/xm-test/mkreport | 71 -
tools/xm-test/ramdisk/Makefile.am | 126 -
.../ramdisk/README-XenSource-initrd-0.7-img | 42 -
.../ramdisk/README-XenSource-initrd-0.8-img | 42 -
.../ramdisk/README-XenSource-initrd-1.0-img | 46 -
.../ramdisk/README-XenSource-initrd-1.1-img | 45 -
tools/xm-test/ramdisk/bin/create_disk_image | 384 --
tools/xm-test/ramdisk/configs/buildroot-i386 | 346 --
tools/xm-test/ramdisk/configs/busybox | 465 --
tools/xm-test/ramdisk/configs/uClibc | 172 -
tools/xm-test/ramdisk/make-release.sh | 44 -
.../patches/buildroot/add_xvd_devices.patch | 13 -
.../xm-test/ramdisk/patches/buildroot/hping.patch | 67 -
tools/xm-test/ramdisk/skel/.profile | 3 -
tools/xm-test/ramdisk/skel/etc/init.d/rcS | 19 -
tools/xm-test/ramdisk/skel/etc/inittab | 5 -
tools/xm-test/ramdisk/skel/root/.profile | 3 -
tools/xm-test/runtest.sh | 337 --
tools/xm-test/tests/Makefile.am | 43 -
tools/xm-test/tests/Makefile.am.template | 21 -
tools/xm-test/tests/_sanity/01_domu_proc.py | 32 -
tools/xm-test/tests/_sanity/Makefile.am | 21 -
.../block-create/01_block_attach_device_pos.py | 49 -
.../02_block_attach_file_device_pos.py | 49 -
.../04_block_attach_device_repeatedly_pos.py | 46 -
...ock_attach_and_dettach_device_repeatedly_pos.py | 49 -
.../block-create/06_block_attach_baddomain_neg.py | 18 -
.../block-create/07_block_attach_baddevice_neg.py | 53 -
.../08_block_attach_bad_filedevice_neg.py | 52 -
...ock_attach_and_dettach_device_check_data_pos.py | 66 -
.../10_block_attach_dettach_multiple_devices.py | 100 -
.../block-create/11_block_attach_shared_dom0.py | 38 -
.../block-create/12_block_attach_shared_domU.py | 30 -
tools/xm-test/tests/block-create/Makefile.am | 29 -
.../block-destroy/01_block-destroy_btblock_pos.py | 44 -
.../block-destroy/02_block-destroy_rtblock_pos.py | 41 -
.../block-destroy/03_block-destroy_nonexist_neg.py | 17 -
.../04_block-destroy_nonattached_neg.py | 33 -
.../block-destroy/05_block-destroy_byname_pos.py | 43 -
.../06_block-destroy_check_list_pos.py | 42 -
tools/xm-test/tests/block-destroy/Makefile.am | 26 -
.../block-integrity/01_block_device_read_verify.py | 62 -
.../02_block_device_write_verify.py | 63 -
tools/xm-test/tests/block-integrity/Makefile.am | 22 -
.../xm-test/tests/block-list/01_block-list_pos.py | 42 -
.../tests/block-list/02_block-list_attachbd_pos.py | 46 -
.../block-list/03_block-list_anotherbd_pos.py | 54 -
.../tests/block-list/04_block-list_nodb_pos.py | 28 -
.../tests/block-list/05_block-list_nonexist_neg.py | 18 -
.../block-list/06_block-list_checkremove_pos.py | 61 -
tools/xm-test/tests/block-list/Makefile.am | 26 -
.../xm-test/tests/console/01_console_badopt_neg.py | 21 -
.../xm-test/tests/console/02_console_baddom_neg.py | 27 -
tools/xm-test/tests/console/Makefile.am | 22 -
.../xm-test/tests/cpupool/01_cpupool_basic_pos.py | 72 -
.../xm-test/tests/cpupool/02_cpupool_manage_pos.py | 152 -
tools/xm-test/tests/cpupool/03_cpupool_domain.py | 126 -
tools/xm-test/tests/cpupool/04_cpupool_migrate.py | 84 -
tools/xm-test/tests/cpupool/Makefile.am | 22 -
tools/xm-test/tests/cpupool/pool1.cfg | 1 -
tools/xm-test/tests/cpupool/pools.py | 78 -
tools/xm-test/tests/create/01_create_basic_pos.py | 49 -
tools/xm-test/tests/create/02_create_noparm_neg.py | 17 -
.../xm-test/tests/create/03_create_badparm_neg.py | 19 -
.../tests/create/04_create_conflictname_neg.py | 41 -
tools/xm-test/tests/create/06_create_mem_neg.py | 53 -
tools/xm-test/tests/create/07_create_mem64_pos.py | 49 -
tools/xm-test/tests/create/08_create_mem128_pos.py | 49 -
tools/xm-test/tests/create/09_create_mem256_pos.py | 49 -
.../xm-test/tests/create/10_create_fastdestroy.py | 43 -
.../tests/create/11_create_concurrent_pos.py | 78 -
.../create/12_create_concurrent_stress_pos.py | 59 -
.../xm-test/tests/create/13_create_multinic_pos.py | 27 -
.../tests/create/14_create_blockroot_pos.py | 44 -
.../xm-test/tests/create/15_create_smallmem_pos.py | 27 -
.../xm-test/tests/create/16_create_smallmem_neg.py | 30 -
tools/xm-test/tests/create/Makefile.am | 33 -
.../xm-test/tests/destroy/01_destroy_basic_pos.py | 40 -
.../xm-test/tests/destroy/02_destroy_noparm_neg.py | 16 -
.../tests/destroy/03_destroy_nonexist_neg.py | 16 -
.../tests/destroy/04_destroy_badparm_neg.py | 16 -
tools/xm-test/tests/destroy/05_destroy_byid_pos.py | 33 -
tools/xm-test/tests/destroy/06_destroy_dom0_neg.py | 14 -
.../xm-test/tests/destroy/07_destroy_stale_pos.py | 133 -
tools/xm-test/tests/destroy/Makefile.am | 27 -
tools/xm-test/tests/dmesg/01_dmesg_basic_pos.py | 15 -
tools/xm-test/tests/dmesg/02_dmesg_basic_neg.py | 17 -
tools/xm-test/tests/dmesg/Makefile.am | 21 -
tools/xm-test/tests/domid/01_domid_basic_pos.py | 16 -
tools/xm-test/tests/domid/02_domid_basic_neg.py | 15 -
tools/xm-test/tests/domid/Makefile.am | 21 -
.../xm-test/tests/domname/01_domname_basic_pos.py | 17 -
.../xm-test/tests/domname/02_domname_basic_neg.py | 15 -
tools/xm-test/tests/domname/Makefile.am | 21 -
.../01_enforce_dom0_cpus_basic_pos.py | 126 -
tools/xm-test/tests/enforce_dom0_cpus/Makefile.am | 21 -
tools/xm-test/tests/help/01_help_basic_pos.py | 14 -
tools/xm-test/tests/help/02_help_basic_neg.py | 14 -
tools/xm-test/tests/help/03_help_badparm_neg.py | 14 -
tools/xm-test/tests/help/04_help_long_pos.py | 16 -
tools/xm-test/tests/help/05_help_nonroot_pos.py | 17 -
tools/xm-test/tests/help/06_help_allcmds.py | 44 -
tools/xm-test/tests/help/Makefile.am | 26 -
tools/xm-test/tests/info/01_info_basic_pos.py | 11 -
.../xm-test/tests/info/02_info_compiledata_pos.py | 42 -
tools/xm-test/tests/info/Makefile.am | 22 -
tools/xm-test/tests/list/01_list_basic_pos.py | 14 -
tools/xm-test/tests/list/02_list_badparm_neg.py | 16 -
tools/xm-test/tests/list/03_list_nonexist_neg.py | 17 -
tools/xm-test/tests/list/04_list_goodparm_pos.py | 28 -
tools/xm-test/tests/list/05_list_long_pos.py | 22 -
tools/xm-test/tests/list/06_list_nonroot.py | 15 -
tools/xm-test/tests/list/Makefile.am | 27 -
.../xm-test/tests/memmax/01_memmax_badparm_neg.py | 29 -
tools/xm-test/tests/memmax/Makefile.am | 21 -
tools/xm-test/tests/memset/01_memset_basic_pos.py | 82 -
.../xm-test/tests/memset/02_memset_badparm_neg.py | 56 -
tools/xm-test/tests/memset/03_memset_random_pos.py | 64 -
.../xm-test/tests/memset/04_memset_smallmem_pos.py | 55 -
tools/xm-test/tests/memset/Makefile.am | 24 -
.../tests/migrate/01_migrate_localhost_pos.py | 86 -
tools/xm-test/tests/migrate/Makefile.am | 20 -
.../tests/network-attach/01_network_attach_pos.py | 43 -
.../network-attach/02_network_attach_detach_pos.py | 49 -
.../03_network_attach_detach_multiple_pos.py | 51 -
.../04_network_attach_baddomain_neg.py | 15 -
tools/xm-test/tests/network-attach/Makefile.am | 24 -
.../tests/network/02_network_local_ping_pos.py | 71 -
.../tests/network/03_network_local_tcp_pos.py | 75 -
.../tests/network/04_network_local_udp_pos.py | 76 -
.../tests/network/05_network_dom0_ping_pos.py | 54 -
.../tests/network/06_network_dom0_tcp_pos.py | 57 -
.../tests/network/07_network_dom0_udp_pos.py | 56 -
.../tests/network/11_network_domU_ping_pos.py | 62 -
.../tests/network/12_network_domU_tcp_pos.py | 64 -
.../tests/network/13_network_domU_udp_pos.py | 76 -
tools/xm-test/tests/network/Makefile.am | 34 -
tools/xm-test/tests/pause/01_pause_basic_pos.py | 63 -
tools/xm-test/tests/pause/02_pause_badopt_neg.py | 32 -
tools/xm-test/tests/pause/03_pause_badname_neg.py | 18 -
tools/xm-test/tests/pause/04_pause_badid_neg.py | 18 -
tools/xm-test/tests/pause/Makefile.am | 22 -
tools/xm-test/tests/reboot/01_reboot_basic_pos.py | 52 -
tools/xm-test/tests/reboot/02_reboot_badopt_neg.py | 32 -
.../xm-test/tests/reboot/03_reboot_badname_neg.py | 18 -
tools/xm-test/tests/reboot/Makefile.am | 23 -
.../xm-test/tests/restore/01_restore_basic_pos.py | 82 -
.../tests/restore/02_restore_badparm_neg.py | 28 -
.../tests/restore/03_restore_badfilename_neg.py | 28 -
.../tests/restore/04_restore_withdevices_pos.py | 130 -
tools/xm-test/tests/restore/Makefile.am | 24 -
tools/xm-test/tests/save/01_save_basic_pos.py | 37 -
tools/xm-test/tests/save/02_save_badparm_neg.py | 28 -
tools/xm-test/tests/save/03_save_bogusfile_neg.py | 39 -
tools/xm-test/tests/save/Makefile.am | 24 -
.../sched-credit/01_sched_credit_weight_cap_pos.py | 72 -
tools/xm-test/tests/sched-credit/Makefile.am | 20 -
.../xm-test/tests/sedf/01_sedf_period_slice_pos.py | 62 -
.../xm-test/tests/sedf/02_sedf_period_lower_neg.py | 44 -
.../xm-test/tests/sedf/03_sedf_slice_lower_neg.py | 40 -
.../xm-test/tests/sedf/04_sedf_slice_upper_neg.py | 48 -
tools/xm-test/tests/sedf/05_sedf_extratime_pos.py | 63 -
.../tests/sedf/06_sedf_extratime_disable_neg.py | 71 -
tools/xm-test/tests/sedf/Makefile.am | 25 -
.../tests/shutdown/01_shutdown_basic_pos.py | 54 -
.../tests/shutdown/02_shutdown_badparm_neg.py | 39 -
.../tests/shutdown/03_shutdown_nonexist_neg.py | 22 -
tools/xm-test/tests/shutdown/Makefile.am | 21 -
tools/xm-test/tests/sysrq/01_sysrq_basic_neg.py | 20 -
tools/xm-test/tests/sysrq/02_sysrq_sync_pos.py | 52 -
.../xm-test/tests/sysrq/03_sysrq_withreboot_pos.py | 40 -
tools/xm-test/tests/sysrq/Makefile.am | 23 -
.../xm-test/tests/unpause/01_unpause_basic_pos.py | 76 -
tools/xm-test/tests/unpause/Makefile.am | 20 -
.../vcpu-disable/01_vcpu-disable_basic_pos.py | 82 -
tools/xm-test/tests/vcpu-disable/Makefile.am | 21 -
.../tests/vcpu-pin/01_vcpu-pin_basic_pos.py | 50 -
tools/xm-test/tests/vcpu-pin/Makefile.am | 21 -
tools/xm-test/tests/xapi/01_xapi-vm_basic.py | 61 -
tools/xm-test/tests/xapi/02_xapi-vbd_basic.py | 122 -
tools/xm-test/tests/xapi/03_xapi-network_pos.py | 123 -
.../tests/xapi/04_xapi-data_uri_handling.py | 65 -
tools/xm-test/tests/xapi/20_xapi-cpu_pool_basic.py | 157 -
tools/xm-test/tests/xapi/Makefile.am | 23 -
xen/Makefile | 35 +-
xen/Rules.mk | 12 +-
xen/arch/arm/Makefile | 14 +-
xen/arch/arm/README.LinuxPrimitives | 163 +
xen/arch/arm/Rules.mk | 34 +-
xen/arch/arm/arm32/Makefile | 2 +-
xen/arch/arm/arm32/asm-offsets.c | 11 +-
xen/arch/arm/arm32/debug-exynos4210.inc | 32 -
xen/arch/arm/arm32/head.S | 196 +-
xen/arch/arm/arm32/lib/Makefile | 3 +-
xen/arch/arm/arm32/lib/assembler.h | 8 +-
xen/arch/arm/arm32/lib/bitops.h | 22 +-
xen/arch/arm/arm32/lib/changebit.S | 4 +-
xen/arch/arm/arm32/lib/clearbit.S | 4 +-
xen/arch/arm/arm32/lib/copy_template.S | 36 +-
xen/arch/arm/arm32/lib/memchr.S | 28 +
xen/arch/arm/arm32/lib/memmove.S | 36 +-
xen/arch/arm/arm32/lib/memset.S | 100 +-
xen/arch/arm/arm32/lib/setbit.S | 4 +-
xen/arch/arm/arm32/lib/strchr.S | 29 +
xen/arch/arm/arm32/lib/strrchr.S | 28 +
xen/arch/arm/arm32/lib/testchangebit.S | 4 +-
xen/arch/arm/arm32/lib/testclearbit.S | 4 +-
xen/arch/arm/arm32/lib/testsetbit.S | 4 +-
xen/arch/arm/arm32/proc-caxx.c | 35 +
xen/arch/arm/arm32/proc-v7.S | 19 +-
xen/arch/arm/arm32/traps.c | 23 +
xen/arch/arm/arm64/Makefile | 1 +
xen/arch/arm/arm64/asm-offsets.c | 11 +-
xen/arch/arm/arm64/cache.S | 52 +
xen/arch/arm/arm64/domain.c | 4 +-
xen/arch/arm/arm64/domctl.c | 7 +-
xen/arch/arm/arm64/head.S | 350 +-
xen/arch/arm/arm64/lib/Makefile | 3 +
xen/arch/arm/arm64/lib/assembler.h | 12 +
xen/arch/arm/arm64/lib/bitops.S | 3 +-
xen/arch/arm/arm64/lib/clear_page.S | 36 +
xen/arch/arm/arm64/lib/memchr.S | 44 +
xen/arch/arm/arm64/lib/memcmp.S | 258 ++
xen/arch/arm/arm64/lib/memcpy.S | 201 +
xen/arch/arm/arm64/lib/memmove.S | 197 +
xen/arch/arm/arm64/lib/memset.S | 216 +
xen/arch/arm/arm64/lib/strchr.S | 41 +
xen/arch/arm/arm64/lib/strcmp.S | 235 ++
xen/arch/arm/arm64/lib/strlen.S | 128 +
xen/arch/arm/arm64/lib/strncmp.S | 311 ++
xen/arch/arm/arm64/lib/strnlen.S | 172 +
xen/arch/arm/arm64/lib/strrchr.S | 42 +
xen/arch/arm/arm64/smpboot.c | 5 +-
xen/arch/arm/arm64/vfp.c | 6 +-
xen/arch/arm/bootfdt.c | 370 ++
xen/arch/arm/decode.c | 2 +-
xen/arch/arm/device.c | 15 +
xen/arch/arm/domain.c | 107 +-
xen/arch/arm/domain_build.c | 520 ++-
xen/arch/arm/domctl.c | 35 +
xen/arch/arm/early_printk.c | 36 +-
xen/arch/arm/efi/Makefile | 3 +
xen/arch/arm/efi/efi-boot.h | 576 +++
xen/arch/arm/efi/runtime.h | 1 +
xen/arch/arm/gic-v2.c | 787 ++++
xen/arch/arm/gic-v3.c | 1299 ++++++
xen/arch/arm/gic.c | 1017 ++---
xen/arch/arm/guestcopy.c | 2 +-
xen/arch/arm/io.c | 59 +-
xen/arch/arm/io.h | 57 -
xen/arch/arm/irq.c | 388 +-
xen/arch/arm/kernel.c | 281 +-
xen/arch/arm/kernel.h | 46 +-
xen/arch/arm/mm.c | 256 +-
xen/arch/arm/p2m.c | 1072 +++--
xen/arch/arm/platform.c | 2 +-
xen/arch/arm/platforms/Makefile | 2 +
xen/arch/arm/platforms/brcm.c | 294 ++
xen/arch/arm/platforms/exynos5.c | 232 +-
xen/arch/arm/platforms/omap5.c | 47 +-
xen/arch/arm/platforms/seattle.c | 60 +
xen/arch/arm/platforms/sunxi.c | 32 +
xen/arch/arm/platforms/vexpress.c | 8 +-
xen/arch/arm/platforms/xgene-storm.c | 124 +-
xen/arch/arm/processor.c | 49 +
xen/arch/arm/psci.c | 108 +-
xen/arch/arm/setup.c | 327 +-
xen/arch/arm/shutdown.c | 27 +-
xen/arch/arm/smc.S | 21 +
xen/arch/arm/smp.c | 13 +-
xen/arch/arm/smpboot.c | 18 +-
xen/arch/arm/time.c | 102 +-
xen/arch/arm/traps.c | 349 +-
xen/arch/arm/vgic-v2.c | 589 +++
xen/arch/arm/vgic-v3.c | 1086 +++++
xen/arch/arm/vgic.c | 735 +---
xen/arch/arm/vpsci.c | 136 +-
xen/arch/arm/vtimer.c | 33 +-
xen/arch/arm/vtimer.h | 2 +-
xen/arch/arm/vuart.c | 30 +-
xen/arch/arm/xen.lds.S | 17 +
xen/arch/x86/Makefile | 2 +
xen/arch/x86/Rules.mk | 1 +
xen/arch/x86/acpi/boot.c | 12 +-
xen/arch/x86/acpi/cpu_idle.c | 120 +-
xen/arch/x86/acpi/cpufreq/cpufreq.c | 4 +-
xen/arch/x86/acpi/cpuidle_menu.c | 21 +-
xen/arch/x86/acpi/suspend.c | 6 +-
xen/arch/x86/alternative.c | 213 +
xen/arch/x86/apic.c | 63 +-
xen/arch/x86/boot/Makefile | 8 +-
xen/arch/x86/boot/build32.mk | 5 +-
xen/arch/x86/boot/cmdline.S | 4 +
xen/arch/x86/boot/head.S | 37 +-
xen/arch/x86/boot/reloc.c | 15 +-
xen/arch/x86/boot/trampoline.S | 5 +-
xen/arch/x86/boot/wakeup.S | 5 +-
xen/arch/x86/boot/x86_64.S | 53 +-
xen/arch/x86/bzimage.c | 4 +-
xen/arch/x86/cpu/amd.c | 199 +-
xen/arch/x86/cpu/common.c | 197 +-
xen/arch/x86/cpu/cpu.h | 1 -
xen/arch/x86/cpu/intel.c | 159 +-
xen/arch/x86/cpu/intel_cacheinfo.c | 49 +-
xen/arch/x86/cpu/mcheck/Makefile | 2 -
xen/arch/x86/cpu/mcheck/amd_f10.c | 147 -
xen/arch/x86/cpu/mcheck/amd_k8.c | 117 -
xen/arch/x86/cpu/mcheck/mcaction.c | 2 +-
xen/arch/x86/cpu/mcheck/mcaction.h | 2 +-
xen/arch/x86/cpu/mcheck/mce-apei.c | 19 +-
xen/arch/x86/cpu/mcheck/mce.c | 30 +-
xen/arch/x86/cpu/mcheck/mce.h | 7 +-
xen/arch/x86/cpu/mcheck/mce_amd.c | 160 +-
xen/arch/x86/cpu/mcheck/mce_amd.h | 3 -
xen/arch/x86/cpu/mcheck/mce_intel.c | 18 +-
xen/arch/x86/cpu/mcheck/mctelem.c | 21 +-
xen/arch/x86/cpu/mcheck/mctelem.h | 2 +-
xen/arch/x86/cpu/mcheck/vmce.c | 20 +-
xen/arch/x86/cpu/mcheck/vmce.h | 5 +-
xen/arch/x86/cpu/mcheck/x86_mca.h | 2 +-
xen/arch/x86/cpu/mtrr/generic.c | 181 +-
xen/arch/x86/cpu/mtrr/main.c | 2 +-
xen/arch/x86/cpu/mtrr/mtrr.h | 18 -
xen/arch/x86/cpu/mwait-idle.c | 276 +-
xen/arch/x86/crash.c | 8 +-
xen/arch/x86/dmi_scan.c | 8 +-
xen/arch/x86/domain.c | 132 +-
xen/arch/x86/domain_build.c | 752 +++-
xen/arch/x86/domain_page.c | 6 +-
xen/arch/x86/domctl.c | 304 +-
xen/arch/x86/e820.c | 8 +-
xen/arch/x86/efi/boot.c | 1723 --------
xen/arch/x86/efi/efi-boot.h | 639 +++
xen/arch/x86/efi/efi.h | 39 -
xen/arch/x86/efi/runtime.c | 547 ---
xen/arch/x86/efi/runtime.h | 5 +
xen/arch/x86/efi/stub.c | 6 +
xen/arch/x86/flushtlb.c | 31 +-
xen/arch/x86/genapic/x2apic.c | 5 +
xen/arch/x86/hpet.c | 2 +-
xen/arch/x86/hvm/emulate.c | 337 +-
xen/arch/x86/hvm/hpet.c | 188 +-
xen/arch/x86/hvm/hvm.c | 2568 +++++++++---
xen/arch/x86/hvm/i8254.c | 20 +-
xen/arch/x86/hvm/intercept.c | 12 +
xen/arch/x86/hvm/io.c | 154 +-
xen/arch/x86/hvm/irq.c | 29 +-
xen/arch/x86/hvm/mtrr.c | 350 +-
xen/arch/x86/hvm/rtc.c | 18 +
xen/arch/x86/hvm/save.c | 6 +
xen/arch/x86/hvm/svm/svm.c | 315 +-
xen/arch/x86/hvm/svm/vpmu.c | 7 +-
xen/arch/x86/hvm/viridian.c | 142 +-
xen/arch/x86/hvm/vlapic.c | 373 +-
xen/arch/x86/hvm/vmsi.c | 43 +-
xen/arch/x86/hvm/vmx/realmode.c | 23 +-
xen/arch/x86/hvm/vmx/vmcs.c | 55 +-
xen/arch/x86/hvm/vmx/vmx.c | 293 +-
xen/arch/x86/hvm/vmx/vpmu_core2.c | 79 +-
xen/arch/x86/hvm/vmx/vvmx.c | 17 +-
xen/arch/x86/hvm/vpic.c | 20 +
xen/arch/x86/hvm/vpmu.c | 36 +-
xen/arch/x86/hvm/vpt.c | 20 +-
xen/arch/x86/i8259.c | 73 +-
xen/arch/x86/io_apic.c | 25 +-
xen/arch/x86/irq.c | 31 +-
xen/arch/x86/microcode_amd.c | 230 +-
xen/arch/x86/mm.c | 279 +-
xen/arch/x86/mm/Makefile | 2 -
xen/arch/x86/mm/guest_walk.c | 53 +-
xen/arch/x86/mm/hap/hap.c | 50 +-
xen/arch/x86/mm/hap/nested_ept.c | 6 +-
xen/arch/x86/mm/hap/nested_hap.c | 21 +-
xen/arch/x86/mm/mem_access.c | 70 -
xen/arch/x86/mm/mem_event.c | 698 ---
xen/arch/x86/mm/mem_paging.c | 2 +-
xen/arch/x86/mm/mem_sharing.c | 30 +-
xen/arch/x86/mm/p2m-ept.c | 642 ++-
xen/arch/x86/mm/p2m-pod.c | 49 +-
xen/arch/x86/mm/p2m-pt.c | 553 ++-
xen/arch/x86/mm/p2m.c | 806 +++-
xen/arch/x86/mm/paging.c | 49 +-
xen/arch/x86/mm/shadow/common.c | 26 +-
xen/arch/x86/mm/shadow/multi.c | 69 +-
xen/arch/x86/mm/shadow/private.h | 6 +-
xen/arch/x86/msi.c | 55 +-
xen/arch/x86/nmi.c | 72 +-
xen/arch/x86/numa.c | 505 +--
xen/arch/x86/oprofile/backtrace.c | 8 +-
xen/arch/x86/oprofile/nmi_int.c | 4 +-
xen/arch/x86/oprofile/op_model_athlon.c | 15 +-
xen/arch/x86/oprofile/op_model_p4.c | 2 +-
xen/arch/x86/oprofile/op_model_ppro.c | 12 +-
xen/arch/x86/oprofile/op_x86_model.h | 2 +-
xen/arch/x86/physdev.c | 20 +-
xen/arch/x86/platform_hypercall.c | 159 +
xen/arch/x86/psr.c | 200 +
xen/arch/x86/setup.c | 121 +-
xen/arch/x86/shutdown.c | 49 +-
xen/arch/x86/smp.c | 12 +-
xen/arch/x86/smpboot.c | 60 +-
xen/arch/x86/srat.c | 16 +-
xen/arch/x86/sysctl.c | 67 +
xen/arch/x86/tboot.c | 15 +-
xen/arch/x86/time.c | 259 +-
xen/arch/x86/trace.c | 28 +-
xen/arch/x86/traps.c | 434 +-
xen/arch/x86/usercopy.c | 6 +
xen/arch/x86/x86_64/asm-offsets.c | 14 +-
xen/arch/x86/x86_64/compat/entry.S | 3 +-
xen/arch/x86/x86_64/compat/mm.c | 15 +-
xen/arch/x86/x86_64/compat/traps.c | 2 +-
xen/arch/x86/x86_64/entry.S | 127 +-
xen/arch/x86/x86_64/mm.c | 98 +-
xen/arch/x86/x86_64/mmconf-fam10h.c | 1 +
xen/arch/x86/x86_64/mmconfig-shared.c | 1 +
xen/arch/x86/x86_64/mmconfig.h | 4 -
xen/arch/x86/x86_64/platform_hypercall.c | 4 +
xen/arch/x86/x86_64/traps.c | 42 +-
xen/arch/x86/x86_emulate/x86_emulate.c | 203 +-
xen/arch/x86/x86_emulate/x86_emulate.h | 27 +-
xen/arch/x86/xen.lds.S | 15 +
xen/arch/x86/xstate.c | 91 +-
xen/common/Makefile | 4 +
xen/common/bitmap.c | 8 +-
xen/common/compat/domain.c | 2 +-
xen/common/compat/grant_table.c | 27 +-
xen/common/compat/memory.c | 7 +
xen/common/cpupool.c | 49 +-
xen/common/device_tree.c | 582 +--
xen/common/domain.c | 246 +-
xen/common/domctl.c | 354 +-
xen/common/efi/boot.c | 1322 ++++++
xen/{arch/x86 => common}/efi/compat.c | 0
xen/common/efi/efi.h | 41 +
xen/common/efi/runtime.c | 600 +++
xen/common/event_channel.c | 19 +-
xen/common/event_fifo.c | 4 +-
xen/common/grant_table.c | 260 +-
xen/common/hvm/save.c | 19 +-
xen/common/kernel.c | 9 +-
xen/common/kexec.c | 2 +-
xen/common/keyhandler.c | 44 +-
xen/common/lib.c | 5 +
xen/common/libelf/libelf-private.h | 5 +
xen/common/libfdt/Makefile.libfdt | 4 +-
xen/common/libfdt/fdt.c | 30 +-
xen/common/libfdt/fdt_empty_tree.c | 84 +
xen/common/libfdt/fdt_ro.c | 7 +-
xen/common/libfdt/fdt_rw.c | 31 +-
xen/common/libfdt/fdt_sw.c | 4 +-
xen/common/libfdt/fdt_wip.c | 2 +-
xen/common/libfdt/version.lds | 6 +
xen/common/lz4/defs.h | 14 -
xen/common/lzo.c | 762 ++--
xen/common/mem_access.c | 159 +
xen/common/mem_event.c | 742 ++++
xen/common/memory.c | 215 +-
xen/common/page_alloc.c | 279 +-
xen/common/pdx.c | 117 +
xen/common/rangeset.c | 107 +-
xen/common/sched_credit.c | 161 +-
xen/common/sched_credit2.c | 534 ++-
xen/common/sched_rt.c | 1112 +++++
xen/common/sched_sedf.c | 14 +-
xen/common/schedule.c | 87 +-
xen/common/shutdown.c | 4 +-
xen/common/softirq.c | 56 +-
xen/common/spinlock.c | 136 +-
xen/common/symbols.c | 2 +-
xen/common/tmem.c | 608 +--
xen/common/trace.c | 10 +-
xen/common/unlzma.c | 2 +-
xen/common/vsprintf.c | 155 +-
xen/common/wait.c | 10 +-
xen/common/xenoprof.c | 10 +-
xen/crypto/rijndael.c | 3 +
xen/drivers/acpi/apei/erst.c | 47 +-
xen/drivers/char/console.c | 86 +-
xen/drivers/char/dt-uart.c | 9 +-
xen/drivers/char/ehci-dbgp.c | 8 +-
xen/drivers/char/exynos4210-uart.c | 41 +-
xen/drivers/char/ns16550.c | 487 ++-
xen/drivers/char/omap-uart.c | 43 +-
xen/drivers/char/pl011.c | 44 +-
xen/drivers/char/serial.c | 9 -
xen/drivers/passthrough/Makefile | 6 +-
xen/drivers/passthrough/amd/iommu_cmd.c | 3 +-
xen/drivers/passthrough/amd/iommu_detect.c | 2 +-
xen/drivers/passthrough/amd/iommu_guest.c | 11 +-
xen/drivers/passthrough/amd/iommu_init.c | 26 +-
xen/drivers/passthrough/amd/iommu_map.c | 56 +-
xen/drivers/passthrough/amd/pci_amd_iommu.c | 74 +-
xen/drivers/passthrough/arm/Makefile | 2 +
xen/drivers/passthrough/arm/iommu.c | 70 +
xen/drivers/passthrough/arm/smmu.c | 1784 ++++++++
xen/drivers/passthrough/device_tree.c | 108 +
xen/drivers/passthrough/io.c | 568 ++-
xen/drivers/passthrough/iommu.c | 523 +--
xen/drivers/passthrough/pci.c | 439 +-
xen/drivers/passthrough/vtd/extern.h | 9 +-
xen/drivers/passthrough/vtd/intremap.c | 4 +-
xen/drivers/passthrough/vtd/iommu.c | 322 +-
xen/drivers/passthrough/vtd/iommu.h | 2 -
xen/drivers/passthrough/vtd/qinval.c | 245 +-
xen/drivers/passthrough/vtd/quirks.c | 36 +-
xen/drivers/passthrough/vtd/x86/vtd.c | 14 +-
xen/drivers/passthrough/x86/Makefile | 1 +
xen/drivers/passthrough/x86/ats.c | 2 +-
xen/drivers/passthrough/x86/iommu.c | 145 +
xen/drivers/video/arm_hdlcd.c | 31 +-
xen/include/Makefile | 25 +-
xen/include/acpi/apei.h | 6 +-
xen/include/asm-arm/arm32/atomic.h | 196 +-
xen/include/asm-arm/arm32/bug.h | 13 +
xen/include/asm-arm/arm32/cmpxchg.h | 155 +
xen/include/asm-arm/arm32/flushtlb.h | 16 +-
xen/include/asm-arm/arm32/macros.h | 8 +
xen/include/asm-arm/arm32/page.h | 60 +-
xen/include/asm-arm/arm32/processor.h | 6 +-
xen/include/asm-arm/arm32/spinlock.h | 78 +
xen/include/asm-arm/arm32/system.h | 131 +-
xen/include/asm-arm/arm64/atomic.h | 48 +-
xen/include/asm-arm/arm64/bug.h | 10 +
xen/include/asm-arm/arm64/cmpxchg.h | 178 +
xen/include/asm-arm/arm64/efibind.h | 216 +
xen/include/asm-arm/arm64/page.h | 45 +-
xen/include/asm-arm/arm64/processor.h | 10 +-
xen/include/asm-arm/arm64/spinlock.h | 63 +
xen/include/asm-arm/arm64/system.h | 171 +-
xen/include/asm-arm/atomic.h | 23 +-
xen/include/asm-arm/bug.h | 77 +-
xen/include/asm-arm/config.h | 26 +-
xen/include/asm-arm/cpufeature.h | 8 +-
xen/include/asm-arm/debugger.h | 2 +-
xen/include/asm-arm/device.h | 14 +-
xen/include/asm-arm/domain.h | 96 +-
xen/include/asm-arm/early_printk.h | 27 +-
xen/include/asm-arm/efibind.h | 2 +
xen/include/asm-arm/event.h | 1 +
xen/include/asm-arm/flushtlb.h | 3 +
xen/include/asm-arm/gic.h | 317 +-
xen/include/asm-arm/gic_v3_defs.h | 161 +
xen/include/asm-arm/grant_table.h | 5 +-
xen/include/asm-arm/hvm/iommu.h | 10 +
xen/include/asm-arm/iommu.h | 36 +
xen/include/asm-arm/irq.h | 18 +-
xen/include/asm-arm/macros.h | 16 +
xen/include/asm-arm/mm.h | 50 +-
xen/include/asm-arm/mmio.h | 71 +
xen/include/asm-arm/numa.h | 1 +
xen/include/asm-arm/p2m.h | 56 +-
xen/include/asm-arm/page.h | 201 +-
xen/include/asm-arm/platform.h | 5 +
xen/include/asm-arm/platforms/exynos5.h | 7 +-
xen/include/asm-arm/processor-ca15.h | 42 -
xen/include/asm-arm/processor-ca7.h | 20 -
xen/include/asm-arm/processor.h | 153 +-
xen/include/asm-arm/procinfo.h | 17 +-
xen/include/asm-arm/psci.h | 87 +-
xen/include/asm-arm/setup.h | 55 +-
xen/include/asm-arm/smp.h | 2 +-
xen/include/asm-arm/softirq.h | 2 +
xen/include/asm-arm/string.h | 36 +-
xen/include/asm-arm/sysregs.h | 56 +
xen/include/asm-arm/system.h | 26 +-
xen/include/asm-arm/time.h | 10 +-
xen/include/asm-arm/types.h | 5 +
xen/include/asm-arm/vgic.h | 209 +
xen/include/asm-x86/acpi.h | 1 -
xen/include/asm-x86/alternative.h | 78 +
xen/include/asm-x86/apic.h | 2 +-
xen/include/asm-x86/apicdef.h | 17 +-
xen/include/asm-x86/asm_defns.h | 259 +-
xen/include/asm-x86/atomic.h | 43 +-
xen/include/asm-x86/bitops.h | 62 +-
xen/include/asm-x86/config.h | 11 +-
xen/include/asm-x86/cpufeature.h | 61 +-
xen/include/asm-x86/current.h | 27 +-
xen/include/asm-x86/debugreg.h | 14 +
xen/include/asm-x86/desc.h | 13 +-
xen/include/asm-x86/domain.h | 56 +-
xen/include/asm-x86/e820.h | 10 +-
xen/include/asm-x86/edd.h | 76 +-
xen/include/asm-x86/fixmap.h | 1 -
xen/include/asm-x86/flushtlb.h | 18 +
xen/include/asm-x86/genapic.h | 11 +-
xen/include/asm-x86/grant_table.h | 3 +
xen/include/asm-x86/hap.h | 2 +-
xen/include/asm-x86/hvm/cacheattr.h | 12 +-
xen/include/asm-x86/hvm/domain.h | 67 +-
xen/include/asm-x86/hvm/emulate.h | 13 +-
xen/include/asm-x86/hvm/hvm.h | 119 +-
xen/include/asm-x86/hvm/io.h | 6 +-
xen/include/asm-x86/hvm/iommu.h | 22 +
xen/include/asm-x86/hvm/support.h | 19 +-
xen/include/asm-x86/hvm/svm/amd-iommu-proto.h | 2 +-
xen/include/asm-x86/hvm/svm/svm.h | 6 +
xen/include/asm-x86/hvm/svm/vmcb.h | 27 +-
xen/include/asm-x86/hvm/trace.h | 7 +
xen/include/asm-x86/hvm/vcpu.h | 17 +-
xen/include/asm-x86/hvm/viridian.h | 27 +
xen/include/asm-x86/hvm/vlapic.h | 27 +-
xen/include/asm-x86/hvm/vmx/vmcs.h | 14 +
xen/include/asm-x86/hvm/vmx/vmx.h | 17 +-
xen/include/asm-x86/hvm/vpmu.h | 7 +-
xen/include/asm-x86/hvm/vpt.h | 4 +-
xen/include/asm-x86/i387.h | 4 +-
xen/include/asm-x86/io_apic.h | 20 +-
xen/include/asm-x86/iommu.h | 43 +
xen/include/asm-x86/irq.h | 2 +
xen/include/asm-x86/ldt.h | 2 +-
xen/include/asm-x86/mem_access.h | 35 -
xen/include/asm-x86/mem_event.h | 82 -
xen/include/asm-x86/mm.h | 14 +-
xen/include/asm-x86/msi.h | 10 +-
xen/include/asm-x86/msr-index.h | 64 +-
xen/include/asm-x86/msr.h | 6 +-
xen/include/asm-x86/mtrr.h | 27 +-
xen/include/asm-x86/nmi.h | 9 +-
xen/include/asm-x86/nops.h | 66 +
xen/include/asm-x86/p2m.h | 139 +-
xen/include/asm-x86/page.h | 5 -
xen/include/asm-x86/paging.h | 11 +-
xen/include/asm-x86/perfc_defn.h | 1 +
xen/include/asm-x86/processor.h | 92 +-
xen/include/asm-x86/psr.h | 61 +
xen/include/asm-x86/setup.h | 1 -
xen/include/asm-x86/shadow.h | 4 -
xen/include/asm-x86/softirq.h | 5 +-
xen/include/asm-x86/spinlock.h | 54 +
xen/include/asm-x86/system.h | 2 +
xen/include/asm-x86/tboot.h | 4 -
xen/include/asm-x86/time.h | 13 +-
xen/include/asm-x86/traps.h | 2 -
xen/include/asm-x86/types.h | 1 +
xen/include/asm-x86/uaccess.h | 8 +-
xen/include/asm-x86/x86_64/asm_defns.h | 231 -
xen/include/asm-x86/x86_64/page.h | 36 +-
xen/include/asm-x86/x86_64/system.h | 4 +-
xen/include/asm-x86/xstate.h | 20 +-
xen/include/public/arch-arm.h | 50 +-
xen/include/public/arch-x86/cpuid.h | 29 +-
xen/include/public/arch-x86/hvm/save.h | 23 +-
xen/include/public/domctl.h | 172 +-
xen/include/public/event_channel.h | 4 +
xen/include/public/features.h | 5 +
xen/include/public/grant_table.h | 20 +
xen/include/public/hvm/hvm_op.h | 195 +-
xen/include/public/hvm/ioreq.h | 9 +-
xen/include/public/hvm/params.h | 48 +-
xen/include/public/io/blkif.h | 32 +
xen/include/public/io/netif.h | 53 +
xen/include/public/io/vscsiif.h | 185 +-
xen/include/public/io/xs_wire.h | 13 +-
xen/include/public/mem_event.h | 70 +-
xen/include/public/memory.h | 113 +-
xen/include/public/platform.h | 46 +-
xen/include/public/sched.h | 7 +-
xen/include/public/sysctl.h | 40 +-
xen/include/public/trace.h | 25 +-
xen/include/xen/bitmap.h | 30 +-
xen/include/xen/compat.h | 2 +-
xen/include/xen/compiler.h | 8 +-
xen/include/xen/config.h | 15 +-
xen/include/xen/device_tree.h | 137 +-
xen/include/xen/domain.h | 18 +-
xen/include/xen/early_printk.h | 21 +
xen/include/xen/efi.h | 1 +
xen/include/xen/event.h | 3 +
xen/include/xen/grant_table.h | 4 +-
xen/include/xen/hvm/iommu.h | 33 +-
xen/include/xen/hvm/irq.h | 10 +-
xen/include/xen/init.h | 8 +
xen/include/xen/iommu.h | 103 +-
xen/include/xen/irq.h | 41 +-
xen/include/xen/kernel.h | 3 +-
xen/include/xen/lib.h | 11 +-
xen/include/xen/libfdt/fdt.h | 93 +-
xen/include/xen/libfdt/libfdt.h | 315 +-
xen/include/xen/libfdt/libfdt_env.h | 4 +
xen/include/xen/list.h | 18 +-
xen/include/xen/lzo.h | 11 +-
xen/include/xen/mem_access.h | 65 +
xen/include/xen/mem_event.h | 143 +
xen/include/xen/mm.h | 27 +
xen/include/xen/p2m-common.h | 47 +
xen/include/xen/pci.h | 4 +-
xen/include/xen/pdx.h | 50 +
xen/include/xen/prefetch.h | 1 -
xen/include/xen/rangeset.h | 20 +
xen/include/xen/sched-if.h | 3 +-
xen/include/xen/sched.h | 82 +-
xen/include/xen/serial.h | 5 -
xen/include/xen/shutdown.h | 9 +-
xen/include/xen/sizes.h | 48 +
xen/include/xen/softirq.h | 3 +
xen/include/xen/spinlock.h | 6 +-
xen/include/xen/stdarg.h | 1 +
xen/include/xen/time.h | 2 +
xen/include/xlat.lst | 16 +
xen/include/xsm/dummy.h | 92 +-
xen/include/xsm/xsm.h | 125 +-
xen/xsm/dummy.c | 23 +-
xen/xsm/flask/avc.c | 16 +-
xen/xsm/flask/flask_op.c | 122 +-
xen/xsm/flask/hooks.c | 358 +-
xen/xsm/flask/include/conditional.h | 4 +-
xen/xsm/flask/include/objsec.h | 6 -
xen/xsm/flask/policy/access_vectors | 30 +-
xen/xsm/flask/policy/security_classes | 1 +
xen/xsm/flask/ss/avtab.c | 5 +-
xen/xsm/flask/ss/conditional.c | 14 +-
xen/xsm/flask/ss/ebitmap.c | 11 +-
xen/xsm/flask/ss/hashtab.c | 14 +-
xen/xsm/flask/ss/policydb.c | 49 +-
xen/xsm/flask/ss/services.c | 57 +-
xen/xsm/xsm_core.c | 66 +-
xen/xsm/xsm_policy.c | 62 +-
1695 files changed, 75615 insertions(+), 144525 deletions(-)
diff --cc debian/.git-dpm
index 18d8768,0000000..681711c
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
- 21e58346145a93c80356d565cba28dbe10ecad28
- 21e58346145a93c80356d565cba28dbe10ecad28
- 3387be132d526263f246c24d3bbc94767a4eba76
++f1b16d718afb3270ba7284952d77c7f9641f7ead
++f1b16d718afb3270ba7284952d77c7f9641f7ead
++9ca7a919493667f7b431cf66eca19d4deccc3a61
+9ca7a919493667f7b431cf66eca19d4deccc3a61
+xen_4.5.0~rc3.orig.tar.xz
+38c29e5a70c3c9e3297f9ce70d80bde881683bc8
+3504496
diff --cc debian/patches/config-prefix.diff
index 6a6465f,0000000..d3578ce
mode 100644,000000..100644
--- a/debian/patches/config-prefix.diff
+++ b/debian/patches/config-prefix.diff
@@@ -1,57 -1,0 +1,47 @@@
- From ec5aa476dc815f4716f55dd0573d5821edc9647d Mon Sep 17 00:00:00 2001
++From 8a804fe6b91d895d043656a0737f1debfe9819f8 Mon Sep 17 00:00:00 2001
+From: Bastian Blank <waldi at debian.org>
+Date: Sat, 5 Jul 2014 11:46:45 +0200
+Subject: config-prefix.diff
+
+Patch-Name: config-prefix.diff
+---
- Config.mk | 2 +-
- config/StdGNU.mk | 11 ++++++++---
- 2 files changed, 9 insertions(+), 4 deletions(-)
++ Config.mk | 2 +-
++ config/Paths.mk.in | 5 +++--
++ 2 files changed, 4 insertions(+), 3 deletions(-)
+
+diff --git a/Config.mk b/Config.mk
- index c44853f..df3a853 100644
++index a53cfb5..2e84ee1 100644
+--- a/Config.mk
++++ b/Config.mk
- @@ -84,7 +84,7 @@ EXTRA_LIB += $(EXTRA_PREFIX)/lib
++@@ -75,7 +75,7 @@ EXTRA_LIB += $(EXTRA_PREFIX)/lib
+ endif
+
+ PYTHON ?= python
+-PYTHON_PREFIX_ARG ?= --prefix="$(PREFIX)"
- +PYTHON_PREFIX_ARG ?= --home="$(PRIVATE_PREFIX)"
+++PYTHON_PREFIX_ARG ?= --home="$(LIBEXEC)"
+ # The above requires that PREFIX contains *no spaces*. This variable is here
+ # to permit the user to set PYTHON_PREFIX_ARG to '' to workaround this bug:
+ # https://bugs.launchpad.net/ubuntu/+bug/362570
- diff --git a/config/StdGNU.mk b/config/StdGNU.mk
- index 25fc594..0f1776d 100644
- --- a/config/StdGNU.mk
- +++ b/config/StdGNU.mk
- @@ -1,3 +1,5 @@
- +include /usr/share/dpkg/architecture.mk
- +
- AS = $(CROSS_COMPILE)as
- LD = $(CROSS_COMPILE)ld
- ifeq ($(clang),y)
- @@ -30,16 +32,19 @@ INSTALL_PROG = $(INSTALL) -m0755 -p
- PREFIX ?= /usr
- BINDIR = $(PREFIX)/bin
- INCLUDEDIR = $(PREFIX)/include
- -LIBEXEC = $(PREFIX)/lib/xen/bin
- +LIBDIR = $(PREFIX)/lib/$(DEB_HOST_MULTIARCH)
- SHAREDIR = $(PREFIX)/share
- MANDIR = $(SHAREDIR)/man
- MAN1DIR = $(MANDIR)/man1
- MAN8DIR = $(MANDIR)/man8
- SBINDIR = $(PREFIX)/sbin
- -XENFIRMWAREDIR = $(PREFIX)/lib/xen/boot
++diff --git a/config/Paths.mk.in b/config/Paths.mk.in
++index fe10f76..c3b9200 100644
++--- a/config/Paths.mk.in
+++++ b/config/Paths.mk.in
++@@ -13,6 +13,7 @@
++ # http://wiki.xen.org/wiki/Category:Host_Configuration#System_wide_xen_configuration
+
- -PRIVATE_PREFIX = $(LIBDIR)/xen
- +PRIVATE_PREFIX = $(PREFIX)/lib/xen-$(XEN_VERSION)
- PRIVATE_BINDIR = $(PRIVATE_PREFIX)/bin
- +PRIVATE_LIBDIR = $(PRIVATE_PREFIX)/lib
- +
- +LIBEXEC = $(PRIVATE_BINDIR)
- +XENFIRMWAREDIR = $(PRIVATE_PREFIX)/boot
++ PACKAGE_TARNAME := @PACKAGE_TARNAME@
+++PACKAGE_VERSION := @PACKAGE_VERSION@
++ prefix := @prefix@
++ bindir := @bindir@
++ sbindir := @sbindir@
++@@ -33,8 +34,8 @@ PREFIX := $(prefix)
++
++ SBINDIR := $(sbindir)
++ BINDIR := $(bindir)
++-LIBEXEC := $(libexecdir)/$(PACKAGE_TARNAME)
++-LIBEXEC_BIN := @LIBEXEC_BIN@
+++LIBEXEC := $(libexecdir)/$(PACKAGE_TARNAME)-$(PACKAGE_VERSION)
+++LIBEXEC_BIN := $(LIBEXEC)/bin
++ LIBEXEC_LIB := $(LIBEXEC)/lib
++ LIBEXEC_INC := $(LIBEXEC)/include
+
- CONFIG_DIR = /etc
- XEN_LOCK_DIR = /var/lock
diff --cc debian/patches/series
index 53386f8,0000000..85657a5
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,48 -1,0 +1,27 @@@
+version.diff
+config-prefix.diff
+tools-libfsimage-abiname.diff
+tools-libxc-abiname.diff
+tools-libxl-abiname.diff
+tools-xenstat-abiname.diff
+tools-rpath.diff
+tools-blktap2-prefix.diff
+tools-console-prefix.diff
+tools-libfsimage-prefix.diff
+tools-libxl-prefix.diff
+tools-misc-prefix.diff
+tools-pygrub-prefix.diff
+tools-python-prefix.diff
+tools-xcutils-rpath.diff
+tools-xenmon-prefix.diff
+tools-xenpaging-prefix.diff
++tools-xenpmd-prefix.diff
+tools-xenstat-prefix.diff
+tools-xenstore-prefix.diff
+tools-xentrace-prefix.diff
- tools-python-xen-relative-path.diff
- tools-misc-xend-startup.diff
- tools-disable.diff
- tools-examples-xend-disable-network.diff
- tools-examples-xend-disable-relocation.diff
+tools-pygrub-remove-static-solaris-support
+tools-include-install.diff
+tools-xenmon-install.diff
+tools-hotplug-udevrules.diff
- tools-python-shebang.diff
+tools-xenstore-compatibility.diff
+xl-coredumps-to-var-lib-xen-dump.diff
- CVE-2014-6268.diff
- CVE-2014-7154.diff
- CVE-2014-7155.diff
- CVE-2014-7156.diff
- CVE-2014-7188.diff
- CVE-2013-3495.diff
- CVE-2014-5146.diff
- CVE-2014-8594.diff
- CVE-2014-8595.diff
- CVE-2014-9030.diff
- libxl-parse-max-leak.diff
- CVE-2014-8866.diff
- CVE-2014-8867.diff
- domain-builder-pv-kernel-memory-leak.diff
- libxl-local-attach-diskpath-leak.diff
- CVE-2014-9065.diff
diff --cc debian/patches/tools-blktap2-prefix.diff
index f122270,0000000..57917fe
mode 100644,000000..100644
--- a/debian/patches/tools-blktap2-prefix.diff
+++ b/debian/patches/tools-blktap2-prefix.diff
@@@ -1,155 -1,0 +1,154 @@@
- From e3e6c6f2fe01654be0d0fbe125d43a6236423c09 Mon Sep 17 00:00:00 2001
++From d8f57e314b2766a9716399893efb59afd7e82726 Mon Sep 17 00:00:00 2001
+From: Bastian Blank <waldi at debian.org>
+Date: Sat, 5 Jul 2014 11:46:53 +0200
+Subject: tools-blktap2-prefix.diff
+
+Patch-Name: tools-blktap2-prefix.diff
+---
+ tools/blktap2/control/Makefile | 26 ++++++++------------------
+ tools/blktap2/vhd/Makefile | 1 +
+ tools/blktap2/vhd/lib/Makefile | 29 +++++++++--------------------
+ 3 files changed, 18 insertions(+), 38 deletions(-)
+
+diff --git a/tools/blktap2/control/Makefile b/tools/blktap2/control/Makefile
- index 86a433c..f3a7a6e 100644
++index a88ff4c..d2615d9 100644
+--- a/tools/blktap2/control/Makefile
++++ b/tools/blktap2/control/Makefile
+@@ -1,10 +1,7 @@
+ XEN_ROOT := $(CURDIR)/../../../
+ include $(XEN_ROOT)/tools/Rules.mk
+
+-MAJOR = 1.0
+-MINOR = 0
+ LIBNAME = libblktapctl
+-LIBSONAME = $(LIBNAME).so.$(MAJOR)
+
+ IBIN = tap-ctl
+
+@@ -38,39 +35,32 @@ OBJS = $(CTL_OBJS) tap-ctl.o
+ PICS = $(CTL_PICS)
+
+ LIB_STATIC = $(LIBNAME).a
+-LIB_SHARED = $(LIBSONAME).$(MINOR)
++LIB_SHARED = $(LIBNAME).so
+ IBIN = tap-ctl
+
+ all: build
+
+ build: $(IBIN) $(LIB_STATIC) $(LIB_SHARED)
+
+-$(LIBNAME).so: $(LIBSONAME)
+- ln -sf $< $@
+-
+-$(LIBSONAME): $(LIB_SHARED)
+- ln -sf $< $@
+-
+ tap-ctl: tap-ctl.o $(LIBNAME).so
- - $(CC) $(LDFLAGS) -o $@ $^
- + $(CC) $(LDFLAGS) $(call LDFLAGS_RPATH,../lib) -o $@ $^
++- $(CC) $(LDFLAGS) -o $@ $^ $(APPEND_LDFLAGS)
+++ $(CC) $(LDFLAGS) $(call LDFLAGS_RPATH,../lib) -o $@ $^ $(APPEND_LDFLAGS)
+
+ $(LIB_STATIC): $(CTL_OBJS)
+ $(AR) r $@ $^
+
+ $(LIB_SHARED): $(CTL_PICS)
- - $(CC) $(LDFLAGS) -fPIC -Wl,$(SONAME_LDFLAG) -Wl,$(LIBSONAME) $(SHLIB_LDFLAGS) -rdynamic $^ -o $@
- + $(CC) $(LDFLAGS) -fPIC $(SHLIB_LDFLAGS) -rdynamic $^ -o $@
++- $(CC) $(LDFLAGS) -fPIC -Wl,$(SONAME_LDFLAG) -Wl,$(LIBSONAME) $(SHLIB_LDFLAGS) -rdynamic $^ -o $@ $(APPEND_LDFLAGS)
+++ $(CC) $(LDFLAGS) -fPIC $(SHLIB_LDFLAGS) -rdynamic $^ -o $@ $(APPEND_LDFLAGS)
+
+ install: $(IBIN) $(LIB_STATIC) $(LIB_SHARED)
+- $(INSTALL_DIR) -p $(DESTDIR)$(SBINDIR)
+- $(INSTALL_PROG) $(IBIN) $(DESTDIR)$(SBINDIR)
- + $(INSTALL_DIR) -p $(DESTDIR)$(IBDIR)
- + $(INSTALL_DIR) -p $(DESTDIR)$(PRIVATE_LIBDIR)
- + $(INSTALL_DIR) -p $(DESTDIR)$(PRIVATE_SBINDIR)
- + $(INSTALL_PROG) $(IBIN) $(DESTDIR)$(PRIVATE_BINDIR)
+++ $(INSTALL_DIR) -p $(DESTDIR)$(LIBDIR)
+++ $(INSTALL_DIR) -p $(DESTDIR)$(LIBEXEC_BIN)
+++ $(INSTALL_DIR) -p $(DESTDIR)$(LIBEXEC_LIB)
+++ $(INSTALL_PROG) $(IBIN) $(DESTDIR)$(LIBEXEC_BIN)
+ $(INSTALL_DATA) $(LIB_STATIC) $(DESTDIR)$(LIBDIR)
+- $(INSTALL_PROG) $(LIB_SHARED) $(DESTDIR)$(LIBDIR)
+- ln -sf $(LIBSONAME) $(DESTDIR)$(LIBDIR)/$(LIBNAME).so
+- ln -sf $(LIB_SHARED) $(DESTDIR)$(LIBDIR)/$(LIBSONAME)
- + $(INSTALL_PROG) $(LIB_SHARED) $(DESTDIR)$(PRIVATE_LIBDIR)
+++ $(INSTALL_PROG) $(LIB_SHARED) $(DESTDIR)$(LIBEXEC_LIB)
+
+ clean:
+ rm -f $(OBJS) $(PICS) $(DEPS) $(IBIN) $(LIB_STATIC) $(LIB_SHARED)
+- rm -f $(LIBNAME).so $(LIBSONAME)
+ rm -f *~
+
+ .PHONY: all build clean install
+diff --git a/tools/blktap2/vhd/Makefile b/tools/blktap2/vhd/Makefile
- index c5019de..e55c73c 100644
++index fef0d36..cf8b639 100644
+--- a/tools/blktap2/vhd/Makefile
++++ b/tools/blktap2/vhd/Makefile
+@@ -12,6 +12,7 @@ CFLAGS += -Werror
+ CFLAGS += -Wno-unused
+ CFLAGS += -I../include
+ CFLAGS += -D_GNU_SOURCE
++CFLAGS += $(CFLAGS_libxenctrl)
+
+ ifeq ($(CONFIG_X86_64),y)
+ CFLAGS += -fPIC
+diff --git a/tools/blktap2/vhd/lib/Makefile b/tools/blktap2/vhd/lib/Makefile
- index cdbb86c..0ab9885 100644
++index 99e3cdb..45fac4f 100644
+--- a/tools/blktap2/vhd/lib/Makefile
++++ b/tools/blktap2/vhd/lib/Makefile
- @@ -2,26 +2,20 @@ XEN_ROOT=$(CURDIR)/../../../..
++@@ -2,25 +2,19 @@ XEN_ROOT=$(CURDIR)/../../../..
+ BLKTAP_ROOT := ../..
+ include $(XEN_ROOT)/tools/Rules.mk
+
+-LIBVHD-MAJOR = 1.0
+-LIBVHD-MINOR = 0
+-LIBVHD-SONAME = libvhd.so.$(LIBVHD-MAJOR)
+-
+ LVM-UTIL-OBJ := $(BLKTAP_ROOT)/lvm/lvm-util.o
+
+-LIBVHD-BUILD := libvhd.a
+-
+-INST-DIR = $(LIBDIR)
+-
+ CFLAGS += -Werror
+ CFLAGS += -Wno-unused
+ CFLAGS += -I../../include
+ CFLAGS += -D_GNU_SOURCE
+ CFLAGS += -fPIC
- CFLAGS += -g
- +CFLAGS += $(CFLAGS_libxenctrl)
+++CFLAGS += $(CFLAGS_libxenctrl)
+
+ ifeq ($(CONFIG_Linux),y)
+ LIBS := -luuid
+ endif
++LDFLAGS += $(LDFLAGS_libxenctrl) $(call LDFLAGS_RPATH)
+
+ ifeq ($(CONFIG_LIBICONV),y)
+ LIBS += -liconv
- @@ -51,27 +45,22 @@ LIB-OBJS += $(LVM-UTIL-OBJ)
++@@ -50,27 +44,22 @@ LIB-OBJS += $(LVM-UTIL-OBJ)
+
+ LIB-PICOBJS = $(patsubst %.o,%.opic,$(LIB-OBJS))
+
+-LIBVHD = libvhd.a libvhd.so.$(LIBVHD-MAJOR).$(LIBVHD-MINOR)
++LIBVHD = libvhd.a libvhd.so
+
+ all: build
+
+-build: libvhd.a libvhd.so.$(LIBVHD-MAJOR).$(LIBVHD-MINOR)
++build: libvhd.a libvhd.so
+
+ libvhd.a: $(LIB-OBJS)
+ $(AR) rc $@ $^
+
+-libvhd.so.$(LIBVHD-MAJOR).$(LIBVHD-MINOR): $(LIB-PICOBJS)
+- $(CC) -Wl,$(SONAME_LDFLAG),$(LIBVHD-SONAME) $(SHLIB_LDFLAGS) \
+- $(LDFLAGS) -o libvhd.so.$(LIBVHD-MAJOR).$(LIBVHD-MINOR) $^ $(LIBS)
+- ln -sf libvhd.so.$(LIBVHD-MAJOR).$(LIBVHD-MINOR) libvhd.so.$(LIBVHD-MAJOR)
+- ln -sf libvhd.so.$(LIBVHD-MAJOR) libvhd.so
++libvhd.so: $(LIB-PICOBJS)
++ $(CC) $(SHLIB_LDFLAGS) $(LDFLAGS) -o libvhd.so $^ $(LIBS)
+
+ install: all
+- $(INSTALL_DIR) -p $(DESTDIR)$(INST-DIR)
+- $(INSTALL_DATA) libvhd.a $(DESTDIR)$(INST-DIR)
+- $(INSTALL_PROG) libvhd.so.$(LIBVHD-MAJOR).$(LIBVHD-MINOR) $(DESTDIR)$(INST-DIR)
+- ln -sf libvhd.so.$(LIBVHD-MAJOR).$(LIBVHD-MINOR) $(DESTDIR)$(INST-DIR)/libvhd.so.$(LIBVHD-MAJOR)
+- ln -sf libvhd.so.$(LIBVHD-MAJOR) $(DESTDIR)$(INST-DIR)/libvhd.so
++ $(INSTALL_DIR) -p $(DESTDIR)$(LIBDIR)
++ $(INSTALL_DATA) libvhd.a $(DESTDIR)$(LIBDIR)
++ $(INSTALL_PROG) libvhd.so $(DESTDIR)$(LIBDIR)
+
+ clean:
+ rm -rf *.a *.so* *.o *.opic *~ $(DEPS) $(LIBVHD)
diff --cc debian/patches/tools-console-prefix.diff
index 6430a84,0000000..79f3979
mode 100644,000000..100644
--- a/debian/patches/tools-console-prefix.diff
+++ b/debian/patches/tools-console-prefix.diff
@@@ -1,33 -1,0 +1,33 @@@
- From 6133fec6e8a95d48c89984b7fa508a2dc545c711 Mon Sep 17 00:00:00 2001
++From 2a567a791e07e168a79559b185aeb9c9dca0e6b1 Mon Sep 17 00:00:00 2001
+From: Bastian Blank <waldi at debian.org>
+Date: Sat, 5 Jul 2014 11:46:54 +0200
+Subject: tools-console-prefix.diff
+
+Patch-Name: tools-console-prefix.diff
+---
+ tools/console/Makefile | 5 ++---
+ 1 file changed, 2 insertions(+), 3 deletions(-)
+
+diff --git a/tools/console/Makefile b/tools/console/Makefile
- index 3e38252..b69f674 100644
++index 6e55618..3e96550 100644
+--- a/tools/console/Makefile
++++ b/tools/console/Makefile
+@@ -8,6 +8,7 @@ CFLAGS += $(CFLAGS_libxenstore)
+ LDLIBS += $(LDLIBS_libxenctrl)
+ LDLIBS += $(LDLIBS_libxenstore)
+ LDLIBS += $(SOCKET_LIBS)
++LDFLAGS += $(call LDFLAGS_RPATH,../lib)
+
+ LDLIBS_xenconsoled += $(UTIL_LIBS)
+ LDLIBS_xenconsoled += -lrt
+@@ -30,9 +31,7 @@ xenconsole: $(patsubst %.c,%.o,$(wildcard client/*.c))
+
+ .PHONY: install
+ install: $(BIN)
+- $(INSTALL_DIR) $(DESTDIR)/$(SBINDIR)
+- $(INSTALL_PROG) xenconsoled $(DESTDIR)/$(SBINDIR)
- $(INSTALL_DIR) $(DESTDIR)$(PRIVATE_BINDIR)
- - $(INSTALL_PROG) xenconsole $(DESTDIR)$(PRIVATE_BINDIR)
- + $(INSTALL_PROG) xenconsole xenconsoled $(DESTDIR)$(PRIVATE_BINDIR)
++ $(INSTALL_DIR) $(DESTDIR)$(LIBEXEC_BIN)
++- $(INSTALL_PROG) xenconsole $(DESTDIR)$(LIBEXEC_BIN)
+++ $(INSTALL_PROG) xenconsole xenconsoled $(DESTDIR)$(LIBEXEC_BIN)
+
+ -include $(DEPS)
diff --cc debian/patches/tools-hotplug-udevrules.diff
index 4f1bcb1,0000000..0271005
mode 100644,000000..100644
--- a/debian/patches/tools-hotplug-udevrules.diff
+++ b/debian/patches/tools-hotplug-udevrules.diff
@@@ -1,26 -1,0 +1,28 @@@
- From 9424935f25e6fc0e081ac5e6048cc388a21b1000 Mon Sep 17 00:00:00 2001
++From 6a25f6302e0d60cd4d67968e80407ff88869d508 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
+
+Patch-Name: tools-hotplug-udevrules.diff
+---
- tools/hotplug/Linux/xen-backend.rules | 7 -------
- 1 file changed, 7 deletions(-)
++ tools/hotplug/Linux/xen-backend.rules.in | 9 ++-------
++ 1 file changed, 2 insertions(+), 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"
++diff --git a/tools/hotplug/Linux/xen-backend.rules.in b/tools/hotplug/Linux/xen-backend.rules.in
++index 7d2f914..87dacf9 100644
++--- a/tools/hotplug/Linux/xen-backend.rules.in
+++++ b/tools/hotplug/Linux/xen-backend.rules.in
++@@ -5,11 +5,6 @@ SUBSYSTEM=="xen-backend", KERNEL=="vif-*", ENV{UDEV_CALL}="1", ACTION=="online",
++ SUBSYSTEM=="xen-backend", KERNEL=="vif-*", ENV{UDEV_CALL}="1", ACTION=="offline", RUN+="@XEN_SCRIPT_DIR@/vif-setup offline type_if=vif"
++ SUBSYSTEM=="xen-backend", KERNEL=="vscsi*", RUN+="@XEN_SCRIPT_DIR@/vscsi $env{ACTION}"
++ SUBSYSTEM=="xen-backend", ACTION=="remove", ENV{UDEV_CALL}="1", RUN+="@XEN_SCRIPT_DIR@/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"
+++SUBSYSTEM=="xen", KERNEL=="blktap[0-9]*", MODE="0600"
+++SUBSYSTEM=="blktap2", KERNEL=="blktap[0-9]*", MODE="0600"
++ SUBSYSTEM=="net", KERNEL=="vif*-emu", ACTION=="add", ENV{UDEV_CALL}="1", RUN+="@XEN_SCRIPT_DIR@/vif-setup $env{ACTION} type_if=tap"
diff --cc debian/patches/tools-include-install.diff
index 83ec47e,0000000..5ae7ed6
mode 100644,000000..100644
--- a/debian/patches/tools-include-install.diff
+++ b/debian/patches/tools-include-install.diff
@@@ -1,30 -1,0 +1,30 @@@
- From 7d56e014040266d6f6ab2c52fed6126a4fab98a0 Mon Sep 17 00:00:00 2001
++From b1f8db07bdf43c58bd67772fe4b681467b0d1fb3 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
+
+Patch-Name: tools-include-install.diff
+---
+ tools/include/Makefile | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/tools/include/Makefile b/tools/include/Makefile
+index f7a6256..615f5bb 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 arch-arm hvm io xsm) xen
+ ln -sf ../xen-sys/$(XEN_OS) xen/sys
+@@ -30,7 +29,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/tools-libfsimage-abiname.diff
index 16c81fc,0000000..1eb71d0
mode 100644,000000..100644
--- a/debian/patches/tools-libfsimage-abiname.diff
+++ b/debian/patches/tools-libfsimage-abiname.diff
@@@ -1,60 -1,0 +1,60 @@@
- From 4a4ff09180bf2642429ecafb505b3a04843be52f Mon Sep 17 00:00:00 2001
++From 3f12df5e0d22f2ea95e86726e7f2b2f53932e783 Mon Sep 17 00:00:00 2001
+From: Bastian Blank <waldi at debian.org>
+Date: Sat, 5 Jul 2014 11:46:47 +0200
+Subject: tools-libfsimage-abiname.diff
+
+Patch-Name: tools-libfsimage-abiname.diff
+---
+ tools/libfsimage/common/Makefile | 18 ++++--------------
+ 1 file changed, 4 insertions(+), 14 deletions(-)
+
+diff --git a/tools/libfsimage/common/Makefile b/tools/libfsimage/common/Makefile
- index cbd60b4..4202cc1 100644
++index fb306f4..0e6c728 100644
+--- a/tools/libfsimage/common/Makefile
++++ b/tools/libfsimage/common/Makefile
+@@ -1,9 +1,6 @@
+ XEN_ROOT = $(CURDIR)/../../..
+ include $(XEN_ROOT)/tools/libfsimage/Rules.mk
+
+-MAJOR = 1.0
+-MINOR = 0
+-
+ LDFLAGS-$(CONFIG_SunOS) = -Wl,-M -Wl,mapfile-SunOS
+ LDFLAGS-$(CONFIG_Linux) = -Wl,mapfile-GNU
+ LDFLAGS = $(LDFLAGS-y)
+@@ -15,7 +12,7 @@ LIB_SRCS-y = fsimage.c fsimage_plugin.c fsimage_grub.c
+
+ PIC_OBJS := $(patsubst %.c,%.opic,$(LIB_SRCS-y))
+
+-LIB = libfsimage.so libfsimage.so.$(MAJOR) libfsimage.so.$(MAJOR).$(MINOR)
++LIB = libfsimage.so
+
+ .PHONY: all
+ all: $(LIB)
+@@ -24,9 +21,7 @@ all: $(LIB)
+ install: all
+ $(INSTALL_DIR) $(DESTDIR)$(LIBDIR)
+ $(INSTALL_DIR) $(DESTDIR)$(INCLUDEDIR)
+- $(INSTALL_PROG) libfsimage.so.$(MAJOR).$(MINOR) $(DESTDIR)$(LIBDIR)
+- ln -sf libfsimage.so.$(MAJOR).$(MINOR) $(DESTDIR)$(LIBDIR)/libfsimage.so.$(MAJOR)
+- ln -sf libfsimage.so.$(MAJOR) $(DESTDIR)$(LIBDIR)/libfsimage.so
++ $(INSTALL_PROG) libfsimage.so $(DESTDIR)$(LIBDIR)
+ $(INSTALL_DATA) fsimage.h $(DESTDIR)$(INCLUDEDIR)
+ $(INSTALL_DATA) fsimage_plugin.h $(DESTDIR)$(INCLUDEDIR)
+ $(INSTALL_DATA) fsimage_grub.h $(DESTDIR)$(INCLUDEDIR)
+@@ -34,13 +29,8 @@ install: all
+ clean distclean::
+ rm -f $(LIB)
+
+-libfsimage.so: libfsimage.so.$(MAJOR)
+- ln -sf $< $@
+-libfsimage.so.$(MAJOR): libfsimage.so.$(MAJOR).$(MINOR)
+- ln -sf $< $@
+-
+-libfsimage.so.$(MAJOR).$(MINOR): $(PIC_OBJS)
- - $(CC) $(LDFLAGS) -Wl,$(SONAME_LDFLAG) -Wl,libfsimage.so.$(MAJOR) $(SHLIB_LDFLAGS) -o $@ $^ $(PTHREAD_LIBS)
++- $(CC) $(LDFLAGS) -Wl,$(SONAME_LDFLAG) -Wl,libfsimage.so.$(MAJOR) $(SHLIB_LDFLAGS) -o $@ $^ $(PTHREAD_LIBS) $(APPEND_LDFLAGS)
++libfsimage.so: $(PIC_OBJS)
- + $(CC) $(LDFLAGS) -Wl,$(SONAME_LDFLAG),$@ $(SHLIB_LDFLAGS) -o $@ $^ $(PTHREAD_LIBS)
+++ $(CC) $(LDFLAGS) -Wl,$(SONAME_LDFLAG),$@ $(SHLIB_LDFLAGS) -o $@ $^ $(PTHREAD_LIBS) $(APPEND_LDFLAGS)
+
+ -include $(DEPS)
+
diff --cc debian/patches/tools-libfsimage-prefix.diff
index c9c5e0d,0000000..01786b0
mode 100644,000000..100644
--- a/debian/patches/tools-libfsimage-prefix.diff
+++ b/debian/patches/tools-libfsimage-prefix.diff
@@@ -1,53 -1,0 +1,53 @@@
- From 66f2cc186b7cd712a059c51af7fd89c0d7806e20 Mon Sep 17 00:00:00 2001
++From 57e02a108aa4dc29be9a9fde4ae44a06703be81c Mon Sep 17 00:00:00 2001
+From: Bastian Blank <waldi at debian.org>
+Date: Sat, 5 Jul 2014 11:46:55 +0200
+Subject: tools-libfsimage-prefix.diff
+
+Patch-Name: tools-libfsimage-prefix.diff
+---
+ tools/libfsimage/Rules.mk | 3 ++-
+ tools/libfsimage/common/Makefile | 6 ++++--
+ 2 files changed, 6 insertions(+), 3 deletions(-)
+
+diff --git a/tools/libfsimage/Rules.mk b/tools/libfsimage/Rules.mk
- index 8a23655..2750f4f 100644
++index 8a23655..3e35fc7 100644
+--- a/tools/libfsimage/Rules.mk
++++ b/tools/libfsimage/Rules.mk
+@@ -3,10 +3,11 @@ include $(XEN_ROOT)/tools/Rules.mk
+ CFLAGS += -Wno-unknown-pragmas -I$(XEN_ROOT)/tools/libfsimage/common/ -DFSIMAGE_FSDIR=\"$(FSDIR)\"
+ CFLAGS += -Werror -D_GNU_SOURCE
+ LDFLAGS += -L../common/
++LDFLAGS += $(call LDFLAGS_RPATH,../..)
+
+ PIC_OBJS := $(patsubst %.c,%.opic,$(LIB_SRCS-y))
+
+-FSDIR = $(LIBDIR)/fs
- +FSDIR = $(PRIVATE_LIBDIR)/fs
+++FSDIR = $(LIBEXEC_LIB)/fs
+
+ FSLIB = fsimage.so
+
+diff --git a/tools/libfsimage/common/Makefile b/tools/libfsimage/common/Makefile
- index 4202cc1..85f3d29 100644
++index 0e6c728..4e472f0 100644
+--- a/tools/libfsimage/common/Makefile
++++ b/tools/libfsimage/common/Makefile
+@@ -1,6 +1,8 @@
+ XEN_ROOT = $(CURDIR)/../../..
+ include $(XEN_ROOT)/tools/libfsimage/Rules.mk
+
- +CFLAGS += -DFSDIR="\"$(PRIVATE_LIBDIR)/fs\""
+++CFLAGS += -DFSDIR="\"$(LIBEXEC_LIB)/fs\""
++
+ LDFLAGS-$(CONFIG_SunOS) = -Wl,-M -Wl,mapfile-SunOS
+ LDFLAGS-$(CONFIG_Linux) = -Wl,mapfile-GNU
+ LDFLAGS = $(LDFLAGS-y)
+@@ -19,9 +21,9 @@ all: $(LIB)
+
+ .PHONY: install
+ install: all
+- $(INSTALL_DIR) $(DESTDIR)$(LIBDIR)
- + $(INSTALL_DIR) $(DESTDIR)$(PRIVATE_LIBDIR)
+++ $(INSTALL_DIR) $(DESTDIR)$(LIBEXEC_LIB)
+ $(INSTALL_DIR) $(DESTDIR)$(INCLUDEDIR)
+- $(INSTALL_PROG) libfsimage.so $(DESTDIR)$(LIBDIR)
- + $(INSTALL_PROG) libfsimage.so $(DESTDIR)$(PRIVATE_LIBDIR)
+++ $(INSTALL_PROG) libfsimage.so $(DESTDIR)$(LIBEXEC_LIB)
+ $(INSTALL_DATA) fsimage.h $(DESTDIR)$(INCLUDEDIR)
+ $(INSTALL_DATA) fsimage_plugin.h $(DESTDIR)$(INCLUDEDIR)
+ $(INSTALL_DATA) fsimage_grub.h $(DESTDIR)$(INCLUDEDIR)
diff --cc debian/patches/tools-libxc-abiname.diff
index ccc14ee,0000000..f375658
mode 100644,000000..100644
--- a/debian/patches/tools-libxc-abiname.diff
+++ b/debian/patches/tools-libxc-abiname.diff
@@@ -1,99 -1,0 +1,99 @@@
- From 942996c5b4c8a136150e19909440019592530678 Mon Sep 17 00:00:00 2001
++From 32a2bbf98bf9f255eaa80ed5faa74187a878be17 Mon Sep 17 00:00:00 2001
+From: Bastian Blank <waldi at debian.org>
+Date: Sat, 5 Jul 2014 11:46:48 +0200
+Subject: tools-libxc-abiname.diff
+
+Patch-Name: tools-libxc-abiname.diff
+---
+ tools/libxc/Makefile | 35 +++++++++++++----------------------
+ 1 file changed, 13 insertions(+), 22 deletions(-)
+
+diff --git a/tools/libxc/Makefile b/tools/libxc/Makefile
- index 2cca2b2..b171f91 100644
++index bd2ca6c..09a065d 100644
+--- a/tools/libxc/Makefile
++++ b/tools/libxc/Makefile
+@@ -1,9 +1,6 @@
+ XEN_ROOT = $(CURDIR)/../..
+ include $(XEN_ROOT)/tools/Rules.mk
+
- -MAJOR = 4.4
++-MAJOR = 4.5
+-MINOR = 0
+-
+ CTRL_SRCS-y :=
+ CTRL_SRCS-y += xc_core.c
+ CTRL_SRCS-$(CONFIG_X86) += xc_core_x86.c
- @@ -110,12 +107,12 @@ OSDEP_PIC_OBJS := $(patsubst %.c,%.opic,$(OSDEP_SRCS-y))
++@@ -113,12 +110,12 @@ $(CTRL_PIC_OBJS) $(GUEST_PIC_OBJS) $(OSDEP_PIC_OBJS) : CFLAGS += -include $(XEN_
+
+ LIB := libxenctrl.a
- ifneq ($(stubdom),y)
++ ifneq ($(nosharedlibs),y)
+-LIB += libxenctrl.so libxenctrl.so.$(MAJOR) libxenctrl.so.$(MAJOR).$(MINOR)
- +LIB += libxenctrl.so libxenctrl-$(XEN_VERSION).so
+++LIB += libxenctrl.so libxenctrl-$(PACKAGE_VERSION).so
+ endif
+
+ LIB += libxenguest.a
- ifneq ($(stubdom),y)
++ ifneq ($(nosharedlibs),y)
+-LIB += libxenguest.so libxenguest.so.$(MAJOR) libxenguest.so.$(MAJOR).$(MINOR)
- +LIB += libxenguest.so libxenguest-$(XEN_VERSION).so
+++LIB += libxenguest.so libxenguest-$(PACKAGE_VERSION).so
+ endif
+
- ifneq ($(stubdom),y)
- @@ -136,15 +133,13 @@ libs: $(LIB)
++ ifneq ($(nosharedlibs),y)
++@@ -147,15 +144,13 @@ libs: $(LIB)
+ install: build
+ $(INSTALL_DIR) $(DESTDIR)$(LIBDIR)
+ $(INSTALL_DIR) $(DESTDIR)$(INCLUDEDIR)
- - $(INSTALL_PROG) libxenctrl.so.$(MAJOR).$(MINOR) $(DESTDIR)$(LIBDIR)
- + $(INSTALL_PROG) libxenctrl-$(XEN_VERSION).so $(DESTDIR)$(LIBDIR)
++- $(INSTALL_SHLIB) libxenctrl.so.$(MAJOR).$(MINOR) $(DESTDIR)$(LIBDIR)
+++ $(INSTALL_SHLIB) libxenctrl-$(PACKAGE_VERSION).so $(DESTDIR)$(LIBDIR)
+ $(INSTALL_DATA) libxenctrl.a $(DESTDIR)$(LIBDIR)
- - ln -sf libxenctrl.so.$(MAJOR).$(MINOR) $(DESTDIR)$(LIBDIR)/libxenctrl.so.$(MAJOR)
- - ln -sf libxenctrl.so.$(MAJOR) $(DESTDIR)$(LIBDIR)/libxenctrl.so
- + ln -sf libxenctrl-$(XEN_VERSION).so $(DESTDIR)$(LIBDIR)/libxenctrl.so
- $(INSTALL_DATA) xenctrl.h xenctrlosdep.h xentoollog.h $(DESTDIR)$(INCLUDEDIR)
- - $(INSTALL_PROG) libxenguest.so.$(MAJOR).$(MINOR) $(DESTDIR)$(LIBDIR)
- + $(INSTALL_PROG) libxenguest-$(XEN_VERSION).so $(DESTDIR)$(LIBDIR)
++- $(SYMLINK_SHLIB) libxenctrl.so.$(MAJOR).$(MINOR) $(DESTDIR)$(LIBDIR)/libxenctrl.so.$(MAJOR)
++- $(SYMLINK_SHLIB) libxenctrl.so.$(MAJOR) $(DESTDIR)$(LIBDIR)/libxenctrl.so
+++ $(SYMLINK_SHLIB) libxenctrl-$(PACKAGE_VERSION).so $(DESTDIR)$(LIBDIR)/libxenctrl.so
++ $(INSTALL_DATA) include/xenctrl.h include/xenctrlosdep.h include/xentoollog.h $(DESTDIR)$(INCLUDEDIR)
++- $(INSTALL_SHLIB) libxenguest.so.$(MAJOR).$(MINOR) $(DESTDIR)$(LIBDIR)
+++ $(INSTALL_SHLIB) libxenguest-$(PACKAGE_VERSION).so $(DESTDIR)$(LIBDIR)
+ $(INSTALL_DATA) libxenguest.a $(DESTDIR)$(LIBDIR)
- - ln -sf libxenguest.so.$(MAJOR).$(MINOR) $(DESTDIR)$(LIBDIR)/libxenguest.so.$(MAJOR)
- - ln -sf libxenguest.so.$(MAJOR) $(DESTDIR)$(LIBDIR)/libxenguest.so
- + ln -sf libxenguest-$(XEN_VERSION).so $(DESTDIR)$(LIBDIR)/libxenguest.so
- $(INSTALL_DATA) xenguest.h $(DESTDIR)$(INCLUDEDIR)
++- $(SYMLINK_SHLIB) libxenguest.so.$(MAJOR).$(MINOR) $(DESTDIR)$(LIBDIR)/libxenguest.so.$(MAJOR)
++- $(SYMLINK_SHLIB) libxenguest.so.$(MAJOR) $(DESTDIR)$(LIBDIR)/libxenguest.so
+++ $(SYMLINK_SHLIB) libxenguest-$(PACKAGE_VERSION).so $(DESTDIR)$(LIBDIR)/libxenguest.so
++ $(INSTALL_DATA) include/xenguest.h $(DESTDIR)$(INCLUDEDIR)
+
+ .PHONY: TAGS
- @@ -173,22 +168,18 @@ rpm: build
++@@ -185,22 +180,18 @@ rpm: build
+ libxenctrl.a: $(CTRL_LIB_OBJS)
+ $(AR) rc $@ $^
+
+-libxenctrl.so: libxenctrl.so.$(MAJOR)
- - ln -sf $< $@
++- $(SYMLINK_SHLIB) $< $@
+-libxenctrl.so.$(MAJOR): libxenctrl.so.$(MAJOR).$(MINOR)
- +libxenctrl.so: libxenctrl-$(XEN_VERSION).so
- ln -sf $< $@
+++libxenctrl.so: libxenctrl-$(PACKAGE_VERSION).so
++ $(SYMLINK_SHLIB) $< $@
+
+-libxenctrl.so.$(MAJOR).$(MINOR): $(CTRL_PIC_OBJS)
+- $(CC) $(LDFLAGS) $(PTHREAD_LDFLAGS) -Wl,$(SONAME_LDFLAG) -Wl,libxenctrl.so.$(MAJOR) $(SHLIB_LDFLAGS) -o $@ $^ $(DLOPEN_LIBS) $(PTHREAD_LIBS) $(APPEND_LDFLAGS)
- +libxenctrl-$(XEN_VERSION).so: $(CTRL_PIC_OBJS)
+++libxenctrl-$(PACKAGE_VERSION).so: $(CTRL_PIC_OBJS)
++ $(CC) $(LDFLAGS) $(PTHREAD_LDFLAGS) -Wl,$(SONAME_LDFLAG),$@ $(SHLIB_LDFLAGS) -o $@ $^ $(DLOPEN_LIBS) $(PTHREAD_LIBS) $(APPEND_LDFLAGS)
+
+ # libxenguest
+
+ libxenguest.a: $(GUEST_LIB_OBJS)
+ $(AR) rc $@ $^
+
+-libxenguest.so: libxenguest.so.$(MAJOR)
- - ln -sf $< $@
++- $(SYMLINK_SHLIB) $< $@
+-libxenguest.so.$(MAJOR): libxenguest.so.$(MAJOR).$(MINOR)
- +libxenguest.so: libxenguest-$(XEN_VERSION).so
- ln -sf $< $@
+++libxenguest.so: libxenguest-$(PACKAGE_VERSION).so
++ $(SYMLINK_SHLIB) $< $@
+
+ ifeq ($(CONFIG_MiniOS),y)
- @@ -200,9 +191,9 @@ endif
++@@ -212,9 +203,9 @@ endif
+ xc_dom_bzimageloader.o: CFLAGS += $(call zlib-options,D)
+ xc_dom_bzimageloader.opic: CFLAGS += $(call zlib-options,D)
+
+-libxenguest.so.$(MAJOR).$(MINOR): COMPRESSION_LIBS = $(call zlib-options,l)
+-libxenguest.so.$(MAJOR).$(MINOR): $(GUEST_PIC_OBJS) libxenctrl.so
+- $(CC) $(LDFLAGS) -Wl,$(SONAME_LDFLAG) -Wl,libxenguest.so.$(MAJOR) $(SHLIB_LDFLAGS) -o $@ $(GUEST_PIC_OBJS) $(COMPRESSION_LIBS) -lz $(LDLIBS_libxenctrl) $(PTHREAD_LIBS) $(APPEND_LDFLAGS)
- +libxenguest-$(XEN_VERSION).so: COMPRESSION_LIBS = $(call zlib-options,l)
- +libxenguest-$(XEN_VERSION).so: $(GUEST_PIC_OBJS) libxenctrl-$(XEN_VERSION).so
+++libxenguest-$(PACKAGE_VERSION).so: COMPRESSION_LIBS = $(call zlib-options,l)
+++libxenguest-$(PACKAGE_VERSION).so: $(GUEST_PIC_OBJS) libxenctrl-$(PACKAGE_VERSION).so
++ $(CC) $(LDFLAGS) -Wl,$(SONAME_LDFLAG),$@ $(SHLIB_LDFLAGS) -o $@ $(GUEST_PIC_OBJS) $(COMPRESSION_LIBS) -lz $(LDLIBS_libxenctrl) $(PTHREAD_LIBS) $(APPEND_LDFLAGS)
+
+ xenctrl_osdep_ENOSYS.so: $(OSDEP_PIC_OBJS) libxenctrl.so
- $(CC) -g $(LDFLAGS) $(SHLIB_LDFLAGS) -o $@ $(OSDEP_PIC_OBJS) $(LDLIBS_libxenctrl) $(APPEND_LDFLAGS)
++ $(CC) $(LDFLAGS) $(SHLIB_LDFLAGS) -o $@ $(OSDEP_PIC_OBJS) $(LDLIBS_libxenctrl) $(APPEND_LDFLAGS)
diff --cc debian/patches/tools-libxl-abiname.diff
index 766e4f4,0000000..272b6fe
mode 100644,000000..100644
--- a/debian/patches/tools-libxl-abiname.diff
+++ b/debian/patches/tools-libxl-abiname.diff
@@@ -1,81 -1,0 +1,81 @@@
- From 11a304a31b9c43087ce887d2708099c1658f2b58 Mon Sep 17 00:00:00 2001
++From 402d3cfa4b5f7066a2df2269ab6eec97728aeae4 Mon Sep 17 00:00:00 2001
+From: Bastian Blank <waldi at debian.org>
+Date: Sat, 5 Jul 2014 11:46:49 +0200
+Subject: tools-libxl-abiname.diff
+
+Patch-Name: tools-libxl-abiname.diff
+---
+ tools/libxl/Makefile | 34 ++++++++++------------------------
+ 1 file changed, 10 insertions(+), 24 deletions(-)
+
+diff --git a/tools/libxl/Makefile b/tools/libxl/Makefile
- index 755b666..b002c54 100644
++index df08c8a..1c5a00b 100644
+--- a/tools/libxl/Makefile
++++ b/tools/libxl/Makefile
+@@ -5,12 +5,6 @@
+ XEN_ROOT = $(CURDIR)/../..
+ include $(XEN_ROOT)/tools/Rules.mk
+
- -MAJOR = 4.4
++-MAJOR = 4.5
+-MINOR = 0
+-
+-XLUMAJOR = 4.3
+-XLUMINOR = 0
+-
+ CFLAGS += -Werror -Wno-format-zero-length -Wmissing-declarations \
+ -Wno-declaration-after-statement -Wformat-nonliteral
+ CFLAGS += -I. -fPIC
- @@ -185,14 +179,11 @@ _libxl_type%.h _libxl_type%_json.h _libxl_type%.c: libxl_type%.idl gentypes.py i
++@@ -206,14 +200,11 @@ _libxl_type%.h _libxl_type%_json.h _libxl_type%_private.h _libxl_type%.c: libxl_
+ $(call move-if-changed,__libxl_type$*_json.h,_libxl_type$*_json.h)
+ $(call move-if-changed,__libxl_type$*.c,_libxl_type$*.c)
+
+-libxenlight.so: libxenlight.so.$(MAJOR)
- +libxenlight.so: libxenlight-$(XEN_VERSION).so
- ln -sf $< $@
+++libxenlight.so: libxenlight-$(PACKAGE_VERSION).so
++ $(SYMLINK_SHLIB) $< $@
+
+-libxenlight.so.$(MAJOR): libxenlight.so.$(MAJOR).$(MINOR)
- - ln -sf $< $@
++- $(SYMLINK_SHLIB) $< $@
+-
+-libxenlight.so.$(MAJOR).$(MINOR): $(LIBXL_OBJS)
+- $(CC) $(LDFLAGS) -Wl,$(SONAME_LDFLAG) -Wl,libxenlight.so.$(MAJOR) $(SHLIB_LDFLAGS) -o $@ $^ $(LIBXL_LIBS) $(APPEND_LDFLAGS)
- +libxenlight-$(XEN_VERSION).so: $(LIBXL_OBJS)
+++libxenlight-$(PACKAGE_VERSION).so: $(LIBXL_OBJS)
++ $(CC) $(LDFLAGS) -Wl,$(SONAME_LDFLAG),$@ $(SHLIB_LDFLAGS) -o $@ $^ $(LIBXL_LIBS) $(APPEND_LDFLAGS)
+
+ libxenlight_test.so: $(LIBXL_OBJS) $(LIBXL_TEST_OBJS)
+ $(CC) $(LDFLAGS) -Wl,$(SONAME_LDFLAG) -Wl,libxenlight.so.$(MAJOR) $(SHLIB_LDFLAGS) -o $@ $^ $(LIBXL_LIBS) $(APPEND_LDFLAGS)
- @@ -200,14 +191,11 @@ libxenlight_test.so: $(LIBXL_OBJS) $(LIBXL_TEST_OBJS)
++@@ -221,14 +212,11 @@ libxenlight_test.so: $(LIBXL_OBJS) $(LIBXL_TEST_OBJS)
+ libxenlight.a: $(LIBXL_OBJS)
+ $(AR) rcs libxenlight.a $^
+
+-libxlutil.so: libxlutil.so.$(XLUMAJOR)
- - ln -sf $< $@
++- $(SYMLINK_SHLIB) $< $@
+-
+-libxlutil.so.$(XLUMAJOR): libxlutil.so.$(XLUMAJOR).$(XLUMINOR)
- +libxlutil.so: libxlutil-$(XEN_VERSION).so
- ln -sf $< $@
+++libxlutil.so: libxlutil-$(PACKAGE_VERSION).so
++ $(SYMLINK_SHLIB) $< $@
+
+-libxlutil.so.$(XLUMAJOR).$(XLUMINOR): $(LIBXLU_OBJS)
+- $(CC) $(LDFLAGS) -Wl,$(SONAME_LDFLAG) -Wl,libxlutil.so.$(XLUMAJOR) $(SHLIB_LDFLAGS) -o $@ $^ $(LIBXLU_LIBS) $(APPEND_LDFLAGS)
- +libxlutil-$(XEN_VERSION).so: $(LIBXLU_OBJS)
+++libxlutil-$(PACKAGE_VERSION).so: $(LIBXLU_OBJS)
++ $(CC) $(LDFLAGS) -Wl,$(SONAME_LDFLAG),$@ $(SHLIB_LDFLAGS) -o $@ $^ $(LIBXLU_LIBS) $(APPEND_LDFLAGS)
+
+ libxlutil.a: $(LIBXLU_OBJS)
+ $(AR) rcs libxlutil.a $^
- @@ -234,13 +222,11 @@ install: all
- $(INSTALL_DIR) $(DESTDIR)$(PRIVATE_BINDIR)
++@@ -258,13 +246,11 @@ install: all
+ $(INSTALL_PROG) xl $(DESTDIR)$(SBINDIR)
- $(INSTALL_PROG) libxl-save-helper $(DESTDIR)$(PRIVATE_BINDIR)
- - $(INSTALL_PROG) libxenlight.so.$(MAJOR).$(MINOR) $(DESTDIR)$(LIBDIR)
- - ln -sf libxenlight.so.$(MAJOR).$(MINOR) $(DESTDIR)$(LIBDIR)/libxenlight.so.$(MAJOR)
- - ln -sf libxenlight.so.$(MAJOR) $(DESTDIR)$(LIBDIR)/libxenlight.so
- + $(INSTALL_PROG) libxenlight-$(XEN_VERSION).so $(DESTDIR)$(LIBDIR)
- + ln -sf libxenlight-$(XEN_VERSION).so $(DESTDIR)$(LIBDIR)/libxenlight.so
++ $(INSTALL_PROG) xen-init-dom0 $(DESTDIR)$(LIBEXEC_BIN)
++ $(INSTALL_PROG) libxl-save-helper $(DESTDIR)$(LIBEXEC_BIN)
++- $(INSTALL_SHLIB) libxenlight.so.$(MAJOR).$(MINOR) $(DESTDIR)$(LIBDIR)
++- $(SYMLINK_SHLIB) libxenlight.so.$(MAJOR).$(MINOR) $(DESTDIR)$(LIBDIR)/libxenlight.so.$(MAJOR)
++- $(SYMLINK_SHLIB) libxenlight.so.$(MAJOR) $(DESTDIR)$(LIBDIR)/libxenlight.so
+++ $(INSTALL_SHLIB) libxenlight-$(PACKAGE_VERSION).so $(DESTDIR)$(LIBDIR)
+++ $(SYMLINK_SHLIB) libxenlight-$(PACKAGE_VERSION).so $(DESTDIR)$(LIBDIR)/libxenlight.so
+ $(INSTALL_DATA) libxenlight.a $(DESTDIR)$(LIBDIR)
- - $(INSTALL_PROG) libxlutil.so.$(XLUMAJOR).$(XLUMINOR) $(DESTDIR)$(LIBDIR)
- - ln -sf libxlutil.so.$(XLUMAJOR).$(XLUMINOR) $(DESTDIR)$(LIBDIR)/libxlutil.so.$(XLUMAJOR)
- - ln -sf libxlutil.so.$(XLUMAJOR) $(DESTDIR)$(LIBDIR)/libxlutil.so
- + $(INSTALL_PROG) libxlutil-$(XEN_VERSION).so $(DESTDIR)$(LIBDIR)
- + ln -sf libxlutil-$(XEN_VERSION).so $(DESTDIR)$(LIBDIR)/libxlutil.so
++- $(INSTALL_SHLIB) libxlutil.so.$(XLUMAJOR).$(XLUMINOR) $(DESTDIR)$(LIBDIR)
++- $(SYMLINK_SHLIB) libxlutil.so.$(XLUMAJOR).$(XLUMINOR) $(DESTDIR)$(LIBDIR)/libxlutil.so.$(XLUMAJOR)
++- $(SYMLINK_SHLIB) libxlutil.so.$(XLUMAJOR) $(DESTDIR)$(LIBDIR)/libxlutil.so
+++ $(INSTALL_SHLIB) libxlutil-$(PACKAGE_VERSION).so $(DESTDIR)$(LIBDIR)
+++ $(SYMLINK_SHLIB) libxlutil-$(PACKAGE_VERSION).so $(DESTDIR)$(LIBDIR)/libxlutil.so
+ $(INSTALL_DATA) libxlutil.a $(DESTDIR)$(LIBDIR)
+ $(INSTALL_DATA) libxl.h libxl_event.h libxl_json.h _libxl_types.h _libxl_types_json.h _libxl_list.h libxl_utils.h libxl_uuid.h $(DESTDIR)$(INCLUDEDIR)
+ $(INSTALL_DATA) bash-completion $(DESTDIR)$(BASH_COMPLETION_DIR)/xl.sh
diff --cc debian/patches/tools-libxl-prefix.diff
index 11d9295,0000000..ba90c3a
mode 100644,000000..100644
--- a/debian/patches/tools-libxl-prefix.diff
+++ b/debian/patches/tools-libxl-prefix.diff
@@@ -1,70 -1,0 +1,55 @@@
- From 3f24c2632f080487bb2f789a8249be6ca58e8301 Mon Sep 17 00:00:00 2001
++From 05c3a7581b37dcde3a10900a53cd51c3fa4413e8 Mon Sep 17 00:00:00 2001
+From: Bastian Blank <waldi at debian.org>
+Date: Sat, 5 Jul 2014 11:46:57 +0200
+Subject: tools-libxl-prefix.diff
+
+Patch-Name: tools-libxl-prefix.diff
+---
- tools/libxl/Makefile | 9 +++++----
- tools/xenstat/libxenstat/Makefile | 2 +-
- 2 files changed, 6 insertions(+), 5 deletions(-)
++ tools/libxl/Makefile | 9 +++++----
++ 1 file changed, 5 insertions(+), 4 deletions(-)
+
+diff --git a/tools/libxl/Makefile b/tools/libxl/Makefile
- index b002c54..39e20ad 100644
++index 1c5a00b..e15bb7c 100644
+--- a/tools/libxl/Makefile
++++ b/tools/libxl/Makefile
+@@ -12,6 +12,8 @@ CFLAGS += -I. -fPIC
+ ifeq ($(CONFIG_Linux),y)
+ LIBUUID_LIBS += -luuid
+ endif
++LDFLAGS_XL = $(call LDFLAGS_RPATH,../lib)
++LDFLAGS_LIBXL = $(call LDFLAGS_RPATH)
+
+ LIBXL_LIBS =
+ LIBXL_LIBS = $(LDLIBS_libxenctrl) $(LDLIBS_libxenguest) $(LDLIBS_libxenstore) $(LDLIBS_libblktapctl) $(PTYFUNCS_LIBS) $(LIBUUID_LIBS)
- @@ -183,7 +185,7 @@ libxenlight.so: libxenlight-$(XEN_VERSION).so
- ln -sf $< $@
++@@ -204,7 +206,7 @@ libxenlight.so: libxenlight-$(PACKAGE_VERSION).so
++ $(SYMLINK_SHLIB) $< $@
+
- libxenlight-$(XEN_VERSION).so: $(LIBXL_OBJS)
++ libxenlight-$(PACKAGE_VERSION).so: $(LIBXL_OBJS)
+- $(CC) $(LDFLAGS) -Wl,$(SONAME_LDFLAG),$@ $(SHLIB_LDFLAGS) -o $@ $^ $(LIBXL_LIBS) $(APPEND_LDFLAGS)
++ $(CC) $(LDFLAGS) -Wl,$(SONAME_LDFLAG),$@ $(LDFLAGS_LIBXL) $(SHLIB_LDFLAGS) -o $@ $^ $(LIBXL_LIBS) $(APPEND_LDFLAGS)
+
+ libxenlight_test.so: $(LIBXL_OBJS) $(LIBXL_TEST_OBJS)
+ $(CC) $(LDFLAGS) -Wl,$(SONAME_LDFLAG) -Wl,libxenlight.so.$(MAJOR) $(SHLIB_LDFLAGS) -o $@ $^ $(LIBXL_LIBS) $(APPEND_LDFLAGS)
- @@ -201,7 +203,7 @@ libxlutil.a: $(LIBXLU_OBJS)
++@@ -222,7 +224,7 @@ libxlutil.a: $(LIBXLU_OBJS)
+ $(AR) rcs libxlutil.a $^
+
+ xl: $(XL_OBJS) libxlutil.so libxenlight.so
+- $(CC) $(LDFLAGS) -o $@ $(XL_OBJS) libxlutil.so $(LDLIBS_libxenlight) $(LDLIBS_libxenctrl) -lyajl $(APPEND_LDFLAGS)
++ $(CC) $(LDFLAGS) $(LDFLAGS_XL) -o $@ $(XL_OBJS) libxlutil.so $(LDLIBS_libxenlight) $(LDLIBS_libxenctrl) -lyajl $(APPEND_LDFLAGS)
+
- test_%: test_%.o test_common.o libxlutil.so libxenlight_test.so
- $(CC) $(LDFLAGS) -o $@ $^ $(filter-out %libxenlight.so, $(LDLIBS_libxenlight)) $(LDLIBS_libxenctrl) -lyajl $(APPEND_LDFLAGS)
- @@ -214,13 +216,12 @@ testidl: testidl.o libxlutil.so libxenlight.so
++ xen-init-dom0: $(XEN_INIT_DOM0_OBJS) libxenlight.so
++ $(CC) $(LDFLAGS) -o $@ $(XEN_INIT_DOM0_OBJS) $(LDLIBS_libxenstore) $(LDLIBS_libxenlight) $(LDLIBS_libxenctrl) $(APPEND_LDFLAGS)
++@@ -238,12 +240,11 @@ testidl: testidl.o libxlutil.so libxenlight.so
+
+ .PHONY: install
+ install: all
+- $(INSTALL_DIR) $(DESTDIR)$(SBINDIR)
+ $(INSTALL_DIR) $(DESTDIR)$(LIBDIR)
+ $(INSTALL_DIR) $(DESTDIR)$(INCLUDEDIR)
+ $(INSTALL_DIR) $(DESTDIR)$(BASH_COMPLETION_DIR)
- $(INSTALL_DIR) $(DESTDIR)$(XEN_RUN_DIR)
- $(INSTALL_DIR) $(DESTDIR)$(PRIVATE_BINDIR)
++ $(INSTALL_DIR) $(DESTDIR)$(LIBEXEC_BIN)
+- $(INSTALL_PROG) xl $(DESTDIR)$(SBINDIR)
- + $(INSTALL_PROG) xl $(DESTDIR)$(PRIVATE_BINDIR)
- $(INSTALL_PROG) libxl-save-helper $(DESTDIR)$(PRIVATE_BINDIR)
- $(INSTALL_PROG) libxenlight-$(XEN_VERSION).so $(DESTDIR)$(LIBDIR)
- ln -sf libxenlight-$(XEN_VERSION).so $(DESTDIR)$(LIBDIR)/libxenlight.so
- diff --git a/tools/xenstat/libxenstat/Makefile b/tools/xenstat/libxenstat/Makefile
- index 669bb1f..6089755 100644
- --- a/tools/xenstat/libxenstat/Makefile
- +++ b/tools/xenstat/libxenstat/Makefile
- @@ -53,7 +53,7 @@ $(SHLIB): $(OBJECTS-y)
- install: all
- $(INSTALL_DATA) src/xenstat.h $(DESTDIR)$(INCLUDEDIR)
- $(INSTALL_DATA) $(LIB) $(DESTDIR)$(LIBDIR)/libxenstat.a
- - $(INSTALL_PROG) src/libxenstat.so $(DESTDIR)$(LIBDIR)
- + $(INSTALL_PROG) src/libxenstat.so $(DESTDIR)$(PRIVATE_LIBDIR)
-
- PYLIB=bindings/swig/python/_xenstat.so
- PYMOD=bindings/swig/python/xenstat.py
+++ $(INSTALL_PROG) xl $(DESTDIR)$(LIBEXEC_BIN)
++ $(INSTALL_PROG) xen-init-dom0 $(DESTDIR)$(LIBEXEC_BIN)
++ $(INSTALL_PROG) libxl-save-helper $(DESTDIR)$(LIBEXEC_BIN)
++ $(INSTALL_SHLIB) libxenlight-$(PACKAGE_VERSION).so $(DESTDIR)$(LIBDIR)
diff --cc debian/patches/tools-misc-prefix.diff
index 7c13e9c,0000000..22e4c59
mode 100644,000000..100644
--- a/debian/patches/tools-misc-prefix.diff
+++ b/debian/patches/tools-misc-prefix.diff
@@@ -1,51 -1,0 +1,37 @@@
- From 02114134100401cf516261e5b15d305145d9c8e8 Mon Sep 17 00:00:00 2001
++From 794ff234fe557f154402ca50dc8c08f3bbc0d12e Mon Sep 17 00:00:00 2001
+From: Bastian Blank <waldi at debian.org>
+Date: Sat, 5 Jul 2014 11:46:59 +0200
+Subject: tools-misc-prefix.diff
+
+Patch-Name: tools-misc-prefix.diff
+---
- tools/misc/Makefile | 8 +++-----
- tools/python/xen/xend/xend | 2 ++
- 2 files changed, 5 insertions(+), 5 deletions(-)
++ tools/misc/Makefile | 8 +++-----
++ 1 file changed, 3 insertions(+), 5 deletions(-)
+
+diff --git a/tools/misc/Makefile b/tools/misc/Makefile
- index 17aeda5..56d4b82 100644
++index 7a2bfd2..98627f9 100644
+--- a/tools/misc/Makefile
++++ b/tools/misc/Makefile
+@@ -32,6 +32,8 @@ INSTALL_PRIVBIN := $(INSTALL_PRIVBIN-y)
+ # Include configure output (config.h) to headers search path
+ CFLAGS += -I$(XEN_ROOT)/tools
+
++APPEND_LDFLAGS += $(call LDFLAGS_RPATH,../lib)
++
+ .PHONY: all
+ all: build
+
- @@ -41,12 +43,8 @@ build: $(TARGETS)
++@@ -40,12 +42,8 @@ build: $(TARGETS)
+
+ .PHONY: install
+ install: build
+- $(INSTALL_DIR) $(DESTDIR)$(BINDIR)
+- $(INSTALL_DIR) $(DESTDIR)$(SBINDIR)
- $(INSTALL_DIR) $(DESTDIR)$(PRIVATE_BINDIR)
++ $(INSTALL_DIR) $(DESTDIR)$(LIBEXEC_BIN)
+- $(INSTALL_PYTHON_PROG) $(INSTALL_BIN) $(DESTDIR)$(BINDIR)
+- $(INSTALL_PYTHON_PROG) $(INSTALL_SBIN) $(DESTDIR)$(SBINDIR)
- - $(INSTALL_PYTHON_PROG) $(INSTALL_PRIVBIN) $(DESTDIR)$(PRIVATE_BINDIR)
- + $(INSTALL_PYTHON_PROG) $(INSTALL_BIN) $(INSTALL_SBIN) $(INSTALL_PRIVBIN) $(DESTDIR)$(PRIVATE_BINDIR)
- set -e; for d in $(SUBDIRS); do $(MAKE) -C $$d install-recurse; done
++- $(INSTALL_PYTHON_PROG) $(INSTALL_PRIVBIN) $(DESTDIR)$(LIBEXEC_BIN)
+++ $(INSTALL_PYTHON_PROG) $(INSTALL_BIN) $(INSTALL_SBIN) $(INSTALL_PRIVBIN) $(DESTDIR)$(LIBEXEC_BIN)
+
+ .PHONY: clean
- diff --git a/tools/python/xen/xend/xend b/tools/python/xen/xend/xend
- index 9ef0210..3446c8e 100644
- --- a/tools/python/xen/xend/xend
- +++ b/tools/python/xen/xend/xend
- @@ -33,6 +33,8 @@ import signal
- import time
- import commands
-
- +sys.path.insert(1, sys.path[0] + '/../lib/python')
- +
- from xen.xend.server import SrvDaemon
-
- class CheckError(ValueError):
++ clean:
diff --cc debian/patches/tools-pygrub-prefix.diff
index 7f3244b,0000000..37c4920
mode 100644,000000..100644
--- a/debian/patches/tools-pygrub-prefix.diff
+++ b/debian/patches/tools-pygrub-prefix.diff
@@@ -1,42 -1,0 +1,59 @@@
- From 755283c8766340546fb7856f11f81502c18c9831 Mon Sep 17 00:00:00 2001
++From 8aa1828689ff90535bb53d4d2ad2e0f2de9ddab8 Mon Sep 17 00:00:00 2001
+From: Bastian Blank <waldi at debian.org>
+Date: Sat, 5 Jul 2014 11:47:01 +0200
+Subject: tools-pygrub-prefix.diff
+
+Patch-Name: tools-pygrub-prefix.diff
+---
++ tools/pygrub/Makefile | 5 -----
+ tools/pygrub/setup.py | 2 ++
+ tools/pygrub/src/pygrub | 2 ++
- 2 files changed, 4 insertions(+)
++ 3 files changed, 4 insertions(+), 5 deletions(-)
+
++diff --git a/tools/pygrub/Makefile b/tools/pygrub/Makefile
++index 3dff608..5fe4a80 100644
++--- a/tools/pygrub/Makefile
+++++ b/tools/pygrub/Makefile
++@@ -13,11 +13,6 @@ install: all
++ CC="$(CC)" CFLAGS="$(CFLAGS) $(APPEND_LDFLAGS)" $(PYTHON) setup.py install \
++ $(PYTHON_PREFIX_ARG) --root="$(DESTDIR)" \
++ --install-scripts=$(LIBEXEC_BIN) --force
++- set -e; if [ $(BINDIR) != $(LIBEXEC_BIN) -a \
++- "`readlink -f $(DESTDIR)/$(BINDIR)`" != \
++- "`readlink -f $(LIBEXEC_BIN)`" ]; then \
++- ln -sf $(LIBEXEC_BIN)/pygrub $(DESTDIR)/$(BINDIR); \
++- fi
++
++ .PHONY: clean
++ clean:
+diff --git a/tools/pygrub/setup.py b/tools/pygrub/setup.py
+index 52dcf57..8a1be9a 100644
+--- a/tools/pygrub/setup.py
++++ b/tools/pygrub/setup.py
+@@ -4,11 +4,13 @@ import os
+ import sys
+
+ extra_compile_args = [ "-fno-strict-aliasing", "-Werror" ]
++extra_link_args = [ "-Wl,-rpath,${ORIGIN}/.." ]
+
+ XEN_ROOT = "../.."
+
+ fsimage = Extension("fsimage",
+ extra_compile_args = extra_compile_args,
++ extra_link_args = extra_link_args,
+ include_dirs = [ XEN_ROOT + "/tools/libfsimage/common/" ],
+ library_dirs = [ XEN_ROOT + "/tools/libfsimage/common/" ],
+ libraries = ["fsimage"],
+diff --git a/tools/pygrub/src/pygrub b/tools/pygrub/src/pygrub
- index 45a7290..1e3e3ba 100644
++index aa7e562..17f2396 100644
+--- a/tools/pygrub/src/pygrub
++++ b/tools/pygrub/src/pygrub
+@@ -22,6 +22,8 @@ import xen.lowlevel.xc
+ import curses, _curses, curses.wrapper, curses.textpad, curses.ascii
+ import getopt
+
++sys.path.insert(1, sys.path[0] + '/../lib/python')
++
+ import fsimage
+ import grub.GrubConf
+ import grub.LiloConf
diff --cc debian/patches/tools-pygrub-remove-static-solaris-support
index 1563655,0000000..f772027
mode 100644,000000..100644
--- a/debian/patches/tools-pygrub-remove-static-solaris-support
+++ b/debian/patches/tools-pygrub-remove-static-solaris-support
@@@ -1,86 -1,0 +1,86 @@@
- From b0160947a9e22114aa4b8b3f55ecb10a9c3dcc30 Mon Sep 17 00:00:00 2001
++From a3cd6003c363ef8c12a257ff4a6ae259ad39dc44 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
++Subject: Remove static solaris support from pygrub
+
+Patch-Name: 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 1e3e3ba..2964140 100644
++index 17f2396..de1086e 100644
+--- a/tools/pygrub/src/pygrub
++++ b/tools/pygrub/src/pygrub
- @@ -17,7 +17,6 @@ import os, sys, string, struct, tempfile, re, traceback
++@@ -17,7 +17,6 @@ import os, sys, string, struct, tempfile, re, traceback, stat, errno
+ 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):
++@@ -662,51 +661,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__":
++@@ -892,10 +846,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/tools-python-prefix.diff
index 14b1718,0000000..725a4ca
mode 100644,000000..100644
--- a/debian/patches/tools-python-prefix.diff
+++ b/debian/patches/tools-python-prefix.diff
@@@ -1,148 -1,0 +1,46 @@@
- From 995133b1d2a5e180b8f50e5abde596bdb85fba77 Mon Sep 17 00:00:00 2001
++From 57b592e0c05196a32512652582fa171f71c694a9 Mon Sep 17 00:00:00 2001
+From: Bastian Blank <waldi at debian.org>
+Date: Sat, 5 Jul 2014 11:47:02 +0200
+Subject: tools-python-prefix.diff
+
+Patch-Name: tools-python-prefix.diff
+---
- tools/python/setup.py | 10 ++++++++++
- tools/python/xen/util/auxbin.py | 36 +++++++++++++++++++-----------------
- 2 files changed, 29 insertions(+), 17 deletions(-)
++ tools/python/setup.py | 4 ++++
++ 1 file changed, 4 insertions(+)
+
+diff --git a/tools/python/setup.py b/tools/python/setup.py
- index 8127b21..702a383 100644
++index 439c429..7e3684f 100644
+--- a/tools/python/setup.py
++++ b/tools/python/setup.py
+@@ -5,6 +5,7 @@ import os, sys
+ XEN_ROOT = "../.."
+
+ extra_compile_args = [ "-fno-strict-aliasing", "-Werror" ]
++extra_link_args = [ "-Wl,-rpath,${ORIGIN}/../../.." ]
+
+ PATH_XEN = XEN_ROOT + "/tools/include"
+ PATH_LIBXC = XEN_ROOT + "/tools/libxc"
+@@ -13,6 +14,7 @@ PATH_XENSTORE = XEN_ROOT + "/tools/xenstore"
+
+ xc = Extension("xc",
+ extra_compile_args = extra_compile_args,
++ extra_link_args = extra_link_args,
- include_dirs = [ PATH_XEN, PATH_LIBXC, "xen/lowlevel/xc" ],
++ include_dirs = [ PATH_XEN, PATH_LIBXC + "/include", "xen/lowlevel/xc" ],
+ library_dirs = [ PATH_LIBXC ],
+ libraries = [ "xenctrl", "xenguest" ],
+@@ -21,6 +23,7 @@ xc = Extension("xc",
+
+ xs = Extension("xs",
+ extra_compile_args = extra_compile_args,
++ extra_link_args = extra_link_args,
- include_dirs = [ PATH_XEN, PATH_XENSTORE, "xen/lowlevel/xs" ],
++ include_dirs = [ PATH_XEN, PATH_XENSTORE + "/include", "xen/lowlevel/xs" ],
+ library_dirs = [ PATH_XENSTORE ],
+ libraries = [ "xenstore" ],
+@@ -29,6 +32,7 @@ xs = Extension("xs",
+
- scf = Extension("scf",
- extra_compile_args = extra_compile_args,
- + extra_link_args = extra_link_args,
- include_dirs = [ "xen/lowlevel/scf" ],
- library_dirs = [ ],
- libraries = [ ],
- @@ -37,6 +41,7 @@ scf = Extension("scf",
-
- process = Extension("process",
- extra_compile_args = extra_compile_args,
- + extra_link_args = extra_link_args,
- include_dirs = [ "xen/lowlevel/process" ],
- library_dirs = [ ],
- libraries = [ "contract" ],
- @@ -45,6 +50,7 @@ process = Extension("process",
-
- flask = Extension("flask",
- extra_compile_args = extra_compile_args,
- + extra_link_args = extra_link_args,
- include_dirs = [ PATH_XEN, PATH_LIBXC, "xen/lowlevel/flask" ],
- library_dirs = [ PATH_LIBXC ],
- libraries = [ "xenctrl" ],
- @@ -53,6 +59,7 @@ flask = Extension("flask",
-
- ptsname = Extension("ptsname",
- extra_compile_args = extra_compile_args,
- + extra_link_args = extra_link_args,
- include_dirs = [ "ptsname" ],
- library_dirs = [ ],
- libraries = [ ],
- @@ -61,6 +68,7 @@ ptsname = Extension("ptsname",
-
- checkpoint = Extension("checkpoint",
- extra_compile_args = extra_compile_args,
- + extra_link_args = extra_link_args,
- include_dirs = [ PATH_XEN, PATH_LIBXC, PATH_XENSTORE ],
- library_dirs = [ PATH_LIBXC, PATH_XENSTORE ],
- libraries = [ "xenctrl", "xenguest", "xenstore", "rt" ],
- @@ -72,6 +80,7 @@ checkpoint = Extension("checkpoint",
-
- netlink = Extension("netlink",
- extra_compile_args = extra_compile_args,
- + extra_link_args = extra_link_args,
- include_dirs = [ ],
- library_dirs = [ ],
- libraries = [ ],
- @@ -81,6 +90,7 @@ netlink = Extension("netlink",
-
+ xl = Extension("xl",
+ extra_compile_args = extra_compile_args,
++ extra_link_args = extra_link_args,
- include_dirs = [ PATH_XEN, PATH_LIBXL, PATH_LIBXC, "xen/lowlevel/xl" ],
++ include_dirs = [ PATH_XEN, PATH_LIBXL, PATH_LIBXC + "/include", "xen/lowlevel/xl" ],
+ library_dirs = [ PATH_LIBXL ],
+ libraries = [ "xenlight" ],
- diff --git a/tools/python/xen/util/auxbin.py b/tools/python/xen/util/auxbin.py
- index a690ad9..b1bd191 100644
- --- a/tools/python/xen/util/auxbin.py
- +++ b/tools/python/xen/util/auxbin.py
- @@ -19,29 +19,31 @@
- import os
- import os.path
- import sys
- -from xen.util.path import *
- +import xen.util.path
- +
- +
- +class _Path(object):
- + def __init__(self, path=[]):
- + self._path = path
- + def __call__(self, name):
- + for dir in self._path:
- + real = os.path.join(dir, name)
- + if os.path.exists(real):
- + return real
- +
- +
- +path_bin = _Path([xen.util.path.PRIVATE_BINDIR, '/usr/lib/xen/bin', '/usr/sbin', '/sbin', '/usr/bin', '/bin'])
- +path_boot = _Path([xen.util.path.XENFIRMWAREDIR, '/usr/lib/xen/boot', '/boot'])
-
- def execute(exe, args = None):
- - exepath = pathTo(exe)
- + exepath = path_bin(exe)
- a = [ exepath ]
- if args:
- a.extend(args)
- - try:
- - os.execv(exepath, a)
- - except (OSError, TypeError), exn:
- - print exepath, ": ", exn
- - sys.exit(1)
- -
- -SEARCHDIRS = [ BINDIR, SBINDIR, LIBEXEC, PRIVATE_BINDIR, XENFIRMWAREDIR ]
- -def pathTo(exebin):
- - for dir in SEARCHDIRS:
- - exe = os.path.join(dir, exebin)
- - if os.path.exists(exe):
- - return exe
- - return None
- + os.execv(exepath, a)
-
- def xen_configdir():
- - return XEN_CONFIG_DIR
- + return xen.util.path.XEN_CONFIG_DIR
-
- def scripts_dir():
- - return XEN_SCRIPT_DIR
- + return xen.util.path.XEN_SCRIPT_DIR
diff --cc debian/patches/tools-rpath.diff
index a62a322,0000000..426522a
mode 100644,000000..100644
--- a/debian/patches/tools-rpath.diff
+++ b/debian/patches/tools-rpath.diff
@@@ -1,23 -1,0 +1,23 @@@
- From cf39071467ab7d09b4260f0e2908c1f6c4721af0 Mon Sep 17 00:00:00 2001
++From 22587a5e3487242779ebce73c20132add0b04530 Mon Sep 17 00:00:00 2001
+From: Bastian Blank <waldi at debian.org>
+Date: Sat, 5 Jul 2014 11:46:51 +0200
+Subject: tools-rpath.diff
+
+Patch-Name: tools-rpath.diff
+---
+ tools/Rules.mk | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/tools/Rules.mk b/tools/Rules.mk
- index 13d8fc1..0d9d98c 100644
++index 87a56dc..6b3a62a 100644
+--- a/tools/Rules.mk
++++ b/tools/Rules.mk
+@@ -9,6 +9,8 @@ include $(XEN_ROOT)/Config.mk
+ export _INSTALL := $(INSTALL)
+ INSTALL = $(XEN_ROOT)/tools/cross-install
+
++LDFLAGS_RPATH = -Wl,-rpath,'$${ORIGIN}$(if $(1),/$(1))'
++
+ XEN_INCLUDE = $(XEN_ROOT)/tools/include
+ XEN_LIBXC = $(XEN_ROOT)/tools/libxc
+ XEN_XENLIGHT = $(XEN_ROOT)/tools/libxl
diff --cc debian/patches/tools-xcutils-rpath.diff
index d60e061,0000000..197e8ee
mode 100644,000000..100644
--- a/debian/patches/tools-xcutils-rpath.diff
+++ b/debian/patches/tools-xcutils-rpath.diff
@@@ -1,23 -1,0 +1,23 @@@
- From c8425e52400d7370d58aab689b0c9ad150992f2a Mon Sep 17 00:00:00 2001
++From 7bfdd00ceb1699d7545343896417badd4a4b50e7 Mon Sep 17 00:00:00 2001
+From: Bastian Blank <waldi at debian.org>
+Date: Sat, 5 Jul 2014 11:47:05 +0200
+Subject: tools-xcutils-rpath.diff
+
+Patch-Name: tools-xcutils-rpath.diff
+---
+ tools/xcutils/Makefile | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/tools/xcutils/Makefile b/tools/xcutils/Makefile
- index 6c502f1..d0d20d6 100644
++index 1c5237c..298981b 100644
+--- a/tools/xcutils/Makefile
++++ b/tools/xcutils/Makefile
- @@ -20,6 +20,8 @@ CFLAGS_xc_save.o := $(CFLAGS_libxenctrl) $(CFLAGS_libxenguest) $(CFLAGS_libxe
- CFLAGS_readnotes.o := $(CFLAGS_libxenctrl) $(CFLAGS_libxenguest)
++@@ -19,6 +19,8 @@ CFLAGS += -Werror
++ CFLAGS_readnotes.o := $(CFLAGS_libxenctrl) $(CFLAGS_libxenguest) -I$(XEN_ROOT)/tools/libxc
+ CFLAGS_lsevtchn.o := $(CFLAGS_libxenctrl)
+
++APPEND_LDFLAGS += $(call LDFLAGS_RPATH,../lib)
++
+ .PHONY: all
+ all: build
+
diff --cc debian/patches/tools-xenmon-install.diff
index ca44e6d,0000000..25bfe34
mode 100644,000000..100644
--- a/debian/patches/tools-xenmon-install.diff
+++ b/debian/patches/tools-xenmon-install.diff
@@@ -1,34 -1,0 +1,34 @@@
- From a04b1971492440cfebbbb9cdcef56f8d70fc4761 Mon Sep 17 00:00:00 2001
++From 26a8aa331f53aec1689731532094959ea749da4e 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
+
+Patch-Name: 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
++index eb10389..f79c327 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)$(LIBEXEC_BIN)
++ $(INSTALL_PROG) xenbaked $(DESTDIR)$(LIBEXEC_BIN)/xenbaked
++ $(INSTALL_PROG) xentrace_setmask $(DESTDIR)$(LIBEXEC_BIN)/xentrace_setmask
++- $(INSTALL_PROG) xenmon.py $(DESTDIR)$(LIBEXEC_BIN)/xenmon.py
+++ $(INSTALL_PROG) xenmon.py $(DESTDIR)$(LIBEXEC_BIN)/xenmon
+ $(INSTALL_DIR) $(DESTDIR)$(DOCDIR)
+ $(INSTALL_DATA) README $(DESTDIR)$(DOCDIR)/README.xenmon
+
diff --cc debian/patches/tools-xenmon-prefix.diff
index 8fd7af0,0000000..a1b2e9f
mode 100644,000000..100644
--- a/debian/patches/tools-xenmon-prefix.diff
+++ b/debian/patches/tools-xenmon-prefix.diff
@@@ -1,37 -1,0 +1,37 @@@
- From 7890b6a82243405fd71018580cc12ce142de636d Mon Sep 17 00:00:00 2001
++From cc094cf644ad8955e227f5c5427b1c93389ef383 Mon Sep 17 00:00:00 2001
+From: Bastian Blank <waldi at debian.org>
+Date: Sat, 5 Jul 2014 11:47:06 +0200
+Subject: tools-xenmon-prefix.diff
+
+Patch-Name: tools-xenmon-prefix.diff
+---
+ tools/xenmon/Makefile | 9 +++++----
+ 1 file changed, 5 insertions(+), 4 deletions(-)
+
+diff --git a/tools/xenmon/Makefile b/tools/xenmon/Makefile
- index 3fe87ba..dab5415 100644
++index 3fe87ba..eb10389 100644
+--- a/tools/xenmon/Makefile
++++ b/tools/xenmon/Makefile
+@@ -16,6 +16,7 @@ include $(XEN_ROOT)/tools/Rules.mk
+ CFLAGS += -Werror
+ CFLAGS += $(CFLAGS_libxenctrl)
+ LDLIBS += $(LDLIBS_libxenctrl)
++LDFLAGS += $(call LDFLAGS_RPATH,../lib)
+
+ SCRIPTS = xenmon.py
+
+@@ -27,10 +28,10 @@ build: xentrace_setmask xenbaked
+
+ .PHONY: install
+ install: build
+- $(INSTALL_DIR) $(DESTDIR)$(SBINDIR)
+- $(INSTALL_PROG) xenbaked $(DESTDIR)$(SBINDIR)/xenbaked
+- $(INSTALL_PROG) xentrace_setmask $(DESTDIR)$(SBINDIR)/xentrace_setmask
+- $(INSTALL_PROG) xenmon.py $(DESTDIR)$(SBINDIR)/xenmon.py
- + $(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_DIR) $(DESTDIR)$(LIBEXEC_BIN)
+++ $(INSTALL_PROG) xenbaked $(DESTDIR)$(LIBEXEC_BIN)/xenbaked
+++ $(INSTALL_PROG) xentrace_setmask $(DESTDIR)$(LIBEXEC_BIN)/xentrace_setmask
+++ $(INSTALL_PROG) xenmon.py $(DESTDIR)$(LIBEXEC_BIN)/xenmon.py
+ $(INSTALL_DIR) $(DESTDIR)$(DOCDIR)
+ $(INSTALL_DATA) README $(DESTDIR)$(DOCDIR)/README.xenmon
+
diff --cc debian/patches/tools-xenpaging-prefix.diff
index 7d341a4,0000000..77cd1d1
mode 100644,000000..100644
--- a/debian/patches/tools-xenpaging-prefix.diff
+++ b/debian/patches/tools-xenpaging-prefix.diff
@@@ -1,34 -1,0 +1,23 @@@
- From 8d4e0f7ace4dd7e41af63b9f8203a69dc1f6db76 Mon Sep 17 00:00:00 2001
++From 2d9b92f5b0a94534595224ab783b7d3946ef43cd Mon Sep 17 00:00:00 2001
+From: Bastian Blank <waldi at debian.org>
+Date: Sat, 5 Jul 2014 11:47:08 +0200
+Subject: tools-xenpaging-prefix.diff
+
+Patch-Name: tools-xenpaging-prefix.diff
+---
- tools/xenpaging/Makefile | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
++ tools/xenpaging/Makefile | 2 +-
++ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/tools/xenpaging/Makefile b/tools/xenpaging/Makefile
- index 548d9dd..b5147da 100644
++index c742e62..ffdc29b 100644
+--- a/tools/xenpaging/Makefile
++++ b/tools/xenpaging/Makefile
- @@ -3,7 +3,7 @@ include $(XEN_ROOT)/tools/Rules.mk
-
- CFLAGS += $(CFLAGS_libxenctrl) $(CFLAGS_libxenstore) $(PTHREAD_CFLAGS)
++@@ -4,7 +4,7 @@ include $(XEN_ROOT)/tools/Rules.mk
++ # xenpaging.c and file_ops.c incorrectly use libxc internals
++ CFLAGS += $(CFLAGS_libxenctrl) $(CFLAGS_libxenstore) $(PTHREAD_CFLAGS) -I$(XEN_ROOT)/tools/libxc
+ LDLIBS += $(LDLIBS_libxenctrl) $(LDLIBS_libxenstore) $(PTHREAD_LIBS)
+-LDFLAGS += $(PTHREAD_LDFLAGS)
++LDFLAGS += $(PTHREAD_LDFLAGS) $(call LDFLAGS_RPATH,../lib)
+
+ POLICY = default
+
- @@ -25,8 +25,8 @@ xenpaging: $(OBJS)
-
- install: all
- $(INSTALL_DIR) $(DESTDIR)$(XEN_PAGING_DIR)
- - $(INSTALL_DIR) $(DESTDIR)$(LIBEXEC)
- - $(INSTALL_PROG) $(IBINS) $(DESTDIR)$(LIBEXEC)
- + $(INSTALL_DIR) $(DESTDIR)$(PRIVATE_BINDIR)
- + $(INSTALL_PROG) $(IBINS) $(DESTDIR)$(PRIVATE_BINDIR)
-
- clean:
- rm -f *.o *~ $(DEPS) xen TAGS $(IBINS) $(LIB)
diff --cc debian/patches/tools-xenpmd-prefix.diff
index 0000000,0000000..2923425
new file mode 100644
--- /dev/null
+++ b/debian/patches/tools-xenpmd-prefix.diff
@@@ -1,0 -1,0 +1,25 @@@
++From 9dee08b274bc47c6df2706f06a7985a976358aa4 Mon Sep 17 00:00:00 2001
++From: Bastian Blank <waldi at debian.org>
++Date: Sat, 13 Dec 2014 19:37:02 +0100
++Subject: tools-xenpmd-prefix.diff
++
++Patch-Name: tools-xenpmd-prefix.diff
++---
++ tools/xenpmd/Makefile | 4 ++--
++ 1 file changed, 2 insertions(+), 2 deletions(-)
++
++diff --git a/tools/xenpmd/Makefile b/tools/xenpmd/Makefile
++index 2d925df..d7c0b6c 100644
++--- a/tools/xenpmd/Makefile
+++++ b/tools/xenpmd/Makefile
++@@ -11,8 +11,8 @@ all: xenpmd
++
++ .PHONY: install
++ install: all
++- $(INSTALL_DIR) $(DESTDIR)$(SBINDIR)
++- $(INSTALL_PROG) xenpmd $(DESTDIR)$(SBINDIR)
+++ $(INSTALL_DIR) $(DESTDIR)$(LIBEXEC_BIN)
+++ $(INSTALL_PROG) xenpmd $(DESTDIR)$(LIBEXEC_BIN)
++
++ .PHONY: clean
++ clean:
diff --cc debian/patches/tools-xenstat-abiname.diff
index fdfba4c,0000000..f72f459
mode 100644,000000..100644
--- a/debian/patches/tools-xenstat-abiname.diff
+++ b/debian/patches/tools-xenstat-abiname.diff
@@@ -1,64 -1,0 +1,65 @@@
- From 17957eb752727543ff74bb733b9dc653a47b2e38 Mon Sep 17 00:00:00 2001
++From 68ce7e635b54b1b9b2a56328e65ce0f63c8f3c66 Mon Sep 17 00:00:00 2001
+From: Bastian Blank <waldi at debian.org>
+Date: Sat, 5 Jul 2014 11:46:50 +0200
+Subject: tools-xenstat-abiname.diff
+
+Patch-Name: tools-xenstat-abiname.diff
+---
+ tools/xenstat/libxenstat/Makefile | 20 ++++----------------
+ 1 file changed, 4 insertions(+), 16 deletions(-)
+
+diff --git a/tools/xenstat/libxenstat/Makefile b/tools/xenstat/libxenstat/Makefile
- index 21aad89..669bb1f 100644
++index 86068cb..3469385 100644
+--- a/tools/xenstat/libxenstat/Makefile
++++ b/tools/xenstat/libxenstat/Makefile
- @@ -22,17 +22,13 @@ libdir=$(prefix)/lib
++@@ -18,18 +18,14 @@ include $(XEN_ROOT)/tools/Rules.mk
+ LDCONFIG=ldconfig
+ MAKE_LINK=ln -sf
+
+-MAJOR=0
+-MINOR=0
+-
+ LIB=src/libxenstat.a
+-SHLIB=src/libxenstat.so.$(MAJOR).$(MINOR)
+-SHLIB_LINKS=src/libxenstat.so.$(MAJOR) src/libxenstat.so
++SHLIB=src/libxenstat.so
+ OBJECTS-y=src/xenstat.o
+ OBJECTS-$(CONFIG_Linux) += src/xenstat_linux.o
+ OBJECTS-$(CONFIG_SunOS) += src/xenstat_solaris.o
+ OBJECTS-$(CONFIG_NetBSD) += src/xenstat_netbsd.o
++ OBJECTS-$(CONFIG_FreeBSD) += src/xenstat_freebsd.o
+-SONAME_FLAGS=-Wl,$(SONAME_LDFLAG) -Wl,libxenstat.so.$(MAJOR)
++SONAME_FLAGS=-Wl,$(SONAME_LDFLAG),libxenstat.so
+
- WARN_FLAGS=-Wall -Werror
-
- @@ -43,7 +39,7 @@ LDLIBS-y = $(LDLIBS_libxenstore) $(LDLIBS_libxenctrl)
++ CFLAGS+=-fPIC
++ CFLAGS+=-Isrc $(CFLAGS_libxenctrl) $(CFLAGS_libxenstore) $(CFLAGS_xeninclude)
++@@ -38,7 +34,7 @@ LDLIBS-y = $(LDLIBS_libxenstore) $(LDLIBS_libxenctrl)
+ LDLIBS-$(CONFIG_SunOS) += -lkstat
+
+ .PHONY: all
+-all: $(LIB) $(SHLIB) $(SHLIB_LINKS)
++all: $(LIB) $(SHLIB)
+
+ $(LIB): $(OBJECTS-y)
+ $(AR) rc $@ $^
- @@ -53,19 +49,11 @@ $(SHLIB): $(OBJECTS-y)
++@@ -48,19 +44,11 @@ $(SHLIB): $(OBJECTS-y)
+ $(CC) $(LDFLAGS) $(SONAME_FLAGS) $(SHLIB_LDFLAGS) -o $@ \
+ $(OBJECTS-y) $(LDLIBS-y) $(APPEND_LDFLAGS)
+
+-src/libxenstat.so.$(MAJOR): $(SHLIB)
+- $(MAKE_LINK) $(<F) $@
+-
+-src/libxenstat.so: src/libxenstat.so.$(MAJOR)
+- $(MAKE_LINK) $(<F) $@
+-
+ .PHONY: install
+ install: all
+ $(INSTALL_DATA) src/xenstat.h $(DESTDIR)$(INCLUDEDIR)
+ $(INSTALL_DATA) $(LIB) $(DESTDIR)$(LIBDIR)/libxenstat.a
+- $(INSTALL_PROG) src/libxenstat.so.$(MAJOR).$(MINOR) $(DESTDIR)$(LIBDIR)
+- ln -sf libxenstat.so.$(MAJOR).$(MINOR) $(DESTDIR)$(LIBDIR)/libxenstat.so.$(MAJOR)
+- ln -sf libxenstat.so.$(MAJOR) $(DESTDIR)$(LIBDIR)/libxenstat.so
++ $(INSTALL_PROG) src/libxenstat.so $(DESTDIR)$(LIBDIR)
+
+ PYLIB=bindings/swig/python/_xenstat.so
+ PYMOD=bindings/swig/python/xenstat.py
diff --cc debian/patches/tools-xenstat-prefix.diff
index 9a74313,0000000..616078a
mode 100644,000000..100644
--- a/debian/patches/tools-xenstat-prefix.diff
+++ b/debian/patches/tools-xenstat-prefix.diff
@@@ -1,48 -1,0 +1,52 @@@
- From d66e717b740d1ca2e48718ac5c0c19afbab7e896 Mon Sep 17 00:00:00 2001
++From 43707de4d411710c890f65b152ece3e61e07f12e Mon Sep 17 00:00:00 2001
+From: Bastian Blank <waldi at debian.org>
+Date: Sat, 5 Jul 2014 11:47:09 +0200
+Subject: tools-xenstat-prefix.diff
+
+Patch-Name: tools-xenstat-prefix.diff
+---
- tools/xenstat/libxenstat/Makefile | 1 +
++ tools/xenstat/libxenstat/Makefile | 3 ++-
+ tools/xenstat/xentop/Makefile | 6 ++++--
- 2 files changed, 5 insertions(+), 2 deletions(-)
++ 2 files changed, 6 insertions(+), 3 deletions(-)
+
+diff --git a/tools/xenstat/libxenstat/Makefile b/tools/xenstat/libxenstat/Makefile
- index 6089755..eaf40b4 100644
++index 3469385..661ab16 100644
+--- a/tools/xenstat/libxenstat/Makefile
++++ b/tools/xenstat/libxenstat/Makefile
- @@ -51,6 +51,7 @@ $(SHLIB): $(OBJECTS-y)
++@@ -46,9 +46,10 @@ $(SHLIB): $(OBJECTS-y)
+
+ .PHONY: install
+ install: all
- + $(INSTALL_DIR) $(DESTDIR)$(LIBDIR) $(DESTDIR)$(PRIVATE_LIBDIR)
+++ $(INSTALL_DIR) $(DESTDIR)$(LIBDIR) $(DESTDIR)$(LIBEXEC_LIB)
+ $(INSTALL_DATA) src/xenstat.h $(DESTDIR)$(INCLUDEDIR)
+ $(INSTALL_DATA) $(LIB) $(DESTDIR)$(LIBDIR)/libxenstat.a
- $(INSTALL_PROG) src/libxenstat.so $(DESTDIR)$(PRIVATE_LIBDIR)
++- $(INSTALL_PROG) src/libxenstat.so $(DESTDIR)$(LIBDIR)
+++ $(INSTALL_PROG) src/libxenstat.so $(DESTDIR)$(LIBEXEC_LIB)
++
++ PYLIB=bindings/swig/python/_xenstat.so
++ PYMOD=bindings/swig/python/xenstat.py
+diff --git a/tools/xenstat/xentop/Makefile b/tools/xenstat/xentop/Makefile
- index afed0d1..61f1c7d 100644
++index 076e44c..33e8740 100644
+--- a/tools/xenstat/xentop/Makefile
++++ b/tools/xenstat/xentop/Makefile
+@@ -19,7 +19,9 @@ all install xentop:
+ else
+
- CFLAGS += -DGCC_PRINTF -Wall -Werror $(CFLAGS_libxenstat)
++ CFLAGS += -DGCC_PRINTF -Werror $(CFLAGS_libxenstat)
++LDFLAGS += $(call LDFLAGS_RPATH,../lib)
- LDLIBS += $(LDLIBS_libxenstat) $(CURSES_LIBS) $(SOCKET_LIBS)
++ LDLIBS += $(LDLIBS_libxenstat) $(CURSES_LIBS) $(SOCKET_LIBS) -lm
++LDLIBS += $(LDLIBS_libxenctrl) $(LDLIBS_libxenstore)
+ CFLAGS += -DHOST_$(XEN_OS)
+
+ # Include configure output (config.h) to headers search path
- @@ -30,8 +32,8 @@ all: xentop
++@@ -31,8 +33,8 @@ all: xentop
+
+ .PHONY: install
+ install: xentop xentop.1
+- $(INSTALL_DIR) $(DESTDIR)$(SBINDIR)
+- $(INSTALL_PROG) xentop $(DESTDIR)$(SBINDIR)/xentop
- + $(INSTALL_DIR) $(DESTDIR)$(PRIVATE_BINDIR)
- + $(INSTALL_PROG) xentop $(DESTDIR)$(PRIVATE_BINDIR)/xentop
+++ $(INSTALL_DIR) $(DESTDIR)$(LIBEXEC_BIN)
+++ $(INSTALL_PROG) xentop $(DESTDIR)$(LIBEXEC_BIN)/xentop
+ $(INSTALL_DIR) $(DESTDIR)$(MAN1DIR)
+ $(INSTALL_DATA) xentop.1 $(DESTDIR)$(MAN1DIR)/xentop.1
+
diff --cc debian/patches/tools-xenstore-compatibility.diff
index 652ab17,0000000..69bb222
mode 100644,000000..100644
--- a/debian/patches/tools-xenstore-compatibility.diff
+++ b/debian/patches/tools-xenstore-compatibility.diff
@@@ -1,62 -1,0 +1,62 @@@
- From f590cef34c6d4a84449cb0bc46c843745cf195a0 Mon Sep 17 00:00:00 2001
++From 4ccbd7db0dcba9f9322fa71b17da086fa6cd6e2b 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
+
+Patch-Name: tools-xenstore-compatibility.diff
+---
- tools/xenstore/xenstore.h | 1 +
- tools/xenstore/xenstore_client.c | 2 +-
- tools/xenstore/xs.c | 4 +++-
++ tools/xenstore/include/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
++diff --git a/tools/xenstore/include/xenstore.h b/tools/xenstore/include/xenstore.h
+index fdf5e76..b45224b 100644
- --- a/tools/xenstore/xenstore.h
- +++ b/tools/xenstore/xenstore.h
++--- a/tools/xenstore/include/xenstore.h
+++++ b/tools/xenstore/include/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
++index 1054f18..e6fa58d 100644
+--- a/tools/xenstore/xenstore_client.c
++++ b/tools/xenstore/xenstore_client.c
- @@ -632,7 +632,7 @@ main(int argc, char **argv)
++@@ -635,7 +635,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
++index 968141d..738d86f 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());
diff --cc debian/patches/tools-xenstore-prefix.diff
index 4a542ab,0000000..fc19d00
mode 100644,000000..100644
--- a/debian/patches/tools-xenstore-prefix.diff
+++ b/debian/patches/tools-xenstore-prefix.diff
@@@ -1,59 -1,0 +1,61 @@@
- From dfef5e187690887a937be5fe34770b599067070f Mon Sep 17 00:00:00 2001
++From c06d96cdbe650d2f7d2ed23fccba59bf8d0f3d34 Mon Sep 17 00:00:00 2001
+From: Bastian Blank <waldi at debian.org>
+Date: Sat, 5 Jul 2014 11:47:12 +0200
+Subject: tools-xenstore-prefix.diff
+
+Patch-Name: tools-xenstore-prefix.diff
+---
- tools/xenstore/Makefile | 16 +++++++++-------
- 1 file changed, 9 insertions(+), 7 deletions(-)
++ tools/xenstore/Makefile | 18 ++++++++++--------
++ 1 file changed, 10 insertions(+), 8 deletions(-)
+
+diff --git a/tools/xenstore/Makefile b/tools/xenstore/Makefile
- index 262f401..153c36f 100644
++index bff9b25..f0a0b14 100644
+--- a/tools/xenstore/Makefile
++++ b/tools/xenstore/Makefile
- @@ -8,6 +8,8 @@ CFLAGS += -Werror
- CFLAGS += -I.
- CFLAGS += $(CFLAGS_libxenctrl)
++@@ -17,6 +17,8 @@ LDFLAGS-$(CONFIG_SYSTEMD) += $(SYSTEMD_LIBS)
++ CFLAGS += $(CFLAGS-y)
++ LDFLAGS += $(LDFLAGS-y)
+
++LDFLAGS_libxenctrl += $(call LDFLAGS_RPATH,../lib)
++
+ CLIENTS := xenstore-exists xenstore-list xenstore-read xenstore-rm xenstore-chmod
+ CLIENTS += xenstore-write xenstore-ls xenstore-watch
+
- @@ -58,10 +60,10 @@ endif
++@@ -74,10 +76,10 @@ endif
+ init-xenstore-domain.o: CFLAGS += $(CFLAGS_libxenguest)
+
+ init-xenstore-domain: init-xenstore-domain.o $(LIBXENSTORE)
+- $(CC) $(LDFLAGS) $^ $(LDLIBS_libxenctrl) $(LDLIBS_libxenguest) $(LDLIBS_libxenstore) -o $@ $(APPEND_LDFLAGS)
++ $(CC) $(LDFLAGS) $^ $(LDLIBS_libxenctrl) $(LDLIBS_libxenguest) $(LDLIBS_libxenstore) $(call LDFLAGS_RPATH,../lib) -o $@ $(APPEND_LDFLAGS)
+
+ xenstored: $(XENSTORED_OBJS)
+- $(CC) $(LDFLAGS) $^ $(LDLIBS_libxenctrl) $(SOCKET_LIBS) -o $@ $(APPEND_LDFLAGS)
++ $(CC) $(LDFLAGS) $^ $(LDLIBS_libxenctrl) $(SOCKET_LIBS) $(call LDFLAGS_RPATH,../lib) -o $@ $(APPEND_LDFLAGS)
+
+ xenstored.a: $(XENSTORED_OBJS)
+ $(AR) cr $@ $^
- @@ -109,17 +111,17 @@ tarball: clean
++@@ -125,18 +127,18 @@ tarball: clean
+
+ .PHONY: install
+ install: all
+- $(INSTALL_DIR) $(DESTDIR)$(BINDIR)
- + $(INSTALL_DIR) $(DESTDIR)$(PRIVATE_BINDIR)
- $(INSTALL_DIR) $(DESTDIR)$(SBINDIR)
+++ $(INSTALL_DIR) $(DESTDIR)$(LIBEXEC_BIN)
+++ $(INSTALL_DIR) $(DESTDIR)$(SBINDIR)
+ $(INSTALL_DIR) $(DESTDIR)$(INCLUDEDIR)
+ $(INSTALL_DIR) $(DESTDIR)$(INCLUDEDIR)/xenstore-compat
- $(INSTALL_DIR) $(DESTDIR)/var/run/xenstored
- $(INSTALL_DIR) $(DESTDIR)/var/lib/xenstored
++ ifeq ($(XENSTORE_XENSTORED),y)
++- $(INSTALL_DIR) $(DESTDIR)$(SBINDIR)
++ $(INSTALL_DIR) $(DESTDIR)$(XEN_LIB_STORED)
+- $(INSTALL_PROG) xenstored $(DESTDIR)$(SBINDIR)
+++ $(INSTALL_PROG) xenstored $(DESTDIR)$(LIBEXEC_BIN)
++ endif
+- $(INSTALL_PROG) xenstore-control $(DESTDIR)$(BINDIR)
+- $(INSTALL_PROG) xenstore $(DESTDIR)$(BINDIR)
- + $(INSTALL_PROG) xenstored $(DESTDIR)$(PRIVATE_BINDIR)
- + $(INSTALL_PROG) xenstore-control $(DESTDIR)$(PRIVATE_BINDIR)
+++ $(INSTALL_PROG) xenstore-control $(DESTDIR)$(LIBEXEC_BIN)
++ $(INSTALL_PROG) xenstore $(DESTDIR)$(SBINDIR)
+ set -e ; for c in $(CLIENTS) ; do \
+- ln -f $(DESTDIR)$(BINDIR)/xenstore $(DESTDIR)$(BINDIR)/$${c} ; \
- + ln -f xenstore $(DESTDIR)$(SBINDIR)/$${c} ; \
+++ ln -f $(DESTDIR)$(SBINDIR)/xenstore $(DESTDIR)$(SBINDIR)/$${c} ; \
+ done
+ $(INSTALL_DIR) $(DESTDIR)$(LIBDIR)
- $(INSTALL_PROG) libxenstore.so.$(MAJOR).$(MINOR) $(DESTDIR)$(LIBDIR)
++ $(INSTALL_SHLIB) libxenstore.so.$(MAJOR).$(MINOR) $(DESTDIR)$(LIBDIR)
diff --cc debian/patches/tools-xentrace-prefix.diff
index fb0b972,0000000..d1546e7
mode 100644,000000..100644
--- a/debian/patches/tools-xentrace-prefix.diff
+++ b/debian/patches/tools-xentrace-prefix.diff
@@@ -1,39 -1,0 +1,39 @@@
- From 5870bdab405f9d52009dde6e9c18c00566274ebb Mon Sep 17 00:00:00 2001
++From a86b5a90f4008e6704167c63535a49a8977f77f8 Mon Sep 17 00:00:00 2001
+From: Bastian Blank <waldi at debian.org>
+Date: Sat, 5 Jul 2014 11:47:14 +0200
+Subject: tools-xentrace-prefix.diff
+
+Patch-Name: tools-xentrace-prefix.diff
+---
+ tools/xentrace/Makefile | 9 ++++-----
+ 1 file changed, 4 insertions(+), 5 deletions(-)
+
+diff --git a/tools/xentrace/Makefile b/tools/xentrace/Makefile
- index 63b09c0..fcc578a 100644
++index b821952..ffe2f0d 100644
+--- a/tools/xentrace/Makefile
++++ b/tools/xentrace/Makefile
+@@ -5,6 +5,7 @@ CFLAGS += -Werror
+
+ CFLAGS += $(CFLAGS_libxenctrl)
+ LDLIBS += $(LDLIBS_libxenctrl)
++LDFLAGS += $(call LDFLAGS_RPATH,../lib)
+
+ BIN = xentrace xentrace_setsize
+ LIBBIN = xenctx
+@@ -20,13 +21,11 @@ build: $(BIN) $(LIBBIN)
+
+ .PHONY: install
+ install: build
+- $(INSTALL_DIR) $(DESTDIR)$(BINDIR)
- - [ -z "$(LIBBIN)" ] || $(INSTALL_DIR) $(DESTDIR)$(PRIVATE_BINDIR)
- + $(INSTALL_DIR) $(DESTDIR)$(PRIVATE_BINDIR)
++- [ -z "$(LIBBIN)" ] || $(INSTALL_DIR) $(DESTDIR)$(LIBEXEC_BIN)
+++ $(INSTALL_DIR) $(DESTDIR)$(LIBEXEC_BIN)
+ $(INSTALL_DIR) $(DESTDIR)$(MAN1DIR)
+ $(INSTALL_DIR) $(DESTDIR)$(MAN8DIR)
+- $(INSTALL_PROG) $(BIN) $(DESTDIR)$(BINDIR)
+- $(INSTALL_PYTHON_PROG) $(SCRIPTS) $(DESTDIR)$(BINDIR)
- - [ -z "$(LIBBIN)" ] || $(INSTALL_PROG) $(LIBBIN) $(DESTDIR)$(PRIVATE_BINDIR)
- + $(INSTALL_PROG) $(BIN) $(LIBBIN) $(DESTDIR)$(PRIVATE_BINDIR)
- + $(INSTALL_PYTHON_PROG) $(SCRIPTS) $(DESTDIR)$(PRIVATE_BINDIR)
++- [ -z "$(LIBBIN)" ] || $(INSTALL_PROG) $(LIBBIN) $(DESTDIR)$(LIBEXEC_BIN)
+++ $(INSTALL_PROG) $(BIN) $(LIBBIN) $(DESTDIR)$(LIBEXEC_BIN)
+++ $(INSTALL_PYTHON_PROG) $(SCRIPTS) $(DESTDIR)$(LIBEXEC_BIN)
+ $(INSTALL_DATA) $(MAN1) $(DESTDIR)$(MAN1DIR)
+ $(INSTALL_DATA) $(MAN8) $(DESTDIR)$(MAN8DIR)
+
diff --cc debian/patches/version.diff
index 3c0bde2,0000000..cece35f
mode 100644,000000..100644
--- a/debian/patches/version.diff
+++ b/debian/patches/version.diff
@@@ -1,170 -1,0 +1,170 @@@
- From a56d50ac2bb489b7767b225f994b884c500cd6af Mon Sep 17 00:00:00 2001
++From e3eb13e030e91ed7d3bcd1f15d2c1c66bb51f1c5 Mon Sep 17 00:00:00 2001
+From: Bastian Blank <waldi at debian.org>
+Date: Sat, 5 Jul 2014 11:46:43 +0200
+Subject: version
+
+Patch-Name: version.diff
+---
+ xen/Makefile | 11 +++++------
+ xen/common/kernel.c | 4 ++--
+ xen/common/version.c | 21 +++++++++++----------
+ xen/drivers/char/console.c | 9 +++------
+ xen/include/xen/compile.h.in | 8 ++++----
+ xen/include/xen/version.h | 8 ++++----
+ 6 files changed, 29 insertions(+), 32 deletions(-)
+
+diff --git a/xen/Makefile b/xen/Makefile
- index 134a8bd..10d1424 100644
++index 72c1313..ca6f0c1 100644
+--- a/xen/Makefile
++++ b/xen/Makefile
- @@ -122,20 +122,19 @@ delete-unfresh-files:
++@@ -125,20 +125,19 @@ delete-unfresh-files:
+ @mv -f $@.tmp $@
+
+ # compile.h contains dynamic build info. Rebuilt on every 'make' invocation.
+-include/xen/compile.h: include/xen/compile.h.in .banner
++include/xen/compile.h: include/xen/compile.h.in
+ @sed -e 's/@@date@@/$(shell LC_ALL=C date)/g' \
+ -e 's/@@time@@/$(shell LC_ALL=C date +%T)/g' \
+- -e 's/@@whoami@@/$(XEN_WHOAMI)/g' \
+- -e 's/@@domain@@/$(XEN_DOMAIN)/g' \
+- -e 's/@@hostname@@/$(shell hostname)/g' \
+ -e 's!@@compiler@@!$(shell $(CC) $(CFLAGS) --version 2>&1 | head -1)!g' \
+ -e 's/@@version@@/$(XEN_VERSION)/g' \
+ -e 's/@@subversion@@/$(XEN_SUBVERSION)/g' \
+ -e 's/@@extraversion@@/$(XEN_EXTRAVERSION)/g' \
+ -e 's!@@changeset@@!$(shell tools/scmversion $(XEN_ROOT) || echo "unavailable")!g' \
++ -e 's/@@system_distribution@@/$(shell lsb_release -is)/g' \
++ -e 's/@@system_maintainer_domain@@/$(shell cd ../../../..; dpkg-parsechangelog | sed -ne 's,^Maintainer: .[^<]*<[^@>]*@\([^>]*\)>,\1,p')/g' \
++ -e 's/@@system_maintainer_local@@/$(shell cd ../../../..; dpkg-parsechangelog | sed -ne 's,^Maintainer: .[^<]*<\([^@>]*\)@.*>,\1,p')/g' \
++ -e 's/@@system_version@@/$(shell cd ../../../..; dpkg-parsechangelog | awk '/^Version:/ {print $$2}')/g' \
+ < include/xen/compile.h.in > $@.new
+- @cat .banner
+- @$(PYTHON) tools/fig-to-oct.py < .banner >> $@.new
+ @mv -f $@.new $@
+
+ include/asm-$(TARGET_ARCH)/asm-offsets.h: arch/$(TARGET_ARCH)/asm-offsets.s
+diff --git a/xen/common/kernel.c b/xen/common/kernel.c
- index b371f8f..877d461 100644
++index d23c422..0734a50 100644
+--- a/xen/common/kernel.c
++++ b/xen/common/kernel.c
- @@ -243,8 +243,8 @@ DO(xen_version)(int cmd, XEN_GUEST_HANDLE_PARAM(void) arg)
++@@ -250,8 +250,8 @@ DO(xen_version)(int cmd, XEN_GUEST_HANDLE_PARAM(void) arg)
+ {
+ struct xen_compile_info info;
+ safe_strcpy(info.compiler, xen_compiler());
+- safe_strcpy(info.compile_by, xen_compile_by());
+- safe_strcpy(info.compile_domain, xen_compile_domain());
++ safe_strcpy(info.compile_by, xen_compile_system_maintainer_local());
++ safe_strcpy(info.compile_domain, xen_compile_system_maintainer_domain());
+ safe_strcpy(info.compile_date, xen_compile_date());
+ if ( copy_to_guest(arg, &info, 1) )
+ return -EFAULT;
+diff --git a/xen/common/version.c b/xen/common/version.c
+index b152e27..7b5af55 100644
+--- a/xen/common/version.c
++++ b/xen/common/version.c
+@@ -11,19 +11,24 @@ const char *xen_compile_time(void)
+ return XEN_COMPILE_TIME;
+ }
+
+-const char *xen_compile_by(void)
++const char *xen_compile_system_distribution(void)
+ {
+- return XEN_COMPILE_BY;
++ return XEN_COMPILE_SYSTEM_DISTRIBUTION;
+ }
+
+-const char *xen_compile_domain(void)
++const char *xen_compile_system_maintainer_local(void)
+ {
+- return XEN_COMPILE_DOMAIN;
++ return XEN_COMPILE_SYSTEM_MAINTAINER_LOCAL;
+ }
+
+-const char *xen_compile_host(void)
++const char *xen_compile_system_maintainer_domain(void)
+ {
+- return XEN_COMPILE_HOST;
++ return XEN_COMPILE_SYSTEM_MAINTAINER_DOMAIN;
++}
++
++const char *xen_compile_system_version(void)
++{
++ return XEN_COMPILE_SYSTEM_VERSION;
+ }
+
+ const char *xen_compiler(void)
+@@ -51,7 +56,3 @@ const char *xen_changeset(void)
+ return XEN_CHANGESET;
+ }
+
+-const char *xen_banner(void)
+-{
+- return XEN_BANNER;
+-}
+diff --git a/xen/drivers/char/console.c b/xen/drivers/char/console.c
- index 89ffe64..07af8d6 100644
++index 2f03259..1f5200a 100644
+--- a/xen/drivers/char/console.c
++++ b/xen/drivers/char/console.c
- @@ -667,14 +667,11 @@ void __init console_init_preirq(void)
++@@ -727,14 +727,11 @@ void __init console_init_preirq(void)
+ serial_set_rx_handler(sercon_handle, serial_rx);
+
+ /* HELLO WORLD --- start-of-day banner text. */
+- spin_lock(&console_lock);
+- __putstr(xen_banner());
+- spin_unlock(&console_lock);
+- printk("Xen version %d.%d%s (%s@%s) (%s) debug=%c %s\n",
++ printk("Xen version %d.%d%s (%s %s) (%s@%s) (%s) debug=%c %s\n",
+ xen_major_version(), xen_minor_version(), xen_extra_version(),
+- xen_compile_by(), xen_compile_domain(),
++ xen_compile_system_distribution(), xen_compile_system_version(),
++ xen_compile_system_maintainer_local(), xen_compile_system_maintainer_domain(),
+ xen_compiler(), debug_build() ? 'y' : 'n', xen_compile_date());
+- printk("Latest ChangeSet: %s\n", xen_changeset());
+
+ if ( opt_sync_console )
+ {
+diff --git a/xen/include/xen/compile.h.in b/xen/include/xen/compile.h.in
+index 440ecb2..0c3ca58 100644
+--- a/xen/include/xen/compile.h.in
++++ b/xen/include/xen/compile.h.in
+@@ -1,8 +1,9 @@
+ #define XEN_COMPILE_DATE "@@date@@"
+ #define XEN_COMPILE_TIME "@@time@@"
+-#define XEN_COMPILE_BY "@@whoami@@"
+-#define XEN_COMPILE_DOMAIN "@@domain@@"
+-#define XEN_COMPILE_HOST "@@hostname@@"
++#define XEN_COMPILE_SYSTEM_DISTRIBUTION "@@system_distribution@@"
++#define XEN_COMPILE_SYSTEM_MAINTAINER_DOMAIN "@@system_maintainer_domain@@"
++#define XEN_COMPILE_SYSTEM_MAINTAINER_LOCAL "@@system_maintainer_local@@"
++#define XEN_COMPILE_SYSTEM_VERSION "@@system_version@@"
+ #define XEN_COMPILER "@@compiler@@"
+
+ #define XEN_VERSION @@version@@
+@@ -10,4 +11,3 @@
+ #define XEN_EXTRAVERSION "@@extraversion@@"
+
+ #define XEN_CHANGESET "@@changeset@@"
+-#define XEN_BANNER \
+diff --git a/xen/include/xen/version.h b/xen/include/xen/version.h
+index 81a3c7d..c25937e 100644
+--- a/xen/include/xen/version.h
++++ b/xen/include/xen/version.h
+@@ -3,14 +3,14 @@
+
+ const char *xen_compile_date(void);
+ const char *xen_compile_time(void);
+-const char *xen_compile_by(void);
+-const char *xen_compile_domain(void);
+-const char *xen_compile_host(void);
++const char *xen_compile_system_distribution(void);
++const char *xen_compile_system_maintainer_domain(void);
++const char *xen_compile_system_maintainer_local(void);
++const char *xen_compile_system_version(void);
+ const char *xen_compiler(void);
+ unsigned int xen_major_version(void);
+ unsigned int xen_minor_version(void);
+ const char *xen_extra_version(void);
+ const char *xen_changeset(void);
+-const char *xen_banner(void);
+
+ #endif /* __XEN_VERSION_H__ */
diff --cc debian/patches/xl-coredumps-to-var-lib-xen-dump.diff
index 13a19a5,0000000..9f28e7c
mode 100644,000000..100644
--- a/debian/patches/xl-coredumps-to-var-lib-xen-dump.diff
+++ b/debian/patches/xl-coredumps-to-var-lib-xen-dump.diff
@@@ -1,80 -1,0 +1,57 @@@
- From 2ee9f4efffced82ac054728cc38e8712fd88f6a3 Mon Sep 17 00:00:00 2001
++From f1b16d718afb3270ba7284952d77c7f9641f7ead Mon Sep 17 00:00:00 2001
+From: Ian Campbell <ijc at hellion.org.uk>
+Date: Sun, 31 Aug 2014 01:42:03 +0100
+Subject: send xl coredumps /var/lib/xen/dump/NAME
+
+Patch-Name: xl-coredumps-to-var-lib-xen-dump.diff
+---
- docs/man/xl.cfg.pod.5 | 4 ++--
- tools/Makefile | 2 +-
- tools/libxl/xl_cmdimpl.c | 2 +-
- tools/python/xen/xend/XendDomainInfo.py | 4 ++--
- 4 files changed, 6 insertions(+), 6 deletions(-)
++ docs/man/xl.cfg.pod.5 | 4 ++--
++ tools/Makefile | 2 +-
++ tools/libxl/xl_cmdimpl.c | 2 +-
++ 3 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/docs/man/xl.cfg.pod.5 b/docs/man/xl.cfg.pod.5
- index e15a49f..d26ea0b 100644
++index 622ea53..11115ee 100644
+--- a/docs/man/xl.cfg.pod.5
++++ b/docs/man/xl.cfg.pod.5
- @@ -268,12 +268,12 @@ destroy`.
++@@ -298,12 +298,12 @@ destroy`.
+
+ =item B<coredump-destroy>
+
+-write a "coredump" of the domain to F</var/xen/dump/NAME> and then
++write a "coredump" of the domain to F</var/lib/xen/dump/NAME> and then
+ destroy the domain.
+
+ =item B<coredump-restart>
+
+-write a "coredump" of the domain to F</var/xen/dump/NAME> and then
++write a "coredump" of the domain to F</var/lib/xen/dump/NAME> and then
+ restart the domain.
+
+ =back
+diff --git a/tools/Makefile b/tools/Makefile
- index 2fca717..7c2dcaf 100644
++index af9798a..521bd2e 100644
+--- a/tools/Makefile
++++ b/tools/Makefile
- @@ -58,7 +58,7 @@ all: subdirs-all
++@@ -59,7 +59,7 @@ build all: subdirs-all
+
+ .PHONY: install
+ install: subdirs-install
+- $(INSTALL_DIR) $(DESTDIR)/var/xen/dump
++ $(INSTALL_DIR) $(DESTDIR)/var/lib/xen/dump/
+ $(INSTALL_DIR) $(DESTDIR)/var/log/xen
+ $(INSTALL_DIR) $(DESTDIR)/var/lib/xen
- $(INSTALL_DIR) $(DESTDIR)/var/lock/subsys
++
+diff --git a/tools/libxl/xl_cmdimpl.c b/tools/libxl/xl_cmdimpl.c
- index 4fc46eb..4e9dacb 100644
++index 0e754e7..1663b2e 100644
+--- a/tools/libxl/xl_cmdimpl.c
++++ b/tools/libxl/xl_cmdimpl.c
- @@ -1815,7 +1815,7 @@ static int handle_domain_death(uint32_t *r_domid,
++@@ -2083,7 +2083,7 @@ static int handle_domain_death(uint32_t *r_domid,
+ char *corefile;
+ int rc;
+
+- if (asprintf(&corefile, "/var/xen/dump/%s", d_config->c_info.name) < 0) {
++ if (asprintf(&corefile, "/var/lib/xen/dump/%s", d_config->c_info.name) < 0) {
+ LOG("failed to construct core dump path");
+ } else {
+ LOG("dumping core to %s", corefile);
- diff --git a/tools/python/xen/xend/XendDomainInfo.py b/tools/python/xen/xend/XendDomainInfo.py
- index cb2d36d..793f3b2 100644
- --- a/tools/python/xen/xend/XendDomainInfo.py
- +++ b/tools/python/xen/xend/XendDomainInfo.py
- @@ -2288,7 +2288,7 @@ class XendDomainInfo:
- # To prohibit directory traversal
- based_name = os.path.basename(self.info['name_label'])
-
- - coredir = "/var/xen/dump/%s" % (based_name)
- + coredir = "/var/lib/xen/dump/%s" % (based_name)
- if not os.path.exists(coredir):
- try:
- mkdir.parents(coredir, stat.S_IRWXU)
- @@ -2297,7 +2297,7 @@ class XendDomainInfo:
-
- if not os.path.isdir(coredir):
- # Use former directory to dump core
- - coredir = '/var/xen/dump'
- + coredir = '/var/lib/xen/dump/'
-
- this_time = time.strftime("%Y-%m%d-%H%M.%S", time.localtime())
- corefile = "%s/%s-%s.%s.core" % (coredir, this_time,
--
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