[PATCH RFC 2/7] Revert "x86: do not re-randomize RNG seed on snapshot load"

From: "Michael S. Tsirkin" <mst@redhat.com>
To: qemu-devel@nongnu.org, "Jason A. Donenfeld" <Jason@zx2c4.com>
Cc: x86@kernel.org, linux-kernel@vger.kernel.org,
	"Dov Murik" <dovmurik@linux.ibm.com>,
	"Tom Lendacky" <thomas.lendacky@amd.com>,
	"Gerd Hoffmann" <kraxel@redhat.com>,
	"Daniel P . Berrangé" <berrange@redhat.com>,
	"Paolo Bonzini" <pbonzini@redhat.com>,
	"Richard Henderson" <richard.henderson@linaro.org>,
	"H . Peter Anvin" <hpa@zytor.com>,
	"Philippe Mathieu-Daudé" <philmd@linaro.org>,
	"Nathan Chancellor" <nathan@kernel.org>,
	"Borislav Petkov" <bp@alien8.de>,
	"Eric Biggers" <ebiggers@kernel.org>,
	"Eduardo Habkost" <eduardo@habkost.net>,
	"Marcel Apfelbaum" <marcel.apfelbaum@gmail.com>
Subject: [PATCH RFC 2/7] Revert "x86: do not re-randomize RNG seed on snapshot load"
Date: Wed, 8 Feb 2023 16:12:31 -0500	[thread overview]
Message-ID: <20230208211212.41951-3-mst@redhat.com> (raw)
In-Reply-To: <20230208211212.41951-1-mst@redhat.com>

This reverts commit 14b29fea742034186403914b4d013d0e83f19e78.

Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Fixes: 14b29fea74 ("x86: do not re-randomize RNG seed on snapshot load")
---
 hw/i386/x86.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hw/i386/x86.c b/hw/i386/x86.c
index 78cc131926..7984f65352 100644
--- a/hw/i386/x86.c
+++ b/hw/i386/x86.c
@@ -1115,7 +1115,7 @@ void x86_load_linux(X86MachineState *x86ms,
         setup_data->type = cpu_to_le32(SETUP_RNG_SEED);
         setup_data->len = cpu_to_le32(RNG_SEED_LENGTH);
         qemu_guest_getrandom_nofail(setup_data->data, RNG_SEED_LENGTH);
-        qemu_register_reset_nosnapshotload(reset_rng_seed, setup_data);
+        qemu_register_reset(reset_rng_seed, setup_data);
         fw_cfg_add_bytes_callback(fw_cfg, FW_CFG_KERNEL_DATA, reset_rng_seed, NULL,
                                   setup_data, kernel, kernel_size, true);
     } else {
-- 
MST

