From patchwork Mon May 12 08:39:42 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 889347 Delivered-To: patch@linaro.org Received: by 2002:adf:fd8a:0:b0:3a1:f579:ae88 with SMTP id d10csp1497972wrr; Mon, 12 May 2025 01:44:28 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCV6NmuD7cGxuWT5/+XnaWUghEW25wJ16UFp4y60rHWOXC+8yS4EUYZRduwOXRdnzowtHaiJ5g==@linaro.org X-Google-Smtp-Source: AGHT+IEl0sfcRJAUE5xCSTffOhC4LW4glQfBkvGdVXlOhyNSZnfCV9C6rkyCVCtA1Ecn+CXT4Bj9 X-Received: by 2002:a05:6214:1c4d:b0:6e8:f166:b1a0 with SMTP id 6a1803df08f44-6f6e482d146mr214458066d6.36.1747039467847; Mon, 12 May 2025 01:44:27 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1747039467; cv=none; d=google.com; s=arc-20240605; b=CGlND8vITomBKXjHpCRZZZKFMYrvne8mnhWUVKBWYxe5I6imqeCEY3Tp/jzN80OKW5 0l3IaZgyGRJjrF53y4Tw7vtl1dkxxFOKSDUhzrKwlL6aPt2bipEa6rqkwJW4Upa1CHwq 6DstoBC2CguiZabZjd/nGtAxqJbc7xz9n0thq1H6094WKKvQ5Ya35SOzkR6EuDqPEh9E gY9E6KNbcpOTBL7JyeMVxtpbqGa3GNdzQNpOzBbzJWSoIWEeIjVZhgfGpVu4cWG9jm4r puzvvCS0+zOAKur3JTSk4SAWPogr+YzfLdwGK/zVug9E+arYmmEQlNxlc+ToU0f5y9k7 Co5Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=DxDElVV2Vn4WLDsSj0otIlxNm5IFXNud0/Q6aYpzZPw=; fh=Ncl/2H2FpHFyQPDEI+akN/dcSz5rzMHPSrZYqm/0AUw=; b=jf/rFB6lAAN961CD0xkYGyjZUD6fVZkHkJwFedzbaZ0GGrDMLbF7Py5yZCofDKQKbM 5hBqqtUKc8G0UOFLaQaPcW6cTBL2+EHa4YcPAMew4+iBQpdCDZ59LRm3r1H4qd+GcM09 ILc1gJgjayqypLiXrxoTHcfJmejck6EI9a7IvZry4KSYJZ6tlgjcTnBtZxiVVL/mgP2S LHVfaCP45iDEkqvvj920eaI49FaDpQikIQCN9k2Nd+jnNt91qEnfF++Zk+LjZgOXZ9wu 45fsNup/ZSnYIqWOOYJ5Y8EKD3dkRlPzEtC6+xlxhZb6sL2N+VkVs8+lrsbXlyu7x6JU xNog==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=riW86SrP; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id 6a1803df08f44-6f6e3a58e09si81944926d6.425.2025.05.12.01.44.27 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 12 May 2025 01:44:27 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=riW86SrP; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uEOlp-0004WZ-0W; Mon, 12 May 2025 04:44:21 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1uEOjT-0008Lm-5w for qemu-devel@nongnu.org; Mon, 12 May 2025 04:41:57 -0400 Received: from mail-wm1-x332.google.com ([2a00:1450:4864:20::332]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uEOjM-0001oq-OC for qemu-devel@nongnu.org; Mon, 12 May 2025 04:41:54 -0400 Received: by mail-wm1-x332.google.com with SMTP id 5b1f17b1804b1-441d1ed82dbso44926305e9.0 for ; Mon, 12 May 2025 01:41:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1747039307; x=1747644107; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=DxDElVV2Vn4WLDsSj0otIlxNm5IFXNud0/Q6aYpzZPw=; b=riW86SrPScdQsmfSEg5dJ56NCU6Ioa/B1+ntXLH9ZAzgTqLxv6a11YuZtnH9Lbbkvh 7bv/WpmKSWPocFCTGYkd8tpi/019bMNnyhiTsBJRKgGbPGjkwr2Ux0EmlVX+4uwzRNDQ fV73Rqm0BEa72O2k2kNpQ0foUV/XL1tbBKYkn9wZewbkZ+nQh8sK6pt4pgQCjETaxjcD FkJEgRMw+938iJEk9dEDl/NpCs1WKdnHtgXE/CcmRDz9/5oWIFLWaJi8IfV9OMCQqMP9 3Y0uZNnXqgF5hDRIzqmMPKmfZ9Ge+0B4mKkbUOtxMf0OvctDnD82xANs9LZ3k2bgHrkC Dr+A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1747039307; x=1747644107; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=DxDElVV2Vn4WLDsSj0otIlxNm5IFXNud0/Q6aYpzZPw=; b=KPwc9UNsPpIMQDBma7FteDn5eTIQIKyY/+8JRUIwPBvTpYyx6YlZIgrUiPcwPLm/Xi 22JdQf2neCJHPOUe8ic6A6SRpc3NXrJVkaw4HaBqk77M8g/IAo+5cnzBvYZPg1AydNrK ZPp36cfSbd08qVHFoXJKnrj7iNh5z60RoRNQx3B/6xnOwh5gMfFHTzBc0vBm6+J+U2z9 3Jp4UPWcV2SgkdFWPGBGxkpwomYKcDXxagZzEutY1yERWRO0sFgPSqg3BCKD4h2si/MF sjanJtF3aLI2EMH2i7tgRegkRIkwOhIuXhUGzIhd09wvvAC6oAtWRkseWL7t7ZVeJKyC oCxA== X-Gm-Message-State: AOJu0YwIf0McvhHxkNV2CO2tYCR7oK5ph4lQVNk0TaX7qsQF+K0zKKI+ bFCLpmy1ibIn53Jhb6NAKTI/lpYCUQo7m39Vytn/lExJvApyisn24B3C2UpL3EOFmkMpnrLrq4S a4r0ILg== X-Gm-Gg: ASbGncsqJzyWnlj1syonU8A3h/1ST9mOVugDWBYpERQGTxG+Ht2/pYGZR4nwoTRZTyi RKLHYzLxl+EKgfoY0vrmqD8d0RrBBMcpR6R1o9FMeW2Jl0z/Ir0vss0HOd+mSmfFfkNPvWtrHct i+cGcfYm4YFqhI670Wkh5VXLPDWxpnDl8Ex1+aSpVLXSqDsImFEWXRYD1QKQ7PG95wwsTDg/pWP w3rDM9LxIfNglGvHjtun1R3prz4nSPEdkQm4vtOcb5tcj0xWFF8HtQpmIkpoKfKMsjgufoisuZh +j+1vwnqJGvo5zNquxKRxTSdlrmy9IrHYBST+5H92zWMRFCLApXuqTyiNjgvhcmjphB8nZ+cveo 6CVXlMQy8g7z2CSMujaiiMPA= X-Received: by 2002:a05:600c:34ca:b0:43c:f8fc:f6a6 with SMTP id 5b1f17b1804b1-442d6d37115mr115193495e9.9.1747039306695; Mon, 12 May 2025 01:41:46 -0700 (PDT) Received: from localhost.localdomain (129.163.185.81.rev.sfr.net. [81.185.163.129]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-442cd3af15bsm161173755e9.30.2025.05.12.01.41.43 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 12 May 2025 01:41:46 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Yanan Wang , Kevin Wolf , Richard Henderson , Marcel Apfelbaum , qemu-block@nongnu.org, Fabiano Rosas , Fam Zheng , =?utf-8?q?Phil?= =?utf-8?q?ippe_Mathieu-Daud=C3=A9?= , Jason Wang , Laurent Vivier , Paolo Bonzini , Dmitry Fleytman , Eduardo Habkost , Hanna Reitz , Zhao Liu , John Snow , Gerd Hoffmann , "Michael S. Tsirkin" , =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= Subject: [PATCH v4 13/19] hw/block/fdc-isa: Remove 'fallback' property Date: Mon, 12 May 2025 10:39:42 +0200 Message-ID: <20250512083948.39294-14-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250512083948.39294-1-philmd@linaro.org> References: <20250512083948.39294-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::332; envelope-from=philmd@linaro.org; helo=mail-wm1-x332.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org The "fallback" property was only used by the hw_compat_2_5[] array, as 'fallback=144'. We removed all machines using that array, lets remove ISA floppy drive 'fallback' property, manually setting the default value in isabus_fdc_realize(). Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Daniel P. Berrangé Reviewed-by: Zhao Liu --- hw/block/fdc-isa.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/hw/block/fdc-isa.c b/hw/block/fdc-isa.c index 6d1790e0e61..5d746d73165 100644 --- a/hw/block/fdc-isa.c +++ b/hw/block/fdc-isa.c @@ -97,6 +97,7 @@ static void isabus_fdc_realize(DeviceState *dev, Error **errp) isa->iobase, fdc_portio_list, fdctrl, "fdc"); + fdctrl->fallback = FLOPPY_DRIVE_TYPE_288; fdctrl->irq = isa_bus_get_irq(bus, isa->irq); fdctrl->dma_chann = isa->dma; if (fdctrl->dma_chann != -1) { @@ -293,9 +294,6 @@ static const Property isa_fdc_properties[] = { DEFINE_PROP_SIGNED("fdtypeB", FDCtrlISABus, state.qdev_for_drives[1].type, FLOPPY_DRIVE_TYPE_AUTO, qdev_prop_fdc_drive_type, FloppyDriveType), - DEFINE_PROP_SIGNED("fallback", FDCtrlISABus, state.fallback, - FLOPPY_DRIVE_TYPE_288, qdev_prop_fdc_drive_type, - FloppyDriveType), }; static void isabus_fdc_class_init(ObjectClass *klass, const void *data)