提交 4cc017e5 编写于 作者: M Marc-André Lureau

serial: register vmsd with DeviceClass

Migration from old to new code works, however the other way fails for
devices that use serial_init/serial_mm_init with "base", used as
instance_id previously.

(with qdev_set_legacy_instance_id, the alias_id is only used in
savevm.c:find_se(), and thus can only be used to match against
"legacy" instance id values. On new code, instance_id is generated
incrementally from 0 with calculate_new_instance_id(), based on
"qdev-path/vmsd-name")
Signed-off-by: NMarc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: Nxiaoqiang zhao <zxq_yx_007@163.com>
上级 7781b88e
......@@ -990,8 +990,7 @@ SerialState *serial_init(int base, qemu_irq irq, int baudbase,
s->baudbase = baudbase;
qemu_chr_fe_init(&s->chr, chr, &error_abort);
serial_realize_core(s, &error_fatal);
vmstate_register(NULL, base, &vmstate_serial, s);
qdev_set_legacy_instance_id(dev, base, 2);
qdev_init_nofail(dev);
memory_region_init_io(&s->io, NULL, &serial_io_ops, s, "serial", 8);
......@@ -1006,6 +1005,7 @@ static void serial_class_init(ObjectClass *klass, void *data)
/* internal device for serialio/serialmm, not user-creatable */
dc->user_creatable = false;
dc->vmsd = &vmstate_serial;
}
static const TypeInfo serial_info = {
......@@ -1069,7 +1069,7 @@ SerialState *serial_mm_init(MemoryRegion *address_space,
qemu_chr_fe_init(&s->chr, chr, &error_abort);
serial_realize_core(s, &error_fatal);
vmstate_register(NULL, base, &vmstate_serial, s);
qdev_set_legacy_instance_id(dev, base, 2);
qdev_init_nofail(dev);
memory_region_init_io(&s->io, NULL, &serial_mm_ops[end], s,
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册