From nobody Mon Feb 9 16:34:53 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.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 216.205.24.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=1621273816; cv=none; d=zohomail.com; s=zohoarc; b=QSAS6Ytd+bWjl0zMkLm+4lQyCjpir5vKPQv/sPNhycVd3blJZB1Iwrq3Zul5FhmdLj113BiYcITsYj5SMJ/zI7tDpavygdqvXznZlI0mf8mDgC9PiSMayikvF44IwppBhei0CyBFwxYPXurNU17QhKhDKMSLKzhV37evUgFZP2M= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1621273816; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=Fhf+AVXUBClcrbXUaAt1JBIAw3G0Rh6YDh+yCprkS/g=; b=oB0/DYbp5pnxGyfgdXeqjAdr5Qt2GTE1tpzXw+mS29RgWBCzePmXm9tBMzs7enRkGDgACK8/AXsVyyuD3ml1A7vcvS6baj+NkF1ClPFlQotXiMRPXpARFH/2eXcMYHZTUDGp5EQTnlfaylPsxEJ+xTKzD/j3OujKMoSLBmC52E8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.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 [216.205.24.124]) by mx.zohomail.com with SMTPS id 1621273816969175.03013550537878; Mon, 17 May 2021 10:50:16 -0700 (PDT) Received: from mail-ej1-f72.google.com (mail-ej1-f72.google.com [209.85.218.72]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-111-kg_JTSoUO5WIY0bz3T7rhg-1; Mon, 17 May 2021 13:50:14 -0400 Received: by mail-ej1-f72.google.com with SMTP id i23-20020a17090685d7b02903d089ab83fcso1327372ejy.19 for ; Mon, 17 May 2021 10:50:13 -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 cw12sm2703174ejc.17.2021.05.17.10.50.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 May 2021 10:50:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1621273815; 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=Fhf+AVXUBClcrbXUaAt1JBIAw3G0Rh6YDh+yCprkS/g=; b=cndDn0EzXIS8KLGkvcZk1uDN+n7G6rT4lOeuFe+OUbZszQuj+KF2ZYGrOLH9nCA7urT7oB heu+HaC0vAV5MU0IkWzbMXu03vtjVGk5hb94sy2SoQC+ojd6ZDLRmANHq9JXy3U9p8lTZ4 DfhVcGinVoseLwwKTZqNk6+4hfPL1eU= X-MC-Unique: kg_JTSoUO5WIY0bz3T7rhg-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=Fhf+AVXUBClcrbXUaAt1JBIAw3G0Rh6YDh+yCprkS/g=; b=isV0OBZ71ikyhvIu78RqY/pljMR3bzb/bzswLplFpuT7v3BM3kAzjUSPsyWQFnYYpN qXQN6x4FJT3hQ0H2f3S/Cklr6OEr7nDY5UlWjtI634bubPQKpIcQwfx5rsus3Ub4KqrF HtHIqOPAncY/cobFhQTnEC/taj4igq+K/U+w/cBpYOv31nW6UiRsvPprFg22wMC3PDvH kM2fCG3sWHi1dw0SUbw8mFj9HlNimm0Fj3a+a4NL2dyB4ZNIcfPat0hkxEhOH89sEyzm 2ogL1gIITRtgMtyC+5KQ00Pf48hCzNO//Tp3AUpUamw3CuO39EtOPUMI/XU3DM9GSjV5 383w== X-Gm-Message-State: AOAM531J7UERL+Bh5a6UiD9if+Cnd7VVM1+BGjXpsVVk4R9sFdxKcN9m CvSf0ZN7pbNChWrx9epgxwRm0p8J12bnBHz0YhpIY3B7L7qyUkHyj5Rt5NTwiwmMkd1tiz9pagQ thFbZ64FPL+XTzw== X-Received: by 2002:aa7:da8e:: with SMTP id q14mr1499491eds.13.1621273812851; Mon, 17 May 2021 10:50:12 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxCC71n6xVzcfe/mBFv6ZisP9EWYSa0DW+ItSM+g1cIFO6xdp4CvnsHwVj+J3l6lIQmBJTW6g== X-Received: by 2002:aa7:da8e:: with SMTP id q14mr1499478eds.13.1621273812689; Mon, 17 May 2021 10:50:12 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org, John Snow Cc: qemu-block@nongnu.org, Mark Cave-Ayland , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v3 5/8] hw/block/fdc: Add sysbus_fdc_init_drives() method Date: Mon, 17 May 2021 19:49:44 +0200 Message-Id: <20210517174947.1199649-6-philmd@redhat.com> X-Mailer: git-send-email 2.26.3 In-Reply-To: <20210517174947.1199649-1-philmd@redhat.com> References: <20210517174947.1199649-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 71755fd6ae4..1163e53165d 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_initfn(Object *obj) --=20 2.26.3