X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fdevices%2Fpci.c;h=0d11ed593d4da336d401b9f8d1aaa9a19d9e1e5c;hb=c4a5d877f7cbd0419439af4adf600dde225e9564;hp=ef4f4854e65db4cfc0a91bb4831f0487b98fcfe4;hpb=13fb068168e2826db39a481cf85033bb0156d2f9;p=palacios.git diff --git a/palacios/src/devices/pci.c b/palacios/src/devices/pci.c index ef4f485..0d11ed5 100644 --- a/palacios/src/devices/pci.c +++ b/palacios/src/devices/pci.c @@ -32,7 +32,7 @@ #include #include -#ifndef DEBUG_PCI +#ifndef CONFIG_DEBUG_PCI #undef PrintDebug #define PrintDebug(fmt, args...) #endif @@ -99,7 +99,7 @@ struct pci_internal { -#ifdef DEBUG_PCI +#ifdef CONFIG_DEBUG_PCI static void pci_dump_state(struct pci_internal * pci_state) { struct rb_node * node = v3_rb_first(&(pci_state->bus_list[0].devices)); @@ -385,14 +385,14 @@ static inline int is_cfg_reg_writable(uchar_t header_type, int reg_num) { static int bar_update(struct pci_device * pci, int bar_num, uint32_t new_val) { struct v3_pci_bar * bar = &(pci->bar[bar_num]); - PrintError("Updating BAR Register (Dev=%s) (bar=%d) (old_val=0x%x) (new_val=0x%x)\n", + PrintDebug("Updating BAR Register (Dev=%s) (bar=%d) (old_val=0x%x) (new_val=0x%x)\n", pci->name, bar_num, bar->val, new_val); switch (bar->type) { case PCI_BAR_IO: { int i = 0; - PrintError("\tRehooking %d IO ports from base 0x%x to 0x%x for %d ports\n", + PrintDebug("\tRehooking %d IO ports from base 0x%x to 0x%x for %d ports\n", bar->num_ports, PCI_IO_BASE(bar->val), PCI_IO_BASE(new_val), bar->num_ports); @@ -403,7 +403,7 @@ static int bar_update(struct pci_device * pci, int bar_num, uint32_t new_val) { for (i = 0; i < bar->num_ports; i++) { - PrintError("Rehooking PCI IO port (old port=%u) (new port=%u)\n", + PrintDebug("Rehooking PCI IO port (old port=%u) (new port=%u)\n", PCI_IO_BASE(bar->val) + i, PCI_IO_BASE(new_val) + i); v3_dev_unhook_io(pci->vm_dev, PCI_IO_BASE(bar->val) + i); @@ -875,12 +875,9 @@ struct pci_device * v3_pci_register_device(struct vm_device * pci, // add the device add_device_to_bus(bus, pci_dev); -#ifdef DEBUG_PCI +#ifdef CONFIG_DEBUG_PCI pci_dump_state(pci_state); #endif return pci_dev; } - - -