Page MenuHomeFreeBSD
Files F150158429

D27929.id.diff
No OneTemporary
Actions

D27929.id.diff
View Options

Index: sys/dev/virtio/balloon/virtio_balloon.c
===================================================================
--- sys/dev/virtio/balloon/virtio_balloon.c
+++ sys/dev/virtio/balloon/virtio_balloon.c
@@ -159,7 +159,9 @@
DRIVER_MODULE(virtio_balloon, virtio_mmio, vtballoon_driver,
vtballoon_devclass, 0, 0);
-DRIVER_MODULE(virtio_balloon, virtio_pci_legacy, vtballoon_driver,
+DRIVER_MODULE(virtio_balloon, vtpcil, vtballoon_driver,
+ vtballoon_devclass, 0, 0);
+DRIVER_MODULE(virtio_balloon, vtpcim, vtballoon_driver,
vtballoon_devclass, 0, 0);
MODULE_VERSION(virtio_balloon, 1);
MODULE_DEPEND(virtio_balloon, virtio, 1, 1, 1);
Index: sys/dev/virtio/block/virtio_blk.c
===================================================================
--- sys/dev/virtio/block/virtio_blk.c
+++ sys/dev/virtio/block/virtio_blk.c
@@ -269,7 +269,9 @@
DRIVER_MODULE(virtio_blk, virtio_mmio, vtblk_driver, vtblk_devclass,
vtblk_modevent, 0);
-DRIVER_MODULE(virtio_blk, virtio_pci_legacy, vtblk_driver, vtblk_devclass,
+DRIVER_MODULE(virtio_blk, vtpcil, vtblk_driver, vtblk_devclass,
+ vtblk_modevent, 0);
+DRIVER_MODULE(virtio_blk, vtpcim, vtblk_driver, vtblk_devclass,
vtblk_modevent, 0);
MODULE_VERSION(virtio_blk, 1);
MODULE_DEPEND(virtio_blk, virtio, 1, 1, 1);
Index: sys/dev/virtio/console/virtio_console.c
===================================================================
--- sys/dev/virtio/console/virtio_console.c
+++ sys/dev/virtio/console/virtio_console.c
@@ -265,7 +265,9 @@
DRIVER_MODULE(virtio_console, virtio_mmio, vtcon_driver, vtcon_devclass,
vtcon_modevent, 0);
-DRIVER_MODULE(virtio_console, virtio_pci_legacy, vtcon_driver, vtcon_devclass,
+DRIVER_MODULE(virtio_console, vtpcil, vtcon_driver, vtcon_devclass,
+ vtcon_modevent, 0);
+DRIVER_MODULE(virtio_console, vtpcim, vtcon_driver, vtcon_devclass,
vtcon_modevent, 0);
MODULE_VERSION(virtio_console, 1);
MODULE_DEPEND(virtio_console, virtio, 1, 1, 1);
Index: sys/dev/virtio/network/if_vtnet.c
===================================================================
--- sys/dev/virtio/network/if_vtnet.c
+++ sys/dev/virtio/network/if_vtnet.c
@@ -356,16 +356,16 @@
#endif
static driver_t vtnet_driver = {
- .name = "vtnet",
- .methods = vtnet_methods,
- .size = sizeof(struct vtnet_softc)
+ .name = "vtnet",
+ .methods = vtnet_methods,
+ .size = sizeof(struct vtnet_softc)
};
static devclass_t vtnet_devclass;
DRIVER_MODULE(vtnet, virtio_mmio, vtnet_driver, vtnet_devclass,
vtnet_modevent, 0);
-DRIVER_MODULE(vtnet, virtio_pci_legacy, vtnet_driver, vtnet_devclass,
- vtnet_modevent, 0);
+DRIVER_MODULE(vtnet, vtpcil, vtnet_driver, vtnet_devclass, vtnet_modevent, 0);
+DRIVER_MODULE(vtnet, vtpcim, vtnet_driver, vtnet_devclass, vtnet_modevent, 0);
MODULE_VERSION(vtnet, 1);
MODULE_DEPEND(vtnet, virtio, 1, 1, 1);
#ifdef DEV_NETMAP
Index: sys/dev/virtio/pci/virtio_pci_legacy.c
===================================================================
--- sys/dev/virtio/pci/virtio_pci_legacy.c
+++ sys/dev/virtio/pci/virtio_pci_legacy.c
@@ -179,15 +179,14 @@
};
static driver_t vtpci_legacy_driver = {
- "virtio_pci_legacy",
- vtpci_legacy_methods,
- sizeof(struct vtpci_legacy_softc)
+ .name = "vtpcil",
+ .methods = vtpci_legacy_methods,
+ .size = sizeof(struct vtpci_legacy_softc)
};
devclass_t vtpci_legacy_devclass;
-DRIVER_MODULE(virtio_pci_legacy, pci, vtpci_legacy_driver,
- vtpci_legacy_devclass, 0, 0);
+DRIVER_MODULE(vtpcil, pci, vtpci_legacy_driver, vtpci_legacy_devclass, 0, 0);
static int
vtpci_legacy_probe(device_t dev)
Index: sys/dev/virtio/pci/virtio_pci_modern.c
===================================================================
--- sys/dev/virtio/pci/virtio_pci_modern.c
+++ sys/dev/virtio/pci/virtio_pci_modern.c
@@ -237,15 +237,14 @@
};
static driver_t vtpci_modern_driver = {
- "virtio_pci_modern",
- vtpci_modern_methods,
- sizeof(struct vtpci_modern_softc)
+ .name = "vtpcim",
+ .methods = vtpci_modern_methods,
+ .size = sizeof(struct vtpci_modern_softc)
};
devclass_t vtpci_modern_devclass;
-DRIVER_MODULE(virtio_pci_modern, pci, vtpci_modern_driver,
- vtpci_modern_devclass, 0, 0);
+DRIVER_MODULE(vtpcim, pci, vtpci_modern_driver, vtpci_modern_devclass, 0, 0);
static int
vtpci_modern_probe(device_t dev)
Index: sys/dev/virtio/random/virtio_random.c
===================================================================
--- sys/dev/virtio/random/virtio_random.c
+++ sys/dev/virtio/random/virtio_random.c
@@ -98,7 +98,9 @@
DRIVER_MODULE(virtio_random, virtio_mmio, vtrnd_driver, vtrnd_devclass,
vtrnd_modevent, 0);
-DRIVER_MODULE(virtio_random, virtio_pci_legacy, vtrnd_driver, vtrnd_devclass,
+DRIVER_MODULE(virtio_random, vtpcil, vtrnd_driver, vtrnd_devclass,
+ vtrnd_modevent, 0);
+DRIVER_MODULE(virtio_random, vtpcim, vtrnd_driver, vtrnd_devclass,
vtrnd_modevent, 0);
MODULE_VERSION(virtio_random, 1);
MODULE_DEPEND(virtio_random, virtio, 1, 1, 1);
Index: sys/dev/virtio/scsi/virtio_scsi.c
===================================================================
--- sys/dev/virtio/scsi/virtio_scsi.c
+++ sys/dev/virtio/scsi/virtio_scsi.c
@@ -240,7 +240,9 @@
DRIVER_MODULE(virtio_scsi, virtio_mmio, vtscsi_driver, vtscsi_devclass,
vtscsi_modevent, 0);
-DRIVER_MODULE(virtio_scsi, virtio_pci_legacy, vtscsi_driver, vtscsi_devclass,
+DRIVER_MODULE(virtio_scsi, vtpcil, vtscsi_driver, vtscsi_devclass,
+ vtscsi_modevent, 0);
+DRIVER_MODULE(virtio_scsi, vtpcim, vtscsi_driver, vtscsi_devclass,
vtscsi_modevent, 0);
MODULE_VERSION(virtio_scsi, 1);
MODULE_DEPEND(virtio_scsi, virtio, 1, 1, 1);

File Metadata

Mime Type
text/plain
Expires
Mon, Mar 30, 9:38 PM (17 h, 52 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
30602747
Default Alt Text
D27929.id.diff (5 KB)

Event Timeline