[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 32/48] ipoctal232: QOM parent field cleanup
From: |
Andreas Färber |
Subject: |
[Qemu-devel] [PULL 32/48] ipoctal232: QOM parent field cleanup |
Date: |
Mon, 10 Feb 2014 19:36:49 +0100 |
Clean up accesses to IPOctalState::dev field and rename it.
Acked-by: Alberto Garcia <address@hidden>
Signed-off-by: Andreas Färber <address@hidden>
---
hw/char/ipoctal232.c | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/hw/char/ipoctal232.c b/hw/char/ipoctal232.c
index b33cfff..99bab4d 100644
--- a/hw/char/ipoctal232.c
+++ b/hw/char/ipoctal232.c
@@ -108,7 +108,8 @@ struct SCC2698Block {
};
struct IPOctalState {
- IPackDevice dev;
+ IPackDevice parent_obj;
+
SCC2698Channel ch[N_CHANNELS];
SCC2698Block blk[N_BLOCKS];
uint8_t irq_vector;
@@ -154,7 +155,7 @@ static const VMStateDescription vmstate_ipoctal = {
.minimum_version_id = 1,
.minimum_version_id_old = 1,
.fields = (VMStateField[]) {
- VMSTATE_IPACK_DEVICE(dev, IPOctalState),
+ VMSTATE_IPACK_DEVICE(parent_obj, IPOctalState),
VMSTATE_STRUCT_ARRAY(ch, IPOctalState, N_CHANNELS, 1,
vmstate_scc2698_channel, SCC2698Channel),
VMSTATE_STRUCT_ARRAY(blk, IPOctalState, N_BLOCKS, 1,
@@ -172,6 +173,7 @@ static const uint8_t id_prom_data[] = {
static void update_irq(IPOctalState *dev, unsigned block)
{
+ IPackDevice *idev = IPACK_DEVICE(dev);
/* Blocks A and B interrupt on INT0#, C and D on INT1#.
Thus, to get the status we have to check two blocks. */
SCC2698Block *blk0 = &dev->blk[block];
@@ -179,9 +181,9 @@ static void update_irq(IPOctalState *dev, unsigned block)
unsigned intno = block / 2;
if ((blk0->isr & blk0->imr) || (blk1->isr & blk1->imr)) {
- qemu_irq_raise(dev->dev.irq[intno]);
+ qemu_irq_raise(idev->irq[intno]);
} else {
- qemu_irq_lower(dev->dev.irq[intno]);
+ qemu_irq_lower(idev->irq[intno]);
}
}
--
1.8.4.5
- Re: [Qemu-devel] [PULL 28/48] tests: Add ipoctal232 qtest, (continued)
- [Qemu-devel] [PULL 21/48] tests: Add vmxnet3 qtest, Andreas Färber, 2014/02/10
- [Qemu-devel] [PULL 22/48] tests: Add rtl8139 qtest, Andreas Färber, 2014/02/10
- [Qemu-devel] [PULL 30/48] ipack: QOM parent field cleanup for IPackBus, Andreas Färber, 2014/02/10
- [Qemu-devel] [PULL 29/48] ipack: Convert to QOM realize, Andreas Färber, 2014/02/10
- [Qemu-devel] [PULL 23/48] tests: Add pcnet qtest, Andreas Färber, 2014/02/10
- [Qemu-devel] [PULL 24/48] tests: Add eepro100 qtest, Andreas Färber, 2014/02/10
- [Qemu-devel] [PULL 26/48] tests: Add virtio-net qtest, Andreas Färber, 2014/02/10
- [Qemu-devel] [PULL 32/48] ipoctal232: QOM parent field cleanup,
Andreas Färber <=
- [Qemu-devel] [PULL 31/48] ipack: QOM parent field cleanup for IPackDevice, Andreas Färber, 2014/02/10
- [Qemu-devel] [PULL 33/48] ipack: Move IndustryPack out of hw/char/, Andreas Färber, 2014/02/10
- [Qemu-devel] [PULL 34/48] qtest: Don't segfault with invalid -qtest option, Andreas Färber, 2014/02/10
- [Qemu-devel] [PULL 35/48] qapi: Add size parser to StringInputVisitor, Andreas Färber, 2014/02/10
- [Qemu-devel] [PULL 39/48] qdev: Legacy properties are just strings, Andreas Färber, 2014/02/10
- [Qemu-devel] [PULL 36/48] qdev: Sizes are now parsed by StringInputVisitor, Andreas Färber, 2014/02/10
- [Qemu-devel] [PULL 37/48] qdev: Remove legacy parsers for hex8/32/64, Andreas Färber, 2014/02/10
- [Qemu-devel] [PULL 46/48] qdev: Add enum property types to QAPI schema, Andreas Färber, 2014/02/10