From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:42816) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XWoWh-0004j0-3O for qemu-devel@nongnu.org; Wed, 24 Sep 2014 11:30:51 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XWoWZ-0007fG-30 for qemu-devel@nongnu.org; Wed, 24 Sep 2014 11:30:43 -0400 Received: from mx1.redhat.com ([209.132.183.28]:56185) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XWoWY-0007eR-QH for qemu-devel@nongnu.org; Wed, 24 Sep 2014 11:30:34 -0400 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id s8OFUSIt011419 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL) for ; Wed, 24 Sep 2014 11:30:29 -0400 From: Markus Armbruster References: <1411490885-29782-1-git-send-email-jsnow@redhat.com> <1411490885-29782-7-git-send-email-jsnow@redhat.com> <87a95poy3g.fsf@blackfin.pond.sub.org> Date: Wed, 24 Sep 2014 17:30:26 +0200 In-Reply-To: <87a95poy3g.fsf@blackfin.pond.sub.org> (Markus Armbruster's message of "Wed, 24 Sep 2014 17:08:19 +0200") Message-ID: <87h9zxm3xp.fsf@blackfin.pond.sub.org> MIME-Version: 1.0 Content-Type: text/plain Subject: Re: [Qemu-devel] [PATCH 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, mst@redhat.com Markus Armbruster writes: > John Snow 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 >> --- >> 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? */ > [...]