Merge tag 'for-linus-5.11-rc1b-tag' of git://git.kernel.org/pub/scm/linux/kernel...

Pull more xen updates from Juergen Gross:
 "Some minor cleanup patches and a small series disentangling some Xen
  related Kconfig options"

* tag 'for-linus-5.11-rc1b-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip:
  xen: Kconfig: remove X86_64 depends from XEN_512GB
  xen/manage: Fix fall-through warnings for Clang
  xen-blkfront: Fix fall-through warnings for Clang
  xen: remove trailing semicolon in macro definition
  xen: Kconfig: nest Xen guest options
  xen: Remove Xen PVH/PVHVM dependency on PCI
  x86/xen: Convert to DEFINE_SHOW_ATTRIBUTE

diff --git a/arch/x86/include/asm/xen/page.h b/arch/x86/include/asm/xen/page.h
index 5941e18edd5a9b5eeeb9646b2f06bf8f1ca83c3b..1a162e559753b5ef97def181ad94f574eac28218 100644 (file)
--- a/arch/x86/include/asm/xen/page.h
+++ b/arch/x86/include/asm/xen/page.h
@@ -355,7 +355,7 @@ unsigned long arbitrary_virt_to_mfn(void *vaddr);
 void make_lowmem_page_readonly(void *vaddr);
 void make_lowmem_page_readwrite(void *vaddr);
 
-#define xen_remap(cookie, size) ioremap((cookie), (size));
+#define xen_remap(cookie, size) ioremap((cookie), (size))
 #define xen_unmap(cookie) iounmap((cookie))
 
 static inline bool xen_arch_need_swiotlb(struct device *dev,

diff --git a/arch/x86/xen/Kconfig b/arch/x86/xen/Kconfig
index 218acbd5c7a01af94f62468a05b8f79288678083..afc1da68b06d80bcd8afda6989689f400f90af56 100644 (file)
--- a/arch/x86/xen/Kconfig
+++ b/arch/x86/xen/Kconfig
@@ -26,6 +26,19 @@ config XEN_PV
        help
          Support running as a Xen PV guest.
 
+config XEN_512GB
+       bool "Limit Xen pv-domain memory to 512GB"
+       depends on XEN_PV
+       default y
+       help
+         Limit paravirtualized user domains to 512GB of RAM.
+
+         The Xen tools and crash dump analysis tools might not support
+         pv-domains with more than 512 GB of RAM. This option controls the
+         default setting of the kernel to use only up to 512 GB or more.
+         It is always possible to change the default via specifying the
+         boot parameter "xen_512gb_limit".
+
 config XEN_PV_SMP
        def_bool y
        depends on XEN_PV && SMP
@@ -39,28 +52,19 @@ config XEN_DOM0
          Support running as a Xen PV Dom0 guest.
 
 config XEN_PVHVM
-       bool "Xen PVHVM guest support"
-       default y
-       depends on XEN && PCI && X86_LOCAL_APIC
-       help
-         Support running as a Xen PVHVM guest.
+       def_bool y
+       depends on XEN && X86_LOCAL_APIC
 
 config XEN_PVHVM_SMP
        def_bool y
        depends on XEN_PVHVM && SMP
 
-config XEN_512GB
-       bool "Limit Xen pv-domain memory to 512GB"
-       depends on XEN_PV
+config XEN_PVHVM_GUEST
+       bool "Xen PVHVM guest support"
        default y
+       depends on XEN_PVHVM && PCI
        help
-         Limit paravirtualized user domains to 512GB of RAM.
-
-         The Xen tools and crash dump analysis tools might not support
-         pv-domains with more than 512 GB of RAM. This option controls the
-         default setting of the kernel to use only up to 512 GB or more.
-         It is always possible to change the default via specifying the
-         boot parameter "xen_512gb_limit".
+         Support running as a Xen PVHVM guest.
 
 config XEN_SAVE_RESTORE
        bool
@@ -76,7 +80,9 @@ config XEN_DEBUG_FS
          Enabling this option may incur a significant performance overhead.
 
 config XEN_PVH
-       bool "Support for running as a Xen PVH guest"
+       bool "Xen PVH guest support"
        depends on XEN && XEN_PVHVM && ACPI
        select PVH
        def_bool n
+       help
+         Support for running as a Xen PVH guest.

diff --git a/arch/x86/xen/p2m.c b/arch/x86/xen/p2m.c
index be4151f42611f71bb1724b62f3ec9046848971bc..3301875dd1965da1c9de6312c9ff7bdf91e0502c 100644 (file)
--- a/arch/x86/xen/p2m.c
+++ b/arch/x86/xen/p2m.c
@@ -795,17 +795,7 @@ static int p2m_dump_show(struct seq_file *m, void *v)
        return 0;
 }
 
-static int p2m_dump_open(struct inode *inode, struct file *filp)
-{
-       return single_open(filp, p2m_dump_show, NULL);
-}
-
-static const struct file_operations p2m_dump_fops = {
-       .open           = p2m_dump_open,
-       .read           = seq_read,
-       .llseek         = seq_lseek,
-       .release        = single_release,
-};
+DEFINE_SHOW_ATTRIBUTE(p2m_dump);
 
 static struct dentry *d_mmu_debug;
 

diff --git a/drivers/block/xen-blkfront.c b/drivers/block/xen-blkfront.c
index 188e0b47534bcf664fa35ca332fe338c49787c14..5265975b3fba5c0c726b7ed5bd5f595cd6bd5145 100644 (file)
--- a/drivers/block/xen-blkfront.c
+++ b/drivers/block/xen-blkfront.c
@@ -2462,6 +2462,7 @@ static void blkback_changed(struct xenbus_device *dev,
                        break;
                if (talk_to_blkback(dev, info))
                        break;
+               break;
        case XenbusStateInitialising:
        case XenbusStateInitialised:
        case XenbusStateReconfiguring:

diff --git a/drivers/xen/Makefile b/drivers/xen/Makefile
index babdca808861da9e5d54c58c4f4523c885159b29..c3621b9f4012f4128522e88fecb510f0e59c005a 100644 (file)
--- a/drivers/xen/Makefile
+++ b/drivers/xen/Makefile
@@ -21,7 +21,7 @@ obj-$(CONFIG_XEN_GNTDEV)              += xen-gntdev.o
 obj-$(CONFIG_XEN_GRANT_DEV_ALLOC)      += xen-gntalloc.o
 obj-$(CONFIG_XENFS)                    += xenfs/
 obj-$(CONFIG_XEN_SYS_HYPERVISOR)       += sys-hypervisor.o
-obj-$(CONFIG_XEN_PVHVM)                        += platform-pci.o
+obj-$(CONFIG_XEN_PVHVM_GUEST)          += platform-pci.o
 obj-$(CONFIG_SWIOTLB_XEN)              += swiotlb-xen.o
 obj-$(CONFIG_XEN_MCE_LOG)              += mcelog.o
 obj-$(CONFIG_XEN_PCIDEV_BACKEND)       += xen-pciback/

diff --git a/drivers/xen/manage.c b/drivers/xen/manage.c
index cd046684e0d1bb7e6e3e7330e402ec65bbf2f5d5..374d36de7f5a45b698e39e506afa9ea6cd03be13 100644 (file)
--- a/drivers/xen/manage.c
+++ b/drivers/xen/manage.c
@@ -179,6 +179,7 @@ static int poweroff_nb(struct notifier_block *cb, unsigned long code, void *unus
        case SYS_HALT:
        case SYS_POWER_OFF:
                shutting_down = SHUTDOWN_POWEROFF;
+               break;
        default:
                break;
        }