From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:38027) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XJV3f-0007kR-67 for qemu-devel@nongnu.org; Mon, 18 Aug 2014 18:05:49 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XJV3U-0006Qp-7Z for qemu-devel@nongnu.org; Mon, 18 Aug 2014 18:05:43 -0400 Received: from mx1.redhat.com ([209.132.183.28]:3703) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XJV3T-0006On-L3 for qemu-devel@nongnu.org; Mon, 18 Aug 2014 18:05:32 -0400 From: John Snow Date: Mon, 18 Aug 2014 18:05:19 -0400 Message-Id: <1408399520-12778-4-git-send-email-jsnow@redhat.com> In-Reply-To: <1408399520-12778-1-git-send-email-jsnow@redhat.com> References: <1408399520-12778-1-git-send-email-jsnow@redhat.com> Subject: [Qemu-devel] [RFC 3/4] ide: update ide_drive_get to work with both PCI-IDE and AHCI interfaces List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: kwolf@redhat.com, jsnow@redhat.com, armbru@redhat.com, stefanha@redhat.com, agraf@suse.de Signed-off-by: John Snow --- hw/i386/pc_piix.c | 2 +- hw/ide/core.c | 11 +++++++---- include/hw/ide.h | 3 ++- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c index 47ac1b5..9da6f0e 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -239,7 +239,7 @@ static void pc_init1(MachineState *machine, pc_nic_init(isa_bus, pci_bus); - ide_drive_get(hd, MAX_IDE_BUS); + ide_drive_get(hd, IF_IDE, MAX_IDE_BUS); if (pci_enabled) { PCIDevice *dev; if (xen_enabled()) { diff --git a/hw/ide/core.c b/hw/ide/core.c index b48127f..408d7c1 100644 --- a/hw/ide/core.c +++ b/hw/ide/core.c @@ -2481,16 +2481,19 @@ const VMStateDescription vmstate_ide_bus = { } }; -void ide_drive_get(DriveInfo **hd, int max_bus) +void ide_drive_get(DriveInfo **hd, BlockInterfaceType type, int max_bus) { int i; - 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); + for (i = 0; i < max_bus * if_get_max_devs(type); i++) { + fprintf(stderr, "hd[%u] := drive_get_by_index(%d, %u);\n", + i, type, i); + hd[i] = drive_get_by_index(type, i); + fprintf(stderr, "hd[%u] := %p\n", i, (void *)hd[i]); } } diff --git a/include/hw/ide.h b/include/hw/ide.h index bc8bd32..c4400ab 100644 --- a/include/hw/ide.h +++ b/include/hw/ide.h @@ -4,6 +4,7 @@ #include "hw/isa/isa.h" #include "hw/pci/pci.h" #include "exec/memory.h" +#include "sysemu/blockdev.h" #define MAX_IDE_DEVS 2 @@ -28,6 +29,6 @@ int ide_get_geometry(BusState *bus, int unit, int ide_get_bios_chs_trans(BusState *bus, int unit); /* ide/core.c */ -void ide_drive_get(DriveInfo **hd, int max_bus); +void ide_drive_get(DriveInfo **hd, BlockInterfaceType type, int max_bus); #endif /* HW_IDE_H */ -- 1.9.3