OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

Fix vmport segfault (v2)

Browse Source 
Fix regression caused by qdev conversion.

Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
This commit is contained in:
Marcelo Tosatti 2011-02-17 01:27:19 -02:00 committed by Blue Swirl
parent 79f2b6fcdb
commit e14da0af64
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
hw/vmport.c
View File

@ -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);