| Message ID | 1472120105-29235-2-git-send-email-chao.p.peng@linux.intel.com |
|---|---|
| State | New |
| Headers | show |
On Thu, Aug 25, 2016 at 06:14:54AM -0400, Chao Peng wrote: > Signed-off-by: Chao Peng <chao.p.peng@linux.intel.com> > --- > hw/i386/pc.c | 23 +++++++++++++++++++++++ > hw/i386/pc_q35.c | 12 +++++++----- > include/hw/i386/pc.h | 3 +++ > 3 files changed, 33 insertions(+), 5 deletions(-) > > diff --git a/hw/i386/pc.c b/hw/i386/pc.c > index 022dd1b..66e1961 100644 > --- a/hw/i386/pc.c > +++ b/hw/i386/pc.c > @@ -2005,6 +2005,27 @@ static HotplugHandler *pc_get_hotpug_handler(MachineState *machine, > pcmc->get_hotplug_handler(machine, dev) : NULL; > } > > +static void pc_machine_get_prop_bool(Object *obj, Visitor *v, const char *name, > + void *opaque, Error **errp) > +{ > + bool value = *(bool *)opaque; > + > + visit_type_bool(v, name, &value, errp); > +} > + > +static void pc_machine_set_prop_bool(Object *obj, Visitor *v, const char *name, > + void *opaque, Error **errp) > +{ > + visit_type_bool(v, name, (bool *)opaque, errp); > +} > + > +#define PC_MACHINE_DEFINE_PROP_BOOL(pcms, prop, field, defval) \ > + pcms->field = defval; \ > + object_property_add(OBJECT(pcms), prop, "bool", \ > + pc_machine_get_prop_bool, \ > + pc_machine_set_prop_bool, \ > + NULL, &pcms->field, &error_abort); This is triggers checkpatch.pl error: ERROR: Macros with multiple statements should be enclosed in a do - while loop #76: FILE: hw/i386/pc.c:2022: +#define PC_MACHINE_DEFINE_PROP_BOOL(pcms, prop, field, defval) \ + pcms->field = defval; \ + object_property_add(OBJECT(pcms), prop, "bool", \ + pc_machine_get_prop_bool, \ + pc_machine_set_prop_bool, \ + NULL, &pcms->field, &error_abort); > + > static void > pc_machine_get_hotplug_memory_region_size(Object *obj, Visitor *v, > const char *name, void *opaque, > @@ -2168,6 +2189,8 @@ static void pc_machine_initfn(Object *obj) > pcms->acpi_nvdimm_state.is_enabled = false; > object_property_add_bool(obj, PC_MACHINE_NVDIMM, pc_machine_get_nvdimm, > pc_machine_set_nvdimm, &error_abort); > + > + PC_MACHINE_DEFINE_PROP_BOOL(pcms, PC_MACHINE_SMBUS, smbus, true); I suggest using object_class_property_add_bool() and registering properties at class_init. > } > [...]
diff --git a/hw/i386/pc.c b/hw/i386/pc.c index 022dd1b..66e1961 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -2005,6 +2005,27 @@ static HotplugHandler *pc_get_hotpug_handler(MachineState *machine, pcmc->get_hotplug_handler(machine, dev) : NULL; } +static void pc_machine_get_prop_bool(Object *obj, Visitor *v, const char *name, + void *opaque, Error **errp) +{ + bool value = *(bool *)opaque; + + visit_type_bool(v, name, &value, errp); +} + +static void pc_machine_set_prop_bool(Object *obj, Visitor *v, const char *name, + void *opaque, Error **errp) +{ + visit_type_bool(v, name, (bool *)opaque, errp); +} + +#define PC_MACHINE_DEFINE_PROP_BOOL(pcms, prop, field, defval) \ + pcms->field = defval; \ + object_property_add(OBJECT(pcms), prop, "bool", \ + pc_machine_get_prop_bool, \ + pc_machine_set_prop_bool, \ + NULL, &pcms->field, &error_abort); + static void pc_machine_get_hotplug_memory_region_size(Object *obj, Visitor *v, const char *name, void *opaque, @@ -2168,6 +2189,8 @@ static void pc_machine_initfn(Object *obj) pcms->acpi_nvdimm_state.is_enabled = false; object_property_add_bool(obj, PC_MACHINE_NVDIMM, pc_machine_get_nvdimm, pc_machine_set_nvdimm, &error_abort); + + PC_MACHINE_DEFINE_PROP_BOOL(pcms, PC_MACHINE_SMBUS, smbus, true); } static void pc_machine_reset(void) diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c index c0b9961..5bb19c1 100644 --- a/hw/i386/pc_q35.c +++ b/hw/i386/pc_q35.c @@ -247,11 +247,13 @@ static void pc_q35_init(MachineState *machine) ehci_create_ich9_with_companions(host_bus, 0x1d); } - /* TODO: Populate SPD eeprom data. */ - smbus_eeprom_init(ich9_smb_init(host_bus, - PCI_DEVFN(ICH9_SMB_DEV, ICH9_SMB_FUNC), - 0xb100), - 8, NULL, 0); + if (pcms->smbus) { + /* TODO: Populate SPD eeprom data. */ + smbus_eeprom_init(ich9_smb_init(host_bus, + PCI_DEVFN(ICH9_SMB_DEV, ICH9_SMB_FUNC), + 0xb100), + 8, NULL, 0); + } pc_cmos_init(pcms, idebus[0], idebus[1], rtc_state); diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h index 74c175c..aec809c 100644 --- a/include/hw/i386/pc.h +++ b/include/hw/i386/pc.h @@ -76,6 +76,8 @@ struct PCMachineState { /* Address space used by IOAPIC device. All IOAPIC interrupts * will be translated to MSI messages in the address space. */ AddressSpace *ioapic_as; + + bool smbus; }; #define PC_MACHINE_ACPI_DEVICE_PROP "acpi-device" @@ -84,6 +86,7 @@ struct PCMachineState { #define PC_MACHINE_VMPORT "vmport" #define PC_MACHINE_SMM "smm" #define PC_MACHINE_NVDIMM "nvdimm" +#define PC_MACHINE_SMBUS "smbus" /** * PCMachineClass:
Signed-off-by: Chao Peng <chao.p.peng@linux.intel.com> --- hw/i386/pc.c | 23 +++++++++++++++++++++++ hw/i386/pc_q35.c | 12 +++++++----- include/hw/i386/pc.h | 3 +++ 3 files changed, 33 insertions(+), 5 deletions(-)