Fixed merge conflict in vmm_halt.c

[palacios.git] / palacios / src / devices / pci_front.c

diff --git a/palacios/src/devices/pci_front.c b/palacios/src/devices/pci_front.c
index eb73076..68428b5 100644 (file)
--- a/palacios/src/devices/pci_front.c
+++ b/palacios/src/devices/pci_front.c
@@ -57,7 +57,7 @@
 #include <interfaces/vmm_host_dev.h>
 
 
-#ifndef CONFIG_DEBUG_PCI_FRONT
+#ifndef V3_CONFIG_DEBUG_PCI_FRONT
 #undef PrintDebug
 #define PrintDebug(fmt, args...)
 #endif
@@ -151,7 +151,7 @@ static int push_config(struct pci_front_internal *state, uint8_t *config)
 
 static int pull_config(struct pci_front_internal *state, uint8_t *config)
 {
-    if (v3_host_dev_config_read(state->host_dev, 0, config, 256) != 256) { 
+    if (v3_host_dev_read_config(state->host_dev, 0, config, 256) != 256) { 
        return -1;
     } else {
        return 0;
@@ -607,7 +607,7 @@ static int pci_bar_write(int bar_num, uint32_t * src, void * private_data) {
 }
 
 
-static int pci_front_config_update(uint_t reg_num, void * src, uint_t length, void * private_data) 
+static int pci_front_config_update(struct pci_device *pci_dev, uint_t reg_num, void * src, uint_t length, void * private_data) 
 {
     int i;
     struct vm_device * dev = (struct vm_device *)private_data;
@@ -625,7 +625,7 @@ static int pci_front_config_update(uint_t reg_num, void * src, uint_t length, vo
 
     PrintDebug("\n");
 
-    if (v3_host_dev_config_write(state->host_dev,
+    if (v3_host_dev_write_config(state->host_dev,
                                 pci_addr.value,
                                 src,
                                 length) != length) { 
@@ -690,6 +690,7 @@ static int setup_virt_pci_dev(struct v3_vm_info * vm_info, struct vm_device * de
                                     bus_num, -1, 0, 
                                     state->name, bars,
                                     pci_front_config_update,
+                                    NULL,      // no suport for config reads
                                     NULL,      // no support for command updates
                                     NULL,      // no support for expansion roms              
                                     dev);