[qemu-xen staging-4.18] hw/ppc/e500: fix broken snapshot replay

[patchbot@xxxxxxx]

commit fcb49ea23c39dd93b8e1d4e0edae67967d28e001
Author:     Maksim Kostin <maksim.kostin@xxxxxxxxx>
AuthorDate: Wed Aug 9 13:07:33 2023 +0300
Commit:     Michael Tokarev <mjt@xxxxxxxxxx>
CommitDate: Sun Sep 10 19:39:41 2023 +0300

    hw/ppc/e500: fix broken snapshot replay
    
    ppce500_reset_device_tree is registered for system reset, but after
    c4b075318eb1 this function rerandomizes rng-seed via
    qemu_guest_getrandom_nofail. And when loading a snapshot, it tries to read
    EVENT_RANDOM that doesn't exist, so we have an error:
    
      qemu-system-ppc: Missing random event in the replay log
    
    To fix this, use qemu_register_reset_nosnapshotload instead of
    qemu_register_reset.
    
    Reported-by: Vitaly Cheptsov <cheptsov@xxxxxxxxx>
    Fixes: c4b075318eb1 ("hw/ppc: pass random seed to fdt ")
    Resolves: https://gitlab.com/qemu-project/qemu/-/issues/1634
    Signed-off-by: Maksim Kostin <maksim.kostin@xxxxxxxxx>
    Reviewed-by: Nicholas Piggin <npiggin@xxxxxxxxx>
    Signed-off-by: Cédric Le Goater <clg@xxxxxxxx>
    (cherry picked from commit 6ec65b69ba17c954414fa23a397fb8a3fcfb4a43)
    Signed-off-by: Michael Tokarev <mjt@xxxxxxxxxx>
---
 hw/ppc/e500.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hw/ppc/e500.c b/hw/ppc/e500.c
index 117c9c08ed..27d83a4bf6 100644
--- a/hw/ppc/e500.c
+++ b/hw/ppc/e500.c
@@ -712,7 +712,7 @@ static int ppce500_prep_device_tree(PPCE500MachineState 
*machine,
     p->kernel_base = kernel_base;
     p->kernel_size = kernel_size;
 
-    qemu_register_reset(ppce500_reset_device_tree, p);
+    qemu_register_reset_nosnapshotload(ppce500_reset_device_tree, p);
     p->notifier.notify = ppce500_init_notify;
     qemu_add_machine_init_done_notifier(&p->notifier);
 
--
generated by git-patchbot for /home/xen/git/qemu-xen.git#staging-4.18