Message ID | 1363628480-29306-1-git-send-email-peter.maydell@linaro.org |
---|---|
State | Accepted |
Commit | e8945b4f2a65fc2872cc31a5141e136fd27d0af8 |
Headers | show |
diff --git a/hw/pl050.c b/hw/pl050.c index bc31ab6..76735a0 100644 --- a/hw/pl050.c +++ b/hw/pl050.c @@ -24,14 +24,13 @@ typedef struct { static const VMStateDescription vmstate_pl050 = { .name = "pl050", - .version_id = 1, - .minimum_version_id = 1, + .version_id = 2, + .minimum_version_id = 2, .fields = (VMStateField[]) { VMSTATE_UINT32(cr, pl050_state), VMSTATE_UINT32(clk, pl050_state), VMSTATE_UINT32(last, pl050_state), VMSTATE_INT32(pending, pl050_state), - VMSTATE_INT32(is_mouse, pl050_state), VMSTATE_END_OF_LIST() } };
The is_mouse field of the pl050 state structure is constant (it tracks whether this is a 'pl050_keyboard' or 'pl050_mouse'), so there's no need to include it in the VMState structure. Signed-off-by: Peter Maydell <peter.maydell@linaro.org> --- It doesn't hurt to carry around the is_mouse field, I guess, but I thought it nicer to do the cleanup now while we still don't care about between version migration. hw/pl050.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)