From nobody Sun May 5 21:58:20 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.128.48 as permitted sender) client-ip=209.85.128.48; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-f48.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.48 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1616614055; cv=none; d=zohomail.com; s=zohoarc; b=nAyfURb7OZf038W9PyzyH47Fa2XCE+WVgFFMKPXXVXAQFF4nRqbdHa5SL9BIoW2MIxC5laax9rzkVWMd7QRNejKmTvNM2tXkQ3jIRcFsTLxnrzG3tsYaX66IstaMtMZIFsN16J0u5gJ0kKsu13YMvs1v3hrjWNWtVKNIRx2yf7A= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1616614055; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:MIME-Version:Message-ID:Sender:Subject:To; bh=hLU1kCsBKvwOHqlKzu9iQGtoczQm9ofJkmpKvIMAg3o=; b=FsTrKDRwLio+aJANxcqisk/M37GkejwV/GP14K9nHByobz5BvXsbqa03m+X4G5P+sIY9x6naWY5gZVzPtXDmQq57hD71ZG9hK1BilywFEAkgP0J+gSX0N7xBVX94oi+HEsgu2hN0bqm0Rdv9OKv4irWcJbN3j//8F46jeQu3WnM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.48 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wm1-f48.google.com (mail-wm1-f48.google.com [209.85.128.48]) by mx.zohomail.com with SMTPS id 1616614055425229.91053656580516; Wed, 24 Mar 2021 12:27:35 -0700 (PDT) Received: by mail-wm1-f48.google.com with SMTP id z6-20020a1c4c060000b029010f13694ba2so1824341wmf.5 for ; Wed, 24 Mar 2021 12:27:34 -0700 (PDT) Return-Path: Return-Path: Received: from localhost.localdomain (17.red-88-21-201.staticip.rima-tde.net. [88.21.201.17]) by smtp.gmail.com with ESMTPSA id j13sm4438342wrt.29.2021.03.24.12.27.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 24 Mar 2021 12:27:32 -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=hLU1kCsBKvwOHqlKzu9iQGtoczQm9ofJkmpKvIMAg3o=; b=e+sZjNM1eu6IT3yUN3D73I66mv/D2Xp20EjjI+qG615vXG8FeFB+tzGFo4CxOOQ+uO pjdLN9Ztz6niyLW2eIvSPBbEnKba6f6/nGIy1Id8D25BqHIZf4oMUyH6uCFdqoq2zvnB dF0SoHKZByre7tTBae/vXG6dZ1snw5qscxLBz1CnqCpU3V8IrKPvKhCD/G/8h97eQZiE QNUmxZug/awaHW0N3MsPhOHYTTRI3j2uzlEg07lE2+7soO5JCQQCXYFIxfc7AFqYqEZI beyn9dCwMR3TopZHPUZRiIT9NyuovSBu2viJH9RcqAoUJkTDn21KcIvor9EacuVus8XF O/7A== 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=hLU1kCsBKvwOHqlKzu9iQGtoczQm9ofJkmpKvIMAg3o=; b=VAC+3yzOlXbE+XH0xLyVy9BjbOrZ5J7WYAGvP9gRyRirM0Zcvxnwp0MM7KRe6AfyHF 8hM6854h2vu48ETlg7xU44p3bQMB+1yPFYLwgc4pXrhPhApVqCwMv8BojjTzK13snLH0 M9w59g9nrY2afzU00nLFRVsbuymquYhNMFMT4LqXJy4IQbQeoOXE8tlfZRLcty+YyMw8 AqTMEFmaAYT5sZXjCXDA81pi4SnBZiwe4uIXUpS8CcEIbjvgvnyAW0mt2oX670pRE1ol u37+3Uce0Mc8JTaNl8y44hpAL20CBreTmbKqxSWuFDhMHBpbFxDgA15SVylk0q8sC5CD h0nQ== X-Gm-Message-State: AOAM5335RPZL+P9ZvEoBBzVPxQiUhg7SN1AaSGIVkmL5rOJpfHj63Mmk r58tLNRMtwD8fE1lU5VQyTI7jv5dBXFVQw== X-Google-Smtp-Source: ABdhPJzuZVUq5iwCegzAQecfb7aN0vrrDm8HkBsAlUodEgdQbWz6heOtAvRAxWhDcXHj/Ur1kqtWfg== X-Received: by 2002:a1c:6605:: with SMTP id a5mr4538276wmc.85.1616614053638; Wed, 24 Mar 2021 12:27:33 -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: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , =?UTF-8?q?Herv=C3=A9=20Poussineau?= , "Dr . David Alan Gilbert" , Aurelien Jarno Subject: [PATCH v2] hw/isa/piix4: Migrate Reset Control Register Date: Wed, 24 Mar 2021 20:27:31 +0100 Message-Id: <20210324192731.717142-1-f4bug@amsat.org> X-Mailer: git-send-email 2.26.2 MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) When adding the Reset register in commit 5790b757cfb we forgot to migrate it. While it is possible a VM using the PIIX4 is migrated just after requesting a system shutdown, it is very unlikely. However when restoring a migrated VM, we might have the RCR bit #4 set on the stack and when the VM resume it directly shutdowns. Add a post_load() migration handler and set the default RCR value to 0 for earlier versions, assuming the VM was not going to shutdown before migration. Fixes: 5790b757cfb ("piix4: Add the Reset Control Register") Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- v2: Add piix4_ide_post_load() and describe --- hw/isa/piix4.c | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/hw/isa/piix4.c b/hw/isa/piix4.c index a50d97834c7..e7bce0e590c 100644 --- a/hw/isa/piix4.c +++ b/hw/isa/piix4.c @@ -93,12 +93,25 @@ static void piix4_isa_reset(DeviceState *dev) pci_conf[0xae] =3D 0x00; } =20 +static int piix4_ide_post_load(void *opaque, int version_id) +{ + PIIX4State *s =3D opaque; + + if (version_id =3D=3D 2) { + s->rcr =3D 0; + } + + return 0; +} + static const VMStateDescription vmstate_piix4 =3D { .name =3D "PIIX4", - .version_id =3D 2, + .version_id =3D 3, .minimum_version_id =3D 2, + .post_load =3D piix4_ide_post_load, .fields =3D (VMStateField[]) { VMSTATE_PCI_DEVICE(dev, PIIX4State), + VMSTATE_UINT8(rcr, PIIX4State), VMSTATE_END_OF_LIST() } }; --=20 2.26.2