From patchwork Sat Dec 19 23:08:42 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Cave-Ayland X-Patchwork-Id: 559279 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 A168914031D for ; Sun, 20 Dec 2015 10:09:35 +1100 (AEDT) Received: from localhost ([::1]:39030 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aAQd3-0006Kn-5F for incoming@patchwork.ozlabs.org; Sat, 19 Dec 2015 18:09:33 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:40873) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aAQco-00063Q-Mj for qemu-devel@nongnu.org; Sat, 19 Dec 2015 18:09:19 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aAQcl-0003WP-Gx for qemu-devel@nongnu.org; Sat, 19 Dec 2015 18:09:18 -0500 Received: from s16892447.onlinehome-server.info ([82.165.15.123]:55626) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aAQcl-0003W5-An for qemu-devel@nongnu.org; Sat, 19 Dec 2015 18:09:15 -0500 Received: from host81-136-15-68.range81-136.btcentralplus.com ([81.136.15.68] helo=kentang.home) by s16892447.onlinehome-server.info with esmtpsa (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.76) (envelope-from ) id 1aAQcc-0008Vb-Vb; Sat, 19 Dec 2015 23:09:08 +0000 From: Mark Cave-Ayland To: stefanha@redhat.com, pbonzini@redhat.com, qemu-devel@nongnu.org Date: Sat, 19 Dec 2015 23:08:42 +0000 Message-Id: <1450566522-6003-1-git-send-email-mark.cave-ayland@ilande.co.uk> X-Mailer: git-send-email 1.7.10.4 X-SA-Exim-Connect-IP: 81.136.15.68 X-SA-Exim-Mail-From: mark.cave-ayland@ilande.co.uk X-SA-Exim-Version: 4.2.1 (built Sun, 08 Jan 2012 02:45:44 +0000) X-SA-Exim-Scanned: Yes (on s16892447.onlinehome-server.info) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 82.165.15.123 Subject: [Qemu-devel] [PATCH] trace: fix PRIx64 constants in trace-events 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 Commit c8ee0a4 introduced new events containing PRIx64 constants without including the % prefix in the preceding string. This results in a compile error during build if --enable-trace-backends is passed to configure. Signed-off-by: Mark Cave-Ayland --- trace-events | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/trace-events b/trace-events index 6f03638..ea5872d 100644 --- a/trace-events +++ b/trace-events @@ -1799,15 +1799,15 @@ qcrypto_tls_session_new(void *session, void *creds, const char *hostname, const vhost_user_event(const char *chr, int event) "chr: %s got event: %d" # linux-user/signal.c -user_setup_frame(void *env, uint64_t frame_addr) "env=%p frame_addr="PRIx64"" -user_setup_rt_frame(void *env, uint64_t frame_addr) "env=%p frame_addr="PRIx64"" -user_do_rt_sigreturn(void *env, uint64_t frame_addr) "env=%p frame_addr="PRIx64"" -user_do_sigreturn(void *env, uint64_t frame_addr) "env=%p frame_addr="PRIx64"" +user_setup_frame(void *env, uint64_t frame_addr) "env=%p frame_addr=%"PRIx64"" +user_setup_rt_frame(void *env, uint64_t frame_addr) "env=%p frame_addr=%"PRIx64"" +user_do_rt_sigreturn(void *env, uint64_t frame_addr) "env=%p frame_addr=%"PRIx64"" +user_do_sigreturn(void *env, uint64_t frame_addr) "env=%p frame_addr=%"PRIx64"" user_force_sig(void *env, int target_sig, int host_sig) "env=%p signal %d (host %d)" user_handle_signal(void *env, int target_sig) "env=%p signal %d" user_host_signal(void *env, int host_sig, int target_sig) "env=%p signal %d (target %d(" user_queue_signal(void *env, int target_sig) "env=%p signal %d" -user_s390x_restore_sigregs(void *env, uint64_t sc_psw_addr, uint64_t env_psw_addr) "env=%p frame psw.addr "PRIx64 " current psw.addr "PRIx64"" +user_s390x_restore_sigregs(void *env, uint64_t sc_psw_addr, uint64_t env_psw_addr) "env=%p frame psw.addr %"PRIx64 " current psw.addr %"PRIx64"" # io/task.c qio_task_new(void *task, void *source, void *func, void *opaque) "Task new task=%p source=%p func=%p opaque=%p"