* [PATCH] xen: only check xen_platform_pci_unplug if hvm
@ 2012-03-27 17:31 Igor Mammedov
2012-03-27 17:36 ` [Xen-devel] " Konrad Rzeszutek Wilk
0 siblings, 1 reply; 2+ messages in thread
From: Igor Mammedov @ 2012-03-27 17:31 UTC (permalink / raw)
To: xen-devel; +Cc: konrad.wilk, Stefano.Stabellini
commit b9136d207f08
xen: initialize platform-pci even if xen_emul_unplug=never
breaks blkfront/netfront by not loading them because of
xen_platform_pci_unplug=0 and it is never set for PV guest.
Signed-off-by: Andrew Jones <drjones@redhat.com>
Signed-off-by: Igor Mammedov <imammedo@redhat.com>
---
drivers/block/xen-blkfront.c | 2 +-
drivers/net/xen-netfront.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/block/xen-blkfront.c b/drivers/block/xen-blkfront.c
index d5e1ab9..98cbeba 100644
--- a/drivers/block/xen-blkfront.c
+++ b/drivers/block/xen-blkfront.c
@@ -1475,7 +1475,7 @@ static int __init xlblk_init(void)
if (!xen_domain())
return -ENODEV;
- if (!xen_platform_pci_unplug)
+ if (xen_hvm_domain() && !xen_platform_pci_unplug)
return -ENODEV;
if (register_blkdev(XENVBD_MAJOR, DEV_NAME)) {
diff --git a/drivers/net/xen-netfront.c b/drivers/net/xen-netfront.c
index 663b32c..0ebbb19 100644
--- a/drivers/net/xen-netfront.c
+++ b/drivers/net/xen-netfront.c
@@ -1965,7 +1965,7 @@ static int __init netif_init(void)
if (xen_initial_domain())
return 0;
- if (!xen_platform_pci_unplug)
+ if (xen_hvm_domain() && !xen_platform_pci_unplug)
return -ENODEV;
printk(KERN_INFO "Initialising Xen virtual ethernet driver.\n");
--
1.7.5
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [Xen-devel] [PATCH] xen: only check xen_platform_pci_unplug if hvm
2012-03-27 17:31 [PATCH] xen: only check xen_platform_pci_unplug if hvm Igor Mammedov
@ 2012-03-27 17:36 ` Konrad Rzeszutek Wilk
0 siblings, 0 replies; 2+ messages in thread
From: Konrad Rzeszutek Wilk @ 2012-03-27 17:36 UTC (permalink / raw)
To: Igor Mammedov, linux-kernel, axboe, davem; +Cc: xen-devel, Stefano.Stabellini
On Tue, Mar 27, 2012 at 07:31:08PM +0200, Igor Mammedov wrote:
> commit b9136d207f08
> xen: initialize platform-pci even if xen_emul_unplug=never
>
> breaks blkfront/netfront by not loading them because of
> xen_platform_pci_unplug=0 and it is never set for PV guest.
Looks good to me.
If the networking/block maintainers don't object I can push this out to
Linus when rc1 comes out.
>
> Signed-off-by: Andrew Jones <drjones@redhat.com>
> Signed-off-by: Igor Mammedov <imammedo@redhat.com>
> ---
> drivers/block/xen-blkfront.c | 2 +-
> drivers/net/xen-netfront.c | 2 +-
> 2 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/block/xen-blkfront.c b/drivers/block/xen-blkfront.c
> index d5e1ab9..98cbeba 100644
> --- a/drivers/block/xen-blkfront.c
> +++ b/drivers/block/xen-blkfront.c
> @@ -1475,7 +1475,7 @@ static int __init xlblk_init(void)
> if (!xen_domain())
> return -ENODEV;
>
> - if (!xen_platform_pci_unplug)
> + if (xen_hvm_domain() && !xen_platform_pci_unplug)
> return -ENODEV;
>
> if (register_blkdev(XENVBD_MAJOR, DEV_NAME)) {
> diff --git a/drivers/net/xen-netfront.c b/drivers/net/xen-netfront.c
> index 663b32c..0ebbb19 100644
> --- a/drivers/net/xen-netfront.c
> +++ b/drivers/net/xen-netfront.c
> @@ -1965,7 +1965,7 @@ static int __init netif_init(void)
> if (xen_initial_domain())
> return 0;
>
> - if (!xen_platform_pci_unplug)
> + if (xen_hvm_domain() && !xen_platform_pci_unplug)
> return -ENODEV;
>
> printk(KERN_INFO "Initialising Xen virtual ethernet driver.\n");
> --
> 1.7.5
>
>
> _______________________________________________
> Xen-devel mailing list
> Xen-devel@lists.xen.org
> http://lists.xen.org/xen-devel
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2012-03-27 17:36 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-03-27 17:31 [PATCH] xen: only check xen_platform_pci_unplug if hvm Igor Mammedov
2012-03-27 17:36 ` [Xen-devel] " Konrad Rzeszutek Wilk
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).