| Message ID | 1436439674-51226-1-git-send-email-cornelia.huck@de.ibm.com |
|---|---|
| State | New |
| Headers | show |
Am 09.07.2015 um 13:01 schrieb Cornelia Huck: > 64 bit props used 32 bit callbacks in two places, leading to broken > feature bits on virtio (example: got 0x31000000000006d4 which is > obviously bogus). Fix this. > > Fixes: fdba6d96 ("qdev: add 64bit properties") > Signed-off-by: Cornelia Huck <cornelia.huck@de.ibm.com> Tested-by: Christian Borntraeger <borntraeger@de.ibm.com> With that patch a pre-v1-patches save file loads and works. (Without this patch the guest loads, but virtio is broken and all I/O hangs) > --- > hw/core/qdev-properties.c | 2 +- > include/hw/qdev-properties.h | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/hw/core/qdev-properties.c b/hw/core/qdev-properties.c > index e9e686f..04fd80a 100644 > --- a/hw/core/qdev-properties.c > +++ b/hw/core/qdev-properties.c > @@ -130,7 +130,7 @@ PropertyInfo qdev_prop_bit = { > > static uint64_t qdev_get_prop_mask64(Property *prop) > { > - assert(prop->info == &qdev_prop_bit); > + assert(prop->info == &qdev_prop_bit64); > return 0x1ull << prop->bitnr; > } > > diff --git a/include/hw/qdev-properties.h b/include/hw/qdev-properties.h > index 0cfff1c..77538a8 100644 > --- a/include/hw/qdev-properties.h > +++ b/include/hw/qdev-properties.h > @@ -53,7 +53,7 @@ extern PropertyInfo qdev_prop_arraylen; > } > #define DEFINE_PROP_BIT64(_name, _state, _field, _bit, _defval) { \ > .name = (_name), \ > - .info = &(qdev_prop_bit), \ > + .info = &(qdev_prop_bit64), \ > .bitnr = (_bit), \ > .offset = offsetof(_state, _field) \ > + type_check(uint64_t, typeof_field(_state, _field)), \ >
On Thu, 9 Jul 2015 13:01:14 +0200 Cornelia Huck <cornelia.huck@de.ibm.com> wrote: > 64 bit props used 32 bit callbacks in two places, leading to broken > feature bits on virtio (example: got 0x31000000000006d4 which is > obviously bogus). Fix this. > > Fixes: fdba6d96 ("qdev: add 64bit properties") > Signed-off-by: Cornelia Huck <cornelia.huck@de.ibm.com> > --- > hw/core/qdev-properties.c | 2 +- > include/hw/qdev-properties.h | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) Ping? I think this should go into 2.4-rc1. > > diff --git a/hw/core/qdev-properties.c b/hw/core/qdev-properties.c > index e9e686f..04fd80a 100644 > --- a/hw/core/qdev-properties.c > +++ b/hw/core/qdev-properties.c > @@ -130,7 +130,7 @@ PropertyInfo qdev_prop_bit = { > > static uint64_t qdev_get_prop_mask64(Property *prop) > { > - assert(prop->info == &qdev_prop_bit); > + assert(prop->info == &qdev_prop_bit64); > return 0x1ull << prop->bitnr; > } > > diff --git a/include/hw/qdev-properties.h b/include/hw/qdev-properties.h > index 0cfff1c..77538a8 100644 > --- a/include/hw/qdev-properties.h > +++ b/include/hw/qdev-properties.h > @@ -53,7 +53,7 @@ extern PropertyInfo qdev_prop_arraylen; > } > #define DEFINE_PROP_BIT64(_name, _state, _field, _bit, _defval) { \ > .name = (_name), \ > - .info = &(qdev_prop_bit), \ > + .info = &(qdev_prop_bit64), \ > .bitnr = (_bit), \ > .offset = offsetof(_state, _field) \ > + type_check(uint64_t, typeof_field(_state, _field)), \
On 13/07/2015 11:01, Cornelia Huck wrote: > On Thu, 9 Jul 2015 13:01:14 +0200 > Cornelia Huck <cornelia.huck@de.ibm.com> wrote: > >> 64 bit props used 32 bit callbacks in two places, leading to broken >> feature bits on virtio (example: got 0x31000000000006d4 which is >> obviously bogus). Fix this. >> >> Fixes: fdba6d96 ("qdev: add 64bit properties") >> Signed-off-by: Cornelia Huck <cornelia.huck@de.ibm.com> >> --- >> hw/core/qdev-properties.c | 2 +- >> include/hw/qdev-properties.h | 2 +- >> 2 files changed, 2 insertions(+), 2 deletions(-) > > Ping? I think this should go into 2.4-rc1. I'll queue it. Paolo
On Mon, Jul 13, 2015 at 12:18:31PM +0200, Paolo Bonzini wrote: > > > On 13/07/2015 11:01, Cornelia Huck wrote: > > On Thu, 9 Jul 2015 13:01:14 +0200 > > Cornelia Huck <cornelia.huck@de.ibm.com> wrote: > > > >> 64 bit props used 32 bit callbacks in two places, leading to broken > >> feature bits on virtio (example: got 0x31000000000006d4 which is > >> obviously bogus). Fix this. > >> > >> Fixes: fdba6d96 ("qdev: add 64bit properties") > >> Signed-off-by: Cornelia Huck <cornelia.huck@de.ibm.com> > >> --- > >> hw/core/qdev-properties.c | 2 +- > >> include/hw/qdev-properties.h | 2 +- > >> 2 files changed, 2 insertions(+), 2 deletions(-) > > > > Ping? I think this should go into 2.4-rc1. > > I'll queue it. > > Paolo No need, I already have it queued. Want to send an ack?
On 13/07/2015 13:23, Michael S. Tsirkin wrote: > On Mon, Jul 13, 2015 at 12:18:31PM +0200, Paolo Bonzini wrote: >> >> >> On 13/07/2015 11:01, Cornelia Huck wrote: >>> On Thu, 9 Jul 2015 13:01:14 +0200 >>> Cornelia Huck <cornelia.huck@de.ibm.com> wrote: >>> >>>> 64 bit props used 32 bit callbacks in two places, leading to broken >>>> feature bits on virtio (example: got 0x31000000000006d4 which is >>>> obviously bogus). Fix this. >>>> >>>> Fixes: fdba6d96 ("qdev: add 64bit properties") >>>> Signed-off-by: Cornelia Huck <cornelia.huck@de.ibm.com> >>>> --- >>>> hw/core/qdev-properties.c | 2 +- >>>> include/hw/qdev-properties.h | 2 +- >>>> 2 files changed, 2 insertions(+), 2 deletions(-) >>> >>> Ping? I think this should go into 2.4-rc1. >> >> I'll queue it. >> >> Paolo > > No need, I already have it queued. Want to send an ack? Sure, Acked-by: Paolo Bonzini <pbonzini@redhat.com>
diff --git a/hw/core/qdev-properties.c b/hw/core/qdev-properties.c index e9e686f..04fd80a 100644 --- a/hw/core/qdev-properties.c +++ b/hw/core/qdev-properties.c @@ -130,7 +130,7 @@ PropertyInfo qdev_prop_bit = { static uint64_t qdev_get_prop_mask64(Property *prop) { - assert(prop->info == &qdev_prop_bit); + assert(prop->info == &qdev_prop_bit64); return 0x1ull << prop->bitnr; } diff --git a/include/hw/qdev-properties.h b/include/hw/qdev-properties.h index 0cfff1c..77538a8 100644 --- a/include/hw/qdev-properties.h +++ b/include/hw/qdev-properties.h @@ -53,7 +53,7 @@ extern PropertyInfo qdev_prop_arraylen; } #define DEFINE_PROP_BIT64(_name, _state, _field, _bit, _defval) { \ .name = (_name), \ - .info = &(qdev_prop_bit), \ + .info = &(qdev_prop_bit64), \ .bitnr = (_bit), \ .offset = offsetof(_state, _field) \ + type_check(uint64_t, typeof_field(_state, _field)), \
64 bit props used 32 bit callbacks in two places, leading to broken feature bits on virtio (example: got 0x31000000000006d4 which is obviously bogus). Fix this. Fixes: fdba6d96 ("qdev: add 64bit properties") Signed-off-by: Cornelia Huck <cornelia.huck@de.ibm.com> --- hw/core/qdev-properties.c | 2 +- include/hw/qdev-properties.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)