| Message ID | 20191128164810.54279-3-felipe@nutanix.com |
|---|---|
| State | New |
| Headers | show |
| Series | Improve default object property_add uint helpers | expand |
On Thu, Nov 28, 2019 at 8:48 PM Felipe Franciosi <felipe@nutanix.com> wrote: > > When QOM APIs were added to ich9 in 6f1426ab, the getter for sci_int was > written using uint32_t. However, the object property is uint8_t. This > fixes the getter for correctness. > > Signed-off-by: Felipe Franciosi <felipe@nutanix.com> Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com> > --- > hw/isa/lpc_ich9.c | 6 ++---- > 1 file changed, 2 insertions(+), 4 deletions(-) > > diff --git a/hw/isa/lpc_ich9.c b/hw/isa/lpc_ich9.c > index f5526f9c3b..3a9c4f0503 100644 > --- a/hw/isa/lpc_ich9.c > +++ b/hw/isa/lpc_ich9.c > @@ -631,9 +631,7 @@ static void ich9_lpc_get_sci_int(Object *obj, Visitor *v, const char *name, > void *opaque, Error **errp) > { > ICH9LPCState *lpc = ICH9_LPC_DEVICE(obj); > - uint32_t value = lpc->sci_gsi; > - > - visit_type_uint32(v, name, &value, errp); > + visit_type_uint8(v, name, &lpc->sci_gsi, errp); > } > > static void ich9_lpc_add_properties(ICH9LPCState *lpc) > @@ -641,7 +639,7 @@ static void ich9_lpc_add_properties(ICH9LPCState *lpc) > static const uint8_t acpi_enable_cmd = ICH9_APM_ACPI_ENABLE; > static const uint8_t acpi_disable_cmd = ICH9_APM_ACPI_DISABLE; > > - object_property_add(OBJECT(lpc), ACPI_PM_PROP_SCI_INT, "uint32", > + object_property_add(OBJECT(lpc), ACPI_PM_PROP_SCI_INT, "uint8", > ich9_lpc_get_sci_int, > NULL, NULL, NULL, NULL); > object_property_add_uint8_ptr(OBJECT(lpc), ACPI_PM_PROP_ACPI_ENABLE_CMD, > -- > 2.20.1 >
diff --git a/hw/isa/lpc_ich9.c b/hw/isa/lpc_ich9.c index f5526f9c3b..3a9c4f0503 100644 --- a/hw/isa/lpc_ich9.c +++ b/hw/isa/lpc_ich9.c @@ -631,9 +631,7 @@ static void ich9_lpc_get_sci_int(Object *obj, Visitor *v, const char *name, void *opaque, Error **errp) { ICH9LPCState *lpc = ICH9_LPC_DEVICE(obj); - uint32_t value = lpc->sci_gsi; - - visit_type_uint32(v, name, &value, errp); + visit_type_uint8(v, name, &lpc->sci_gsi, errp); } static void ich9_lpc_add_properties(ICH9LPCState *lpc) @@ -641,7 +639,7 @@ static void ich9_lpc_add_properties(ICH9LPCState *lpc) static const uint8_t acpi_enable_cmd = ICH9_APM_ACPI_ENABLE; static const uint8_t acpi_disable_cmd = ICH9_APM_ACPI_DISABLE; - object_property_add(OBJECT(lpc), ACPI_PM_PROP_SCI_INT, "uint32", + object_property_add(OBJECT(lpc), ACPI_PM_PROP_SCI_INT, "uint8", ich9_lpc_get_sci_int, NULL, NULL, NULL, NULL); object_property_add_uint8_ptr(OBJECT(lpc), ACPI_PM_PROP_ACPI_ENABLE_CMD,
When QOM APIs were added to ich9 in 6f1426ab, the getter for sci_int was written using uint32_t. However, the object property is uint8_t. This fixes the getter for correctness. Signed-off-by: Felipe Franciosi <felipe@nutanix.com> --- hw/isa/lpc_ich9.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)