mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

serial: use post_load version_id field and remove pre_load function

Browse Source 
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-10-16 15:39:58 +02:00 committed by Anthony Liguori
parent eacf610f37
commit 4c18ce94ff
1 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
hw/serial.c
View File

@ -649,17 +649,13 @@ static void serial_pre_save(void *opaque)
s->fcr_vmstate = s->fcr; s->fcr_vmstate = s->fcr;
} }
static int serial_pre_load(void *opaque)
{
SerialState *s = opaque;
s->fcr_vmstate = 0;
return 0;
}
static int serial_post_load(void *opaque, int version_id) static int serial_post_load(void *opaque, int version_id)
{ {
SerialState *s = opaque; SerialState *s = opaque;
if (version_id < 3) {
s->fcr_vmstate = 0;
}
/* Initialize fcr via setter to perform essential side-effects */ /* Initialize fcr via setter to perform essential side-effects */
serial_ioport_write(s, 0x02, s->fcr_vmstate); serial_ioport_write(s, 0x02, s->fcr_vmstate);
return 0; return 0;
@ -670,7 +666,6 @@ static const VMStateDescription vmstate_serial = {
.version_id = 3, .version_id = 3,
.minimum_version_id = 2, .minimum_version_id = 2,
.pre_save = serial_pre_save, .pre_save = serial_pre_save,
.pre_load = serial_pre_load,
.post_load = serial_post_load, .post_load = serial_post_load,
.fields = (VMStateField []) { .fields = (VMStateField []) {
VMSTATE_UINT16_V(divider, SerialState, 2), VMSTATE_UINT16_V(divider, SerialState, 2),