Commit dda53ee9 authored by Zihan Yang's avatar Zihan Yang Committed by Michael S. Tsirkin
Browse files

hw/pci-host/q35: Replace hardcoded value with macro 



During smram region initialization some addresses are hardcoded,
replace them with macro to be more clear to readers.

Previous patch forgets about one value and exceeds the line
limit of 90 characters. The v2 breaks a few long lines

Signed-off-by: default avatarZihan Yang <whois.zihan.yang@gmail.com>
Reviewed-by: default avatarMichael S. Tsirkin <mst@redhat.com>
Signed-off-by: default avatarMichael S. Tsirkin <mst@redhat.com>
parent 4f50c167

hw/pci-host/q35.c

+11 −6
Original line number Diff line number Diff line
@@ -535,13 +535,15 @@ static void mch_realize(PCIDevice *d, Error **errp) 


    /* if *disabled* show SMRAM to all CPUs */

    memory_region_init_alias(&mch->smram_region, OBJECT(mch), "smram-region",

                             mch->pci_address_space, 0xa0000, 0x20000);

    memory_region_add_subregion_overlap(mch->system_memory, 0xa0000,

                             mch->pci_address_space, MCH_HOST_BRIDGE_SMRAM_C_BASE,

                             MCH_HOST_BRIDGE_SMRAM_C_SIZE);

    memory_region_add_subregion_overlap(mch->system_memory, MCH_HOST_BRIDGE_SMRAM_C_BASE,

                                        &mch->smram_region, 1);

    memory_region_set_enabled(&mch->smram_region, true);



    memory_region_init_alias(&mch->open_high_smram, OBJECT(mch), "smram-open-high",

                             mch->ram_memory, 0xa0000, 0x20000);

                             mch->ram_memory, MCH_HOST_BRIDGE_SMRAM_C_BASE,

                             MCH_HOST_BRIDGE_SMRAM_C_SIZE);

    memory_region_add_subregion_overlap(mch->system_memory, 0xfeda0000,

                                        &mch->open_high_smram, 1);

    memory_region_set_enabled(&mch->open_high_smram, false);
@@ -550,11 +552,14 @@ static void mch_realize(PCIDevice *d, Error **errp) 
    memory_region_init(&mch->smram, OBJECT(mch), "smram", 1ull << 32);

    memory_region_set_enabled(&mch->smram, true);

    memory_region_init_alias(&mch->low_smram, OBJECT(mch), "smram-low",

                             mch->ram_memory, 0xa0000, 0x20000);

                             mch->ram_memory, MCH_HOST_BRIDGE_SMRAM_C_BASE,

                             MCH_HOST_BRIDGE_SMRAM_C_SIZE);

    memory_region_set_enabled(&mch->low_smram, true);

    memory_region_add_subregion(&mch->smram, 0xa0000, &mch->low_smram);

    memory_region_add_subregion(&mch->smram, MCH_HOST_BRIDGE_SMRAM_C_BASE,

                                &mch->low_smram);

    memory_region_init_alias(&mch->high_smram, OBJECT(mch), "smram-high",

                             mch->ram_memory, 0xa0000, 0x20000);

                             mch->ram_memory, MCH_HOST_BRIDGE_SMRAM_C_BASE,

                             MCH_HOST_BRIDGE_SMRAM_C_SIZE);

    memory_region_set_enabled(&mch->high_smram, true);

    memory_region_add_subregion(&mch->smram, 0xfeda0000, &mch->high_smram);