X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?p=palacios.git;a=blobdiff_plain;f=palacios%2Fsrc%2Fdevices%2Fpiix3.c;h=377c8457ec8fcf3513b61a63f70e39f027b8a524;hp=73fd46c453adead6fc2cc00fa3c0e3b631685530;hb=123a1ba27ea09c8fa77a1b36ce625b43d7c48b14;hpb=23b1c1715de4e064ee134b15273b3935ecfb8b74

diff --git a/palacios/src/devices/piix3.c b/palacios/src/devices/piix3.c
index 73fd46c..377c845 100644
--- a/palacios/src/devices/piix3.c
+++ b/palacios/src/devices/piix3.c
@@ -19,9 +19,13 @@
  
 
 #include <palacios/vmm.h>
+#include <palacios/vmm_dev_mgr.h>
+#include <palacios/vmm_intr.h>
+
 #include <devices/pci.h>
 #include <devices/southbridge.h>
 
+
 struct iort_reg {
     union {
 	uint8_t value;
@@ -367,7 +371,7 @@ static int raise_pci_irq(struct vm_device * dev, struct pci_device * pci_dev) {
     int intr_pin = pci_dev->config_header.intr_pin - 1;
     int irq_index = (intr_pin + pci_dev->dev_num - 1) & 0x3;
     
-    //    PrintError("Raising PCI IRQ %d\n", piix3_cfg->pirq_rc[irq_index]);
+    //        PrintError("Raising PCI IRQ %d\n", piix3_cfg->pirq_rc[irq_index]);
     
     v3_raise_irq(dev->vm, piix3_cfg->pirq_rc[irq_index]);
 
@@ -441,10 +445,11 @@ static int setup_pci(struct vm_device * dev) {
     return 0;
 }
 
-static int piix3_init(struct guest_info * vm, void * cfg_data) {
+static int piix3_init(struct guest_info * vm, v3_cfg_tree_t * cfg) {
     struct v3_southbridge * piix3 = (struct v3_southbridge *)V3_Malloc(sizeof(struct v3_southbridge));
     struct vm_device * dev = NULL;
-    struct vm_device * pci = v3_find_dev(vm, (char *)cfg_data);
+    struct vm_device * pci = v3_find_dev(vm, v3_cfg_val(cfg, "bus"));
+    char * name = v3_cfg_val(cfg, "name");
 
     if (!pci) {
 	PrintError("Could not find PCI device\n");
@@ -454,10 +459,10 @@ static int piix3_init(struct guest_info * vm, void * cfg_data) {
     piix3->pci_bus = pci;
     piix3->type = V3_SB_PIIX3;
     
-    dev = v3_allocate_device("PIIX3", &dev_ops, piix3);
+    dev = v3_allocate_device(name, &dev_ops, piix3);
 
     if (v3_attach_device(vm, dev) == -1) {
-	PrintError("Could not attach device %s\n", "PIIX3");
+	PrintError("Could not attach device %s\n", name);
 	return -1;
     }