All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH v2] hw/i386/pc: Remove unused 'owner' argument from pc_pci_as_mapping_init
@ 2023-01-05 17:38 Philippe Mathieu-Daudé
  2023-01-05 22:07 ` Bernhard Beschow
  2023-01-16 17:42 ` Laurent Vivier
  0 siblings, 2 replies; 3+ messages in thread
From: Philippe Mathieu-Daudé @ 2023-01-05 17:38 UTC (permalink / raw)
  To: qemu-devel
  Cc: Paolo Bonzini, Marcel Apfelbaum, Eduardo Habkost, qemu-trivial,
	Michael S. Tsirkin, Richard Henderson,
	Philippe Mathieu-Daudé

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);
-- 
2.38.1



^ permalink raw reply related	[flat|nested] 3+ messages in thread
* Re: [PATCH v2] hw/i386/pc: Remove unused 'owner' argument from pc_pci_as_mapping_init
  2023-01-05 17:38 [PATCH v2] hw/i386/pc: Remove unused 'owner' argument from pc_pci_as_mapping_init Philippe Mathieu-Daudé
@ 2023-01-05 22:07 ` Bernhard Beschow
  2023-01-16 17:42 ` Laurent Vivier
  1 sibling, 0 replies; 3+ messages in thread
From: Bernhard Beschow @ 2023-01-05 22:07 UTC (permalink / raw)
  To: qemu-devel, Philippe Mathieu-Daudé
  Cc: Paolo Bonzini, Marcel Apfelbaum, Eduardo Habkost, qemu-trivial,
	Michael S. Tsirkin, Richard Henderson



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);


^ permalink raw reply	[flat|nested] 3+ messages in thread
* Re: [PATCH v2] hw/i386/pc: Remove unused 'owner' argument from pc_pci_as_mapping_init
  2023-01-05 17:38 [PATCH v2] hw/i386/pc: Remove unused 'owner' argument from pc_pci_as_mapping_init Philippe Mathieu-Daudé
  2023-01-05 22:07 ` Bernhard Beschow
@ 2023-01-16 17:42 ` Laurent Vivier
  1 sibling, 0 replies; 3+ messages in thread
From: Laurent Vivier @ 2023-01-16 17:42 UTC (permalink / raw)
  To: Philippe Mathieu-Daudé, qemu-devel
  Cc: Paolo Bonzini, Marcel Apfelbaum, Eduardo Habkost, qemu-trivial,
	Michael S. Tsirkin, Richard Henderson

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


^ permalink raw reply	[flat|nested] 3+ messages in thread
end of thread, other threads:[~2023-01-16 17:42 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-01-05 17:38 [PATCH v2] hw/i386/pc: Remove unused 'owner' argument from pc_pci_as_mapping_init Philippe Mathieu-Daudé
2023-01-05 22:07 ` Bernhard Beschow
2023-01-16 17:42 ` Laurent Vivier

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.