Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6f6c15ef authored Dec 11, 2013 by Konrad Rzeszutek Wilk

xen/pvhvm: Remove the xen_platform_pci int.



Since we have  xen_has_pv_devices,xen_has_pv_disk_devices,
xen_has_pv_nic_devices, and xen_has_pv_and_legacy_disk_devices
to figure out the different 'unplug' behaviors - lets
use those instead of this single int.

Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>

parent 51c71a3b

arch/x86/xen/platform-pci-unplug.c

+2 −3

Original line number	Diff line number	Diff line
		@@ -30,10 +30,9 @@
		#define XEN_PLATFORM_ERR_PROTOCOL -2
		#define XEN_PLATFORM_ERR_BLACKLIST -3

		/* store the value of xen_emul_unplug after the unplug is done */
		int xen_platform_pci_unplug;
		EXPORT_SYMBOL_GPL(xen_platform_pci_unplug);
		#ifdef CONFIG_XEN_PVHVM
		/* store the value of xen_emul_unplug after the unplug is done */
		static int xen_platform_pci_unplug;
		static int xen_emul_unplug;

		static int check_platform_magic(void)

include/xen/platform_pci.h

+0 −2

Original line number	Diff line number	Diff line
		@@ -46,8 +46,6 @@ static inline int xen_must_unplug_disks(void) {
		#endif
		}

		extern int xen_platform_pci_unplug;

		#if defined(CONFIG_XEN_PVHVM)
		extern bool xen_has_pv_devices(void);
		extern bool xen_has_pv_disk_devices(void);