From patchwork Tue Oct 9 03:30:25 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jason Baron X-Patchwork-Id: 190186 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 D60D82C0341 for ; Tue, 9 Oct 2012 14:58:32 +1100 (EST) Received: from localhost ([::1]:50735 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TLQXI-0002Ig-Cp for incoming@patchwork.ozlabs.org; Mon, 08 Oct 2012 23:31:12 -0400 Received: from eggs.gnu.org ([208.118.235.92]:57638) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TLQWc-0000ew-NT for qemu-devel@nongnu.org; Mon, 08 Oct 2012 23:30:33 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TLQWb-0001mt-9J for qemu-devel@nongnu.org; Mon, 08 Oct 2012 23:30:30 -0400 Received: from mx1.redhat.com ([209.132.183.28]:53364) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TLQWb-0001kx-0a for qemu-devel@nongnu.org; Mon, 08 Oct 2012 23:30:29 -0400 Received: from int-mx02.intmail.prod.int.phx2.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id q993UPdP025559 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Mon, 8 Oct 2012 23:30:25 -0400 Received: from redhat.com (dhcp-185-114.bos.redhat.com [10.16.185.114]) by int-mx02.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id q993UPdf006125; Mon, 8 Oct 2012 23:30:25 -0400 Date: Mon, 8 Oct 2012 23:30:25 -0400 From: Jason Baron To: qemu-devel@nongnu.org Message-Id: <07da35180257308d6d3ade9a8d4f40c08a0eb925.1349749915.git.jbaron@redhat.com> In-Reply-To: References: X-Scanned-By: MIMEDefang 2.67 on 10.5.11.12 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, juzhang@redhat.com, mst@redhat.com, jan.kiszka@siemens.com, armbru@redhat.com, agraf@suse.de, blauwirbel@gmail.com, yamahata@valinux.co.jp, alex.williamson@redhat.com, kevin@koconnor.net, avi@redhat.com, mkletzan@redhat.com, pbonzini@redhat.com, lcapitulino@redhat.com, afaerber@suse.de, kraxel@redhat.com Subject: [Qemu-devel] [PATCH v2 02/21] blockdev: Introduce IF_AHCI 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: Jason Baron Introduce IF_AHCI so that q35 can differentiate between ide and ahci disks. This allows q35 to specify its default disk type. It also allows q35 to differentiate between ahci and ide disks, such that -drive if=ide does not result in the creating of an ahci disk. This is important, since we don't want to have the meaning of if=ide changing once q35 is introduced. Thus, its important for this to be applied before we introduce q35. This patch also adds: pci_ahci_create_devs(PCIDevice *pci_dev, DriveInfo **hd_table) Which provides a convient way of attaching ahci drives to an ahci controller. Signed-off-by: Jason Baron Reviewed-by: Paolo Bonzini --- blockdev.c | 13 ++++++++++++- blockdev.h | 2 ++ hw/ide.h | 6 ++++++ hw/ide/ahci.c | 18 ++++++++++++++++++ hw/ide/core.c | 23 ++++++++++++++++++----- 5 files changed, 56 insertions(+), 6 deletions(-) diff --git a/blockdev.c b/blockdev.c index 93a7bf7..9ccc150 100644 --- a/blockdev.c +++ b/blockdev.c @@ -32,6 +32,7 @@ static const char *const if_name[IF_COUNT] = { [IF_SD] = "sd", [IF_VIRTIO] = "virtio", [IF_XEN] = "xen", + [IF_AHCI] = "ahci", }; static const int if_max_devs[IF_COUNT] = { @@ -51,8 +52,17 @@ static const int if_max_devs[IF_COUNT] = { */ [IF_IDE] = 2, [IF_SCSI] = 7, + [IF_AHCI] = 6, }; +int get_if_max_devs(BlockInterfaceType if_type) +{ + assert(if_type < IF_COUNT); + assert(if_type >= IF_DEFAULT); + + return if_max_devs[if_type]; +} + /* * We automatically delete the drive when a device using it gets * unplugged. Questionable feature, but we can't just drop it. @@ -517,7 +527,7 @@ DriveInfo *drive_init(QemuOpts *opts, int mach_if) } else { /* no id supplied -> create one */ dinfo->id = g_malloc0(32); - if (type == IF_IDE || type == IF_SCSI) + if (type == IF_IDE || type == IF_SCSI || type == IF_AHCI) mediastr = (media == MEDIA_CDROM) ? "-cd" : "-hd"; if (max_devs) snprintf(dinfo->id, 32, "%s%i%s%i", @@ -549,6 +559,7 @@ DriveInfo *drive_init(QemuOpts *opts, int mach_if) switch(type) { case IF_IDE: + case IF_AHCI: case IF_SCSI: case IF_XEN: case IF_NONE: diff --git a/blockdev.h b/blockdev.h index 8b126ad..bbd1017 100644 --- a/blockdev.h +++ b/blockdev.h @@ -21,6 +21,7 @@ typedef enum { IF_DEFAULT = -1, /* for use with drive_add() only */ IF_NONE, IF_IDE, IF_SCSI, IF_FLOPPY, IF_PFLASH, IF_MTD, IF_SD, IF_VIRTIO, IF_XEN, + IF_AHCI, IF_COUNT } BlockInterfaceType; @@ -56,6 +57,7 @@ static inline int get_mach_if(int mach_if) return mach_if; } +int get_if_max_devs(BlockInterfaceType if_type); DriveInfo *drive_get(BlockInterfaceType type, int bus, int unit); DriveInfo *drive_get_by_index(BlockInterfaceType type, int index); int drive_get_max_bus(BlockInterfaceType type); diff --git a/hw/ide.h b/hw/ide.h index 2db4079..0b7e000 100644 --- a/hw/ide.h +++ b/hw/ide.h @@ -4,6 +4,7 @@ #include "isa.h" #include "pci.h" #include "memory.h" +#include "blockdev.h" #define MAX_IDE_DEVS 2 @@ -34,6 +35,11 @@ int ide_get_geometry(BusState *bus, int unit, int ide_get_bios_chs_trans(BusState *bus, int unit); /* ide/core.c */ +void ata_drive_get(DriveInfo **hd, int max_bus, BlockInterfaceType type); void ide_drive_get(DriveInfo **hd, int max_bus); +void ahci_drive_get(DriveInfo **hd, int max_bus); + +/* ide/ahci.c */ +void pci_ahci_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 68671bc..824b86f 100644 --- a/hw/ide/ahci.c +++ b/hw/ide/ahci.c @@ -26,6 +26,7 @@ #include #include #include +#include #include "monitor.h" #include "dma.h" @@ -1260,3 +1261,20 @@ static void sysbus_ahci_register_types(void) } type_init(sysbus_ahci_register_types) + +void pci_ahci_create_devs(PCIDevice *pci_dev, DriveInfo **hd_table) +{ + struct AHCIPCIState *dev = DO_UPCAST(struct AHCIPCIState, card, pci_dev); + int i; + DriveInfo *drive; + + for (i = 0; i < dev->ahci.ports; i++) { + if (hd_table[i] == NULL) { + continue; + } + drive = hd_table[i]; + assert(drive->type == IF_AHCI); + ide_create_drive(&dev->ahci.dev[i].port, 0, + hd_table[i]); + } +} diff --git a/hw/ide/core.c b/hw/ide/core.c index d6fb69c..f2fcc79 100644 --- a/hw/ide/core.c +++ b/hw/ide/core.c @@ -2351,16 +2351,29 @@ const VMStateDescription vmstate_ide_bus = { } }; -void ide_drive_get(DriveInfo **hd, int max_bus) +void ata_drive_get(DriveInfo **hd, int max_bus, BlockInterfaceType type) { int i; + int max_devs; + + assert((type == IF_IDE) || type == IF_AHCI); - if (drive_get_max_bus(IF_IDE) >= max_bus) { + if (drive_get_max_bus(type) >= max_bus) { fprintf(stderr, "qemu: too many IDE bus: %d\n", max_bus); exit(1); } - - for(i = 0; i < max_bus * MAX_IDE_DEVS; i++) { - hd[i] = drive_get(IF_IDE, i / MAX_IDE_DEVS, i % MAX_IDE_DEVS); + max_devs = get_if_max_devs(type); + for (i = 0; i < max_bus * max_devs; i++) { + hd[i] = drive_get(type, i / max_devs, i % max_devs); } } + +void ide_drive_get(DriveInfo **hd, int max_bus) +{ + ata_drive_get(hd, max_bus, IF_IDE); +} + +void ahci_drive_get(DriveInfo **hd, int max_bus) +{ + ata_drive_get(hd, max_bus, IF_AHCI); +}