Commit ac40aa15 authored by Le Tan's avatar Le Tan Committed by Michael S. Tsirkin
Browse files

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: default avatarLe Tan <tamlokveer@gmail.com>
Reviewed-by: default avatarMichael S. Tsirkin <mst@redhat.com>
Signed-off-by: default avatarMichael S. Tsirkin <mst@redhat.com>
parent a52a7fdf

hw/core/machine.c

+7 −3
Original line number Diff line number Diff line
@@ -284,10 +284,14 @@ static void machine_initfn(Object *obj) 
                             machine_set_dump_guest_core,

                             NULL);

    object_property_add_bool(obj, "mem-merge",

                             machine_get_mem_merge, machine_set_mem_merge, NULL);

    object_property_add_bool(obj, "usb", machine_get_usb, machine_set_usb, NULL);

                             machine_get_mem_merge,

                             machine_set_mem_merge, NULL);

    object_property_add_bool(obj, "usb",

                             machine_get_usb,

                             machine_set_usb, NULL);

    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",

                             machine_get_iommu,

                             machine_set_iommu, NULL);

hw/pci-host/q35.c

+6 −5
Original line number Diff line number Diff line
@@ -405,12 +405,13 @@ static int mch_init(PCIDevice *d) 
    memory_region_add_subregion_overlap(mch->system_memory, 0xa0000,

                                        &mch->smram_region, 1);

    memory_region_set_enabled(&mch->smram_region, false);

    init_pam(DEVICE(mch), mch->ram_memory, mch->system_memory, mch->pci_address_space,

             &mch->pam_regions[0], PAM_BIOS_BASE, PAM_BIOS_SIZE);

    init_pam(DEVICE(mch), mch->ram_memory, mch->system_memory,

             mch->pci_address_space, &mch->pam_regions[0],

             PAM_BIOS_BASE, PAM_BIOS_SIZE);

    for (i = 0; i < 12; ++i) {

        init_pam(DEVICE(mch), mch->ram_memory, mch->system_memory, mch->pci_address_space,

                 &mch->pam_regions[i+1], PAM_EXPAN_BASE + i * PAM_EXPAN_SIZE,

                 PAM_EXPAN_SIZE);

        init_pam(DEVICE(mch), mch->ram_memory, mch->system_memory,

                 mch->pci_address_space, &mch->pam_regions[i+1],

                 PAM_EXPAN_BASE + i * PAM_EXPAN_SIZE, PAM_EXPAN_SIZE);

    }

    /* Intel IOMMU (VT-d) */

    if (qemu_opt_get_bool(qemu_get_machine_opts(), "iommu", false)) {