[v1] Q35 and I440FX host bridge QOM cleanup

[PATCH 07/15] hw/pci-host/i440fx: Replace magic values by existing constants

Posted by Bernhard Beschow 2 years, 8 months ago

Signed-off-by: Bernhard Beschow <shentey@gmail.com>
---
 hw/pci-host/i440fx.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/hw/pci-host/i440fx.c b/hw/pci-host/i440fx.c
index 61e7b97ff4..daa4d11104 100644
--- a/hw/pci-host/i440fx.c
+++ b/hw/pci-host/i440fx.c
@@ -277,8 +277,8 @@ PCIBus *i440fx_init(const char *pci_type,
 
     /* if *disabled* show SMRAM to all CPUs */
     memory_region_init_alias(&f->smram_region, OBJECT(d), "smram-region",
-                             f->pci_address_space, 0xa0000, 0x20000);
-    memory_region_add_subregion_overlap(f->system_memory, 0xa0000,
+                             f->pci_address_space, SMRAM_C_BASE, SMRAM_C_SIZE);
+    memory_region_add_subregion_overlap(f->system_memory, SMRAM_C_BASE,
                                         &f->smram_region, 1);
     memory_region_set_enabled(&f->smram_region, true);
 
@@ -286,9 +286,9 @@ PCIBus *i440fx_init(const char *pci_type,
     memory_region_init(&f->smram, OBJECT(d), "smram", 4 * GiB);
     memory_region_set_enabled(&f->smram, true);
     memory_region_init_alias(&f->low_smram, OBJECT(d), "smram-low",
-                             f->ram_memory, 0xa0000, 0x20000);
+                             f->ram_memory, SMRAM_C_BASE, SMRAM_C_SIZE);
     memory_region_set_enabled(&f->low_smram, true);
-    memory_region_add_subregion(&f->smram, 0xa0000, &f->low_smram);
+    memory_region_add_subregion(&f->smram, SMRAM_C_BASE, &f->low_smram);
     object_property_add_const_link(qdev_get_machine(), "smram",
                                    OBJECT(&f->smram));
 
-- 
2.41.0

Re: [PATCH 07/15] hw/pci-host/i440fx: Replace magic values by existing constants

Posted by Igor Mammedov 2 years, 8 months ago

On Sun, 11 Jun 2023 12:34:04 +0200
Bernhard Beschow <shentey@gmail.com> wrote:

> Signed-off-by: Bernhard Beschow <shentey@gmail.com>

Reviewed-by: Igor Mammedov <imammedo@redhat.com>

> ---
>  hw/pci-host/i440fx.c | 8 ++++----
>  1 file changed, 4 insertions(+), 4 deletions(-)
> 
> diff --git a/hw/pci-host/i440fx.c b/hw/pci-host/i440fx.c
> index 61e7b97ff4..daa4d11104 100644
> --- a/hw/pci-host/i440fx.c
> +++ b/hw/pci-host/i440fx.c
> @@ -277,8 +277,8 @@ PCIBus *i440fx_init(const char *pci_type,
>  
>      /* if *disabled* show SMRAM to all CPUs */
>      memory_region_init_alias(&f->smram_region, OBJECT(d), "smram-region",
> -                             f->pci_address_space, 0xa0000, 0x20000);
> -    memory_region_add_subregion_overlap(f->system_memory, 0xa0000,
> +                             f->pci_address_space, SMRAM_C_BASE, SMRAM_C_SIZE);
> +    memory_region_add_subregion_overlap(f->system_memory, SMRAM_C_BASE,
>                                          &f->smram_region, 1);
>      memory_region_set_enabled(&f->smram_region, true);
>  
> @@ -286,9 +286,9 @@ PCIBus *i440fx_init(const char *pci_type,
>      memory_region_init(&f->smram, OBJECT(d), "smram", 4 * GiB);
>      memory_region_set_enabled(&f->smram, true);
>      memory_region_init_alias(&f->low_smram, OBJECT(d), "smram-low",
> -                             f->ram_memory, 0xa0000, 0x20000);
> +                             f->ram_memory, SMRAM_C_BASE, SMRAM_C_SIZE);
>      memory_region_set_enabled(&f->low_smram, true);
> -    memory_region_add_subregion(&f->smram, 0xa0000, &f->low_smram);
> +    memory_region_add_subregion(&f->smram, SMRAM_C_BASE, &f->low_smram);
>      object_property_add_const_link(qdev_get_machine(), "smram",
>                                     OBJECT(&f->smram));
>

Re: [PATCH 07/15] hw/pci-host/i440fx: Replace magic values by existing constants

Posted by Philippe Mathieu-Daudé 2 years, 8 months ago

On 11/6/23 12:34, Bernhard Beschow wrote:
> Signed-off-by: Bernhard Beschow <shentey@gmail.com>
> ---
>   hw/pci-host/i440fx.c | 8 ++++----
>   1 file changed, 4 insertions(+), 4 deletions(-)

:)

Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>