[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 17/18] hw/isa: Un-inline isa_bus_from_device()
From: |
Philippe Mathieu-Daudé |
Subject: |
[PATCH v2 17/18] hw/isa: Un-inline isa_bus_from_device() |
Date: |
Wed, 15 Feb 2023 17:16:40 +0100 |
No point in inlining isa_bus_from_device() which is only
used at device realization time.
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
hw/isa/isa-bus.c | 5 +++++
include/hw/isa/isa.h | 6 +-----
2 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/hw/isa/isa-bus.c b/hw/isa/isa-bus.c
index 719f2e96f2..f44817b88b 100644
--- a/hw/isa/isa-bus.c
+++ b/hw/isa/isa-bus.c
@@ -167,6 +167,11 @@ bool isa_realize_and_unref(ISADevice *dev, ISABus *bus,
Error **errp)
return qdev_realize_and_unref(&dev->parent_obj, &bus->parent_obj, errp);
}
+ISABus *isa_bus_from_device(ISADevice *dev)
+{
+ return ISA_BUS(qdev_get_parent_bus(DEVICE(dev)));
+}
+
ISADevice *isa_vga_init(ISABus *bus)
{
vga_interface_created = true;
diff --git a/include/hw/isa/isa.h b/include/hw/isa/isa.h
index 1084d68ead..c9954a7d99 100644
--- a/include/hw/isa/isa.h
+++ b/include/hw/isa/isa.h
@@ -96,6 +96,7 @@ ISADevice *isa_vga_init(ISABus *bus);
/* isa_get_irq() is deprecated, please use isa_bus_get_irq() instead. */
qemu_irq isa_get_irq(ISADevice *dev, unsigned irqnum);
+ISABus *isa_bus_from_device(ISADevice *dev);
/**
* isa_register_ioport: Install an I/O port region on the ISA bus.
@@ -133,9 +134,4 @@ int isa_register_portio_list(ISADevice *dev,
const MemoryRegionPortio *portio,
void *opaque, const char *name);
-static inline ISABus *isa_bus_from_device(ISADevice *d)
-{
- return ISA_BUS(qdev_get_parent_bus(DEVICE(d)));
-}
-
#endif
--
2.38.1
- Re: [PATCH v2 07/18] hw/ide/piix: Ensure IDE output IRQs are wired at realization, (continued)
- [PATCH v2 08/18] hw/isa: Deprecate isa_get_irq() in favor of isa_bus_get_irq(), Philippe Mathieu-Daudé, 2023/02/15
- [PATCH v2 09/18] hw/isa: Simplify isa_address_space[_io](), Philippe Mathieu-Daudé, 2023/02/15
- [PATCH v2 10/18] hw/isa: Use isa_address_space_io() in isa_register_ioport(), Philippe Mathieu-Daudé, 2023/02/15
- [PATCH v2 11/18] hw/ide: Declare ide_get_[geometry/bios_chs_trans] in 'hw/ide/internal.h', Philippe Mathieu-Daudé, 2023/02/15
- [PATCH v2 12/18] hw/ide: Rename ISA specific ide_init_ioport -> ide_bus_init_ioport_isa, Philippe Mathieu-Daudé, 2023/02/15
- [PATCH v2 15/18] hw/isa: Ensure isa_register_portio_list() do not get NULL ISA device, Philippe Mathieu-Daudé, 2023/02/15
- [PATCH v2 13/18] hw/ide: Introduce generic ide_init_ioport(), Philippe Mathieu-Daudé, 2023/02/15
- [PATCH v2 14/18] hw/ide/piix: Use generic ide_bus_init_ioport(), Philippe Mathieu-Daudé, 2023/02/15
- [PATCH v2 16/18] hw/isa: Reduce 'isabus' singleton scope to isa_bus_new(), Philippe Mathieu-Daudé, 2023/02/15
- [PATCH v2 17/18] hw/isa: Un-inline isa_bus_from_device(),
Philippe Mathieu-Daudé <=
- [PATCH v2 18/18] hw/isa: Remove empty ISADeviceClass structure, Philippe Mathieu-Daudé, 2023/02/15
- [PATCH v2 06.5/18] hw/ide/piix: Allow using PIIX3-IDE as standalone PCI function, Philippe Mathieu-Daudé, 2023/02/20