From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 44BF2C433F5 for ; Fri, 19 Nov 2021 18:33:32 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 0973361A70 for ; Fri, 19 Nov 2021 18:33:32 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 0973361A70 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=eik.bme.hu Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=nongnu.org Received: from localhost ([::1]:35314 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mo8hX-0003EE-7K for qemu-devel@archiver.kernel.org; Fri, 19 Nov 2021 13:33:31 -0500 Received: from eggs.gnu.org ([209.51.188.92]:37728) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mo8Xz-0005p3-Lq for qemu-devel@nongnu.org; Fri, 19 Nov 2021 13:23:41 -0500 Received: from [2001:738:2001:2001::2001] (port=39696 helo=zero.eik.bme.hu) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mo8Xw-0001up-Os for qemu-devel@nongnu.org; Fri, 19 Nov 2021 13:23:38 -0500 Received: from zero.eik.bme.hu (blah.eik.bme.hu [152.66.115.182]) by localhost (Postfix) with SMTP id 4871D75603A; Fri, 19 Nov 2021 19:23:35 +0100 (CET) Received: by zero.eik.bme.hu (Postfix, from userid 432) id 23732755FE6; Fri, 19 Nov 2021 19:23:35 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by zero.eik.bme.hu (Postfix) with ESMTP id 21993755F74; Fri, 19 Nov 2021 19:23:35 +0100 (CET) Date: Fri, 19 Nov 2021 19:23:35 +0100 (CET) From: BALATON Zoltan To: =?ISO-8859-15?Q?Philippe_Mathieu-Daud=E9?= Subject: Re: [PATCH-for-7.0 2/5] hw/display/vga-mmio: Inline vga_mm_init() In-Reply-To: Message-ID: References: <20211119171202.458919-1-f4bug@amsat.org> <20211119171202.458919-3-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="3866299591-1362958849-1637346215=:35384" X-Host-Lookup-Failed: Reverse DNS lookup failed for 2001:738:2001:2001::2001 (failed) Received-SPF: pass client-ip=2001:738:2001:2001::2001; envelope-from=balaton@eik.bme.hu; helo=zero.eik.bme.hu X-Spam_score_int: -10 X-Spam_score: -1.1 X-Spam_bar: - X-Spam_report: (-1.1 / 5.0 requ) BAYES_00=-1.9, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Thomas Huth , =?ISO-8859-15?Q?Herv=E9_Poussineau?= , qemu-devel@nongnu.org, Gerd Hoffmann Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" This message is in MIME format. The first part should be readable text, while the remaining parts are likely unreadable without MIME-aware tools. --3866299591-1362958849-1637346215=:35384 Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8BIT On Fri, 19 Nov 2021, BALATON Zoltan wrote: > On Fri, 19 Nov 2021, Philippe Mathieu-Daudé wrote: >> Inline vga_mm_init() in vga_mmio_init() to simplify the >> next patch review. Kind of. >> >> Signed-off-by: Philippe Mathieu-Daudé >> --- >> hw/display/vga-mmio.c | 27 ++++++++++----------------- >> 1 file changed, 10 insertions(+), 17 deletions(-) >> >> diff --git a/hw/display/vga-mmio.c b/hw/display/vga-mmio.c >> index 8aaf44e7b1d..0aefbcf53a0 100644 >> --- a/hw/display/vga-mmio.c >> +++ b/hw/display/vga-mmio.c >> @@ -65,12 +65,19 @@ static const MemoryRegionOps vga_mm_ctrl_ops = { >> .endianness = DEVICE_NATIVE_ENDIAN, >> }; >> >> -static void vga_mm_init(VGAMmioState *s, hwaddr vram_base, >> - hwaddr ctrl_base, int it_shift, >> - MemoryRegion *address_space) >> +int vga_mmio_init(hwaddr vram_base, >> + hwaddr ctrl_base, int it_shift, >> + MemoryRegion *address_space) > > Indentation? (But it's removed later so does not really matter.) > >> { >> + VGAMmioState *s; >> MemoryRegion *s_ioport_ctrl, *vga_io_memory; >> >> + s = g_malloc0(sizeof(*s)); >> + >> + s->vga.vram_size_mb = VGA_RAM_SIZE / MiB; >> + s->vga.global_vmstate = true; >> + vga_common_init(&s->vga, NULL); >> + >> s->it_shift = it_shift; >> s_ioport_ctrl = g_malloc(sizeof(*s_ioport_ctrl)); >> memory_region_init_io(s_ioport_ctrl, NULL, &vga_mm_ctrl_ops, s, >> @@ -89,20 +96,6 @@ static void vga_mm_init(VGAMmioState *s, hwaddr >> vram_base, >> memory_region_add_subregion(address_space, >> vram_base + 0x000a0000, vga_io_memory); >> memory_region_set_coalescing(vga_io_memory); >> -} >> - >> -int vga_mmio_init(hwaddr vram_base, >> - hwaddr ctrl_base, int it_shift, >> - MemoryRegion *address_space) >> -{ >> - VGAMmioState *s; >> - >> - s = g_malloc0(sizeof(*s)); >> - >> - s->vga.vram_size_mb = VGA_RAM_SIZE / MiB; >> - s->vga.global_vmstate = true; >> - vga_common_init(&s->vga, NULL); >> - vga_mm_init(s, vram_base, ctrl_base, it_shift, address_space); > > Where did this vga_mm_init() go? Sorry, this is what's being inlined... So I mean Reviewed-by: BALATON Zoltan > Regards, > BALATON Zoltan > >> s->vga.con = graphic_console_init(NULL, 0, s->vga.hw_ops, s); >> > --3866299591-1362958849-1637346215=:35384--