From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:57164) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Rd80P-0000J7-Go for qemu-devel@nongnu.org; Tue, 20 Dec 2011 17:17:54 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Rd80O-0000eT-Fq for qemu-devel@nongnu.org; Tue, 20 Dec 2011 17:17:53 -0500 Received: from e8.ny.us.ibm.com ([32.97.182.138]:38502) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Rd80O-0000eP-4T for qemu-devel@nongnu.org; Tue, 20 Dec 2011 17:17:52 -0500 Received: from /spool/local by e8.ny.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Tue, 20 Dec 2011 17:17:51 -0500 Received: from d01av03.pok.ibm.com (d01av03.pok.ibm.com [9.56.224.217]) by d01relay04.pok.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id pBKMHISX238566 for ; Tue, 20 Dec 2011 17:17:18 -0500 Received: from d01av03.pok.ibm.com (loopback [127.0.0.1]) by d01av03.pok.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id pBKMHH90014609 for ; Tue, 20 Dec 2011 20:17:18 -0200 Message-ID: <4EF1096C.9030303@us.ibm.com> Date: Tue, 20 Dec 2011 16:17:16 -0600 From: Anthony Liguori MIME-Version: 1.0 References: <1324326839-28915-1-git-send-email-peter.maydell@linaro.org> In-Reply-To: <1324326839-28915-1-git-send-email-peter.maydell@linaro.org> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit Subject: Re: [Qemu-devel] [PATCH] hw/sysbus.c: Remove unnecessary conditionals List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Peter Maydell Cc: =?UTF-8?B?QmVub8OudCBDYW5ldA==?= , qemu-devel@nongnu.org, patches@linaro.org On 12/19/2011 02:33 PM, Peter Maydell wrote: > Now that all sysbus MMIO regions are MemoryRegions, mmio[n].memory > is never NULL, and we can remove some unnecessary conditionals. > > Signed-off-by: Peter Maydell Applied. Thanks. Regards, Anthony Liguori > --- > A minor tidyup following Benoît's now-applied patches to remove > sysbus_init_mmio_cb2(). > > hw/sysbus.c | 18 +++++------------- > 1 files changed, 5 insertions(+), 13 deletions(-) > > diff --git a/hw/sysbus.c b/hw/sysbus.c > index 81a57bd..24f619f 100644 > --- a/hw/sysbus.c > +++ b/hw/sysbus.c > @@ -50,17 +50,12 @@ void sysbus_mmio_map(SysBusDevice *dev, int n, target_phys_addr_t addr) > } > if (dev->mmio[n].addr != (target_phys_addr_t)-1) { > /* Unregister previous mapping. */ > - if (dev->mmio[n].memory) { > - memory_region_del_subregion(get_system_memory(), > - dev->mmio[n].memory); > - } > + memory_region_del_subregion(get_system_memory(), dev->mmio[n].memory); > } > dev->mmio[n].addr = addr; > - if (dev->mmio[n].memory) { > - memory_region_add_subregion(get_system_memory(), > - addr, > - dev->mmio[n].memory); > - } > + memory_region_add_subregion(get_system_memory(), > + addr, > + dev->mmio[n].memory); > } > > > @@ -206,10 +201,7 @@ static void sysbus_dev_print(Monitor *mon, DeviceState *dev, int indent) > > monitor_printf(mon, "%*sirq %d\n", indent, "", s->num_irq); > for (i = 0; i< s->num_mmio; i++) { > - size = 0; > - if (s->mmio[i].memory) { > - size = memory_region_size(s->mmio[i].memory); > - } > + size = memory_region_size(s->mmio[i].memory); > monitor_printf(mon, "%*smmio " TARGET_FMT_plx "/" TARGET_FMT_plx "\n", > indent, "", s->mmio[i].addr, size); > }