[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 20/45] apic-common: make "id" property a uint32
From: |
Marc-André Lureau |
Subject: |
[Qemu-devel] [PATCH v2 20/45] apic-common: make "id" property a uint32 |
Date: |
Wed, 31 May 2017 17:56:44 +0400 |
Change suggested by Markus Armbruster:
This one's a bit of a mess.
The getter and setter of TYPE_APIC_COMMON property "id" are
apic_common_get_id() and apic_common_set_id().
apic_common_get_id() reads either APICCommonState member uint32_t
initial_apic_id or uint8_t id into an int64_t local variable. It then
passes this variable to visit_type_int().
apic_common_set_id() uses visit_type_int() to read the value into a
local variable, which it then assigns both to initial_apic_id and id.
While the state backing the property is two unsigned members, 8 and 32
bits wide, the actual visitor is 64 bits signed.
cpu->apic_id is uint32_t.
qdev_prop_set_uint32() isn't really wrong, because any uint32_t value is
also a valid int64_t value.
qdev_prop_set_int32() implicitly converts cpu->apic_id from uint32_t
to int32_t. Perhaps that's even okay, but I don't care, I want this
mess cleaned up
Change getter and setter to use visit_type_uint32(). Then everything's
uint32_t, except for @id.
Signed-off-by: Marc-André Lureau <address@hidden>
---
hw/intc/apic_common.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/hw/intc/apic_common.c b/hw/intc/apic_common.c
index 1ef56f8d10..e1ac33042f 100644
--- a/hw/intc/apic_common.c
+++ b/hw/intc/apic_common.c
@@ -450,10 +450,10 @@ static void apic_common_get_id(Object *obj, Visitor *v,
const char *name,
void *opaque, Error **errp)
{
APICCommonState *s = APIC_COMMON(obj);
- int64_t value;
+ uint32_t value;
value = s->apicbase & MSR_IA32_APICBASE_EXTD ? s->initial_apic_id : s->id;
- visit_type_int(v, name, &value, errp);
+ visit_type_uint32(v, name, &value, errp);
}
static void apic_common_set_id(Object *obj, Visitor *v, const char *name,
@@ -462,14 +462,14 @@ static void apic_common_set_id(Object *obj, Visitor *v,
const char *name,
APICCommonState *s = APIC_COMMON(obj);
DeviceState *dev = DEVICE(obj);
Error *local_err = NULL;
- int64_t value;
+ uint32_t value;
if (dev->realized) {
qdev_prop_set_after_realize(dev, name, errp);
return;
}
- visit_type_int(v, name, &value, &local_err);
+ visit_type_uint32(v, name, &value, &local_err);
if (local_err) {
error_propagate(errp, local_err);
return;
@@ -484,7 +484,7 @@ static void apic_common_initfn(Object *obj)
APICCommonState *s = APIC_COMMON(obj);
s->id = s->initial_apic_id = -1;
- object_property_add(obj, "id", "int",
+ object_property_add(obj, "id", "uint32",
apic_common_get_id,
apic_common_set_id, NULL, NULL, NULL);
}
--
2.13.0.91.g00982b8dd
- [Qemu-devel] [PATCH v2 09/45] qapi: merge QInt and QFloat in QNum, (continued)
- [Qemu-devel] [PATCH v2 09/45] qapi: merge QInt and QFloat in QNum, Marc-André Lureau, 2017/05/31
- [Qemu-devel] [PATCH v2 11/45] tests: remove /qnum/destroy test, Marc-André Lureau, 2017/05/31
- [Qemu-devel] [PATCH v2 12/45] qnum: add uint type, Marc-André Lureau, 2017/05/31
- [Qemu-devel] [PATCH v2 13/45] json: learn to parse uint64 numbers, Marc-André Lureau, 2017/05/31
- [Qemu-devel] [PATCH v2 14/45] qapi: update the qobject visitor to use QNUM_U64, Marc-André Lureau, 2017/05/31
- [Qemu-devel] [PATCH v2 15/45] object: add uint property setter/getter, Marc-André Lureau, 2017/05/31
- [Qemu-devel] [PATCH v2 16/45] q35: fix get_mmcfg_size to use uint64 visitor, Marc-André Lureau, 2017/05/31
- [Qemu-devel] [PATCH v2 17/45] object: use more specific property type names, Marc-André Lureau, 2017/05/31
- [Qemu-devel] [PATCH v2 18/45] qdev: make default property int, Marc-André Lureau, 2017/05/31
- [Qemu-devel] [PATCH v2 19/45] qdev: add unsigned properties, Marc-André Lureau, 2017/05/31
- [Qemu-devel] [PATCH v2 20/45] apic-common: make "id" property a uint32,
Marc-André Lureau <=
- [Qemu-devel] [PATCH v2 21/45] qdev: use appropriate getter/setters type, Marc-André Lureau, 2017/05/31
- [Qemu-devel] [PATCH v2 22/45] isa: use get_uint() for "io-base", Marc-André Lureau, 2017/05/31
- [Qemu-devel] [PATCH v2 23/45] pc-dimm: use get_uint() for dimm properties, Marc-André Lureau, 2017/05/31
- [Qemu-devel] [PATCH v2 24/45] pc-dimm: make "size" property uint64, Marc-André Lureau, 2017/05/31
- [Qemu-devel] [PATCH v2 25/45] pcihp: use get_uint() for "bsel" property, Marc-André Lureau, 2017/05/31
- [Qemu-devel] [PATCH v2 27/45] bcm2835_fb: use {get, set}_uint() for "vcram-size" and "vcram-base", Marc-André Lureau, 2017/05/31
- [Qemu-devel] [PATCH v2 26/45] aspeed: use {set, get}_uint() for "ram-size" property, Marc-André Lureau, 2017/05/31
- [Qemu-devel] [PATCH v2 28/45] platform-bus: use get_uint() for "addr" property, Marc-André Lureau, 2017/05/31
- [Qemu-devel] [PATCH v2 29/45] acpi: use get_uint() for "acpi-pcihp-io*" properties, Marc-André Lureau, 2017/05/31
- [Qemu-devel] [PATCH v2 30/45] acpi: use get_uint() for various acpi properties, Marc-André Lureau, 2017/05/31