From patchwork Mon May 9 21:34:48 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 94889 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [140.186.70.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 6AEEAB6F11 for ; Tue, 10 May 2011 07:47:21 +1000 (EST) Received: from localhost ([::1]:54340 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QJYIQ-0007Vy-M1 for incoming@patchwork.ozlabs.org; Mon, 09 May 2011 17:47:18 -0400 Received: from eggs.gnu.org ([140.186.70.92]:38669) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QJY6z-00044O-Dh for qemu-devel@nongnu.org; Mon, 09 May 2011 17:35:31 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QJY6y-0006PM-6R for qemu-devel@nongnu.org; Mon, 09 May 2011 17:35:29 -0400 Received: from mail-iw0-f173.google.com ([209.85.214.173]:38418) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QJY6y-0006Af-39 for qemu-devel@nongnu.org; Mon, 09 May 2011 17:35:28 -0400 Received: by mail-iw0-f173.google.com with SMTP id 42so5560360iwl.4 for ; Mon, 09 May 2011 14:35:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:sender:from:to:subject:date:message-id:x-mailer :in-reply-to:references; bh=RI2aBEFGB1HxZ5kucI73hCVDPLtskGwXtGxMLp8Igv0=; b=B+hBFrNEz07sBDjTZgUEjSApucza7CfOoD2LKL/WmYAUB5SWu8ONtWWYiLgPvloLS4 q2VQ6HdLoaslWIHeSJGGcEaPz99wWogSlVjol07jqADymv+a+dKfQtJVVD2EFsmsa7aM EiFFgCadaww6uUYy0tHaISZs83F0pTqujAwR0= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=sender:from:to:subject:date:message-id:x-mailer:in-reply-to :references; b=wPJK5TpqhNu/CpdmCsFxDSf3b8xBSDa7DaCxsj4Sz/PeUb8Bn+7S3ZChQzbugxJZgt vBOAspdxxtlK2HA1Dtp1YmBHK8JLu+TomuWCEPsIIhhhyZCSX+ilZvFuqLaxdYjQ2VdO qAIZBF/GOSD3J4MBnxfD3g0ixawxTszpGV67c= Received: by 10.43.70.204 with SMTP id yh12mr6364124icb.430.1304976927831; Mon, 09 May 2011 14:35:27 -0700 (PDT) Received: from localhost.localdomain (are.twiddle.net [75.101.38.216]) by mx.google.com with ESMTPS id ui7sm2549819icb.14.2011.05.09.14.35.27 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 09 May 2011 14:35:27 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Mon, 9 May 2011 14:34:48 -0700 Message-Id: <1304976889-29675-35-git-send-email-rth@twiddle.net> X-Mailer: git-send-email 1.7.4.4 In-Reply-To: <1304976889-29675-1-git-send-email-rth@twiddle.net> References: <1304976889-29675-1-git-send-email-rth@twiddle.net> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 209.85.214.173 Subject: [Qemu-devel] [PATCH 34/35] target-alpha: Enable PCI IDE 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 The CMD646 is the candidate that might be closest to something that may have existed on real Alpha hardware. Signed-off-by: Richard Henderson --- default-configs/alpha-softmmu.mak | 1 + hw/alpha_dp264.c | 10 ++++++++++ 2 files changed, 11 insertions(+), 0 deletions(-) diff --git a/default-configs/alpha-softmmu.mak b/default-configs/alpha-softmmu.mak index abadcff..32167cd 100644 --- a/default-configs/alpha-softmmu.mak +++ b/default-configs/alpha-softmmu.mak @@ -7,3 +7,4 @@ CONFIG_VGA_PCI=y CONFIG_IDE_CORE=y CONFIG_IDE_QDEV=y CONFIG_VMWARE_VGA=y +CONFIG_IDE_CMD646=y diff --git a/hw/alpha_dp264.c b/hw/alpha_dp264.c index dea0ef6..30ae567 100644 --- a/hw/alpha_dp264.c +++ b/hw/alpha_dp264.c @@ -13,7 +13,9 @@ #include "alpha_sys.h" #include "sysemu.h" #include "mc146818rtc.h" +#include "ide.h" +#define MAX_IDE_BUS 2 static uint64_t cpu_alpha_superpage_to_phys(void *opaque, uint64_t addr) { @@ -97,6 +99,14 @@ static void clipper_init(ram_addr_t ram_size, pci_nic_init_nofail(&nd_table[i], "e1000", NULL); } + /* IDE disk setup. */ + { + DriveInfo *hd[MAX_IDE_BUS * MAX_IDE_DEVS]; + ide_drive_get(hd, MAX_IDE_BUS); + + pci_cmd646_ide_init(pci_bus, hd, 0); + } + /* Load PALcode. Given that this is not "real" cpu palcode, but one explicitly written for the emulation, we might as well load it directly from and ELF image. */