--- old/usr/src/pkg/manifests/system-kernel-platform.mf	Fri Aug 10 23:19:15 2018
+++ new/usr/src/pkg/manifests/system-kernel-platform.mf	Fri Aug 10 23:19:15 2018
@@ -21,7 +21,7 @@
 
 #
 # Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
-# Copyright 2012 Nexenta Systems, Inc. All rights reserved.
+# Copyright 2018 Nexenta Systems, Inc.
 # Copyright 2014 Gary Mills
 #
 
@@ -310,21 +310,6 @@
 $(i386_ONLY)dir path=platform/i86pc/kernel/misc group=sys
 $(i386_ONLY)dir path=platform/i86pc/kernel/misc/$(ARCH64) group=sys
 $(i386_ONLY)dir path=platform/i86pc/ucode group=sys
-$(i386_ONLY)dir path=platform/i86xpv group=sys
-$(i386_ONLY)dir path=platform/i86xpv/kernel group=sys
-$(i386_ONLY)dir path=platform/i86xpv/kernel/$(ARCH64) group=sys
-$(i386_ONLY)dir path=platform/i86xpv/kernel/cpu group=sys
-$(i386_ONLY)dir path=platform/i86xpv/kernel/cpu/$(ARCH64) group=sys
-$(i386_ONLY)dir path=platform/i86xpv/kernel/dacf group=sys
-$(i386_ONLY)dir path=platform/i86xpv/kernel/dacf/$(ARCH64) group=sys
-$(i386_ONLY)dir path=platform/i86xpv/kernel/drv group=sys
-$(i386_ONLY)dir path=platform/i86xpv/kernel/drv/$(ARCH64) group=sys
-$(i386_ONLY)dir path=platform/i86xpv/kernel/mach group=sys
-$(i386_ONLY)dir path=platform/i86xpv/kernel/mach/$(ARCH64) group=sys
-$(i386_ONLY)dir path=platform/i86xpv/kernel/misc group=sys
-$(i386_ONLY)dir path=platform/i86xpv/kernel/misc/$(ARCH64) group=sys
-$(i386_ONLY)dir path=platform/i86xpv/kernel/tod group=sys
-$(i386_ONLY)dir path=platform/i86xpv/kernel/tod/$(ARCH64) group=sys
 $(sparc_ONLY)dir path=platform/sun4u group=sys
 $(sparc_ONLY)dir path=platform/sun4u-us3 group=sys
 $(sparc_ONLY)dir path=platform/sun4u-us3/kernel group=sys
@@ -539,18 +524,9 @@
     alias=SUNW,virtual-devices
 $(sparc_ONLY)driver name=xcalppm alias=ebus-ppm
 $(sparc_ONLY)driver name=xcalwd
-$(i386_ONLY)driver name=xdb
 $(i386_ONLY)driver name=xdf
-$(i386_ONLY)driver name=xenbus perms="* 0666 root sys"
-$(i386_ONLY)driver name=xencons
-$(i386_ONLY)driver name=xnbe alias=xnb,ioemu
-$(i386_ONLY)driver name=xnbo \
-    alias=xnb \
-    alias=xnb,SUNW_mac
-$(i386_ONLY)driver name=xnbu alias=xnb,netfront
 $(i386_ONLY)driver name=xnf
 $(i386_ONLY)driver name=xpvd
-$(i386_ONLY)driver name=xpvtap perms="* 0666 root sys"
 $(sparc_ONLY)driver name=zs perms="[a-z] 0666 root sys" \
     perms="[a-z],cu 0600 uucp uucp"
 $(sparc_ONLY)driver name=zsh perms="* 0666 root sys"
@@ -853,52 +829,6 @@
 $(i386_ONLY)file path=platform/i86pc/ucode/intel-ucode.txt group=sys mode=0444 \
     original_name=SUNWcakr:platform/i86pc/ucode/intel-ucode.txt preserve=true \
     reboot-needed=true
