[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 1/4] qdev: fix 64 bit properties
From: |
Michael S. Tsirkin |
Subject: |
[Qemu-devel] [PULL 1/4] qdev: fix 64 bit properties |
Date: |
Mon, 13 Jul 2015 15:04:34 +0300 |
From: Cornelia Huck <address@hidden>
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 <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>
Tested-by: Christian Borntraeger <address@hidden>
Acked-by: Paolo Bonzini <address@hidden>
---
include/hw/qdev-properties.h | 2 +-
hw/core/qdev-properties.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
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)), \
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;
}
--
MST
- [Qemu-devel] [PULL 0/4] pc,virtio: fixes for 2.4, Michael S. Tsirkin, 2015/07/13
- [Qemu-devel] [PULL 0/4] pc,virtio: fixes for 2.4, Michael S. Tsirkin, 2015/07/13
- [Qemu-devel] [PULL 1/4] qdev: fix 64 bit properties, Michael S. Tsirkin, 2015/07/13
- [Qemu-devel] [PULL 3/4] Revert "virtio-net: enable virtio 1.0", Michael S. Tsirkin, 2015/07/13
- [Qemu-devel] [PULL 2/4] virtio-pci: don't crash on illegal length, Michael S. Tsirkin, 2015/07/13
- [Qemu-devel] [PULL 4/4] pc: fix reuse of pc-i440fx-2.4 in pc-i440fx-2.3, Michael S. Tsirkin, 2015/07/13
- Re: [Qemu-devel] [PULL 0/4] pc,virtio: fixes for 2.4, Peter Maydell, 2015/07/13