david.venhoff/QEMU-Nyx-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

vmstate: remove ps2_kbd_load_old()

Browse Source 
Now that we have version_id on post_load() we don't need the old load
function

Signed-off-by: Juan Quintela <quintela@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
This commit is contained in:
Juan Quintela 2009-09-29 22:48:23 +02:00 committed by Anthony Liguori
parent d4bfa4d7c6
commit db596c53a1
1 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
hw/ps2.c
View File

@ -541,19 +541,11 @@ static const VMStateDescription vmstate_ps2_common = {
} }
}; };
static int ps2_kbd_load_old(QEMUFile* f, void* opaque, int version_id) static int ps2_kbd_post_load(void* opaque, int version_id)
{ {
PS2KbdState *s = (PS2KbdState*)opaque; PS2KbdState *s = (PS2KbdState*)opaque;
if (version_id != 2 && version_id != 3) if (version_id == 2)
return -EINVAL;
vmstate_load_state(f, &vmstate_ps2_common, &s->common, version_id);
s->scan_enabled=qemu_get_be32(f);
s->translate=qemu_get_be32(f);
if (version_id == 3)
s->scancode_set=qemu_get_be32(f);
else
s->scancode_set=2; s->scancode_set=2;
return 0; return 0;
} }
@ -561,9 +553,9 @@ static int ps2_kbd_load_old(QEMUFile* f, void* opaque, int version_id)
static const VMStateDescription vmstate_ps2_keyboard = { static const VMStateDescription vmstate_ps2_keyboard = {
.name = "ps2kbd", .name = "ps2kbd",
.version_id = 3, .version_id = 3,
.minimum_version_id = 3, .minimum_version_id = 2,
.minimum_version_id_old = 2, .minimum_version_id_old = 2,
.load_state_old = ps2_kbd_load_old, .post_load = ps2_kbd_post_load,
.fields = (VMStateField []) { .fields = (VMStateField []) {
VMSTATE_STRUCT(common, PS2KbdState, 0, vmstate_ps2_common, PS2State), VMSTATE_STRUCT(common, PS2KbdState, 0, vmstate_ps2_common, PS2State),
VMSTATE_INT32(scan_enabled, PS2KbdState), VMSTATE_INT32(scan_enabled, PS2KbdState),