| Message ID | 1454359775-25959-2-git-send-email-wei@redhat.com |
|---|---|
| State | New |
| Headers | show |
On 1 February 2016 at 20:49, Wei Huang <wei@redhat.com> wrote: > This patch removes the float_high field of PL061State, which doesn't > seem to be used anywhere. Because this changes the device state, the > version ID is also bumped up for the reason of compatiblity. > > Signed-off-by: Wei Huang <wei@redhat.com> > --- > hw/gpio/pl061.c | 6 ++---- > 1 file changed, 2 insertions(+), 4 deletions(-) > > diff --git a/hw/gpio/pl061.c b/hw/gpio/pl061.c > index 342a70d..5e2abe6 100644 > --- a/hw/gpio/pl061.c > +++ b/hw/gpio/pl061.c > @@ -56,7 +56,6 @@ typedef struct PL061State { > uint32_t slr; > uint32_t den; > uint32_t cr; > - uint32_t float_high; > uint32_t amsel; > qemu_irq irq; > qemu_irq out[8]; > @@ -65,8 +64,8 @@ typedef struct PL061State { > > static const VMStateDescription vmstate_pl061 = { > .name = "pl061", > - .version_id = 3, > - .minimum_version_id = 3, > + .version_id = 4, > + .minimum_version_id = 4, > .fields = (VMStateField[]) { > VMSTATE_UINT32(locked, PL061State), > VMSTATE_UINT32(data, PL061State), > @@ -88,7 +87,6 @@ static const VMStateDescription vmstate_pl061 = { > VMSTATE_UINT32(slr, PL061State), > VMSTATE_UINT32(den, PL061State), > VMSTATE_UINT32(cr, PL061State), > - VMSTATE_UINT32(float_high, PL061State), > VMSTATE_UINT32_V(amsel, PL061State, 2), > VMSTATE_END_OF_LIST() > } Reviewed-by: Peter Maydell <peter.maydell@linaro.org> thanks -- PMM
diff --git a/hw/gpio/pl061.c b/hw/gpio/pl061.c index 342a70d..5e2abe6 100644 --- a/hw/gpio/pl061.c +++ b/hw/gpio/pl061.c @@ -56,7 +56,6 @@ typedef struct PL061State { uint32_t slr; uint32_t den; uint32_t cr; - uint32_t float_high; uint32_t amsel; qemu_irq irq; qemu_irq out[8]; @@ -65,8 +64,8 @@ typedef struct PL061State { static const VMStateDescription vmstate_pl061 = { .name = "pl061", - .version_id = 3, - .minimum_version_id = 3, + .version_id = 4, + .minimum_version_id = 4, .fields = (VMStateField[]) { VMSTATE_UINT32(locked, PL061State), VMSTATE_UINT32(data, PL061State), @@ -88,7 +87,6 @@ static const VMStateDescription vmstate_pl061 = { VMSTATE_UINT32(slr, PL061State), VMSTATE_UINT32(den, PL061State), VMSTATE_UINT32(cr, PL061State), - VMSTATE_UINT32(float_high, PL061State), VMSTATE_UINT32_V(amsel, PL061State, 2), VMSTATE_END_OF_LIST() }
This patch removes the float_high field of PL061State, which doesn't seem to be used anywhere. Because this changes the device state, the version ID is also bumped up for the reason of compatiblity. Signed-off-by: Wei Huang <wei@redhat.com> --- hw/gpio/pl061.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)