From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56704) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XUfzS-0007lQ-0g for qemu-devel@nongnu.org; Thu, 18 Sep 2014 13:59:40 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XUfzI-0000gI-G3 for qemu-devel@nongnu.org; Thu, 18 Sep 2014 13:59:33 -0400 Received: from mx1.redhat.com ([209.132.183.28]:29410) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XUfzI-0000eg-86 for qemu-devel@nongnu.org; Thu, 18 Sep 2014 13:59:24 -0400 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id s8IHxIog011004 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL) for ; Thu, 18 Sep 2014 13:59:18 -0400 From: John Snow Date: Thu, 18 Sep 2014 13:59:06 -0400 Message-Id: <1411063146-24058-4-git-send-email-jsnow@redhat.com> In-Reply-To: <1411063146-24058-1-git-send-email-jsnow@redhat.com> References: <1411063146-24058-1-git-send-email-jsnow@redhat.com> Subject: [Qemu-devel] [RFC v2 3/3] ahci: implement -cdrom and -hd[a-d] List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: jsnow@redhat.com, armbru@redhat.com Signed-off-by: John Snow --- hw/i386/pc_q35.c | 3 +++ hw/ide/ahci.c | 31 +++++++++++++++++++++++++++++++ hw/ide/ahci.h | 3 +++ 3 files changed, 37 insertions(+) diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c index fd26fe1..0f33696 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"); + ahci_drive_get(ahci, hd); + ahci_ide_create_devs(ahci, hd); if (usb_enabled(false)) { /* Should we create 6 UHCI according to ich9 spec? */ diff --git a/hw/ide/ahci.c b/hw/ide/ahci.c index ba69de3..ae28de4 100644 --- a/hw/ide/ahci.c +++ b/hw/ide/ahci.c @@ -1402,3 +1402,34 @@ static void sysbus_ahci_register_types(void) } type_init(sysbus_ahci_register_types) + +void ahci_drive_get(PCIDevice *dev, DriveInfo **tab) +{ + AHCIPCIState *d = ICH_AHCI(dev); + AHCIState *ahci = &d->ahci; + unsigned i; + + if ((i = drive_get_max_bus(IF_IDE)) >= ahci->ports) { + fprintf(stderr, "AHCI: Too many IDE buses defined for AHCI (%d > %d)\n", + i, ahci->ports - 1); + } + + for (i = 0; i < ahci->ports; ++i) { + tab[i] = drive_get_by_index(IF_IDE, i); + } +} + +void ahci_ide_create_devs(PCIDevice *dev, DriveInfo **tab) +{ + AHCIPCIState *d = ICH_AHCI(dev); + AHCIState *ahci = &d->ahci; + unsigned i; + + for (i = 0; i < ahci->ports; i++) { + if (tab[i] == NULL) { + continue; + } + ide_create_drive(&ahci->dev[i].port, 0, tab[i]); + } + +} diff --git a/hw/ide/ahci.h b/hw/ide/ahci.h index 1543df7..06a18de 100644 --- a/hw/ide/ahci.h +++ b/hw/ide/ahci.h @@ -332,4 +332,7 @@ void ahci_uninit(AHCIState *s); void ahci_reset(AHCIState *s); +void ahci_drive_get(PCIDevice *dev, DriveInfo **tab); +void ahci_ide_create_devs(PCIDevice *dev, DriveInfo **tab); + #endif /* HW_IDE_AHCI_H */ -- 1.9.3