From nobody Mon Feb 9 16:02:31 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1621366394; cv=none; d=zohomail.com; s=zohoarc; b=gD0gVWyz3gCM3gOn9GisbLnJjiLFCWVkjvGCqfpfE9xtsjbcTkAtJXA3nCqb5QzLLERJghmaMTQpPYxy/BB1R5cDJD012d69DUbR+JcSy/3ArONATxY2ZH2u5dNNDVSzgOFnRVKhUpjFdg8oWhmMOXxQRjuvKgIK/8gF17Rww0k= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1621366394; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=6ktb/E9EO0a25OO2SuCF411Xiw3RFQnNg5asaFxGDPs=; b=h7JBBlMueQfvggavL7zgjdt7SyBDu5Vqy1l+paIgQJo8tUFTpy5r8L95c97aEXZzAgVzViLMT7obyShnrMgXAmtpRoX9SkTNUw9YFVEa/Xpqm7BdZIzisYyLOcoiOjnnRrbJm84CyaGkMG1zOOxSTsaTUxmozQwFiuiYBLuopBk= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mx.zohomail.com with SMTPS id 1621366394210464.2134783571428; Tue, 18 May 2021 12:33:14 -0700 (PDT) Received: from mail-ed1-f70.google.com (mail-ed1-f70.google.com [209.85.208.70]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-8-fM4viR3FPt2PSr4LQu64PA-1; Tue, 18 May 2021 15:33:11 -0400 Received: by mail-ed1-f70.google.com with SMTP id d4-20020aa7ce040000b029038d1d0524d0so5569471edv.3 for ; Tue, 18 May 2021 12:33:11 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.redhat.com (31.red-83-51-215.dynamicip.rima-tde.net. [83.51.215.31]) by smtp.gmail.com with ESMTPSA id t2sm11023385edd.58.2021.05.18.12.33.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 18 May 2021 12:33:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1621366393; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=6ktb/E9EO0a25OO2SuCF411Xiw3RFQnNg5asaFxGDPs=; b=QcvJIWOLxq2hD7/1ox4pUfVDBWoP+b+6EFTDqaHZvfaFozMGvZa+uKuFIsUyqwwvcTrHGT 2oMRo7u6jGhpbZVl8tSqyeb+4od96P1YtfoHk+cXPDy7NyV6wDG/Z4BMz6JN6goUr+Irno pByfJPxDMH+fqeVAV6LhrV8D0Z7MS14= X-MC-Unique: fM4viR3FPt2PSr4LQu64PA-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=6ktb/E9EO0a25OO2SuCF411Xiw3RFQnNg5asaFxGDPs=; b=Y+t9AhPr38eVD8qyuguWFXTEHsjIe/GzpgMe3acQd7xx3McC9fTY6Ln7q5UFIXxQNg bmny5JJ0v1vgt15psWAnid7RqNEJ/jusGHUyQm6mYP626c2mMU1HGfCjhZZRjKcIaWI4 pydU+JzIpjG3JLzMgAwFckTvR6bjqQTScR8BrRgr/BAW3rN1pBscZE75wHUB7wW0neUo i8nQMhuL/tA8Fl83YTGvwUHp7JSijEJRfCeCLMCgX590RhMHOaXQsGpjNfBIOO235jGD puHHQgx5MVkmmtqSAogMdntXmjT2lC/KGyuY0dg6GN8uAuywuD36AI+2XpyCA3GKVJao KENg== X-Gm-Message-State: AOAM530HFccTHbCEUNDj/Mi0tgj4YrJuFkJFt1SX5WjAPkuZgKR2gWxg cnsWlmhynX/YVDDPiNvqrf0T+JKs09Ws+I/qv4eDMmzsZNH5haa0/rBhuVdRTgnav0hzxRAOMC1 yi8oEt4Xyivieog== X-Received: by 2002:a05:6402:3594:: with SMTP id y20mr9038461edc.63.1621366390144; Tue, 18 May 2021 12:33:10 -0700 (PDT) X-Google-Smtp-Source: ABdhPJz8/QIl2FKm7DQLhOXO6Vi6b57VNjydjN0U5MxNslFyu+tmA5cQQkacpvcfjx34/VI+yfvoqw== X-Received: by 2002:a05:6402:3594:: with SMTP id y20mr9038451edc.63.1621366389957; Tue, 18 May 2021 12:33:09 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org, John Snow Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Mark Cave-Ayland Subject: [PATCH v5 6/6] hw/block/fdc: Add sysbus_fdc_init_drives() method Date: Tue, 18 May 2021 21:32:39 +0200 Message-Id: <20210518193239.1725624-7-philmd@redhat.com> X-Mailer: git-send-email 2.26.3 In-Reply-To: <20210518193239.1725624-1-philmd@redhat.com> References: <20210518193239.1725624-1-philmd@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=philmd@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) FDCtrlSysBus's FDCtrl state is a private field. However it is accessed by the public fdctrl_init_sysbus() and sun4m_fdctrl_init() methods. To be able to move them out of fdc-sysbus.c, first add the sysbus_fdc_init_drives() method and use it in these 2 functions. Reviewed-by: Mark Cave-Ayland Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- include/hw/block/fdc.h | 2 ++ hw/block/fdc-sysbus.c | 23 ++++++++++++++++------- 2 files changed, 18 insertions(+), 7 deletions(-) diff --git a/include/hw/block/fdc.h b/include/hw/block/fdc.h index 1ecca7cac7f..52e45c53078 100644 --- a/include/hw/block/fdc.h +++ b/include/hw/block/fdc.h @@ -3,6 +3,7 @@ =20 #include "exec/hwaddr.h" #include "qapi/qapi-types-block.h" +#include "hw/sysbus.h" =20 /* fdc.c */ #define MAX_FD 2 @@ -10,6 +11,7 @@ #define TYPE_ISA_FDC "isa-fdc" =20 void isa_fdc_init_drives(ISADevice *fdc, DriveInfo **fds); +void sysbus_fdc_init_drives(SysBusDevice *dev, DriveInfo **fds); void fdctrl_init_sysbus(qemu_irq irq, int dma_chann, hwaddr mmio_base, DriveInfo **fds); void sun4m_fdctrl_init(qemu_irq irq, hwaddr io_base, diff --git a/hw/block/fdc-sysbus.c b/hw/block/fdc-sysbus.c index c6308f53004..e4105407280 100644 --- a/hw/block/fdc-sysbus.c +++ b/hw/block/fdc-sysbus.c @@ -94,6 +94,15 @@ static void fdctrl_handle_tc(void *opaque, int irq, int = level) trace_fdctrl_tc_pulse(level); } =20 +void sysbus_fdc_init_drives(SysBusDevice *dev, DriveInfo **fds) +{ + FDCtrlSysBus *fdc; + + fdc =3D SYSBUS_FDC(dev); + + fdctrl_init_drives(&fdc->state.bus, fds); +} + void fdctrl_init_sysbus(qemu_irq irq, int dma_chann, hwaddr mmio_base, DriveInfo **fds) { @@ -111,23 +120,23 @@ void fdctrl_init_sysbus(qemu_irq irq, int dma_chann, sysbus_connect_irq(sbd, 0, irq); sysbus_mmio_map(sbd, 0, mmio_base); =20 - fdctrl_init_drives(&sys->state.bus, fds); + sysbus_fdc_init_drives(sbd, fds); } =20 void sun4m_fdctrl_init(qemu_irq irq, hwaddr io_base, DriveInfo **fds, qemu_irq *fdc_tc) { DeviceState *dev; - FDCtrlSysBus *sys; + SysBusDevice *sbd; =20 dev =3D qdev_new("sun-fdtwo"); - sysbus_realize_and_unref(SYS_BUS_DEVICE(dev), &error_fatal); - sys =3D SYSBUS_FDC(dev); - sysbus_connect_irq(SYS_BUS_DEVICE(sys), 0, irq); - sysbus_mmio_map(SYS_BUS_DEVICE(sys), 0, io_base); + sbd =3D SYS_BUS_DEVICE(dev); + sysbus_realize_and_unref(sbd, &error_fatal); + sysbus_connect_irq(sbd, 0, irq); + sysbus_mmio_map(sbd, 0, io_base); *fdc_tc =3D qdev_get_gpio_in(dev, 0); =20 - fdctrl_init_drives(&sys->state.bus, fds); + sysbus_fdc_init_drives(sbd, fds); } =20 static void sysbus_fdc_common_instance_init(Object *obj) --=20 2.26.3