Attachment 571838 Details for Bug 803239 – [RHEL6.3 PATCH] xen: initialize platform_pci even if xen_emul_unplug=never

[patch] [RHEL6.3 PATCH] xen: initialize platform_pci even if xen_emul_unplug=never

0001-xen-initialize-platform_pci-even-if-xen_emul_unplug-.patch (text/plain), 2.81 KB, created by Igor Mammedov on 2012-03-21 20:29:10 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Igor Mammedov

Created: 2012-03-21 20:29:10 UTC

Size: 2.81 KB

patch

obsolete

>From 61f9a838b98695bd22fd6e88f964cc9b4d8bbda8 Mon Sep 17 00:00:00 2001
>From: Igor Mammedov <imammedo@redhat.com>
>Date: Wed, 21 Mar 2012 16:02:33 +0100
>Subject: [RHEL6.3 PATCH] xen: initialize platform_pci even if xen_emul_unplug=never
>
>BZ#803239
>Brew: http://brewweb.devel.redhat.com/brew/taskinfo?taskID=4177408
>Upstream status: posted
>
>When xen_emul_unplug=never is specified on kernel command line
>reading files from /sys/hypervisor is broken (returns -EBUSY).
>It is caused by xen_bus dependency on platform_pci and
>platform_pci isn't initialized when xen_emul_unplug=never is
>specified.
>
>Fix it by allowing platform_pci to ignore xen_emul_unplug=never,
>and do not intialize xen_[blk|net]front instead.
>
>Tested localy with RHEL6x64 guest
>
>Signed-off-by: Igor Mammedov <imammedo@redhat.com>
>Acked-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
>---
> drivers/block/xen-blkfront.c |    4 ++++
> drivers/net/xen-netfront.c   |    4 ++++
> drivers/xen/platform-pci.c   |    5 -----
> 3 files changed, 8 insertions(+), 5 deletions(-)
>
>diff --git a/drivers/block/xen-blkfront.c b/drivers/block/xen-blkfront.c
>index 51e1a94..55fc19a 100644
>--- a/drivers/block/xen-blkfront.c
>+++ b/drivers/block/xen-blkfront.c
>@@ -46,6 +46,7 @@
> #include <xen/grant_table.h>
> #include <xen/events.h>
> #include <xen/page.h>
>+#include <xen/platform_pci.h>
> 
> #include <xen/interface/grant_table.h>
> #include <xen/interface/io/blkif.h>
>@@ -1389,6 +1390,9 @@ static int __init xlblk_init(void)
> 	if (!xen_domain())
> 		return -ENODEV;
> 
>+	if (!xen_platform_pci_unplug)
>+		return -ENODEV;
>+
> 	printk("%s: register_blkdev major: %d \n", __FUNCTION__, XENVBD_MAJOR);
> 	if (register_blkdev(XENVBD_MAJOR, DEV_NAME)) {
> 		printk(KERN_WARNING "xen_blk: can't get major %d with name %s\n",
>diff --git a/drivers/net/xen-netfront.c b/drivers/net/xen-netfront.c
>index 0aa39f6..fcc8bd4 100644
>--- a/drivers/net/xen-netfront.c
>+++ b/drivers/net/xen-netfront.c
>@@ -45,6 +45,7 @@
> #include <xen/xenbus.h>
> #include <xen/events.h>
> #include <xen/page.h>
>+#include <xen/platform_pci.h>
> #include <xen/grant_table.h>
> 
> #include <xen/interface/io/netif.h>
>@@ -1875,6 +1876,9 @@ static int __init netif_init(void)
> 	if (xen_initial_domain())
> 		return 0;
> 
>+	if (!xen_platform_pci_unplug)
>+		return -ENODEV;
>+
> 	printk(KERN_INFO "Initialising Xen virtual ethernet driver.\n");
> 
> 	return xenbus_register_frontend(&netfront_driver);
>diff --git a/drivers/xen/platform-pci.c b/drivers/xen/platform-pci.c
>index a433427..3daadf0 100644
>--- a/drivers/xen/platform-pci.c
>+++ b/drivers/xen/platform-pci.c
>@@ -203,11 +203,6 @@ static int __init platform_pci_module_init(void)
> {
> 	int rc;
> 
>-	/* no unplug has been done, IGNORE hasn't been specified: just
>-	 * return now */
>-	if (!xen_platform_pci_unplug)
>-		return -ENODEV;
>-
> 	rc = pci_register_driver(&platform_driver);
> 	if (rc) {
> 		printk(KERN_INFO DRV_NAME
>-- 
>1.7.5
>

Actions: View | Diff

Attachments on bug 803239: 569948 | 571838