lsi: Fix value overflow in request tag processing

[mirror_qemu.git] / hw / cs4231.c

diff --git a/hw/cs4231.c b/hw/cs4231.c
index 6d7e4b1c93e25b075f6c108a34e7d2fa65b60a3f..f7ce0af3f92be4c4c583bdccde9123cbe17d95e8 100644 (file)
--- a/hw/cs4231.c
+++ b/hw/cs4231.c
@@ -21,8 +21,8 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-#include "hw.h"
-#include "sun4m.h"
+
+#include "sysbus.h"
 
 /* debug CS4231 */
 //#define DEBUG_CS
@@ -36,9 +36,10 @@
 #define CS_MAXDREG (CS_DREGS - 1)
 
 typedef struct CSState {
+    SysBusDevice busdev;
+    qemu_irq irq;
     uint32_t regs[CS_REGS];
     uint8_t dregs[CS_DREGS];
-    void *intctl;
 } CSState;
 
 #define CS_RAP(s) ((s)->regs[0] & CS_MAXDREG)
@@ -52,9 +53,9 @@ typedef struct CSState {
 #define DPRINTF(fmt, ...)
 #endif
 
-static void cs_reset(void *opaque)
+static void cs_reset(DeviceState *d)
 {
-    CSState *s = opaque;
+    CSState *s = container_of(d, CSState, busdev.qdev);
 
     memset(s->regs, 0, CS_REGS * 4);
     memset(s->dregs, 0, CS_DREGS);
@@ -116,8 +117,9 @@ static void cs_mem_writel(void *opaque, target_phys_addr_t addr, uint32_t val)
     case 2: // Read only
         break;
     case 4:
-        if (val & 1)
-            cs_reset(s);
+        if (val & 1) {
+            cs_reset(&s->busdev.qdev);
+        }
         val &= 0x7f;
         s->regs[saddr] = val;
         break;
@@ -127,54 +129,56 @@ static void cs_mem_writel(void *opaque, target_phys_addr_t addr, uint32_t val)
     }
 }
 
-static CPUReadMemoryFunc *cs_mem_read[3] = {
+static CPUReadMemoryFunc * const cs_mem_read[3] = {
     cs_mem_readl,
     cs_mem_readl,
     cs_mem_readl,
 };
 
-static CPUWriteMemoryFunc *cs_mem_write[3] = {
+static CPUWriteMemoryFunc * const cs_mem_write[3] = {
     cs_mem_writel,
     cs_mem_writel,
     cs_mem_writel,
 };
 
-static void cs_save(QEMUFile *f, void *opaque)
-{
-    CSState *s = opaque;
-    unsigned int i;
-
-    for (i = 0; i < CS_REGS; i++)
-        qemu_put_be32s(f, &s->regs[i]);
-
-    qemu_put_buffer(f, s->dregs, CS_DREGS);
-}
+static const VMStateDescription vmstate_cs4231 = {
+    .name ="cs4231",
+    .version_id = 1,
+    .minimum_version_id = 1,
+    .minimum_version_id_old = 1,
+    .fields      = (VMStateField []) {
+        VMSTATE_UINT32_ARRAY(regs, CSState, CS_REGS),
+        VMSTATE_UINT8_ARRAY(dregs, CSState, CS_DREGS),
+        VMSTATE_END_OF_LIST()
+    }
+};
 
-static int cs_load(QEMUFile *f, void *opaque, int version_id)
+static int cs4231_init1(SysBusDevice *dev)
 {
-    CSState *s = opaque;
-    unsigned int i;
-
-    if (version_id > 1)
-        return -EINVAL;
+    int io;
+    CSState *s = FROM_SYSBUS(CSState, dev);
 
-    for (i = 0; i < CS_REGS; i++)
-        qemu_get_be32s(f, &s->regs[i]);
+    io = cpu_register_io_memory(cs_mem_read, cs_mem_write, s);
+    sysbus_init_mmio(dev, CS_SIZE, io);
+    sysbus_init_irq(dev, &s->irq);
 
-    qemu_get_buffer(f, s->dregs, CS_DREGS);
     return 0;
 }
 
-void cs_init(target_phys_addr_t base, int irq, void *intctl)
-{
-    int cs_io_memory;
-    CSState *s;
-
-    s = qemu_mallocz(sizeof(CSState));
+static SysBusDeviceInfo cs4231_info = {
+    .init = cs4231_init1,
+    .qdev.name  = "SUNW,CS4231",
+    .qdev.size  = sizeof(CSState),
+    .qdev.vmsd  = &vmstate_cs4231,
+    .qdev.reset = cs_reset,
+    .qdev.props = (Property[]) {
+        {.name = NULL}
+    }
+};
 
-    cs_io_memory = cpu_register_io_memory(cs_mem_read, cs_mem_write, s);
-    cpu_register_physical_memory(base, CS_SIZE, cs_io_memory);
-    register_savevm("cs4231", base, 1, cs_save, cs_load, s);
-    qemu_register_reset(cs_reset, 0, s);
-    cs_reset(s);
+static void cs4231_register_devices(void)
+{
+    sysbus_register_withprop(&cs4231_info);
 }
+
+device_init(cs4231_register_devices)