-$(i386_ONLY)file path=platform/i86xpv/kernel/$(ARCH64)/unix group=sys \
-    mode=0755
-$(i386_ONLY)file path=platform/i86xpv/kernel/cpu/$(ARCH64)/cpu.generic \
-    group=sys mode=0755
-$(i386_ONLY)file path=platform/i86xpv/kernel/cpu/$(ARCH64)/cpu_ms.AuthenticAMD \
-    group=sys mode=0755
-$(i386_ONLY)file \
-    path=platform/i86xpv/kernel/cpu/$(ARCH64)/cpu_ms.AuthenticAMD.15 \
-    group=sys mode=0755
-$(i386_ONLY)file path=platform/i86xpv/kernel/cpu/$(ARCH64)/cpu_ms.GenuineIntel \
-    group=sys mode=0755
-$(i386_ONLY)file path=platform/i86xpv/kernel/dacf/$(ARCH64)/consconfig_dacf \
-    group=sys mode=0755
-$(i386_ONLY)file path=platform/i86xpv/kernel/drv/$(ARCH64)/balloon group=sys
-$(i386_ONLY)file path=platform/i86xpv/kernel/drv/$(ARCH64)/domcaps group=sys
-$(i386_ONLY)file path=platform/i86xpv/kernel/drv/$(ARCH64)/evtchn group=sys
-$(i386_ONLY)file path=platform/i86xpv/kernel/drv/$(ARCH64)/isa group=sys
-$(i386_ONLY)file path=platform/i86xpv/kernel/drv/$(ARCH64)/npe group=sys
-$(i386_ONLY)file path=platform/i86xpv/kernel/drv/$(ARCH64)/pci group=sys
-$(i386_ONLY)file path=platform/i86xpv/kernel/drv/$(ARCH64)/pit_beep group=sys
-$(i386_ONLY)file path=platform/i86xpv/kernel/drv/$(ARCH64)/privcmd group=sys
-$(i386_ONLY)file path=platform/i86xpv/kernel/drv/$(ARCH64)/rootnex group=sys
-$(i386_ONLY)file path=platform/i86xpv/kernel/drv/$(ARCH64)/xdb group=sys
-$(i386_ONLY)file path=platform/i86xpv/kernel/drv/$(ARCH64)/xdf group=sys
-$(i386_ONLY)file path=platform/i86xpv/kernel/drv/$(ARCH64)/xenbus group=sys
-$(i386_ONLY)file path=platform/i86xpv/kernel/drv/$(ARCH64)/xencons group=sys
-$(i386_ONLY)file path=platform/i86xpv/kernel/drv/$(ARCH64)/xnbe group=sys
-$(i386_ONLY)file path=platform/i86xpv/kernel/drv/$(ARCH64)/xnbo group=sys
-$(i386_ONLY)file path=platform/i86xpv/kernel/drv/$(ARCH64)/xnbu group=sys
-$(i386_ONLY)file path=platform/i86xpv/kernel/drv/$(ARCH64)/xnf group=sys
-$(i386_ONLY)file path=platform/i86xpv/kernel/drv/$(ARCH64)/xpvd group=sys
-$(i386_ONLY)file path=platform/i86xpv/kernel/drv/$(ARCH64)/xpvtap group=sys
-$(i386_ONLY)file path=platform/i86xpv/kernel/drv/pit_beep.conf group=sys
-$(i386_ONLY)file path=platform/i86xpv/kernel/drv/xencons.conf group=sys
-$(i386_ONLY)file path=platform/i86xpv/kernel/mach/$(ARCH64)/xpv_psm group=sys \
-    mode=0755
-$(i386_ONLY)file path=platform/i86xpv/kernel/mach/$(ARCH64)/xpv_uppc group=sys \
-    mode=0755
-$(i386_ONLY)file path=platform/i86xpv/kernel/misc/$(ARCH64)/gfx_private \
-    group=sys mode=0755
-$(i386_ONLY)file path=platform/i86xpv/kernel/misc/$(ARCH64)/xnb group=sys \
-    mode=0755
-$(i386_ONLY)file path=platform/i86xpv/kernel/misc/$(ARCH64)/xpv_autoconfig \
-    group=sys mode=0755
-$(i386_ONLY)file path=platform/i86xpv/kernel/tod/$(ARCH64)/xpvtod group=sys \
-    mode=0755
 $(sparc_ONLY)file path=platform/sun4u-us3/kernel/crypto/$(ARCH64)/aes \
     group=sys mode=0755
 $(sparc_ONLY)file path=platform/sun4u/bootlst group=sys reboot-needed=true
@@ -1130,9 +1060,6 @@
 $(sparc_ONLY)legacy pkg=SUNWcakrnt2000.v arch=$(ARCH).sun4v \
     desc="driver software for the Netra-T2000 hardware platform" \
     name="Platform Specific Drivers for Netra-T2000, (Root)"
-$(i386_ONLY)legacy pkg=SUNWcakrx.i arch=$(ARCH).i86pc \
-    desc="core kernel software for the i86xpv virtual hardware platform" \
-    name="Core Kernel Architecture i86xpv, (Root)"
 license cr_Sun license=cr_Sun
 license lic_CDDL license=lic_CDDL
 license usr/src/cmd/mdb/common/libstand/THIRDPARTYLICENSE \
