All of lore.kernel.org
 help / color / mirror / Atom feed
From: Bernhard Beschow <shentey@gmail.com>
To: qemu-devel@nongnu.org
Cc: qemu-ppc@nongnu.org, "John Snow" <jsnow@redhat.com>,
	"Huacai Chen" <chenhuacai@kernel.org>,
	"Jiaxun Yang" <jiaxun.yang@flygoat.com>,
	"Gerd Hoffmann" <kraxel@redhat.com>,
	qemu-block@nongnu.org, "Philippe Mathieu-Daudé" <f4bug@amsat.org>,
	"BALATON Zoltan" <balaton@eik.bme.hu>,
	"Bernhard Beschow" <shentey@gmail.com>
Subject: [PATCH v5 02/13] hw/isa/vt82c686: Resolve unneeded attribute
Date: Thu,  1 Sep 2022 13:41:16 +0200	[thread overview]
Message-ID: <20220901114127.53914-3-shentey@gmail.com> (raw)
In-Reply-To: <20220901114127.53914-1-shentey@gmail.com>

Now that also the super io device is realized in the common realize method,
the isa_bus attribute can be turned into a temporary.

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

diff --git a/hw/isa/vt82c686.c b/hw/isa/vt82c686.c
index 0217c98fe4..9d12e1cae4 100644
--- a/hw/isa/vt82c686.c
+++ b/hw/isa/vt82c686.c
@@ -543,7 +543,6 @@ struct ViaISAState {
     PCIDevice dev;
     qemu_irq cpu_intr;
     qemu_irq *isa_irqs;
-    ISABus *isa_bus;
     ViaSuperIOState via_sio;
 };
 
@@ -585,17 +584,18 @@ static void via_isa_realize(PCIDevice *d, Error **errp)
     ViaISAState *s = VIA_ISA(d);
     DeviceState *dev = DEVICE(d);
     qemu_irq *isa_irq;
+    ISABus *isa_bus;
     int i;
 
     qdev_init_gpio_out(dev, &s->cpu_intr, 1);
     isa_irq = qemu_allocate_irqs(via_isa_request_i8259_irq, s, 1);
-    s->isa_bus = isa_bus_new(dev, get_system_memory(), pci_address_space_io(d),
+    isa_bus = isa_bus_new(dev, get_system_memory(), pci_address_space_io(d),
                           &error_fatal);
-    s->isa_irqs = i8259_init(s->isa_bus, *isa_irq);
-    isa_bus_irqs(s->isa_bus, s->isa_irqs);
-    i8254_pit_init(s->isa_bus, 0x40, 0, NULL);
-    i8257_dma_init(s->isa_bus, 0);
-    mc146818_rtc_init(s->isa_bus, 2000, NULL);
+    s->isa_irqs = i8259_init(isa_bus, *isa_irq);
+    isa_bus_irqs(isa_bus, s->isa_irqs);
+    i8254_pit_init(isa_bus, 0x40, 0, NULL);
+    i8257_dma_init(isa_bus, 0);
+    mc146818_rtc_init(isa_bus, 2000, NULL);
 
     for (i = 0; i < PCI_CONFIG_HEADER_SIZE; i++) {
         if (i < PCI_COMMAND || i >= PCI_REVISION_ID) {
@@ -604,7 +604,7 @@ static void via_isa_realize(PCIDevice *d, Error **errp)
     }
 
     /* Super I/O */
-    if (!qdev_realize(DEVICE(&s->via_sio), BUS(s->isa_bus), errp)) {
+    if (!qdev_realize(DEVICE(&s->via_sio), BUS(isa_bus), errp)) {
         return;
     }
 }
-- 
2.37.3



  parent reply	other threads:[~2022-09-01 12:03 UTC|newest]

Thread overview: 34+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-09-01 11:41 [PATCH v5 00/13] Instantiate VT82xx functions in host device Bernhard Beschow
2022-09-01 11:41 ` [PATCH v5 01/13] hw/isa/vt82c686: Resolve chip-specific realize methods Bernhard Beschow
2022-09-01 11:41 ` Bernhard Beschow [this message]
2022-09-01 11:41 ` [PATCH v5 03/13] hw/isa/vt82c686: Prefer pci_address_space() over get_system_memory() Bernhard Beschow
2022-09-01 11:41 ` [PATCH v5 04/13] hw/isa/vt82c686: Reuse errp Bernhard Beschow
2022-09-01 11:41 ` [PATCH v5 05/13] hw/isa/vt82c686: Introduce TYPE_VIA_IDE define Bernhard Beschow
2022-09-08 10:20   ` Daniel Henrique Barboza
2022-09-01 11:41 ` [PATCH v5 06/13] hw/isa/vt82c686: Instantiate IDE function in host device Bernhard Beschow
2022-09-08 10:20   ` Daniel Henrique Barboza
2022-09-01 11:41 ` [PATCH v5 07/13] hw/isa/vt82c686: Introduce TYPE_VT82C686B_USB_UHCI define Bernhard Beschow
2022-09-08 10:20   ` Daniel Henrique Barboza
2022-09-01 11:41 ` [PATCH v5 08/13] hw/isa/vt82c686: Instantiate USB functions in host device Bernhard Beschow
2022-09-08 10:20   ` Daniel Henrique Barboza
2022-09-01 11:41 ` [PATCH v5 09/13] hw/isa/vt82c686: Instantiate PM function " Bernhard Beschow
2022-09-08 10:20   ` Daniel Henrique Barboza
2022-09-01 11:41 ` [PATCH v5 10/13] hw/isa/vt82c686: Instantiate AC97 and MC97 functions " Bernhard Beschow
2022-09-08 10:21   ` Daniel Henrique Barboza
2022-09-01 11:41 ` [PATCH v5 11/13] hw/mips/fuloong2e: Inline vt82c686b_southbridge_init() and remove it Bernhard Beschow
2022-09-16 14:34   ` Philippe Mathieu-Daudé via
2022-09-01 11:41 ` [PATCH v5 12/13] hw/isa/vt82c686: Embed RTCState in host device Bernhard Beschow
2022-09-01 11:41 ` [PATCH v5 13/13] hw/isa/vt82c686: Create rtc-time alias in boards instead Bernhard Beschow
2022-09-08 10:21   ` Daniel Henrique Barboza
2022-09-16 14:34   ` Philippe Mathieu-Daudé via
2022-09-01 11:47 ` [PATCH v5 00/13] Instantiate VT82xx functions in host device Bernhard Beschow
2022-09-08  8:34 ` Bernhard Beschow
2022-09-08 10:22   ` BALATON Zoltan
2022-09-08 10:25   ` Daniel Henrique Barboza
2022-09-12 19:50 ` Bernhard Beschow
2022-09-16 14:36   ` Philippe Mathieu-Daudé via
2022-09-16 17:54     ` Bernhard Beschow
2022-10-27  8:21     ` Bernhard Beschow
2022-10-27  9:47       ` Daniel Henrique Barboza
2022-10-27 22:11         ` Philippe Mathieu-Daudé
2022-10-28  7:48           ` 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=20220901114127.53914-3-shentey@gmail.com \
    --to=shentey@gmail.com \
    --cc=balaton@eik.bme.hu \
    --cc=chenhuacai@kernel.org \
    --cc=f4bug@amsat.org \
    --cc=jiaxun.yang@flygoat.com \
    --cc=jsnow@redhat.com \
    --cc=kraxel@redhat.com \
    --cc=qemu-block@nongnu.org \
    --cc=qemu-devel@nongnu.org \
    --cc=qemu-ppc@nongnu.org \
    /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 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.