Patchwork [RESEND] usb-uhci: fix commit 8e65b7c04965c8355e4ce43211582b6b83054e3d for vmstate

login
register
mail settings
Submitter TeLeMan
Date June 1, 2010, 4:26 a.m.
Message ID <AANLkTindZKR6M_OHQpzd5uV6xxr8ZzeyppryAzAM4ZaZ@mail.gmail.com>
Download mbox | patch
Permalink /patch/54145/
State New
Headers show

Comments

TeLeMan - June 1, 2010, 4:26 a.m.
The commit 8e65b7c04965c8355e4ce43211582b6b83054e3d introduced
expire_time of UHCIState. But expire_time is not in vmstate, the
second uhci_frame_timer will not be fired immediately after loadvm.

Signed-off-by: TeLeMan <geleman@gmail.com>
---
 hw/usb-uhci.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)
TeLeMan - June 5, 2010, 12:46 a.m.
no comments?

On Tue, Jun 1, 2010 at 12:26, TeLeMan <geleman@gmail.com> wrote:
> The commit 8e65b7c04965c8355e4ce43211582b6b83054e3d introduced
> expire_time of UHCIState. But expire_time is not in vmstate, the
> second uhci_frame_timer will not be fired immediately after loadvm.
>
> Signed-off-by: TeLeMan <geleman@gmail.com>
> ---
>  hw/usb-uhci.c |    3 ++-
>  1 files changed, 2 insertions(+), 1 deletions(-)
>
> diff --git a/hw/usb-uhci.c b/hw/usb-uhci.c
> index 624d55b..d9d74c9 100644
> --- a/hw/usb-uhci.c
> +++ b/hw/usb-uhci.c
> @@ -375,7 +375,7 @@ static const VMStateDescription vmstate_uhci_port = {
>
>  static const VMStateDescription vmstate_uhci = {
>     .name = "uhci",
> -    .version_id = 1,
> +    .version_id = 2,
>     .minimum_version_id = 1,
>     .minimum_version_id_old = 1,
>     .pre_save = uhci_pre_save,
> @@ -392,6 +392,7 @@ static const VMStateDescription vmstate_uhci = {
>         VMSTATE_UINT8(sof_timing, UHCIState),
>         VMSTATE_UINT8(status2, UHCIState),
>         VMSTATE_TIMER(frame_timer, UHCIState),
> +        VMSTATE_INT64_V(expire_time, UHCIState, 2),
>         VMSTATE_END_OF_LIST()
>     }
>  };
> --
> 1.6.5.1.1367.gcd48
> --
> SUN OF A BEACH
>
Aurelien Jarno - June 30, 2010, 6:44 p.m.
On Tue, Jun 01, 2010 at 12:26:20PM +0800, TeLeMan wrote:
> The commit 8e65b7c04965c8355e4ce43211582b6b83054e3d introduced
> expire_time of UHCIState. But expire_time is not in vmstate, the
> second uhci_frame_timer will not be fired immediately after loadvm.
> 
> Signed-off-by: TeLeMan <geleman@gmail.com>
> ---
>  hw/usb-uhci.c |    3 ++-
>  1 files changed, 2 insertions(+), 1 deletions(-)

Thanks, applied.

> diff --git a/hw/usb-uhci.c b/hw/usb-uhci.c
> index 624d55b..d9d74c9 100644
> --- a/hw/usb-uhci.c
> +++ b/hw/usb-uhci.c
> @@ -375,7 +375,7 @@ static const VMStateDescription vmstate_uhci_port = {
> 
>  static const VMStateDescription vmstate_uhci = {
>      .name = "uhci",
> -    .version_id = 1,
> +    .version_id = 2,
>      .minimum_version_id = 1,
>      .minimum_version_id_old = 1,
>      .pre_save = uhci_pre_save,
> @@ -392,6 +392,7 @@ static const VMStateDescription vmstate_uhci = {
>          VMSTATE_UINT8(sof_timing, UHCIState),
>          VMSTATE_UINT8(status2, UHCIState),
>          VMSTATE_TIMER(frame_timer, UHCIState),
> +        VMSTATE_INT64_V(expire_time, UHCIState, 2),
>          VMSTATE_END_OF_LIST()
>      }
>  };
> -- 
> 1.6.5.1.1367.gcd48
> --
> SUN OF A BEACH
> 
>

Patch

diff --git a/hw/usb-uhci.c b/hw/usb-uhci.c
index 624d55b..d9d74c9 100644
--- a/hw/usb-uhci.c
+++ b/hw/usb-uhci.c
@@ -375,7 +375,7 @@  static const VMStateDescription vmstate_uhci_port = {

 static const VMStateDescription vmstate_uhci = {
     .name = "uhci",
-    .version_id = 1,
+    .version_id = 2,
     .minimum_version_id = 1,
     .minimum_version_id_old = 1,
     .pre_save = uhci_pre_save,
@@ -392,6 +392,7 @@  static const VMStateDescription vmstate_uhci = {
         VMSTATE_UINT8(sof_timing, UHCIState),
         VMSTATE_UINT8(status2, UHCIState),
         VMSTATE_TIMER(frame_timer, UHCIState),
+        VMSTATE_INT64_V(expire_time, UHCIState, 2),
         VMSTATE_END_OF_LIST()
     }
 };