From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:48263) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1R36b1-0003mC-FH for qemu-devel@nongnu.org; Mon, 12 Sep 2011 09:30:52 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1R36b0-0004zH-5a for qemu-devel@nongnu.org; Mon, 12 Sep 2011 09:30:47 -0400 Received: from thoth.sbs.de ([192.35.17.2]:31036) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1R36az-0004yk-QK for qemu-devel@nongnu.org; Mon, 12 Sep 2011 09:30:46 -0400 Message-ID: <4E6E0982.2010503@siemens.com> Date: Mon, 12 Sep 2011 15:30:42 +0200 From: Jan Kiszka MIME-Version: 1.0 References: <1315824666-4214-1-git-send-email-avi@redhat.com> <1315824666-4214-16-git-send-email-avi@redhat.com> <4E6E010D.9030303@siemens.com> In-Reply-To: <4E6E010D.9030303@siemens.com> Content-Type: text/plain; charset=ISO-8859-15 Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PULL 15/28] i8259: Convert to MemoryRegion List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Avi Kivity Cc: Alexander Graf , =?ISO-8859-15?Q?Andreas_F=E4rber?= , qemu-devel@nongnu.org, Richard Henderson On 2011-09-12 14:54, Jan Kiszka wrote: > 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 > > --- 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); > > 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? The patch is not that easy to break out as it depends on other changes, e.g. a fix for the broken poll command implementation in our i8259. That probably leads too far for this conversion. Jan -- Siemens AG, Corporate Technology, CT T DE IT 1 Corporate Competence Center Embedded Linux