summary refs log tree commit diff stats
path: root/hw/core/qdev-properties.c
diff options
context:
space:
mode:
authorCornelia Huck <cornelia.huck@de.ibm.com>2015-07-09 13:01:14 +0200
committerMichael S. Tsirkin <mst@redhat.com>2015-07-13 14:42:24 +0300
commit8aedc369c6ae4fb4c4c6920f703b000015df3d8d (patch)
tree72d43d72a74b42161152ab1b496256b459adae1f /hw/core/qdev-properties.c
parentc4fc82bf1ad088a84ccedf779f6aa928e4fadb5f (diff)
downloadfocaccia-qemu-8aedc369c6ae4fb4c4c6920f703b000015df3d8d.tar.gz
focaccia-qemu-8aedc369c6ae4fb4c4c6920f703b000015df3d8d.zip
qdev: fix 64 bit properties
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>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Tested-by: Christian Borntraeger <borntraeger@de.ibm.com>
Acked-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'hw/core/qdev-properties.c')
-rw-r--r--hw/core/qdev-properties.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/hw/core/qdev-properties.c b/hw/core/qdev-properties.c
index e9e686f260..04fd80a4de 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;
 }