From nobody Mon Feb 9 19:04:41 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=1621442099; cv=none; d=zohomail.com; s=zohoarc; b=NngqBODQRbVUyiTh4FzSJBWP5e6qk12fWEVb2p7ykoTRHOnNFVhluZik6wmwolK18pOPVvV/yV1E3GinwOlK/dYeelD0uLT4GPnOeI6RFPMiQDR5Rb5iQTg8ELL8tr3PDXfH/vXFnFtVtRHhgCo2qaNTHfds6wCxUzj97299QR4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1621442099; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=STXGbIo4CYsigtu77YyYPuvkys8zN3rBCtP/Bf+nCQk=; b=QVz//QyyS11xAS8VdVJQ9ZBy9mBGyN8MNO8beBgTf7EwmVPvRgTNXxlTCHVhgwlhIRAtyCs5DJZHVR1Cr18kOk81UCg265le7rKYHo9H/mIrVOzDfBKOv/WgmTUBY85GZrSqQ1KnKic+GGXGXgAxX6JTNHgi1eODru6mFOLr6bw= 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 1621442099282537.4698081722435; Wed, 19 May 2021 09:34:59 -0700 (PDT) Received: from mail-wm1-f71.google.com (mail-wm1-f71.google.com [209.85.128.71]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-452-Aw--i40WNQu-BIhR_wBQSA-1; Wed, 19 May 2021 12:34:56 -0400 Received: by mail-wm1-f71.google.com with SMTP id y193-20020a1c32ca0000b029014cbf30c3f2so1699719wmy.1 for ; Wed, 19 May 2021 09:34:55 -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 c7sm17085620wrs.23.2021.05.19.09.34.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 19 May 2021 09:34:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1621442098; 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=STXGbIo4CYsigtu77YyYPuvkys8zN3rBCtP/Bf+nCQk=; b=ROuM//gTRYsIli3gqQn4WvHuHW+FgiUDcFPU91C/CJ3sCyy5Z33hbhbJrwXV3bf8PHkk6l gliGvoLYdhZchk8DQkmEuNFgf4aerh3FwDcZ3yrxd4c5KVoB9prZMBFODD3NKWk+Ei8rSO pAcvcKbg0IzXQwsEL7K90Bbd1SCPvYE= X-MC-Unique: Aw--i40WNQu-BIhR_wBQSA-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=STXGbIo4CYsigtu77YyYPuvkys8zN3rBCtP/Bf+nCQk=; b=fdTwayD3lMe4nT4tlmgKmitvvbspEfrQfvEwYVcuirZJRUmTyTmfUMourexwGtEcDn Dcz7EoUCoGUEU3o9yH3J//cF2zXp6aJPhfAuOkTuONQSmi8lGpq5nmfhblyDFd5Ddg5I ZTU69pkkNtLAo0rGfvmbJapyNSrJaCsj/C16+4Ss4/hlS19UZOu00xaegYhivGpo4diz /LsxjU2wN5vfW04MIa3kdQU1jTlLVA1yCd6Y3Dyamhz/cP4iS5aHqmUQoWq7sOmyrNJv kXD+CKm+HPtf+IrdWKKG9ShLJFbciWlZ7CcvAmIOH4wZrEwdz+p2K3n/mFCa8aTp53Wu iMjA== X-Gm-Message-State: AOAM533OsSCw+R0ET1YrQONLM5JVjSx19thyubF4PU00OKfOkIqri9vv YOjYvbdOdpxArHBcUhlDmYFYt5AfAU2Ww0Gc9kbijKX829eDztoTQwsYp4v0AESNfZlklxX1RHw Pgis/2KHotuoanw== X-Received: by 2002:a1c:3cd4:: with SMTP id j203mr11182494wma.25.1621442094916; Wed, 19 May 2021 09:34:54 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxOIGX5IHnm7u4fYmi/Ht/Hnkwz7C+gcRlh5wkbGRuI/3sC+jjmBYmbrx9Ee/FQojT3tnqL9Q== X-Received: by 2002:a1c:3cd4:: with SMTP id j203mr11182480wma.25.1621442094746; Wed, 19 May 2021 09:34:54 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: John Snow , qemu-devel@nongnu.org Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Thomas Huth Subject: [PATCH v6 1/5] hw/isa/Kconfig: Fix missing dependency ISA_SUPERIO -> FDC Date: Wed, 19 May 2021 18:34:44 +0200 Message-Id: <20210519163448.2154339-2-philmd@redhat.com> X-Mailer: git-send-email 2.26.3 In-Reply-To: <20210519163448.2154339-1-philmd@redhat.com> References: <20210519163448.2154339-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) isa_superio_realize() calls isa_fdc_init_drives(), which is defined in hw/block/fdc.c, so ISA_SUPERIO needs to select the FDC symbol. Add a isa_fdc_init_drives() stub for when FDC is not selected. Reported-by: John Snow Suggested-by: Thomas Huth Fixes: c0ff3795143 ("Introduce a CONFIG_ISA_SUPERIO switch for isa-superio.= c") Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/block/fdc-isa-stubs.c | 22 ++++++++++++++++++++++ MAINTAINERS | 1 + hw/block/meson.build | 5 ++++- hw/isa/Kconfig | 1 + 4 files changed, 28 insertions(+), 1 deletion(-) create mode 100644 hw/block/fdc-isa-stubs.c diff --git a/hw/block/fdc-isa-stubs.c b/hw/block/fdc-isa-stubs.c new file mode 100644 index 00000000000..60180531e11 --- /dev/null +++ b/hw/block/fdc-isa-stubs.c @@ -0,0 +1,22 @@ +/* + * QEMU Floppy disk emulator (Intel 82078) stubs + * + * Copyright (c) 2021 Red Hat, Inc. + * + * Author: + * Philippe Mathieu-Daud=C3=A9 + * + * SPDX-License-Identifier: GPL-2.0-or-later + * + * This work is licensed under the terms of the GNU GPL, version 2 or late= r. + * See the COPYING file in the top-level directory. + */ + +#include "qemu/osdep.h" +#include "hw/block/fdc.h" +#include "hw/isa/isa.h" + +void isa_fdc_init_drives(ISADevice *fdc, DriveInfo **fds) +{ + g_assert_not_reached(); +} diff --git a/MAINTAINERS b/MAINTAINERS index eab178aeee5..8fa85e40a52 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1659,6 +1659,7 @@ M: John Snow L: qemu-block@nongnu.org S: Supported F: hw/block/fdc.c +F: hw/block/fdc-isa-stubs.c F: include/hw/block/fdc.h F: tests/qtest/fdc-test.c T: git https://gitlab.com/jsnow/qemu.git ide diff --git a/hw/block/meson.build b/hw/block/meson.build index 8b0de54db1f..bb5b331d86a 100644 --- a/hw/block/meson.build +++ b/hw/block/meson.build @@ -4,7 +4,8 @@ 'hd-geometry.c' )) softmmu_ss.add(when: 'CONFIG_ECC', if_true: files('ecc.c')) -softmmu_ss.add(when: 'CONFIG_FDC', if_true: files('fdc.c')) +softmmu_ss.add(when: 'CONFIG_FDC', if_true: files('fdc.c'), + if_false: files('fdc-isa-stubs.c')) softmmu_ss.add(when: 'CONFIG_NAND', if_true: files('nand.c')) softmmu_ss.add(when: 'CONFIG_ONENAND', if_true: files('onenand.c')) softmmu_ss.add(when: 'CONFIG_PFLASH_CFI01', if_true: files('pflash_cfi01.c= ')) @@ -18,3 +19,5 @@ specific_ss.add(when: 'CONFIG_VHOST_USER_BLK', if_true: files('vhost-user-= blk.c')) =20 subdir('dataplane') + +softmmu_ss.add(when: 'CONFIG_ALL', if_true: files('fdc-isa-stubs.c')) diff --git a/hw/isa/Kconfig b/hw/isa/Kconfig index 55e0003ce40..7216f66a54a 100644 --- a/hw/isa/Kconfig +++ b/hw/isa/Kconfig @@ -17,6 +17,7 @@ config ISA_SUPERIO bool select ISA_BUS select PCKBD + select FDC =20 config PC87312 bool --=20 2.26.3