From nobody Wed Nov 27 00:44:01 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1703171438; cv=none; d=zohomail.com; s=zohoarc; b=dFD8PZPNllyBcXjngEIk4ByAaUbALMGoV+KC7oFsccLCrhlZ2A/iu8PDK+EcZX3392efAINQ1SKsPFD/54a5V8lIkUgS7884EfmHPULHYfOjk/QQMamN0xLR1ER58b/jXumBkLKU+tmdwntsvfwTCCSkiLSxvC4bFccw5yivIOg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1703171438; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=f6QSb1FgBHOx15gmSAz7A8OR4SzZo63fPyAah9GqvLw=; b=fLULUwMOE9upZ8UOGQMnU4kJSE5TUrwsU5Tm7cpxHgW5ItY3hTQYXXYGNtKDbejkgXb8OsOMEpGLNDC3f7455S2cf3zcN9N15HxHQuE9cMwUKiY3eYs/2Xpj8uDDpgzkbBvTfaDQ3cSkgS7mKOhxyzpNsPGhgiF8SrOGSJrMyqo= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1703171438409365.4553628437467; Thu, 21 Dec 2023 07:10:38 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rGKeg-00086l-Cb; Thu, 21 Dec 2023 10:08:10 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rGKee-00086T-OJ; Thu, 21 Dec 2023 10:08:08 -0500 Received: from mail-ed1-x52a.google.com ([2a00:1450:4864:20::52a]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rGKed-0004Ie-2g; Thu, 21 Dec 2023 10:08:08 -0500 Received: by mail-ed1-x52a.google.com with SMTP id 4fb4d7f45d1cf-54c79968ffbso981271a12.3; Thu, 21 Dec 2023 07:08:04 -0800 (PST) Received: from archlinux.. (pd95ed842.dip0.t-ipconnect.de. [217.94.216.66]) by smtp.gmail.com with ESMTPSA id t25-20020a056402241900b00553b6b5bb44sm1264264eda.67.2023.12.21.07.08.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 21 Dec 2023 07:08:01 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1703171282; x=1703776082; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=f6QSb1FgBHOx15gmSAz7A8OR4SzZo63fPyAah9GqvLw=; b=lD7jz4DIaRHiNlDCt3JaMxvtHCkm5jNgaaCZWhyKIbxCi3hdG9oyTRM9pjdY1E3ryK vQ7bUnZo25bBOXl1Lh6O3qU5SaK0RFKp1p9lZCZclrAs/Q/53dlF1CttYduQLbXuRRq6 aXvGWCj/ZJGoI7zB0uR2yKqkDvAlyyok+BcjtVWzCCH7konWikGatDvtoRJyhul0p+4p +eycGtZRPUeUsGNwBOpjfZVQtvfZpqezFtL8pM4G2cy4KeH/t1w9YhlgaW7h0eqK3OTw VCHVevZ2MqbH1hBochgRnqLYRSjBVSqjiQlcUcgibrH5d/p9FoZigUoy8PuSrpNTEQ3n pbfw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1703171282; x=1703776082; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=f6QSb1FgBHOx15gmSAz7A8OR4SzZo63fPyAah9GqvLw=; b=SwDhBfXs30MO6jDyHafOl0EtBD2p/DTpK4oCY3eVXPKLwCk2qBeZqYLvYESTqhiBQW Rlyz1qW+atReFwiqg50oknJIGGXXK3LqmT3Z6tgVamzBIWUuaIscnq0yT7qC9rYVw6F0 ZwrZoLApkNh8aB1wrF/DKN9coQgHx0WiAfLR0vJ6GzY2/xl8WqvsFC+uRQFNDkZbW6+p ZqdqnHy+TOJK6ndZNAqHmtT44NJI+okPIpsDsp5QlmamZYMZXv6loDKDZRDOfFXVO7t0 QjT3xYKgY8udY+7ciD4Yh9bzLUCpMQ1Z3ZiHfpX0jOcGZ3QkVujK5CWZ+VWu+69beOJW vlPg== X-Gm-Message-State: AOJu0YxN6ngY7/e/zvYZgKS1HlJ9sUe1L0dDQd1PYlWQCO0Bo9YkQ/4n +qDwJADO7BbDOBCWqggVgowx7ogTYoBcGA== X-Google-Smtp-Source: AGHT+IGWuFbrYOPgfFxBwRFob9N5D3BMeQyNU0f2nZ4lzWnQtDD1OrW9DyvgT4cVrDlEoFPmlEWG3A== X-Received: by 2002:a50:871a:0:b0:553:ca52:3fb3 with SMTP id i26-20020a50871a000000b00553ca523fb3mr1695176edb.42.1703171282583; Thu, 21 Dec 2023 07:08:02 -0800 (PST) From: Bernhard Beschow To: qemu-devel@nongnu.org Cc: Juan Quintela , =?UTF-8?q?Herv=C3=A9=20Poussineau?= , Hanna Reitz , Fabiano Rosas , Paolo Bonzini , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , Mark Cave-Ayland , Aleksandar Rikalo , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Eduardo Habkost , Thomas Huth , Peter Xu , Jiaxun Yang , qemu-ppc@nongnu.org, Kevin Wolf , =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Barrat?= , Sergio Lopez , John Snow , Artyom Tarasenko , David Hildenbrand , Nicholas Piggin , Marcel Apfelbaum , BALATON Zoltan , qemu-block@nongnu.org, Richard Henderson , Leonardo Bras , "Michael S. Tsirkin" , Bernhard Beschow Subject: [PATCH v3 01/11] hw/block/fdc-isa: Move portio_list from FDCtrl to FDCtrlISABus Date: Thu, 21 Dec 2023 16:07:40 +0100 Message-ID: <20231221150750.5435-2-shentey@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20231221150750.5435-1-shentey@gmail.com> References: <20231221150750.5435-1-shentey@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::52a; envelope-from=shentey@gmail.com; helo=mail-ed1-x52a.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 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: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1703171440142100005 Content-Type: text/plain; charset="utf-8" FDCtrl::portio_list isn't used inside FDCtrl context but only inside FDCtrlISABus context, so move it there. Signed-off-by: Bernhard Beschow Reviewed-by: BALATON Zoltan --- hw/block/fdc-internal.h | 2 -- hw/block/fdc-isa.c | 4 +++- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/hw/block/fdc-internal.h b/hw/block/fdc-internal.h index 036392e9fc..fef2bfbbf5 100644 --- a/hw/block/fdc-internal.h +++ b/hw/block/fdc-internal.h @@ -26,7 +26,6 @@ #define HW_BLOCK_FDC_INTERNAL_H =20 #include "exec/memory.h" -#include "exec/ioport.h" #include "hw/block/block.h" #include "hw/block/fdc.h" #include "qapi/qapi-types-block.h" @@ -140,7 +139,6 @@ struct FDCtrl { /* Timers state */ uint8_t timer0; uint8_t timer1; - PortioList portio_list; }; =20 extern const FDFormat fd_formats[]; diff --git a/hw/block/fdc-isa.c b/hw/block/fdc-isa.c index 7ec075e470..b4c92b40b3 100644 --- a/hw/block/fdc-isa.c +++ b/hw/block/fdc-isa.c @@ -42,6 +42,7 @@ #include "sysemu/block-backend.h" #include "sysemu/blockdev.h" #include "sysemu/sysemu.h" +#include "exec/ioport.h" #include "qemu/log.h" #include "qemu/main-loop.h" #include "qemu/module.h" @@ -60,6 +61,7 @@ struct FDCtrlISABus { uint32_t irq; uint32_t dma; struct FDCtrl state; + PortioList portio_list; int32_t bootindexA; int32_t bootindexB; }; @@ -91,7 +93,7 @@ static void isabus_fdc_realize(DeviceState *dev, Error **= errp) FDCtrl *fdctrl =3D &isa->state; Error *err =3D NULL; =20 - isa_register_portio_list(isadev, &fdctrl->portio_list, + isa_register_portio_list(isadev, &isa->portio_list, isa->iobase, fdc_portio_list, fdctrl, "fdc"); =20 --=20 2.43.0