qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Laurent Vivier <laurent@vivier.eu>
To: qemu-devel@nongnu.org
Cc: qemu-trivial@nongnu.org,
	"Philippe Mathieu-Daudé" <philmd@linaro.org>,
	"Bernhard Beschow" <shentey@gmail.com>,
	"Laurent Vivier" <laurent@vivier.eu>
Subject: [PULL 10/15] hw/i386/pc: Remove unused 'owner' argument from pc_pci_as_mapping_init
Date: Wed, 18 Jan 2023 08:52:29 +0100	[thread overview]
Message-ID: <20230118075234.2322131-11-laurent@vivier.eu> (raw)
In-Reply-To: <20230118075234.2322131-1-laurent@vivier.eu>

From: 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>
Message-Id: <20230105173826.56748-1-philmd@linaro.org>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
---
 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 d489ecc0d1cd..6e592bd969aa 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 d5426ef4a53c..262f82c30380 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 20da1213747c..26390863d605 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 991f905f5d25..88a120bc234b 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



  parent reply	other threads:[~2023-01-18  7:56 UTC|newest]

Thread overview: 17+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-01-18  7:52 [PULL 00/15] Trivial branch for 8.0 patches Laurent Vivier
2023-01-18  7:52 ` [PULL 01/15] Call qemu_socketpair() instead of socketpair() when possible Laurent Vivier
2023-01-18  7:52 ` [PULL 02/15] hw/display: Move omap_lcdc.c out of target-specific source set Laurent Vivier
2023-01-18  7:52 ` [PULL 03/15] hw/intc: Move some files out of the " Laurent Vivier
2023-01-18  7:52 ` [PULL 04/15] hw/tpm: Move tpm_ppi.c out of " Laurent Vivier
2023-01-18  7:52 ` [PULL 05/15] hw/arm: Move various units to softmmu_ss[] Laurent Vivier
2023-01-18  7:52 ` [PULL 06/15] hw/cpu: Mark arm11 and realview mpcore as target-independent code Laurent Vivier
2023-01-18  7:52 ` [PULL 07/15] hw/intc: Mark more interrupt-controller files as target independent Laurent Vivier
2023-01-18  7:52 ` [PULL 08/15] hw/usb: Mark the XLNX_VERSAL-related files as target-independent Laurent Vivier
2023-01-18  7:52 ` [PULL 09/15] tests/qtest/test-hmp: Improve the check for verbose mode Laurent Vivier
2023-01-18  7:52 ` Laurent Vivier [this message]
2023-01-18  7:52 ` [PULL 11/15] ccid-card-emulated: fix cast warning/error Laurent Vivier
2023-01-18  7:52 ` [PULL 12/15] hw/pvrdma: Protect against buggy or malicious guest driver Laurent Vivier
2023-01-18  7:52 ` [PULL 13/15] hw/cxl/cxl-cdat.c: spelling: missmatch Laurent Vivier
2023-01-18  7:52 ` [PULL 14/15] hw/cxl/cxl-host: Fix an error message typo Laurent Vivier
2023-01-18  7:52 ` [PULL 15/15] hw/ssi/sifive_spi.c: spelling: reigster Laurent Vivier
2023-01-19 18:57 ` [PULL 00/15] Trivial branch for 8.0 patches Peter Maydell

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20230118075234.2322131-11-laurent@vivier.eu \
    --to=laurent@vivier.eu \
    --cc=philmd@linaro.org \
    --cc=qemu-devel@nongnu.org \
    --cc=qemu-trivial@nongnu.org \
    --cc=shentey@gmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).