From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41284) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XZfzx-0001lp-I2 for qemu-devel@nongnu.org; Thu, 02 Oct 2014 09:00:51 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XZfzr-0004AR-DB for qemu-devel@nongnu.org; Thu, 02 Oct 2014 09:00:45 -0400 Received: from mx1.redhat.com ([209.132.183.28]:25611) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XZfzq-0004AD-Hr for qemu-devel@nongnu.org; Thu, 02 Oct 2014 09:00:38 -0400 Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id s92D0ZI2007256 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL) for ; Thu, 2 Oct 2014 09:00:37 -0400 Date: Thu, 2 Oct 2014 16:04:03 +0300 From: "Michael S. Tsirkin" Message-ID: <20141002130403.GC25927@redhat.com> References: <1412187569-23452-1-git-send-email-jsnow@redhat.com> <1412187569-23452-7-git-send-email-jsnow@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1412187569-23452-7-git-send-email-jsnow@redhat.com> Subject: Re: [Qemu-devel] [PATCH v3 6/6] q35/ahci: Pick up -cdrom and -hda options List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: John Snow Cc: kwolf@redhat.com, qemu-devel@nongnu.org, stefanha@redhat.com, armbru@redhat.com On Wed, Oct 01, 2014 at 02:19:29PM -0400, John Snow wrote: > 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. > > Signed-off-by: John Snow Reviewed-by: Michael S. Tsirkin > --- > hw/i386/pc_q35.c | 4 ++++ > hw/ide/ahci.c | 15 +++++++++++++++ > hw/ide/ahci.h | 2 ++ > 3 files changed, 21 insertions(+) > > diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c > index b28ddbb..bb0dc8e 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,9 @@ 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"); > + g_assert_cmpint(MAX_SATA_PORTS, ==, ICH_AHCI(ahci)->ahci.ports); > + ide_drive_get(hd, ICH_AHCI(ahci)->ahci.ports); > + 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 8978643..063730e 100644 > --- a/hw/ide/ahci.c > +++ b/hw/ide/ahci.c > @@ -1419,3 +1419,18 @@ static void sysbus_ahci_register_types(void) > } > > type_init(sysbus_ahci_register_types) > + > +void ahci_ide_create_devs(PCIDevice *dev, DriveInfo **hd) > +{ > + AHCIPCIState *d = ICH_AHCI(dev); > + AHCIState *ahci = &d->ahci; > + int i; > + > + for (i = 0; i < ahci->ports; i++) { > + if (hd[i] == NULL) { > + continue; > + } > + ide_create_drive(&ahci->dev[i].port, 0, hd[i]); > + } > + > +} > diff --git a/hw/ide/ahci.h b/hw/ide/ahci.h > index 1543df7..e223258 100644 > --- a/hw/ide/ahci.h > +++ b/hw/ide/ahci.h > @@ -332,4 +332,6 @@ void ahci_uninit(AHCIState *s); > > void ahci_reset(AHCIState *s); > > +void ahci_ide_create_devs(PCIDevice *dev, DriveInfo **hd); > + > #endif /* HW_IDE_AHCI_H */ > -- > 1.9.3