From nobody Mon Feb 9 20:59:50 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.51 as permitted sender) client-ip=209.85.221.51; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f51.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.51 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1637341945; cv=none; d=zohomail.com; s=zohoarc; b=VqfZZXjcheUs47CtKBvgLBvSqvPgoRFJhgOt30EslwYki6PuCWYQ1eMH/W5MH1cMvjtsTJm3xXAJ5pbsBbRHfYwUa0IXGDE0Qq6CnD/fwZxYxQOhlFPsW1gOpCW/zpJQwLpfn/Xj3NZ0coCh9ju8OW2FnGVRMgfIDseH9OgNaSw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1637341945; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=L/CC3I2TBV/ZdA0Br80pFCsNnb1lQ9G4hQuRebB0TTw=; b=M0V749EGfdEni0T0y2b5hvG07aJzr8h4jL79BVy2c8fgMu9RoUhC17QLQzrWF/smixQpWkzhYsk8jvdgeuotvHPxfWat79BXOKyRrdfY7ju+LUwJHE9To91DxllnN6hllryK+NyhFHZeiRbc9JSnl51mRYab9i0Tq/bCWAs6rDI= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.51 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wr1-f51.google.com (mail-wr1-f51.google.com [209.85.221.51]) by mx.zohomail.com with SMTPS id 1637341945723630.6705541889982; Fri, 19 Nov 2021 09:12:25 -0800 (PST) Received: by mail-wr1-f51.google.com with SMTP id d27so19312197wrb.6 for ; Fri, 19 Nov 2021 09:12:25 -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 o12sm510061wrc.85.2021.11.19.09.12.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 19 Nov 2021 09:12:23 -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=L/CC3I2TBV/ZdA0Br80pFCsNnb1lQ9G4hQuRebB0TTw=; b=XJJoc84RDmhstokLaNYqA67+k1GSj04TrY4fvspn6lIgT6KFo4RfuxePUi9PvpN/Og ShtLiMcvHHFxkLemM6Ig6ik+//qZhM1bXvD2KFsdwOGYJTfFYJWoEKhqsEAdcvQMLhaz 135mdpNoeW+3AnR0RZ6ol8Q/P8yMllzx9hejlWh9zbz6Te8QjdHN7nR4jacMJhSAcqRz PqbiFVWiaeKZAkdK1ywGz/J44ZpMlIGI/4Kson1sgUbKYQkFdNLijE6FANTdSZ6Z2cVT sF0Kl6fjoadjkwn5FqWkJChhf+YiN8MsCioTq3tskQYfuWQj/VuMOVTq4Mh88c1kSmfW ZfXQ== 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=L/CC3I2TBV/ZdA0Br80pFCsNnb1lQ9G4hQuRebB0TTw=; b=OSg2LsL0ytASOIg0OOpar1dvdznoF5+e3NnF13qk19ht03WfbaIl5d3gpteCdmTZyk zTWkNxMJdp6Swhn6AER8pPYXG8W+YqPSFh+sGpwGKQdBttGfi8HMjimeo0IOGga0Qvo0 sGlBro42G7JjunwD8GreZfrs1n7dyMqusqF1JEi3JtCjnnE9PjwIkTjiZrJtPlXakL8p qxBOhgauxUKy03b7NTYmbhRL2IayuuGU9AhES2HggUcQrYruz3ono54NFJiQmO+ugmml 7exHPIwZXXSN0yTwJG56wsoHsi0dFmIBKZSLNgEqCpBCd4s+vbRdjnE38CpsX1ZhSvfD SX2w== X-Gm-Message-State: AOAM532Udx80P+OXMWc/F4Nr4ZsYbikpiN3y7CRcxp96gkcF4QWBjkmb J3B86A7leLM2BezDkBZzp06rPWXsZ9E= X-Google-Smtp-Source: ABdhPJyAZRYVkHItd/wIhSdc35V3BXNTEYUIUBLuAlp00W6042VtGY69SkjmJRUo5G7Hs1oaZbbK5Q== X-Received: by 2002:a5d:47c7:: with SMTP id o7mr9662363wrc.204.1637341943937; Fri, 19 Nov 2021 09:12:23 -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 4/5] hw/mips/jazz: Inline vga_mmio_init() and remove it Date: Fri, 19 Nov 2021 18:12:01 +0100 Message-Id: <20211119171202.458919-5-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: 1637341945980100001 vga_mmio_init() is used only one time and not very helpful, inline and remove it. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: BALATON Zoltan --- include/hw/display/vga.h | 6 ------ hw/display/vga-mmio.c | 20 -------------------- hw/mips/jazz.c | 9 ++++++++- 3 files changed, 8 insertions(+), 27 deletions(-) diff --git a/include/hw/display/vga.h b/include/hw/display/vga.h index 03c65a14218..451e4c9898c 100644 --- a/include/hw/display/vga.h +++ b/include/hw/display/vga.h @@ -9,8 +9,6 @@ #ifndef QEMU_HW_DISPLAY_VGA_H #define QEMU_HW_DISPLAY_VGA_H =20 -#include "exec/hwaddr.h" - /* * modules can reference this symbol to avoid being loaded * into system emulators without vga support @@ -24,8 +22,4 @@ enum vga_retrace_method { =20 extern enum vga_retrace_method vga_retrace_method; =20 -int vga_mmio_init(hwaddr vram_base, - hwaddr ctrl_base, int it_shift, - MemoryRegion *address_space); - #endif diff --git a/hw/display/vga-mmio.c b/hw/display/vga-mmio.c index d1c5f31c134..af9229794c9 100644 --- a/hw/display/vga-mmio.c +++ b/hw/display/vga-mmio.c @@ -25,7 +25,6 @@ =20 #include "qemu/osdep.h" #include "qapi/error.h" -#include "hw/display/vga.h" #include "hw/sysbus.h" #include "hw/qdev-properties.h" #include "vga_int.h" @@ -87,25 +86,6 @@ static void vga_mmio_reset(DeviceState *dev) vga_common_reset(s); } =20 -int vga_mmio_init(hwaddr vram_base, - hwaddr ctrl_base, int it_shift, - MemoryRegion *address_space) -{ - DeviceState *dev; - SysBusDevice *s; - - dev =3D qdev_new(TYPE_VGA_MMIO); - qdev_prop_set_uint8(dev, "it_shift", it_shift); - s =3D SYS_BUS_DEVICE(dev); - sysbus_realize_and_unref(s, &error_fatal); - - sysbus_mmio_map(s, 0, ctrl_base); - sysbus_mmio_map(s, 1, vram_base + 0x000a0000); - sysbus_mmio_map(s, 2, VBE_DISPI_LFB_PHYSICAL_ADDRESS); - - return 0; -} - static void vga_mmio_realizefn(DeviceState *dev, Error **errp) { VGAMmioState *s =3D VGA_MMIO(dev); diff --git a/hw/mips/jazz.c b/hw/mips/jazz.c index 8f345afd137..bd9815c773e 100644 --- a/hw/mips/jazz.c +++ b/hw/mips/jazz.c @@ -43,6 +43,7 @@ #include "hw/rtc/mc146818rtc.h" #include "hw/timer/i8254.h" #include "hw/display/vga.h" +#include "hw/display/bochs-vbe.h" #include "hw/audio/pcspk.h" #include "hw/input/i8042.h" #include "hw/sysbus.h" @@ -274,7 +275,13 @@ static void mips_jazz_init(MachineState *machine, } break; case JAZZ_PICA61: - vga_mmio_init(0x40000000, 0x60000000, 0, get_system_memory()); + dev =3D qdev_new("vga-mmio"); + qdev_prop_set_uint8(dev, "it_shift", 0); + sysbus =3D SYS_BUS_DEVICE(dev); + sysbus_realize_and_unref(sysbus, &error_fatal); + sysbus_mmio_map(sysbus, 0, 0x60000000); + sysbus_mmio_map(sysbus, 1, 0x400a0000); + sysbus_mmio_map(sysbus, 2, VBE_DISPI_LFB_PHYSICAL_ADDRESS); break; default: break; --=20 2.31.1