| Message ID | 20230105173826.56748-1-philmd@linaro.org |
|---|---|
| State | Superseded |
| Headers | show |
| Series | [v2] hw/i386/pc: Remove unused 'owner' argument from pc_pci_as_mapping_init | expand |
Am 5. Januar 2023 17:38:26 UTC schrieb "Philippe Mathieu-Daudé" <philmd@linaro.org>: >This argument was added 9 years ago in commit 83d08f2673 >("pc: map PCI address space as catchall region for not mapped >addresses") and has never been used since, so remove it. > >Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org> Reviewed-by: Bernhard Beschow <shentey@gmail.com> >--- > hw/i386/pc.c | 2 +- > hw/pci-host/i440fx.c | 3 +-- > hw/pci-host/q35.c | 3 +-- > include/hw/i386/pc.h | 2 +- > 4 files changed, 4 insertions(+), 6 deletions(-) > >diff --git a/hw/i386/pc.c b/hw/i386/pc.c >index d489ecc0d1..6e592bd969 100644 >--- a/hw/i386/pc.c >+++ b/hw/i386/pc.c >@@ -782,7 +782,7 @@ void pc_guest_info_init(PCMachineState *pcms) > } > > /* setup pci memory address space mapping into system address space */ >-void pc_pci_as_mapping_init(Object *owner, MemoryRegion *system_memory, >+void pc_pci_as_mapping_init(MemoryRegion *system_memory, > MemoryRegion *pci_address_space) > { > /* Set to lower priority than RAM */ >diff --git a/hw/pci-host/i440fx.c b/hw/pci-host/i440fx.c >index d5426ef4a5..262f82c303 100644 >--- a/hw/pci-host/i440fx.c >+++ b/hw/pci-host/i440fx.c >@@ -272,8 +272,7 @@ PCIBus *i440fx_init(const char *pci_type, > IO_APIC_DEFAULT_ADDRESS - 1); > > /* setup pci memory mapping */ >- pc_pci_as_mapping_init(OBJECT(f), f->system_memory, >- f->pci_address_space); >+ pc_pci_as_mapping_init(f->system_memory, f->pci_address_space); > > /* if *disabled* show SMRAM to all CPUs */ > memory_region_init_alias(&f->smram_region, OBJECT(d), "smram-region", >diff --git a/hw/pci-host/q35.c b/hw/pci-host/q35.c >index 20da121374..26390863d6 100644 >--- a/hw/pci-host/q35.c >+++ b/hw/pci-host/q35.c >@@ -574,8 +574,7 @@ static void mch_realize(PCIDevice *d, Error **errp) > } > > /* setup pci memory mapping */ >- pc_pci_as_mapping_init(OBJECT(mch), mch->system_memory, >- mch->pci_address_space); >+ pc_pci_as_mapping_init(mch->system_memory, mch->pci_address_space); > > /* if *disabled* show SMRAM to all CPUs */ > memory_region_init_alias(&mch->smram_region, OBJECT(mch), "smram-region", >diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h >index 991f905f5d..88a120bc23 100644 >--- a/include/hw/i386/pc.h >+++ b/include/hw/i386/pc.h >@@ -156,7 +156,7 @@ void pc_guest_info_init(PCMachineState *pcms); > #define PCI_HOST_ABOVE_4G_MEM_SIZE "above-4g-mem-size" > > >-void pc_pci_as_mapping_init(Object *owner, MemoryRegion *system_memory, >+void pc_pci_as_mapping_init(MemoryRegion *system_memory, > MemoryRegion *pci_address_space); > > void xen_load_linux(PCMachineState *pcms);
Le 05/01/2023 à 18:38, Philippe Mathieu-Daudé a écrit : > This argument was added 9 years ago in commit 83d08f2673 > ("pc: map PCI address space as catchall region for not mapped > addresses") and has never been used since, so remove it. > > Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org> > --- > hw/i386/pc.c | 2 +- > hw/pci-host/i440fx.c | 3 +-- > hw/pci-host/q35.c | 3 +-- > include/hw/i386/pc.h | 2 +- > 4 files changed, 4 insertions(+), 6 deletions(-) > > diff --git a/hw/i386/pc.c b/hw/i386/pc.c > index d489ecc0d1..6e592bd969 100644 > --- a/hw/i386/pc.c > +++ b/hw/i386/pc.c > @@ -782,7 +782,7 @@ void pc_guest_info_init(PCMachineState *pcms) > } > > /* setup pci memory address space mapping into system address space */ > -void pc_pci_as_mapping_init(Object *owner, MemoryRegion *system_memory, > +void pc_pci_as_mapping_init(MemoryRegion *system_memory, > MemoryRegion *pci_address_space) > { > /* Set to lower priority than RAM */ > diff --git a/hw/pci-host/i440fx.c b/hw/pci-host/i440fx.c > index d5426ef4a5..262f82c303 100644 > --- a/hw/pci-host/i440fx.c > +++ b/hw/pci-host/i440fx.c > @@ -272,8 +272,7 @@ PCIBus *i440fx_init(const char *pci_type, > IO_APIC_DEFAULT_ADDRESS - 1); > > /* setup pci memory mapping */ > - pc_pci_as_mapping_init(OBJECT(f), f->system_memory, > - f->pci_address_space); > + pc_pci_as_mapping_init(f->system_memory, f->pci_address_space); > > /* if *disabled* show SMRAM to all CPUs */ > memory_region_init_alias(&f->smram_region, OBJECT(d), "smram-region", > diff --git a/hw/pci-host/q35.c b/hw/pci-host/q35.c > index 20da121374..26390863d6 100644 > --- a/hw/pci-host/q35.c > +++ b/hw/pci-host/q35.c > @@ -574,8 +574,7 @@ static void mch_realize(PCIDevice *d, Error **errp) > } > > /* setup pci memory mapping */ > - pc_pci_as_mapping_init(OBJECT(mch), mch->system_memory, > - mch->pci_address_space); > + pc_pci_as_mapping_init(mch->system_memory, mch->pci_address_space); > > /* if *disabled* show SMRAM to all CPUs */ > memory_region_init_alias(&mch->smram_region, OBJECT(mch), "smram-region", > diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h > index 991f905f5d..88a120bc23 100644 > --- a/include/hw/i386/pc.h > +++ b/include/hw/i386/pc.h > @@ -156,7 +156,7 @@ void pc_guest_info_init(PCMachineState *pcms); > #define PCI_HOST_ABOVE_4G_MEM_SIZE "above-4g-mem-size" > > > -void pc_pci_as_mapping_init(Object *owner, MemoryRegion *system_memory, > +void pc_pci_as_mapping_init(MemoryRegion *system_memory, > MemoryRegion *pci_address_space); > > void xen_load_linux(PCMachineState *pcms); Applied to my trivial-patches branch. Thanks, Laurent
diff --git a/hw/i386/pc.c b/hw/i386/pc.c index d489ecc0d1..6e592bd969 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -782,7 +782,7 @@ void pc_guest_info_init(PCMachineState *pcms) } /* setup pci memory address space mapping into system address space */ -void pc_pci_as_mapping_init(Object *owner, MemoryRegion *system_memory, +void pc_pci_as_mapping_init(MemoryRegion *system_memory, MemoryRegion *pci_address_space) { /* Set to lower priority than RAM */ diff --git a/hw/pci-host/i440fx.c b/hw/pci-host/i440fx.c index d5426ef4a5..262f82c303 100644 --- a/hw/pci-host/i440fx.c +++ b/hw/pci-host/i440fx.c @@ -272,8 +272,7 @@ PCIBus *i440fx_init(const char *pci_type, IO_APIC_DEFAULT_ADDRESS - 1); /* setup pci memory mapping */ - pc_pci_as_mapping_init(OBJECT(f), f->system_memory, - f->pci_address_space); + pc_pci_as_mapping_init(f->system_memory, f->pci_address_space); /* if *disabled* show SMRAM to all CPUs */ memory_region_init_alias(&f->smram_region, OBJECT(d), "smram-region", diff --git a/hw/pci-host/q35.c b/hw/pci-host/q35.c index 20da121374..26390863d6 100644 --- a/hw/pci-host/q35.c +++ b/hw/pci-host/q35.c @@ -574,8 +574,7 @@ static void mch_realize(PCIDevice *d, Error **errp) } /* setup pci memory mapping */ - pc_pci_as_mapping_init(OBJECT(mch), mch->system_memory, - mch->pci_address_space); + pc_pci_as_mapping_init(mch->system_memory, mch->pci_address_space); /* if *disabled* show SMRAM to all CPUs */ memory_region_init_alias(&mch->smram_region, OBJECT(mch), "smram-region", diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h index 991f905f5d..88a120bc23 100644 --- a/include/hw/i386/pc.h +++ b/include/hw/i386/pc.h @@ -156,7 +156,7 @@ void pc_guest_info_init(PCMachineState *pcms); #define PCI_HOST_ABOVE_4G_MEM_SIZE "above-4g-mem-size" -void pc_pci_as_mapping_init(Object *owner, MemoryRegion *system_memory, +void pc_pci_as_mapping_init(MemoryRegion *system_memory, MemoryRegion *pci_address_space); void xen_load_linux(PCMachineState *pcms);
This argument was added 9 years ago in commit 83d08f2673 ("pc: map PCI address space as catchall region for not mapped addresses") and has never been used since, so remove it. Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org> --- hw/i386/pc.c | 2 +- hw/pci-host/i440fx.c | 3 +-- hw/pci-host/q35.c | 3 +-- include/hw/i386/pc.h | 2 +- 4 files changed, 4 insertions(+), 6 deletions(-)