From mboxrd@z Thu Jan 1 00:00:00 1970 From: Muli Ben-Yehuda Subject: Re: [PATCH 5/6] device assignment: support for assigning PCI devices to guests Date: Tue, 28 Oct 2008 17:32:28 +0200 Message-ID: <20081028153228.GA6737@il.ibm.com> References: <1225188410-2222-1-git-send-email-muli@il.ibm.com> <1225188410-2222-2-git-send-email-muli@il.ibm.com> <1225188410-2222-3-git-send-email-muli@il.ibm.com> <1225188410-2222-4-git-send-email-muli@il.ibm.com> <1225188410-2222-5-git-send-email-muli@il.ibm.com> <1225188410-2222-6-git-send-email-muli@il.ibm.com> <715D42877B251141A38726ABF5CABF2C018681F600@pdsmsx503.ccr.corp.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Cc: "'avi@redhat.com'" , "'kvm@vger.kernel.org'" , "'anthony@codemonkey.ws'" , Ben-Ami Yassour1 , "'amit.shah@redhat.com'" , "Kay, Allen M" To: "Han, Weidong" Return-path: Received: from mtagate6.uk.ibm.com ([195.212.29.139]:58490 "EHLO mtagate6.uk.ibm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752020AbYJ1PgT (ORCPT ); Tue, 28 Oct 2008 11:36:19 -0400 Received: from d06nrmr1407.portsmouth.uk.ibm.com (d06nrmr1407.portsmouth.uk.ibm.com [9.149.38.185]) by mtagate6.uk.ibm.com (8.13.8/8.13.8) with ESMTP id m9SFZ4Do665494 for ; Tue, 28 Oct 2008 15:35:04 GMT Received: from d06av04.portsmouth.uk.ibm.com (d06av04.portsmouth.uk.ibm.com [9.149.37.216]) by d06nrmr1407.portsmouth.uk.ibm.com (8.13.8/8.13.8/NCO v9.1) with ESMTP id m9SFZ4a7725054 for ; Tue, 28 Oct 2008 15:35:04 GMT Received: from d06av04.portsmouth.uk.ibm.com (loopback [127.0.0.1]) by d06av04.portsmouth.uk.ibm.com (8.12.11.20060308/8.13.3) with ESMTP id m9SFZ3rk026977 for ; Tue, 28 Oct 2008 15:35:04 GMT Content-Disposition: inline In-Reply-To: <715D42877B251141A38726ABF5CABF2C018681F600@pdsmsx503.ccr.corp.intel.com> Sender: kvm-owner@vger.kernel.org List-ID: On Tue, Oct 28, 2008 at 10:10:07PM +0800, Han, Weidong wrote: > > + DEBUG("r_pio=%08x e_physbase=%08x r_virtbase=%08lx value=%08x\n", > > + r_pio, (int)r_access->e_physbase, > > + (unsigned long)r_access->r_virtbase, value); > > should be (unsigned long)r_access->u.r_virtbase Thanks, actually it should be u.r_baseport for IO ports and there were a number of other bogosities there too. Here's a quick incremental patch compiled with DEBUG() enabled. >>From 9b917528647b55a1046a5a19d9e2427bb2d86db7 Mon Sep 17 00:00:00 2001 From: Muli Ben-Yehuda Date: Tue, 28 Oct 2008 17:30:30 +0200 Subject: [PATCH 1/1] fix DEBUG statements (thanks to Weidong Han for spotting) Signed-off-by: Muli Ben-Yehuda --- qemu/hw/device-assignment.c | 32 ++++++++++++++++---------------- 1 files changed, 16 insertions(+), 16 deletions(-) diff --git a/qemu/hw/device-assignment.c b/qemu/hw/device-assignment.c index 89b05f9..8b56599 100644 --- a/qemu/hw/device-assignment.c +++ b/qemu/hw/device-assignment.c @@ -63,9 +63,9 @@ static void assigned_dev_ioport_writeb(void *opaque, uint32_t addr, AssignedDevRegion *r_access = opaque; uint32_t r_pio = guest_to_host_ioport(r_access, addr); - DEBUG("r_pio=%08x e_physbase=%08x r_virtbase=%08lx value=%08x\n", + DEBUG("r_pio=%08x e_physbase=%08x r_baseport=%08lx value=%08x\n", r_pio, (int)r_access->e_physbase, - (unsigned long)r_access->r_virtbase, value); + (unsigned long)r_access->u.r_baseport, value); outb(value, r_pio); } @@ -76,9 +76,9 @@ static void assigned_dev_ioport_writew(void *opaque, uint32_t addr, AssignedDevRegion *r_access = opaque; uint32_t r_pio = guest_to_host_ioport(r_access, addr); - DEBUG("r_pio=%08x e_physbase=%08x r_virtbase=%08lx value=%08x\n", - __func__, r_pio, (int)r_access->e_physbase, - (unsigned long)r_access->r_virtbase, value); + DEBUG("r_pio=%08x e_physbase=%08x r_baseport=%08lx value=%08x\n", + r_pio, (int)r_access->e_physbase, + (unsigned long)r_access->u.r_baseport, value); outw(value, r_pio); } @@ -89,9 +89,9 @@ static void assigned_dev_ioport_writel(void *opaque, uint32_t addr, AssignedDevRegion *r_access = opaque; uint32_t r_pio = guest_to_host_ioport(r_access, addr); - DEBUG("%s: r_pio=%08x e_physbase=%08x r_virtbase=%08lx value=%08x\n", + DEBUG("r_pio=%08x e_physbase=%08x r_baseport=%08lx value=%08x\n", r_pio, (int)r_access->e_physbase, - (unsigned long)r_access->r_virtbase, value); + (unsigned long)r_access->u.r_baseport, value); outl(value, r_pio); } @@ -104,9 +104,9 @@ static uint32_t assigned_dev_ioport_readb(void *opaque, uint32_t addr) value = inb(r_pio); - DEBUG("r_pio=%08x e_physbase=%08x r_virtbase=%08lx value=%08x\n", + DEBUG("r_pio=%08x e_physbase=%08x r_=%08lx value=%08x\n", r_pio, (int)r_access->e_physbase, - (unsigned long)r_access->r_virtbase, value); + (unsigned long)r_access->u.r_baseport, value); return value; } @@ -119,9 +119,9 @@ static uint32_t assigned_dev_ioport_readw(void *opaque, uint32_t addr) value = inw(r_pio); - DEBUG("r_pio=%08x e_physbase=%08x r_virtbase=%08lx value=%08x\n", + DEBUG("r_pio=%08x e_physbase=%08x r_baseport=%08lx value=%08x\n", r_pio, (int)r_access->e_physbase, - (unsigned long)r_access->r_virtbase, value); + (unsigned long)r_access->u.r_baseport, value); return value; } @@ -134,9 +134,9 @@ static uint32_t assigned_dev_ioport_readl(void *opaque, uint32_t addr) value = inl(r_pio); - DEBUG("r_pio=%08x e_physbase=%08x r_virtbase=%08lx value=%08x\n", + DEBUG("r_pio=%08x e_physbase=%08x r_baseport=%08lx value=%08x\n", r_pio, (int)r_access->e_physbase, - (unsigned long)r_access->r_virtbase, value); + (unsigned long)r_access->u.r_baseport, value); return value; } @@ -151,8 +151,8 @@ static void assigned_dev_iomem_map(PCIDevice *pci_dev, int region_num, int first_map = (region->e_size == 0); int ret = 0; - DEBUG("e_phys=%08x r_virt=%x type=%d len=%08x region_num=%d \n", - e_phys, (uint32_t)region->r_virtbase, type, e_size, region_num); + DEBUG("e_phys=%08x r_virt=%p type=%d len=%08x region_num=%d \n", + e_phys, region->u.r_virtbase, type, e_size, region_num); region->e_physbase = e_phys; region->e_size = e_size; @@ -425,7 +425,7 @@ again: rp->valid = 1; rp->base_addr = start; rp->size = size; - DEBUG("region %d size %d start 0x%x type %d resource_fd %d\n", + DEBUG("region %d size %d start 0x%llx type %d resource_fd %d\n", r, rp->size, start, rp->type, rp->resource_fd); } fclose(f); -- 1.5.6.5