From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:58137) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Rink2-0001Pv-2L for qemu-devel@nongnu.org; Thu, 05 Jan 2012 08:52:27 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Rink0-0005Q6-Vg for qemu-devel@nongnu.org; Thu, 05 Jan 2012 08:52:26 -0500 Received: from smtp111.dfw.emailsrvr.com ([67.192.241.111]:33368) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Rink0-0005Q0-SU for qemu-devel@nongnu.org; Thu, 05 Jan 2012 08:52:24 -0500 From: Mark Langsdorf Date: Thu, 5 Jan 2012 07:52:39 -0600 Message-Id: <1325771559-15570-2-git-send-email-mark.langsdorf@calxeda.com> In-Reply-To: <1325771559-15570-1-git-send-email-mark.langsdorf@calxeda.com> References: <1325771559-15570-1-git-send-email-mark.langsdorf@calxeda.com> Subject: [Qemu-devel] [PATCH v3 2/2] ahci: add support for non-PCI based controllers List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: kwolf@redhat.com, peter.maydell@linaro.org, Rob Herring , afaerber@suse.de, Mark Langsdorf From: Rob Herring Add support for ahci on sysbus. Signed-off-by: Rob Herring Signed-off-by: Mark Langsdorf --- Changes from v1, v2 Corrected indentation of PlatAHCIState members Made plat_ahci_info into a single structure, not a list hw/ide/ahci.c | 31 +++++++++++++++++++++++++++++++ 1 files changed, 31 insertions(+), 0 deletions(-) diff --git a/hw/ide/ahci.c b/hw/ide/ahci.c index 135d0ee..f052e55 100644 --- a/hw/ide/ahci.c +++ b/hw/ide/ahci.c @@ -25,6 +25,7 @@ #include #include #include +#include #include "monitor.h" #include "dma.h" @@ -1214,3 +1215,33 @@ void ahci_reset(void *opaque) ahci_reset_port(s, i); } } + +typedef struct PlatAHCIState { + SysBusDevice busdev; + AHCIState ahci; +} PlatAHCIState; + +static int plat_ahci_init(SysBusDevice *dev) +{ + PlatAHCIState *s = FROM_SYSBUS(PlatAHCIState, dev); + ahci_init(&s->ahci, &dev->qdev, 1); + + sysbus_init_mmio(dev, &s->ahci.mem); + sysbus_init_irq(dev, &s->ahci.irq); + + qemu_register_reset(ahci_reset, &s->ahci); + return 0; +} + +static SysBusDeviceInfo plat_ahci_info = { + .qdev.name = "plat-ahci", + .qdev.size = sizeof(PlatAHCIState), + .init = plat_ahci_init, +}; + +static void plat_ahci_register(void) +{ + sysbus_register_withprop(&plat_ahci_info); +} +device_init(plat_ahci_register); + -- 1.7.5.4