From nobody Sat Sep 21 07:44:42 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=1705236296; cv=none; d=zohomail.com; s=zohoarc; b=j7WZmOQ80kyBf8KGK4gzkmrT9AUMlzZDmPcx3y99yssZM7PqTktcSrH8CsYYxkFTcmeGiPO1+zhd7mrWzOlnQBR9K8APkJqEkH6pzaq8NUtFMx8zfVxUzC5X+bFld3zdFdlgTytqIg5h66kDOTnx3KH3Doub558zIt3ZJ+XM+O0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1705236296; 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=Blu6OuTjSPsdfd3EbHeR0ttbZLV058NKotTs2DtlESs=; b=LDHKF52IhxW32b6iOEm2refkCxdhhv9lIXBD2tZFW41adWcwEnVPkW4D/2C+q7wa+ilzRhnJrVMDH6XvAvPBDnGco29HNFZVySnyGrs5mjFr6jOSwTxnsZ+0yxJSkVcuf0ISXQdifq29KH/8RMFDMKPkQdskMh0cJE9igeXP9p0= 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 170523629698893.67605773167634; Sun, 14 Jan 2024 04:44:56 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rOzm4-0003F2-FV; Sun, 14 Jan 2024 07:39:36 -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 1rOzlz-0003DC-B6; Sun, 14 Jan 2024 07:39:32 -0500 Received: from mail-lf1-x133.google.com ([2a00:1450:4864:20::133]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rOzlx-0001Yg-1y; Sun, 14 Jan 2024 07:39:31 -0500 Received: by mail-lf1-x133.google.com with SMTP id 2adb3069b0e04-50e7d6565b5so9223724e87.0; Sun, 14 Jan 2024 04:39:27 -0800 (PST) Received: from archlinux.. (dynamic-077-183-249-018.77.183.pool.telefonica.de. [77.183.249.18]) by smtp.gmail.com with ESMTPSA id s2-20020a170906354200b00a293c6cc184sm4023734eja.24.2024.01.14.04.39.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 14 Jan 2024 04:39:23 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1705235965; x=1705840765; 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=Blu6OuTjSPsdfd3EbHeR0ttbZLV058NKotTs2DtlESs=; b=e8zL+0lXzIqWvSAGbaxDxZF1ruuppUcHrTwFlBz18MVRkriszdlZyBahIFmpDBzLIB g1RR0sW9GahmRUdRgYmJDAlcRlRGAoNPFn78xl5mMX081CmB9pSMC8yFTL2HvNGfKtiL DhKNzk0BJutuguZiR1eCQRkTHFbHMhcNO2yMHeS+nzE6eCUgxrRc3H692NQJZMYcB0Lq Ts9qJQ+QEPxx2YdWNCjUK0g3ApMghSlQrrhS4PkYgsNbV+0/W+L8oWqWgvHXfDURIZyQ z3afzcsvdEJm+xuFzOYrva8WZ3KQ/Oyxcp5f+aJhbMy/mjwAZ4K3NG9FDA64nUHfjGdC ZcQw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1705235965; x=1705840765; 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=Blu6OuTjSPsdfd3EbHeR0ttbZLV058NKotTs2DtlESs=; b=O2JwVjboT6pWC+dBnr/mOWaBL5vjbl9UerZUH9qcTYajsZ2Y3tBLitbDWJvR+Qvl38 gFMD0As+IANInHEdNaL3K6yDWC/qFMgo9xEv3NI096HqI1EDvY+qCwOy3iUlyyDZkzFB b7doprPDpyAD+iVVOtDTntn3PqbX7UzvRldpvMgTWWwQYy0+LPJt1FY22OJq62eDzJGL j/c3wyi34vItRwV1qZzIOlseUpDEW82L/qKMO2KNsIEkMQQVYmT1PTzjS7wL0mS3J7yy AyrdtAI0DI+dSjz5HpKHosls5F77Su4l3Cr5tZdEKcvkoxCFZnu6X6GuoUErBis16B62 qCjw== X-Gm-Message-State: AOJu0YyfIKk9RG+agnZ27t7sc2XYMPSOlHfOawZMFM0pFBAjGphgjd77 3YeeOxhxFGOMESVyaUGJ8alpHOeiDNk= X-Google-Smtp-Source: AGHT+IEBsmbm58nPQH4Hjg5RrwhCkRVAcO0Rd3js4FhncHG9B83nyPXe1zUnwDlkk5p0HH1nL/VHQQ== X-Received: by 2002:a05:6512:10cd:b0:50e:2bfe:ef43 with SMTP id k13-20020a05651210cd00b0050e2bfeef43mr2105583lfg.115.1705235964652; Sun, 14 Jan 2024 04:39:24 -0800 (PST) From: Bernhard Beschow To: qemu-devel@nongnu.org Cc: Nicholas Piggin , qemu-block@nongnu.org, Sergio Lopez , =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Barrat?= , =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , Richard Henderson , qemu-ppc@nongnu.org, Artyom Tarasenko , Fabiano Rosas , =?UTF-8?q?Herv=C3=A9=20Poussineau?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Hanna Reitz , Jiaxun Yang , John Snow , Thomas Huth , Peter Xu , Paolo Bonzini , Mark Cave-Ayland , Leonardo Bras , "Michael S. Tsirkin" , Eduardo Habkost , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Marcel Apfelbaum , BALATON Zoltan , Aleksandar Rikalo , Kevin Wolf , David Hildenbrand , Bernhard Beschow Subject: [PATCH v5 01/11] hw/block/fdc-isa: Move portio_list from FDCtrl to FDCtrlISABus Date: Sun, 14 Jan 2024 13:39:01 +0100 Message-ID: <20240114123911.4877-2-shentey@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240114123911.4877-1-shentey@gmail.com> References: <20240114123911.4877-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::133; envelope-from=shentey@gmail.com; helo=mail-lf1-x133.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: 1705236298160100003 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 ad0921c7d3..2d8a98ce7d 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