Il 17/07/2014 13:02, Pavel Dovgalyuk ha scritto: > - .version_id = 3, > + .version_id = 4, > .minimum_version_id = 2, > .pre_save = serial_pre_save, > .post_load = serial_post_load, > .fields = (VMStateField[]) { > VMSTATE_UINT16_V(divider, SerialState, 2), > VMSTATE_UINT8(rbr, SerialState), > + VMSTATE_UINT8_V(thr, SerialState, 4), > + VMSTATE_UINT8_V(tsr, SerialState, 4), > VMSTATE_UINT8(ier, SerialState), > VMSTATE_UINT8(iir, SerialState), > VMSTATE_UINT8(lcr, SerialState), > @@ -613,6 +627,15 @@ const VMStateDescription vmstate_serial = { > VMSTATE_UINT8(msr, SerialState), > VMSTATE_UINT8(scr, SerialState), > VMSTATE_UINT8_V(fcr_vmstate, SerialState, 3), > + VMSTATE_INT32_V(thr_ipending, SerialState, 4),
Subsection, only migrated if it doesn't match "(s->iir & UART_IIR_ID) == UART_IIR_THRI". > + VMSTATE_INT32_V(last_break_enable, SerialState, 4), Can be reconstructed in the post_load callback from s->lcr. > + VMSTATE_INT32_V(tsr_retry, SerialState, 4), Subsection, only migrated if nonzero. thr/tsr can be in this subsection as well. > + VMSTATE_STRUCT(recv_fifo, SerialState, 4, vmstate_fifo8, Fifo8), > + VMSTATE_STRUCT(xmit_fifo, SerialState, 4, vmstate_fifo8, Fifo8), Two subsections, only transmitted if nonempty. > + VMSTATE_TIMER_V(fifo_timeout_timer, SerialState, 4), Subsection, only transmitted if pending. > + VMSTATE_INT32_V(timeout_ipending, SerialState, 4), Subsection, transmitted only if nonzero. > + VMSTATE_INT32_V(poll_msl, SerialState, 4), > + VMSTATE_TIMER_V(modem_status_poll, SerialState, 4), Both in a subsection, only migrated if poll_msl is not -1. Paolo > VMSTATE_END_OF_LIST()