[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 18/41] apic-common: make "id" property a uint32
From: |
Markus Armbruster |
Subject: |
[Qemu-devel] [PULL 18/41] apic-common: make "id" property a uint32 |
Date: |
Fri, 9 Jun 2017 15:47:02 +0200 |
From: Marc-André Lureau <address@hidden>
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.
Change getter and setter to use visit_type_uint32(). Then everything's
uint32_t, except for @id.
Suggested-by: Markus Armbruster <address@hidden>
Signed-off-by: Marc-André Lureau <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: Markus Armbruster <address@hidden>
Signed-off-by: Markus Armbruster <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 1ef56f8..e1ac330 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.7.5
- [Qemu-devel] [PULL 40/41] console: use get_uint() for "head" property, (continued)
- [Qemu-devel] [PULL 40/41] console: use get_uint() for "head" property, Markus Armbruster, 2017/06/09
- [Qemu-devel] [PULL 26/41] platform-bus: use get_uint() for "addr" property, Markus Armbruster, 2017/06/09
- [Qemu-devel] [PULL 30/41] pc: use get_uint() for "iobase" property, Markus Armbruster, 2017/06/09
- [Qemu-devel] [PULL 36/41] pvpanic: use get_uint() for "ioport" property, Markus Armbruster, 2017/06/09
- [Qemu-devel] [PULL 23/41] pcihp: use get_uint() for "bsel" property, Markus Armbruster, 2017/06/09
- [Qemu-devel] [PULL 14/41] object: use more specific property type names, Markus Armbruster, 2017/06/09
- [Qemu-devel] [PULL 32/41] pc: use get_uint() for "hpet-intcap" property, Markus Armbruster, 2017/06/09
- [Qemu-devel] [PULL 38/41] numa: use get_uint() for "size" property, Markus Armbruster, 2017/06/09
- [Qemu-devel] [PULL 41/41] tests/qdict: check more get_try_int() cases, Markus Armbruster, 2017/06/09
- [Qemu-devel] [PULL 27/41] acpi: use get_uint() for "acpi-pcihp-io*" properties, Markus Armbruster, 2017/06/09
- [Qemu-devel] [PULL 18/41] apic-common: make "id" property a uint32,
Markus Armbruster <=
- [Qemu-devel] [PULL 13/41] q35: fix get_mmcfg_size to use uint64 visitor, Markus Armbruster, 2017/06/09
- [Qemu-devel] [PULL 25/41] bcm2835_fb: use {get, set}_uint() for "vcram-size" and "vcram-base", Markus Armbruster, 2017/06/09
- [Qemu-devel] [PULL 31/41] pc: use get_uint() for "apic-id" property, Markus Armbruster, 2017/06/09
- [Qemu-devel] [PULL 17/41] qdev: avoid type casts between signed and unsigned, Markus Armbruster, 2017/06/09
- [Qemu-devel] [PULL 07/41] qapi: Remove visit_start_alternate() parameter promote_int, Markus Armbruster, 2017/06/09
- [Qemu-devel] [PULL 08/41] tests: remove /{qnum, qlist, dict}/destroy test, Markus Armbruster, 2017/06/09
- [Qemu-devel] [PULL 37/41] pnv-core: use get_uint() for "core-pir" property, Markus Armbruster, 2017/06/09
- [Qemu-devel] [PULL 34/41] arm: use get_uint() for "mp-affinity" property, Markus Armbruster, 2017/06/09
- [Qemu-devel] [PULL 28/41] acpi: use get_uint() for various acpi properties, Markus Armbruster, 2017/06/09
- [Qemu-devel] [PULL 22/41] pc-dimm: make "size" property uint64, Markus Armbruster, 2017/06/09