From nobody Tue Feb 10 15:44:27 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.128.48 as permitted sender) client-ip=209.85.128.48; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-f48.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.48 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1637341936; cv=none; d=zohomail.com; s=zohoarc; b=BiEgni32q7pG2SVglaDQoxolHe4iB0y1yKh+MKwaN7lq/nGPIxR1CX+owalh/qxs6KdxL9+sjFiuNmYl22IvDo+8CE5Ft/MYW4wWvk5WiCP0I6iv+JXgspIenr6+jiPBTvNFFF20fl04GrYnqNS9mAN2GEDUeDX3CoUbvFBf4l4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1637341936; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=ZHCEhn6PI0jEPNaBscG3od0nMbxmuG7wPeTVim4TAJw=; b=L8NZ4ejueoc79HYcchVJ6Lj8mzqKpxmVy4BLUEjJVJLyGoPIYYNJGEjufREv3lVD8pKsbhKprxGkw3PiRzqYHvHGGo/sIpOnB/1oBQNTIySWGg0WRatp2LM+jmBrPpunQc4Ii4wU5kNbZlqyRCAmtWsZTPojFsBLx8LW3j8BXuo= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.48 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wm1-f48.google.com (mail-wm1-f48.google.com [209.85.128.48]) by mx.zohomail.com with SMTPS id 1637341936246281.77627695356284; Fri, 19 Nov 2021 09:12:16 -0800 (PST) Received: by mail-wm1-f48.google.com with SMTP id j140-20020a1c2392000000b003399ae48f58so3132889wmj.5 for ; Fri, 19 Nov 2021 09:12:15 -0800 (PST) Return-Path: Return-Path: Received: from x1w.. (62.red-83-57-168.dynamicip.rima-tde.net. [83.57.168.62]) by smtp.gmail.com with ESMTPSA id be3sm12384948wmb.1.2021.11.19.09.12.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 19 Nov 2021 09:12:14 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=ZHCEhn6PI0jEPNaBscG3od0nMbxmuG7wPeTVim4TAJw=; b=A9ZmrFMRh665OwWuOKxRRDyIsLEpA8Zj7qbknL9H8g8+X9fP1DadhI3ZNcOLeTxSOj NZ8dvn/brifUrUl6TIA5RRP7ofRzepO2IBa3fbl8mirNxZ2T7WetfP47cxFc1KgJK/Q/ 2v8akLpW4RCUMzeHHDYSLQwj1E6zL0QUN2vk15m4vWDikAlg8RkOrUaUuokg9fNY1Rr0 YQDJd1wZQS7JKZO8ksCKVCI5/8ujwbVleste2O8UsHUc55j0iCQ9SOGrs0Oz5Hv6P0oq bGW6OajDLDTNBF/ue8YG9qm+ZP9GGohG2hhrvVTPrcYLyfeAQkQoES1TYRECHfo+i5mx vM7A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=ZHCEhn6PI0jEPNaBscG3od0nMbxmuG7wPeTVim4TAJw=; b=JV3/fDLv6QMGLb174AyIM4lnAtROTkD3YP7HlDvHyBmODCS7qIuYaKDX+EF2E6ilLV orpj5KpIjkJmQroiftLfWXAuMwko1kgy/8QCkuxRdPy4TluEeTQOHkU53Q7/hD5vVrBB yDCjjmvdXYf70Agt05rLZDCWBxInnCT79W3Uy9IvHZNg9SAHvG96u9RWU8LWsCXXIdqh W6ArqD6Bt8uuoPRN/CH7DOCcUmwF4kjtKLbLjpm78zB8c70kJ9ZNQtchm3k4BdoXfWfy fx5kQXuZ7am8Hs8qNNhsIL6QRHK2YVL+KW299R+KqfY5GxugSRiijPE/absGQg4qnw5i PMWQ== X-Gm-Message-State: AOAM533COsMY1RL4jo8i63TmmE6N2fE4UuNr9mtfQkdFxYbHz+T8oQ8T uSmCackcDGTtp9KShzZMke4= X-Google-Smtp-Source: ABdhPJxciEIeb/JWdRbjE8tRo5Y2MEwumyIAE4hxP+NVwrtwzAY6Ve7Y3pnhOMPuzZmfLsIIqK+eqQ== X-Received: by 2002:a1c:8002:: with SMTP id b2mr1560819wmd.2.1637341934483; Fri, 19 Nov 2021 09:12:14 -0800 (PST) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Herv=C3=A9=20Poussineau?= , Gerd Hoffmann , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Thomas Huth Subject: [PATCH-for-7.0 2/5] hw/display/vga-mmio: Inline vga_mm_init() Date: Fri, 19 Nov 2021 18:11:59 +0100 Message-Id: <20211119171202.458919-3-f4bug@amsat.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20211119171202.458919-1-f4bug@amsat.org> References: <20211119171202.458919-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1637341938585100001 Inline vga_mm_init() in vga_mmio_init() to simplify the next patch review. Kind of. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: BALATON Zoltan Reviewed-by: Thomas Huth --- 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 =3D { .endianness =3D DEVICE_NATIVE_ENDIAN, }; =20 -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) { + VGAMmioState *s; MemoryRegion *s_ioport_ctrl, *vga_io_memory; =20 + s =3D g_malloc0(sizeof(*s)); + + s->vga.vram_size_mb =3D VGA_RAM_SIZE / MiB; + s->vga.global_vmstate =3D true; + vga_common_init(&s->vga, NULL); + s->it_shift =3D it_shift; s_ioport_ctrl =3D 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_bas= e, 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 =3D g_malloc0(sizeof(*s)); - - s->vga.vram_size_mb =3D VGA_RAM_SIZE / MiB; - s->vga.global_vmstate =3D true; - vga_common_init(&s->vga, NULL); - vga_mm_init(s, vram_base, ctrl_base, it_shift, address_space); =20 s->vga.con =3D graphic_console_init(NULL, 0, s->vga.hw_ops, s); =20 --=20 2.31.1