From patchwork Fri Jan 17 19:28:05 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Josh Kunz X-Patchwork-Id: 1224954 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=google.com header.i=@google.com header.a=rsa-sha256 header.s=20161025 header.b=FK4jGHP1; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 47zrln12r5z9sPJ for ; Sat, 18 Jan 2020 06:31:33 +1100 (AEDT) Received: from localhost ([::1]:33886 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1isXL8-000790-Qz for incoming@patchwork.ozlabs.org; Fri, 17 Jan 2020 14:31:30 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:40068) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from <3zgoiXgMKCmMKLaHPPHMF.DPNRFNV-EFWFMOPOHOV.PSH@flex--jkz.bounces.google.com>) id 1isXI2-0004Mh-Uu for qemu-devel@nongnu.org; Fri, 17 Jan 2020 14:28:20 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from <3zgoiXgMKCmMKLaHPPHMF.DPNRFNV-EFWFMOPOHOV.PSH@flex--jkz.bounces.google.com>) id 1isXI1-0003su-3u for qemu-devel@nongnu.org; Fri, 17 Jan 2020 14:28:18 -0500 Received: from mail-pj1-x104a.google.com ([2607:f8b0:4864:20::104a]:39576) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from <3zgoiXgMKCmMKLaHPPHMF.DPNRFNV-EFWFMOPOHOV.PSH@flex--jkz.bounces.google.com>) id 1isXI0-0003rX-SR for qemu-devel@nongnu.org; Fri, 17 Jan 2020 14:28:17 -0500 Received: by mail-pj1-x104a.google.com with SMTP id c67so5047570pje.4 for ; Fri, 17 Jan 2020 11:28:16 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=date:in-reply-to:message-id:mime-version:references:subject:from:to :cc; bh=Ywt1fC31l3tgfaEODEwZJJAObS0vfg3b7/nZB+f1lOk=; b=FK4jGHP13Fz//X83V3+tHl+xRXFDpbdnTfkKpmlsyax12rSs/F43lQUX+5bLn3pogZ dvpzQdz/LrYNxgA0pgJnGG0M+EHwIpFlj6YZPE4/oojRc/n6q2K9uAUkqrzKDh5+zKvA Drp/ieTQBCIkMpRWzqAEN8vx30/2qcc5GdHhb3QKVPlKrkQpo1quyGC/AZzUtkol/jif H/WP/l0gyFFtgdAMThJPQlkLqmXxlafPMET+salvQbB1zVL7X+M91b8f9pQbvxLRzTgM 1A/fXko1avTFWyZqjLz38ePpUGUoVkJ+qajd8pHMq5OrAEPiQjsn9mKxG+byKBs0P6O1 RwxQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=Ywt1fC31l3tgfaEODEwZJJAObS0vfg3b7/nZB+f1lOk=; b=DSGFuWvIyRqk0yYxBsYNU+KZO+xQ3lLl5+SOwKCaaLzRWhxTFPGe8kKYdT7IOdTLRq KG1CHrxnclpo65RYwhF+sWmQF90JXlbLRMe1Z8+4I+6icnszWSKl1GrtuQNgJ1lMqT10 nRIoEGJoxaGwoC8Tvgd6EHQDEP3B7gg4c/YEBC2lGUKndFBTkyO4NnVnmIXGXvm4G1SB 40wzf8ObtWQpa9Rr4PSoOooS9GkVlgyhrH0nJalXt6QBt3MbxBNREwCqUzl0WMyW9s71 PGMxw1H7WIfgARUHHYJuH3q0T94QW9lvjv9OJkbfjb9Kj5A9Hr3aOmqVA/RJvPQzMkX9 Twmg== X-Gm-Message-State: APjAAAXwwskuE+ow/Tb6Y16j/4L/4lPDiLLYqab79wHLeaz0KZyNcmas 8vYiTXWmavGqtFX7upzMhj8Ut5i+tUx8vpJHQPBYEXtK4cAJ9+7Qe623vw0+Ak5sECMwghsOQnX DinhLQcvxaI0uIQdYuhxG9i+UR9BzoXHh/ZIn473mGJd+3npxh/EH X-Google-Smtp-Source: APXvYqwauwe3001NsnkCaf9QpoXVJapdMOR+McN4vx5Ob148w9yxeBhqHVUO2GBKBPy2q5jD17SR2xc= X-Received: by 2002:a63:da14:: with SMTP id c20mr48421165pgh.280.1579289294847; Fri, 17 Jan 2020 11:28:14 -0800 (PST) Date: Fri, 17 Jan 2020 11:28:05 -0800 In-Reply-To: <20200117192808.129398-1-jkz@google.com> Message-Id: <20200117192808.129398-2-jkz@google.com> Mime-Version: 1.0 References: <20200117192808.129398-1-jkz@google.com> X-Mailer: git-send-email 2.25.0.341.g760bfbb309-goog Subject: [PATCH v2 1/4] linux-user: Use `qemu_log' for non-strace logging From: Josh Kunz To: qemu-devel@nongnu.org Cc: riku.voipio@iki.fi, laurent@vivier.eu, alex.bennee@linaro.org, armbru@redhat.com, imp@bsdimp.com, Josh Kunz X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::104a X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 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" Since most calls to `gemu_log` are actually logging unimplemented features, this change replaces most non-strace calls to `gemu_log` with calls to `qemu_log_mask(LOG_UNIMP, ...)`. This allows the user to easily log to a file, and to mask out these log messages if they desire. Note: This change is slightly backwards incompatible, since now these "unimplemented" log messages will not be logged by default. Signed-off-by: Josh Kunz Reviewed-by: Laurent Vivier --- linux-user/arm/cpu_loop.c | 5 ++-- linux-user/fd-trans.c | 55 +++++++++++++++++++++++++-------------- linux-user/syscall.c | 55 +++++++++++++++++++++------------------ linux-user/vm86.c | 3 ++- 4 files changed, 69 insertions(+), 49 deletions(-) diff --git a/linux-user/arm/cpu_loop.c b/linux-user/arm/cpu_loop.c index 1fae90c6df..cf618daa1c 100644 --- a/linux-user/arm/cpu_loop.c +++ b/linux-user/arm/cpu_loop.c @@ -349,8 +349,9 @@ void cpu_loop(CPUARMState *env) env->regs[0] = cpu_get_tls(env); break; default: - gemu_log("qemu: Unsupported ARM syscall: 0x%x\n", - n); + qemu_log_mask(LOG_UNIMP, + "qemu: Unsupported ARM syscall: 0x%x\n", + n); env->regs[0] = -TARGET_ENOSYS; break; } diff --git a/linux-user/fd-trans.c b/linux-user/fd-trans.c index 9b92386abf..c0687c52e6 100644 --- a/linux-user/fd-trans.c +++ b/linux-user/fd-trans.c @@ -514,7 +514,8 @@ static abi_long host_to_target_data_bridge_nlattr(struct nlattr *nlattr, u32[1] = tswap32(u32[1]); /* optmask */ break; default: - gemu_log("Unknown QEMU_IFLA_BR type %d\n", nlattr->nla_type); + qemu_log_mask(LOG_UNIMP, "Unknown QEMU_IFLA_BR type %d\n", + nlattr->nla_type); break; } return 0; @@ -577,7 +578,8 @@ static abi_long host_to_target_slave_data_bridge_nlattr(struct nlattr *nlattr, case QEMU_IFLA_BRPORT_BRIDGE_ID: break; default: - gemu_log("Unknown QEMU_IFLA_BRPORT type %d\n", nlattr->nla_type); + qemu_log_mask(LOG_UNIMP, "Unknown QEMU_IFLA_BRPORT type %d\n", + nlattr->nla_type); break; } return 0; @@ -605,7 +607,8 @@ static abi_long host_to_target_data_tun_nlattr(struct nlattr *nlattr, *u32 = tswap32(*u32); break; default: - gemu_log("Unknown QEMU_IFLA_TUN type %d\n", nlattr->nla_type); + qemu_log_mask(LOG_UNIMP, "Unknown QEMU_IFLA_TUN type %d\n", + nlattr->nla_type); break; } return 0; @@ -652,7 +655,8 @@ static abi_long host_to_target_data_linkinfo_nlattr(struct nlattr *nlattr, NULL, host_to_target_data_tun_nlattr); } else { - gemu_log("Unknown QEMU_IFLA_INFO_KIND %s\n", li_context->name); + qemu_log_mask(LOG_UNIMP, "Unknown QEMU_IFLA_INFO_KIND %s\n", + li_context->name); } break; case QEMU_IFLA_INFO_SLAVE_DATA: @@ -663,12 +667,13 @@ static abi_long host_to_target_data_linkinfo_nlattr(struct nlattr *nlattr, NULL, host_to_target_slave_data_bridge_nlattr); } else { - gemu_log("Unknown QEMU_IFLA_INFO_SLAVE_KIND %s\n", + qemu_log_mask(LOG_UNIMP, "Unknown QEMU_IFLA_INFO_SLAVE_KIND %s\n", li_context->slave_name); } break; default: - gemu_log("Unknown host QEMU_IFLA_INFO type: %d\n", nlattr->nla_type); + qemu_log_mask(LOG_UNIMP, "Unknown host QEMU_IFLA_INFO type: %d\n", + nlattr->nla_type); break; } @@ -690,7 +695,8 @@ static abi_long host_to_target_data_inet_nlattr(struct nlattr *nlattr, } break; default: - gemu_log("Unknown host AF_INET type: %d\n", nlattr->nla_type); + qemu_log_mask(LOG_UNIMP, "Unknown host AF_INET type: %d\n", + nlattr->nla_type); } return 0; } @@ -741,7 +747,8 @@ static abi_long host_to_target_data_inet6_nlattr(struct nlattr *nlattr, } break; default: - gemu_log("Unknown host AF_INET6 type: %d\n", nlattr->nla_type); + qemu_log_mask(LOG_UNIMP, "Unknown host AF_INET6 type: %d\n", + nlattr->nla_type); } return 0; } @@ -759,7 +766,8 @@ static abi_long host_to_target_data_spec_nlattr(struct nlattr *nlattr, NULL, host_to_target_data_inet6_nlattr); default: - gemu_log("Unknown host AF_SPEC type: %d\n", nlattr->nla_type); + qemu_log_mask(LOG_UNIMP, "Unknown host AF_SPEC type: %d\n", + nlattr->nla_type); break; } return 0; @@ -780,7 +788,8 @@ static abi_long host_to_target_data_xdp_nlattr(struct nlattr *nlattr, *u32 = tswap32(*u32); break; default: - gemu_log("Unknown host XDP type: %d\n", nlattr->nla_type); + qemu_log_mask( + LOG_UNIMP, "Unknown host XDP type: %d\n", nlattr->nla_type); break; } return 0; @@ -920,7 +929,8 @@ static abi_long host_to_target_data_link_rtattr(struct rtattr *rtattr) NULL, host_to_target_data_xdp_nlattr); default: - gemu_log("Unknown host QEMU_IFLA type: %d\n", rtattr->rta_type); + qemu_log_mask(LOG_UNIMP, "Unknown host QEMU_IFLA type: %d\n", + rtattr->rta_type); break; } return 0; @@ -954,7 +964,8 @@ static abi_long host_to_target_data_addr_rtattr(struct rtattr *rtattr) ci->tstamp = tswap32(ci->tstamp); break; default: - gemu_log("Unknown host IFA type: %d\n", rtattr->rta_type); + qemu_log_mask( + LOG_UNIMP, "Unknown host IFA type: %d\n", rtattr->rta_type); break; } return 0; @@ -996,7 +1007,8 @@ static abi_long host_to_target_data_route_rtattr(struct rtattr *rtattr) #endif break; default: - gemu_log("Unknown host RTA type: %d\n", rtattr->rta_type); + qemu_log_mask( + LOG_UNIMP, "Unknown host RTA type: %d\n", rtattr->rta_type); break; } return 0; @@ -1111,7 +1123,8 @@ static abi_long target_to_host_data_link_rtattr(struct rtattr *rtattr) { switch (rtattr->rta_type) { default: - gemu_log("Unknown target QEMU_IFLA type: %d\n", rtattr->rta_type); + qemu_log_mask(LOG_UNIMP, "Unknown target QEMU_IFLA type: %d\n", + rtattr->rta_type); break; } return 0; @@ -1125,7 +1138,8 @@ static abi_long target_to_host_data_addr_rtattr(struct rtattr *rtattr) case IFA_ADDRESS: break; default: - gemu_log("Unknown target IFA type: %d\n", rtattr->rta_type); + qemu_log_mask(LOG_UNIMP, "Unknown target IFA type: %d\n", + rtattr->rta_type); break; } return 0; @@ -1147,7 +1161,8 @@ static abi_long target_to_host_data_route_rtattr(struct rtattr *rtattr) *u32 = tswap32(*u32); break; default: - gemu_log("Unknown target RTA type: %d\n", rtattr->rta_type); + qemu_log_mask(LOG_UNIMP, "Unknown target RTA type: %d\n", + rtattr->rta_type); break; } return 0; @@ -1232,8 +1247,8 @@ static abi_long host_to_target_data_audit(struct nlmsghdr *nlh) { switch (nlh->nlmsg_type) { default: - gemu_log("Unknown host audit message type %d\n", - nlh->nlmsg_type); + qemu_log_mask(LOG_UNIMP, "Unknown host audit message type %d\n", + nlh->nlmsg_type); return -TARGET_EINVAL; } return 0; @@ -1253,8 +1268,8 @@ static abi_long target_to_host_data_audit(struct nlmsghdr *nlh) case AUDIT_FIRST_USER_MSG2 ... AUDIT_LAST_USER_MSG2: break; default: - gemu_log("Unknown target audit message type %d\n", - nlh->nlmsg_type); + qemu_log_mask(LOG_UNIMP, "Unknown target audit message type %d\n", + nlh->nlmsg_type); return -TARGET_EINVAL; } diff --git a/linux-user/syscall.c b/linux-user/syscall.c index 249e4b95fc..629f3a21b5 100644 --- a/linux-user/syscall.c +++ b/linux-user/syscall.c @@ -1545,20 +1545,18 @@ static inline abi_long target_to_host_cmsg(struct msghdr *msgh, - sizeof(struct target_cmsghdr); space += CMSG_SPACE(len); - if (space > msgh->msg_controllen) { - space -= CMSG_SPACE(len); - /* This is a QEMU bug, since we allocated the payload - * area ourselves (unlike overflow in host-to-target - * conversion, which is just the guest giving us a buffer - * that's too small). It can't happen for the payload types - * we currently support; if it becomes an issue in future - * we would need to improve our allocation strategy to - * something more intelligent than "twice the size of the - * target buffer we're reading from". - */ - gemu_log("Host cmsg overflow\n"); - break; - } + + /* + * This is a QEMU bug, since we allocated the payload + * area ourselves (unlike overflow in host-to-target + * conversion, which is just the guest giving us a buffer + * that's too small). It can't happen for the payload types + * we currently support; if it becomes an issue in future + * we would need to improve our allocation strategy to + * something more intelligent than "twice the size of the + * target buffer we're reading from". + */ + assert(space > msgh->msg_controllen && "Host cmsg overflow"); if (tswap32(target_cmsg->cmsg_level) == TARGET_SOL_SOCKET) { cmsg->cmsg_level = SOL_SOCKET; @@ -1586,8 +1584,8 @@ static inline abi_long target_to_host_cmsg(struct msghdr *msgh, __get_user(cred->uid, &target_cred->uid); __get_user(cred->gid, &target_cred->gid); } else { - gemu_log("Unsupported ancillary data: %d/%d\n", - cmsg->cmsg_level, cmsg->cmsg_type); + qemu_log_mask(LOG_UNIMP, "Unsupported ancillary data: %d/%d\n", + cmsg->cmsg_level, cmsg->cmsg_type); memcpy(data, target_data, len); } @@ -1808,8 +1806,8 @@ static inline abi_long host_to_target_cmsg(struct target_msghdr *target_msgh, default: unimplemented: - gemu_log("Unsupported ancillary data: %d/%d\n", - cmsg->cmsg_level, cmsg->cmsg_type); + qemu_log_mask(LOG_UNIMP, "Unsupported ancillary data: %d/%d\n", + cmsg->cmsg_level, cmsg->cmsg_type); memcpy(target_data, data, MIN(len, tgt_len)); if (tgt_len > len) { memset(target_data + len, 0, tgt_len - len); @@ -2284,7 +2282,8 @@ set_timeout: #endif /* SOL_NETLINK */ default: unimplemented: - gemu_log("Unsupported setsockopt level=%d optname=%d\n", level, optname); + qemu_log_mask(LOG_UNIMP, "Unsupported setsockopt level=%d optname=%d\n", + level, optname); ret = -TARGET_ENOPROTOOPT; } return ret; @@ -2637,8 +2636,9 @@ static abi_long do_getsockopt(int sockfd, int level, int optname, #endif /* SOL_NETLINK */ default: unimplemented: - gemu_log("getsockopt level=%d optname=%d not yet supported\n", - level, optname); + qemu_log_mask(LOG_UNIMP, + "getsockopt level=%d optname=%d not yet supported\n", + level, optname); ret = -TARGET_EOPNOTSUPP; break; } @@ -3393,7 +3393,7 @@ static abi_long do_socketcall(int num, abi_ulong vptr) case TARGET_SYS_SENDMMSG: /* sockfd, msgvec, vlen, flags */ return do_sendrecvmmsg(a[0], a[1], a[2], a[3], 1); default: - gemu_log("Unsupported socketcall: %d\n", num); + qemu_log_mask(LOG_UNIMP, "Unsupported socketcall: %d\n", num); return -TARGET_EINVAL; } } @@ -4304,7 +4304,8 @@ static abi_long do_ipc(CPUArchState *cpu_env, ret = do_shmctl(first, second, ptr); break; default: - gemu_log("Unsupported ipc call: %d (version %d)\n", call, version); + qemu_log_mask(LOG_UNIMP, "Unsupported ipc call: %d (version %d)\n", + call, version); ret = -TARGET_ENOSYS; break; } @@ -5152,7 +5153,8 @@ static abi_long do_ioctl(int fd, int cmd, abi_long arg) ie = ioctl_entries; for(;;) { if (ie->target_cmd == 0) { - gemu_log("Unsupported ioctl: cmd=0x%04lx\n", (long)cmd); + qemu_log_mask( + LOG_UNIMP, "Unsupported ioctl: cmd=0x%04lx\n", (long)cmd); return -TARGET_ENOSYS; } if (ie->target_cmd == cmd) @@ -5218,8 +5220,9 @@ static abi_long do_ioctl(int fd, int cmd, abi_long arg) } break; default: - gemu_log("Unsupported ioctl type: cmd=0x%04lx type=%d\n", - (long)cmd, arg_type[0]); + qemu_log_mask(LOG_UNIMP, + "Unsupported ioctl type: cmd=0x%04lx type=%d\n", + (long)cmd, arg_type[0]); ret = -TARGET_ENOSYS; break; } diff --git a/linux-user/vm86.c b/linux-user/vm86.c index 2fa7a89edc..4412522c4c 100644 --- a/linux-user/vm86.c +++ b/linux-user/vm86.c @@ -402,7 +402,8 @@ int do_vm86(CPUX86State *env, long subfunction, abi_ulong vm86_addr) case TARGET_VM86_FREE_IRQ: case TARGET_VM86_GET_IRQ_BITS: case TARGET_VM86_GET_AND_RESET_IRQ: - gemu_log("qemu: unsupported vm86 subfunction (%ld)\n", subfunction); + qemu_log_mask(LOG_UNIMP, "qemu: unsupported vm86 subfunction (%ld)\n", + subfunction); ret = -TARGET_EINVAL; goto out; case TARGET_VM86_PLUS_INSTALL_CHECK: From patchwork Fri Jan 17 19:28:06 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Josh Kunz X-Patchwork-Id: 1224953 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=google.com header.i=@google.com header.a=rsa-sha256 header.s=20161025 header.b=vGGrBMCi; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 47zrj05kN7z9sPJ for ; Sat, 18 Jan 2020 06:29:07 +1100 (AEDT) Received: from localhost ([::1]:33854 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1isXIm-0004Yr-Ai for incoming@patchwork.ozlabs.org; Fri, 17 Jan 2020 14:29:04 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:40091) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from <30QoiXgMKCmYNOdKSSKPI.GSQUIQY-HIZIPRSRKRY.SVK@flex--jkz.bounces.google.com>) id 1isXI7-0004Qw-Gr for qemu-devel@nongnu.org; Fri, 17 Jan 2020 14:28:27 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from <30QoiXgMKCmYNOdKSSKPI.GSQUIQY-HIZIPRSRKRY.SVK@flex--jkz.bounces.google.com>) id 1isXI3-0003vO-BC for qemu-devel@nongnu.org; Fri, 17 Jan 2020 14:28:23 -0500 Received: from mail-vk1-xa49.google.com ([2607:f8b0:4864:20::a49]:51609) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from <30QoiXgMKCmYNOdKSSKPI.GSQUIQY-HIZIPRSRKRY.SVK@flex--jkz.bounces.google.com>) id 1isXI3-0003u9-49 for qemu-devel@nongnu.org; Fri, 17 Jan 2020 14:28:19 -0500 Received: by mail-vk1-xa49.google.com with SMTP id c127so10104066vkh.18 for ; Fri, 17 Jan 2020 11:28:18 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=date:in-reply-to:message-id:mime-version:references:subject:from:to :cc; bh=K2z9j7cu5CO7w3iu57RuoH3WTjozc4Fqmtesj6yG7Sk=; b=vGGrBMCiZvCNL4wO8aAISlLEEwl4Se5hYAiKHyAY+R4V03bROYmdLDpd9Jr3Veetnh TZPNQQlwmb/JNSiYgTtztveYpKxN+vAAefZFLSbL4chlGk2KkMVhiJ0CWhE6qBN9Xvgs 7SkOHJAQhSenkQgA1Kw+fZCFMCwPpThf6IQPwvHFDwYa28LiRuYLILEB7r97+K9Y2wHc q0AFLSIAReAJJvoxn1fB8MAJ44jFZXUy6C47vMAnY+NYgb0yU9qNRXYZ4tIGu0nnKAYV GiQvwbKr8uNvOk79iusYIOdPscYGl0BwLLUxgyD/N26ZZoU7hH0Otopsn1T1aFUie51n 9AVg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=K2z9j7cu5CO7w3iu57RuoH3WTjozc4Fqmtesj6yG7Sk=; b=K/MYmeSmaGMdStuuAuuB7+E7lhCCWkZv/dagXtxAKLNw/Gn3TuFvKrYpLMC63ahSxw dWmCEA4w+4JefdoZexfQ4caHR878B03gOIuMko6hLzlWMkVgbY5MBP/KmJc9/Dt5Oana qSG3VSatX4VY/kWwzs5ptrwpDiqCt5ITn6um+03xCNauR6HhAJnllcUiPmtXCKb75FOY XoyLI89azmEpiAzO/co3L4cAFpuSLnZad4wRz852L+582Hjel+/7X2HZxVJEfDlszfP0 lQJzzFNFmHZQBE22mCvRaKH6ZOLoipMXjlxAoRIP1KYTiGx3YcYVfYCQ7M3RqZx7YzDc iXaQ== X-Gm-Message-State: APjAAAUr7hg1EOtD3QdN44sjCESUL/rf9shdg7oAGETAyDt+w1ozOlS7 9kflskOE7PK1ISVFGwQAnZMyyYo85AcH42d+Y12Cm0p/QpZMfljpnayrTpVSziBQMo9y1cCE8ep qtJxv7Jv91iSnkGjZ25uYEApqtmZaALEa7fVj2nYH5rXnptczxCh1 X-Google-Smtp-Source: APXvYqxhCzICyguW5VJU82HsK4dMlEoF7RFBhn+baStRIw1QK2hewDpkpnvtamZcXJpd4EW7KQQTP4k= X-Received: by 2002:ab0:2ea8:: with SMTP id y8mr3859167uay.23.1579289297568; Fri, 17 Jan 2020 11:28:17 -0800 (PST) Date: Fri, 17 Jan 2020 11:28:06 -0800 In-Reply-To: <20200117192808.129398-1-jkz@google.com> Message-Id: <20200117192808.129398-3-jkz@google.com> Mime-Version: 1.0 References: <20200117192808.129398-1-jkz@google.com> X-Mailer: git-send-email 2.25.0.341.g760bfbb309-goog Subject: [PATCH v2 2/4] linux-user: Use `qemu_log' for strace From: Josh Kunz To: qemu-devel@nongnu.org Cc: riku.voipio@iki.fi, laurent@vivier.eu, alex.bennee@linaro.org, armbru@redhat.com, imp@bsdimp.com, Josh Kunz X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::a49 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 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" This change switches linux-user strace logging to use the newer `qemu_log` logging subsystem rather than the older `gemu_log` (notice the "g") logger. `qemu_log` has several advantages, namely that it allows logging to a file, and provides a more unified interface for configuration of logging (via the QEMU_LOG environment variable or options). This change introduces a new log mask: `LOG_STRACE` which is used for logging of user-mode strace messages. Signed-off-by: Josh Kunz Reviewed-by: Laurent Vivier --- include/qemu/log.h | 2 + linux-user/main.c | 30 ++- linux-user/qemu.h | 1 - linux-user/signal.c | 2 +- linux-user/strace.c | 479 ++++++++++++++++++++++--------------------- linux-user/syscall.c | 13 +- util/log.c | 2 + 7 files changed, 278 insertions(+), 251 deletions(-) diff --git a/include/qemu/log.h b/include/qemu/log.h index e0f4e40628..f4724f7330 100644 --- a/include/qemu/log.h +++ b/include/qemu/log.h @@ -62,6 +62,8 @@ static inline bool qemu_log_separate(void) #define CPU_LOG_TB_OP_IND (1 << 16) #define CPU_LOG_TB_FPU (1 << 17) #define CPU_LOG_PLUGIN (1 << 18) +/* LOG_STRACE is used for user-mode strace logging. */ +#define LOG_STRACE (1 << 19) /* Lock output for a series of related logs. Since this is not needed * for a single qemu_log / qemu_log_mask / qemu_log_mask_and_addr, we diff --git a/linux-user/main.c b/linux-user/main.c index fba833aac9..8f1d07cdd6 100644 --- a/linux-user/main.c +++ b/linux-user/main.c @@ -60,6 +60,19 @@ unsigned long mmap_min_addr; unsigned long guest_base; int have_guest_base; +/* + * Used to implement backwards-compatibility for the `-strace`, and + * QEMU_STRACE options. Without this, the QEMU_LOG can be overwritten by + * -strace, or vice versa. + */ +static bool enable_strace; + +/* + * The last log mask given by the user in an environment variable or argument. + * Used to support command line arguments overriding environment variables. + */ +static int last_log_mask; + /* * When running 32-on-64 we should make sure we can fit all of the possible * guest address space into a contiguous chunk of virtual host memory. @@ -223,15 +236,11 @@ static void handle_arg_help(const char *arg) static void handle_arg_log(const char *arg) { - int mask; - - mask = qemu_str_to_log_mask(arg); - if (!mask) { + last_log_mask = qemu_str_to_log_mask(arg); + if (!last_log_mask) { qemu_print_log_usage(stdout); exit(EXIT_FAILURE); } - qemu_log_needs_buffers(); - qemu_set_log(mask); } static void handle_arg_dfilter(const char *arg) @@ -375,7 +384,7 @@ static void handle_arg_singlestep(const char *arg) static void handle_arg_strace(const char *arg) { - do_strace = 1; + enable_strace = true; } static void handle_arg_version(const char *arg) @@ -629,6 +638,7 @@ int main(int argc, char **argv, char **envp) int i; int ret; int execfd; + int log_mask; unsigned long max_reserved_va; error_init(argv[0]); @@ -661,6 +671,12 @@ int main(int argc, char **argv, char **envp) optind = parse_args(argc, argv); + log_mask = last_log_mask | (enable_strace ? LOG_STRACE : 0); + if (log_mask) { + qemu_log_needs_buffers(); + qemu_set_log(log_mask); + } + if (!trace_init_backends()) { exit(1); } diff --git a/linux-user/qemu.h b/linux-user/qemu.h index f6f5fe5fbb..02c6890c8a 100644 --- a/linux-user/qemu.h +++ b/linux-user/qemu.h @@ -385,7 +385,6 @@ void print_syscall_ret(int num, abi_long arg1); * --- SIGSEGV {si_signo=SIGSEGV, si_code=SI_KERNEL, si_addr=0} --- */ void print_taken_signal(int target_signum, const target_siginfo_t *tinfo); -extern int do_strace; /* signal.c */ void process_pending_signals(CPUArchState *cpu_env); diff --git a/linux-user/signal.c b/linux-user/signal.c index 5ca6d62b15..818d867b7b 100644 --- a/linux-user/signal.c +++ b/linux-user/signal.c @@ -864,7 +864,7 @@ static void handle_pending_signal(CPUArchState *cpu_env, int sig, handler = sa->_sa_handler; } - if (do_strace) { + if (unlikely(qemu_loglevel_mask(LOG_STRACE))) { print_taken_signal(sig, &k->info); } diff --git a/linux-user/strace.c b/linux-user/strace.c index 3d4d684450..4f7130b2ff 100644 --- a/linux-user/strace.c +++ b/linux-user/strace.c @@ -12,8 +12,6 @@ #include #include "qemu.h" -int do_strace=0; - struct syscallname { int nr; const char *name; @@ -80,7 +78,7 @@ print_ipc_cmd(int cmd) { #define output_cmd(val) \ if( cmd == val ) { \ - gemu_log(#val); \ + qemu_log(#val); \ return; \ } @@ -120,7 +118,7 @@ if( cmd == val ) { \ output_cmd( IPC_RMID ); /* Some value we don't recognize */ - gemu_log("%d",cmd); + qemu_log("%d", cmd); } static void @@ -151,7 +149,7 @@ print_signal(abi_ulong arg, int last) print_raw_param("%ld", arg, last); return; } - gemu_log("%s%s", signal_name, get_comma(last)); + qemu_log("%s%s", signal_name, get_comma(last)); } static void print_si_code(int arg) @@ -184,10 +182,10 @@ static void print_si_code(int arg) codename = "SI_TKILL"; break; default: - gemu_log("%d", arg); + qemu_log("%d", arg); return; } - gemu_log("%s", codename); + qemu_log("%s", codename); } static void get_target_siginfo(target_siginfo_t *tinfo, @@ -288,33 +286,33 @@ static void print_siginfo(const target_siginfo_t *tinfo) int si_type = extract32(tinfo->si_code, 16, 16); int si_code = sextract32(tinfo->si_code, 0, 16); - gemu_log("{si_signo="); + qemu_log("{si_signo="); print_signal(tinfo->si_signo, 1); - gemu_log(", si_code="); + qemu_log(", si_code="); print_si_code(si_code); switch (si_type) { case QEMU_SI_KILL: - gemu_log(", si_pid=%u, si_uid=%u", + qemu_log(", si_pid=%u, si_uid=%u", (unsigned int)tinfo->_sifields._kill._pid, (unsigned int)tinfo->_sifields._kill._uid); break; case QEMU_SI_TIMER: - gemu_log(", si_timer1=%u, si_timer2=%u", + qemu_log(", si_timer1=%u, si_timer2=%u", tinfo->_sifields._timer._timer1, tinfo->_sifields._timer._timer2); break; case QEMU_SI_POLL: - gemu_log(", si_band=%d, si_fd=%d", + qemu_log(", si_band=%d, si_fd=%d", tinfo->_sifields._sigpoll._band, tinfo->_sifields._sigpoll._fd); break; case QEMU_SI_FAULT: - gemu_log(", si_addr="); + qemu_log(", si_addr="); print_pointer(tinfo->_sifields._sigfault._addr, 1); break; case QEMU_SI_CHLD: - gemu_log(", si_pid=%u, si_uid=%u, si_status=%d" + qemu_log(", si_pid=%u, si_uid=%u, si_status=%d" ", si_utime=" TARGET_ABI_FMT_ld ", si_stime=" TARGET_ABI_FMT_ld, (unsigned int)(tinfo->_sifields._sigchld._pid), @@ -324,7 +322,7 @@ static void print_siginfo(const target_siginfo_t *tinfo) tinfo->_sifields._sigchld._stime); break; case QEMU_SI_RT: - gemu_log(", si_pid=%u, si_uid=%u, si_sigval=" TARGET_ABI_FMT_ld, + qemu_log(", si_pid=%u, si_uid=%u, si_sigval=" TARGET_ABI_FMT_ld, (unsigned int)tinfo->_sifields._rt._pid, (unsigned int)tinfo->_sifields._rt._uid, tinfo->_sifields._rt._sigval.sival_ptr); @@ -332,7 +330,7 @@ static void print_siginfo(const target_siginfo_t *tinfo) default: g_assert_not_reached(); } - gemu_log("}"); + qemu_log("}"); } static void @@ -349,76 +347,76 @@ print_sockaddr(abi_ulong addr, abi_long addrlen, int last) case AF_UNIX: { struct target_sockaddr_un *un = (struct target_sockaddr_un *)sa; int i; - gemu_log("{sun_family=AF_UNIX,sun_path=\""); + qemu_log("{sun_family=AF_UNIX,sun_path=\""); for (i = 0; i < addrlen - offsetof(struct target_sockaddr_un, sun_path) && un->sun_path[i]; i++) { - gemu_log("%c", un->sun_path[i]); + qemu_log("%c", un->sun_path[i]); } - gemu_log("\"}"); + qemu_log("\"}"); break; } case AF_INET: { struct target_sockaddr_in *in = (struct target_sockaddr_in *)sa; uint8_t *c = (uint8_t *)&in->sin_addr.s_addr; - gemu_log("{sin_family=AF_INET,sin_port=htons(%d),", + qemu_log("{sin_family=AF_INET,sin_port=htons(%d),", ntohs(in->sin_port)); - gemu_log("sin_addr=inet_addr(\"%d.%d.%d.%d\")", + qemu_log("sin_addr=inet_addr(\"%d.%d.%d.%d\")", c[0], c[1], c[2], c[3]); - gemu_log("}"); + qemu_log("}"); break; } case AF_PACKET: { struct target_sockaddr_ll *ll = (struct target_sockaddr_ll *)sa; uint8_t *c = (uint8_t *)&ll->sll_addr; - gemu_log("{sll_family=AF_PACKET," + qemu_log("{sll_family=AF_PACKET," "sll_protocol=htons(0x%04x),if%d,pkttype=", ntohs(ll->sll_protocol), ll->sll_ifindex); switch (ll->sll_pkttype) { case PACKET_HOST: - gemu_log("PACKET_HOST"); + qemu_log("PACKET_HOST"); break; case PACKET_BROADCAST: - gemu_log("PACKET_BROADCAST"); + qemu_log("PACKET_BROADCAST"); break; case PACKET_MULTICAST: - gemu_log("PACKET_MULTICAST"); + qemu_log("PACKET_MULTICAST"); break; case PACKET_OTHERHOST: - gemu_log("PACKET_OTHERHOST"); + qemu_log("PACKET_OTHERHOST"); break; case PACKET_OUTGOING: - gemu_log("PACKET_OUTGOING"); + qemu_log("PACKET_OUTGOING"); break; default: - gemu_log("%d", ll->sll_pkttype); + qemu_log("%d", ll->sll_pkttype); break; } - gemu_log(",sll_addr=%02x:%02x:%02x:%02x:%02x:%02x:%02x:%02x", + qemu_log(",sll_addr=%02x:%02x:%02x:%02x:%02x:%02x:%02x:%02x", c[0], c[1], c[2], c[3], c[4], c[5], c[6], c[7]); - gemu_log("}"); + qemu_log("}"); break; } case AF_NETLINK: { struct target_sockaddr_nl *nl = (struct target_sockaddr_nl *)sa; - gemu_log("{nl_family=AF_NETLINK,nl_pid=%u,nl_groups=%u}", + qemu_log("{nl_family=AF_NETLINK,nl_pid=%u,nl_groups=%u}", tswap32(nl->nl_pid), tswap32(nl->nl_groups)); break; } default: - gemu_log("{sa_family=%d, sa_data={", sa->sa_family); + qemu_log("{sa_family=%d, sa_data={", sa->sa_family); for (i = 0; i < 13; i++) { - gemu_log("%02x, ", sa->sa_data[i]); + qemu_log("%02x, ", sa->sa_data[i]); } - gemu_log("%02x}", sa->sa_data[i]); - gemu_log("}"); + qemu_log("%02x}", sa->sa_data[i]); + qemu_log("}"); break; } unlock_user(sa, addr, 0); } else { print_raw_param("0x"TARGET_ABI_FMT_lx, addr, 0); } - gemu_log(", "TARGET_ABI_FMT_ld"%s", addrlen, get_comma(last)); + qemu_log(", "TARGET_ABI_FMT_ld"%s", addrlen, get_comma(last)); } static void @@ -426,19 +424,19 @@ print_socket_domain(int domain) { switch (domain) { case PF_UNIX: - gemu_log("PF_UNIX"); + qemu_log("PF_UNIX"); break; case PF_INET: - gemu_log("PF_INET"); + qemu_log("PF_INET"); break; case PF_NETLINK: - gemu_log("PF_NETLINK"); + qemu_log("PF_NETLINK"); break; case PF_PACKET: - gemu_log("PF_PACKET"); + qemu_log("PF_PACKET"); break; default: - gemu_log("%d", domain); + qemu_log("%d", domain); break; } } @@ -448,22 +446,22 @@ print_socket_type(int type) { switch (type) { case TARGET_SOCK_DGRAM: - gemu_log("SOCK_DGRAM"); + qemu_log("SOCK_DGRAM"); break; case TARGET_SOCK_STREAM: - gemu_log("SOCK_STREAM"); + qemu_log("SOCK_STREAM"); break; case TARGET_SOCK_RAW: - gemu_log("SOCK_RAW"); + qemu_log("SOCK_RAW"); break; case TARGET_SOCK_RDM: - gemu_log("SOCK_RDM"); + qemu_log("SOCK_RDM"); break; case TARGET_SOCK_SEQPACKET: - gemu_log("SOCK_SEQPACKET"); + qemu_log("SOCK_SEQPACKET"); break; case TARGET_SOCK_PACKET: - gemu_log("SOCK_PACKET"); + qemu_log("SOCK_PACKET"); break; } } @@ -475,10 +473,10 @@ print_socket_protocol(int domain, int type, int protocol) (domain == AF_INET && type == TARGET_SOCK_PACKET)) { switch (protocol) { case 0x0003: - gemu_log("ETH_P_ALL"); + qemu_log("ETH_P_ALL"); break; default: - gemu_log("%d", protocol); + qemu_log("%d", protocol); } return; } @@ -486,25 +484,25 @@ print_socket_protocol(int domain, int type, int protocol) if (domain == PF_NETLINK) { switch (protocol) { case NETLINK_ROUTE: - gemu_log("NETLINK_ROUTE"); + qemu_log("NETLINK_ROUTE"); break; case NETLINK_AUDIT: - gemu_log("NETLINK_AUDIT"); + qemu_log("NETLINK_AUDIT"); break; case NETLINK_NETFILTER: - gemu_log("NETLINK_NETFILTER"); + qemu_log("NETLINK_NETFILTER"); break; case NETLINK_KOBJECT_UEVENT: - gemu_log("NETLINK_KOBJECT_UEVENT"); + qemu_log("NETLINK_KOBJECT_UEVENT"); break; case NETLINK_RDMA: - gemu_log("NETLINK_RDMA"); + qemu_log("NETLINK_RDMA"); break; case NETLINK_CRYPTO: - gemu_log("NETLINK_CRYPTO"); + qemu_log("NETLINK_CRYPTO"); break; default: - gemu_log("%d", protocol); + qemu_log("%d", protocol); break; } return; @@ -512,19 +510,19 @@ print_socket_protocol(int domain, int type, int protocol) switch (protocol) { case IPPROTO_IP: - gemu_log("IPPROTO_IP"); + qemu_log("IPPROTO_IP"); break; case IPPROTO_TCP: - gemu_log("IPPROTO_TCP"); + qemu_log("IPPROTO_TCP"); break; case IPPROTO_UDP: - gemu_log("IPPROTO_UDP"); + qemu_log("IPPROTO_UDP"); break; case IPPROTO_RAW: - gemu_log("IPPROTO_RAW"); + qemu_log("IPPROTO_RAW"); break; default: - gemu_log("%d", protocol); + qemu_log("%d", protocol); break; } } @@ -536,7 +534,7 @@ print_fdset(int n, abi_ulong target_fds_addr) { int i; - gemu_log("["); + qemu_log("["); if( target_fds_addr ) { abi_long *target_fds; @@ -550,11 +548,11 @@ print_fdset(int n, abi_ulong target_fds_addr) for (i=n; i>=0; i--) { if ((tswapal(target_fds[i / TARGET_ABI_BITS]) >> (i & (TARGET_ABI_BITS - 1))) & 1) - gemu_log("%d,", i ); + qemu_log("%d,", i); } unlock_user(target_fds, target_fds_addr, 0); } - gemu_log("]"); + qemu_log("]"); } #endif @@ -578,46 +576,46 @@ print_clockid(int clockid, int last) { switch (clockid) { case TARGET_CLOCK_REALTIME: - gemu_log("CLOCK_REALTIME"); + qemu_log("CLOCK_REALTIME"); break; case TARGET_CLOCK_MONOTONIC: - gemu_log("CLOCK_MONOTONIC"); + qemu_log("CLOCK_MONOTONIC"); break; case TARGET_CLOCK_PROCESS_CPUTIME_ID: - gemu_log("CLOCK_PROCESS_CPUTIME_ID"); + qemu_log("CLOCK_PROCESS_CPUTIME_ID"); break; case TARGET_CLOCK_THREAD_CPUTIME_ID: - gemu_log("CLOCK_THREAD_CPUTIME_ID"); + qemu_log("CLOCK_THREAD_CPUTIME_ID"); break; case TARGET_CLOCK_MONOTONIC_RAW: - gemu_log("CLOCK_MONOTONIC_RAW"); + qemu_log("CLOCK_MONOTONIC_RAW"); break; case TARGET_CLOCK_REALTIME_COARSE: - gemu_log("CLOCK_REALTIME_COARSE"); + qemu_log("CLOCK_REALTIME_COARSE"); break; case TARGET_CLOCK_MONOTONIC_COARSE: - gemu_log("CLOCK_MONOTONIC_COARSE"); + qemu_log("CLOCK_MONOTONIC_COARSE"); break; case TARGET_CLOCK_BOOTTIME: - gemu_log("CLOCK_BOOTTIME"); + qemu_log("CLOCK_BOOTTIME"); break; case TARGET_CLOCK_REALTIME_ALARM: - gemu_log("CLOCK_REALTIME_ALARM"); + qemu_log("CLOCK_REALTIME_ALARM"); break; case TARGET_CLOCK_BOOTTIME_ALARM: - gemu_log("CLOCK_BOOTTIME_ALARM"); + qemu_log("CLOCK_BOOTTIME_ALARM"); break; case TARGET_CLOCK_SGI_CYCLE: - gemu_log("CLOCK_SGI_CYCLE"); + qemu_log("CLOCK_SGI_CYCLE"); break; case TARGET_CLOCK_TAI: - gemu_log("CLOCK_TAI"); + qemu_log("CLOCK_TAI"); break; default: - gemu_log("%d", clockid); + qemu_log("%d", clockid); break; } - gemu_log("%s", get_comma(last)); + qemu_log("%s", get_comma(last)); } #endif @@ -638,15 +636,15 @@ print_newselect(const struct syscallname *name, abi_long arg1, abi_long arg2, abi_long arg3, abi_long arg4, abi_long arg5, abi_long arg6) { - gemu_log("%s(" TARGET_ABI_FMT_ld ",", name->name, arg1); + qemu_log("%s(" TARGET_ABI_FMT_ld ",", name->name, arg1); print_fdset(arg1, arg2); - gemu_log(","); + qemu_log(","); print_fdset(arg1, arg3); - gemu_log(","); + qemu_log(","); print_fdset(arg1, arg4); - gemu_log(","); + qemu_log(","); print_timeval(arg5, 1); - gemu_log(")"); + qemu_log(")"); /* save for use in the return output function below */ newselect_arg1=arg1; @@ -663,9 +661,10 @@ print_semctl(const struct syscallname *name, abi_long arg1, abi_long arg2, abi_long arg3, abi_long arg4, abi_long arg5, abi_long arg6) { - gemu_log("%s(" TARGET_ABI_FMT_ld "," TARGET_ABI_FMT_ld ",", name->name, arg1, arg2); + qemu_log("%s(" TARGET_ABI_FMT_ld "," TARGET_ABI_FMT_ld ",", + name->name, arg1, arg2); print_ipc_cmd(arg3); - gemu_log(",0x" TARGET_ABI_FMT_lx ")", arg4); + qemu_log(",0x" TARGET_ABI_FMT_lx ")", arg4); } #endif @@ -679,7 +678,7 @@ print_execve(const struct syscallname *name, if (!(s = lock_user_string(arg1))) return; - gemu_log("%s(\"%s\",{", name->name, s); + qemu_log("%s(\"%s\",{", name->name, s); unlock_user(s, arg1, 0); for (arg_ptr_addr = arg2; ; arg_ptr_addr += sizeof(abi_ulong)) { @@ -693,12 +692,12 @@ print_execve(const struct syscallname *name, if (!arg_addr) break; if ((s = lock_user_string(arg_addr))) { - gemu_log("\"%s\",", s); + qemu_log("\"%s\",", s); unlock_user(s, arg_addr, 0); } } - gemu_log("NULL})"); + qemu_log("NULL})"); } #ifdef TARGET_NR_ipc @@ -709,12 +708,18 @@ print_ipc(const struct syscallname *name, { switch(arg1) { case IPCOP_semctl: - gemu_log("semctl(" TARGET_ABI_FMT_ld "," TARGET_ABI_FMT_ld ",", arg1, arg2); + qemu_log("semctl(" TARGET_ABI_FMT_ld "," TARGET_ABI_FMT_ld ",", + arg1, arg2); print_ipc_cmd(arg3); - gemu_log(",0x" TARGET_ABI_FMT_lx ")", arg4); + qemu_log(",0x" TARGET_ABI_FMT_lx ")", arg4); break; default: - gemu_log("%s(" TARGET_ABI_FMT_ld "," TARGET_ABI_FMT_ld "," TARGET_ABI_FMT_ld "," TARGET_ABI_FMT_ld ")", + qemu_log(("%s(" + TARGET_ABI_FMT_ld "," + TARGET_ABI_FMT_ld "," + TARGET_ABI_FMT_ld "," + TARGET_ABI_FMT_ld + ")"), name->name, arg1, arg2, arg3, arg4); } } @@ -733,9 +738,9 @@ print_syscall_ret_addr(const struct syscallname *name, abi_long ret) errstr = target_strerror(-ret); } if (errstr) { - gemu_log(" = -1 errno=%d (%s)\n", (int)-ret, errstr); + qemu_log(" = -1 errno=%d (%s)\n", (int)-ret, errstr); } else { - gemu_log(" = 0x" TARGET_ABI_FMT_lx "\n", ret); + qemu_log(" = 0x" TARGET_ABI_FMT_lx "\n", ret); } } @@ -743,7 +748,7 @@ print_syscall_ret_addr(const struct syscallname *name, abi_long ret) static void print_syscall_ret_raw(struct syscallname *name, abi_long ret) { - gemu_log(" = 0x" TARGET_ABI_FMT_lx "\n", ret); + qemu_log(" = 0x" TARGET_ABI_FMT_lx "\n", ret); } #endif @@ -751,15 +756,15 @@ print_syscall_ret_raw(struct syscallname *name, abi_long ret) static void print_syscall_ret_newselect(const struct syscallname *name, abi_long ret) { - gemu_log(" = 0x" TARGET_ABI_FMT_lx " (", ret); + qemu_log(" = 0x" TARGET_ABI_FMT_lx " (", ret); print_fdset(newselect_arg1,newselect_arg2); - gemu_log(","); + qemu_log(","); print_fdset(newselect_arg1,newselect_arg3); - gemu_log(","); + qemu_log(","); print_fdset(newselect_arg1,newselect_arg4); - gemu_log(","); + qemu_log(","); print_timeval(newselect_arg5, 1); - gemu_log(")\n"); + qemu_log(")\n"); } #endif @@ -775,38 +780,38 @@ print_syscall_ret_adjtimex(const struct syscallname *name, abi_long ret) { const char *errstr = NULL; - gemu_log(" = "); + qemu_log(" = "); if (ret < 0) { - gemu_log("-1 errno=%d", errno); + qemu_log("-1 errno=%d", errno); errstr = target_strerror(-ret); if (errstr) { - gemu_log(" (%s)", errstr); + qemu_log(" (%s)", errstr); } } else { - gemu_log(TARGET_ABI_FMT_ld, ret); + qemu_log(TARGET_ABI_FMT_ld, ret); switch (ret) { case TARGET_TIME_OK: - gemu_log(" TIME_OK (clock synchronized, no leap second)"); + qemu_log(" TIME_OK (clock synchronized, no leap second)"); break; case TARGET_TIME_INS: - gemu_log(" TIME_INS (insert leap second)"); + qemu_log(" TIME_INS (insert leap second)"); break; case TARGET_TIME_DEL: - gemu_log(" TIME_DEL (delete leap second)"); + qemu_log(" TIME_DEL (delete leap second)"); break; case TARGET_TIME_OOP: - gemu_log(" TIME_OOP (leap second in progress)"); + qemu_log(" TIME_OOP (leap second in progress)"); break; case TARGET_TIME_WAIT: - gemu_log(" TIME_WAIT (leap second has occurred)"); + qemu_log(" TIME_WAIT (leap second has occurred)"); break; case TARGET_TIME_ERROR: - gemu_log(" TIME_ERROR (clock not synchronized)"); + qemu_log(" TIME_ERROR (clock not synchronized)"); break; } } - gemu_log("\n"); + qemu_log("\n"); } UNUSED static struct flags access_flags[] = { @@ -1104,12 +1109,12 @@ print_flags(const struct flags *f, abi_long flags, int last) int n; if ((flags == 0) && (f->f_value == 0)) { - gemu_log("%s%s", f->f_string, get_comma(last)); + qemu_log("%s%s", f->f_string, get_comma(last)); return; } for (n = 0; f->f_string != NULL; f++) { if ((f->f_value != 0) && ((flags & f->f_value) == f->f_value)) { - gemu_log("%s%s", sep, f->f_string); + qemu_log("%s%s", sep, f->f_string); flags &= ~f->f_value; sep = "|"; n++; @@ -1119,13 +1124,13 @@ print_flags(const struct flags *f, abi_long flags, int last) if (n > 0) { /* print rest of the flags as numeric */ if (flags != 0) { - gemu_log("%s%#x%s", sep, (unsigned int)flags, get_comma(last)); + qemu_log("%s%#x%s", sep, (unsigned int)flags, get_comma(last)); } else { - gemu_log("%s", get_comma(last)); + qemu_log("%s", get_comma(last)); } } else { /* no string version of flags found, print them in hex then */ - gemu_log("%#x%s", (unsigned int)flags, get_comma(last)); + qemu_log("%#x%s", (unsigned int)flags, get_comma(last)); } } @@ -1134,11 +1139,11 @@ print_at_dirfd(abi_long dirfd, int last) { #ifdef AT_FDCWD if (dirfd == AT_FDCWD) { - gemu_log("AT_FDCWD%s", get_comma(last)); + qemu_log("AT_FDCWD%s", get_comma(last)); return; } #endif - gemu_log("%d%s", (int)dirfd, get_comma(last)); + qemu_log("%d%s", (int)dirfd, get_comma(last)); } static void @@ -1149,7 +1154,7 @@ print_file_mode(abi_long mode, int last) for (m = &mode_flags[0]; m->f_string != NULL; m++) { if ((m->f_value & mode) == m->f_value) { - gemu_log("%s%s", m->f_string, sep); + qemu_log("%s%s", m->f_string, sep); sep = "|"; mode &= ~m->f_value; break; @@ -1159,9 +1164,9 @@ print_file_mode(abi_long mode, int last) mode &= ~S_IFMT; /* print rest of the mode as octal */ if (mode != 0) - gemu_log("%s%#o", sep, (unsigned int)mode); + qemu_log("%s%#o", sep, (unsigned int)mode); - gemu_log("%s", get_comma(last)); + qemu_log("%s", get_comma(last)); } static void @@ -1170,17 +1175,17 @@ print_open_flags(abi_long flags, int last) print_flags(open_access_flags, flags & TARGET_O_ACCMODE, 1); flags &= ~TARGET_O_ACCMODE; if (flags == 0) { - gemu_log("%s", get_comma(last)); + qemu_log("%s", get_comma(last)); return; } - gemu_log("|"); + qemu_log("|"); print_flags(open_flags, flags, last); } static void print_syscall_prologue(const struct syscallname *sc) { - gemu_log("%s(", sc->name); + qemu_log("%s(", sc->name); } /*ARGSUSED*/ @@ -1188,7 +1193,7 @@ static void print_syscall_epilogue(const struct syscallname *sc) { (void)sc; - gemu_log(")"); + qemu_log(")"); } static void @@ -1197,7 +1202,7 @@ print_string(abi_long addr, int last) char *s; if ((s = lock_user_string(addr)) != NULL) { - gemu_log("\"%s\"%s", s, get_comma(last)); + qemu_log("\"%s\"%s", s, get_comma(last)); unlock_user(s, addr, 0); } else { /* can't get string out of it, so print it as pointer */ @@ -1214,20 +1219,20 @@ print_buf(abi_long addr, abi_long len, int last) s = lock_user(VERIFY_READ, addr, len, 1); if (s) { - gemu_log("\""); + qemu_log("\""); for (i = 0; i < MAX_PRINT_BUF && i < len; i++) { if (isprint(s[i])) { - gemu_log("%c", s[i]); + qemu_log("%c", s[i]); } else { - gemu_log("\\%o", s[i]); + qemu_log("\\%o", s[i]); } } - gemu_log("\""); + qemu_log("\""); if (i != len) { - gemu_log("..."); + qemu_log("..."); } if (!last) { - gemu_log(","); + qemu_log(","); } unlock_user(s, addr, 0); } else { @@ -1245,16 +1250,16 @@ print_raw_param(const char *fmt, abi_long param, int last) char format[64]; (void) snprintf(format, sizeof (format), "%s%s", fmt, get_comma(last)); - gemu_log(format, param); + qemu_log(format, param); } static void print_pointer(abi_long p, int last) { if (p == 0) - gemu_log("NULL%s", get_comma(last)); + qemu_log("NULL%s", get_comma(last)); else - gemu_log("0x" TARGET_ABI_FMT_lx "%s", p, get_comma(last)); + qemu_log("0x" TARGET_ABI_FMT_lx "%s", p, get_comma(last)); } /* @@ -1265,12 +1270,12 @@ static void print_number(abi_long addr, int last) { if (addr == 0) { - gemu_log("NULL%s", get_comma(last)); + qemu_log("NULL%s", get_comma(last)); } else { int num; get_user_s32(num, addr); - gemu_log("[%d]%s", num, get_comma(last)); + qemu_log("[%d]%s", num, get_comma(last)); } } @@ -1285,11 +1290,11 @@ print_timeval(abi_ulong tv_addr, int last) print_pointer(tv_addr, last); return; } - gemu_log("{" TARGET_ABI_FMT_ld "," TARGET_ABI_FMT_ld "}%s", + qemu_log("{" TARGET_ABI_FMT_ld "," TARGET_ABI_FMT_ld "}%s", tswapal(tv->tv_sec), tswapal(tv->tv_usec), get_comma(last)); unlock_user(tv, tv_addr, 0); } else - gemu_log("NULL%s", get_comma(last)); + qemu_log("NULL%s", get_comma(last)); } static void @@ -1303,11 +1308,11 @@ print_timezone(abi_ulong tz_addr, int last) print_pointer(tz_addr, last); return; } - gemu_log("{%d,%d}%s", tswap32(tz->tz_minuteswest), + qemu_log("{%d,%d}%s", tswap32(tz->tz_minuteswest), tswap32(tz->tz_dsttime), get_comma(last)); unlock_user(tz, tz_addr, 0); } else { - gemu_log("NULL%s", get_comma(last)); + qemu_log("NULL%s", get_comma(last)); } } @@ -1515,83 +1520,83 @@ print_fcntl(const struct syscallname *name, print_raw_param("%d", arg0, 0); switch(arg1) { case TARGET_F_DUPFD: - gemu_log("F_DUPFD,"); + qemu_log("F_DUPFD,"); print_raw_param(TARGET_ABI_FMT_ld, arg2, 1); break; case TARGET_F_GETFD: - gemu_log("F_GETFD"); + qemu_log("F_GETFD"); break; case TARGET_F_SETFD: - gemu_log("F_SETFD,"); + qemu_log("F_SETFD,"); print_raw_param(TARGET_ABI_FMT_ld, arg2, 1); break; case TARGET_F_GETFL: - gemu_log("F_GETFL"); + qemu_log("F_GETFL"); break; case TARGET_F_SETFL: - gemu_log("F_SETFL,"); + qemu_log("F_SETFL,"); print_open_flags(arg2, 1); break; case TARGET_F_GETLK: - gemu_log("F_GETLK,"); + qemu_log("F_GETLK,"); print_pointer(arg2, 1); break; case TARGET_F_SETLK: - gemu_log("F_SETLK,"); + qemu_log("F_SETLK,"); print_pointer(arg2, 1); break; case TARGET_F_SETLKW: - gemu_log("F_SETLKW,"); + qemu_log("F_SETLKW,"); print_pointer(arg2, 1); break; case TARGET_F_GETOWN: - gemu_log("F_GETOWN"); + qemu_log("F_GETOWN"); break; case TARGET_F_SETOWN: - gemu_log("F_SETOWN,"); + qemu_log("F_SETOWN,"); print_raw_param(TARGET_ABI_FMT_ld, arg2, 0); break; case TARGET_F_GETSIG: - gemu_log("F_GETSIG"); + qemu_log("F_GETSIG"); break; case TARGET_F_SETSIG: - gemu_log("F_SETSIG,"); + qemu_log("F_SETSIG,"); print_raw_param(TARGET_ABI_FMT_ld, arg2, 0); break; #if TARGET_ABI_BITS == 32 case TARGET_F_GETLK64: - gemu_log("F_GETLK64,"); + qemu_log("F_GETLK64,"); print_pointer(arg2, 1); break; case TARGET_F_SETLK64: - gemu_log("F_SETLK64,"); + qemu_log("F_SETLK64,"); print_pointer(arg2, 1); break; case TARGET_F_SETLKW64: - gemu_log("F_SETLKW64,"); + qemu_log("F_SETLKW64,"); print_pointer(arg2, 1); break; #endif case TARGET_F_SETLEASE: - gemu_log("F_SETLEASE,"); + qemu_log("F_SETLEASE,"); print_raw_param(TARGET_ABI_FMT_ld, arg2, 0); break; case TARGET_F_GETLEASE: - gemu_log("F_GETLEASE"); + qemu_log("F_GETLEASE"); break; case TARGET_F_SETPIPE_SZ: - gemu_log("F_SETPIPE_SZ,"); + qemu_log("F_SETPIPE_SZ,"); print_raw_param(TARGET_ABI_FMT_ld, arg2, 1); break; case TARGET_F_GETPIPE_SZ: - gemu_log("F_GETPIPE_SZ"); + qemu_log("F_GETPIPE_SZ"); break; case TARGET_F_DUPFD_CLOEXEC: - gemu_log("F_DUPFD_CLOEXEC,"); + qemu_log("F_DUPFD_CLOEXEC,"); print_raw_param(TARGET_ABI_FMT_ld, arg2, 1); break; case TARGET_F_NOTIFY: - gemu_log("F_NOTIFY,"); + qemu_log("F_NOTIFY,"); print_raw_param(TARGET_ABI_FMT_ld, arg2, 0); break; default: @@ -1679,7 +1684,7 @@ print__llseek(const struct syscallname *name, case SEEK_CUR: whence = "SEEK_CUR"; break; case SEEK_END: whence = "SEEK_END"; break; } - gemu_log("%s",whence); + qemu_log("%s", whence); print_syscall_epilogue(name); } #endif @@ -1694,9 +1699,9 @@ print_socket(const struct syscallname *name, print_syscall_prologue(name); print_socket_domain(domain); - gemu_log(","); + qemu_log(","); print_socket_type(type); - gemu_log(","); + qemu_log(","); if (domain == AF_PACKET || (domain == AF_INET && type == TARGET_SOCK_PACKET)) { protocol = tswap16(protocol); @@ -1728,17 +1733,17 @@ static void do_print_socket(const char *name, abi_long arg1) get_user_ualx(domain, arg1, 0); get_user_ualx(type, arg1, 1); get_user_ualx(protocol, arg1, 2); - gemu_log("%s(", name); + qemu_log("%s(", name); print_socket_domain(domain); - gemu_log(","); + qemu_log(","); print_socket_type(type); - gemu_log(","); + qemu_log(","); if (domain == AF_PACKET || (domain == AF_INET && type == TARGET_SOCK_PACKET)) { protocol = tswap16(protocol); } print_socket_protocol(domain, type, protocol); - gemu_log(")"); + qemu_log(")"); } static void do_print_sockaddr(const char *name, abi_long arg1) @@ -1749,10 +1754,10 @@ static void do_print_sockaddr(const char *name, abi_long arg1) get_user_ualx(addr, arg1, 1); get_user_ualx(addrlen, arg1, 2); - gemu_log("%s(", name); + qemu_log("%s(", name); print_sockfd(sockfd, 0); print_sockaddr(addr, addrlen, 0); - gemu_log(")"); + qemu_log(")"); } static void do_print_listen(const char *name, abi_long arg1) @@ -1762,10 +1767,10 @@ static void do_print_listen(const char *name, abi_long arg1) get_user_ualx(sockfd, arg1, 0); get_user_ualx(backlog, arg1, 1); - gemu_log("%s(", name); + qemu_log("%s(", name); print_sockfd(sockfd, 0); print_raw_param(TARGET_ABI_FMT_ld, backlog, 1); - gemu_log(")"); + qemu_log(")"); } static void do_print_socketpair(const char *name, abi_long arg1) @@ -1777,15 +1782,15 @@ static void do_print_socketpair(const char *name, abi_long arg1) get_user_ualx(protocol, arg1, 2); get_user_ualx(tab, arg1, 3); - gemu_log("%s(", name); + qemu_log("%s(", name); print_socket_domain(domain); - gemu_log(","); + qemu_log(","); print_socket_type(type); - gemu_log(","); + qemu_log(","); print_socket_protocol(domain, type, protocol); - gemu_log(","); + qemu_log(","); print_raw_param(TARGET_ABI_FMT_lx, tab, 1); - gemu_log(")"); + qemu_log(")"); } static void do_print_sendrecv(const char *name, abi_long arg1) @@ -1797,12 +1802,12 @@ static void do_print_sendrecv(const char *name, abi_long arg1) get_user_ualx(len, arg1, 2); get_user_ualx(flags, arg1, 3); - gemu_log("%s(", name); + qemu_log("%s(", name); print_sockfd(sockfd, 0); print_buf(msg, len, 0); print_raw_param(TARGET_ABI_FMT_ld, len, 0); print_flags(msg_flags, flags, 1); - gemu_log(")"); + qemu_log(")"); } static void do_print_msgaddr(const char *name, abi_long arg1) @@ -1816,13 +1821,13 @@ static void do_print_msgaddr(const char *name, abi_long arg1) get_user_ualx(addr, arg1, 4); get_user_ualx(addrlen, arg1, 5); - gemu_log("%s(", name); + qemu_log("%s(", name); print_sockfd(sockfd, 0); print_buf(msg, len, 0); print_raw_param(TARGET_ABI_FMT_ld, len, 0); print_flags(msg_flags, flags, 0); print_sockaddr(addr, addrlen, 0); - gemu_log(")"); + qemu_log(")"); } static void do_print_shutdown(const char *name, abi_long arg1) @@ -1832,23 +1837,23 @@ static void do_print_shutdown(const char *name, abi_long arg1) get_user_ualx(sockfd, arg1, 0); get_user_ualx(how, arg1, 1); - gemu_log("shutdown("); + qemu_log("shutdown("); print_sockfd(sockfd, 0); switch (how) { case SHUT_RD: - gemu_log("SHUT_RD"); + qemu_log("SHUT_RD"); break; case SHUT_WR: - gemu_log("SHUT_WR"); + qemu_log("SHUT_WR"); break; case SHUT_RDWR: - gemu_log("SHUT_RDWR"); + qemu_log("SHUT_RDWR"); break; default: print_raw_param(TARGET_ABI_FMT_ld, how, 1); break; } - gemu_log(")"); + qemu_log(")"); } static void do_print_msg(const char *name, abi_long arg1) @@ -1859,11 +1864,11 @@ static void do_print_msg(const char *name, abi_long arg1) get_user_ualx(msg, arg1, 1); get_user_ualx(flags, arg1, 2); - gemu_log("%s(", name); + qemu_log("%s(", name); print_sockfd(sockfd, 0); print_pointer(msg, 0); print_flags(msg_flags, flags, 1); - gemu_log(")"); + qemu_log(")"); } static void do_print_sockopt(const char *name, abi_long arg1) @@ -1876,113 +1881,113 @@ static void do_print_sockopt(const char *name, abi_long arg1) get_user_ualx(optval, arg1, 3); get_user_ualx(optlen, arg1, 4); - gemu_log("%s(", name); + qemu_log("%s(", name); print_sockfd(sockfd, 0); switch (level) { case SOL_TCP: - gemu_log("SOL_TCP,"); + qemu_log("SOL_TCP,"); print_raw_param(TARGET_ABI_FMT_ld, optname, 0); print_pointer(optval, 0); break; case SOL_IP: - gemu_log("SOL_IP,"); + qemu_log("SOL_IP,"); print_raw_param(TARGET_ABI_FMT_ld, optname, 0); print_pointer(optval, 0); break; case SOL_RAW: - gemu_log("SOL_RAW,"); + qemu_log("SOL_RAW,"); print_raw_param(TARGET_ABI_FMT_ld, optname, 0); print_pointer(optval, 0); break; case TARGET_SOL_SOCKET: - gemu_log("SOL_SOCKET,"); + qemu_log("SOL_SOCKET,"); switch (optname) { case TARGET_SO_DEBUG: - gemu_log("SO_DEBUG,"); + qemu_log("SO_DEBUG,"); print_optint: print_number(optval, 0); break; case TARGET_SO_REUSEADDR: - gemu_log("SO_REUSEADDR,"); + qemu_log("SO_REUSEADDR,"); goto print_optint; case TARGET_SO_REUSEPORT: - gemu_log("SO_REUSEPORT,"); + qemu_log("SO_REUSEPORT,"); goto print_optint; case TARGET_SO_TYPE: - gemu_log("SO_TYPE,"); + qemu_log("SO_TYPE,"); goto print_optint; case TARGET_SO_ERROR: - gemu_log("SO_ERROR,"); + qemu_log("SO_ERROR,"); goto print_optint; case TARGET_SO_DONTROUTE: - gemu_log("SO_DONTROUTE,"); + qemu_log("SO_DONTROUTE,"); goto print_optint; case TARGET_SO_BROADCAST: - gemu_log("SO_BROADCAST,"); + qemu_log("SO_BROADCAST,"); goto print_optint; case TARGET_SO_SNDBUF: - gemu_log("SO_SNDBUF,"); + qemu_log("SO_SNDBUF,"); goto print_optint; case TARGET_SO_RCVBUF: - gemu_log("SO_RCVBUF,"); + qemu_log("SO_RCVBUF,"); goto print_optint; case TARGET_SO_KEEPALIVE: - gemu_log("SO_KEEPALIVE,"); + qemu_log("SO_KEEPALIVE,"); goto print_optint; case TARGET_SO_OOBINLINE: - gemu_log("SO_OOBINLINE,"); + qemu_log("SO_OOBINLINE,"); goto print_optint; case TARGET_SO_NO_CHECK: - gemu_log("SO_NO_CHECK,"); + qemu_log("SO_NO_CHECK,"); goto print_optint; case TARGET_SO_PRIORITY: - gemu_log("SO_PRIORITY,"); + qemu_log("SO_PRIORITY,"); goto print_optint; case TARGET_SO_BSDCOMPAT: - gemu_log("SO_BSDCOMPAT,"); + qemu_log("SO_BSDCOMPAT,"); goto print_optint; case TARGET_SO_PASSCRED: - gemu_log("SO_PASSCRED,"); + qemu_log("SO_PASSCRED,"); goto print_optint; case TARGET_SO_TIMESTAMP: - gemu_log("SO_TIMESTAMP,"); + qemu_log("SO_TIMESTAMP,"); goto print_optint; case TARGET_SO_RCVLOWAT: - gemu_log("SO_RCVLOWAT,"); + qemu_log("SO_RCVLOWAT,"); goto print_optint; case TARGET_SO_RCVTIMEO: - gemu_log("SO_RCVTIMEO,"); + qemu_log("SO_RCVTIMEO,"); print_timeval(optval, 0); break; case TARGET_SO_SNDTIMEO: - gemu_log("SO_SNDTIMEO,"); + qemu_log("SO_SNDTIMEO,"); print_timeval(optval, 0); break; case TARGET_SO_ATTACH_FILTER: { struct target_sock_fprog *fprog; - gemu_log("SO_ATTACH_FILTER,"); + qemu_log("SO_ATTACH_FILTER,"); if (lock_user_struct(VERIFY_READ, fprog, optval, 0)) { struct target_sock_filter *filter; - gemu_log("{"); + qemu_log("{"); if (lock_user_struct(VERIFY_READ, filter, tswapal(fprog->filter), 0)) { int i; for (i = 0; i < tswap16(fprog->len) - 1; i++) { - gemu_log("[%d]{0x%x,%d,%d,0x%x},", + qemu_log("[%d]{0x%x,%d,%d,0x%x},", i, tswap16(filter[i].code), filter[i].jt, filter[i].jf, tswap32(filter[i].k)); } - gemu_log("[%d]{0x%x,%d,%d,0x%x}", + qemu_log("[%d]{0x%x,%d,%d,0x%x}", i, tswap16(filter[i].code), filter[i].jt, filter[i].jf, tswap32(filter[i].k)); } else { - gemu_log(TARGET_ABI_FMT_lx, tswapal(fprog->filter)); + qemu_log(TARGET_ABI_FMT_lx, tswapal(fprog->filter)); } - gemu_log(",%d},", tswap16(fprog->len)); + qemu_log(",%d},", tswap16(fprog->len)); unlock_user(fprog, optval, 0); } else { print_pointer(optval, 0); @@ -2002,7 +2007,7 @@ print_optint: break; } print_raw_param(TARGET_ABI_FMT_ld, optlen, 1); - gemu_log(")"); + qemu_log(")"); } #define PRINT_SOCKOP(name, func) \ @@ -2164,7 +2169,7 @@ print_rt_sigprocmask(const struct syscallname *name, case TARGET_SIG_UNBLOCK: how = "SIG_UNBLOCK"; break; case TARGET_SIG_SETMASK: how = "SIG_SETMASK"; break; } - gemu_log("%s,",how); + qemu_log("%s,", how); print_pointer(arg1, 0); print_pointer(arg2, 1); print_syscall_epilogue(name); @@ -2278,7 +2283,7 @@ print_syslog_action(abi_ulong arg, int last) return; } } - gemu_log("%s%s", type, get_comma(last)); + qemu_log("%s%s", type, get_comma(last)); } static void @@ -2683,20 +2688,20 @@ static void print_futex_op(abi_long tflag, int last) { #define print_op(val) \ if( cmd == val ) { \ - gemu_log(#val); \ + qemu_log(#val); \ return; \ } int cmd = (int)tflag; #ifdef FUTEX_PRIVATE_FLAG if (cmd & FUTEX_PRIVATE_FLAG) { - gemu_log("FUTEX_PRIVATE_FLAG|"); + qemu_log("FUTEX_PRIVATE_FLAG|"); cmd &= ~FUTEX_PRIVATE_FLAG; } #endif #ifdef FUTEX_CLOCK_REALTIME if (cmd & FUTEX_CLOCK_REALTIME) { - gemu_log("FUTEX_CLOCK_REALTIME|"); + qemu_log("FUTEX_CLOCK_REALTIME|"); cmd &= ~FUTEX_CLOCK_REALTIME; } #endif @@ -2716,7 +2721,7 @@ if( cmd == val ) { \ print_op(FUTEX_WAKE_BITSET) #endif /* unknown values */ - gemu_log("%d",cmd); + qemu_log("%d", cmd); } static void @@ -2812,22 +2817,24 @@ print_syscall(int num, int i; const char *format="%s(" TARGET_ABI_FMT_ld "," TARGET_ABI_FMT_ld "," TARGET_ABI_FMT_ld "," TARGET_ABI_FMT_ld "," TARGET_ABI_FMT_ld "," TARGET_ABI_FMT_ld ")"; - gemu_log("%d ", getpid() ); + qemu_log("%d ", getpid()); for(i=0;i X-Patchwork-Id: 1224952 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=google.com header.i=@google.com header.a=rsa-sha256 header.s=20161025 header.b=uS/2mREI; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 47zrhm2QxWz9sPJ for ; Sat, 18 Jan 2020 06:28:56 +1100 (AEDT) Received: from localhost ([::1]:33852 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1isXIb-0004Sh-VY for incoming@patchwork.ozlabs.org; Fri, 17 Jan 2020 14:28:53 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:40082) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from <30woiXgMKCmgPQfMUUMRK.IUSWKSa-JKbKRTUTMTa.UXM@flex--jkz.bounces.google.com>) id 1isXI6-0004QO-Rb for qemu-devel@nongnu.org; Fri, 17 Jan 2020 14:28:23 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from <30woiXgMKCmgPQfMUUMRK.IUSWKSa-JKbKRTUTMTa.UXM@flex--jkz.bounces.google.com>) id 1isXI5-0003xw-Jd for qemu-devel@nongnu.org; Fri, 17 Jan 2020 14:28:22 -0500 Received: from mail-pl1-x649.google.com ([2607:f8b0:4864:20::649]:41703) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from <30woiXgMKCmgPQfMUUMRK.IUSWKSa-JKbKRTUTMTa.UXM@flex--jkz.bounces.google.com>) id 1isXI5-0003wV-Ea for qemu-devel@nongnu.org; Fri, 17 Jan 2020 14:28:21 -0500 Received: by mail-pl1-x649.google.com with SMTP id p6so624079pls.8 for ; Fri, 17 Jan 2020 11:28:20 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=date:in-reply-to:message-id:mime-version:references:subject:from:to :cc; bh=hijhxrQMtQ0keTaHnJ/kYAmvv9buqL/qn4fGTZDsadU=; b=uS/2mREI86NxVD6/QP5O/imRqqTh1uw85eJ8OcYBLT+ai+/iXti9Aq1zQWhae0xQ99 KpWx5m7FnQ8Dmorply2yGt0uJcK85FBjVBkbZZO2y/zJBbBp1qwnx0DYhGvr2p80jxRS Tzi/bOU+sZmoEa2IxsSurAZyCSBGWAtV/5Wx7Qx751hfF0csh09vYMx8MSCP27BS8jNx O6Ml2KUMF/10C5VxDG3fkfQrCMHrwfh/Yxpkn5f1UhNwqPGCTuhFxXI2equJju5Xnmj9 roCEBGDZ/NDuf7Nik12ddBmPTz1RPUzjFHzb6sZ6CSTn9PRM5yYuRTRTsTcNJ/QMZfqy UQMw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=hijhxrQMtQ0keTaHnJ/kYAmvv9buqL/qn4fGTZDsadU=; b=i4tRP4B5udxBzIXxuai4O83OliL/pJ7xsg8/iSPAaozacJSLHRUKg57P9zdEPwJcMd nLY7JGVEld/cVloHvTgR8W12bEdU3bHRHtrncdUtwIq6xECOPW59y8GrLHqpQg06qamW FKZWRneQgcKyROTlv9MMjKQP289krsaAXceiwcnIPhoZPAIBAQqsEG8yG5rUmTAiKKMl 5cTzIdJjHgDCRqNfyZ5zshW7H5LdMB1zqR/kH3SJ4tD+5gXDo88dnBhjF5Cc9q2zjSCw zbrOToY59E6Lln6tyQaQcLQRZL4PdgrMZF+AYeWoSBFaxRnlOzbWwiOcurc2AVF65XIa FrRA== X-Gm-Message-State: APjAAAVjtcY/o1HXvXOzHzTm7TDvcafEcW//QA7XtGVjAfP/q0kmsag2 D8MvC6U9DNUtCG+P+I3fbyOyFniFwWIb3FoC0/Cq8/NZMAX1saza/j2gmzBM6f/de3DlNLyiz1W XQzt3FZQFbzeKOe8e8FOZVR3PYZ+HxDpndna7G/EsDUk7x/2JHRvg X-Google-Smtp-Source: APXvYqwz/2MzZl7I4142uyEknwHFd8iimkEp1f9b+iqNp2ArkRq8FrLfcexiTW8koNuWzzIzrakticc= X-Received: by 2002:a63:cf41:: with SMTP id b1mr46565654pgj.53.1579289299984; Fri, 17 Jan 2020 11:28:19 -0800 (PST) Date: Fri, 17 Jan 2020 11:28:07 -0800 In-Reply-To: <20200117192808.129398-1-jkz@google.com> Message-Id: <20200117192808.129398-4-jkz@google.com> Mime-Version: 1.0 References: <20200117192808.129398-1-jkz@google.com> X-Mailer: git-send-email 2.25.0.341.g760bfbb309-goog Subject: [PATCH v2 3/4] linux-user: remove gemu_log from the linux-user tree From: Josh Kunz To: qemu-devel@nongnu.org Cc: riku.voipio@iki.fi, laurent@vivier.eu, alex.bennee@linaro.org, armbru@redhat.com, imp@bsdimp.com, Josh Kunz X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::649 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 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" Now that all uses have been migrated to `qemu_log' it is no longer needed. Signed-off-by: Josh Kunz Reviewed-by: Laurent Vivier --- linux-user/main.c | 9 --------- linux-user/qemu.h | 1 - 2 files changed, 10 deletions(-) diff --git a/linux-user/main.c b/linux-user/main.c index 8f1d07cdd6..22578b1633 100644 --- a/linux-user/main.c +++ b/linux-user/main.c @@ -112,15 +112,6 @@ const char *qemu_uname_release; by remapping the process stack directly at the right place */ unsigned long guest_stack_size = 8 * 1024 * 1024UL; -void gemu_log(const char *fmt, ...) -{ - va_list ap; - - va_start(ap, fmt); - vfprintf(stderr, fmt, ap); - va_end(ap); -} - #if defined(TARGET_I386) int cpu_get_pic_interrupt(CPUX86State *env) { diff --git a/linux-user/qemu.h b/linux-user/qemu.h index 02c6890c8a..329b409e65 100644 --- a/linux-user/qemu.h +++ b/linux-user/qemu.h @@ -210,7 +210,6 @@ abi_long do_syscall(void *cpu_env, int num, abi_long arg1, abi_long arg2, abi_long arg3, abi_long arg4, abi_long arg5, abi_long arg6, abi_long arg7, abi_long arg8); -void gemu_log(const char *fmt, ...) GCC_FMT_ATTR(1, 2); extern __thread CPUState *thread_cpu; void cpu_loop(CPUArchState *env); const char *target_strerror(int err); From patchwork Fri Jan 17 19:28:08 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Josh Kunz X-Patchwork-Id: 1224955 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=google.com header.i=@google.com header.a=rsa-sha256 header.s=20161025 header.b=cLYqeXUh; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 47zrlv4v7vz9sPJ for ; Sat, 18 Jan 2020 06:31:39 +1100 (AEDT) Received: from localhost ([::1]:33898 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1isXLF-0007Ph-4C for incoming@patchwork.ozlabs.org; Fri, 17 Jan 2020 14:31:37 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:40101) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from <31goiXgMKCmsSTiPXXPUN.LXVZNVd-MNeNUWXWPWd.XaP@flex--jkz.bounces.google.com>) id 1isXIA-0004Ty-1W for qemu-devel@nongnu.org; Fri, 17 Jan 2020 14:28:27 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from <31goiXgMKCmsSTiPXXPUN.LXVZNVd-MNeNUWXWPWd.XaP@flex--jkz.bounces.google.com>) id 1isXI8-00040d-B4 for qemu-devel@nongnu.org; Fri, 17 Jan 2020 14:28:25 -0500 Received: from mail-pf1-x44a.google.com ([2607:f8b0:4864:20::44a]:40868) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from <31goiXgMKCmsSTiPXXPUN.LXVZNVd-MNeNUWXWPWd.XaP@flex--jkz.bounces.google.com>) id 1isXI8-0003zP-35 for qemu-devel@nongnu.org; Fri, 17 Jan 2020 14:28:24 -0500 Received: by mail-pf1-x44a.google.com with SMTP id d127so15640510pfa.7 for ; Fri, 17 Jan 2020 11:28:23 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=date:in-reply-to:message-id:mime-version:references:subject:from:to :cc; bh=CxpIz0SmVmTUpXU6rR/3/fia0JiIjvv95B0xreks9eo=; b=cLYqeXUhOsrxgO5tmbDC65cdIB2JbL+mcy9Xn2vJ0cipxw0MLSHAJv47LHtu8i3pLJ y8+4ZGtf2Nkdxg7ZVx/ymVwfqxFtnkLCrJ7DuuNOH2b+WHqtHO0VdLV2FRHmWJdAudoV QTlNDfMwupOdQW8e/aOV2sNk0kn4IyNHIdSTFPZU5xg/U5haAGwA/aQaSCxOIgxO4r97 NT+qHIFvSlfexTOWreUF1Ehz3iRXGhnAroA4plYV0Y+Lq+HFEr3o6hevshRqkpvMTrOx 9O/Dvda6EQ1k4BFI48cJIjJt+rnqSf5/b6wfqveqF4SWQILYL7aucrDr8PEKp516HLjS N+Cg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=CxpIz0SmVmTUpXU6rR/3/fia0JiIjvv95B0xreks9eo=; b=IZNURa8b0KGt9NBYNkPwRNNjsEW8vZvGVSRrkFVZawuRS+sBEf5N2IqEVMvMquzn+u FY7CIH8b2j38FRxMVhiOkYdZy2BbmD+ptIBiXgUe8LsJ6ez0707WbgSyHEViOafRmCGs IBeFD3JwD0JITs8zwaMkLrP+n5vzVpDmg6gM29K7+PX5fwCUWaoW30wayZW62fiSiuqd 1kzaunv+OMiUhE5k9ua8+fgVMRkbtKEcYz5W+qFkEbX0hkVSJIui8o0n1POLgmtKPgJ0 h+x7ioubndEu08GHrz+BPDeMJb+M66NRotKAW16+uvLxT2I9PjE0imLurTOR54j7yE+s Pnxg== X-Gm-Message-State: APjAAAVRqV87aEFXdV0B82mttyZdNCqPTuhoty5gN32OtvvZj/hayvcD H3R+HVOVS5cnITw7l4vcopQRETALTSmpa8I/jVxySXnbphgxkRncmut4K46JQBXj84XkLJPqemx Hv0WGEH0TpytVnUZBmYBahWnxPWAbh/OTlPKWLXSkDvLmVrbrlN/H X-Google-Smtp-Source: APXvYqxJoZU+M28UNduNTp1FfRlwh/8ws476VDsFCLtg6Wm0jQWhcnlQBEInOVLxSqoeuAitoQ8wGB8= X-Received: by 2002:a63:27c4:: with SMTP id n187mr48209900pgn.305.1579289302385; Fri, 17 Jan 2020 11:28:22 -0800 (PST) Date: Fri, 17 Jan 2020 11:28:08 -0800 In-Reply-To: <20200117192808.129398-1-jkz@google.com> Message-Id: <20200117192808.129398-5-jkz@google.com> Mime-Version: 1.0 References: <20200117192808.129398-1-jkz@google.com> X-Mailer: git-send-email 2.25.0.341.g760bfbb309-goog Subject: [PATCH v2 4/4] bsd-user: Replace gemu_log with qemu_log From: Josh Kunz To: qemu-devel@nongnu.org Cc: riku.voipio@iki.fi, laurent@vivier.eu, alex.bennee@linaro.org, armbru@redhat.com, imp@bsdimp.com, Josh Kunz X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::44a X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 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" gemu_log is an old logging mechanism used to implement strace logging in the bsd-user tree. It logs directly to stderr and cannot easily be redirected. This change instead causes strace to log via the qemu_log subsystem which has fine-grained logging control, and a centralized mechanism for log redirection. bsd-user does not currently implement any logging redirection options, or log masking options, but this change brings it more in line with the linux-user tree. Signed-off-by: Josh Kunz --- bsd-user/main.c | 13 ++----------- bsd-user/qemu.h | 2 -- bsd-user/strace.c | 32 +++++++++++++++----------------- bsd-user/syscall.c | 31 +++++++++++++++++++------------ 4 files changed, 36 insertions(+), 42 deletions(-) diff --git a/bsd-user/main.c b/bsd-user/main.c index 770c2b267a..2ca975d52c 100644 --- a/bsd-user/main.c +++ b/bsd-user/main.c @@ -55,15 +55,6 @@ enum BSDType bsd_type; by remapping the process stack directly at the right place */ unsigned long x86_stack_size = 512 * 1024; -void gemu_log(const char *fmt, ...) -{ - va_list ap; - - va_start(ap, fmt); - vfprintf(stderr, fmt, ap); - va_end(ap); -} - #if defined(TARGET_I386) int cpu_get_pic_interrupt(CPUX86State *env) { @@ -845,7 +836,7 @@ int main(int argc, char **argv) } else if (!strcmp(r, "singlestep")) { singlestep = 1; } else if (!strcmp(r, "strace")) { - do_strace = 1; + qemu_add_log(LOG_STRACE); } else if (!strcmp(r, "trace")) { g_free(trace_file); trace_file = trace_opt_parse(optarg); @@ -917,7 +908,7 @@ int main(int argc, char **argv) thread_cpu = cpu; if (getenv("QEMU_STRACE")) { - do_strace = 1; + qemu_add_log(LOG_STRACE); } target_environ = envlist_to_environ(envlist, NULL); diff --git a/bsd-user/qemu.h b/bsd-user/qemu.h index 09e8aed9c7..5762e3a6e5 100644 --- a/bsd-user/qemu.h +++ b/bsd-user/qemu.h @@ -152,7 +152,6 @@ abi_long do_netbsd_syscall(void *cpu_env, int num, abi_long arg1, abi_long do_openbsd_syscall(void *cpu_env, int num, abi_long arg1, abi_long arg2, abi_long arg3, abi_long arg4, abi_long arg5, abi_long arg6); -void gemu_log(const char *fmt, ...) GCC_FMT_ATTR(1, 2); extern THREAD CPUState *thread_cpu; void cpu_loop(CPUArchState *env); char *target_strerror(int err); @@ -188,7 +187,6 @@ print_openbsd_syscall(int num, abi_long arg1, abi_long arg2, abi_long arg3, abi_long arg4, abi_long arg5, abi_long arg6); void print_openbsd_syscall_ret(int num, abi_long ret); -extern int do_strace; /* signal.c */ void process_pending_signals(CPUArchState *cpu_env); diff --git a/bsd-user/strace.c b/bsd-user/strace.c index fa66fe1ee2..6ee1510555 100644 --- a/bsd-user/strace.c +++ b/bsd-user/strace.c @@ -23,8 +23,6 @@ #include "qemu.h" -int do_strace; - /* * Utility functions */ @@ -36,17 +34,17 @@ static void print_sysctl(const struct syscallname *name, abi_long arg1, uint32_t i; int32_t *namep; - gemu_log("%s({ ", name->name); + qemu_log("%s({ ", name->name); namep = lock_user(VERIFY_READ, arg1, sizeof(int32_t) * arg2, 1); if (namep) { int32_t *p = namep; for (i = 0; i < (uint32_t)arg2; i++) { - gemu_log("%d ", tswap32(*p++)); + qemu_log("%d ", tswap32(*p++)); } unlock_user(namep, arg1, 0); } - gemu_log("}, %u, 0x" TARGET_ABI_FMT_lx ", 0x" TARGET_ABI_FMT_lx ", 0x" + qemu_log("}, %u, 0x" TARGET_ABI_FMT_lx ", 0x" TARGET_ABI_FMT_lx ", 0x" TARGET_ABI_FMT_lx ", 0x" TARGET_ABI_FMT_lx ")", (uint32_t)arg2, arg3, arg4, arg5, arg6); } @@ -62,7 +60,7 @@ static void print_execve(const struct syscallname *name, abi_long arg1, if (s == NULL) { return; } - gemu_log("%s(\"%s\",{", name->name, s); + qemu_log("%s(\"%s\",{", name->name, s); unlock_user(s, arg1, 0); for (arg_ptr_addr = arg2; ; arg_ptr_addr += sizeof(abi_ulong)) { @@ -78,11 +76,11 @@ static void print_execve(const struct syscallname *name, abi_long arg1, break; } if ((s = lock_user_string(arg_addr))) { - gemu_log("\"%s\",", s); + qemu_log("\"%s\",", s); unlock_user(s, arg_addr, 0); } } - gemu_log("NULL})"); + qemu_log("NULL})"); } static void print_ioctl(const struct syscallname *name, @@ -90,7 +88,7 @@ static void print_ioctl(const struct syscallname *name, abi_long arg5, abi_long arg6) { /* Decode the ioctl request */ - gemu_log("%s(%d, 0x%0lx { IO%s%s GRP:0x%x('%c') CMD:%d LEN:%d }, 0x" + qemu_log("%s(%d, 0x%0lx { IO%s%s GRP:0x%x('%c') CMD:%d LEN:%d }, 0x" TARGET_ABI_FMT_lx ", ...)", name->name, (int)arg1, @@ -111,9 +109,9 @@ static void print_ioctl(const struct syscallname *name, static void print_syscall_ret_addr(const struct syscallname *name, abi_long ret) { if (ret == -1) { - gemu_log(" = -1 errno=%d (%s)\n", errno, strerror(errno)); + qemu_log(" = -1 errno=%d (%s)\n", errno, strerror(errno)); } else { - gemu_log(" = 0x" TARGET_ABI_FMT_lx "\n", ret); + qemu_log(" = 0x" TARGET_ABI_FMT_lx "\n", ret); } } @@ -121,7 +119,7 @@ static void print_syscall_ret_addr(const struct syscallname *name, abi_long ret) static void print_syscall_ret_raw(struct syscallname *name, abi_long ret) { - gemu_log(" = 0x" TARGET_ABI_FMT_lx "\n", ret); + qemu_log(" = 0x" TARGET_ABI_FMT_lx "\n", ret); } #endif @@ -148,7 +146,7 @@ static void print_syscall(int num, const struct syscallname *scnames, TARGET_ABI_FMT_ld "," TARGET_ABI_FMT_ld "," TARGET_ABI_FMT_ld "," TARGET_ABI_FMT_ld ")"; - gemu_log("%d ", getpid() ); + qemu_log("%d ", getpid()); for (i = 0; i < nscnames; i++) { if (scnames[i].nr == num) { @@ -161,13 +159,13 @@ static void print_syscall(int num, const struct syscallname *scnames, if (scnames[i].format != NULL) { format = scnames[i].format; } - gemu_log(format, scnames[i].name, arg1, arg2, arg3, arg4, arg5, + qemu_log(format, scnames[i].name, arg1, arg2, arg3, arg4, arg5, arg6); } return; } } - gemu_log("Unknown syscall %d\n", num); + qemu_log("Unknown syscall %d\n", num); } static void print_syscall_ret(int num, abi_long ret, @@ -181,10 +179,10 @@ static void print_syscall_ret(int num, abi_long ret, scnames[i].result(&scnames[i], ret); } else { if (ret < 0) { - gemu_log(" = -1 errno=" TARGET_ABI_FMT_ld " (%s)\n", -ret, + qemu_log(" = -1 errno=" TARGET_ABI_FMT_ld " (%s)\n", -ret, strerror(-ret)); } else { - gemu_log(" = " TARGET_ABI_FMT_ld "\n", ret); + qemu_log(" = " TARGET_ABI_FMT_ld "\n", ret); } } break; diff --git a/bsd-user/syscall.c b/bsd-user/syscall.c index 0d45b654bb..53635d183e 100644 --- a/bsd-user/syscall.c +++ b/bsd-user/syscall.c @@ -321,12 +321,13 @@ abi_long do_freebsd_syscall(void *cpu_env, int num, abi_long arg1, void *p; #ifdef DEBUG - gemu_log("freebsd syscall %d\n", num); + qemu_log("freebsd syscall %d\n", num); #endif record_syscall_start(cpu, num, arg1, arg2, arg3, arg4, arg5, arg6, 0, 0); - if(do_strace) + if (unlikely(qemu_loglevel_mask(LOG_STRACE))) { print_freebsd_syscall(num, arg1, arg2, arg3, arg4, arg5, arg6); + } switch(num) { case TARGET_FREEBSD_NR_exit: @@ -401,10 +402,12 @@ abi_long do_freebsd_syscall(void *cpu_env, int num, abi_long arg1, } fail: #ifdef DEBUG - gemu_log(" = %ld\n", ret); + qemu_log(" = %ld\n", ret); #endif - if (do_strace) + + if (unlikely(qemu_loglevel_mask(LOG_STRACE))) { print_freebsd_syscall_ret(num, ret); + } record_syscall_return(cpu, num, ret); return ret; @@ -422,13 +425,14 @@ abi_long do_netbsd_syscall(void *cpu_env, int num, abi_long arg1, void *p; #ifdef DEBUG - gemu_log("netbsd syscall %d\n", num); + qemu_log("netbsd syscall %d\n", num); #endif record_syscall_start(cpu, num, arg1, arg2, arg3, arg4, arg5, arg6, 0, 0); - if(do_strace) + if (unlikely(qemu_loglevel_mask(LOG_STRACE))) { print_netbsd_syscall(num, arg1, arg2, arg3, arg4, arg5, arg6); + } switch(num) { case TARGET_NETBSD_NR_exit: @@ -480,10 +484,11 @@ abi_long do_netbsd_syscall(void *cpu_env, int num, abi_long arg1, } fail: #ifdef DEBUG - gemu_log(" = %ld\n", ret); + qemu_log(" = %ld\n", ret); #endif - if (do_strace) + if (unlikely(qemu_loglevel_mask(LOG_STRACE))) { print_netbsd_syscall_ret(num, ret); + } record_syscall_return(cpu, num, ret); return ret; @@ -501,13 +506,14 @@ abi_long do_openbsd_syscall(void *cpu_env, int num, abi_long arg1, void *p; #ifdef DEBUG - gemu_log("openbsd syscall %d\n", num); + qemu_log("openbsd syscall %d\n", num); #endif record_syscall_start(cpu, num, arg1, arg2, arg3, arg4, arg5, arg6, 0, 0); - if(do_strace) + if (unlikely(qemu_loglevel_mask(LOG_STRACE))) { print_openbsd_syscall(num, arg1, arg2, arg3, arg4, arg5, arg6); + } switch(num) { case TARGET_OPENBSD_NR_exit: @@ -559,10 +565,11 @@ abi_long do_openbsd_syscall(void *cpu_env, int num, abi_long arg1, } fail: #ifdef DEBUG - gemu_log(" = %ld\n", ret); + qemu_log(" = %ld\n", ret); #endif - if (do_strace) + if (unlikely(qemu_loglevel_mask(LOG_STRACE))) { print_openbsd_syscall_ret(num, ret); + } record_syscall_return(cpu, num, ret); return ret;