From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1etCaM-0002Fj-EF for mharc-qemu-trivial@gnu.org; Tue, 06 Mar 2018 08:24:54 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:49165) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1etCaF-00028c-3V for qemu-trivial@nongnu.org; Tue, 06 Mar 2018 08:24:52 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1etCaE-0001IO-5I for qemu-trivial@nongnu.org; Tue, 06 Mar 2018 08:24:47 -0500 Received: from mx3-rdu2.redhat.com ([66.187.233.73]:38188 helo=mx1.redhat.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1etCa8-0001FW-NG; Tue, 06 Mar 2018 08:24:40 -0500 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 0BEA080AD238; Tue, 6 Mar 2018 13:24:40 +0000 (UTC) Received: from t460.redhat.com (unknown [10.33.36.54]) by smtp.corp.redhat.com (Postfix) with ESMTP id 273E71C705; Tue, 6 Mar 2018 13:24:33 +0000 (UTC) From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: qemu-devel@nongnu.org Cc: Peter Maydell , qemu-trivial@nongnu.org, Stefan Hajnoczi , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= Date: Tue, 6 Mar 2018 13:24:30 +0000 Message-Id: <20180306132430.32110-1-berrange@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 X-Scanned-By: MIMEDefang 2.79 on 10.11.54.5 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.8]); Tue, 06 Mar 2018 13:24:40 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.8]); Tue, 06 Mar 2018 13:24:40 +0000 (UTC) for IP:'10.11.54.5' DOMAIN:'int-mx05.intmail.prod.int.rdu2.redhat.com' HELO:'smtp.corp.redhat.com' FROM:'berrange@redhat.com' RCPT:'' Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 66.187.233.73 Subject: [Qemu-trivial] [PATCH] misc: don't use hwaddr as a type in trace events X-BeenThere: qemu-trivial@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 06 Mar 2018 13:24:53 -0000 Use types that are defined by QEMU in trace events caused build failures for the UST trace backend: In file included from trace-ust-all.c:13:0: trace-ust-all.h:11844:206: error: unknown type name =E2=80=98hwaddr=E2=80= =99 It only knows about C built-in types, and any types that are pulled in from includs of qemu-common.h and lttng/tracepoint.h. This does not include the 'hwaddr' type, so replace it with a uint64_t which is what exec/hwaddr.h defines 'hwaddr' as. This fixes the build failure introduced by commit 9eb8040c2d2b38e1a40bb6129b1b668fa178fcab Author: Peter Maydell Date: Fri Mar 2 10:45:39 2018 +0000 hw/misc/tz-ppc: Model TrustZone peripheral protection controller Signed-off-by: Daniel P. Berrang=C3=A9 --- For future work it might be good to have tracetool whitelist the permitted data types that can be safely used in trace events... hw/misc/trace-events | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hw/misc/trace-events b/hw/misc/trace-events index eb5ffcc0a8..b0cc047289 100644 --- a/hw/misc/trace-events +++ b/hw/misc/trace-events @@ -92,8 +92,8 @@ tz_ppc_cfg_sec_resp(int level) "TZ PPC: cfg_sec_resp =3D= %d" tz_ppc_irq_enable(int level) "TZ PPC: int_enable =3D %d" tz_ppc_irq_clear(int level) "TZ PPC: int_clear =3D %d" tz_ppc_update_irq(int level) "TZ PPC: setting irq line to %d" -tz_ppc_read_blocked(int n, hwaddr offset, bool secure, bool user) "TZ PP= C: port %d offset 0x%" HWADDR_PRIx " read (secure %d user %d) blocked" -tz_ppc_write_blocked(int n, hwaddr offset, bool secure, bool user) "TZ P= PC: port %d offset 0x%" HWADDR_PRIx " write (secure %d user %d) blocked" +tz_ppc_read_blocked(int n, uint64_t offset, bool secure, bool user) "TZ = PPC: port %d offset 0x%" HWADDR_PRIx " read (secure %d user %d) blocked" +tz_ppc_write_blocked(int n, uint64_t offset, bool secure, bool user) "TZ= PPC: port %d offset 0x%" HWADDR_PRIx " write (secure %d user %d) blocked= " =20 # hw/misc/iotkit-secctl.c iotkit_secctl_s_read(uint32_t offset, uint64_t data, unsigned size) "IoT= Kit SecCtl S regs read: offset 0x%x data 0x%" PRIx64 " size %u" --=20 2.14.3