Wind up bootprio support in the ahci driver so boot device ordering
works for ahci disks too. No extra work needed on qemu side.
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
dprintf(1, "%s\n", desc);
// Register with bcv system.
dprintf(1, "%s\n", desc);
// Register with bcv system.
- boot_add_hd(&port->drive, desc, -1);
+ int prio = bootprio_find_ata_device(ctrl->pci_tmp, pnr, 0);
+ boot_add_hd(&port->drive, desc, prio);
} else {
// found cdrom (atapi)
port->drive.blksize = CDROM_SECTOR_SIZE;
} else {
// found cdrom (atapi)
port->drive.blksize = CDROM_SECTOR_SIZE;
dprintf(1, "%s\n", desc);
// fill cdidmap
dprintf(1, "%s\n", desc);
// fill cdidmap
- if (iscd)
- boot_add_cd(&port->drive, desc, -1);
+ if (iscd) {
+ int prio = bootprio_find_ata_device(ctrl->pci_tmp, pnr, 0);
+ boot_add_cd(&port->drive, desc, prio);
+ }
// Initialize an ata controller and detect its drives.
static void
// Initialize an ata controller and detect its drives.
static void
-ahci_init_controller(int bdf)
+ahci_init_controller(struct pci_device *pci)
{
struct ahci_ctrl_s *ctrl = malloc_fseg(sizeof(*ctrl));
{
struct ahci_ctrl_s *ctrl = malloc_fseg(sizeof(*ctrl));
ctrl->pci_bdf = bdf;
ctrl->iobase = pci_config_readl(bdf, PCI_BASE_ADDRESS_5);
ctrl->irq = pci_config_readb(bdf, PCI_INTERRUPT_LINE);
ctrl->pci_bdf = bdf;
ctrl->iobase = pci_config_readl(bdf, PCI_BASE_ADDRESS_5);
ctrl->irq = pci_config_readb(bdf, PCI_INTERRUPT_LINE);
continue;
if (pci->prog_if != 1 /* AHCI rev 1 */)
continue;
continue;
if (pci->prog_if != 1 /* AHCI rev 1 */)
continue;
- ahci_init_controller(pci->bdf);
+ ahci_init_controller(pci);
+ struct pci_device *pci_tmp;
+ u16 pci_bdf;
u8 irq;
u32 iobase;
u32 caps;
u8 irq;
u32 iobase;
u32 caps;