From patchwork Tue Dec 14 00:49:17 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Andreas_F=C3=A4rber?= X-Patchwork-Id: 75455 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id D70401007D1 for ; Tue, 14 Dec 2010 12:07:23 +1100 (EST) Received: from localhost ([127.0.0.1]:53963 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PSJ9u-0004T4-OK for incoming@patchwork.ozlabs.org; Mon, 13 Dec 2010 19:54:26 -0500 Received: from [140.186.70.92] (port=54785 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PSJ6h-0003Jo-JR for qemu-devel@nongnu.org; Mon, 13 Dec 2010 19:51:08 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PSJ6M-0005Mu-I7 for qemu-devel@nongnu.org; Mon, 13 Dec 2010 19:50:48 -0500 Received: from fmmailgate02.web.de ([217.72.192.227]:38826) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PSJ6M-0005MQ-B8 for qemu-devel@nongnu.org; Mon, 13 Dec 2010 19:50:46 -0500 Received: from smtp04.web.de ( [172.20.0.225]) by fmmailgate02.web.de (Postfix) with ESMTP id CCDBF18D7350A; Tue, 14 Dec 2010 01:50:44 +0100 (CET) Received: from [84.148.38.31] (helo=localhost.localdomain) by smtp04.web.de with asmtp (WEB.DE 4.110 #24) id 1PSJ6K-0007dg-01; Tue, 14 Dec 2010 01:50:44 +0100 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= To: qemu-devel@nongnu.org Date: Tue, 14 Dec 2010 01:49:17 +0100 Message-Id: <1292287758-8009-4-git-send-email-andreas.faerber@web.de> X-Mailer: git-send-email 1.7.3 In-Reply-To: <1292287758-8009-3-git-send-email-andreas.faerber@web.de> References: <1292287758-8009-1-git-send-email-andreas.faerber@web.de> <1292287758-8009-2-git-send-email-andreas.faerber@web.de> <1292287758-8009-3-git-send-email-andreas.faerber@web.de> MIME-Version: 1.0 X-Sender: Andreas.Faerber@web.de X-Provags-ID: V01U2FsdGVkX1+LJ38h80DZISU+ghV0G+M96rO9LvVQFFgsZg0d s1nm2IAofK+IUh2z2T0cutsVY9zGiSGpwGaSSoRXDJgVOttov8 62lh9zbAdf7mqtiqDerA== X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4-2.6 Cc: =?UTF-8?q?Andreas=20F=C3=A4rber?= , hpoussin@reactos.org, agraf@suse.de Subject: [Qemu-devel] [PATCH, RFC 3/4] prep: Fix duplicate ISA IDE IRQ X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Calling isa_ide_init() twice with the same IRQ 13 fails: qemu: hardware error: isa irq 13 already assigned Use a different IRQ (14) for the second one to avoid this. Signed-off-by: Hervé Poussineau Cc: Alexander Graf Signed-off-by: Andreas Färber --- hw/ppc_prep.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/hw/ppc_prep.c b/hw/ppc_prep.c index 3575dee..3073870 100644 --- a/hw/ppc_prep.c +++ b/hw/ppc_prep.c @@ -76,7 +76,7 @@ qemu_log_mask(CPU_LOG_IOPORT, fmt, ## __VA_ARGS__) /* Constants for devices init */ static const int ide_iobase[2] = { 0x1f0, 0x170 }; static const int ide_iobase2[2] = { 0x3f6, 0x376 }; -static const int ide_irq[2] = { 13, 13 }; +static const int ide_irq[2] = { 13, 14 }; #define NE2000_NB_MAX 6