summaryrefslogtreecommitdiff
path: root/hw/pc.c
diff options
context:
space:
mode:
authorBlue Swirl <blauwirbel@gmail.com>2011-02-05 14:34:45 +0000
committerBlue Swirl <blauwirbel@gmail.com>2011-02-12 09:34:56 +0000
commit91c9e09147ba1f3604a3d5d29b4de7702082a33f (patch)
treee562f07f9e783b45aea32999858ac2d6ca0c3c3f /hw/pc.c
parent6872ef610bad337701e0dcb0ab06558c04a0146f (diff)
downloadqemu-91c9e09147ba1f3604a3d5d29b4de7702082a33f.tar.gz
qemu-91c9e09147ba1f3604a3d5d29b4de7702082a33f.tar.bz2
qemu-91c9e09147ba1f3604a3d5d29b4de7702082a33f.zip
vmmouse: convert to qdev
Convert to qdev, also add a proper reset function. Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
Diffstat (limited to 'hw/pc.c')
-rw-r--r--hw/pc.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/hw/pc.c b/hw/pc.c
index c698161fe6..cde20c06da 100644
--- a/hw/pc.c
+++ b/hw/pc.c
@@ -1096,7 +1096,7 @@ void pc_basic_device_init(qemu_irq *isa_irq,
PITState *pit;
qemu_irq rtc_irq = NULL;
qemu_irq *a20_line;
- ISADevice *i8042, *port92;
+ ISADevice *i8042, *port92, *vmmouse;
qemu_irq *cpu_exit_irq;
register_ioport_write(0x80, 1, 1, ioport80_write, NULL);
@@ -1134,7 +1134,8 @@ void pc_basic_device_init(qemu_irq *isa_irq,
i8042 = isa_create_simple("i8042");
i8042_setup_a20_line(i8042, &a20_line[0]);
vmport_init();
- vmmouse_init(i8042);
+ vmmouse = isa_create("vmmouse");
+ qdev_prop_set_ptr(&vmmouse->qdev, "ps2_mouse", i8042);
port92 = isa_create_simple("port92");
port92_init(port92, &a20_line[1]);