xen: only check xen_platform_pci_unplug if hvm
Subsystems (4)
PATCH 1/1 xen: only check xen_platform_pci_unplug if hvm
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 <[email protected]>
Signed-off-by Igor Mammedov <[email protected]>
--- drivers/block/xen-blkfront.c | 2 +- drivers/net/xen-netfront.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
drivers/block/xen-blkfront.c +1 -1
@@ -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 )) {
drivers/net/xen-netfront.c +1 -1
@@ -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" );
Signature · 1 line
1.7.5
Quoted 5 lines · Igor Mammedov
commit
b9136d207f08
xen: initialize platform-pci even if xen_emul_unplug=neverbreaks 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.
Quoted 42 lines
Signed-off-by Andrew Jones <[email protected]>Signed-off-by Igor Mammedov <[email protected]>--- drivers/block/xen-blkfront.c | 2 +- drivers/net/xen-netfront.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)drivers/block/xen-blkfront.c +1
-1@@ -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 )) {drivers/net/xen-netfront.c +1
-1@@ -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" );Signature · 7 lines
1.7.5 _______________________________________________ Xen-devel mailing list [email protected] http://lists.xen.org/xen-devel