From nobody Tue Feb 10 02:54:48 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.128.46 as permitted sender) client-ip=209.85.128.46; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-f46.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.46 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1638830744; cv=none; d=zohomail.com; s=zohoarc; b=QBnZWPTrXyIdB8hRR7s6AhfP/Eib3mpRhcx+xvXwipKpHihyljkjl15Nf5LuDsR24Syp9M3dech8ODeJlw1ZSz/gZmdyugX9coIhHlIvQg61qeun6Tk01GyqQpH3pwYaYg6o64sCxgCa6Wh0WcsrnK0VGuydkY/GP36hzW9b/Kg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1638830744; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=S41Bx0PKiSXj39RU/0leVOxf7HhF7IplspLzvzcX9jo=; b=deRRamRWCXSKn15eDt/ZRWKpIbv+NcpouQWjaJh2a2s0iDucf1K0n9AhgPwNXGkMCYVJTb77uJbNNjTDVVBc4h7qYGSyDboIruj/76UpaAUxGv02ybB2jT9OYfaFWrwKqbO5SWwYdHvNH56AXPci6d1sgppvbV8NX/bV5M/f+RE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.46 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wm1-f46.google.com (mail-wm1-f46.google.com [209.85.128.46]) by mx.zohomail.com with SMTPS id 1638830744043463.4329487311579; Mon, 6 Dec 2021 14:45:44 -0800 (PST) Received: by mail-wm1-f46.google.com with SMTP id g191-20020a1c9dc8000000b0032fbf912885so903580wme.4 for ; Mon, 06 Dec 2021 14:45:43 -0800 (PST) Return-Path: Return-Path: Received: from x1w.. (174.red-83-50-185.dynamicip.rima-tde.net. [83.50.185.174]) by smtp.gmail.com with ESMTPSA id l8sm750832wmc.40.2021.12.06.14.45.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 06 Dec 2021 14:45:41 -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=S41Bx0PKiSXj39RU/0leVOxf7HhF7IplspLzvzcX9jo=; b=bfTiKK0ie48Zzhd/6+NWdFwhQtmXBzuzMaDCJJ6m+JpgkEWfHExFDwj99BxfnU7jmB qrT/blDWe8PZGnM34w4Fjyo8FM633YUtaviCddZdO7s9ZeClBLgNOXjZsjxs8Jg/5atu FCPu49KGtPAYc28khvS3O1YgJJXIpQKRTX/yBItjntaORnPQtMUgJaZN9K4000m3I89+ TY2u1+o3Y7TdHDdOxvWcyxD+ezM5dscAuJjz8/KbHcZYp9JX2pYnfTAYgGiS6rn+e5P4 2xubWPn0h07A6zigNYW91OV6+eVqTNITXsKkkNhlFppEHBjg9hfj12QQYen2wJZEQN8/ v+GA== 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=S41Bx0PKiSXj39RU/0leVOxf7HhF7IplspLzvzcX9jo=; b=TMrSvIDhRCZGAAEotV6MpOM0b8u8vl11xkNGWMZMyPq2pc5vmeakY2lGhiPwN+YE3B nNUo8IAJg3+e4vnTQsld/FW8AsROgyF4lTAOoE0ajXEpq4CnDQeT9+8krCkEUHRkcdmE b2eHx9qq2YM0Af59jTRC7qYbWDvr3LoMHq+K6QJ+z60Grh+uwsEvMXP0SZIU0JosY+b1 Y27lW3F1KQTUoEPtN3VuOcO7zKtRDIvJ8nPUjSTcMk8/7fkt5PqaBEL6upRFTzTGDPje 5PKR8fyqBASweIoSdcH+Jv1RpQ6iODFoWB1ZbLp17ziv+0tzROH4O5QZg6skmcIK7NUb svQQ== X-Gm-Message-State: AOAM533+z+T8F1NYrN91yJh/CifEe3U0UbKkvwNiG4zYwugQjzG24ruN +3L8q/eqihuPTQ8rKOt6DbM= X-Google-Smtp-Source: ABdhPJzQXbtPT/sONIhv8YJt57FFC1QYctFVBdWaja3Z7Mqlagr2qvi+ivONXVQYeARXsYFZwkq5aw== X-Received: by 2002:a7b:c848:: with SMTP id c8mr1442471wml.105.1638830742381; Mon, 06 Dec 2021 14:45:42 -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: Gerd Hoffmann , Jiaxun Yang , BALATON Zoltan , Thomas Huth , =?UTF-8?q?Herv=C3=A9=20Poussineau?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v2 2/4] hw/display/vga-mmio: Inline vga_mm_init() Date: Mon, 6 Dec 2021 23:45:26 +0100 Message-Id: <20211206224528.563588-3-f4bug@amsat.org> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20211206224528.563588-1-f4bug@amsat.org> References: <20211206224528.563588-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: 1638830746198100001 Inline vga_mm_init() in vga_mmio_init() to simplify the next patch review. Kind of. Reviewed-by: BALATON Zoltan Reviewed-by: Thomas Huth Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/display/vga-mmio.c | 25 +++++++++---------------- 1 file changed, 9 insertions(+), 16 deletions(-) diff --git a/hw/display/vga-mmio.c b/hw/display/vga-mmio.c index 4ffe3afe32d..5671fdb920f 100644 --- a/hw/display/vga-mmio.c +++ b/hw/display/vga-mmio.c @@ -65,12 +65,18 @@ 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,19 +95,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.33.1