OSDN Git Service
(root)
/
qmiga
/
qemu.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
b34f2fd
)
Revert "x86: do not re-randomize RNG seed on snapshot load"
author
Michael S. Tsirkin
<mst@redhat.com>
Wed, 8 Feb 2023 20:55:38 +0000
(15:55 -0500)
committer
Michael S. Tsirkin
<mst@redhat.com>
Thu, 2 Mar 2023 08:10:46 +0000
(
03:10
-0500)
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")
Tested-by: Nathan Chancellor <nathan@kernel.org>
Tested-by: Dov Murik <dovmurik@linux.ibm.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
hw/i386/x86.c
patch
|
blob
|
history
diff --git
a/hw/i386/x86.c
b/hw/i386/x86.c
index
9b74761
..
7a128a2
100644
(file)
--- a/
hw/i386/x86.c
+++ b/
hw/i386/x86.c
@@
-1116,7
+1116,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 {