qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Bernhard Beschow <shentey@gmail.com>
To: qemu-devel@nongnu.org
Cc: "Jiaxun Yang" <jiaxun.yang@flygoat.com>,
	"BALATON Zoltan" <balaton@eik.bme.hu>,
	"Philippe Mathieu-Daudé" <f4bug@amsat.org>,
	"Huacai Chen" <chenhuacai@kernel.org>,
	qemu-ppc@nongnu.org, "Bernhard Beschow" <shentey@gmail.com>
Subject: [PATCH 2/9] hw/isa/vt82c686: Resolve unneeded attribute
Date: Tue, 23 Aug 2022 00:43:48 +0200	[thread overview]
Message-ID: <20220822224355.11753-3-shentey@gmail.com> (raw)
In-Reply-To: <20220822224355.11753-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.2



  parent reply	other threads:[~2022-08-22 22:57 UTC|newest]

Thread overview: 31+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-08-22 22:43 [PATCH 0/9] QOM'ify VT82xx devices Bernhard Beschow
2022-08-22 22:43 ` [PATCH 1/9] hw/isa/vt82c686: QOM'ify Super I/O creation Bernhard Beschow
2022-08-23  0:35   ` BALATON Zoltan
2022-08-23 18:47     ` Bernhard Beschow
2022-08-23 23:36       ` BALATON Zoltan
2022-08-24 22:21         ` Bernhard Beschow
2022-08-22 22:43 ` Bernhard Beschow [this message]
2022-08-22 22:43 ` [PATCH 3/9] hw/isa/vt82c686: Prefer pci_address_space() over get_system_memory() Bernhard Beschow
2022-08-22 22:43 ` [PATCH 4/9] hw/isa/vt82c686: QOM'ify via-ide creation Bernhard Beschow
2022-08-24 13:54   ` BALATON Zoltan
2022-08-24 22:19     ` Bernhard Beschow
2022-08-24 23:18       ` BALATON Zoltan
2022-08-29 16:43         ` BB
2022-08-29 17:04           ` BALATON Zoltan
2022-08-29 18:12             ` BB
2022-08-30 19:05               ` BB
2022-08-22 22:43 ` [PATCH 5/9] hw/isa/vt82c686: QOM'ify vt82c686b-usb-uhci creation Bernhard Beschow
2022-08-22 22:43 ` [PATCH 6/9] hw/isa/vt82c686: QOM'ify pm creation Bernhard Beschow
2022-08-22 22:43 ` [PATCH 7/9] hw/isa/vt82c686: QOM'ify ac97 and mc97 creation Bernhard Beschow
2022-08-23  0:44   ` BALATON Zoltan
2022-08-23 18:50     ` Bernhard Beschow
2022-08-23 22:54       ` BALATON Zoltan
2022-08-24 22:43         ` Bernhard Beschow
2022-08-22 22:43 ` [PATCH 8/9] hw/isa/vt82c686: QOM'ify RTC creation Bernhard Beschow
2022-08-23  0:20   ` BALATON Zoltan
2022-08-23 18:38     ` Bernhard Beschow
2022-08-23 23:23       ` BALATON Zoltan
2022-08-29 17:07         ` BB
2022-08-29 17:50           ` BALATON Zoltan
2022-08-29 18:07             ` BB
2022-08-22 22:43 ` [PATCH 9/9] hw/isa/vt82c686: Reuse errp 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=20220822224355.11753-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=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 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).