summary refs log tree commit diff stats
path: root/hw/pc.c
diff options
context:
space:
mode:
authorJan Kiszka <jan.kiszka@siemens.com>2012-02-17 11:24:34 +0100
committerAnthony Liguori <aliguori@us.ibm.com>2012-02-17 09:58:22 -0600
commit302fe51b5900c5ca5be921269b61f4862e0634ce (patch)
treeee0e3e9a4c73dc3d858cb8eae83b61a5144fa4e5 /hw/pc.c
parentce967e2f33861b0e17753f97fa4527b5943c94b6 (diff)
downloadfocaccia-qemu-302fe51b5900c5ca5be921269b61f4862e0634ce.tar.gz
focaccia-qemu-302fe51b5900c5ca5be921269b61f4862e0634ce.zip
pcspk: Convert to qdev
Convert the PC speaker device to a qdev ISA model. Move the public
interface to a dedicated header file at this chance.

CC: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'hw/pc.c')
-rw-r--r--hw/pc.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/hw/pc.c b/hw/pc.c
index 8e265637bc..57461291ef 100644
--- a/hw/pc.c
+++ b/hw/pc.c
@@ -37,6 +37,7 @@
 #include "multiboot.h"
 #include "mc146818rtc.h"
 #include "i8254.h"
+#include "pcspk.h"
 #include "msi.h"
 #include "sysbus.h"
 #include "sysemu.h"
@@ -1172,7 +1173,7 @@ void pc_basic_device_init(ISABus *isa_bus, qemu_irq *gsi,
         /* connect PIT to output control line of the HPET */
         qdev_connect_gpio_out(hpet, 0, qdev_get_gpio_in(&pit->qdev, 0));
     }
-    pcspk_init(pit);
+    pcspk_init(isa_bus, pit);
 
     for(i = 0; i < MAX_SERIAL_PORTS; i++) {
         if (serial_hds[i]) {