[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [RFC PATCH v2 01/12] pc: make smbus configurable
From: |
Chao Peng |
Subject: |
[Qemu-devel] [RFC PATCH v2 01/12] pc: make smbus configurable |
Date: |
Thu, 25 Aug 2016 06:14:54 -0400 |
Signed-off-by: Chao Peng <address@hidden>
---
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);
+
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:
--
1.8.3.1
- [Qemu-devel] [RFC PATCH v2 00/12] Guest startup time optimization, Chao Peng, 2016/08/25
- [Qemu-devel] [RFC PATCH v2 01/12] pc: make smbus configurable,
Chao Peng <=
- [Qemu-devel] [RFC PATCH v2 03/12] pc: make pic configurable, Chao Peng, 2016/08/25
- [Qemu-devel] [RFC PATCH v2 02/12] pc: make sata configurable, Chao Peng, 2016/08/25
- [Qemu-devel] [RFC PATCH v2 05/12] acpi: build static _PRT, Chao Peng, 2016/08/25
- [Qemu-devel] [RFC PATCH v2 04/12] pc: make pit configurable, Chao Peng, 2016/08/25
- [Qemu-devel] [RFC PATCH v2 06/12] acpi: expose data structurs and functions of BIOS linker loader, Chao Peng, 2016/08/25
- [Qemu-devel] [RFC PATCH v2 07/12] acpi: expose acpi_checksum(), Chao Peng, 2016/08/25
- [Qemu-devel] [RFC PATCH v2 10/12] q35: initialize MMCFG base when there is no firmware, Chao Peng, 2016/08/25
- [Qemu-devel] [RFC PATCH v2 08/12] acpi: patch guest ACPI when there is no firmware, Chao Peng, 2016/08/25
- [Qemu-devel] [RFC PATCH v2 09/12] ich9: enable pm registers when there is no firmware, Chao Peng, 2016/08/25