From patchwork Thu Sep 13 20:12:38 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jason Baron X-Patchwork-Id: 183729 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 3C2002C008B for ; Fri, 14 Sep 2012 07:02:32 +1000 (EST) Received: from localhost ([::1]:60416 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TCFn5-00027q-DF for incoming@patchwork.ozlabs.org; Thu, 13 Sep 2012 16:13:35 -0400 Received: from eggs.gnu.org ([208.118.235.92]:53089) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TCFmE-0000hz-0I for qemu-devel@nongnu.org; Thu, 13 Sep 2012 16:12:48 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TCFmC-0002sk-HK for qemu-devel@nongnu.org; Thu, 13 Sep 2012 16:12:41 -0400 Received: from mx1.redhat.com ([209.132.183.28]:41136) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TCFmC-0002sY-7z for qemu-devel@nongnu.org; Thu, 13 Sep 2012 16:12:40 -0400 Received: from int-mx01.intmail.prod.int.phx2.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id q8DKCcsX017803 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Thu, 13 Sep 2012 16:12:38 -0400 Received: from redhat.com (dhcp-185-114.bos.redhat.com [10.16.185.114]) by int-mx01.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id q8DKCcbb028690; Thu, 13 Sep 2012 16:12:38 -0400 Date: Thu, 13 Sep 2012 16:12:38 -0400 From: Jason Baron To: qemu-devel@nongnu.org Message-Id: <8a374796284b9bcb9685833809f6c6932f6430c6.1347561356.git.jbaron@redhat.com> In-Reply-To: References: X-Scanned-By: MIMEDefang 2.67 on 10.5.11.11 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.132.183.28 Cc: aliguori@us.ibm.com, alex.williamson@redhat.com, mst@redhat.com, jan.kiszka@siemens.com, agraf@suse.de, armbru@redhat.com, yamahata@valinux.co.jp, juzhang@redhat.com, kevin@koconnor.net, avi@redhat.com, mkletzan@redhat.com, lcapitulino@redhat.com, afaerber@suse.de Subject: [Qemu-devel] [PATCH 04/25] ahci: add ide device initialization helper X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org From: Isaku Yamahata Introduce a helper function which initializes the ahci port with ide devices. It will be used by q35 support. Cc: Alexander Graf Signed-off-by: Isaku Yamahata Signed-off-by: Jason Baron --- hw/ide.h | 3 +++ hw/ide/ahci.c | 16 ++++++++++++++++ 2 files changed, 19 insertions(+), 0 deletions(-) diff --git a/hw/ide.h b/hw/ide.h index 2db4079..8df872e 100644 --- a/hw/ide.h +++ b/hw/ide.h @@ -36,4 +36,7 @@ int ide_get_bios_chs_trans(BusState *bus, int unit); /* ide/core.c */ void ide_drive_get(DriveInfo **hd, int max_bus); +/* ide/ahci.c */ +void pci_ahci_ide_create_devs(PCIDevice *pci_dev, DriveInfo **hd_table); + #endif /* HW_IDE_H */ diff --git a/hw/ide/ahci.c b/hw/ide/ahci.c index 5ea3cad..9561210 100644 --- a/hw/ide/ahci.c +++ b/hw/ide/ahci.c @@ -1260,3 +1260,19 @@ static void sysbus_ahci_register_types(void) } type_init(sysbus_ahci_register_types) + +void pci_ahci_ide_create_devs(PCIDevice *pci_dev, DriveInfo **hd_table) +{ + struct AHCIPCIState *dev = DO_UPCAST(struct AHCIPCIState, card, pci_dev); + int i; + + for (i = 0; i < dev->ahci.ports; i++) { + /* master device only, ignore slaves */ + if (hd_table[i * MAX_IDE_DEVS] == NULL) { + continue; + } + ide_create_drive(&dev->ahci.dev[i].port, 0, + hd_table[i * MAX_IDE_DEVS]); + } +} +