[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH RFC 3/7] Revert "x86: re-initialize RNG seed when selecting kerne
From: |
Michael S. Tsirkin |
Subject: |
[PATCH RFC 3/7] Revert "x86: re-initialize RNG seed when selecting kernel" |
Date: |
Wed, 8 Feb 2023 16:12:37 -0500 |
This reverts commit cc63374a5a7c240b7d3be734ef589dabbefc7527.
Fixes: cc63374a5a ("x86: re-initialize RNG seed when selecting kernel")
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
---
hw/i386/x86.c | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/hw/i386/x86.c b/hw/i386/x86.c
index 7984f65352..e1a5f244a9 100644
--- a/hw/i386/x86.c
+++ b/hw/i386/x86.c
@@ -1116,14 +1116,11 @@ void x86_load_linux(X86MachineState *x86ms,
setup_data->len = cpu_to_le32(RNG_SEED_LENGTH);
qemu_guest_getrandom_nofail(setup_data->data, RNG_SEED_LENGTH);
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 {
- fw_cfg_add_bytes(fw_cfg, FW_CFG_KERNEL_DATA, kernel, kernel_size);
}
fw_cfg_add_i32(fw_cfg, FW_CFG_KERNEL_ADDR, prot_addr);
fw_cfg_add_i32(fw_cfg, FW_CFG_KERNEL_SIZE, kernel_size);
+ fw_cfg_add_bytes(fw_cfg, FW_CFG_KERNEL_DATA, kernel, kernel_size);
sev_load_ctx.kernel_data = (char *)kernel;
sev_load_ctx.kernel_size = kernel_size;
--
MST
- [PATCH RFC 0/7] revert RNG seed mess, Michael S. Tsirkin, 2023/02/08
- [PATCH RFC 1/7] Revert "x86: don't let decompressed kernel image clobber setup_data", Michael S. Tsirkin, 2023/02/08
- [PATCH RFC 2/7] Revert "x86: do not re-randomize RNG seed on snapshot load", Michael S. Tsirkin, 2023/02/08
- [PATCH RFC 3/7] Revert "x86: re-initialize RNG seed when selecting kernel",
Michael S. Tsirkin <=
- [PATCH RFC 4/7] Revert "x86: reinitialize RNG seed on system reboot", Michael S. Tsirkin, 2023/02/08
- [PATCH RFC 6/7] Revert "x86: return modified setup_data only if read as memory, not as file", Michael S. Tsirkin, 2023/02/08
- [PATCH RFC 5/7] Revert "x86: use typedef for SetupData struct", Michael S. Tsirkin, 2023/02/08