From patchwork Thu Dec 13 13:34:06 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sander Eikelenboom X-Patchwork-Id: 206184 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 5629A2C009B for ; Fri, 14 Dec 2012 04:14:50 +1100 (EST) Received: from localhost ([::1]:59446 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TjAY9-0007Ds-8K for incoming@patchwork.ozlabs.org; Thu, 13 Dec 2012 10:18:13 -0500 Received: from eggs.gnu.org ([208.118.235.92]:40847) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Tj8vm-0006LO-Bc for qemu-devel@nongnu.org; Thu, 13 Dec 2012 08:34:38 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Tj8vg-0005qK-S3 for qemu-devel@nongnu.org; Thu, 13 Dec 2012 08:34:30 -0500 Received: from static.121.164.40.188.clients.your-server.de ([188.40.164.121]:51842 helo=smtp.eikelenboom.it) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Tj8vg-0005qB-M0 for qemu-devel@nongnu.org; Thu, 13 Dec 2012 08:34:24 -0500 Received: from 76-69-ftth.on.nl ([88.159.69.76]:47980 helo=localhost.localdomain) by smtp.eikelenboom.it with esmtpsa (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.72) (envelope-from ) id 1Tj8zg-0003uR-VP; Thu, 13 Dec 2012 14:38:33 +0100 From: Sander Eikelenboom To: qemu-devel@nongnu.org Date: Thu, 13 Dec 2012 14:34:06 +0100 Message-Id: <1355405646-3226-2-git-send-email-linux@eikelenboom.it> X-Mailer: git-send-email 1.7.2.5 In-Reply-To: References: X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4.x-2.6.x [generic] X-Received-From: 188.40.164.121 X-Mailman-Approved-At: Thu, 13 Dec 2012 10:17:45 -0500 Cc: anthony.perard@citrix.com, Sander Eikelenboom , Stefano.Stabellini@eu.citrix.com, xen-devel@lists.xen.org Subject: [Qemu-devel] [PATCH v2] Fix compile errors when enabling Xen debug logging. X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org v2: - Wrap around > 80 characters - Use %"HWADDR_PRIx" format for hwaddr Signed-off-by: Sander Eikelenboom --- hw/xen_pt.c | 5 +++-- xen-all.c | 7 ++++--- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/hw/xen_pt.c b/hw/xen_pt.c index 7a3846e..7aae826 100644 --- a/hw/xen_pt.c +++ b/hw/xen_pt.c @@ -671,7 +671,8 @@ static int xen_pt_initfn(PCIDevice *d) s->is_virtfn = s->real_device.is_virtfn; if (s->is_virtfn) { XEN_PT_LOG(d, "%04x:%02x:%02x.%d is a SR-IOV Virtual Function\n", - s->real_device.domain, bus, slot, func); + s->real_device.domain, s->real_device.bus, + s->real_device.dev, s->real_device.func); } /* Initialize virtualized PCI configuration (Extended 256 Bytes) */ @@ -752,7 +753,7 @@ out: memory_listener_register(&s->memory_listener, &address_space_memory); memory_listener_register(&s->io_listener, &address_space_io); XEN_PT_LOG(d, "Real physical device %02x:%02x.%d registered successfuly!\n", - bus, slot, func); + s->hostaddr.bus, s->hostaddr.slot, s->hostaddr.function); return 0; } diff --git a/xen-all.c b/xen-all.c index 046cc2a..d0142bd 100644 --- a/xen-all.c +++ b/xen-all.c @@ -292,7 +292,8 @@ static int xen_add_to_physmap(XenIOState *state, return -1; go_physmap: - DPRINTF("mapping vram to %llx - %llx\n", start_addr, start_addr + size); + DPRINTF("mapping vram to %"HWADDR_PRIx" - %"HWADDR_PRIx"\n", + start_addr, start_addr + size); pfn = phys_offset >> TARGET_PAGE_BITS; start_gpfn = start_addr >> TARGET_PAGE_BITS; @@ -365,8 +366,8 @@ static int xen_remove_from_physmap(XenIOState *state, phys_offset = physmap->phys_offset; size = physmap->size; - DPRINTF("unmapping vram to %llx - %llx, from %llx\n", - phys_offset, phys_offset + size, start_addr); + DPRINTF("unmapping vram to %"HWADDR_PRIx" - %"HWADDR_PRIx", from ", + "%"HWADDR_PRIx"\n", phys_offset, phys_offset + size, start_addr); size >>= TARGET_PAGE_BITS; start_addr >>= TARGET_PAGE_BITS;