| Message ID | 20110217032719.GA22836@amt.cnet |
|---|---|
| State | New |
| Headers | show |
Thanks, applied. On Thu, Feb 17, 2011 at 5:27 AM, Marcelo Tosatti <mtosatti@redhat.com> wrote: > Fix regression caused by qdev conversion. > > Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com> > > v2: pass correct register_ioport parameter > > diff --git a/hw/vmport.c b/hw/vmport.c > index 292d78f..19010e4 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) > @@ -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); >
diff --git a/hw/vmport.c b/hw/vmport.c index 292d78f..19010e4 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) @@ -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);
Fix regression caused by qdev conversion. Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com> v2: pass correct register_ioport parameter