qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Bernhard Beschow <shentey@gmail.com>
To: qemu-devel@nongnu.org
Cc: Igor Mammedov <imammedo@redhat.com>,
	Richard Henderson <richard.henderson@linaro.org>,
	Ani Sinha <ani@anisinha.ca>,
	"Michael S. Tsirkin" <mst@redhat.com>,
	Paolo Bonzini <pbonzini@redhat.com>,
	BALATON Zoltan <balaton@eik.bme.hu>,
	Thomas Huth <thuth@redhat.com>,
	Marcel Apfelbaum <marcel.apfelbaum@gmail.com>,
	Eduardo Habkost <eduardo@habkost.net>,
	Laurent Vivier <lvivier@redhat.com>,
	Sunil Muthuswamy <sunilmut@microsoft.com>,
	qemu-trivial@nongnu.org, Bernhard Beschow <shentey@gmail.com>
Subject: [PATCH v2 01/20] hw/pci-host/i440fx: Inline sysbus_add_io()
Date: Tue, 31 Jan 2023 12:53:07 +0100	[thread overview]
Message-ID: <20230131115326.12454-2-shentey@gmail.com> (raw)
In-Reply-To: <20230131115326.12454-1-shentey@gmail.com>

sysbus_add_io() just wraps memory_region_add_subregion() while also
obscuring where the memory is attached. So use
memory_region_add_subregion() directly and attach it to the existing
memory region s->bus->address_space_io which is set as an alias to
get_system_io() by the pc machine.

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

diff --git a/hw/pci-host/i440fx.c b/hw/pci-host/i440fx.c
index 262f82c303..9c6882d3fc 100644
--- a/hw/pci-host/i440fx.c
+++ b/hw/pci-host/i440fx.c
@@ -27,6 +27,7 @@
 #include "qemu/range.h"
 #include "hw/i386/pc.h"
 #include "hw/pci/pci.h"
+#include "hw/pci/pci_bus.h"
 #include "hw/pci/pci_host.h"
 #include "hw/pci-host/i440fx.h"
 #include "hw/qdev-properties.h"
@@ -217,10 +218,10 @@ static void i440fx_pcihost_realize(DeviceState *dev, Error **errp)
     PCIHostState *s = PCI_HOST_BRIDGE(dev);
     SysBusDevice *sbd = SYS_BUS_DEVICE(dev);
 
-    sysbus_add_io(sbd, 0xcf8, &s->conf_mem);
+    memory_region_add_subregion(s->bus->address_space_io, 0xcf8, &s->conf_mem);
     sysbus_init_ioports(sbd, 0xcf8, 4);
 
-    sysbus_add_io(sbd, 0xcfc, &s->data_mem);
+    memory_region_add_subregion(s->bus->address_space_io, 0xcfc, &s->data_mem);
     sysbus_init_ioports(sbd, 0xcfc, 4);
 
     /* register i440fx 0xcf8 port as coalesced pio */
-- 
2.39.1



  reply	other threads:[~2023-01-31 11:54 UTC|newest]

Thread overview: 31+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-01-31 11:53 [PATCH v2 00/20] PC and ICH9 cleanups Bernhard Beschow
2023-01-31 11:53 ` Bernhard Beschow [this message]
2023-01-31 13:38   ` [PATCH v2 01/20] hw/pci-host/i440fx: Inline sysbus_add_io() Thomas Huth
2023-01-31 11:53 ` [PATCH v2 02/20] hw/pci-host/q35: " Bernhard Beschow
2023-01-31 13:38   ` Thomas Huth
2023-01-31 11:53 ` [PATCH v2 03/20] hw/i386/pc_q35: Reuse machine parameter Bernhard Beschow
2023-01-31 13:49   ` Thomas Huth
2023-01-31 11:53 ` [PATCH v2 04/20] hw/i386/pc_q35: Resolve redundant q35_host variable Bernhard Beschow
2023-01-31 13:53   ` Thomas Huth
2023-01-31 11:53 ` [PATCH v2 05/20] hw/i386/pc_{q35, piix}: Reuse MachineClass::desc as SMB product name Bernhard Beschow
2023-01-31 13:55   ` Thomas Huth
2023-01-31 11:53 ` [PATCH v2 06/20] hw/i386/pc_{q35, piix}: Minimize usage of get_system_memory() Bernhard Beschow
2023-01-31 13:58   ` [PATCH v2 06/20] hw/i386/pc_{q35,piix}: " Thomas Huth
2023-01-31 11:53 ` [PATCH v2 07/20] hw/i386/pc: Initialize ram_memory variable directly Bernhard Beschow
2023-01-31 11:53 ` [PATCH v2 08/20] hw/i386/ich9: Rename Q35_MASK to ICH9_MASK Bernhard Beschow
2023-01-31 14:00   ` Thomas Huth
2023-01-31 11:53 ` [PATCH v2 09/20] hw/isa/lpc_ich9: Unexport PIRQ functions Bernhard Beschow
2023-01-31 11:53 ` [PATCH v2 10/20] hw/isa/lpc_ich9: Eliminate ICH9LPCState::isa_bus Bernhard Beschow
2023-01-31 14:04   ` Thomas Huth
2023-01-31 11:53 ` [PATCH v2 11/20] hw/isa/lpc_ich9: Reuse memory and io address space of PCI bus Bernhard Beschow
2023-02-01  0:02   ` Bernhard Beschow
2023-01-31 11:53 ` [PATCH v2 12/20] hw/i2c/smbus_ich9: Move ich9_smb_set_irq() in front of ich9_smbus_realize() Bernhard Beschow
2023-01-31 11:53 ` [PATCH v2 13/20] hw/i2c/smbus_ich9: Inline ich9_smb_init() and remove it Bernhard Beschow
2023-01-31 11:53 ` [PATCH v2 14/20] hw/i386/pc_q35: Allow for setting properties before realizing TYPE_ICH9_LPC_DEVICE Bernhard Beschow
2023-01-31 11:53 ` [PATCH v2 15/20] hw/isa/lpc_ich9: Connect pm stuff to lpc internally Bernhard Beschow
2023-01-31 11:53 ` [PATCH v2 16/20] hw/isa/lpc_ich9: Remove redundant ich9_lpc_reset() invocation Bernhard Beschow
2023-01-31 11:53 ` [PATCH v2 17/20] hw/i386/ich9: Remove redundant GSI_NUM_PINS Bernhard Beschow
2023-01-31 11:53 ` [PATCH v2 18/20] hw: Move ioapic*.h to intc/ Bernhard Beschow
2023-01-31 11:53 ` [PATCH v2 19/20] hw/i386/ich9: Clean up includes Bernhard Beschow
2023-03-02 14:43   ` Igor Mammedov
2023-01-31 11:53 ` [PATCH v2 20/20] hw: Move ich9.h to southbridge/ Bernhard Beschow

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=20230131115326.12454-2-shentey@gmail.com \
    --to=shentey@gmail.com \
    --cc=ani@anisinha.ca \
    --cc=balaton@eik.bme.hu \
    --cc=eduardo@habkost.net \
    --cc=imammedo@redhat.com \
    --cc=lvivier@redhat.com \
    --cc=marcel.apfelbaum@gmail.com \
    --cc=mst@redhat.com \
    --cc=pbonzini@redhat.com \
    --cc=qemu-devel@nongnu.org \
    --cc=qemu-trivial@nongnu.org \
    --cc=richard.henderson@linaro.org \
    --cc=sunilmut@microsoft.com \
    --cc=thuth@redhat.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).