Patchwork Fix vmport segfault

login
register
mail settings
Submitter Marcelo Tosatti
Date Feb. 17, 2011, 2:53 a.m.
Message ID <20110217025336.GA22404@amt.cnet>
Download mbox | patch
Permalink /patch/83424/
State New
Headers show

Comments

Marcelo Tosatti - Feb. 17, 2011, 2:53 a.m.
Fix regression caused by qdev conversion.

Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>

Patch

diff --git a/hw/vmport.c b/hw/vmport.c
index 292d78f..38ec259 100644
--- a/hw/vmport.c
+++ b/hw/vmport.c
@@ -43,15 +43,15 @@  typedef struct _VMPortState
     void *opaque[VMPORT_ENTRIES];
 } VMPortState;
 
-static VMPortState port_state;
+static VMPortState *port_state;
 
 void vmport_register(unsigned char command, IOPortReadFunc *func, void *opaque)
 {
     if (command >= VMPORT_ENTRIES)
         return;
 
-    port_state.func[command] = func;
-    port_state.opaque[command] = opaque;
+    port_state->func[command] = func;
+    port_state->opaque[command] = opaque;
 }
 
 static uint32_t vmport_ioport_read(void *opaque, uint32_t addr)
@@ -128,6 +128,7 @@  static int vmport_initfn(ISADevice *dev)
     register_ioport_read(0x5658, 1, 4, vmport_ioport_read, &s);
     register_ioport_write(0x5658, 1, 4, vmport_ioport_write, &s);
     isa_init_ioport(dev, 0x5658);
+    port_state = s;
     /* Register some generic port commands */
     vmport_register(VMPORT_CMD_GETVERSION, vmport_cmd_get_version, NULL);
     vmport_register(VMPORT_CMD_GETRAMSIZE, vmport_cmd_ram_size, NULL);