From patchwork Wed Jul 22 16:44:01 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 51371 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-wi0-f200.google.com (mail-wi0-f200.google.com [209.85.212.200]) by patches.linaro.org (Postfix) with ESMTPS id 01C6D228EF for ; Wed, 22 Jul 2015 16:44:37 +0000 (UTC) Received: by wicmm11 with SMTP id mm11sf18349426wic.3 for ; Wed, 22 Jul 2015 09:44:36 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:cc:subject :date:message-id:in-reply-to:references:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :list-post:list-help:list-archive:list-unsubscribe; bh=4JaYadUrItflS2wuw8bK0ALkMmJ44wUfTXoyuxWYixQ=; b=WnuQNSHP0AqZdJ5FNcxlvSDBwLs9zf2UBtS3rn5rN7BGB5zmdYomwwEBDEDPGFxk+N Kysx6aUUzt2iRTMhDW63g8N+aV8HlXzgyLDm2ibZrVapBT8iwzxZr37ThyBO/UVxckJh g1WpmNNKplrftHzou9ciFdOiwa5AJIT78AtvZ45FuoMpcTJ8V+x/B+yIQoCffXbX+kna k0JVs9+2BSMJGVcTbSiKAr1/j1dIDLGFWLUmZCHZfmMYtFbc+qjk4WL/S65mdWE9rpE3 HYg8GgVdcAMMLZGJXTdrHW97Al7OPHQ643CCBeDdehndZ6TQDJPOu3jMQrkPUU/nkMnb bZ4g== X-Gm-Message-State: ALoCoQmW7K6GS6CHTb09EurZn5k19n3ISZWQHPEQhM7RwU87Vv4/WW7rPiQ1FktphQpZZ2MFOwND X-Received: by 10.180.11.226 with SMTP id t2mr2080991wib.0.1437583476342; Wed, 22 Jul 2015 09:44:36 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.36.34 with SMTP id n2ls113063laj.15.gmail; Wed, 22 Jul 2015 09:44:36 -0700 (PDT) X-Received: by 10.153.4.40 with SMTP id cb8mr3192317lad.39.1437583476181; Wed, 22 Jul 2015 09:44:36 -0700 (PDT) Received: from mail-la0-f51.google.com (mail-la0-f51.google.com. [209.85.215.51]) by mx.google.com with ESMTPS id xk9si1630498lac.145.2015.07.22.09.44.36 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 22 Jul 2015 09:44:36 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.51 as permitted sender) client-ip=209.85.215.51; Received: by lahh5 with SMTP id h5so141639109lah.2 for ; Wed, 22 Jul 2015 09:44:36 -0700 (PDT) X-Received: by 10.152.207.76 with SMTP id lu12mr3223205lac.29.1437583476045; Wed, 22 Jul 2015 09:44:36 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patches@linaro.org Received: by 10.112.7.198 with SMTP id l6csp46358lba; Wed, 22 Jul 2015 09:44:35 -0700 (PDT) X-Received: by 10.194.175.233 with SMTP id cd9mr6877933wjc.68.1437583463240; Wed, 22 Jul 2015 09:44:23 -0700 (PDT) Received: from mnementh.archaic.org.uk (mnementh.archaic.org.uk. [2001:8b0:1d0::1]) by mx.google.com with ESMTPS id q6si25655221wix.94.2015.07.22.09.44.22 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Wed, 22 Jul 2015 09:44:23 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of pm215@archaic.org.uk designates 2001:8b0:1d0::1 as permitted sender) client-ip=2001:8b0:1d0::1; Received: from pm215 by mnementh.archaic.org.uk with local (Exim 4.80) (envelope-from ) id 1ZHx7r-0002Wf-HJ; Wed, 22 Jul 2015 17:44:11 +0100 From: Peter Maydell To: qemu-devel@nongnu.org Cc: patches@linaro.org Subject: [PATCH 02/12] osdep.h: Remove qemu_printf Date: Wed, 22 Jul 2015 17:44:01 +0100 Message-Id: <1437583451-9677-3-git-send-email-peter.maydell@linaro.org> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1437583451-9677-1-git-send-email-peter.maydell@linaro.org> References: <1437583451-9677-1-git-send-email-peter.maydell@linaro.org> X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: peter.maydell@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.51 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Precedence: list Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org List-ID: X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , qemu_printf is an ancient remnant which has been a simple #define to printf for over a decade, and is used in only a few places. Expand it out in those places and remove the #define. Signed-off-by: Peter Maydell --- include/qemu/osdep.h | 2 -- monitor.c | 4 ++-- user-exec.c | 4 ++-- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/include/qemu/osdep.h b/include/qemu/osdep.h index 3247364..e9b8b92 100644 --- a/include/qemu/osdep.h +++ b/include/qemu/osdep.h @@ -99,8 +99,6 @@ typedef signed int int_fast16_t; #define inline always_inline #endif -#define qemu_printf printf - int qemu_daemon(int nochdir, int noclose); void *qemu_try_memalign(size_t alignment, size_t size); void *qemu_memalign(size_t alignment, size_t size); diff --git a/monitor.c b/monitor.c index aeea2b5..fc32f12 100644 --- a/monitor.c +++ b/monitor.c @@ -678,7 +678,7 @@ static int get_str(char *buf, int buf_size, const char **pp) case '\"': break; default: - qemu_printf("unsupported escape code: '\\%c'\n", c); + printf("unsupported escape code: '\\%c'\n", c); goto fail; } if ((q - buf) < buf_size - 1) { @@ -692,7 +692,7 @@ static int get_str(char *buf, int buf_size, const char **pp) } } if (*p != '\"') { - qemu_printf("unterminated string\n"); + printf("unterminated string\n"); goto fail; } p++; diff --git a/user-exec.c b/user-exec.c index ed9a07f..8ad89a4 100644 --- a/user-exec.c +++ b/user-exec.c @@ -92,8 +92,8 @@ static inline int handle_cpu_signal(uintptr_t pc, unsigned long address, int ret; #if defined(DEBUG_SIGNAL) - qemu_printf("qemu: SIGSEGV pc=0x%08lx address=%08lx w=%d oldset=0x%08lx\n", - pc, address, is_write, *(unsigned long *)old_set); + printf("qemu: SIGSEGV pc=0x%08lx address=%08lx w=%d oldset=0x%08lx\n", + pc, address, is_write, *(unsigned long *)old_set); #endif /* XXX: locking issue */ if (is_write && h2g_valid(address)