Changeset 104142 in vbox

Timestamp:

Apr 3, 2024 3:49:45 PM (11 months ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

162564

Message:

BIOS: Removed VBOX_IS_VIRTIO_SCSI_DEVICE and associated cruft. It's no longer used, virtio-scsi is treated the same as other SCSI HBAs.

File:

• trunk/src/VBox/Devices/PC/BIOS/ebda.h (modified) (2 diffs)

trunk/src/VBox/Devices/PC/BIOS/ebda.h

@@ -100 +100 @@
 #endif
 
-#ifdef VBOX_WITH_VIRTIO_SCSI
-    /* Four should be enough for now */
-    #define BX_MAX_VIRTIO_SCSI_DEVICES 4
-
-    /* An AHCI device starts always at BX_MAX_ATA_DEVICES + BX_MAX_SCSI_DEVICES. */
-    #define VBOX_IS_VIRTIO_SCSI_DEVICE(device_id) (device_id >= (BX_MAX_ATA_DEVICES + BX_MAX_SCSI_DEVICES + BX_MAX_AHCI_DEVICES))
-    #define VBOX_GET_VIRTIO_SCSI_DEVICE(device_id) (device_id - (BX_MAX_ATA_DEVICES + BX_MAX_SCSI_DEVICES + BX_MAX_AHCI_DEVICES))
-#else
-    #define BX_MAX_VIRTIO_SCSI_DEVICES 0
-#endif
-
-#define BX_MAX_STORAGE_DEVICES (BX_MAX_ATA_DEVICES + BX_MAX_SCSI_DEVICES + BX_MAX_AHCI_DEVICES + BX_MAX_VIRTIO_SCSI_DEVICES)
+#define BX_MAX_STORAGE_DEVICES (BX_MAX_ATA_DEVICES + BX_MAX_SCSI_DEVICES + BX_MAX_AHCI_DEVICES)
 
 /* Generic storage device types. These depend on the controller type and
@@ -329 +318 @@
     fdpt_t      fdpt0;      /* FDPTs for the first two ATA disks. */
     fdpt_t      fdpt1;
-
-#ifndef VBOX_WITH_VIRTIO_SCSI /** @todo For development only, need to find a real solution to voercome the 1KB limit. */
-    uint8_t     filler2[0xC4];
-#endif
 
     bio_dsk_t   bdisk;      /* Disk driver data (ATA/SCSI/AHCI). */