| Message ID | 20231020090731.28701-14-quintela@redhat.com |
|---|---|
| State | New |
| Headers | show |
| Series | migration: Check for duplicates on vmstate_register() | expand |
On 20/10/2023 11.07, Juan Quintela wrote: > I have no idea if we can have more than one vmware_vga device, so play > it safe. FWIW, it doesn't look like it's possible: $ ./qemu-system-x86_64 -device vmware-svga -device vmware-svga RAMBlock "vmsvga.fifo" already registered, abort! Aborted (core dumped) (NB: Aborting is very user-unfriendly here, but that's something for another patch...) > Reviewed-by: Stefan Berger <stefanb@linux.ibm.com> > Signed-off-by: Juan Quintela <quintela@redhat.com> > --- > hw/display/vmware_vga.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/hw/display/vmware_vga.c b/hw/display/vmware_vga.c > index 09591fbd39..7490d43881 100644 > --- a/hw/display/vmware_vga.c > +++ b/hw/display/vmware_vga.c > @@ -1264,7 +1264,7 @@ static void vmsvga_init(DeviceState *dev, struct vmsvga_state_s *s, > > vga_common_init(&s->vga, OBJECT(dev), &error_fatal); > vga_init(&s->vga, OBJECT(dev), address_space, io, true); > - vmstate_register(NULL, 0, &vmstate_vga_common, &s->vga); > + vmstate_register_any(NULL, &vmstate_vga_common, &s->vga); > s->new_depth = 32; > } Reviewed-by: Thomas Huth <thuth@redhat.com>
diff --git a/hw/display/vmware_vga.c b/hw/display/vmware_vga.c index 09591fbd39..7490d43881 100644 --- a/hw/display/vmware_vga.c +++ b/hw/display/vmware_vga.c @@ -1264,7 +1264,7 @@ static void vmsvga_init(DeviceState *dev, struct vmsvga_state_s *s, vga_common_init(&s->vga, OBJECT(dev), &error_fatal); vga_init(&s->vga, OBJECT(dev), address_space, io, true); - vmstate_register(NULL, 0, &vmstate_vga_common, &s->vga); + vmstate_register_any(NULL, &vmstate_vga_common, &s->vga); s->new_depth = 32; }