From nobody Mon Feb 9 16:12:36 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=1621273831; cv=none; d=zohomail.com; s=zohoarc; b=iAn70iHL27wSE+mIMi+ZwaWRsAVxXnqoIJGSAUxew1yRYPpg4Dyuh1FENb1AxthxUi1oMeEuI94ageV2M2TpyMccC5ADhxDK1jUt1om5DRcPq4+iaVL0ys2lhgBdGBTHOpAHdvQ91XllHjY95c2h88+QzB8nmIbGgjLXzmS4YWs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1621273831; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=Z14YRAeNHkM20zQ1K99pTtwaHYhMgqGiS7m7zkt7SV4=; b=GENvDLr5CvByNWZloHChQYrA7AEDhkTg6ePTSxJkEfQ0UedVHPB4dMc81bc//tQzvMxNznA4FZjKkNMj+Vj2n8Yk1wq7EWYiTLUC0yXD0/rDFtJU63YTPb82elPfg+xC4d6UvzoXMkVUcwCtiozgZH2c8Qj8uO0n+xgqdExh9OU= 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 1621273831205122.19074235637345; Mon, 17 May 2021 10:50:31 -0700 (PDT) Received: from mail-ed1-f72.google.com (mail-ed1-f72.google.com [209.85.208.72]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-401-26AgINDQP-28bfynT3vDpg-1; Mon, 17 May 2021 13:50:23 -0400 Received: by mail-ed1-f72.google.com with SMTP id i3-20020aa7dd030000b029038ce772ffe4so4371126edv.12 for ; Mon, 17 May 2021 10:50:23 -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 dh21sm175127edb.28.2021.05.17.10.50.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 May 2021 10:50:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1621273830; 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=Z14YRAeNHkM20zQ1K99pTtwaHYhMgqGiS7m7zkt7SV4=; b=Syl433nAzvjy1C2YdVqEHBA2YOCa6oCj7UBAxgtTL9Fsfv6monSMiziiPhT76zKzZCQXfX vwtMNGLSI/8gzvVIwuc5AsBNpmfqPCa+vvfJjZyedz7YXTVMptrhZgStOD1eOMFTLbrOwC pbXQ0EbYG4/VOmU65FSPYLBylL7OJHw= X-MC-Unique: 26AgINDQP-28bfynT3vDpg-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=Z14YRAeNHkM20zQ1K99pTtwaHYhMgqGiS7m7zkt7SV4=; b=ofxnJ3O/SW3U/z1RqAMbBVzjUtop3QKjiiiHaGU7WTH/YBNjjKiBQJ7ZqSR1nEarMO xNPjjxHlflMzcq5mE9j/9gdhzASeaCzbwp1jmBjo7VB5YXGEPCP5xz44YIY4cZRDUNHv rYGdq6F8Z+UqWItQ+uiF3Rt9SSL4nbTLwAm9xSSmbe+y6sNKhwFviQQ2S/gayt7GQyXv DBHG49jq3sLKLs4wxhhFBUt6crN3nWNz51cInZ79CoSL1hTDdSgxA7KTGTgVOfzSPgV5 84YFIN0SMSq7gZ0pO1PEw2qgUuViYyrUoNNUcuanQIV3zFpKky9+jbNkvVA8cJOtYQpf iGKg== X-Gm-Message-State: AOAM530YrNbPCSPi35AkzTWcGME4CxzTgmMCWh9BSwqDpPDbzu3Juz0N xaIlVbI8b+riYQNAWyDCGReWrGY92FcB2B0H53JzEFdTEteh+nVYkIlsgC4E9uRN9g2zDpNoXly 9lsNorjL4+RRbmg== X-Received: by 2002:aa7:c787:: with SMTP id n7mr1453586eds.309.1621273822118; Mon, 17 May 2021 10:50:22 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzi2j1K+yCR15AGxnq0veIJwc1a53Y3utPJZB9BtNBPYrTMmmKWhTdMkaMl2/tYHjiG8XKKRg== X-Received: by 2002:aa7:c787:: with SMTP id n7mr1453573eds.309.1621273821957; Mon, 17 May 2021 10:50:21 -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 7/8] hw/block/fdc-sysbus: Add 'dma-channel' property Date: Mon, 17 May 2021 19:49:46 +0200 Message-Id: <20210517174947.1199649-8-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) QDev properties to be set before the device is realized should be exposed as a Property with a DEFINE_PROP_XXX() macro, then accessed with the equivalent qdev_prop_set_xxx() API. Do this with the FDCtrlSysBus 'dma-channel' property: convert it to int32_t, default-initialize with DEFINE_PROP_INT32() and use qdev_prop_set_int32() to set its value in fdctrl_init_sysbus(). Reviewed-by: Mark Cave-Ayland Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/block/fdc-internal.h | 2 +- hw/block/fdc-sysbus.c | 9 ++------- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/hw/block/fdc-internal.h b/hw/block/fdc-internal.h index 278de725e69..29b318f7525 100644 --- a/hw/block/fdc-internal.h +++ b/hw/block/fdc-internal.h @@ -96,7 +96,7 @@ struct FDCtrl { qemu_irq irq; /* Controller state */ QEMUTimer *result_timer; - int dma_chann; + int32_t dma_chann; uint8_t phase; IsaDma *dma; /* Controller's identification */ diff --git a/hw/block/fdc-sysbus.c b/hw/block/fdc-sysbus.c index 8f94c2efb63..74c7c8f2e01 100644 --- a/hw/block/fdc-sysbus.c +++ b/hw/block/fdc-sysbus.c @@ -106,15 +106,11 @@ void sysbus_fdc_init_drives(SysBusDevice *dev, DriveI= nfo **fds) void fdctrl_init_sysbus(qemu_irq irq, int dma_chann, hwaddr mmio_base, DriveInfo **fds) { - FDCtrl *fdctrl; DeviceState *dev; SysBusDevice *sbd; - FDCtrlSysBus *sys; =20 dev =3D qdev_new("sysbus-fdc"); - sys =3D SYSBUS_FDC(dev); - fdctrl =3D &sys->state; - fdctrl->dma_chann =3D dma_chann; /* FIXME */ + qdev_prop_set_int32(dev, "dma-channel", dma_chann); sbd =3D SYS_BUS_DEVICE(dev); sysbus_realize_and_unref(sbd, &error_fatal); sysbus_connect_irq(sbd, 0, irq); @@ -131,8 +127,6 @@ static void sysbus_fdc_common_initfn(Object *obj) FDCtrlSysBus *sys =3D SYSBUS_FDC(obj); FDCtrl *fdctrl =3D &sys->state; =20 - fdctrl->dma_chann =3D -1; - qdev_set_legacy_instance_id(dev, 0 /* io */, 2); /* FIXME */ =20 memory_region_init_io(&fdctrl->iomem, obj, @@ -173,6 +167,7 @@ static Property sysbus_fdc_properties[] =3D { DEFINE_PROP_SIGNED("fallback", FDCtrlSysBus, state.fallback, FLOPPY_DRIVE_TYPE_144, qdev_prop_fdc_drive_type, FloppyDriveType), + DEFINE_PROP_INT32("dma-channel", FDCtrlSysBus, state.dma_chann, -1), DEFINE_PROP_END_OF_LIST(), }; =20 --=20 2.26.3