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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 51038CD5BA4 for ; Tue, 19 May 2026 13:33:50 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wPKZo-0008Qk-33; Tue, 19 May 2026 09:33:40 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wPKZm-0008Lt-7V for qemu-devel@nongnu.org; Tue, 19 May 2026 09:33:38 -0400 Received: from tor.source.kernel.org ([172.105.4.254]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wPKZk-0000iK-N3 for qemu-devel@nongnu.org; Tue, 19 May 2026 09:33:37 -0400 Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by tor.source.kernel.org (Postfix) with ESMTP id 1259E60121; Tue, 19 May 2026 13:33:36 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 9D424C2BCB3; Tue, 19 May 2026 13:33:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1779197615; bh=d7kHH40NXkm5PLQnHeKBiAkrWHkArmpkDiTZyow9SlI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=t+wTRTOuNZErg2/pQRnsmhANulFdYu9y3eCKSehIQVRikzHJwfUNXaKWAGrBgWSMk Dn4ld9TA3LkT4LLr+bg+PmUopFTybCglzq3QCSUd4m7maKG5tjGen72mYQHNC0fslo q2cUl+7G6O44pqKK05TSbuqXDElPoR7cBFuBjuimcgXcOwv0lYav6mFtsHcaM2Om2j lUBw1RvFBOTrIvUeFfZQHdTNMB0N0GDGlwOV7FPxUNcJVj9qh2XQRnZpMATmAKRTal uM5+u02yJqaP/Ch6wpGFAZFQO6PY0JDs/3Dxdjoj8Ockk0omh83jDwynZYAAP2sdgM KA2jQv+B9nd5A== From: Helge Deller To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Helge Deller , Richard Henderson Subject: [PATCH 2/2] hw/hppa: Move static variable lasi_dev into MachineState Date: Tue, 19 May 2026 15:33:29 +0200 Message-ID: <20260519133329.4268-3-deller@kernel.org> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260519133329.4268-1-deller@kernel.org> References: <20260519133329.4268-1-deller@kernel.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=172.105.4.254; envelope-from=deller@kernel.org; helo=tor.source.kernel.org X-Spam_score_int: -24 X-Spam_score: -2.5 X-Spam_bar: -- X-Spam_report: (-2.5 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.445, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org From: Helge Deller Avoid static variables, so move lasi_dev into the MachineState struct. Signed-off-by: Helge Deller Suggested-by: Philippe Mathieu-Daudé --- hw/hppa/machine.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/hw/hppa/machine.c b/hw/hppa/machine.c index 0937d90ed2..d762163ddf 100644 --- a/hw/hppa/machine.c +++ b/hw/hppa/machine.c @@ -44,6 +44,7 @@ OBJECT_DECLARE_SIMPLE_TYPE(HppaMachineState, HPPA_COMMON_MACHINE) struct HppaMachineState { MachineState parent_obj; + DeviceState *lasi_dev; uint64_t memsplit_addr; }; @@ -52,8 +53,6 @@ struct HppaMachineState { #define HPA_POWER_BUTTON (FIRMWARE_END - 0x10) static hwaddr soft_power_reg; -static DeviceState *lasi_dev; - static void hppa_powerdown_req(Notifier *n, void *opaque) { uint32_t val; @@ -399,7 +398,8 @@ static void machine_HP_common_init_tail(MachineState *machine, PCIBus *pci_bus, { const char *kernel_filename = machine->kernel_filename; MachineClass *mc = MACHINE_GET_CLASS(machine); - DeviceState *dev; + HppaMachineState *hpm = HPPA_COMMON_MACHINE(machine); + DeviceState *dev, *lasi_dev; PCIDevice *pci_dev; long size; uint64_t kernel_entry = 0; @@ -408,6 +408,7 @@ static void machine_HP_common_init_tail(MachineState *machine, PCIBus *pci_bus, SysBusDevice *s; /* Graphics setup. */ + lasi_dev = hpm->lasi_dev; if (lasi_dev && machine->enable_graphics && vga_interface_type != VGA_NONE) { dev = qdev_new("artist"); @@ -576,7 +577,8 @@ static void machine_HP_common_init_tail(MachineState *machine, PCIBus *pci_bus, */ static void machine_HP_715_init(MachineState *machine) { - DeviceState *dev; + HppaMachineState *hpm = HPPA_COMMON_MACHINE(machine); + DeviceState *dev, *lasi_dev; MemoryRegion *addr_space = get_system_memory(); TranslateFn *translate; ISABus *isa_bus; @@ -596,6 +598,7 @@ static void machine_HP_715_init(MachineState *machine) /* Init Lasi chip */ lasi_dev = DEVICE(lasi_init()); + hpm->lasi_dev = lasi_dev; memory_region_add_subregion(addr_space, translate(NULL, LASI_HPA_715), sysbus_mmio_get_region( SYS_BUS_DEVICE(lasi_dev), 0)); @@ -652,7 +655,8 @@ static void machine_HP_715_init(MachineState *machine) */ static void machine_HP_B160L_init(MachineState *machine) { - DeviceState *dev, *dino_dev; + HppaMachineState *hpm = HPPA_COMMON_MACHINE(machine); + DeviceState *dev, *dino_dev, *lasi_dev; MemoryRegion *addr_space = get_system_memory(); TranslateFn *translate; ISABus *isa_bus; @@ -669,6 +673,7 @@ static void machine_HP_B160L_init(MachineState *machine) /* Init Lasi chip */ lasi_dev = DEVICE(lasi_init()); + hpm->lasi_dev = lasi_dev; memory_region_add_subregion(addr_space, translate(NULL, LASI_HPA), sysbus_mmio_get_region( SYS_BUS_DEVICE(lasi_dev), 0)); -- 2.54.0