From patchwork Mon Sep 12 12:54:37 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kiszka X-Patchwork-Id: 114339 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 BFBC3B6FAF for ; Mon, 12 Sep 2011 22:54:58 +1000 (EST) Received: from localhost ([::1]:49613 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1R362D-0004HA-KD for incoming@patchwork.ozlabs.org; Mon, 12 Sep 2011 08:54:49 -0400 Received: from eggs.gnu.org ([140.186.70.92]:33522) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1R3627-0004Gu-Pe for qemu-devel@nongnu.org; Mon, 12 Sep 2011 08:54:44 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1R3626-0005k4-8p for qemu-devel@nongnu.org; Mon, 12 Sep 2011 08:54:43 -0400 Received: from goliath.siemens.de ([192.35.17.28]:20620) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1R3625-0005ja-Vl for qemu-devel@nongnu.org; Mon, 12 Sep 2011 08:54:42 -0400 Received: from mail1.siemens.de (localhost [127.0.0.1]) by goliath.siemens.de (8.13.6/8.13.6) with ESMTP id p8CCscuD031862; Mon, 12 Sep 2011 14:54:38 +0200 Received: from mchn199C.mchp.siemens.de ([139.25.109.49]) by mail1.siemens.de (8.13.6/8.13.6) with ESMTP id p8CCsbar025681; Mon, 12 Sep 2011 14:54:37 +0200 Message-ID: <4E6E010D.9030303@siemens.com> Date: Mon, 12 Sep 2011 14:54:37 +0200 From: Jan Kiszka User-Agent: Mozilla/5.0 (X11; U; Linux i686 (x86_64); de; rv:1.8.1.12) Gecko/20080226 SUSE/2.0.0.12-1.1 Thunderbird/2.0.0.12 Mnenhy/0.7.5.666 MIME-Version: 1.0 To: Avi Kivity References: <1315824666-4214-1-git-send-email-avi@redhat.com> <1315824666-4214-16-git-send-email-avi@redhat.com> In-Reply-To: <1315824666-4214-16-git-send-email-avi@redhat.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6, seldom 2.4 (older, 4) X-Received-From: 192.35.17.28 Cc: Alexander Graf , =?ISO-8859-15?Q?Andreas_F=E4rber?= , qemu-devel@nongnu.org, Richard Henderson Subject: Re: [Qemu-devel] [PULL 15/28] i8259: Convert to MemoryRegion 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 On 2011-09-12 12:50, Avi Kivity wrote: > From: Richard Henderson > > The only non-obvious part is pic_poll_read which used > "addr1 >> 7" to detect whether one referred to either > the master or slave PIC. Instead, test this directly. I've an unfinished queue here that, among other things, took some of the PIC mess away via I've found no regression in prep due to this and was able to kill both pic_poll_read and pic_intack_read this way. I've no problem to (later on) rebase my PIC refactorings (properly decouple both chips and qdev'ify them) on top of this, but maybe the prep cleanup would already make this patch nicer. Should I break out that patch? Jan --- a/hw/ppc_prep.c +++ b/hw/ppc_prep.c @@ -129,7 +129,7 @@ static inline uint32_t _PPC_intack_read(target_phys_addr_t addr) uint32_t retval = 0; if ((addr & 0xf) == 0) - retval = pic_intack_read(isa_pic); + retval = pic_read_irq(isa_pic); #if 0 printf("%s: 0x" TARGET_FMT_plx " <= %08" PRIx32 "\n", __func__, addr, retval);