mirror of
https://github.com/Motorhead1991/qemu.git
synced 2025-08-07 09:43:56 -06:00
vmstate: accept QEMUTimer in VMSTATE_TIMER*, add VMSTATE_TIMER_PTR*
Old users of VMSTATE_TIMER* are mechanically changed to VMSTATE_TIMER_PTR variants. Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
parent
cd1bd53a66
commit
e720677e32
27 changed files with 45 additions and 33 deletions
|
@ -2437,7 +2437,7 @@ const VMStateDescription vmstate_ehci = {
|
|||
VMSTATE_UINT32(portsc[4], EHCIState),
|
||||
VMSTATE_UINT32(portsc[5], EHCIState),
|
||||
/* frame timer */
|
||||
VMSTATE_TIMER(frame_timer, EHCIState),
|
||||
VMSTATE_TIMER_PTR(frame_timer, EHCIState),
|
||||
VMSTATE_UINT64(last_run_ns, EHCIState),
|
||||
VMSTATE_UINT32(async_stepdown, EHCIState),
|
||||
/* schedule state */
|
||||
|
|
|
@ -2015,7 +2015,7 @@ static const VMStateDescription vmstate_ohci_eof_timer = {
|
|||
.minimum_version_id = 1,
|
||||
.pre_load = ohci_eof_timer_pre_load,
|
||||
.fields = (VMStateField[]) {
|
||||
VMSTATE_TIMER(eof_timer, OHCIState),
|
||||
VMSTATE_TIMER_PTR(eof_timer, OHCIState),
|
||||
VMSTATE_END_OF_LIST()
|
||||
},
|
||||
};
|
||||
|
|
|
@ -419,7 +419,7 @@ static const VMStateDescription vmstate_uhci = {
|
|||
VMSTATE_UINT32(fl_base_addr, UHCIState),
|
||||
VMSTATE_UINT8(sof_timing, UHCIState),
|
||||
VMSTATE_UINT8(status2, UHCIState),
|
||||
VMSTATE_TIMER(frame_timer, UHCIState),
|
||||
VMSTATE_TIMER_PTR(frame_timer, UHCIState),
|
||||
VMSTATE_INT64_V(expire_time, UHCIState, 2),
|
||||
VMSTATE_UINT32_V(pending_int_mask, UHCIState, 3),
|
||||
VMSTATE_END_OF_LIST()
|
||||
|
|
|
@ -3855,7 +3855,7 @@ static const VMStateDescription vmstate_xhci = {
|
|||
|
||||
/* Runtime Registers & state */
|
||||
VMSTATE_INT64(mfindex_start, XHCIState),
|
||||
VMSTATE_TIMER(mfwrap_timer, XHCIState),
|
||||
VMSTATE_TIMER_PTR(mfwrap_timer, XHCIState),
|
||||
VMSTATE_STRUCT(cmd_ring, XHCIState, 1, vmstate_xhci_ring, XHCIRing),
|
||||
|
||||
VMSTATE_END_OF_LIST()
|
||||
|
|
|
@ -2438,7 +2438,7 @@ static const VMStateDescription usbredir_vmstate = {
|
|||
.post_load = usbredir_post_load,
|
||||
.fields = (VMStateField[]) {
|
||||
VMSTATE_USB_DEVICE(dev, USBRedirDevice),
|
||||
VMSTATE_TIMER(attach_timer, USBRedirDevice),
|
||||
VMSTATE_TIMER_PTR(attach_timer, USBRedirDevice),
|
||||
{
|
||||
.name = "parser",
|
||||
.version_id = 0,
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue