All of lore.kernel.org
 help / color / mirror / Atom feed
From: "Philippe Mathieu-Daudé" <philippe.mathieu.daude@gmail.com>
To: Bernhard Beschow <shentey@gmail.com>, qemu-devel@nongnu.org
Cc: "Philippe Mathieu-Daudé" <f4bug@amsat.org>
Subject: [PATCH 09/13] hw/rtc/m48t59-isa: QOM'ify IRQ number
Date: Mon,  7 Mar 2022 14:43:49 +0100	[thread overview]
Message-ID: <20220307134353.1950-10-philippe.mathieu.daude@gmail.com> (raw)
In-Reply-To: <20220307134353.1950-1-philippe.mathieu.daude@gmail.com>

From: Bernhard Beschow <shentey@gmail.com>

Exposing the IRQ number as a QOM property not only allows it to be
configurable but also to be printed by standard QOM mechanisms. This allows
isabus_dev_print() to be retired eventually.

Signed-off-by: Bernhard Beschow <shentey@gmail.com>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Message-Id: <20220301220037.76555-3-shentey@gmail.com>
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
---
 hw/rtc/m48t59-isa.c | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/hw/rtc/m48t59-isa.c b/hw/rtc/m48t59-isa.c
index dc21fb10a5..e9086eada4 100644
--- a/hw/rtc/m48t59-isa.c
+++ b/hw/rtc/m48t59-isa.c
@@ -42,6 +42,7 @@ struct M48txxISAState {
     ISADevice parent_obj;
     M48t59State state;
     uint32_t io_base;
+    uint8_t isairq;
     MemoryRegion io;
 };
 
@@ -79,6 +80,7 @@ static void m48txx_isa_toggle_lock(Nvram *obj, int lock)
 static Property m48t59_isa_properties[] = {
     DEFINE_PROP_INT32("base-year", M48txxISAState, state.base_year, 0),
     DEFINE_PROP_UINT32("iobase", M48txxISAState, io_base, 0x74),
+    DEFINE_PROP_UINT8("irq", M48txxISAState, isairq, 8),
     DEFINE_PROP_END_OF_LIST(),
 };
 
@@ -97,9 +99,14 @@ static void m48t59_isa_realize(DeviceState *dev, Error **errp)
     M48txxISAState *d = M48TXX_ISA(dev);
     M48t59State *s = &d->state;
 
+    if (d->isairq >= ISA_NUM_IRQS) {
+        error_setg(errp, "Maximum value for \"irq\" is: %u", ISA_NUM_IRQS - 1);
+        return;
+    }
+
     s->model = u->info.model;
     s->size = u->info.size;
-    isa_init_irq(isadev, &s->IRQ, 8);
+    isa_init_irq(isadev, &s->IRQ, d->isairq);
     m48t59_realize_common(s, errp);
     memory_region_init_io(&d->io, OBJECT(dev), &m48t59_io_ops, s, "m48t59", 4);
     if (d->io_base != 0) {
-- 
2.34.1



  parent reply	other threads:[~2022-03-07 13:54 UTC|newest]

Thread overview: 27+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-03-07 13:43 [PATCH 00/13] hw: ISA & MIPS patches from Bernhard Beschow Philippe Mathieu-Daudé
2022-03-07 13:43 ` [PATCH 01/13] hw/mips/gt64xxx_pci: Fix PCI IRQ levels to be preserved during migration Philippe Mathieu-Daudé
2022-03-08 18:09   ` Richard Henderson
2022-03-07 13:43 ` [PATCH 02/13] malta: Move PCI interrupt handling from gt64xxx_pci to piix4 Philippe Mathieu-Daudé
2022-03-07 13:43 ` [PATCH 03/13] hw/isa/piix4: Resolve redundant i8259[] attribute Philippe Mathieu-Daudé
2022-03-08 18:18   ` Richard Henderson
2022-03-07 13:43 ` [PATCH 04/13] hw/isa/piix4: Pass PIIX4State as opaque parameter for piix4_set_irq() Philippe Mathieu-Daudé
2022-03-08 18:20   ` Richard Henderson
2022-03-07 13:43 ` [PATCH 05/13] hw/isa/piix4: Resolve global instance variable Philippe Mathieu-Daudé
2022-03-08 18:20   ` Richard Henderson
2022-03-07 13:43 ` [PATCH 06/13] hw/isa/piix4: Replace some magic IRQ constants Philippe Mathieu-Daudé
2022-03-08 18:21   ` Richard Henderson
2022-03-07 13:43 ` [PATCH 07/13] hw/mips/gt64xxx_pci: Resolve gt64120_register() Philippe Mathieu-Daudé
2022-03-08 18:32   ` Richard Henderson
2022-03-07 13:43 ` [PATCH 08/13] hw/rtc/mc146818rtc: QOM'ify IRQ number Philippe Mathieu-Daudé
2022-03-07 13:58   ` Bernhard Beschow
2022-03-07 13:43 ` Philippe Mathieu-Daudé [this message]
2022-03-07 13:59   ` [PATCH 09/13] hw/rtc/m48t59-isa: " Bernhard Beschow
2022-03-07 13:43 ` [PATCH 10/13] hw/input/pckbd: QOM'ify IRQ numbers Philippe Mathieu-Daudé
2022-03-07 13:59   ` Bernhard Beschow
2022-03-07 13:43 ` [PATCH 11/13] hw/isa/isa-bus: Remove isabus_dev_print() Philippe Mathieu-Daudé
2022-03-07 14:00   ` Bernhard Beschow
2022-03-07 13:43 ` [PATCH 12/13] hw/isa: Drop unused attributes from ISADevice Philippe Mathieu-Daudé
2022-03-07 14:01   ` Bernhard Beschow
2022-03-07 13:43 ` [PATCH 13/13] hw/isa: Inline and remove one-line isa_init_irq() Philippe Mathieu-Daudé
2022-03-07 13:54   ` Bernhard Beschow
2022-03-07 14:04 ` [PATCH 00/13] hw: ISA & MIPS patches from Bernhard Beschow 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=20220307134353.1950-10-philippe.mathieu.daude@gmail.com \
    --to=philippe.mathieu.daude@gmail.com \
    --cc=f4bug@amsat.org \
    --cc=qemu-devel@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 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.