usb-ehci: itd handling fixes.

[qemu.git] / hw / cs4231a.c

diff --git a/hw/cs4231a.c b/hw/cs4231a.c
index 7c29aa84960c1722cdd7602a234ba05e2c7ad4da..598f0322d9b4325813f262b3e222a933d8145417 100644 (file)
--- a/hw/cs4231a.c
+++ b/hw/cs4231a.c
@@ -645,13 +645,13 @@ static int cs4231a_initfn (ISADevice *dev)
     isa_init_irq (dev, &s->pic, s->irq);
 
     for (i = 0; i < 4; i++) {
+        isa_init_ioport(dev, i);
         register_ioport_write (s->port + i, 1, 1, cs_write, s);
         register_ioport_read (s->port + i, 1, 1, cs_read, s);
     }
 
     DMA_register_channel (s->dma, cs_dma_read, s);
 
-    vmstate_register (0, &vmstate_cs4231a, s);
     qemu_register_reset (cs_reset, s);
     cs_reset (s);
 
@@ -669,6 +669,7 @@ static ISADeviceInfo cs4231a_info = {
     .qdev.name     = "cs4231a",
     .qdev.desc     = "Crystal Semiconductor CS4231A",
     .qdev.size     = sizeof (CSState),
+    .qdev.vmsd     = &vmstate_cs4231a,
     .init          = cs4231a_initfn,
     .qdev.props    = (Property[]) {
         DEFINE_PROP_HEX32  ("iobase",  CSState, port, 0x534),