From nobody Tue Feb 10 00:58:01 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=1619614296; cv=none; d=zohomail.com; s=zohoarc; b=JPXHKYhQuUqo22kSDfPglzgvDgLUBdfyEwnaOmI9WnzXn4Y6zu7Gq+Y0zMkNBQTx8E0PLVafRTh78Y7mASaQDJZXAc1rtQAPtIOWKnTwPtEDWu2sa2ieQaxkXrnglkk34XVd1r2WDaNcVp+Tiivy0dNfpgSMafGSpfI/7PPysrM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1619614296; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=q3XFOlA3I9QKIsvcRP2TeV85rvw51gE7XQXiQybRpMg=; b=HVrzyo1rm2XBfOwSUEuEWTp2rguaZ2Ah93XfB5/g/U/hJMA2LHZAP5G06y+njMzwYsVK31HX+6PkNNHujjUAaXz7++5GIXVWV+d1yDtN5DbJmi19xB9a1SKfxjOeVbXRF/ZpCiEsA/xYfywCyaMd97mxF1UI18l/EnPr83gyC1M= 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 1619614296124330.30471829981377; Wed, 28 Apr 2021 05:51:36 -0700 (PDT) Received: from mail-wr1-f72.google.com (mail-wr1-f72.google.com [209.85.221.72]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-57-qf8ZuiNcOWyuuxGvcZDr1Q-1; Wed, 28 Apr 2021 08:51:33 -0400 Received: by mail-wr1-f72.google.com with SMTP id a12-20020a5d6cac0000b0290109c3c8d66fso6344984wra.15 for ; Wed, 28 Apr 2021 05:51:32 -0700 (PDT) Return-Path: Return-Path: Received: from localhost.localdomain (39.red-81-40-121.staticip.rima-tde.net. [81.40.121.39]) by smtp.gmail.com with ESMTPSA id v17sm8121185wrd.89.2021.04.28.05.51.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 28 Apr 2021 05:51:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1619614295; 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=q3XFOlA3I9QKIsvcRP2TeV85rvw51gE7XQXiQybRpMg=; b=h7nETPf5s/udfLEhWUjsrRLND7Zekzx4jzC6uM74Qw41V4OpFy63My5anU/MPIQV1ZkyiH 2fB0sUuuhf2lcMh6a4gRjVVJdeeh8TE+8cQNTEGtcx8z9MiJQT+EiHtFDYMdRWje4baNyL lHbe2IbZPHo1EhbLNOLSS65lPnO+Cis= X-MC-Unique: qf8ZuiNcOWyuuxGvcZDr1Q-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=q3XFOlA3I9QKIsvcRP2TeV85rvw51gE7XQXiQybRpMg=; b=tmxOg6OjguOcChN99YSijPsGS0yJG4zl3SdtqHhz6uKHMn3vIfcihrh9QeHvBh0ygx f1YkLftS2Nbu4O7nLvsmcFuqdp6P1dbt31rfwO/Cioatb+9uQl5vjygd59l4I8H6ioIV gS3PHBHdFy7jQZs1EMRq9H42zg3WVyzbNXtzgGAmO3NdfAhl102DJIP80Sixl5J5E0dt +xZDoj+WyyE2G+kAkyqnsncPJk1m6CLZPaTW7bXyS9D2mMW7ymivpEaCgkUL7e1Z+yfN 6+Q5jA/icBzGRr/8+it708zYVJ+m0zcmUrzYSGfn/8nwwqIZsgY0ZB1Fn3WT21dVk1Fa iEqg== X-Gm-Message-State: AOAM532lY9pyalvleY2imIZjDyXCYtgv46RjWxXLJu6bhvLdw959tzql yQXpiJlK76p8KdsNvbJnaFWnRYXlypvkd4EaebQagyhxcZZhRRSlWf/aqwV/uVar5IuwxYXzykt Nc1ZAeg7c7uyHqA== X-Received: by 2002:a05:6000:1789:: with SMTP id e9mr36842933wrg.110.1619614291531; Wed, 28 Apr 2021 05:51:31 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxal0BpoVgZGIdazub/2hJhbtucdKY9So77/ftiKcKqiyzV8hv4BhT7XJ6n77pQYEwhtR+B5g== X-Received: by 2002:a05:6000:1789:: with SMTP id e9mr36842907wrg.110.1619614291362; Wed, 28 Apr 2021 05:51:31 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: John Snow , qemu-devel@nongnu.org Cc: Mark Cave-Ayland , Artyom Tarasenko , =?UTF-8?q?Herv=C3=A9=20Poussineau?= , Jiaxun Yang , qemu-block@nongnu.org, Miroslav Rezanina , Aleksandar Rikalo , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Aurelien Jarno , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Kevin Wolf , Max Reitz Subject: [PATCH v2 5/8] hw/block/fdc: Add sysbus_fdc_init_drives() method Date: Wed, 28 Apr 2021 14:51:01 +0200 Message-Id: <20210428125104.358535-6-philmd@redhat.com> X-Mailer: git-send-email 2.26.3 In-Reply-To: <20210428125104.358535-1-philmd@redhat.com> References: <20210428125104.358535-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. 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