openkylin
/
qemu
mirror of https://gitee.com/openkylin/qemu.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

pc: simplify passing qemu_irq 

qemu_irq is already a pointer, no need to have an extra pointer level.

Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
This commit is contained in:
Marc-André Lureau 2016-07-15 18:42:05 +02:00
parent e305a16510
commit d80fe99de4
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
hw/i386/pc.c
View File

@ -530,9 +530,9 @@ static uint64_t port92_read(void *opaque, hwaddr addr,
return ret; return ret;
} }
static void port92_init(ISADevice *dev, qemu_irq *a20_out) static void port92_init(ISADevice *dev, qemu_irq a20_out)
{ {
qdev_connect_gpio_out_named(DEVICE(dev), PORT92_A20_LINE, 0, *a20_out); qdev_connect_gpio_out_named(DEVICE(dev), PORT92_A20_LINE, 0, a20_out);
} }
static const VMStateDescription vmstate_port92_isa = { static const VMStateDescription vmstate_port92_isa = {
@ -1594,7 +1594,7 @@ void pc_basic_device_init(ISABus *isa_bus, qemu_irq *gsi,
a20_line = qemu_allocate_irqs(handle_a20_line_change, first_cpu, 2); a20_line = qemu_allocate_irqs(handle_a20_line_change, first_cpu, 2);
i8042 = isa_create_simple(isa_bus, "i8042"); i8042 = isa_create_simple(isa_bus, "i8042");
i8042_setup_a20_line(i8042, &a20_line[0]); i8042_setup_a20_line(i8042, a20_line[0]);
if (!no_vmport) { if (!no_vmport) {
vmport_init(isa_bus); vmport_init(isa_bus);
vmmouse = isa_try_create(isa_bus, "vmmouse"); vmmouse = isa_try_create(isa_bus, "vmmouse");
@ -1607,7 +1607,7 @@ void pc_basic_device_init(ISABus *isa_bus, qemu_irq *gsi,
qdev_init_nofail(dev); qdev_init_nofail(dev);
} }
port92 = isa_create_simple(isa_bus, "port92"); port92 = isa_create_simple(isa_bus, "port92");
port92_init(port92, &a20_line[1]); port92_init(port92, a20_line[1]);
DMA_init(isa_bus, 0); DMA_init(isa_bus, 0);

4
hw/input/pckbd.c
View File

@ -499,9 +499,9 @@ void i8042_isa_mouse_fake_event(void *opaque)
ps2_mouse_fake_event(s->mouse); ps2_mouse_fake_event(s->mouse);
} }
void i8042_setup_a20_line(ISADevice *dev, qemu_irq *a20_out) void i8042_setup_a20_line(ISADevice *dev, qemu_irq a20_out)
{ {
qdev_connect_gpio_out_named(DEVICE(dev), I8042_A20_LINE, 0, *a20_out); qdev_connect_gpio_out_named(DEVICE(dev), I8042_A20_LINE, 0, a20_out);
} }
static const VMStateDescription vmstate_kbd_isa = { static const VMStateDescription vmstate_kbd_isa = {

2
include/hw/i386/pc.h
View File

@ -220,7 +220,7 @@ void i8042_mm_init(qemu_irq kbd_irq, qemu_irq mouse_irq,
MemoryRegion *region, ram_addr_t size, MemoryRegion *region, ram_addr_t size,
hwaddr mask); hwaddr mask);
void i8042_isa_mouse_fake_event(void *opaque); void i8042_isa_mouse_fake_event(void *opaque);
void i8042_setup_a20_line(ISADevice *dev, qemu_irq *a20_out); void i8042_setup_a20_line(ISADevice *dev, qemu_irq a20_out);
/* pc.c */ /* pc.c */
extern int fd_bootchk; extern int fd_bootchk;