aboutsummaryrefslogtreecommitdiff
path: root/hw/pc.c
diff options
context:
space:
mode:
authorRichard W.M. Jones <rjones@redhat.com>2009-04-25 13:56:19 +0100
committerAnthony Liguori <aliguori@us.ibm.com>2009-05-01 09:44:11 -0500
commit9dd986ccf68f142aaafe543d80cf877716d91d4e (patch)
tree3e9627e3ca3e9414e652ae4085401b0af6b050f5 /hw/pc.c
parentffad4116b96e29e0fbe892806f97c0a6c903d30d (diff)
Hardware watchdog
Here is an updated hardware watchdog patch, which should fix everything that was raised about the previous version ... Signed-off-by: Richard W.M. Jones <rjones@redhat.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, 3 insertions, 0 deletions
diff --git a/hw/pc.c b/hw/pc.c
index 07b75f38cf..340b313cd4 100644
--- a/hw/pc.c
+++ b/hw/pc.c
@@ -37,6 +37,7 @@
#include "virtio-balloon.h"
#include "virtio-console.h"
#include "hpet_emul.h"
+#include "watchdog.h"
#include "smbios.h"
/* output Bochs bios info messages */
@@ -1023,6 +1024,8 @@ static void pc_init1(ram_addr_t ram_size, int vga_ram_size,
}
}
+ watchdog_pc_init(pci_bus);
+
for(i = 0; i < nb_nics; i++) {
NICInfo *nd = &nd_table[i];