Skip to contentSkip to conversation

Fix vmport segfault

PATCH New Marcelo Tosatti 2 participants 3 messages Feb 17, 2011

lore
Share & tools
lore

Marcelo Tosatti

author
#0 lore raw

PATCH 1/1 Fix vmport segfault

Fix regression caused by qdev conversion.

Signed-off-by Marcelo Tosatti <[email protected]>
hw/vmport.c +4 -3
index 292d78f..38ec259 100644
@@ -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);
author
#1 lore raw

PATCH 1/1 Fix vmport segfault (v2)

Fix regression caused by qdev conversion.

Signed-off-by Marcelo Tosatti <[email protected]>

v2: pass correct register_ioport parameter

hw/vmport.c +6 -5
index 292d78f..19010e4 100644
@@ -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)

@@ -125,9 +125,10 @@ static int vmport_initfn(ISADevice *dev)
 {
     VMPortState *s = DO_UPCAST(VMPortState, dev, dev);
 
-    register_ioport_read(0x5658, 1, 4, vmport_ioport_read, &s);
-    register_ioport_write(0x5658, 1, 4, vmport_ioport_write, &s);
+    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);
Applied
#2 lore raw

[Qemu-devel] Re: [PATCH] Fix vmport segfault (v2)

Thanks, applied.

Quoted 43 lines · Marcelo Tosatti

Fix regression caused by qdev conversion.

Signed-off-by Marcelo Tosatti <[email protected]>

v2: pass correct register_ioport parameter

hw/vmport.c +6 -5
index 292d78f..19010e4 100644
@@ -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)

@@ -125,9 +125,10 @@ static int vmport_initfn(ISADevice *dev)
  {
     VMPortState *s = DO_UPCAST(VMPortState, dev, dev);
 
-    register_ioport_read(0x5658, 1, 4, vmport_ioport_read, &s);
-    register_ioport_write(0x5658, 1, 4, vmport_ioport_write, &s);
+    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);