xen: update to 4.12

Reviewed by:		bapt
Sponsored by:		Citrix Systems R&D
Differential revision:	https://reviews.freebsd.org/D20038

8 files changed, 105 insertions, 294 deletions

diff --git a/sysutils/xen-tools/Makefile b/sysutils/xen-tools/Makefile
index 84805221d7c9..1047640bf391 100644
--- a/sysutils/xen-tools/Makefile
+++ b/sysutils/xen-tools/Makefile
@@ -2,8 +2,8 @@
 
 PORTNAME=	xen
 PKGNAMESUFFIX=	-tools
-PORTVERSION=	4.11.1
-PORTREVISION=	2
+PORTVERSION=	4.12.0
+PORTREVISION=	0
 CATEGORIES=	sysutils emulators
 MASTER_SITES=	http://downloads.xenproject.org/release/xen/${PORTVERSION}/
 
@@ -41,20 +41,10 @@ HAS_CONFIGURE=	yes
 # Set ARCH=x86_64 in order to overwrite the environment ARCH=amd64
 MAKE_ARGS=	clang=y ARCH=x86_64
 
-# Set correct include paths taking /usr/local into account.
-EXTRA_PATCHES=	${FILESDIR}/0001-build-fix-include-paths-in-FreeBSD.patch:-p1
-# Build with lld (LLVM linker)
-EXTRA_PATCHES+=	${FILESDIR}/0001-x86-replace-usage-in-the-linker-script.patch:-p1
-# Fix docs build
-EXTRA_PATCHES+=	${FILESDIR}/0001-docs-use-the-make-wildcard-function-instead-of-find.patch:-p1
-# Fix hvmloader build with LLVM LD
-EXTRA_PATCHES+=	${FILESDIR}/0001-hvmloader-fix-build-with-LLVM-Linker.patch:-p1
-
 CONFIGURE_ARGS+=	--with-system-seabios=${LOCALBASE}/share/seabios/bios.bin \
 			--mandir=${MANPREFIX}/man
 
-SHEBANG_FILES=	tools/misc/xen-ringwatch \
-		tools/misc/xencov_split \
+SHEBANG_FILES=	tools/misc/xencov_split \
 		tools/python/scripts/convert-legacy-stream \
 		tools/python/scripts/verify-stream-v2 \
 		tools/xenmon/xenmon.py
@@ -64,6 +54,8 @@ DOCS_ALL_TARGET=	docs
 INSTALL_TARGET=		install-tools
 DOCS_INSTALL_TARGET=	install-docs
 
+EXTRA_PATCHES+=	${FILESDIR}/0001-tools-include-propagate-python-interpreter-path.patch:-p1
+
 .include <bsd.port.options.mk>
 
 .if ${OPSYS} != FreeBSD
