[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 19/61] ich9: Simplify ich9_lpc_initfn
From: |
Paolo Bonzini |
Subject: |
[PULL 19/61] ich9: Simplify ich9_lpc_initfn |
Date: |
Mon, 16 Mar 2020 22:26:46 +0100 |
From: Felipe Franciosi <address@hidden>
Currently, ich9_lpc_initfn simply serves as a caller to
ich9_lpc_add_properties. This simplifies the code a bit by eliminating
ich9_lpc_add_properties altogether and executing its logic in the parent
object initialiser function.
Signed-off-by: Felipe Franciosi <address@hidden>
Reviewed-by: Marc-André Lureau <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>
---
hw/isa/lpc_ich9.c | 15 +++++----------
1 file changed, 5 insertions(+), 10 deletions(-)
diff --git a/hw/isa/lpc_ich9.c b/hw/isa/lpc_ich9.c
index 2471463..3d0f4db 100644
--- a/hw/isa/lpc_ich9.c
+++ b/hw/isa/lpc_ich9.c
@@ -632,12 +632,14 @@ static void ich9_lpc_get_sci_int(Object *obj, Visitor *v,
const char *name,
visit_type_uint8(v, name, &lpc->sci_gsi, errp);
}
-static void ich9_lpc_add_properties(ICH9LPCState *lpc)
+static void ich9_lpc_initfn(Object *obj)
{
+ ICH9LPCState *lpc = ICH9_LPC_DEVICE(obj);
+
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, "uint8",
+ object_property_add(obj, 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,
@@ -645,14 +647,7 @@ static void ich9_lpc_add_properties(ICH9LPCState *lpc)
object_property_add_uint8_ptr(OBJECT(lpc), ACPI_PM_PROP_ACPI_DISABLE_CMD,
&acpi_disable_cmd, OBJ_PROP_FLAG_READ, NULL);
- ich9_pm_add_properties(OBJECT(lpc), &lpc->pm, NULL);
-}
-
-static void ich9_lpc_initfn(Object *obj)
-{
- ICH9LPCState *lpc = ICH9_LPC_DEVICE(obj);
-
- ich9_lpc_add_properties(lpc);
+ ich9_pm_add_properties(obj, &lpc->pm, NULL);
}
static void ich9_lpc_realize(PCIDevice *d, Error **errp)
--
1.8.3.1
- [PULL 06/61] util: add util function buffer_zero_avx512(), (continued)
- [PULL 06/61] util: add util function buffer_zero_avx512(), Paolo Bonzini, 2020/03/16
- [PULL 07/61] WHPX: TSC get and set should be dependent on VM state, Paolo Bonzini, 2020/03/16
- [PULL 10/61] hw/i386/intel_iommu: Fix out-of-bounds access on guest IRT, Paolo Bonzini, 2020/03/16
- [PULL 09/61] MAINTAINERS: Add entry for Guest X86 HAXM CPUs, Paolo Bonzini, 2020/03/16
- [PULL 11/61] oslib-posix: initialize mutex and condition variable, Paolo Bonzini, 2020/03/16
- [PULL 14/61] configure: Fix building with SASL on Windows, Paolo Bonzini, 2020/03/16
- [PULL 13/61] modules: load modules from versioned /var/run dir, Paolo Bonzini, 2020/03/16
- [PULL 16/61] memory: Fix start offset for bitmap log_clear hook, Paolo Bonzini, 2020/03/16
- [PULL 12/61] build-sys: do not make qemu-ga link with pixman, Paolo Bonzini, 2020/03/16
- [PULL 15/61] tests/docker: Install SASL library to extend code coverage on amd64, Paolo Bonzini, 2020/03/16
- [PULL 19/61] ich9: Simplify ich9_lpc_initfn,
Paolo Bonzini <=
- [PULL 18/61] ich9: fix getter type for sci_int property, Paolo Bonzini, 2020/03/16
- [PULL 17/61] qom/object: enable setter for uint types, Paolo Bonzini, 2020/03/16
- [PULL 21/61] i386: Fix GCC warning with snprintf when HAX is enabled, Paolo Bonzini, 2020/03/16
- [PULL 20/61] qom/object: Use common get/set uint helpers, Paolo Bonzini, 2020/03/16
- [PULL 22/61] WHPX: Use proper synchronization primitives while processing, Paolo Bonzini, 2020/03/16
- [PULL 23/61] Makefile: Align 'help' target output, Paolo Bonzini, 2020/03/16
- [PULL 24/61] Makefile: Let the 'help' target list the tools targets, Paolo Bonzini, 2020/03/16
- [PULL 25/61] hw/audio/fmopl: Move ENV_CURVE to .heap to save 32KiB of .bss, Paolo Bonzini, 2020/03/16
- [PULL 26/61] hw/audio/intel-hda: Use memory region alias to reduce .rodata by 4.34MB, Paolo Bonzini, 2020/03/16
- [PULL 27/61] hw/usb/quirks: Use smaller types to reduce .rodata by 10KiB, Paolo Bonzini, 2020/03/16