diff options
| author | Efimov Vasily <real@ispras.ru> | 2016-06-22 15:24:50 +0300 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2016-06-29 14:03:46 +0200 |
| commit | 8d1c7158a059e9a55181517aa61faf422831b8f8 (patch) | |
| tree | 3a8dfecce611fdf72b47ed5df47a39c4782213f9 /hw | |
| parent | 401f2f3ef10037bdeda4549ed4cd5b06af3d1c6a (diff) | |
| download | qemu-8d1c7158a059e9a55181517aa61faf422831b8f8.tar.gz qemu-8d1c7158a059e9a55181517aa61faf422831b8f8.tar.bz2 qemu-8d1c7158a059e9a55181517aa61faf422831b8f8.zip | |
pc_q35: configure Q35 instance using properties
Currently, Q35 instance is configured using direct access to structure fields.
The patch uses property interface to set the fields.
Signed-off-by: Efimov Vasily <real@ispras.ru>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'hw')
| -rw-r--r-- | hw/i386/pc_q35.c | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c index 97a8835eea..65ae78a270 100644 --- a/hw/i386/pc_q35.c +++ b/hw/i386/pc_q35.c @@ -159,12 +159,18 @@ static void pc_q35_init(MachineState *machine) q35_host = Q35_HOST_DEVICE(qdev_create(NULL, TYPE_Q35_HOST_DEVICE)); object_property_add_child(qdev_get_machine(), "q35", OBJECT(q35_host), NULL); - q35_host->mch.ram_memory = ram_memory; - q35_host->mch.pci_address_space = pci_memory; - q35_host->mch.system_memory = get_system_memory(); - q35_host->mch.address_space_io = system_io; - q35_host->mch.below_4g_mem_size = pcms->below_4g_mem_size; - q35_host->mch.above_4g_mem_size = pcms->above_4g_mem_size; + object_property_set_link(OBJECT(q35_host), OBJECT(ram_memory), + MCH_HOST_PROP_RAM_MEM, NULL); + object_property_set_link(OBJECT(q35_host), OBJECT(pci_memory), + MCH_HOST_PROP_PCI_MEM, NULL); + object_property_set_link(OBJECT(q35_host), OBJECT(get_system_memory()), + MCH_HOST_PROP_SYSTEM_MEM, NULL); + object_property_set_link(OBJECT(q35_host), OBJECT(system_io), + MCH_HOST_PROP_IO_MEM, NULL); + object_property_set_int(OBJECT(q35_host), pcms->below_4g_mem_size, + PCI_HOST_BELOW_4G_MEM_SIZE, NULL); + object_property_set_int(OBJECT(q35_host), pcms->above_4g_mem_size, + PCI_HOST_ABOVE_4G_MEM_SIZE, NULL); /* pci */ qdev_init_nofail(DEVICE(q35_host)); phb = PCI_HOST_BRIDGE(q35_host); |