Merge remote-tracking branch 'kiszka/master'

[jailhouse.git] / hypervisor / pci.c

diff --git a/hypervisor/pci.c b/hypervisor/pci.c
index 7e501dd2644fef56a3e90bb5b5ee44a065ec9086..12424666b5c874a09513e1b8171fabecda24ef90 100644 (file)
--- a/hypervisor/pci.c
+++ b/hypervisor/pci.c
@@ -458,7 +458,7 @@ static enum mmio_result pci_mmconfig_access_handler(void *arg,
 
 invalid_access:
        panic_printk("FATAL: Invalid PCI MMCONFIG write, device %02x:%02x.%x, "
-                    "reg: %\n", PCI_BDF_PARAMS(mmio->address >> 12),
+                    "reg: %x\n", PCI_BDF_PARAMS(mmio->address >> 12),
                     reg_addr);
        return MMIO_ERROR;
 
@@ -661,6 +661,9 @@ int pci_cell_init(struct cell *cell)
                mmio_region_register(cell, mmcfg_start, mmcfg_size,
                                     pci_mmconfig_access_handler, NULL);
 
+       if (cell->config->num_pci_devices == 0)
+               return 0;
+
        cell->pci_devices = page_alloc(&mem_pool, devlist_pages);
        if (!cell->pci_devices)
                return -ENOMEM;