From nobody Sun Apr 28 00:52:22 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.128.49 as permitted sender) client-ip=209.85.128.49; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-f49.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.49 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1616616218; cv=none; d=zohomail.com; s=zohoarc; b=fQCxxn2osvM+I0p1ASjtVjP71DDe3xjzRV0X2YCGQ2dVZPE0XHun+oyQte5bbwqi1Q2oysmAzs0Ds7bRdkpQGLs7Rtnn0NYk/IBfoThvpZl9t0AywoUruNQs8I5E9JYnLG+9pGKKMFSPbwg3zTQnLud2F0guJLxFM6vXVSywQ6c= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1616616218; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:MIME-Version:Message-ID:Sender:Subject:To; bh=mysaMOiFaLcROftTce1IldDkRwwnjt3o3BkfEv1lkKY=; b=LbO8wCIk4FtUxXIwnRGZIVBE69sT/V+dODzgn83l3+TC2TVcaN2/I8FB+njIhkIfsltBP+2adwmWPSJcWm0cZyQ7vOUSCWtdeZJ24r3YpZXnvJLst6IOUzKOjEuWssSAYuXfEWsVi8M4qycqI0Vea3nBEG3z8HL/Y+R/K22CToA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.49 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wm1-f49.google.com (mail-wm1-f49.google.com [209.85.128.49]) by mx.zohomail.com with SMTPS id 1616616218295724.6709698122777; Wed, 24 Mar 2021 13:03:38 -0700 (PDT) Received: by mail-wm1-f49.google.com with SMTP id k128so11173666wmk.4 for ; Wed, 24 Mar 2021 13:03:37 -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 q9sm4422994wrp.79.2021.03.24.13.03.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 24 Mar 2021 13:03:35 -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=mysaMOiFaLcROftTce1IldDkRwwnjt3o3BkfEv1lkKY=; b=nPH39AhTEpVg678reqDF34P3blN7eFq3HPEOEUl70mlEKxN1kuJ0/1UcfoKhlrSXBo YFfHuQmptKWrazCfUMnrRBRvHCg1WF+FNV/kwMF7wJaoyCI+/blR0KWm4h2+6lVM86UJ EilQZ7aJ67Ez1QH2V9hzdWEmwMQVWkYwiarERoobi71Uz/PsumGxsDnibdXhaSqL0eZK whCNKNuILamB/ndSU0vUhybmf/DcLGPW4u3aZI6oEX3jbomhk+FvGmkEeqoYD/sdOMoc aF/bdRl8Z0OSoRpzfCgDduI55K0cH3fycXXNaw0IlVT9CTDaBcXwT9FmuOluOM+Nx9GT xtog== 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=mysaMOiFaLcROftTce1IldDkRwwnjt3o3BkfEv1lkKY=; b=rrgyJIOUbHjMkH8FNy1KZB15B+Wv5KbGBP/Ap/C+sVDAX/SXoPhMkc4sYQF3FCTgA7 mry9kQRu8GLCQp2ik0hoJEQRa4DL2NDtMTPFxB4i6pU7lrcIFm+SgxPZ2xHQQvu3e40q 0BtlY80Gd+cCTznr+LGSVfiFO1wY4Y5dv+wZxHWmQ23mhfSxCxXDkMQeFR9aFIya3vnS 71BO53Cr78Q6LjFykuPxWMzHm31k7T3zYmFS5uanv/Kt/355gGf93Y2xbdP5DC+yOlF7 HjobLBQWdc3K2UAvBBolilMtX7OSihOUrOPS82Bc3xR+5RkYL+yWh6tgbR7R/uUK4ykn oUaw== X-Gm-Message-State: AOAM531PbUpekT2F8FE9CW4AIr03gZTaO+lWRJ+PG2HgoXwuHEoD7os9 2OnkdJAfexWZBKWFgpoEG4WnGo055Px2YQ== X-Google-Smtp-Source: ABdhPJwJBc5u3GiFTAE6YrOCOboPtV36KKDO8yxTBCHTV5fboap2jzeGdrL5qBl6l7XZC8Mdm6utSg== X-Received: by 2002:a1c:e18b:: with SMTP id y133mr4547876wmg.22.1616616216632; Wed, 24 Mar 2021 13:03:36 -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: Aurelien Jarno , "Dr . David Alan Gilbert" , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , =?UTF-8?q?Herv=C3=A9=20Poussineau?= Subject: [PATCH v3] hw/isa/piix4: Migrate Reset Control Register Date: Wed, 24 Mar 2021 21:03:34 +0100 Message-Id: <20210324200334.729899-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 Reviewed-by: Dr. David Alan Gilbert --- v3: Use VMSTATE_UINT8_V (Dave) 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..b3b6a4378a3 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_V(rcr, PIIX4State, 3), VMSTATE_END_OF_LIST() } }; --=20 2.26.2