diff --git a/sysutils/xen-tools/distinfo b/sysutils/xen-tools/distinfo
index a61ead1394a4..85ee9e3c004f 100644
--- a/sysutils/xen-tools/distinfo
+++ b/sysutils/xen-tools/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1550823720
-SHA256 (xen-4.11.1.tar.gz) = be88cb2443761990efc1070d9718016561fe19066af232f9bfae572922897e59
-SIZE (xen-4.11.1.tar.gz) = 25152217
+TIMESTAMP = 1555345627
+SHA256 (xen-4.12.0.tar.gz) = 6e5455e4a58dcb2339bfcd2a89842728068b530aa62501843793f7cf743c4d64
+SIZE (xen-4.12.0.tar.gz) = 26949697
diff --git a/sysutils/xen-tools/files/0001-build-fix-include-paths-in-FreeBSD.patch b/sysutils/xen-tools/files/0001-build-fix-include-paths-in-FreeBSD.patch
deleted file mode 100644
index 576914612cb8..000000000000
--- a/sysutils/xen-tools/files/0001-build-fix-include-paths-in-FreeBSD.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From fe9b60476a548de1c62d6fc985e9741b04479d36 Mon Sep 17 00:00:00 2001
-From: Roger Pau Monne <roger.pau@citrix.com>
-Date: Mon, 2 Jul 2018 10:28:26 +0200
-Subject: [PATCH] build: fix include paths in FreeBSD
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-FreeBSD package manager uses /usr/local/ as the default install path,
-but that's not part of the compiler search path, so add it using the
-APPEND_{LIB/INCLUDES} variables.
-
-Signed-off-by: Roger Pau Monné <roger.pau@citrix.com>
-Acked-by: Wei Liu <wei.liu2@citrix.com>
----
- config/FreeBSD.mk | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/config/FreeBSD.mk b/config/FreeBSD.mk
-index afeaefbde2..98a5117e60 100644
---- a/config/FreeBSD.mk
-+++ b/config/FreeBSD.mk
-@@ -3,3 +3,7 @@ include $(XEN_ROOT)/config/StdGNU.mk
- # No wget on FreeBSD base system
- WGET = ftp
- PKG_INSTALLDIR = ${prefix}/libdata/pkgconfig
-+
-+# Add the default pkg install path
-+APPEND_LIB += /usr/local/lib
-+APPEND_INCLUDES += /usr/local/include
--- 
-2.18.0
-
diff --git a/sysutils/xen-tools/files/0001-docs-use-the-make-wildcard-function-instead-of-find.patch b/sysutils/xen-tools/files/0001-docs-use-the-make-wildcard-function-instead-of-find.patch
deleted file mode 100644
index 72c6d8bb2acb..000000000000
--- a/sysutils/xen-tools/files/0001-docs-use-the-make-wildcard-function-instead-of-find.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 76c9776e63305c23bca03eba933e7ce2ecbb749c Mon Sep 17 00:00:00 2001
-From: Roger Pau Monne <roger.pau@citrix.com>
-Date: Mon, 23 Jul 2018 17:58:35 +0200
-Subject: [PATCH] docs: use the make wildcard function instead of find
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-The regexp used with find in order to list the man pages doesn't work
-with FreeBSD find, so use a wildcard instead. No functional change.
-
-Signed-off-by: Roger Pau Monné <roger.pau@citrix.com>
----
-Cc: Ian Jackson <ian.jackson@eu.citrix.com>
-Cc: Wei Liu <wei.liu2@citrix.com>
----
- docs/Makefile | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/docs/Makefile b/docs/Makefile
-index b300bb6be1..fba6673db6 100644
---- a/docs/Makefile
-+++ b/docs/Makefile
-@@ -8,10 +8,10 @@ DATE		:= $(shell date +%Y-%m-%d)
- DOC_ARCHES      := arm x86_32 x86_64
- 
- # Documentation sources to build
--MAN1SRC-y := $(sort $(shell find man/ -regex '.*\.\(pod\|markdown\)\.1' -print))
--MAN5SRC-y := $(sort $(shell find man/ -regex '.*\.\(pod\|markdown\)\.5' -print))
--MAN7SRC-y := $(sort $(shell find man/ -regex '.*\.\(pod\|markdown\)\.7' -print))
--MAN8SRC-y := $(sort $(shell find man/ -regex '.*\.\(pod\|markdown\)\.8' -print))
-+MAN1SRC-y := $(sort $(wildcard man/*.pod.1 man/*.markdown.1))
-+MAN5SRC-y := $(sort $(wildcard man/*.pod.5 man/*.markdown.5))
-+MAN7SRC-y := $(sort $(wildcard man/*.pod.7 man/*.markdown.7))
-+MAN8SRC-y := $(sort $(wildcard man/*.pod.8 man/*.markdown.8))
- 
- MARKDOWNSRC-y := $(sort $(shell find misc -name '*.markdown' -print))
- 
--- 
-2.18.0
-
diff --git a/sysutils/xen-tools/files/0001-hvmloader-fix-build-with-LLVM-Linker.patch b/sysutils/xen-tools/files/0001-hvmloader-fix-build-with-LLVM-Linker.patch
deleted file mode 100644
index 09245d6104e7..000000000000
--- a/sysutils/xen-tools/files/0001-hvmloader-fix-build-with-LLVM-Linker.patch
+++ /dev/null
@@ -1,101 +0,0 @@
-From 9aa8c031ce844ada6832a56d3b25341bed2825db Mon Sep 17 00:00:00 2001
-From: Roger Pau Monne <roger.pau@citrix.com>
-Date: Fri, 24 Aug 2018 10:14:28 +0200
-Subject: [PATCH] hvmloader: fix build with LLVM Linker
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-The hvmloader binary generated when using LLVM LD doesn't work
-properly and seems to get stuck while trying to generate and load the
-ACPI tables. This is caused by the layout of the binary when linked
-with LLVM LD.
-
-LLVM LD has a different default linker script that GNU LD, and the
-resulting hvmloader binary is slightly different:
-
-LLVM LD:
-Program Headers:
-  Type           Offset   VirtAddr   PhysAddr   FileSiz MemSiz  Flg Align
-  PHDR           0x000034 0x000ff034 0x000ff034 0x00060 0x00060 R   0x4
-  LOAD           0x000000 0x000ff000 0x000ff000 0x38000 0x38000 RWE 0x1000
-  GNU_STACK      0x000000 0x00000000 0x00000000 0x00000 0x00000 RW  0
-
-GNU LD:
-Program Headers:
-  Type           Offset   VirtAddr   PhysAddr   FileSiz MemSiz  Flg Align
-  LOAD           0x000080 0x00100000 0x00100000 0x36308 0x3fd74 RWE 0x10
-  GNU_STACK      0x000000 0x00000000 0x00000000 0x00000 0x00000 RW  0x4
-
-Note that in the LLVM LD case (as with GNU LD) the .text section does
-indeed have the address set to 0x100000 as requested on the command
-line:
-
-[ 1] .text             PROGBITS        00100000 001000 00dd10 00  AX  0   0 16
-
-There's however the PHDR which is not present when using GNU LD.
-
-Fix this by using a very simple linker script that generates the same
-binary regardless of whether LLVM or GNU LD is used. By using a linker
-script the usage of -Ttext can also be avoided by placing the desired
-.text load address directly in the linker script.
-
-Signed-off-by: Roger Pau Monné <roger.pau@citrix.com>
----
-Jan Beulich <jbeulich@suse.com>
-Andrew Cooper <andrew.cooper3@citrix.com>
-Wei Liu <wei.liu2@citrix.com>
-Ian Jackson <ian.jackson@eu.citrix.com>
----
- tools/firmware/hvmloader/Makefile      |  7 ++-----
- tools/firmware/hvmloader/hvmloader.lds | 13 +++++++++++++
- 2 files changed, 15 insertions(+), 5 deletions(-)
- create mode 100644 tools/firmware/hvmloader/hvmloader.lds
-
-diff --git a/tools/firmware/hvmloader/Makefile b/tools/firmware/hvmloader/Makefile
-index 496ac72b77..e980ce7c5f 100644
---- a/tools/firmware/hvmloader/Makefile
-+++ b/tools/firmware/hvmloader/Makefile
-@@ -20,9 +20,6 @@
- XEN_ROOT = $(CURDIR)/../../..
- include $(XEN_ROOT)/tools/firmware/Rules.mk
- 
--
--LOADADDR = 0x100000
--
- # SMBIOS spec requires format mm/dd/yyyy
- SMBIOS_REL_DATE ?= $(shell date +%m/%d/%Y)
- 
-@@ -82,8 +79,8 @@ vpath build.c $(ACPI_PATH)
- vpath static_tables.c $(ACPI_PATH)
- OBJS += $(ACPI_OBJS)
- 
--hvmloader: $(OBJS)
--	$(LD) $(LDFLAGS_DIRECT) -N -Ttext $(LOADADDR) -o $@ $^
-+hvmloader: $(OBJS) hvmloader.lds
-+	$(LD) $(LDFLAGS_DIRECT) -N -T hvmloader.lds -o $@ $(OBJS)
- 
- roms.inc: $(ROMS)
- 	echo "/* Autogenerated file. DO NOT EDIT */" > $@.new
-diff --git a/tools/firmware/hvmloader/hvmloader.lds b/tools/firmware/hvmloader/hvmloader.lds
-new file mode 100644
-index 0000000000..15d8f38fff
---- /dev/null
-+++ b/tools/firmware/hvmloader/hvmloader.lds
-@@ -0,0 +1,13 @@
-+SECTIONS
-+{
-+  . = 0x100000;
-+  /*
-+   * NB: there's no need to use the AT keyword in order to set the LMA, by
-+   * default the linker will use VMA = LMA unless specified otherwise.
-+   */
-+  .text : { *(.text) }
-+  .rodata : { *(.rodata) }
-+  .data : { *(.data) }
-+  .bss : { *(.bss) }
-+  _end = .;
-+}
--- 
-2.18.0
-
diff --git a/sysutils/xen-tools/files/0001-tools-include-propagate-python-interpreter-path.patch b/sysutils/xen-tools/files/0001-tools-include-propagate-python-interpreter-path.patch
new file mode 100644
index 000000000000..31356e27083b
--- /dev/null
+++ b/sysutils/xen-tools/files/0001-tools-include-propagate-python-interpreter-path.patch
@@ -0,0 +1,33 @@
+From 6b9481a710c2158ba47fbc18a0767f643cfdfee1 Mon Sep 17 00:00:00 2001
+From: Roger Pau Monne <roger.pau@citrix.com>
+Date: Thu, 18 Apr 2019 11:35:00 +0200
+Subject: [PATCH] tools/include: propagate python interpreter path
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+To the Makefile that generates the cpuid policy. Without this fix if
+the tools python interpreter is different than the default 'python' it
+won't be correctly propagated.
+
+Signed-off-by: Roger Pau Monné <roger.pau@citrix.com>
+---
+ tools/include/Makefile | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/tools/include/Makefile b/tools/include/Makefile
+index d693810053..71538e1ce2 100644
+--- a/tools/include/Makefile
++++ b/tools/include/Makefile
+@@ -32,7 +32,7 @@ endif
+ 	touch $@
+ 
+ all-$(CONFIG_X86): xen/.dir
+-	$(MAKE) -C xen/lib/x86 all XEN_ROOT=$(XEN_ROOT)
++	$(MAKE) -C xen/lib/x86 all XEN_ROOT=$(XEN_ROOT) PYTHON=$(PYTHON)
+ 
+ # Not xen/xsm as that clashes with link to
+ # $(XEN_ROOT)/xen/include/public/xsm above.
+-- 
+2.17.2 (Apple Git-113)
+
diff --git a/sysutils/xen-tools/files/0001-x86-replace-usage-in-the-linker-script.patch b/sysutils/xen-tools/files/0001-x86-replace-usage-in-the-linker-script.patch
deleted file mode 100644
index 4b1f808d9a7a..000000000000
--- a/sysutils/xen-tools/files/0001-x86-replace-usage-in-the-linker-script.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From e21ba44f771226a5f6f0ce269aabcfb019eae539 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Roger=20Pau=20Monn=C3=A9?= <roger.pau@citrix.com>
-Date: Thu, 12 Jul 2018 10:48:18 +0200
-Subject: [PATCH] x86: replace '||' usage in the linker script
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-With '|'. The result is the same, and the later works with lld. Fixes
-the following error when building Xen with lld:
-
-ld    -melf_x86_64_fbsd  -T xen.lds -N prelink.o --build-id=sha1 \
-    /root/src/xen/xen/common/symbols-dummy.o -o /root/src/xen/xen/.xen-syms.0
-ld: error: xen.lds:260: malformed number: |
->>> ASSERT(__image_base__ > (((((((((261 >> 8) * 0xffff000000000000) | (261 << 39))) + ((1 << 39) / 2)) + (64 << 30)) + (1 << 30)) + (1 << 30))) ||
->>>                                                                                                                                               ^
-
-Signed-off-by: Roger Pau Monné <roger.pau@citrix.com>
-Reviewed-by: Jan Beulich <jbeulich@suse.com>
----
- xen/arch/x86/xen.lds.S | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/xen/arch/x86/xen.lds.S b/xen/arch/x86/xen.lds.S
-index 70afedd31d..326e885402 100644
---- a/xen/arch/x86/xen.lds.S
-+++ b/xen/arch/x86/xen.lds.S
-@@ -331,7 +331,7 @@ SECTIONS
-   .comment 0 : { *(.comment) }
- }
- 
--ASSERT(__image_base__ > XEN_VIRT_START ||
-+ASSERT(__image_base__ > XEN_VIRT_START |
-        __2M_rwdata_end <= XEN_VIRT_END - NR_CPUS * PAGE_SIZE,
-        "Xen image overlaps stubs area")
- 
--- 
-2.18.0
-
diff --git a/sysutils/xen-tools/pkg-plist b/sysutils/xen-tools/pkg-plist
index 2fbbc9714d46..751a237b5222 100644
--- a/sysutils/xen-tools/pkg-plist
+++ b/sysutils/xen-tools/pkg-plist
@@ -30,9 +30,6 @@ etc/rc.d/xendriverdomain
 include/_libxl_list.h
 include/_libxl_types.h
 include/_libxl_types_json.h
-include/fsimage.h
-include/fsimage_grub.h
-include/fsimage_plugin.h
 include/libxl.h
 include/libxl_event.h
 include/libxl_json.h
@@ -53,7 +50,9 @@ include/xen/arch-x86/xen-x86_64.h
 include/xen/arch-x86/xen.h
 include/xen/arch-x86_32.h
 include/xen/arch-x86_64.h
+include/xen/argo.h
 include/xen/callback.h
+include/xen/device_tree_defs.h
 include/xen/dom0_ops.h
 include/xen/domctl.h
 include/xen/elfnote.h
@@ -121,6 +120,9 @@ include/xenctrl_compat.h
 include/xendevicemodel.h
 include/xenevtchn.h
 include/xenforeignmemory.h
+include/xenfsimage.h
+include/xenfsimage_grub.h
+include/xenfsimage_plugin.h
 include/xengnttab.h
 include/xenguest.h
 include/xenstat.h
@@ -133,28 +135,18 @@ include/xentoollog.h
 include/xs.h
 include/xs_lib.h
 lib/debug/usr/local/lib/xen/boot/xen-shim-syms
-lib/fs/ext2fs/fsimage.so
-lib/fs/fat/fsimage.so
-lib/fs/iso9660/fsimage.so
-lib/fs/reiserfs/fsimage.so
-lib/fs/ufs/fsimage.so
-lib/fs/xfs/fsimage.so
-lib/fs/zfs/fsimage.so
-lib/libfsimage.so
-lib/libfsimage.so.1.0
-lib/libfsimage.so.1.0.0
 lib/libxencall.a
 lib/libxencall.so
 lib/libxencall.so.1
-lib/libxencall.so.1.1
+lib/libxencall.so.1.2
 lib/libxenctrl.a
 lib/libxenctrl.so
-lib/libxenctrl.so.4.11
-lib/libxenctrl.so.4.11.0
+lib/libxenctrl.so.4.12
+lib/libxenctrl.so.4.12.0
 lib/libxendevicemodel.a
 lib/libxendevicemodel.so
 lib/libxendevicemodel.so.1
-lib/libxendevicemodel.so.1.2
+lib/libxendevicemodel.so.1.3
 lib/libxenevtchn.a
 lib/libxenevtchn.so
 lib/libxenevtchn.so.1
@@ -163,22 +155,25 @@ lib/libxenforeignmemory.a
 lib/libxenforeignmemory.so
 lib/libxenforeignmemory.so.1
 lib/libxenforeignmemory.so.1.3
+lib/libxenfsimage.so
+lib/libxenfsimage.so.4.12
+lib/libxenfsimage.so.4.12.0
 lib/libxengnttab.a
 lib/libxengnttab.so
 lib/libxengnttab.so.1
-lib/libxengnttab.so.1.1
+lib/libxengnttab.so.1.2
 lib/libxenguest.a
 lib/libxenguest.so
-lib/libxenguest.so.4.11
-lib/libxenguest.so.4.11.0
+lib/libxenguest.so.4.12
+lib/libxenguest.so.4.12.0
 lib/libxenlight.a
 lib/libxenlight.so
-lib/libxenlight.so.4.11
-lib/libxenlight.so.4.11.0
+lib/libxenlight.so.4.12
+lib/libxenlight.so.4.12.0
 lib/libxenstat.a
 lib/libxenstat.so
-lib/libxenstat.so.0
-lib/libxenstat.so.0.0
+lib/libxenstat.so.4.12
+lib/libxenstat.so.4.12.0
 lib/libxenstore.a
 lib/libxenstore.so
 lib/libxenstore.so.3.0
@@ -193,9 +188,8 @@ lib/libxentoollog.so.1
 lib/libxentoollog.so.1.0
 lib/libxlutil.a
 lib/libxlutil.so
-lib/libxlutil.so.4.11
-lib/libxlutil.so.4.11.0
-%%PYTHON_SITELIBDIR%%/fsimage.so
+lib/libxlutil.so.4.12
+lib/libxlutil.so.4.12.0
 %%PYTHON_SITELIBDIR%%/grub/ExtLinuxConf.py
 %%PYTHON_SITELIBDIR%%/grub/ExtLinuxConf.pyc
 %%PYTHON_SITELIBDIR%%/grub/GrubConf.py
@@ -204,7 +198,7 @@ lib/libxlutil.so.4.11.0
 %%PYTHON_SITELIBDIR%%/grub/LiloConf.pyc
 %%PYTHON_SITELIBDIR%%/grub/__init__.py
 %%PYTHON_SITELIBDIR%%/grub/__init__.pyc
-%%PYTHON_SITELIBDIR%%/pygrub-0.3-py%%PYTHON_VER%%.egg-info
+%%PYTHON_SITELIBDIR%%/pygrub-0.6-py%%PYTHON_VER%%.egg-info
 %%PYTHON_SITELIBDIR%%/xen-3.0-py%%PYTHON_VER%%.egg-info
 %%PYTHON_SITELIBDIR%%/xen/__init__.py
 %%PYTHON_SITELIBDIR%%/xen/__init__.pyc
@@ -228,7 +222,9 @@ lib/libxlutil.so.4.11.0
 %%PYTHON_SITELIBDIR%%/xen/migration/verify.pyc
 %%PYTHON_SITELIBDIR%%/xen/migration/xl.py
 %%PYTHON_SITELIBDIR%%/xen/migration/xl.pyc
+%%PYTHON_SITELIBDIR%%/xenfsimage.so
 lib/xen/bin/convert-legacy-stream
+lib/xen/bin/depriv-fd-checker
 lib/xen/bin/libxl-save-helper
 lib/xen/bin/lsevtchn
 lib/xen/bin/pygrub
@@ -245,6 +241,13 @@ lib/xen/bin/xenpaging
 lib/xen/bin/xenpvnetboot
 lib/xen/boot/hvmloader
 lib/xen/boot/xen-shim
+lib/xenfsimage/ext2fs/fsimage.so
+lib/xenfsimage/fat/fsimage.so
+lib/xenfsimage/iso9660/fsimage.so
+lib/xenfsimage/reiserfs/fsimage.so
+lib/xenfsimage/ufs/fsimage.so
+lib/xenfsimage/xfs/fsimage.so
+lib/xenfsimage/zfs/fsimage.so
 libdata/pkgconfig/xencall.pc
 libdata/pkgconfig/xencontrol.pc
 libdata/pkgconfig/xendevicemodel.pc
@@ -258,6 +261,26 @@ libdata/pkgconfig/xenstore.pc
 libdata/pkgconfig/xentoolcore.pc
 libdata/pkgconfig/xentoollog.pc
 libdata/pkgconfig/xlutil.pc
+man/man1/xenstore-chmod.1.gz
+man/man1/xenstore-ls.1.gz
+man/man1/xenstore-read.1.gz
+man/man1/xenstore-write.1.gz
+man/man1/xenstore.1.gz
+man/man1/xentop.1.gz
+man/man1/xentrace_format.1.gz
+man/man1/xl.1.gz
+man/man5/xl-disk-configuration.5.gz
+man/man5/xl-network-configuration.5.gz
+man/man5/xl.cfg.5.gz
+man/man5/xl.conf.5.gz
+man/man5/xlcpupool.cfg.5.gz
+man/man7/xen-pci-device-reservations.7.gz
+man/man7/xen-pv-channel.7.gz
+man/man7/xen-tscmode.7.gz
+man/man7/xen-vtpm.7.gz
+man/man7/xen-vtpmmgr.7.gz
+man/man7/xl-numa-placement.7.gz
+man/man8/xentrace.8.gz
 sbin/flask-get-bool
 sbin/flask-getenforce
 sbin/flask-label-pci
@@ -265,22 +288,20 @@ sbin/flask-loadpolicy
 sbin/flask-set-bool
 sbin/flask-setenforce
 sbin/gdbsx
-sbin/kdd
-sbin/xen-bugtool
 sbin/xen-diag
 sbin/xen-hptool
 sbin/xen-hvmcrash
 sbin/xen-hvmctx
+sbin/xen-kdd
 sbin/xen-livepatch
 sbin/xen-lowmemd
 sbin/xen-mfndump
-sbin/xen-ringwatch
 sbin/xen-tmem-list-parse
 sbin/xenbaked
 sbin/xenconsoled
 sbin/xencov
 sbin/xenlockprof
-sbin/xenmon.py
+sbin/xenmon
 sbin/xenperf
 sbin/xenpm
 sbin/xenpmd
@@ -295,7 +316,9 @@ sbin/xl
 %%PORTDOCS%%%%DOCSDIR%%/html/hypercall/arm/include,public,arch-arm,hvm,save.h.html
 %%PORTDOCS%%%%DOCSDIR%%/html/hypercall/arm/include,public,arch-arm,smccc.h.html
 %%PORTDOCS%%%%DOCSDIR%%/html/hypercall/arm/include,public,arch-arm.h.html
+%%PORTDOCS%%%%DOCSDIR%%/html/hypercall/arm/include,public,argo.h.html
 %%PORTDOCS%%%%DOCSDIR%%/html/hypercall/arm/include,public,callback.h.html
+%%PORTDOCS%%%%DOCSDIR%%/html/hypercall/arm/include,public,device_tree_defs.h.html
 %%PORTDOCS%%%%DOCSDIR%%/html/hypercall/arm/include,public,dom0_ops.h.html
 %%PORTDOCS%%%%DOCSDIR%%/html/hypercall/arm/include,public,domctl.h.html
 %%PORTDOCS%%%%DOCSDIR%%/html/hypercall/arm/include,public,elfnote.h.html
@@ -363,7 +386,9 @@ sbin/xl
 %%PORTDOCS%%%%DOCSDIR%%/html/hypercall/x86_32/include,public,arch-x86,xen-x86_32.h.html
 %%PORTDOCS%%%%DOCSDIR%%/html/hypercall/x86_32/include,public,arch-x86,xen.h.html
 %%PORTDOCS%%%%DOCSDIR%%/html/hypercall/x86_32/include,public,arch-x86_32.h.html
+%%PORTDOCS%%%%DOCSDIR%%/html/hypercall/x86_32/include,public,argo.h.html
 %%PORTDOCS%%%%DOCSDIR%%/html/hypercall/x86_32/include,public,callback.h.html
+%%PORTDOCS%%%%DOCSDIR%%/html/hypercall/x86_32/include,public,device_tree_defs.h.html
 %%PORTDOCS%%%%DOCSDIR%%/html/hypercall/x86_32/include,public,dom0_ops.h.html
 %%PORTDOCS%%%%DOCSDIR%%/html/hypercall/x86_32/include,public,domctl.h.html
 %%PORTDOCS%%%%DOCSDIR%%/html/hypercall/x86_32/include,public,elfnote.h.html
@@ -430,7 +455,9 @@ sbin/xl
 %%PORTDOCS%%%%DOCSDIR%%/html/hypercall/x86_64/include,public,arch-x86,xen-x86_64.h.html
 %%PORTDOCS%%%%DOCSDIR%%/html/hypercall/x86_64/include,public,arch-x86,xen.h.html
 %%PORTDOCS%%%%DOCSDIR%%/html/hypercall/x86_64/include,public,arch-x86_64.h.html
+%%PORTDOCS%%%%DOCSDIR%%/html/hypercall/x86_64/include,public,argo.h.html
 %%PORTDOCS%%%%DOCSDIR%%/html/hypercall/x86_64/include,public,callback.h.html
+%%PORTDOCS%%%%DOCSDIR%%/html/hypercall/x86_64/include,public,device_tree_defs.h.html
 %%PORTDOCS%%%%DOCSDIR%%/html/hypercall/x86_64/include,public,dom0_ops.h.html
 %%PORTDOCS%%%%DOCSDIR%%/html/hypercall/x86_64/include,public,domctl.h.html
 %%PORTDOCS%%%%DOCSDIR%%/html/hypercall/x86_64/include,public,elfnote.h.html
@@ -496,6 +523,8 @@ sbin/xl
 %%PORTDOCS%%%%DOCSDIR%%/html/man/xen-vtpmmgr.7.html
 %%PORTDOCS%%%%DOCSDIR%%/html/man/xenstore-chmod.1.html
 %%PORTDOCS%%%%DOCSDIR%%/html/man/xenstore-ls.1.html
+%%PORTDOCS%%%%DOCSDIR%%/html/man/xenstore-read.1.html
+%%PORTDOCS%%%%DOCSDIR%%/html/man/xenstore-write.1.html
 %%PORTDOCS%%%%DOCSDIR%%/html/man/xenstore.1.html
 %%PORTDOCS%%%%DOCSDIR%%/html/man/xentop.1.html
 %%PORTDOCS%%%%DOCSDIR%%/html/man/xentrace.8.html
@@ -507,7 +536,6 @@ sbin/xl
 %%PORTDOCS%%%%DOCSDIR%%/html/man/xl.cfg.5.html
 %%PORTDOCS%%%%DOCSDIR%%/html/man/xl.conf.5.html
 %%PORTDOCS%%%%DOCSDIR%%/html/man/xlcpupool.cfg.5.html
-%%PORTDOCS%%%%DOCSDIR%%/html/misc/9pfs.html
 %%PORTDOCS%%%%DOCSDIR%%/html/misc/amd-ucode-container.txt
 %%PORTDOCS%%%%DOCSDIR%%/html/misc/arm/big.LITTLE.txt
 %%PORTDOCS%%%%DOCSDIR%%/html/misc/arm/booting.txt
@@ -522,63 +550,33 @@ sbin/xl
 %%PORTDOCS%%%%DOCSDIR%%/html/misc/arm/silicon-errata.txt
 %%PORTDOCS%%%%DOCSDIR%%/html/misc/block-scripts.txt
 %%PORTDOCS%%%%DOCSDIR%%/html/misc/console.txt
-%%PORTDOCS%%%%DOCSDIR%%/html/misc/coverage.html
 %%PORTDOCS%%%%DOCSDIR%%/html/misc/crashdb.txt
 %%PORTDOCS%%%%DOCSDIR%%/html/misc/distro_mapping.txt
 %%PORTDOCS%%%%DOCSDIR%%/html/misc/dump-core-format.txt
-%%PORTDOCS%%%%DOCSDIR%%/html/misc/efi.html
 %%PORTDOCS%%%%DOCSDIR%%/html/misc/grant-tables.txt
-%%PORTDOCS%%%%DOCSDIR%%/html/misc/hvm-emulated-unplug.html
 %%PORTDOCS%%%%DOCSDIR%%/html/misc/index.html
 %%PORTDOCS%%%%DOCSDIR%%/html/misc/kconfig-language.txt
 %%PORTDOCS%%%%DOCSDIR%%/html/misc/kconfig.txt
 %%PORTDOCS%%%%DOCSDIR%%/html/misc/kexec_and_kdump.txt
 %%PORTDOCS%%%%DOCSDIR%%/html/misc/libxl_memory.txt
-%%PORTDOCS%%%%DOCSDIR%%/html/misc/livepatch.html
 %%PORTDOCS%%%%DOCSDIR%%/html/misc/printk-formats.txt
-%%PORTDOCS%%%%DOCSDIR%%/html/misc/pv-drivers-lifecycle.html
-%%PORTDOCS%%%%DOCSDIR%%/html/misc/pvcalls.html
-%%PORTDOCS%%%%DOCSDIR%%/html/misc/pvh.html
 %%PORTDOCS%%%%DOCSDIR%%/html/misc/qemu-backends.txt
-%%PORTDOCS%%%%DOCSDIR%%/html/misc/qemu-deprivilege.txt
 %%PORTDOCS%%%%DOCSDIR%%/html/misc/stubdom.txt
 %%PORTDOCS%%%%DOCSDIR%%/html/misc/vtd-pi.txt
 %%PORTDOCS%%%%DOCSDIR%%/html/misc/vtd.txt
 %%PORTDOCS%%%%DOCSDIR%%/html/misc/vtpm-platforms.txt
-%%PORTDOCS%%%%DOCSDIR%%/html/misc/x86-xenpv-bootloader.html
-%%PORTDOCS%%%%DOCSDIR%%/html/misc/xen-command-line.html
 %%PORTDOCS%%%%DOCSDIR%%/html/misc/xen-error-handling.txt
 %%PORTDOCS%%%%DOCSDIR%%/html/misc/xenmon.txt
 %%PORTDOCS%%%%DOCSDIR%%/html/misc/xenpaging.txt
-%%PORTDOCS%%%%DOCSDIR%%/html/misc/xenstore-paths.html
 %%PORTDOCS%%%%DOCSDIR%%/html/misc/xenstore-ring.txt
 %%PORTDOCS%%%%DOCSDIR%%/html/misc/xenstore.txt
-%%PORTDOCS%%%%DOCSDIR%%/html/misc/xl-psr.html
 %%PORTDOCS%%%%DOCSDIR%%/html/misc/xsm-flask.txt
-%%DOCS%%man/man1/xenstore-chmod.1.gz
-%%DOCS%%man/man1/xenstore-ls.1.gz
-%%DOCS%%man/man1/xenstore.1.gz
-%%DOCS%%man/man1/xentop.1.gz
-%%DOCS%%man/man1/xentrace_format.1.gz
-%%DOCS%%man/man1/xl.1.gz
-%%DOCS%%man/man5/xl-disk-configuration.5.gz
-%%DOCS%%man/man5/xl-network-configuration.5.gz
-%%DOCS%%man/man5/xl.cfg.5.gz
-%%DOCS%%man/man5/xl.conf.5.gz
-%%DOCS%%man/man5/xlcpupool.cfg.5.gz
-%%DOCS%%man/man7/xen-pci-device-reservations.7.gz
-%%DOCS%%man/man7/xen-pv-channel.7.gz
-%%DOCS%%man/man7/xen-tscmode.7.gz
-%%DOCS%%man/man7/xen-vtpm.7.gz
-%%DOCS%%man/man7/xen-vtpmmgr.7.gz
-%%DOCS%%man/man7/xl-numa-placement.7.gz
-%%DOCS%%man/man8/xentrace.8.gz
 share/qemu-xen/qemu/QEMU,cgthree.bin
 share/qemu-xen/qemu/QEMU,tcx.bin
-share/qemu-xen/qemu/acpi-dsdt.aml
 share/qemu-xen/qemu/bamboo.dtb
 share/qemu-xen/qemu/bios-256k.bin
 share/qemu-xen/qemu/bios.bin
+share/qemu-xen/qemu/canyonlands.dtb
 share/qemu-xen/qemu/efi-e1000.rom
 share/qemu-xen/qemu/efi-e1000e.rom
 share/qemu-xen/qemu/efi-eepro100.rom
@@ -587,6 +585,7 @@ share/qemu-xen/qemu/efi-pcnet.rom
 share/qemu-xen/qemu/efi-rtl8139.rom
 share/qemu-xen/qemu/efi-virtio.rom
 share/qemu-xen/qemu/efi-vmxnet3.rom
+share/qemu-xen/qemu/hppa-firmware.img
 share/qemu-xen/qemu/keymaps/ar
 share/qemu-xen/qemu/keymaps/bepo
 share/qemu-xen/qemu/keymaps/common
@@ -651,6 +650,7 @@ share/qemu-xen/qemu/skiboot.lid
 share/qemu-xen/qemu/slof.bin
 share/qemu-xen/qemu/spapr-rtas.bin
 share/qemu-xen/qemu/trace-events-all
+share/qemu-xen/qemu/u-boot-sam460-20100605.bin
 share/qemu-xen/qemu/u-boot.e500
 share/qemu-xen/qemu/vgabios-cirrus.bin
 share/qemu-xen/qemu/vgabios-qxl.bin