From nobody Wed Feb 11 02:08:58 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.44 as permitted sender) client-ip=209.85.221.44; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f44.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.44 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1619281370; cv=none; d=zohomail.com; s=zohoarc; b=H+XCxpZILi6SzF1/btxQdPpJJKrQDXzOT6CnTzJV8DvxWtlnrGIG9fOj3M4pGic2CVj3l3rTuDYLoohjcQWNGhV49/nID80Z4L8RNAWz0yWWzonmCkyucoLbszm8S9Lldt2ZwAWmK14V3LoUT2qsIAUk2lVc4N+YQ/QRYVdM5Nc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1619281370; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=4+QISpS2fmofHFusvT0iZzLeTqf48stVhGPP0rBj26c=; b=YT0TCWuwlkNPB1wdhSSAC5HRhLQmaYDqEpxxEseIZVW02LhF/+xI9FIrYT300NANSSNrrcWZTr1ghWLI5HNak5j9V/vkWYzs3I3Gdl7m8to1zwPFL8K2Smq6O8zWCOjRwIjwSz4tnJ2UWHDfjzg/jQYF37Iu/LNJYimtidK4Cu4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.44 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wr1-f44.google.com (mail-wr1-f44.google.com [209.85.221.44]) by mx.zohomail.com with SMTPS id 1619281370497938.9337300522144; Sat, 24 Apr 2021 09:22:50 -0700 (PDT) Received: by mail-wr1-f44.google.com with SMTP id h4so42375780wrt.12 for ; Sat, 24 Apr 2021 09:22:49 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.redhat.com (39.red-81-40-121.staticip.rima-tde.net. [81.40.121.39]) by smtp.gmail.com with ESMTPSA id u14sm12782211wrq.65.2021.04.24.09.22.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 24 Apr 2021 09:22:47 -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:in-reply-to:references :mime-version:content-transfer-encoding; bh=4+QISpS2fmofHFusvT0iZzLeTqf48stVhGPP0rBj26c=; b=X9aNCpiU5uRRiB4ZvEDKILDSMIgY4GeFiCX/xw971wZzOSpY8Wsc5uyf8DvE63kKEO y3Ca1JRzH0MZ+qeYaWuyDw+Bczl+VD+LDFZbivN+YnBS6xFt1YFg5/7pQLWfe3qnLTNL JFLJYPoLYYEWaSPjkvdVaqrWcJRHYav3pLjhCWQkYzTmQT63Wb9D6KeCTIvqrqpWFx0P x8hiXo18CnpQN2qW+S5ZQNVL4QduF9E1v36ey08dsUFAN5i2nhcMB4olJGO3UltO/AuK EgKA0OkUBHn+7KZoZG7YZ8fBSYCnXoiVjeu3W2+Gitv3Tg3L04eU3TsI3eDXTrK29u3B esgg== 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 :in-reply-to:references:mime-version:content-transfer-encoding; bh=4+QISpS2fmofHFusvT0iZzLeTqf48stVhGPP0rBj26c=; b=Tz9F2VkjU0oM1w9PfbGdWC+8WVqRkjfn2ZxVTPNC3ZCsLpXbL0UKLHmVSi8drFXNw9 P9x+KMyv7FO5L3ZJcDG21rwi0CcoEALBCyFtA11eEv1BB2D72RT4VNvN2jh83EjedaMT g4sq76WoxuMrd1B/xwDHQp0NhoPqj9hgrbN/4tyT3zaPet+u4DlbtviGspbaerYPEx3v hSX9o2jZUqMXQJ2MzhTV5UkxsxBNQ3pTDezqgwzIOvEDfJBTZmLn2bDg1K2HUpJzDrDi 0zV750NcRkkwpe52YhRpUs0TxHSi4hxGyI7JKq7SEK95fMPLUp/zOnvg2rb1/6DZdm24 sfiA== X-Gm-Message-State: AOAM533IMfpOZghiDOSpID+nEZdiZiY0IMqSd5ARVAYH62f/K6YP107G nteFXCh7WCcGJTTr9DnwQiA= X-Google-Smtp-Source: ABdhPJyuZ+sG+ybj1josEculdM6x9EeSooAh2Xzwzi65A6hWq2uNmqbmRZcYRivUF80+l5FPA67jNw== X-Received: by 2002:a05:6000:23c:: with SMTP id l28mr11521347wrz.79.1619281368579; Sat, 24 Apr 2021 09:22:48 -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: Peter Maydell , Markus Armbruster , Greg Kurz , qemu-block@nongnu.org, David Gibson , Kevin Wolf , Mark Cave-Ayland , Max Reitz , =?UTF-8?q?Herv=C3=A9=20Poussineau?= , qemu-arm@nongnu.org, qemu-ppc@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH 3/5] hw/block/nand: Register machine reset handler Date: Sat, 24 Apr 2021 18:22:27 +0200 Message-Id: <20210424162229.3312116-4-f4bug@amsat.org> X-Mailer: git-send-email 2.26.3 In-Reply-To: <20210424162229.3312116-1-f4bug@amsat.org> References: <20210424162229.3312116-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) The TYPE_NAND device is bus-less, thus isn't reset automatically. Register a reset handler to get reset with the machine. Fixed: 7426aa72c36 ("nand: Don't inherit from Sysbus") Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/block/nand.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/hw/block/nand.c b/hw/block/nand.c index 8bc80e35144..d3fb5107bfe 100644 --- a/hw/block/nand.c +++ b/hw/block/nand.c @@ -24,6 +24,7 @@ #include "hw/qdev-properties-system.h" #include "hw/block/flash.h" #include "sysemu/block-backend.h" +#include "sysemu/reset.h" #include "migration/vmstate.h" #include "qapi/error.h" #include "qemu/error-report.h" @@ -364,6 +365,11 @@ static const VMStateDescription vmstate_nand =3D { } }; =20 +static void nand_reset_handler(void *dev) +{ + device_legacy_reset(DEVICE(dev)); +} + static void nand_realize(DeviceState *dev, Error **errp) { int pagesize; @@ -423,6 +429,13 @@ static void nand_realize(DeviceState *dev, Error **err= p) } /* Give s->ioaddr a sane value in case we save state before it is used= . */ s->ioaddr =3D s->io; + + qemu_register_reset(nand_reset_handler, dev); +} + +static void nand_unrealize(DeviceState *dev) +{ + qemu_unregister_reset(nand_reset_handler, dev); } =20 static Property nand_properties[] =3D { @@ -437,6 +450,7 @@ static void nand_class_init(ObjectClass *klass, void *d= ata) DeviceClass *dc =3D DEVICE_CLASS(klass); =20 dc->realize =3D nand_realize; + dc->unrealize =3D nand_unrealize; dc->reset =3D nand_reset; dc->vmsd =3D &vmstate_nand; device_class_set_props(dc, nand_properties); --=20 2.26.3