Markus Armbruster <arm...@redhat.com> writes: > John Snow <js...@redhat.com> writes: > >> This patch implements the backend for the Q35 board >> for us to be able to pick up and use drives defined >> by the -cdrom, -hda, or -drive if=ide shorthand options. >> >> A workaround for these command line options not previously >> working as intended in the bios-tables-test is also removed. > > I figure this paragraph has since become PATCH 5, and should be dropped > here. > >> Signed-off-by: John Snow <js...@redhat.com> >> --- >> hw/i386/pc_q35.c | 3 +++ >> hw/ide/ahci.c | 15 +++++++++++++++ >> hw/ide/ahci.h | 2 ++ >> 3 files changed, 20 insertions(+) >> >> diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c >> index b28ddbb..1664a2d 100644 >> --- a/hw/i386/pc_q35.c >> +++ b/hw/i386/pc_q35.c >> @@ -86,6 +86,7 @@ static void pc_q35_init(MachineState *machine) >> DeviceState *icc_bridge; >> PcGuestInfo *guest_info; >> ram_addr_t lowmem; >> + DriveInfo *hd[MAX_SATA_PORTS]; >> >> /* Check whether RAM fits below 4G (leaving 1/2 GByte for IO memory >> * and 256 Mbytes for PCI Express Enhanced Configuration Access Mapping >> @@ -253,6 +254,8 @@ static void pc_q35_init(MachineState *machine) >> true, "ich9-ahci"); >> idebus[0] = qdev_get_child_bus(&ahci->qdev, "ide.0"); >> idebus[1] = qdev_get_child_bus(&ahci->qdev, "ide.1"); >> + ide_drive_get(hd, ICH_AHCI(ahci)->ahci.ports); > > Superfluous parenthesis around ahci.
Nevermind, I can't read. >> + ahci_ide_create_devs(ahci, hd); >> >> if (usb_enabled(false)) { >> /* Should we create 6 UHCI according to ich9 spec? */ > [...]