From patchwork Tue Dec 29 02:24:36 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kusanagi Kouichi X-Patchwork-Id: 70074 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.3/8.14.2) with ESMTP id nBT2Ofo2027612 for ; Tue, 29 Dec 2009 02:24:41 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751583AbZL2CYj (ORCPT ); Mon, 28 Dec 2009 21:24:39 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751510AbZL2CYi (ORCPT ); Mon, 28 Dec 2009 21:24:38 -0500 Received: from msa105.auone-net.jp ([61.117.18.165]:54138 "EHLO msa105.auone-net.jp" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751470AbZL2CYi (ORCPT ); Mon, 28 Dec 2009 21:24:38 -0500 Received: from ppp.dion.ne.jp (ZR170078.ppp.dion.ne.jp [222.14.170.78]) by msa105.auone-net.jp (au one net msa) with ESMTP id 0F7A36FC039 for ; Tue, 29 Dec 2009 11:24:36 +0900 (JST) Date: Tue, 29 Dec 2009 11:24:36 +0900 From: Kusanagi Kouichi To: kvm@vger.kernel.org Subject: [PATCH] Fix build failure with DEVICE_ASSIGNMENT_DEBUG. MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.20 (2009-06-14) Message-Id: <20091229022437.0F7A36FC039@msa105.auone-net.jp> Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org diff --git a/hw/device-assignment.c b/hw/device-assignment.c index 110fd37..f4a1e32 100644 --- a/hw/device-assignment.c +++ b/hw/device-assignment.c @@ -232,7 +232,7 @@ static void assigned_dev_iomem_map_slow(PCIDevice *pci_dev, int region_num, PCIRegion *real_region = &r_dev->real_device.regions[region_num]; int m; - DEBUG("slow map\n"); + DEBUG("%s", "slow map\n"); if (region_num == PCI_ROM_SLOT) m = cpu_register_io_memory(slow_bar_read, NULL, region); else @@ -261,7 +261,7 @@ 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=%p type=%d len=%08x region_num=%d \n", + DEBUG("e_phys=%08" FMT_PCIBUS " r_virt=%p type=%d len=%08" FMT_PCIBUS " region_num=%d \n", e_phys, region->u.r_virtbase, type, e_size, region_num); region->e_physbase = e_phys; @@ -310,7 +310,7 @@ static void assigned_dev_ioport_map(PCIDevice *pci_dev, int region_num, region->e_physbase = addr; region->e_size = size; - DEBUG("e_phys=0x%x r_baseport=%x type=0x%x len=%d region_num=%d \n", + DEBUG("e_phys=0x%" FMT_PCIBUS " r_baseport=%x type=0x%x len=%" FMT_PCIBUS " region_num=%d \n", addr, region->u.r_baseport, type, size, region_num); if (first_map) { @@ -1267,7 +1267,7 @@ static void msix_mmio_writel(void *opaque, unsigned int offset = addr & 0xfff; void *page = adev->msix_table_page; - DEBUG("write to MSI-X entry table mmio offset 0x%lx, val 0x%lx\n", + DEBUG("write to MSI-X entry table mmio offset 0x%lx, val 0x%x\n", addr, val); memcpy((void *)((char *)page + offset), &val, 4); }