From nobody Thu Apr 25 09:26:37 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.208.47 as permitted sender) client-ip=209.85.208.47; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-ed1-f47.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.208.47 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1617802666; cv=none; d=zohomail.com; s=zohoarc; b=FW/RmD1sGA3yaMENW9DMnPCzHgY2n2FS3lZFpzpbVloD0MfJIaaqW6f8gU5iueicurFIaJ4HYvP1meO0CQ/nP+fk9FM3cHWG5EJVFmXe255bt675mm8m/1MehT340ijRrhabjH19oKgLrwI0mror8BGkufOZ+Ts3DXaTujTCdzY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1617802666; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:MIME-Version:Message-ID:Sender:Subject:To; bh=Kk17FMJUo/m9ouAK7Ve/JRf9B5bmijM2EW2uqtHeQaA=; b=Tl6h+Z4MRnyk/g3GrzYY657WIGpZiF4HngleukcLKvqGexaI+jOOE0+/8pP7HDE7nj8gWo9PJ5kMER3yJ72femmzh63J2D2byJkgxjdAAmdMZUN/AN1QsEOyk6caYVpGg1tCn+fdc6O6Ptp0DZ3BPypWDwTZK+GjXMciaD3VNVE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.208.47 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-ed1-f47.google.com (mail-ed1-f47.google.com [209.85.208.47]) by mx.zohomail.com with SMTPS id 1617802666691456.9141814056803; Wed, 7 Apr 2021 06:37:46 -0700 (PDT) Received: by mail-ed1-f47.google.com with SMTP id e7so20882338edu.10 for ; Wed, 07 Apr 2021 06:37:46 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.redhat.com (17.red-88-21-201.staticip.rima-tde.net. [88.21.201.17]) by smtp.gmail.com with ESMTPSA id ho19sm12343399ejc.57.2021.04.07.06.37.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 07 Apr 2021 06:37:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=Kk17FMJUo/m9ouAK7Ve/JRf9B5bmijM2EW2uqtHeQaA=; b=BxfiAap+lujhYLuwBt9vgxgPqojvBRrqGxRPK57g2zkAbcL+ZYBqBFnAjvawhFyYvs uNBaqvOWvYgP4wE2k0YotsHZF+KfDhM0Z2iyh1p2R+oUQgXiqTp5Y+nxxHrBIZiXlCpz 3W+6K6hpjZKwSL3986c4WqJ7ClcdI46FzDXRbEZF6mcFGlv+hfUuloqsOoQoxzZcoCFn yyIVr36fdJTpp6B+pNJOJHlHvzsKo29QiOSBs7xUueErvW1sfMjDufZMB2fv2TJJFpQe xtY82I18jiLzM6+ADVQMgcZz+7KKwDztNk7GPh6lDX9GYwjmXoKyxeZpSz8hegJzF6gI Ch0A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :mime-version:content-transfer-encoding; bh=Kk17FMJUo/m9ouAK7Ve/JRf9B5bmijM2EW2uqtHeQaA=; b=GFB0I/jk/mkrneJrXZAGFH7ZruhHh3cChlUIevA87M4SBNe6Wq86f4sJUVlerOcp0o yg0QLMstjxNZz5xqxY7uBiYtTbjNU8tb/QA6ODjgKreXVTB3G+vBq9dUsPhlOZ0AABPK ylNvz6qYNE5DbC6AHBmashQtv5jQCIQcP+zfIFt/0JggEJbfMRpVbnbUV+fNuyn6oeEp te9sK7JuFOt0Du7ep4YGcL0yresSupgIW8NI/W+EyCmP5PCXliFXSvtwNnPZXwrzFEQc 8Kh11k2gk8Rw5sqYS5GAt/ShP7FG3WhcnRJ5mIfxbv6IFy+YUNAJNKOtXxnROWd2qDZO FUhQ== X-Gm-Message-State: AOAM533z/u75Oo1qOYcguleeZeMAcrzf2LEzavXtLeiQ2BNEWEim1Hr8 rsC66GLoqjcV9B7AE24pDC4= X-Google-Smtp-Source: ABdhPJzB6ZYUa9H27EtgXixYvFO6Fv7ZWX1B2kOAQ1ivKQcIN77WcWGYKjEyKm2hHJXHqt1RsEidUw== X-Received: by 2002:a05:6402:1051:: with SMTP id e17mr4555156edu.42.1617802664917; Wed, 07 Apr 2021 06:37:44 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Kevin Wolf , Eric Blake , Markus Armbruster , =?UTF-8?q?Herv=C3=A9=20Poussineau?= , John Snow , Max Reitz , Mark Cave-Ayland , qemu-block@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH-for-6.0?] hw/block/fdc: Fix 'fallback' property on sysbus floppy disk controllers Date: Wed, 7 Apr 2021 15:37:42 +0200 Message-Id: <20210407133742.1680424-1-f4bug@amsat.org> X-Mailer: git-send-email 2.26.3 MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) Setting the 'fallback' property corrupts the QOM instance state (FDCtrlSysBus) because it accesses an incorrect offset (it uses the offset of the FDCtrlISABus state). Fixes: a73275dd6fc ("fdc: Add fallback option") Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Markus Armbruster --- hw/block/fdc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hw/block/fdc.c b/hw/block/fdc.c index 82afda7f3a7..a825c2acbae 100644 --- a/hw/block/fdc.c +++ b/hw/block/fdc.c @@ -2893,7 +2893,7 @@ static Property sysbus_fdc_properties[] =3D { DEFINE_PROP_SIGNED("fdtypeB", FDCtrlSysBus, state.qdev_for_drives[1].t= ype, FLOPPY_DRIVE_TYPE_AUTO, qdev_prop_fdc_drive_type, FloppyDriveType), - DEFINE_PROP_SIGNED("fallback", FDCtrlISABus, state.fallback, + DEFINE_PROP_SIGNED("fallback", FDCtrlSysBus, state.fallback, FLOPPY_DRIVE_TYPE_144, qdev_prop_fdc_drive_type, FloppyDriveType), DEFINE_PROP_END_OF_LIST(), @@ -2918,7 +2918,7 @@ static Property sun4m_fdc_properties[] =3D { DEFINE_PROP_SIGNED("fdtype", FDCtrlSysBus, state.qdev_for_drives[0].ty= pe, FLOPPY_DRIVE_TYPE_AUTO, qdev_prop_fdc_drive_type, FloppyDriveType), - DEFINE_PROP_SIGNED("fallback", FDCtrlISABus, state.fallback, + DEFINE_PROP_SIGNED("fallback", FDCtrlSysBus, state.fallback, FLOPPY_DRIVE_TYPE_144, qdev_prop_fdc_drive_type, FloppyDriveType), DEFINE_PROP_END_OF_LIST(), --=20 2.26.3