Merge branch 'master' of /home/nchip/public_html/qemu into garage-push

[qemu] / hw / acpi.c

diff --git a/hw/acpi.c b/hw/acpi.c
index dbaf18a..fccae69 100644 (file)
--- a/hw/acpi.c
+++ b/hw/acpi.c
@@ -548,9 +548,9 @@ i2c_bus *piix4_pm_init(PCIBus *bus, int devfn, uint32_t smb_io_base,
 
     register_savevm("piix4_pm", 0, 1, pm_save, pm_load, s);
 
-    s->smbus = i2c_init_bus();
+    s->smbus = i2c_init_bus(NULL, "i2c");
     s->irq = sci_irq;
-    qemu_register_reset(piix4_reset, s);
+    qemu_register_reset(piix4_reset, 0, s);
 
     return s->smbus;
 }