From nobody Mon Feb 9 23:59:54 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=1638830738; cv=none; d=zohomail.com; s=zohoarc; b=EDxw+3Lc7nXp7kbL01yh78AsTwTNgBaVR6J1cn0QJo61FKiF7WlpVp3k7QYzRvjqT4yqQHon0yFrXFnrj5Y0Qtqkvm21Ra7zlQflSETSkmQe+XECfMzkCKfJi6pzSr2QMmRbBxHoZYef88LMYYCY8dYutVasvfv2x0HEWo/WLNY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1638830738; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=9qz4AKFNIN2qnCPkv3JO022Rqx3rJT8mFAHOQmP3u04=; b=jaApepAhmHp0/tyw9thEucz+FJpXUHVCa+VG7fLNU11JJTVmQlcuwDszD+nfR/LOxYiHuqhGWORCAQyItpoVnBzAqG2rugzKOmhz5CWOvuN1km5flH7/1pyFdcvzIDi3d7aIOrDsyR/g8z+nEKC2eIOKYDsXnmhk7btZVKTDAX8= 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 1638830738961718.8744229635548; Mon, 6 Dec 2021 14:45:38 -0800 (PST) Received: by mail-wm1-f48.google.com with SMTP id p18so9285499wmq.5 for ; Mon, 06 Dec 2021 14:45:38 -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 h27sm701340wmc.43.2021.12.06.14.45.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 06 Dec 2021 14:45:36 -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=9qz4AKFNIN2qnCPkv3JO022Rqx3rJT8mFAHOQmP3u04=; b=p1cWL3hFehOQAYhaLPxIQCuBf4xjtGAdXzG/paPrM/1B0Pe5CJ5Rq8QXX22cr8UsKL 9iFK0zi1ChhBYkg/Vh1/KUSqwkuCqbV6LNl5ukNVhVBjdFH17E4/ewmaYf/jecnsS/jx 592pvv45RgqH0sn40KHKMo8usPSxgZz3+dUf4CTBm241VQgHJtEDEqSPR/cux4OzySp0 Nj9MA54IIZh+Ncdar9H5IkRZ/iLhuxO1FB4LiAABAb9zaZ9w3A0Mbe/Y1b/zxgHJfkV0 E+M8rgkFVYF8ICIu5Qkmmj/k7W9ISJmBHF5pMWWB2P8pGJLvXxNnLkt1h3AT4WSahJ+1 hQkA== 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=9qz4AKFNIN2qnCPkv3JO022Rqx3rJT8mFAHOQmP3u04=; b=7/rq6x1q8k4vC8FgDgmDofyBF6SZGFtTlIwnLuZtK+c/JUPHfVfg7bbTBLT/EH47+r tS7Gl7ozskyqmRQ0BdHbAxt7R/XRcTuKK3YISg1R83jtGOFxEzB/Gp1dYl/oQQxEtb3p b8apkpdDc8e8jLecfUFn99uQu5Zrcy8HRzau93hX5aa5Xu6/d0+m2J0DSDtVFIkvPYkZ mlH1JtXguityVaYZJ3nwS3b4+wI9NKH9l8vxyxNX9k0RSTwaS2yrtoVjrAy2CNpeR519 wLF4t+2e3ojHTdISKCJH2Y+ta8gNTH/X19s5w2CV1O9SRvyksljKzcBHd97OshMQ/Aj4 X5+A== X-Gm-Message-State: AOAM531TiObWPtbrNZJIa9POUr68y2jCLeacqTLrCX7DqA1hGgtQI/cf glftcUKow3xScGd9IkHWmMI= X-Google-Smtp-Source: ABdhPJzICQSez9xQRsgMHAk/pWa5/itEpY+i58gyQTYtp38aNxiMFhy9qRS/Ht4/buiPQI7m32JYXA== X-Received: by 2002:a05:600c:1988:: with SMTP id t8mr1894767wmq.48.1638830737242; Mon, 06 Dec 2021 14:45:37 -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 1/4] hw/display: Rename VGA_ISA_MM -> VGA_MMIO Date: Mon, 6 Dec 2021 23:45:25 +0100 Message-Id: <20211206224528.563588-2-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: 1638830739388100001 There is no ISA bus part in the MMIO VGA device, so rename: * hw/display/vga-isa-mm.c -> hw/display/vga-mmio.c * CONFIG_VGA_ISA_MM -> CONFIG_VGA_MMIO * ISAVGAMMState -> VGAMmioState * isa_vga_mm_init() -> vga_mmio_init() Reviewed-by: BALATON Zoltan Reviewed-by: Thomas Huth Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- configs/devices/mips-softmmu/common.mak | 2 +- include/hw/display/vga.h | 5 ++--- hw/display/{vga-isa-mm.c =3D> vga-mmio.c} | 19 +++++++++---------- hw/mips/jazz.c | 2 +- hw/display/Kconfig | 2 +- hw/display/meson.build | 2 +- hw/mips/Kconfig | 2 +- 7 files changed, 16 insertions(+), 18 deletions(-) rename hw/display/{vga-isa-mm.c =3D> vga-mmio.c} (90%) diff --git a/configs/devices/mips-softmmu/common.mak b/configs/devices/mips= -softmmu/common.mak index 752b62b1e63..d2202c839e0 100644 --- a/configs/devices/mips-softmmu/common.mak +++ b/configs/devices/mips-softmmu/common.mak @@ -7,7 +7,7 @@ CONFIG_ISA_BUS=3Dy CONFIG_PCI=3Dy CONFIG_PCI_DEVICES=3Dy CONFIG_VGA_ISA=3Dy -CONFIG_VGA_ISA_MM=3Dy +CONFIG_VGA_MMIO=3Dy CONFIG_VGA_CIRRUS=3Dy CONFIG_VMWARE_VGA=3Dy CONFIG_SERIAL=3Dy diff --git a/include/hw/display/vga.h b/include/hw/display/vga.h index 5f7825e0e36..c16a5c26dae 100644 --- a/include/hw/display/vga.h +++ b/include/hw/display/vga.h @@ -24,8 +24,7 @@ enum vga_retrace_method { =20 extern enum vga_retrace_method vga_retrace_method; =20 -int isa_vga_mm_init(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); =20 #endif diff --git a/hw/display/vga-isa-mm.c b/hw/display/vga-mmio.c similarity index 90% rename from hw/display/vga-isa-mm.c rename to hw/display/vga-mmio.c index 7321b7a06d5..4ffe3afe32d 100644 --- a/hw/display/vga-isa-mm.c +++ b/hw/display/vga-mmio.c @@ -1,5 +1,5 @@ /* - * QEMU ISA MM VGA Emulator. + * QEMU MMIO VGA Emulator. * * Copyright (c) 2003 Fabrice Bellard * @@ -32,15 +32,15 @@ =20 #define VGA_RAM_SIZE (8 * MiB) =20 -typedef struct ISAVGAMMState { +typedef struct VGAMmioState { VGACommonState vga; int it_shift; -} ISAVGAMMState; +} VGAMmioState; =20 /* Memory mapped interface */ static uint64_t vga_mm_read(void *opaque, hwaddr addr, unsigned size) { - ISAVGAMMState *s =3D opaque; + VGAMmioState *s =3D opaque; =20 return vga_ioport_read(&s->vga, addr >> s->it_shift) & MAKE_64BIT_MASK(0, size * 8); @@ -49,7 +49,7 @@ static uint64_t vga_mm_read(void *opaque, hwaddr addr, un= signed size) static void vga_mm_write(void *opaque, hwaddr addr, uint64_t value, unsigned size) { - ISAVGAMMState *s =3D opaque; + VGAMmioState *s =3D opaque; =20 vga_ioport_write(&s->vga, addr >> s->it_shift, value & MAKE_64BIT_MASK(0, size * 8)); @@ -65,7 +65,7 @@ static const MemoryRegionOps vga_mm_ctrl_ops =3D { .endianness =3D DEVICE_NATIVE_ENDIAN, }; =20 -static void vga_mm_init(ISAVGAMMState *s, hwaddr vram_base, +static void vga_mm_init(VGAMmioState *s, hwaddr vram_base, hwaddr ctrl_base, int it_shift, MemoryRegion *address_space) { @@ -91,11 +91,10 @@ static void vga_mm_init(ISAVGAMMState *s, hwaddr vram_b= ase, memory_region_set_coalescing(vga_io_memory); } =20 -int isa_vga_mm_init(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) { - ISAVGAMMState *s; + VGAMmioState *s; =20 s =3D g_malloc0(sizeof(*s)); =20 diff --git a/hw/mips/jazz.c b/hw/mips/jazz.c index f5a26e174d5..8f345afd137 100644 --- a/hw/mips/jazz.c +++ b/hw/mips/jazz.c @@ -274,7 +274,7 @@ static void mips_jazz_init(MachineState *machine, } break; case JAZZ_PICA61: - isa_vga_mm_init(0x40000000, 0x60000000, 0, get_system_memory()); + vga_mmio_init(0x40000000, 0x60000000, 0, get_system_memory()); break; default: break; diff --git a/hw/display/Kconfig b/hw/display/Kconfig index a2306b67d87..a1b159becd7 100644 --- a/hw/display/Kconfig +++ b/hw/display/Kconfig @@ -49,7 +49,7 @@ config VGA_ISA depends on ISA_BUS select VGA =20 -config VGA_ISA_MM +config VGA_MMIO bool select VGA =20 diff --git a/hw/display/meson.build b/hw/display/meson.build index 861c43ff984..adc53dd8b6c 100644 --- a/hw/display/meson.build +++ b/hw/display/meson.build @@ -18,7 +18,7 @@ =20 softmmu_ss.add(when: 'CONFIG_VGA_PCI', if_true: files('vga-pci.c')) softmmu_ss.add(when: 'CONFIG_VGA_ISA', if_true: files('vga-isa.c')) -softmmu_ss.add(when: 'CONFIG_VGA_ISA_MM', if_true: files('vga-isa-mm.c')) +softmmu_ss.add(when: 'CONFIG_VGA_MMIO', if_true: files('vga-mmio.c')) softmmu_ss.add(when: 'CONFIG_VMWARE_VGA', if_true: files('vmware_vga.c')) softmmu_ss.add(when: 'CONFIG_BOCHS_DISPLAY', if_true: files('bochs-display= .c')) =20 diff --git a/hw/mips/Kconfig b/hw/mips/Kconfig index b4c5549ce84..725525358d9 100644 --- a/hw/mips/Kconfig +++ b/hw/mips/Kconfig @@ -16,7 +16,7 @@ config JAZZ select I8254 select I8257 select PCSPK - select VGA_ISA_MM + select VGA_MMIO select G364FB select DP8393X select ESP --=20 2.33.1