From patchwork Fri Feb 27 14:07:17 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jiri Pirko X-Patchwork-Id: 444294 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 8381C1400D5 for ; Sat, 28 Feb 2015 01:07:49 +1100 (AEDT) Received: from localhost ([::1]:36728 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YRLZz-0001NH-EU for incoming@patchwork.ozlabs.org; Fri, 27 Feb 2015 09:07:47 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:55274) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YRLZc-0000cF-7e for qemu-devel@nongnu.org; Fri, 27 Feb 2015 09:07:25 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YRLZY-0004fU-34 for qemu-devel@nongnu.org; Fri, 27 Feb 2015 09:07:24 -0500 Received: from mail-wi0-f180.google.com ([209.85.212.180]:37479) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YRLZX-0004eD-Qd for qemu-devel@nongnu.org; Fri, 27 Feb 2015 09:07:20 -0500 Received: by wivr20 with SMTP id r20so457055wiv.2 for ; Fri, 27 Feb 2015 06:07:19 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=C+5W/7MAWIRuljne/OeU5UaG9tIfjGVvSYeiAit3aj8=; b=NfAVpWj6slc2EjIbJZkRNYMU409I4e4fKks1gNO/w9lXIHOuJzL6D9wmBpgBST3pHh Dy1Biq3IuAGhyq9OJ01x9GncYYK/Hho2REmXI9nfLCH9eBTBvQKHpU0dqsiIIIdEmj0q cusE2EQn6YbKwd0ikw5VRqH8Js/Ac/Eyu+n+ue4/+DZWe5TVPCCX0p0P+KFCVqpm0F8o EC00dmH+4kgRmnHKP+DfrZNbed/hjgZGEUJUa+oI1spuedbkA7YidlCEewkv3/e5wIa2 tIW1mygYXqsESDFU9lk1pvgKUCZUFhuXKEn8ls3t15zRS6yH7XjfQu07pw7W93iTVOfK gtkg== X-Gm-Message-State: ALoCoQm1aARscXe4PG97zqZ+E+uoQfO4p/VG9wCdLoAOyP1vJQEnJMoFnOzlkd7AL9owiURrT5X0 X-Received: by 10.180.211.101 with SMTP id nb5mr6535878wic.37.1425046039309; Fri, 27 Feb 2015 06:07:19 -0800 (PST) Received: from localhost ([2001:470:6f:505:2ad2:44ff:fe9d:d2f6]) by mx.google.com with ESMTPSA id q10sm6087783wjr.41.2015.02.27.06.07.18 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 27 Feb 2015 06:07:18 -0800 (PST) From: Jiri Pirko To: qemu-devel@nongnu.org Date: Fri, 27 Feb 2015 15:07:17 +0100 Message-Id: <1425046037-2092-1-git-send-email-jiri@resnulli.us> X-Mailer: git-send-email 1.9.3 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.85.212.180 Cc: sfeldma@gmail.com, stefanha@redhat.com Subject: [Qemu-devel] [patch qemu] rocker: fix 32bit build 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 For printf format of uint64_t and size_t use TARGET_FMT_plx and %zu Signed-off-by: Jiri Pirko --- hw/net/rocker/rocker.c | 32 +++++++++++++++++--------------- hw/net/rocker/rocker_desc.c | 6 +++--- 2 files changed, 20 insertions(+), 18 deletions(-) diff --git a/hw/net/rocker/rocker.c b/hw/net/rocker/rocker.c index 672cf5a..4105275 100644 --- a/hw/net/rocker/rocker.c +++ b/hw/net/rocker/rocker.c @@ -774,8 +774,8 @@ static void rocker_io_writel(void *opaque, hwaddr addr, uint32_t val) } break; default: - DPRINTF("not implemented dma reg write(l) addr=0x%lx " - "val=0x%08x (ring %d, addr=0x%02x)\n", + DPRINTF("not implemented dma reg write(l) addr=0x" TARGET_FMT_plx + " val=0x%08x (ring %d, addr=0x%02x)\n", addr, val, index, offset); break; } @@ -816,7 +816,8 @@ static void rocker_io_writel(void *opaque, hwaddr addr, uint32_t val) r->lower32 = 0; break; default: - DPRINTF("not implemented write(l) addr=0x%lx val=0x%08x\n", addr, val); + DPRINTF("not implemented write(l) addr=0x" TARGET_FMT_plx + " val=0x%08x\n", addr, val); break; } } @@ -834,8 +835,8 @@ static void rocker_io_writeq(void *opaque, hwaddr addr, uint64_t val) desc_ring_set_base_addr(r->rings[index], val); break; default: - DPRINTF("not implemented dma reg write(q) addr=0x%lx " - "val=0x%016lx (ring %d, offset=0x%02x)\n", + DPRINTF("not implemented dma reg write(q) addr=0x" TARGET_FMT_plx + " val=0x" TARGET_FMT_plx " (ring %d, offset=0x%02x)\n", addr, val, index, offset); break; } @@ -853,8 +854,8 @@ static void rocker_io_writeq(void *opaque, hwaddr addr, uint64_t val) rocker_port_phys_enable_write(r, val); break; default: - DPRINTF("not implemented write(q) addr=0x%lx val=0x%016lx\n", - addr, val); + DPRINTF("not implemented write(q) addr=0x" TARGET_FMT_plx + " val=0x" TARGET_FMT_plx "\n", addr, val); break; } } @@ -945,7 +946,8 @@ static const char *rocker_reg_name(void *opaque, hwaddr addr) static void rocker_mmio_write(void *opaque, hwaddr addr, uint64_t val, unsigned size) { - DPRINTF("Write %s addr %lx, size %u, val %lx\n", + DPRINTF("Write %s addr " TARGET_FMT_plx + ", size %u, val " TARGET_FMT_plx "\n", rocker_reg_name(opaque, addr), addr, size, val); switch (size) { @@ -1017,8 +1019,8 @@ static uint32_t rocker_io_readl(void *opaque, hwaddr addr) ret = desc_ring_get_credits(r->rings[index]); break; default: - DPRINTF("not implemented dma reg read(l) addr=0x%lx " - "(ring %d, addr=0x%02x)\n", addr, index, offset); + DPRINTF("not implemented dma reg read(l) addr=0x" TARGET_FMT_plx + " (ring %d, addr=0x%02x)\n", addr, index, offset); ret = 0; break; } @@ -1072,7 +1074,7 @@ static uint32_t rocker_io_readl(void *opaque, hwaddr addr) ret = (uint32_t)(r->switch_id >> 32); break; default: - DPRINTF("not implemented read(l) addr=0x%lx\n", addr); + DPRINTF("not implemented read(l) addr=0x" TARGET_FMT_plx "\n", addr); ret = 0; break; } @@ -1093,8 +1095,8 @@ static uint64_t rocker_io_readq(void *opaque, hwaddr addr) ret = desc_ring_get_base_addr(r->rings[index]); break; default: - DPRINTF("not implemented dma reg read(q) addr=0x%lx " - "(ring %d, addr=0x%02x)\n", addr, index, offset); + DPRINTF("not implemented dma reg read(q) addr=0x" TARGET_FMT_plx + " (ring %d, addr=0x%02x)\n", addr, index, offset); ret = 0; break; } @@ -1122,7 +1124,7 @@ static uint64_t rocker_io_readq(void *opaque, hwaddr addr) ret = r->switch_id; break; default: - DPRINTF("not implemented read(q) addr=0x%lx\n", addr); + DPRINTF("not implemented read(q) addr=0x" TARGET_FMT_plx "\n", addr); ret = 0; break; } @@ -1131,7 +1133,7 @@ static uint64_t rocker_io_readq(void *opaque, hwaddr addr) static uint64_t rocker_mmio_read(void *opaque, hwaddr addr, unsigned size) { - DPRINTF("Read %s addr %lx, size %u\n", + DPRINTF("Read %s addr " TARGET_FMT_plx ", size %u\n", rocker_reg_name(opaque, addr), addr, size); switch (size) { diff --git a/hw/net/rocker/rocker_desc.c b/hw/net/rocker/rocker_desc.c index 83c2b98..0a6dfae 100644 --- a/hw/net/rocker/rocker_desc.c +++ b/hw/net/rocker/rocker_desc.c @@ -83,7 +83,7 @@ int desc_set_buf(DescInfo *info, size_t tlv_size) if (tlv_size > info->buf_size) { DPRINTF("ERROR: trying to write more to desc buf than it " - "can hold buf_size %ld tlv_size %ld\n", + "can hold buf_size %zu tlv_size %zu\n", info->buf_size, tlv_size); return -ROCKER_EMSGSIZE; } @@ -112,8 +112,8 @@ static bool desc_ring_empty(DescRing *ring) bool desc_ring_set_base_addr(DescRing *ring, uint64_t base_addr) { if (base_addr & 0x7) { - DPRINTF("ERROR: ring[%d] desc base addr (0x%lx) not 8-byte aligned\n", - ring->index, base_addr); + DPRINTF("ERROR: ring[%d] desc base addr (0x" TARGET_FMT_plx + ") not 8-byte aligned\n", ring->index, base_addr); return false; }