| xen-blkfront.c (a7dedb4fead89f88255862a9bc46f4c7ec094c2e) | xen-blkfront.c (51c71a3bbaca868043cc45b3ad3786dd48a90235) |
|---|---|
| 1/* 2 * blkfront.c 3 * 4 * XenLinux virtual block device driver. 5 * 6 * Copyright (c) 2003-2004, Keir Fraser & Steve Hand 7 * Modifications by Mark A. Williamson are (c) Intel Research Cambridge 8 * Copyright (c) 2004, Christian Limpach --- 1342 unchanged lines hidden (view full) --- 1351 return err; 1352 } 1353 } 1354 1355 if (xen_hvm_domain()) { 1356 char *type; 1357 int len; 1358 /* no unplug has been done: do not hook devices != xen vbds */ | 1/* 2 * blkfront.c 3 * 4 * XenLinux virtual block device driver. 5 * 6 * Copyright (c) 2003-2004, Keir Fraser & Steve Hand 7 * Modifications by Mark A. Williamson are (c) Intel Research Cambridge 8 * Copyright (c) 2004, Christian Limpach --- 1342 unchanged lines hidden (view full) --- 1351 return err; 1352 } 1353 } 1354 1355 if (xen_hvm_domain()) { 1356 char *type; 1357 int len; 1358 /* no unplug has been done: do not hook devices != xen vbds */ |
| 1359 if (xen_platform_pci_unplug & XEN_UNPLUG_UNNECESSARY) { | 1359 if (xen_has_pv_and_legacy_disk_devices()) { |
| 1360 int major; 1361 1362 if (!VDEV_IS_EXTENDED(vdevice)) 1363 major = BLKIF_MAJOR(vdevice); 1364 else 1365 major = XENVBD_MAJOR; 1366 1367 if (major != XENVBD_MAJOR) { --- 706 unchanged lines hidden (view full) --- 2074 2075static int __init xlblk_init(void) 2076{ 2077 int ret; 2078 2079 if (!xen_domain()) 2080 return -ENODEV; 2081 | 1360 int major; 1361 1362 if (!VDEV_IS_EXTENDED(vdevice)) 1363 major = BLKIF_MAJOR(vdevice); 1364 else 1365 major = XENVBD_MAJOR; 1366 1367 if (major != XENVBD_MAJOR) { --- 706 unchanged lines hidden (view full) --- 2074 2075static int __init xlblk_init(void) 2076{ 2077 int ret; 2078 2079 if (!xen_domain()) 2080 return -ENODEV; 2081 |
| 2082 if (xen_hvm_domain() && !xen_platform_pci_unplug) | 2082 if (!xen_has_pv_disk_devices()) |
| 2083 return -ENODEV; 2084 2085 if (register_blkdev(XENVBD_MAJOR, DEV_NAME)) { 2086 printk(KERN_WARNING "xen_blk: can't get major %d with name %s\n", 2087 XENVBD_MAJOR, DEV_NAME); 2088 return -ENODEV; 2089 } 2090 --- 24 unchanged lines hidden --- | 2083 return -ENODEV; 2084 2085 if (register_blkdev(XENVBD_MAJOR, DEV_NAME)) { 2086 printk(KERN_WARNING "xen_blk: can't get major %d with name %s\n", 2087 XENVBD_MAJOR, DEV_NAME); 2088 return -ENODEV; 2089 } 2090 --- 24 unchanged lines hidden --- |