提交 ac40aa15 编写于 作者: L Le Tan 提交者: Michael S. Tsirkin

intel-iommu: fix coding style issues around in q35.c and machine.c

Fix coding style issues around in hw/pci-host/q35.c and hw/core/machine.c.
Signed-off-by: NLe Tan <tamlokveer@gmail.com>
Reviewed-by: NMichael S. Tsirkin <mst@redhat.com>
Signed-off-by: NMichael S. Tsirkin <mst@redhat.com>
上级 a52a7fdf
...@@ -284,10 +284,14 @@ static void machine_initfn(Object *obj) ...@@ -284,10 +284,14 @@ static void machine_initfn(Object *obj)
machine_set_dump_guest_core, machine_set_dump_guest_core,
NULL); NULL);
object_property_add_bool(obj, "mem-merge", object_property_add_bool(obj, "mem-merge",
machine_get_mem_merge, machine_set_mem_merge, NULL); machine_get_mem_merge,
object_property_add_bool(obj, "usb", machine_get_usb, machine_set_usb, NULL); machine_set_mem_merge, NULL);
object_property_add_bool(obj, "usb",
machine_get_usb,
machine_set_usb, NULL);
object_property_add_str(obj, "firmware", object_property_add_str(obj, "firmware",
machine_get_firmware, machine_set_firmware, NULL); machine_get_firmware,
machine_set_firmware, NULL);
object_property_add_bool(obj, "iommu", object_property_add_bool(obj, "iommu",
machine_get_iommu, machine_get_iommu,
machine_set_iommu, NULL); machine_set_iommu, NULL);
......
...@@ -405,12 +405,13 @@ static int mch_init(PCIDevice *d) ...@@ -405,12 +405,13 @@ static int mch_init(PCIDevice *d)
memory_region_add_subregion_overlap(mch->system_memory, 0xa0000, memory_region_add_subregion_overlap(mch->system_memory, 0xa0000,
&mch->smram_region, 1); &mch->smram_region, 1);
memory_region_set_enabled(&mch->smram_region, false); memory_region_set_enabled(&mch->smram_region, false);
init_pam(DEVICE(mch), mch->ram_memory, mch->system_memory, mch->pci_address_space, init_pam(DEVICE(mch), mch->ram_memory, mch->system_memory,
&mch->pam_regions[0], PAM_BIOS_BASE, PAM_BIOS_SIZE); mch->pci_address_space, &mch->pam_regions[0],
PAM_BIOS_BASE, PAM_BIOS_SIZE);
for (i = 0; i < 12; ++i) { for (i = 0; i < 12; ++i) {
init_pam(DEVICE(mch), mch->ram_memory, mch->system_memory, mch->pci_address_space, init_pam(DEVICE(mch), mch->ram_memory, mch->system_memory,
&mch->pam_regions[i+1], PAM_EXPAN_BASE + i * PAM_EXPAN_SIZE, mch->pci_address_space, &mch->pam_regions[i+1],
PAM_EXPAN_SIZE); PAM_EXPAN_BASE + i * PAM_EXPAN_SIZE, PAM_EXPAN_SIZE);
} }
/* Intel IOMMU (VT-d) */ /* Intel IOMMU (VT-d) */
if (qemu_opt_get_bool(qemu_get_machine_opts(), "iommu", false)) { if (qemu_opt_get_bool(qemu_get_machine_opts(), "iommu", false)) {
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册