Attachment 614372 Details for Bug 849223 – additional debug messages for qemu-dm

[patch] additional debug messages for qemu-dm

0001-debug-messages-for-bz849223.patch (text/plain), 5.68 KB, created by Laszlo Ersek on 2012-09-19 13:36:19 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Laszlo Ersek

Created: 2012-09-19 13:36:19 UTC

Size: 5.68 KB

patch

obsolete

>From afeaa8526b301aa9d97c4fdc49d38b6c47128f68 Mon Sep 17 00:00:00 2001
>From: Laszlo Ersek <lersek@redhat.com>
>Date: Wed, 19 Sep 2012 14:49:44 +0200
>Subject: [PATCH] debug messages for bz849223
>
>
>Signed-off-by: Laszlo Ersek <lersek@redhat.com>
>---
> tools/ioemu/hw/pass-through.c |   21 +++++++++++++++++++--
> tools/ioemu/hw/pt-msi.c       |   22 ++++++++++++++++++++--
> 2 files changed, 39 insertions(+), 4 deletions(-)
>
>diff --git a/tools/ioemu/hw/pass-through.c b/tools/ioemu/hw/pass-through.c
>index 6f35998..9ad519e 100644
>--- a/tools/ioemu/hw/pass-through.c
>+++ b/tools/ioemu/hw/pass-through.c
>@@ -875,8 +875,12 @@ void pt_iomem_map(PCIDevice *d, int i, uint32_t e_phys, uint32_t e_size,
>     if ( e_size == 0 )
>         return;
> 
>+    PT_LOG("1\n");
>+
>     if ( !first_map && old_ebase != -1 )
>     {
>+        PT_LOG("2\n");
>+
>         add_msix_mapping(assigned_device, i);
>         /* Remove old mapping */
>         ret = xc_domain_memory_mapping(xc_handle, domid,
>@@ -891,9 +895,13 @@ void pt_iomem_map(PCIDevice *d, int i, uint32_t e_phys, uint32_t e_size,
>         }
>     }
> 
>+    PT_LOG("3\n");
>+
>     /* map only valid guest address */
>     if (e_phys != -1)
>     {
>+        PT_LOG("4\n");
>+
>         /* Create new mapping */
>         ret = xc_domain_memory_mapping(xc_handle, domid,
>                 assigned_device->bases[i].e_physbase >> XC_PAGE_SHIFT,
>@@ -910,8 +918,10 @@ void pt_iomem_map(PCIDevice *d, int i, uint32_t e_phys, uint32_t e_size,
>         if ( ret != 0 )
>             PT_LOG("Error: remove MSI-X mmio mapping failed!\n");
> 
>-        if ( old_ebase != e_phys && old_ebase != -1 )
>+        if ( old_ebase != e_phys && old_ebase != -1 ) {
>+            PT_LOG("5\n");
>             pt_msix_update_remap(assigned_device, i);
>+        }
>     }
> }
> 
>@@ -3011,6 +3021,9 @@ static int pt_msixctrl_reg_write(struct pt_dev *ptdev,
> 
>     /* modify emulate register */
>     writable_mask = reg->emu_mask & ~reg->ro_mask & valid_mask;
>+    PT_LOG("emu_mask=%04x ro_mask=%04x valid_mask=%04x writable_mask=%04x\n",
>+           reg->emu_mask, reg->ro_mask, valid_mask, writable_mask);
>+    PT_LOG("value=%04x dev_value=%04x\n", *value, dev_value);
>     cfg_entry->data = ((*value & writable_mask) |
>                        (cfg_entry->data & ~writable_mask));
> 
>@@ -3019,12 +3032,16 @@ static int pt_msixctrl_reg_write(struct pt_dev *ptdev,
>     /* create value for writing to I/O device register */
>     throughable_mask = ~reg->emu_mask & valid_mask;
>     *value = ((*value & throughable_mask) | (dev_value & ~throughable_mask));
>+    PT_LOG("throughable_mask=%04x new_value=%04x", throughable_mask, *value);
> 
>     /* update MSI-X */
>-    if ((*value & PCI_MSIX_ENABLE) && !(*value & PCI_MSIX_MASK))
>+    if ((*value & PCI_MSIX_ENABLE) && !(*value & PCI_MSIX_MASK)) {
>+        PT_LOG("1\n");
>         pt_msix_update(ptdev);
>+    }
> 
>     ptdev->msix->enabled = !!(*value & PCI_MSIX_ENABLE);
>+    PT_LOG("msix_enabled=%d\n", ptdev->msix->enabled);
> 
>     return 0;
> }
>diff --git a/tools/ioemu/hw/pt-msi.c b/tools/ioemu/hw/pt-msi.c
>index 6c94bde..6fbcaee 100644
>--- a/tools/ioemu/hw/pt-msi.c
>+++ b/tools/ioemu/hw/pt-msi.c
>@@ -192,12 +192,16 @@ static int pt_msix_update_one(struct pt_dev *dev, int entry_nr)
>     uint32_t gflags = __get_msi_gflags(entry->io_mem[2], gaddr);
>     int ret;
> 
>+    PT_LOG("1\n");
>     if ( !entry->flags )
>         return 0;
> 
>+    PT_LOG("2\n");
>+
>     /* Check if this entry is already mapped */
>     if ( entry->pirq == -1 )
>     {
>+        PT_LOG("3\n");
>         ret = xc_physdev_map_pirq_msi(xc_handle, domid, AUTO_ASSIGN, &pirq,
>                                 dev->pci_dev->dev << 3 | dev->pci_dev->func,
>                                 dev->pci_dev->bus, entry_nr,
>@@ -220,6 +224,7 @@ static int pt_msix_update_one(struct pt_dev *dev, int entry_nr)
>         return ret;
>     }
> 
>+    PT_LOG("4\n");
>     entry->flags = 0;
> 
>     return 0;
>@@ -234,8 +239,10 @@ int pt_msix_update(struct pt_dev *dev)
>               dev->pci_dev->dev << 3 | dev->pci_dev->func,
>               dev->pci_dev->bus, dev->msix->mmio_base_addr);
> 
>+    PT_LOG("1\n");
>     for ( i = 0; i < msix->total_entries; i++ )
>     {
>+        PT_LOG("2: %d\n", i);
>         pt_msix_update_one(dev, i);
>     }
> 
>@@ -297,14 +304,19 @@ int pt_msix_update_remap(struct pt_dev *dev, int bar_index)
>     struct msix_entry_info *entry;
>     int i, ret;
> 
>+    PT_LOG("1\n");
>     if ( !(dev->msix && dev->msix->bar_index == bar_index) )
>         return 0;
> 
>+    PT_LOG("2\n");
>     for ( i = 0; i < dev->msix->total_entries; i++ )
>     {
>+        PT_LOG("3: %d\n", i);
>         entry = &dev->msix->msix_entry[i];
>         if ( entry->pirq != -1 )
>         {
>+            PT_LOG("4: %d\n", i);
>+
>             ret = xc_domain_unbind_pt_irq(xc_handle, domid, entry->pirq,
>                                           PT_IRQ_TYPE_MSI, 0, 0, 0, 0);
>             if ( ret )
>@@ -333,6 +345,7 @@ static void pci_msix_writel(void *opaque, target_phys_addr_t addr, uint32_t val)
>     void *phys_off;
>     uint32_t vec_ctrl;
> 
>+    PT_LOG("1\n");
>     if ( addr % 4 )
>     {
>         PT_LOG("unaligned dword access to MSI-X table, addr %016lx\n",
>@@ -358,14 +371,19 @@ static void pci_msix_writel(void *opaque, target_phys_addr_t addr, uint32_t val)
>         return;
>     }
> 
>-    if ( offset != 3 && entry->io_mem[offset] != val )
>+    if ( offset != 3 && entry->io_mem[offset] != val ) {
>+        PT_LOG("2\n");
>         entry->flags = 1;
>+    }
>     entry->io_mem[offset] = val;
> 
>     if ( offset == 3 )
>     {
>-        if ( msix->enabled && !(val & 0x1) )
>+        PT_LOG("3\n");
>+        if ( msix->enabled && !(val & 0x1) ) {
>+            PT_LOG("4\n");
>             pt_msix_update_one(dev, entry_nr);
>+        }
>         mask_physical_msix_entry(dev, entry_nr, entry->io_mem[3] & 0x1);
>     }
> }
>-- 
>1.7.1
>

Actions: View | Diff

Attachments on bug 849223: 606043 | 606044 | 606045 | 606046 | 606050 | 606051 | 606365 | 606370 | 606639 | 610520 | 611505 | 613668 | 614372 | 614373 | 614374 | 614596 | 615391 | 615392 | 615482 | 616740 | 617217 | 617218 | 617260 | 617261 | 617528 | 617541 | 617718 | 618009 | 618145 | 618240 | 618241 | 618312