diff mbox

[PULL,v2,58/60] qdev: add 64bit properties

Message ID 1433161230-29421-59-git-send-email-mst@redhat.com
State New
Headers show

Commit Message

Michael S. Tsirkin June 1, 2015, 12:25 p.m. UTC 
From: Gerd Hoffmann <kraxel@redhat.com>

Needed for virtio features which go from 32bit to 64bit with virtio 1.0

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
---
 include/hw/qdev-properties.h | 10 ++++++++
 hw/core/qdev-properties.c    | 58 ++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 68 insertions(+)

Comments

Paolo Bonzini June 20, 2015, 9:10 p.m. UTC | #1 
On 01/06/2015 14:25, Michael S. Tsirkin wrote:
> +static uint64_t qdev_get_prop_mask64(Property *prop)
> +{
> +    assert(prop->info == &qdev_prop_bit);
> +    return 0x1 << prop->bitnr;

This needs to be 1ull.

Paolo

> +}
> +
Gonglei (Arei) June 23, 2015, 1:36 a.m. UTC | #2 
On 2015/6/21 5:10, Paolo Bonzini wrote:
> 
> 
> On 01/06/2015 14:25, Michael S. Tsirkin wrote:
>> +static uint64_t qdev_get_prop_mask64(Property *prop)
>> +{
>> +    assert(prop->info == &qdev_prop_bit);
>> +    return 0x1 << prop->bitnr;
> 
> This needs to be 1ull.
> 
Yes, and coverity spot it and some other OVERRUN problems.

Regards,
-Gonglei
Markus Armbruster June 23, 2015, 6:55 a.m. UTC | #3 
Gonglei <arei.gonglei@huawei.com> writes:

> On 2015/6/21 5:10, Paolo Bonzini wrote:
>> 
>> 
>> On 01/06/2015 14:25, Michael S. Tsirkin wrote:
>>> +static uint64_t qdev_get_prop_mask64(Property *prop)
>>> +{
>>> +    assert(prop->info == &qdev_prop_bit);
>>> +    return 0x1 << prop->bitnr;
>> 
>> This needs to be 1ull.
>> 
> Yes, and coverity spot it and some other OVERRUN problems.

Patch author(s) know?

Or are you taking care of them?
Gonglei (Arei) June 23, 2015, 7:04 a.m. UTC | #4 
On 2015/6/23 14:55, Markus Armbruster wrote:
> Gonglei <arei.gonglei@huawei.com> writes:
> 
>> On 2015/6/21 5:10, Paolo Bonzini wrote:
>>>
>>>
>>> On 01/06/2015 14:25, Michael S. Tsirkin wrote:
>>>> +static uint64_t qdev_get_prop_mask64(Property *prop)
>>>> +{
>>>> +    assert(prop->info == &qdev_prop_bit);
>>>> +    return 0x1 << prop->bitnr;
>>>
>>> This needs to be 1ull.
>>>
>> Yes, and coverity spot it and some other OVERRUN problems.
> 
> Patch author(s) know?
> 
> Or are you taking care of them?
> 
I have already posted a patch and Cc'd Gerd.

Regards,
-Gonglei
diff mbox

Patch

diff --git a/include/hw/qdev-properties.h b/include/hw/qdev-properties.h
index d67dad5..0cfff1c 100644
--- a/include/hw/qdev-properties.h
+++ b/include/hw/qdev-properties.h
@@ -6,6 +6,7 @@ 
 /*** qdev-properties.c ***/
 
 extern PropertyInfo qdev_prop_bit;
+extern PropertyInfo qdev_prop_bit64;
 extern PropertyInfo qdev_prop_bool;
 extern PropertyInfo qdev_prop_uint8;
 extern PropertyInfo qdev_prop_uint16;
@@ -50,6 +51,15 @@  extern PropertyInfo qdev_prop_arraylen;
         .qtype     = QTYPE_QBOOL,                                \
         .defval    = (bool)_defval,                              \
         }
+#define DEFINE_PROP_BIT64(_name, _state, _field, _bit, _defval) {       \
+        .name      = (_name),                                           \
+        .info      = &(qdev_prop_bit),                                  \
+        .bitnr    = (_bit),                                             \
+        .offset    = offsetof(_state, _field)                           \
+            + type_check(uint64_t, typeof_field(_state, _field)),       \
+        .qtype     = QTYPE_QBOOL,                                       \
+        .defval    = (bool)_defval,                                     \
+        }
 
 #define DEFINE_PROP_BOOL(_name, _state, _field, _defval) {       \
         .name      = (_name),                                    \
diff --git a/hw/core/qdev-properties.c b/hw/core/qdev-properties.c
index 570d5f0..a1606de 100644
--- a/hw/core/qdev-properties.c
+++ b/hw/core/qdev-properties.c
@@ -125,6 +125,64 @@  PropertyInfo qdev_prop_bit = {
     .set   = prop_set_bit,
 };
 
+/* Bit64 */
+
+static uint64_t qdev_get_prop_mask64(Property *prop)
+{
+    assert(prop->info == &qdev_prop_bit);
+    return 0x1 << prop->bitnr;
+}
+
+static void bit64_prop_set(DeviceState *dev, Property *props, bool val)
+{
+    uint64_t *p = qdev_get_prop_ptr(dev, props);
+    uint64_t mask = qdev_get_prop_mask64(props);
+    if (val) {
+        *p |= mask;
+    } else {
+        *p &= ~mask;
+    }
+}
+
+static void prop_get_bit64(Object *obj, Visitor *v, void *opaque,
+                           const char *name, Error **errp)
+{
+    DeviceState *dev = DEVICE(obj);
+    Property *prop = opaque;
+    uint64_t *p = qdev_get_prop_ptr(dev, prop);
+    bool value = (*p & qdev_get_prop_mask64(prop)) != 0;
+
+    visit_type_bool(v, &value, name, errp);
+}
+
+static void prop_set_bit64(Object *obj, Visitor *v, void *opaque,
+                           const char *name, Error **errp)
+{
+    DeviceState *dev = DEVICE(obj);
+    Property *prop = opaque;
+    Error *local_err = NULL;
+    bool value;
+
+    if (dev->realized) {
+        qdev_prop_set_after_realize(dev, name, errp);
+        return;
+    }
+
+    visit_type_bool(v, &value, name, &local_err);
+    if (local_err) {
+        error_propagate(errp, local_err);
+        return;
+    }
+    bit64_prop_set(dev, prop, value);
+}
+
+PropertyInfo qdev_prop_bit64 = {
+    .name  = "bool",
+    .description = "on/off",
+    .get   = prop_get_bit64,
+    .set   = prop_set_bit64,
+};
+
 /* --- bool --- */
 
 static void get_bool(Object *obj, Visitor *v, void *opaque,