From nobody Fri Apr 26 10:25:32 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=gmx.de ARC-Seal: i=1; a=rsa-sha256; t=1663716279; cv=none; d=zohomail.com; s=zohoarc; b=lqwwqJ/md+qb+nKx/AT2BIl3OKiXpwlNlztawlJhRbcOrlF5x5GGsgSyvLyCDS+0F0I/1SYIjmNfHhkjUCuvotT/MIVlBTpBiMKnbrJSnNzjAXtPK+dUSod7OF/UjQHH8virQcfCNIcPKEITRVMYGbmWA7U70/PuFtfcUKJi7fw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1663716279; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=Eo16MlU0PkU2tA71IsviwErckpP87VPUcnvqoC2/hSs=; b=iJJUlBrbw8PMh4JOzPHRP8MZPU1Ta8GnLFxyWyuGk0YthOcA7disfTpWDqK8R1V8EGJhmAw74WSeNAQ/1AoVRqjvvRouVmIqth/Ac28hMafgeAT2irtHRvMdDDM/eAs+hl6N8QT0ISVF19dv6c8cnnskhLuMroHdohrK1IJwiOY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 16637162798082.886110960868791; Tue, 20 Sep 2022 16:24:39 -0700 (PDT) Received: from localhost ([::1]:57548 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oambV-0000LL-UW for importer@patchew.org; Tue, 20 Sep 2022 19:24:37 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:52872) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oah6M-00049i-Az for qemu-devel@nongnu.org; Tue, 20 Sep 2022 13:32:09 -0400 Received: from mout.gmx.net ([212.227.17.22]:56561) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oah6D-0003Ih-Tx for qemu-devel@nongnu.org; Tue, 20 Sep 2022 13:32:05 -0400 Received: from p100.fritz.box ([92.116.174.94]) by mail.gmx.net (mrgmx104 [212.227.17.168]) with ESMTPSA (Nemesis) id 1MHXFx-1oVy120gy1-00DVJM; Tue, 20 Sep 2022 19:31:53 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1663695113; bh=7aS2o35HsYTsCq2IrHBGKkUUxkKyHtWnOczIq8CEF3Q=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References; b=Z1EYK39+FAYLS2ZMYTqbIMB3qK09GIZLO/cxtZgHu91QRTXXDBzy9BRIjZJs/FjF7 6WANQKi/BkKSY+2hs+yrI+weRlrTTHQuxigY1zFsbu0zPKUEQMOIKRWIbnNUi6UkV4 HuqdJBPKtAZDR1R8CBmXC+fgYKNJUETyH+kS+tCw= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c From: Helge Deller To: qemu-devel@nongnu.org, Laurent Vivier , Richard Henderson , Stefan Hajnoczi Cc: deller@gmx.de Subject: [PULL 01/12] linux-user: Add missing signals in strace output Date: Tue, 20 Sep 2022 19:31:41 +0200 Message-Id: <20220920173152.199359-2-deller@gmx.de> X-Mailer: git-send-email 2.37.3 In-Reply-To: <20220920173152.199359-1-deller@gmx.de> References: <20220920173152.199359-1-deller@gmx.de> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Provags-ID: V03:K1:pCu7hugRgnxCbWkJZYVblsOSnq1qb8SW25wJSAMmngCOgJtbl0q VVT2S93Q8KdSByJzINdXwlJcuc4GhNXCMX2xJdJfn+R7m3IjPHlqS3u4QI6Vl9xRCn895c+ Zim+bNr2/IzMBtYCH6qGpmkke3ql8LbR7QH1C3PKnPx2uTg/Ds5FTjLp7ArW1OaFDNK7J0X 5RtQKb2HP7I8ch//Qdu6A== X-UI-Out-Filterresults: notjunk:1;V03:K0:hE/V6ylBjag=:/Vf6idBE8EMeo6X8Cv6wur 8JSTr/SPcbx8uq1RzvECsH6K4Yo8ZJxFVgjBt7bYt0Jp1wVEzGoaD/jFZcoVfJ1D+fW/7gfAd ELX62fQvEZSY4Wu519qh1FEofhmUWQiVyEANuh7gDop5+WzCSMcISQM0C0XQhPOqxTbSFNZr0 VafEEMAOgmGvybQd+DKLxtHKW5Fx6kAmdRIpA9oxa9MsdOwiRskJLHsUKNnHiVMo0vc18xQKh Jucd0dl4g+IiE6pvWTHq4HfABekABpk61arx7Kto3g7x4bHvRkc1ftUXaNCyMw7Ok3ICS5Fn9 Emx5nUvbVUWF9NRpEnk8Mec1kJUcD+HFKs0UZhBHh4rMzrwP1X/pX7naKmusYgAixyE3Jk3+I WO20G9uIHtRN8poK9WJArkFzUn7moChD5/JLnxMFTyERcQsHFtLYlUg5M/TRVz97Rg6VO4CQq GTh6W2FbbPwq9cCX3aeAg/JpZDdtTywTQYXHQQz5w8GH83Kuwuqpnqw61fdMWPNeyluJiXV+q iuvfN7JN/V+4bg9jSxKwojeBO1IXW51iNXpc288r3QqeQzCfgHrm+Mp6hgsuxNryOI8msuJWY Gm3yQEjwfDNvL0KoSDJ1GSn1uFpxllPLp3KRQykeyDDXciy7mTaa4s3K0bw9r/E8zZQAAP3WX 5/UwpZFb642LNQEIVtmRVpBzz9CeB3KOLGWKz7ORx45RbVlCQxR0I8O/YPYEb7dvjZMScXOUO wsgL+VA/+DuRkWF86IfQ5v5l/7vh6P/yxIjblL/U8Ig80xJs8lb5p+uweGrg9WJ0wBvNCo9j6 RLIg5c2b1JJoLyXJlMOgzaZjRjR/c+Nrqrm6wcODNdntH9Qss+t8S9f7R/inZOtVfHvXak6gi HrhDlsyfFLjcOzI1zkWoF4d28raXZRO5kT40JGIlsmx+XDaKROVfg4VGUcNpuIB7ZvI71crNS wXlOJXHi5F7P0JAySajKK5S1ldv7u+N3tiGk1dZQ6gqL/+256BbwDBoi6f+Ci5DCKYi22z20k Zq7UE1hqU5owqP5bV4Kr9L9/qTcXvdP81rnyPY3ZURaz7YGFQovde/Ed2Ed0Jx5koyCQGtISK jU5+fxkUNI2QA658cNxB5Vc0JyPhoRq4/FMTark2UMCriCat2/Hquk8VHlWhcryFYD+9GGha/ lrUus= Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=212.227.17.22; envelope-from=deller@gmx.de; helo=mout.gmx.net X-Spam_score_int: -25 X-Spam_score: -2.6 X-Spam_bar: -- X-Spam_report: (-2.6 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, UPPERCASE_50_75=0.008 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @gmx.net) X-ZM-MESSAGEID: 1663716280568100001 Content-Type: text/plain; charset="utf-8" Some of the guest signal numbers are currently not converted to their representative names in the strace output, e.g. SIGVTALRM. This patch introduces a smart way to generate and keep in sync the host-to-guest and guest-to-host signal conversion tables for usage in the qemu signal and strace code. This ensures that any signals will now show up in both tables. There is no functional change in this patch - with the exception that yet missing signal names now show up in the strace code too. Signed-off-by: Helge Deller --- linux-user/signal-common.h | 46 ++++++++++++++++++++++++++++++++++++++ linux-user/signal.c | 37 +++--------------------------- linux-user/strace.c | 30 +++++++++---------------- 3 files changed, 60 insertions(+), 53 deletions(-) diff --git a/linux-user/signal-common.h b/linux-user/signal-common.h index 6a7e4a93fc..3e2dc604c2 100644 --- a/linux-user/signal-common.h +++ b/linux-user/signal-common.h @@ -118,4 +118,50 @@ static inline void finish_sigsuspend_mask(int ret) } } +#if defined(SIGSTKFLT) && defined(TARGET_SIGSTKFLT) +#define MAKE_SIG_ENTRY_SIGSTKFLT MAKE_SIG_ENTRY(SIGSTKFLT) +#else +#define MAKE_SIG_ENTRY_SIGSTKFLT +#endif + +#if defined(SIGIOT) && defined(TARGET_SIGIOT) +#define MAKE_SIG_ENTRY_SIGIOT MAKE_SIG_ENTRY(SIGIOT) +#else +#define MAKE_SIG_ENTRY_SIGIOT +#endif + +#define MAKE_SIGNAL_LIST \ + MAKE_SIG_ENTRY(SIGHUP) \ + MAKE_SIG_ENTRY(SIGINT) \ + MAKE_SIG_ENTRY(SIGQUIT) \ + MAKE_SIG_ENTRY(SIGILL) \ + MAKE_SIG_ENTRY(SIGTRAP) \ + MAKE_SIG_ENTRY(SIGABRT) \ + MAKE_SIG_ENTRY(SIGBUS) \ + MAKE_SIG_ENTRY(SIGFPE) \ + MAKE_SIG_ENTRY(SIGKILL) \ + MAKE_SIG_ENTRY(SIGUSR1) \ + MAKE_SIG_ENTRY(SIGSEGV) \ + MAKE_SIG_ENTRY(SIGUSR2) \ + MAKE_SIG_ENTRY(SIGPIPE) \ + MAKE_SIG_ENTRY(SIGALRM) \ + MAKE_SIG_ENTRY(SIGTERM) \ + MAKE_SIG_ENTRY(SIGCHLD) \ + MAKE_SIG_ENTRY(SIGCONT) \ + MAKE_SIG_ENTRY(SIGSTOP) \ + MAKE_SIG_ENTRY(SIGTSTP) \ + MAKE_SIG_ENTRY(SIGTTIN) \ + MAKE_SIG_ENTRY(SIGTTOU) \ + MAKE_SIG_ENTRY(SIGURG) \ + MAKE_SIG_ENTRY(SIGXCPU) \ + MAKE_SIG_ENTRY(SIGXFSZ) \ + MAKE_SIG_ENTRY(SIGVTALRM) \ + MAKE_SIG_ENTRY(SIGPROF) \ + MAKE_SIG_ENTRY(SIGWINCH) \ + MAKE_SIG_ENTRY(SIGIO) \ + MAKE_SIG_ENTRY(SIGPWR) \ + MAKE_SIG_ENTRY(SIGSYS) \ + MAKE_SIG_ENTRY_SIGSTKFLT \ + MAKE_SIG_ENTRY_SIGIOT + #endif diff --git a/linux-user/signal.c b/linux-user/signal.c index 8d29bfaa6b..61c6fa3fcf 100644 --- a/linux-user/signal.c +++ b/linux-user/signal.c @@ -53,40 +53,9 @@ abi_ulong default_rt_sigreturn; QEMU_BUILD_BUG_ON(__SIGRTMAX + 1 !=3D _NSIG); #endif static uint8_t host_to_target_signal_table[_NSIG] =3D { - [SIGHUP] =3D TARGET_SIGHUP, - [SIGINT] =3D TARGET_SIGINT, - [SIGQUIT] =3D TARGET_SIGQUIT, - [SIGILL] =3D TARGET_SIGILL, - [SIGTRAP] =3D TARGET_SIGTRAP, - [SIGABRT] =3D TARGET_SIGABRT, -/* [SIGIOT] =3D TARGET_SIGIOT,*/ - [SIGBUS] =3D TARGET_SIGBUS, - [SIGFPE] =3D TARGET_SIGFPE, - [SIGKILL] =3D TARGET_SIGKILL, - [SIGUSR1] =3D TARGET_SIGUSR1, - [SIGSEGV] =3D TARGET_SIGSEGV, - [SIGUSR2] =3D TARGET_SIGUSR2, - [SIGPIPE] =3D TARGET_SIGPIPE, - [SIGALRM] =3D TARGET_SIGALRM, - [SIGTERM] =3D TARGET_SIGTERM, -#ifdef SIGSTKFLT - [SIGSTKFLT] =3D TARGET_SIGSTKFLT, -#endif - [SIGCHLD] =3D TARGET_SIGCHLD, - [SIGCONT] =3D TARGET_SIGCONT, - [SIGSTOP] =3D TARGET_SIGSTOP, - [SIGTSTP] =3D TARGET_SIGTSTP, - [SIGTTIN] =3D TARGET_SIGTTIN, - [SIGTTOU] =3D TARGET_SIGTTOU, - [SIGURG] =3D TARGET_SIGURG, - [SIGXCPU] =3D TARGET_SIGXCPU, - [SIGXFSZ] =3D TARGET_SIGXFSZ, - [SIGVTALRM] =3D TARGET_SIGVTALRM, - [SIGPROF] =3D TARGET_SIGPROF, - [SIGWINCH] =3D TARGET_SIGWINCH, - [SIGIO] =3D TARGET_SIGIO, - [SIGPWR] =3D TARGET_SIGPWR, - [SIGSYS] =3D TARGET_SIGSYS, +#define MAKE_SIG_ENTRY(sig) [sig] =3D TARGET_##sig, + MAKE_SIGNAL_LIST +#undef MAKE_SIG_ENTRY /* next signals stay the same */ }; diff --git a/linux-user/strace.c b/linux-user/strace.c index 7d882526da..a4eeef7ae1 100644 --- a/linux-user/strace.c +++ b/linux-user/strace.c @@ -17,6 +17,7 @@ #include "qemu.h" #include "user-internals.h" #include "strace.h" +#include "signal-common.h" struct syscallname { int nr; @@ -141,30 +142,21 @@ if( cmd =3D=3D val ) { \ qemu_log("%d", cmd); } +static const char * const target_signal_name[] =3D { +#define MAKE_SIG_ENTRY(sig) [TARGET_##sig] =3D #sig, + MAKE_SIGNAL_LIST +#undef MAKE_SIG_ENTRY +}; + static void print_signal(abi_ulong arg, int last) { const char *signal_name =3D NULL; - switch(arg) { - case TARGET_SIGHUP: signal_name =3D "SIGHUP"; break; - case TARGET_SIGINT: signal_name =3D "SIGINT"; break; - case TARGET_SIGQUIT: signal_name =3D "SIGQUIT"; break; - case TARGET_SIGILL: signal_name =3D "SIGILL"; break; - case TARGET_SIGABRT: signal_name =3D "SIGABRT"; break; - case TARGET_SIGFPE: signal_name =3D "SIGFPE"; break; - case TARGET_SIGKILL: signal_name =3D "SIGKILL"; break; - case TARGET_SIGSEGV: signal_name =3D "SIGSEGV"; break; - case TARGET_SIGPIPE: signal_name =3D "SIGPIPE"; break; - case TARGET_SIGALRM: signal_name =3D "SIGALRM"; break; - case TARGET_SIGTERM: signal_name =3D "SIGTERM"; break; - case TARGET_SIGUSR1: signal_name =3D "SIGUSR1"; break; - case TARGET_SIGUSR2: signal_name =3D "SIGUSR2"; break; - case TARGET_SIGCHLD: signal_name =3D "SIGCHLD"; break; - case TARGET_SIGCONT: signal_name =3D "SIGCONT"; break; - case TARGET_SIGSTOP: signal_name =3D "SIGSTOP"; break; - case TARGET_SIGTTIN: signal_name =3D "SIGTTIN"; break; - case TARGET_SIGTTOU: signal_name =3D "SIGTTOU"; break; + + if (arg < ARRAY_SIZE(target_signal_name)) { + signal_name =3D target_signal_name[arg]; } + if (signal_name =3D=3D NULL) { print_raw_param("%ld", arg, last); return; -- 2.37.3 From nobody Fri Apr 26 10:25:32 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=gmx.de ARC-Seal: i=1; a=rsa-sha256; t=1663714295; cv=none; d=zohomail.com; s=zohoarc; b=dkUAixidqg34+Cxw/k/qJICdzwB4uxd+QRvnTpsD1whIVGWho32t2ahiWn5kaRo4c6mqczx8rqUYlL8mjmbw0GPSQyVNGpn76u48lRbceWezcRT9usWHl6LBOztF8BiQra8Vgevucw3Bj4zwDmlN9BMcwJ6IAPKmM4ZUp427ApI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1663714295; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=cXVu8zJe00rdUjVQgS2wb/CFXdEc6h/bpgUeLx8vESA=; b=CwRwnavNtEhUcSHkhz7J4NxLg8fhyXcQqmZyU1EOTYuYpyJ0tbfy/n2VvRDz0YP5N4fEK6RqPsn/2K+rcNctKc09DHTnv6w8PbAoBeC/yQhkH7nfJAzbVsPMDCKcSFu4t6fofBXwok8e5MZ54r1XuDsHPx1RVPVhmZ+FiuK3uaA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1663714295091138.64963080322798; Tue, 20 Sep 2022 15:51:35 -0700 (PDT) Received: from localhost ([::1]:47298 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oam5V-0002pQ-OA for importer@patchew.org; Tue, 20 Sep 2022 18:51:33 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33216) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oah6G-00042D-Eo for qemu-devel@nongnu.org; Tue, 20 Sep 2022 13:32:00 -0400 Received: from mout.gmx.net ([212.227.17.21]:44659) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oah6D-0003I5-CI for qemu-devel@nongnu.org; Tue, 20 Sep 2022 13:31:59 -0400 Received: from p100.fritz.box ([92.116.174.94]) by mail.gmx.net (mrgmx104 [212.227.17.168]) with ESMTPSA (Nemesis) id 1M7b6b-1odhEy1ORx-0081fs; Tue, 20 Sep 2022 19:31:53 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1663695113; bh=4I4lfp6ArUG8vjJS1EZv295BBfahRZlwlhlm+UEhPH0=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References; b=ION3CJ9k7l6ajtFxKPGQuCZ6KN1RV79oVne1LblzImfi+W6gzQdtD/6a5DnDZSY/Q E+g3VwkV2GfiSvUI/BP5lyQjJ96M1jJ8o7bVXNujhDD2rfzveI14cq12MTZQe3iS2o 5qkHGyjIzJ0yueC+y+RNmQBJn858WaPCjd9Kpowo= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c From: Helge Deller To: qemu-devel@nongnu.org, Laurent Vivier , Richard Henderson , Stefan Hajnoczi Cc: deller@gmx.de Subject: [PULL 02/12] linux-user: Add missing clock_gettime64() syscall strace Date: Tue, 20 Sep 2022 19:31:42 +0200 Message-Id: <20220920173152.199359-3-deller@gmx.de> X-Mailer: git-send-email 2.37.3 In-Reply-To: <20220920173152.199359-1-deller@gmx.de> References: <20220920173152.199359-1-deller@gmx.de> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Provags-ID: V03:K1:VhMro8PgHH3XWX89sloZPiehOBLaXBbWniiQHAXXNMaQwqZsikv mvwX7GHmExB93cID4eowBUAdgWNDu5eHT4d0d1bawHmM/+uWAGamF9PTlxnyNuCt5fgbnWO xXVlpHd+a+Zwvwjv0HMCQf0AUVRzYKJNKXCWsMz3FyNMzjh4wSaBW/7nG4r0UZH2BmeJnxa aJ6b9gnfYdkaoTny3G0vA== X-UI-Out-Filterresults: notjunk:1;V03:K0:cW3uBlKmc74=:xM0CaVd9LWtrHGl72LhL9W cWDkV3yHdvdzNk1SxkTMK3YRfNmP9zdlqBGJrzH+VhYpIM0lt5rjrCQIOv/doK3sVzqjxkWeS gvdymMvvSrSUuxXA5zkfEE+a1EV/5r7otbmm6LqpbbjAbzY7GlRyjrFVM1bVhCmbFEG13POtd TIy/GLyvAbugB55WUSev3CHGpH0aYWbDAwULKO+kl56Jhxqvzd5GVdAeLAk3ahgQiD4okLYAQ tSUgxj7GayKIF113N256cQVNSssS7YRyee6DYofn5QEaKai8d13RvK2OhGIuW4fA46fBx56d2 yTt7/Ln6gBv5EKZnP5xD/705ZVX3P3o7qZuP/ilzRDsVAGZ9qBcZVGaO8/Ap5M2bLngczEyFW MHGVPtWXR9agdz6Fl7iRiooU12L6/7rIpmE1gITDcBug6i9/kqhZ7Q6fIEAGfqKBoOtZH23DD AYfzgX46zNpNVoT1pM+6ArcM7jVXBanhTxLRQmcTVbktQnXEed5jYR/YDlAYifGpyWLr1RXUh 5U7gtwpNKEZTf5hWHBj4ckT/NhIgNFJvCnwRo+Hw8i7I4dDrg2c+CuNeFuDNLZm6BCJcDU79L Q7UL/p1rp0mU6ZLeRJqcGRDNK2Fw4mUxUUAccdUQD6VVUJVTCqOOJUn8cHmYaiyWXF/Au7rI6 7g1cwqkjYRdD4vyqwfCRaeIUtPDnaupPJRLd62iSqNKJeII3cqwKJlmOoytN9ruf9HRsePGNE u62v+Q5ofiCqJRv1jbgbeP2iBJxI3HJq9VyKlpak2CiT2Wf+bQSBbvn3pTuScMeMduJ1BlGwr S3zWtD9HGmK1rS9I91DUlDDXVEOQ7T/0p376igbFGdpr/G542lpzoHuUxLVD1ytSOuHVahGgs LXXUop6eQnZuUFFOi/9KMphoT6lDfZfHyjkcPTZ1v/z9FBxEgYQ/xSLkHOUmM4kTgHEd9EqPb IOLEs01q7dJ9f48qC4bfWBGqIXjnC1grL0Z1qMvCFL0ACyTAnbHHdL3dF90S2MznI5Q2D1jsb +fXx7kAJ15ZPsNhCJv6AgIq3QRxyZA4idDns+o+4Ex/deHuoBANVVjCZjwXq4/Fzcl206CW0A Tg9z0aju8QnEDE4Bj51gjy7b94cR0RUzug8Eei5mSF/Kzrg2Kp7lNXFzn5KLaCxys1g+glchI V+jLw= Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=212.227.17.21; envelope-from=deller@gmx.de; helo=mout.gmx.net X-Spam_score_int: -25 X-Spam_score: -2.6 X-Spam_bar: -- X-Spam_report: (-2.6 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @gmx.net) X-ZM-MESSAGEID: 1663714296405100001 Content-Type: text/plain; charset="utf-8" Allow linux-user to strace the clock_gettime64() syscall. This syscall is used a lot on 32-bit guest architectures which use newer glibc versions. Signed-off-by: Helge Deller --- linux-user/strace.c | 53 ++++++++++++++++++++++++++++++++++++++++++ linux-user/strace.list | 4 ++++ 2 files changed, 57 insertions(+) diff --git a/linux-user/strace.c b/linux-user/strace.c index a4eeef7ae1..816e679995 100644 --- a/linux-user/strace.c +++ b/linux-user/strace.c @@ -82,6 +82,7 @@ UNUSED static void print_buf(abi_long addr, abi_long len,= int last); UNUSED static void print_raw_param(const char *, abi_long, int); UNUSED static void print_timeval(abi_ulong, int); UNUSED static void print_timespec(abi_ulong, int); +UNUSED static void print_timespec64(abi_ulong, int); UNUSED static void print_timezone(abi_ulong, int); UNUSED static void print_itimerval(abi_ulong, int); UNUSED static void print_number(abi_long, int); @@ -795,6 +796,24 @@ print_syscall_ret_clock_gettime(CPUArchState *cpu_env,= const struct syscallname #define print_syscall_ret_clock_getres print_syscall_ret_clock_gettime #endif +#if defined(TARGET_NR_clock_gettime64) +static void +print_syscall_ret_clock_gettime64(CPUArchState *cpu_env, const struct sysc= allname *name, + abi_long ret, abi_long arg0, abi_long arg1, + abi_long arg2, abi_long arg3, abi_long arg= 4, + abi_long arg5) +{ + if (!print_syscall_err(ret)) { + qemu_log(TARGET_ABI_FMT_ld, ret); + qemu_log(" ("); + print_timespec64(arg1, 1); + qemu_log(")"); + } + + qemu_log("\n"); +} +#endif + #ifdef TARGET_NR_gettimeofday static void print_syscall_ret_gettimeofday(CPUArchState *cpu_env, const struct syscall= name *name, @@ -1652,6 +1671,27 @@ print_timespec(abi_ulong ts_addr, int last) } } +static void +print_timespec64(abi_ulong ts_addr, int last) +{ + if (ts_addr) { + struct target__kernel_timespec *ts; + + ts =3D lock_user(VERIFY_READ, ts_addr, sizeof(*ts), 1); + if (!ts) { + print_pointer(ts_addr, last); + return; + } + qemu_log("{tv_sec =3D %lld" + ",tv_nsec =3D %lld}%s", + (long long)tswap64(ts->tv_sec), (long long)tswap64(ts->tv= _nsec), + get_comma(last)); + unlock_user(ts, ts_addr, 0); + } else { + qemu_log("NULL%s", get_comma(last)); + } +} + static void print_timezone(abi_ulong tz_addr, int last) { @@ -2267,6 +2307,19 @@ print_clock_gettime(CPUArchState *cpu_env, const str= uct syscallname *name, #define print_clock_getres print_clock_gettime #endif +#if defined(TARGET_NR_clock_gettime64) +static void +print_clock_gettime64(CPUArchState *cpu_env, const struct syscallname *nam= e, + abi_long arg0, abi_long arg1, abi_long arg2, + abi_long arg3, abi_long arg4, abi_long arg5) +{ + print_syscall_prologue(name); + print_enums(clockids, arg0, 0); + print_pointer(arg1, 1); + print_syscall_epilogue(name); +} +#endif + #ifdef TARGET_NR_clock_settime static void print_clock_settime(CPUArchState *cpu_env, const struct syscallname *name, diff --git a/linux-user/strace.list b/linux-user/strace.list index 72e17b1acf..a78cdf3cdf 100644 --- a/linux-user/strace.list +++ b/linux-user/strace.list @@ -1676,3 +1676,7 @@ #ifdef TARGET_NR_copy_file_range { TARGET_NR_copy_file_range, "copy_file_range", "%s(%d,%p,%d,%p,"TARGET_AB= I_FMT_lu",%u)", NULL, NULL }, #endif +#ifdef TARGET_NR_clock_gettime64 +{ TARGET_NR_clock_gettime64, "clock_gettime64" , NULL, print_clock_gettime= 64, + print_syscall_ret_clock_gettime64 }, +#endif -- 2.37.3 From nobody Fri Apr 26 10:25:32 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=gmx.de ARC-Seal: i=1; a=rsa-sha256; t=1663715615; cv=none; d=zohomail.com; s=zohoarc; b=FsuA1G1bWhRmacMSPttVzVUt7XY2wdlePGuJSLujz8QKqGggcwTJETjicipIn5cx+5Qe5V3GcQsQlS3r1MxrtMIHfm7iaijfoBaAnvJ2PKTWyMGDse+XGQTBkeOf9wtDTWfOL6gS0Jgi0K3doQavEJD7LxdqSyMBLnX9MoCL9vI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1663715615; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=f7CD+lz9XSCzzjOGnBbjy/eTAGZ/cujOZG64blZfPi0=; b=Y3ZERZrbg5UvTaaw6S3UcPCyWN1zKDcdNLgDMfoJfNwEkrYXpg/m/q5n2J0hgrUD6Q8195jETLex2QSwT+mJt5KOMBW+pIVs6o1PR9EG1DQ4/6vMt0N5URs4EyXO3frISyx5qJ8EkNkQbKBts1Vuy4KfmqxKaO9NdN25Md48keY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1663715615597404.8105937467752; Tue, 20 Sep 2022 16:13:35 -0700 (PDT) Received: from localhost ([::1]:56270 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oamQh-0006gN-P2 for importer@patchew.org; Tue, 20 Sep 2022 19:13:28 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33222) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oah6I-000469-0M for qemu-devel@nongnu.org; Tue, 20 Sep 2022 13:32:03 -0400 Received: from mout.gmx.net ([212.227.17.21]:41195) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oah6D-0003I7-Hg for qemu-devel@nongnu.org; Tue, 20 Sep 2022 13:32:00 -0400 Received: from p100.fritz.box ([92.116.174.94]) by mail.gmx.net (mrgmx104 [212.227.17.168]) with ESMTPSA (Nemesis) id 1MK3Rm-1orfkd2FPK-00LYSJ; Tue, 20 Sep 2022 19:31:53 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1663695113; bh=eOtm8/SMP826aLASyoJ4JmH78WO5pl6ShNUkvz9YRjc=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References; b=QEXJB8+YmprpF04moN6OpkWQiqQW9dlEMpCpMS+WmzWKiHPCqdk8X6dDcPTNq2VTP qKk9jOSmMOe/GrqiDYc3/a3I+XvCFADUmXmqlgXuWMv9Nc1da9w4vVKAr20ZqVM+Ln 2PF7oO180a6vnjmxpR8Hv0KXM6zZjg2f0IkocvGs= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c From: Helge Deller To: qemu-devel@nongnu.org, Laurent Vivier , Richard Henderson , Stefan Hajnoczi Cc: deller@gmx.de Subject: [PULL 03/12] linux-user: Add pidfd_open(), pidfd_send_signal() and pidfd_getfd() syscalls Date: Tue, 20 Sep 2022 19:31:43 +0200 Message-Id: <20220920173152.199359-4-deller@gmx.de> X-Mailer: git-send-email 2.37.3 In-Reply-To: <20220920173152.199359-1-deller@gmx.de> References: <20220920173152.199359-1-deller@gmx.de> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Provags-ID: V03:K1:O4+bcdrQe2R0zWqHQgjY6MgYVgoy1XDgAZ1F/KJuS2adnw7Rgfw KoyE+FPqnSFA3wydxqidBlBlsU4HEDrmAX2PAf5cJ6Nv9XL1C9Hr5+r9wRek4hwz6uA/TlV TS7fVZsTrw0H4Q1MLAn/K1LMgXbgX1RFOo6Ii2EE0UMnM6V/TJAuzUM5s5iAm/e2jeykejL bDS5ZDFjSUz+3N6s2FR9Q== X-UI-Out-Filterresults: notjunk:1;V03:K0:6mR5+OZrBUU=:itClqw1WfiImnII+qfZgsF WxZl+Bj3mMnAXuHdhF9iZN1l3jwD57CfMxa34ovAOli9Jan11IkJE1Ascl3Lk1N1VeK1zw85y j5utm5wpu5rYNz2r5dj3HTpWgFfYPXAquQRh6YHPM7oVZ+Yiv5SuuIbbdD2zRgO7nb3wrNHuI +Y2XZAlKAHiGiGu2pBxMnoIQ6Q+GQZ9+ZoNYpuz+Jhyk+jcEE1gCNd/nDhKjiFChhJ+LEvTOq zAIcel75LWAKwpVHuqGZPDZ/jSweZ9+byw0g6jaqmNn/Lvj8Qt/LSFBhY43S8DA/GCM1Y5jVM bi2i2J41DvVxcPJpMeLxdD8gdu9hGGJ4iQtusTNxpEOepUJM0ZA8QOOyuKPx4+i8v0XCUPmGP RZCdDxZoCD6L+deAo5QMPkrbuU8BV/46E9ve+5IbV+rEbPC9IUoXVa4b5oEJqYVFngeqbLbjZ K2kSo78fIxrLSmWOa6KgT+0+Z01ZlIsd6bZY5v3w4zcNtOgmk20fEsa06mrodwyP+jqw2J/my Hlad9ZvSV/RTy6xYmuwEilfxU5W5XQwBXp8TdHiIxHLRU5OobJ2xlYMofKFgQ4vep5adZslTc St+S/kpDzv53/4QQSSP6XmSBYPDjzqcYAIR/iPmixYZH623WGKM+z9GI7YUfKu30/Vh7Xap6X srWTQ2xe7HveafGV9sxcgMr4JP31dkJorLzMZDyGGiZx8MdboDnV56xCcAa8owcfV5Rgyi5Dk VeLreBYMaCn8MyBQJx2l7WuDjDGZyk9TESVTFiy8PceQiOW3A+YKaFoMRXYctP7en3WEhcnaN KVI7DdWbayqmbGX1uk2R3oJpa2I+8oSnU6wEfiuLcEkamYzAxt8j+gGejCDszYShuqFYNfBc5 H8nF8brmjEWmm0ckBx9m5um5fJ9yR96XreeoaQBKfMbn3eUVNhgcoQ888NSNZPkisra7nx8+l 3af7UI2zot6qR9RlfSmHzNNNLexeOHMMgJs7qzP26DLodu7lQRCgBNV+WrCWzroppUDnjiAJ8 GqnWoBxgx4E0uzP9N3t32ePrKBa3PfTzoqaf1IDQ7fkvyAWNP0Nwvn75WlBx1nQuud2qOkdjL mGyK58kwvQfKMzZInGd9ueasBOi58D5jFTfj1Kmh62Ev8O1UJlYOfmciLAvvsMT3tLou32FEJ 5HrK4pHpst7dmWuWtbMa7DTVko Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=212.227.17.21; envelope-from=deller@gmx.de; helo=mout.gmx.net X-Spam_score_int: -25 X-Spam_score: -2.6 X-Spam_bar: -- X-Spam_report: (-2.6 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @gmx.net) X-ZM-MESSAGEID: 1663715616741100001 Content-Type: text/plain; charset="utf-8" I noticed those were missing when running the glib2.0 testsuite. Add the syscalls including the strace output. Signed-off-by: Helge Deller --- linux-user/strace.c | 28 ++++++++++++++++++++++++++++ linux-user/strace.list | 9 +++++++++ linux-user/syscall.c | 34 ++++++++++++++++++++++++++++++++++ 3 files changed, 71 insertions(+) diff --git a/linux-user/strace.c b/linux-user/strace.c index 816e679995..5ac64df02b 100644 --- a/linux-user/strace.c +++ b/linux-user/strace.c @@ -3317,6 +3317,34 @@ print_openat(CPUArchState *cpu_env, const struct sys= callname *name, } #endif +#ifdef TARGET_NR_pidfd_send_signal +static void +print_pidfd_send_signal(CPUArchState *cpu_env, const struct syscallname *n= ame, + abi_long arg0, abi_long arg1, abi_long arg2, + abi_long arg3, abi_long arg4, abi_long arg5) +{ + void *p; + target_siginfo_t uinfo; + + print_syscall_prologue(name); + print_raw_param("%d", arg0, 0); + print_signal(arg1, 0); + + p =3D lock_user(VERIFY_READ, arg2, sizeof(target_siginfo_t), 1); + if (p) { + get_target_siginfo(&uinfo, p); + print_siginfo(&uinfo); + + unlock_user(p, arg2, 0); + } else { + print_pointer(arg2, 1); + } + + print_raw_param("%u", arg3, 0); + print_syscall_epilogue(name); +} +#endif + #ifdef TARGET_NR_mq_unlink static void print_mq_unlink(CPUArchState *cpu_env, const struct syscallname *name, diff --git a/linux-user/strace.list b/linux-user/strace.list index a78cdf3cdf..4d8b7f6a5e 100644 --- a/linux-user/strace.list +++ b/linux-user/strace.list @@ -1664,6 +1664,15 @@ #ifdef TARGET_NR_pipe2 { TARGET_NR_pipe2, "pipe2", NULL, NULL, NULL }, #endif +#ifdef TARGET_NR_pidfd_open +{ TARGET_NR_pidfd_open, "pidfd_open", "%s(%d,%u)", NULL, NULL }, +#endif +#ifdef TARGET_NR_pidfd_send_signal +{ TARGET_NR_pidfd_send_signal, "pidfd_send_signal", NULL, print_pidfd_send= _signal, NULL }, +#endif +#ifdef TARGET_NR_pidfd_getfd +{ TARGET_NR_pidfd_getfd, "pidfd_getfd", "%s(%d,%d,%u)", NULL, NULL }, +#endif #ifdef TARGET_NR_atomic_cmpxchg_32 { TARGET_NR_atomic_cmpxchg_32, "atomic_cmpxchg_32", NULL, NULL, NULL }, #endif diff --git a/linux-user/syscall.c b/linux-user/syscall.c index f409121202..ca39acfceb 100644 --- a/linux-user/syscall.c +++ b/linux-user/syscall.c @@ -346,6 +346,16 @@ _syscall6(int,sys_futex,int *,uaddr,int,op,int,val, _syscall6(int,sys_futex_time64,int *,uaddr,int,op,int,val, const struct timespec *,timeout,int *,uaddr2,int,val3) #endif +#if defined(__NR_pidfd_open) && defined(TARGET_NR_pidfd_open) +_syscall2(int, pidfd_open, pid_t, pid, unsigned int, flags); +#endif +#if defined(__NR_pidfd_send_signal) && defined(TARGET_NR_pidfd_send_signal) +_syscall4(int, pidfd_send_signal, int, pidfd, int, sig, siginfo_t *, info, + unsigned int, flags); +#endif +#if defined(__NR_pidfd_getfd) && defined(TARGET_NR_pidfd_getfd) +_syscall3(int, pidfd_getfd, int, pidfd, int, targetfd, unsigned int, flags= ); +#endif #define __NR_sys_sched_getaffinity __NR_sched_getaffinity _syscall3(int, sys_sched_getaffinity, pid_t, pid, unsigned int, len, unsigned long *, user_mask_ptr); @@ -8683,6 +8693,30 @@ static abi_long do_syscall1(CPUArchState *cpu_env, i= nt num, abi_long arg1, ret =3D do_open_by_handle_at(arg1, arg2, arg3); fd_trans_unregister(ret); return ret; +#endif +#if defined(__NR_pidfd_open) && defined(TARGET_NR_pidfd_open) + case TARGET_NR_pidfd_open: + return get_errno(pidfd_open(arg1, arg2)); +#endif +#if defined(__NR_pidfd_send_signal) && defined(TARGET_NR_pidfd_send_signal) + case TARGET_NR_pidfd_send_signal: + { + siginfo_t uinfo; + + p =3D lock_user(VERIFY_READ, arg3, sizeof(target_siginfo_t), 1= ); + if (!p) { + return -TARGET_EFAULT; + } + target_to_host_siginfo(&uinfo, p); + unlock_user(p, arg3, 0); + ret =3D get_errno(pidfd_send_signal(arg1, target_to_host_signa= l(arg2), + &uinfo, arg4)); + } + return ret; +#endif +#if defined(__NR_pidfd_getfd) && defined(TARGET_NR_pidfd_getfd) + case TARGET_NR_pidfd_getfd: + return get_errno(pidfd_getfd(arg1, arg2, arg3)); #endif case TARGET_NR_close: fd_trans_unregister(arg1); -- 2.37.3 From nobody Fri Apr 26 10:25:32 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=gmx.de ARC-Seal: i=1; a=rsa-sha256; t=1663711827; cv=none; d=zohomail.com; s=zohoarc; b=ekVKNfGkIZbuRWJhpyyrmrzIMg/7AHp9ho2ffw79+Bc1QJuZ3IvOLhJ2p1xo9X6umq/6JhOPp+9RRUKDCD6XFWFlyplsd4+lU5SnFl0xEnUNozlLcez1f6UQ98tYYE6FPtsZo53S6e2IQ0U3cXr5IxQ0w+qHE0rex7gvPr+pQYw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1663711827; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=eRpgZh9lXSzRoZI+k6OKr1xbIw1/L5x+j8SxO7ZBDlY=; b=LqVuku6BLJXT08CnhkQgfRrKFWf+8Pd4HsdN//heq8Wm6H4vvugggMeaMmirSwHzPnRZBMPVCGpjglfIQySwhyaZx7ZRsdDQCKmULOzjXxlZsV7W8DXirV/XpfVdbpHykxOvKt7R9M56b3jvw+gG7g8STaEhPA932Vg8Qok6lvk= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1663711827856435.08633560932344; Tue, 20 Sep 2022 15:10:27 -0700 (PDT) Received: from localhost ([::1]:52204 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oalRi-0007ly-Ad for importer@patchew.org; Tue, 20 Sep 2022 18:10:26 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:52874) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oah6M-00049m-KA for qemu-devel@nongnu.org; Tue, 20 Sep 2022 13:32:09 -0400 Received: from mout.gmx.net ([212.227.17.22]:50373) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oah6E-0003In-Cx for qemu-devel@nongnu.org; Tue, 20 Sep 2022 13:32:06 -0400 Received: from p100.fritz.box ([92.116.174.94]) by mail.gmx.net (mrgmx104 [212.227.17.168]) with ESMTPSA (Nemesis) id 1Mk0JM-1oyiFl2zyy-00kL65; Tue, 20 Sep 2022 19:31:53 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1663695113; bh=/gVeQ5FY1ri9znOnzbjiflH84LDpU0qJIjCnWz3aFc0=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References; b=bb9Kb3eCxErhLqMinjhO5mDW90YsW4IC+L8UdDJ8H9QLJgUGe1WWKTHGN8HB7cmVt UO8hC4weoPPFtztgSf8k4ln5o7tHWLQOZWjkxBk+6bf2zfju34V6nUO9JUn1aE28Qx cN2/Z4D8QmidnIafINUOb4DpErW+4idpB2VWTy9w= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c From: Helge Deller To: qemu-devel@nongnu.org, Laurent Vivier , Richard Henderson , Stefan Hajnoczi Cc: deller@gmx.de Subject: [PULL 04/12] linux-user: Log failing executable in EXCP_DUMP() Date: Tue, 20 Sep 2022 19:31:44 +0200 Message-Id: <20220920173152.199359-5-deller@gmx.de> X-Mailer: git-send-email 2.37.3 In-Reply-To: <20220920173152.199359-1-deller@gmx.de> References: <20220920173152.199359-1-deller@gmx.de> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Provags-ID: V03:K1:9LeJrD9DbzjFKQV2QbmY6MKjTqOiY8XLWtO0g15Oja8D/1mmvBl VUigYbjiN+Uu4pbCJJwZSZrf46a8qayIm1m2NFjJA/kazzJlTMqDbba49TEmFvljGERL5lq PdOUS4eS9HqwiBG43/9nwkMZx7y0n3ie82CbWpXvA1EP6DocSXXY7Qazv2OJI/xWvlPN5y2 +DsXszE9rR/IZVlQFDDyg== X-UI-Out-Filterresults: notjunk:1;V03:K0:n6SsS6B+HrQ=:5E3ZPoFsJJzywKY3nEdKU8 6mi8Tmu/iqYeFpWoc5jVbw/aAjwiDqckl22Xw82eAkgCZm1rGIvVgIU0HyiovxopKyS2QivQC PZatWZ+Zc7ht8tvOJQT1saabkXNMXpTWb3R9/qwZDBZOeHjRJzwzhGsOafUSwFwrD4grBXOEC s4TmuAv3+GiJPxDZ56mbXm9KdVYargPkNtF7qWXXgQsebaBHS+yNwNaG7v/+Ho3ArhwUEW1KL vI5tLkUh+Oj8gdZGnqBoSN1gJelYVgiGNhEV8TLftmmIrIIc9uFWgLCL4dpHQBKpx3WCCZXRw tRwYy/pppYz9aw8b6OlTxtoxMOGt7iAyHz9Od/S5WEurvpCjOHPq2czq+Nm/2hQUjUqJ9Z6Nj ncDKBQZtwU2QSq420yS3M4kCsN1kXGHovsRl65z6qaO1RCeuTL/eeV9TBfLY5n3qQQDBTOFu2 6N5gcpRUYyXVq0yVZ7JFmp7/zkL7jPykdFG8P6Q6R0NWMdjU4mmYKN1TxsL7zImhEnN9iNSvz XwoALIO/AKd5utWx1KcsU/KyYeqrl8F9z8YyU3CQlqyQjpv1Exp58Y5CNQs9kRDKpUb83Ucho DMnT/sMCfgMNS5rpUmIhcRaf5ddUtaCxO9vXXu7hsIMIbzVrrRb/GbEedFSAPAPTB+LaH/zHq MtYdE5NMB6wa5mhm9fxPoeQV2ie2zMOrcaOO7vzE52MrAvVx1BIkk1if+pDTD46y2+n3PBzUX pkGG1Bz/pbxGS5wQvHMaQwUF8ayBq/ZfsmpgYRAp5NTt5rnK6t1QvtMaLCOKza62yoxLJYADX JH3j7woq8FzoSbUu8QwlZz+pegu77j8u2Z2PvsU66n2v0GmUM00wUBHYBpnEM/oIA1wlom+yj HFgbGap9Reu9b0c//7exH8KVSZGMZ3frKPfnuAhqLb2uLpv8WyR9UND+lzFW/LBl9O7p3xZDE vOFdaTGAPz+0V7iRsApc0tVOgBDdPtlajmBc6gutjdUH/LMBOSDuI5/uISvFTdiC9Eps0Piqi in8Aql3xhn8iVTbhifwPRxjedx433kNbmo00zDJJh0+vKrytXn+SndPh/hMSPuHjmy/N8RWs7 YP3p0A7FiZETB8i15AMxPOC2vfkF0f9AKKBfhSAvef1eaqAppQI1XRJZGXD5W4VWvAZUacPh6 hhMbtfkZlOJBYEoEu9D584Kl4D Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=212.227.17.22; envelope-from=deller@gmx.de; helo=mout.gmx.net X-Spam_score_int: -25 X-Spam_score: -2.6 X-Spam_bar: -- X-Spam_report: (-2.6 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, T_SPF_TEMPERROR=0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @gmx.net) X-ZM-MESSAGEID: 1663711828692100001 Content-Type: text/plain; charset="utf-8" Enhance the EXCP_DUMP() macro to print out the failing program too. During debugging it's sometimes hard to track down the actual failing program if you are e.g. building a whole debian package. Signed-off-by: Helge Deller --- linux-user/cpu_loop-common.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/linux-user/cpu_loop-common.h b/linux-user/cpu_loop-common.h index dc0042e4de..36ff5b14f2 100644 --- a/linux-user/cpu_loop-common.h +++ b/linux-user/cpu_loop-common.h @@ -27,9 +27,11 @@ do { \ CPUState *cs =3D env_cpu(env); \ fprintf(stderr, fmt , ## __VA_ARGS__); \ + fprintf(stderr, "Failing executable: %s\n", exec_path); \ cpu_dump_state(cs, stderr, 0); \ if (qemu_log_separate()) { \ qemu_log(fmt, ## __VA_ARGS__); \ + qemu_log("Failing executable: %s\n", exec_path); \ log_cpu_state(cs, 0); \ } \ } while (0) -- 2.37.3 From nobody Fri Apr 26 10:25:32 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=gmx.de ARC-Seal: i=1; a=rsa-sha256; t=1663714589; cv=none; d=zohomail.com; s=zohoarc; b=OsP59zRSvelL53n1nVeyQa3LemVJhMArpQNuDhWylVoYparFKGwEoOfArGubQBhq1HZnV2v7gjOhu8EDwE03XLAPJFd4yRsUvQprL1j7fhmhf9FdzleA8t0CCqPoV+fDBaHQpXccBQD3XXmhVwyvNmTkDXtY350BH5cl8EV6Ig0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1663714589; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=2UFMxLB79FV/MnY5ZsSBnW8MPGraK3cDLRkbFpF8MVc=; b=mtS2KltW/7cxPzntEKf6fN59+4SRq5QMYbhDku4uOOQpjS+h7f62WC40olXL8aPlnw0dXThPjhLhuiDBfsXUU34ZGm7f7Hb/F3SgLWbSf3CP7Ii3p52j4ZNLb+IdLg6oKfApBbilA07A7kjKP5xOm617XowAhD6EmbBfRnv7ACU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1663714589823469.5961820119595; Tue, 20 Sep 2022 15:56:29 -0700 (PDT) Received: from localhost ([::1]:40190 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oamAG-00034H-Re for importer@patchew.org; Tue, 20 Sep 2022 18:56:28 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33232) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oah6L-00049c-0V for qemu-devel@nongnu.org; Tue, 20 Sep 2022 13:32:09 -0400 Received: from mout.gmx.net ([212.227.17.20]:57149) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oah6F-0003IC-Qk for qemu-devel@nongnu.org; Tue, 20 Sep 2022 13:32:04 -0400 Received: from p100.fritz.box ([92.116.174.94]) by mail.gmx.net (mrgmx104 [212.227.17.168]) with ESMTPSA (Nemesis) id 1MryXN-1p68FQ3kw9-00nvzU; Tue, 20 Sep 2022 19:31:53 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1663695114; bh=oRRfJEPedHy0ArZycxyZNEYilcWidKpRZKOQkRgiKrg=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References; b=ROjgJsTAPJCz9rRMVfQZvMgKl15kqBHOdTjhUM5pEP75VM5sks+/wlh0iO6XkaFef 1mznmDYs8JSR/G+idTQRqoNTD5gdfd3aJNhiF/hyACc6uuH78+tXEaMFDA+fmRuEaq 5K69bem7pCpdrXJC9cqOJ5sdphJMrYHvsc5JFOIA= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c From: Helge Deller To: qemu-devel@nongnu.org, Laurent Vivier , Richard Henderson , Stefan Hajnoczi Cc: deller@gmx.de Subject: [PULL 05/12] linux-user/hppa: Use EXCP_DUMP() to show enhanced debug info Date: Tue, 20 Sep 2022 19:31:45 +0200 Message-Id: <20220920173152.199359-6-deller@gmx.de> X-Mailer: git-send-email 2.37.3 In-Reply-To: <20220920173152.199359-1-deller@gmx.de> References: <20220920173152.199359-1-deller@gmx.de> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Provags-ID: V03:K1:7jsej/kcpjCxY4jqRcQv521jZyxC9zNhT0n9KqRoHUYNbraMF8C JztzDb4ef0U6ade0aWMTF4Dfaq9mu6xPxgpTn5KoWyB9yUhZxw/kw8RJj700gF1CPquog+6 zrxlkU+PmKfTuSJOCq0fMVidb1pYXGgM7mXSnCP/eD6nE1sgv+9+yABvj0RNgcLhZUiHCIc OJ2w6ONDQZbm9y+dmULuA== X-UI-Out-Filterresults: notjunk:1;V03:K0:4BiD1RUmvi8=:bnqbensPicaKEVEPmW08Wx 4AEas0gybDsQF3IPc9n063+sfU/yHzJgOcx6d5CaN5WIkVLs0h8GWJjTsS85YBsYc8HdFz/QX 4FgP9NtRcR/azJuO+fRZqT5RCnBlwC1yIGOJZPrC7s6/fa1vDefYtmUvIPi2ERy9C8PpQ6Mk/ vWwb+aa9wmSqtIg9fES/w/JnbSXW1C7Tblf4+PRLamnnbIUeVDeTf8Tn9kufdU6R3qV6H2rzH gs/nERO+0vfnOrc3NQxQEHq/jlZnpBYoMgYFytV/SYQNknUPx7drUnz4B9fg2kgKtEflvDec+ jU+zsyUP5A5IQhwX5f/Ol0txSZmpjyPrEoGrHgkPP/plk29o1VHVlEa1aw+STSgn9MiRlT70D CF+6r9aN4ROG5jUtOyXgag0T2Ws2Obav9p4yhfoi2YTA202gMDN3dZJNgJh5oplbAcD4tHgrl KpgYOE7yQk7PYewRlvomVVSUewzoqtf5OZHlPTEF752MRPxpJ3EzJeNH7J0B9RyfmZqAJFweg JqPE5S9J08PW1B1DFDmKbMEfLGHSUPeilW4p2RjIpL2x3D4MAsKFc7tAIY4PUweBHkLL3i6Ka kfqfiznI3DItN1aHcejvjU804NEVtWKAM0UdByQXAcZtTQNkBE4RiLDvDRo8ABzQbOfKGSc3r AbPu0B9/mE+WeZxrpuciy0xxMYnmdwaBhJVtf5QhFcRQWsKooOV/bJx+rS2XoId303mXEKJUO Qmllkhwm7QWw8fWWmuFqdOSVmyBYvvB5ZLiCEx7I6E2ysKuogJVHJFLvsF8EwdssmccStuK8P H5Oc6CsV+VaQPd6027s3mAxvI0SZfFvsGNh5ulp7OqAjYGVf6sLFzPttYxI9Z/O50iJhty+gx UE+pKEEh0dEazfSqlOTlgyR3KwvjdVX3aOs1SZiFYM3+akXxhu1VABisU+JQ5Rp/VzwxksW7v GSUmJNNOXY7alEER5qxEIueEVqnUuwgM0eSJGwujuvybf24U6NoGwI9AdTuzkdWgNKNviN2Gf t02EFV5A/Iuofmqe6mmuSSa+0/9hzK8869DDkZQKw5MPIB4qKc0hD+gjO5ipSC/URobUYG4Cw 8pv7D1ZaA3ybHX9iIyxMAO7/RsBmalZZmbpu2DG1TKQuRf+Cp5b8XPWWo4EfqclXZMgNogFTH eRKeu510FGlKV3W647cPFrszAP Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=212.227.17.20; envelope-from=deller@gmx.de; helo=mout.gmx.net X-Spam_score_int: -25 X-Spam_score: -2.6 X-Spam_bar: -- X-Spam_report: (-2.6 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @gmx.net) X-ZM-MESSAGEID: 1663714591536100001 Content-Type: text/plain; charset="utf-8" Enhance the hppa linux-user cpu_loop() to show more debugging info on hard errors. Signed-off-by: Helge Deller --- linux-user/hppa/cpu_loop.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/linux-user/hppa/cpu_loop.c b/linux-user/hppa/cpu_loop.c index 64263c3dc4..1ef3b46191 100644 --- a/linux-user/hppa/cpu_loop.c +++ b/linux-user/hppa/cpu_loop.c @@ -147,12 +147,15 @@ void cpu_loop(CPUHPPAState *env) force_sig_fault(TARGET_SIGSEGV, TARGET_SEGV_MAPERR, env->iaoq_= f); break; case EXCP_ILL: + EXCP_DUMP(env, "qemu: got CPU exception 0x%x - aborting\n", tr= apnr); force_sig_fault(TARGET_SIGILL, TARGET_ILL_ILLOPN, env->iaoq_f); break; case EXCP_PRIV_OPR: + EXCP_DUMP(env, "qemu: got CPU exception 0x%x - aborting\n", tr= apnr); force_sig_fault(TARGET_SIGILL, TARGET_ILL_PRVOPC, env->iaoq_f); break; case EXCP_PRIV_REG: + EXCP_DUMP(env, "qemu: got CPU exception 0x%x - aborting\n", tr= apnr); force_sig_fault(TARGET_SIGILL, TARGET_ILL_PRVREG, env->iaoq_f); break; case EXCP_OVERFLOW: @@ -171,7 +174,8 @@ void cpu_loop(CPUHPPAState *env) /* just indicate that signals should be handled asap */ break; default: - g_assert_not_reached(); + EXCP_DUMP(env, "qemu: unhandled CPU exception 0x%x - aborting\= n", trapnr); + abort(); } process_pending_signals(env); } -- 2.37.3 From nobody Fri Apr 26 10:25:32 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=gmx.de ARC-Seal: i=1; a=rsa-sha256; t=1663712025; cv=none; d=zohomail.com; s=zohoarc; b=bbCHG3tzX4trv+EsXNSoMpVrG4tMvw86lK07TJRlQ4v2+fDJYwqZbe3OdkaMDCelkv+mket8AuF0EFjaA03HBFLYCQfl7rR7ontU5N0Twrx/L6RsN+/SZf7d9PFGai7AnAogpwZ+25mPogBzcQPKzuu2GBwPvI1y3b57jCfaSBc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1663712025; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=QL6TEdyjsmacrIzK8NCJiMNho8ozpCjKFffQoXYcuUc=; b=ObJCTZIG82b1pMZMuAcvCKGiQBPLZG9PXp0kpHBK6wdBee5RWCa8L6ibZVDB+reXCAJ7BlFviUs//nYcigKX4nWv/i9k9ROzep/4sTAKANCVy3UKp9NizVnsf8eUIwg3SvsYrXnepXC+0sfXE578rpB3IYirL9nk2peYRQtwTUo= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 166371202585514.726185174415264; Tue, 20 Sep 2022 15:13:45 -0700 (PDT) Received: from localhost ([::1]:59622 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oalUu-0005Bf-ER for importer@patchew.org; Tue, 20 Sep 2022 18:13:44 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:52876) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oah6O-00049x-6I for qemu-devel@nongnu.org; Tue, 20 Sep 2022 13:32:09 -0400 Received: from mout.gmx.net ([212.227.17.21]:48907) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oah6D-0003IE-Od for qemu-devel@nongnu.org; Tue, 20 Sep 2022 13:32:06 -0400 Received: from p100.fritz.box ([92.116.174.94]) by mail.gmx.net (mrgmx104 [212.227.17.168]) with ESMTPSA (Nemesis) id 1MiJVG-1pFnHY0KgQ-00fRoZ; Tue, 20 Sep 2022 19:31:54 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1663695114; bh=gfeMI+E+j/dnapfMa/8omn/Mn/JySKbYTVeEcHy2pbw=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References; b=U2B6vajh64jLOjDYKmTnTkW706B6FhLUNP9Jrra9OPBPb/DzbhlV6N3zjqmuKAVD+ rGVdc2j8CIWSXmZcqXkIMob+DWtRsEFXNsERthpoB1fB5jMPrZemMd4x7XKLcLx6a5 Jk/J040H93Qdicol1UilfMu1AgCgNMYQRkm1TEkY= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c From: Helge Deller To: qemu-devel@nongnu.org, Laurent Vivier , Richard Henderson , Stefan Hajnoczi Cc: deller@gmx.de Subject: [PULL 06/12] linux-user/hppa: Dump IIR on register dump Date: Tue, 20 Sep 2022 19:31:46 +0200 Message-Id: <20220920173152.199359-7-deller@gmx.de> X-Mailer: git-send-email 2.37.3 In-Reply-To: <20220920173152.199359-1-deller@gmx.de> References: <20220920173152.199359-1-deller@gmx.de> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Provags-ID: V03:K1:esA8DiE/Td8WIHkl741r0svowbw1RX0iSRsBqZ0xN7YWlm9bxHo 3Xb0BmR1io/QPCad1wFUt+eE6RX+cK5m+pDKdIxRz9YOnp/wDWUA/KOqSt1Qm5Gc+vCLXwp SrXMc0ORnp372T20WuHfXX4izdaGXiFPnedzzJR++hgAxhB51+bjL5jC3rSUjngM5k0wxyM T64EIJxuukypJnjAdayRQ== X-UI-Out-Filterresults: notjunk:1;V03:K0:6YRFFN4K8kE=:1pdQVxWd8SBiHmgjOvAnHH cYwue79SLrfVAhDY9QHjjxbhxCdHpaY76qKKxf6XBYNyRvn8OWuMcc8eh50q/7s2GZv9t+Id+ axU8zz1r6pldzepuseM+KotjDkyNE4OBW9RYeb/AEEzJseVi70vvhdpMC3gsBj+8p1StgcPuN R9xPNoXXk4RiJEkkp7WWpn1NosQneI4t+7Xg+SDk3Qe9EUmnqMLaqzdpyY7bQjrPlCJraLYty PvjJP1rK55kc5IlcZpx64L4WxiRLSqYHH+57UWECY9El5X+sK+cf7WmJJ+3eVmneh1egsZglr 16UX/EZ1W4msM4CeBMvBGuzXbbwy1wnwFV0cmv6BuPV+6eOYOke/n9SR/cEg/Q1E/F82z+tJJ tZKaAvn4mGAQInee+/VFVYb1KRGpv46HVOtOPxe+27uX+UBBqw/NXJLpkqKwX3t/P5PMfth9R zcVOIN0s/Z6AUXzpUIiXYsZXeQFjgrjfui+G+NxgtDRLqd4W6NjzmLeMndz3PbWou5uUFtNsW IusrL0mQLvQuvSYDX/yBmh+HZ3pwYCnHdagl+r8gbyKIlA4Z61FDqxgJwF2P6crVBOI1WPt4F 8vk8l7+mBJKkm7yQvVLQXJ+Dr3v6tX6vNE/MnfKtjDjHsW4eMgkSwt7iYR6SztUI8ROByBm+s cwmhY9Ru/E+xPYFxVMRwYACaInD38ESu1SgkbshbliavlWdPIN7F3uMVm8AFNaE9RM2RFxwhu O8PJQafBZ3d21xwQbYcFiN5BxaZLdJn4OvImyyfc/dZGRKUm8/DAl1bOfk02zEY8hAqbcKQVx AV0ncoW0DOWwDLcannam78vpMRPVvntYTs60gw0YtdUcnasbkR1f4vrF1e0R6s85NlM64XK5C Ij7VKtxZVTSXZNEoIZmTZ87xZTlN4G6oFFACjHiNL7onYmQtCx+bbTWpocd/D2MAq83YOPZPJ 9MArI9PWnXEgr9lUaadhWdkACzivSOzc8RBjvezJx9IxR76K4NDRah+rXN1G9wW27kPfxaDRq rAkWfO6zEJB56vj7W79jSZ1CsuBEXWGNzfTg4fGJ5MVck6ByCqnbOYO8wKFM3LISRdZpxmhbB ssEAopFrV3/hs7HoomVQwv+FL5om1nM6PRQTDCeMabMyCPkG6TN+CZhTkD0C2S5/IHXHGigWw LFlGQ= Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=212.227.17.21; envelope-from=deller@gmx.de; helo=mout.gmx.net X-Spam_score_int: -23 X-Spam_score: -2.4 X-Spam_bar: -- X-Spam_report: (-2.4 / 5.0 requ) BAYES_00=-1.9, DKIM_INVALID=0.1, DKIM_SIGNED=0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @gmx.net) X-ZM-MESSAGEID: 1663712027056100001 Content-Type: text/plain; charset="utf-8" Include the IIR register (which holds the opcode of the failing instruction) when dumping the hppa registers. Signed-off-by: Helge Deller --- target/hppa/helper.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/target/hppa/helper.c b/target/hppa/helper.c index e2758d8df3..74b8747083 100644 --- a/target/hppa/helper.c +++ b/target/hppa/helper.c @@ -85,9 +85,11 @@ void hppa_cpu_dump_state(CPUState *cs, FILE *f, int flag= s) char psw_c[20]; int i; - qemu_fprintf(f, "IA_F " TARGET_FMT_lx " IA_B " TARGET_FMT_lx "\n", + qemu_fprintf(f, "IA_F " TARGET_FMT_lx " IA_B " TARGET_FMT_lx + " IIR " TREG_FMT_lx "\n", hppa_form_gva_psw(psw, env->iasq_f, env->iaoq_f), - hppa_form_gva_psw(psw, env->iasq_b, env->iaoq_b)); + hppa_form_gva_psw(psw, env->iasq_b, env->iaoq_b), + env->cr[CR_IIR]); psw_c[0] =3D (psw & PSW_W ? 'W' : '-'); psw_c[1] =3D (psw & PSW_E ? 'E' : '-'); -- 2.37.3 From nobody Fri Apr 26 10:25:32 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=gmx.de ARC-Seal: i=1; a=rsa-sha256; t=1663715375; cv=none; d=zohomail.com; s=zohoarc; b=LY2+LAyiqXCkJzxRo6078rp/tkkAmITkZEaMwqsF0T8Qa0MLSxTsG9NpFIgUC3Acc5l6DWjvhaRkkF1Z6iyF8awDVTWPUpYnn2AlCy0YnRDkfA7DLpaV9vn1saUCVlvxYXu2qBsassRKCggG/jlYvUAZjg2NyFt4H2b7uuM91gw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1663715375; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=fCVVt5AutqCuN5QFWO4lEICLqyhWMnAz+pP1+WWFcJE=; b=Dq+x+cVPHbDvHVxW01WhAQg+Wmh+3m6Jw6UeEDx2gXo8mVs3ztrBUInXEwwQbi2VfEBh6q6r8J7dkzr8+bIKlw9KOzihNRmy59QrWu6WoYEoy9ju9ui6RiK9eP6leyM4+/wMw7cuuBvILdJWvswI6EdEdTHnj8gS1TxzgKiImJI= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 166371537533547.712021628340494; Tue, 20 Sep 2022 16:09:35 -0700 (PDT) Received: from localhost ([::1]:44664 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oamMs-0000tp-SU for importer@patchew.org; Tue, 20 Sep 2022 19:09:32 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33220) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oah6H-00043R-70 for qemu-devel@nongnu.org; Tue, 20 Sep 2022 13:32:01 -0400 Received: from mout.gmx.net ([212.227.17.21]:37997) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oah6D-0003IG-Ld for qemu-devel@nongnu.org; Tue, 20 Sep 2022 13:32:00 -0400 Received: from p100.fritz.box ([92.116.174.94]) by mail.gmx.net (mrgmx104 [212.227.17.168]) with ESMTPSA (Nemesis) id 1N79u8-1pLjK213nQ-017WFF; Tue, 20 Sep 2022 19:31:54 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1663695114; bh=wsABdtA7mc4o7G8R1N8b0kDQgcZ9Rz4G69v+vaVuQF4=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References; b=I3JJVu7SPQwzWSOTsyEf69tvtMYohOXeFEED4bl8qIK+EeEB6h9UuFgZEmFpnpW/e OJXItSzZoagV7997WWyISKTozRoTp4H9KX3FLBuubgFoCdwoRqI2nnJmNqiM5Fi65q H47BV7Om9BIBND0ZIBjg4XcVI2MQu3tzf2qnDNJw= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c From: Helge Deller To: qemu-devel@nongnu.org, Laurent Vivier , Richard Henderson , Stefan Hajnoczi Cc: deller@gmx.de Subject: [PULL 07/12] linux-user: Fix strace of chmod() if mode == 0 Date: Tue, 20 Sep 2022 19:31:47 +0200 Message-Id: <20220920173152.199359-8-deller@gmx.de> X-Mailer: git-send-email 2.37.3 In-Reply-To: <20220920173152.199359-1-deller@gmx.de> References: <20220920173152.199359-1-deller@gmx.de> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Provags-ID: V03:K1:Uul6eBxuNzx317xURXEhC0HUoI8yOrmI9hsVPopOpde2imrApid aMkggwEhn+yWdK69iVf5ji8aOQn29vU8l2HTO8/spIbclEBQZCB64GzBNrH3EnELtzvcNw5 Q8JHJEu+orwfkoICNqSNlhMy46AUbnBejh7srDiUWQ6CVAW2wDlMWyAhj9aWtcVXMg9VfUa /wOjz4VuURzaXVk/1lL7Q== X-UI-Out-Filterresults: notjunk:1;V03:K0:VLJCGPVqvK4=:AtWZajVpwe9/NQoq2f7DB+ 6iNsI9S1tTW3kqDSZ1EUkX4vOKzaMfSXhiltAm3dRsnT+LVrtmgBwbAxXC8ChN3aCu5SMTsAJ p1YNFMoewocouEEJEyG/RCsQz7Q7oJVh1qW66r58cg1mO6FmcT3TRlYkKkAGYHBb+1VJMGqe+ zgduXGzcdxy0uV40rGrs9FaDFdbjNdFUdDSSsLzeix3nxE6FOJR/FQKbT3QDR0tq7UGTWoYdC PzPazav6+c/yHYL7ryinipAy2T28t11w1nrSX9MpWGyRLYaRwrn/ynFTqWdmRb9yqmJkHhujN FvD1vpK1DZ7c3RAP9LpR0fL/LcaK1GyOR9QlP0jQa/2rCLvZIBYGjekwaapoQdXYjIc7jNSxx Doxk+C44W8jRuM5zRT5PtowAFUvwerfMKdL65q2x5UtzCR83+Q/pd7EYpJEugMKGb8vWNL0Rr kKekPqtXfIdAU15hsVPLe6PsYumgS1b6m6GqT7JK3gwhuwuSL97Lz89aeqpETQujjh1xzNMMd NjTcx1gMEkpTceHdu6ltZLY0HbTk3O6OPy62D8htvH35LTgzWHvbDjAdEO2HCwxiNaEb19NMp GwHxz/4uH4v1vx4emmCy8gVQ//kDuxohZHrfBAuXctxtoHo5NsM/3SEy08+M+uH2o0D2KqhtX XvV7Fs7W1L7Y+GXiX+Uunqgh8aCqQmsruL+Z45oL7XqY8d2ZPSsVmhVJW3WIq2o68816ZGhFb Jtx6KS15J0HfD5BdShbPGRtjmckhPqZyDC5MGh2twu3MUUgDMt+XFqGIYBjCTXOD5a1qcqsM2 Kg/azDZT8sKkJwcmEG5PR12rCfwSE2Sx5hySK6S+O7HUjLbc1RXsvcJwvkcczVM8yuC41XE/Y SbbnrUJp6GVDZGIvs/L2F9T8j26VzY49aTQZg/0C3eEKQTZe3af4VUiSL2sjppAUTryydqpQ8 xWy/ksseuhg+9Qfj6UZFdvnZX6gs0S8BsQEtbxB7//8mFxbkYeqee2XHHeLoQ+BjK+YzYY58b +e8DZewC4IdAyV5aHXfCSnGlD8kAsvFukFgXohc9Kco9fbXfuGhyKd7VJf3E4LZGyYjW8MhmQ tq+LsuFqOx/WXow0OlF2M/9IYTEQweF1z9MXUC4c3CeNBZRekeFUWsmHk/2cnUgaRiNAapTAr PHuLA= Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=212.227.17.21; envelope-from=deller@gmx.de; helo=mout.gmx.net X-Spam_score_int: -25 X-Spam_score: -2.6 X-Spam_bar: -- X-Spam_report: (-2.6 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @gmx.net) X-ZM-MESSAGEID: 1663715377706100001 Content-Type: text/plain; charset="utf-8" If the mode parameter of chmod() is zero, this value isn't shown when stracing a program: chmod("filename",) This patch fixes it up to show the zero-value as well: chmod("filename",000) Signed-off-by: Helge Deller --- linux-user/strace.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/linux-user/strace.c b/linux-user/strace.c index 5ac64df02b..2f539845bb 100644 --- a/linux-user/strace.c +++ b/linux-user/strace.c @@ -1505,6 +1505,11 @@ print_file_mode(abi_long mode, int last) const char *sep =3D ""; const struct flags *m; + if (mode =3D=3D 0) { + qemu_log("000%s", get_comma(last)); + return; + } + for (m =3D &mode_flags[0]; m->f_string !=3D NULL; m++) { if ((m->f_value & mode) =3D=3D m->f_value) { qemu_log("%s%s", m->f_string, sep); -- 2.37.3 From nobody Fri Apr 26 10:25:32 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=gmx.de ARC-Seal: i=1; a=rsa-sha256; t=1663716145; cv=none; d=zohomail.com; s=zohoarc; b=GGusMKyJyRcO2hssfAaV/vh47Klgp54azQAVjJfAQ7HuV83DNKMBAcxfcjo7ZYrnnL+V8S4dyEMmwpGYHO+TpYyG74ox6FdL7N29X2wmEo+mfR/W6XI+Y1QtX8J+QYn39Hzzc1v5IWyZs8t6PpdYia7T2h3XDj8jrCxUGZyygv8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1663716145; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=oG+kS8gMap0Ay57t1wyc2bzMq98FY4nhDtO/0taa2AE=; b=DxTX/Isytag87+kYNwXqEm/gyjpOnLCVZUz0qX/NFJlh6T4/zaRdsmsX/7J9rChvE84t3RExSg9/mri816GroCEOAI7EzhQcsVyDEPTzzBnWT+Lq3wRgqcCmGePue4QOwpdkWsgWrWldqsAKGMLybFId30dPaSIn+rLHGeO5zME= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1663716145665830.1635486076623; Tue, 20 Sep 2022 16:22:25 -0700 (PDT) Received: from localhost ([::1]:41216 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oamZL-0002EU-EX for importer@patchew.org; Tue, 20 Sep 2022 19:22:23 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:52870) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oah6M-00049h-A7 for qemu-devel@nongnu.org; Tue, 20 Sep 2022 13:32:09 -0400 Received: from mout.gmx.net ([212.227.17.21]:53615) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oah6G-0003IO-3g for qemu-devel@nongnu.org; Tue, 20 Sep 2022 13:32:05 -0400 Received: from p100.fritz.box ([92.116.174.94]) by mail.gmx.net (mrgmx104 [212.227.17.168]) with ESMTPSA (Nemesis) id 1MKbg4-1or7WI1nu0-00L0Dx; Tue, 20 Sep 2022 19:31:54 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1663695114; bh=BcxOqfmO/trIQjNo29cpvGdH85hMR3n5nzwaODzaDdI=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References; b=kkZ7nMSVuORhh4tj4L23okHSV8Ljmoesc7ETfvVuqB094ypgBSNbqzMS4KRnP1Mf1 eZLyns6Yi65ZmJiwvMdhyz2zSBwoBaYVWJT9uL/BN/7HduPNcRCmYbby3XMLLORYst Sn/IysGsn/SyVlytKIL+K97usx0BBra26oR5q5tw= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c From: Helge Deller To: qemu-devel@nongnu.org, Laurent Vivier , Richard Henderson , Stefan Hajnoczi Cc: deller@gmx.de Subject: [PULL 08/12] linux-user/hppa: Set TASK_UNMAPPED_BASE to 0xfa000000 for hppa arch Date: Tue, 20 Sep 2022 19:31:48 +0200 Message-Id: <20220920173152.199359-9-deller@gmx.de> X-Mailer: git-send-email 2.37.3 In-Reply-To: <20220920173152.199359-1-deller@gmx.de> References: <20220920173152.199359-1-deller@gmx.de> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Provags-ID: V03:K1:FkLP9tkjtH8iyG+/FIAcbUwIaHAMBJw43DcTVUCH06SxnI3nvoz M9o0xHlLtd/k0eSZS1OImoGZlr3jSQOPb8+99xwncNqgu+K5g2e8q62Brpv4VVmRDd7wV2h LDLYF44z5/+TCJ/B33r+Ut8Kz6gKb2k+ffP4J75Vj9/CE1fb/nFTQOtWssHp+o4AjdApRcG Z42p3h6DDdXOBrK/+4eQQ== X-UI-Out-Filterresults: notjunk:1;V03:K0:ZctraO/anlk=:i+T1pnzrbJeBo9ba76k9+a I5Tb7ib15U8MBrJQlWEQeUAIq669d/GZlesPxADn6NNS/0ldGxMQtw30ggeUCgWWK9T9pLwVF Bbdw7FNQVAwPPPmcGggXMvdxoMOQSpAcKtX1G6FRKMOF2sBvS3aKWJRIJDyqbL6qOJBTRxHQY 7I4me7/Gx33/hnGkR1qUVTGbXtElm7uryG3CGslcgPU1aQUlbJ2rQeAXl0dnLGm7y7QSAnEh7 71Ardt1hEdplT7QpPENfHyG5sJ44hFQ+OhD7hjbvSXcD8faC3xhiUzs/r0j0jYSO8muK5qiiQ kXlKA3qB5w5BlMPBbsLCZqDte1WIocj7eZPtkafwQ+Vrtyt8MG/aQKlw1fOcYYaTSW4K7Zhqf QW7S3Z3VYYzJoJ3mGVjw7XU3x7aIBSwCLKt+u2z/44bnxNYa4ptPv3TwNhFChtTjLFWOUNuA9 oG1XTgBmLVhHVyS5LzWXln+IJgjutSVFOieaGJzoXs4vop/swdoHEw3kbTAObs9AFKzp/vxuY 8YtP4YMLuoO6VRwtVBUHHyt7/dzBQuIWNbWj21zcnXtPgYSrM9eV0ZFfnDvqxpgxqWdzk2FSj Vlvz5ljh6hMwHd7fQxwyQDCNZ8qWYs/OL0DJH0QE1k8NZnMPf/5X4kin3VP3OqSeBai7v02DX qAJXdBLXgV1vu5JzLC0fpY83upFy6rTvDoaqElQahfNB1WhsPEgtgY4w3XIp6QVDGg3ihcIya zFu8nw0Kla1YW2bP4UWvY7+23LwDx/maAR+bse/rFwfLkdYcbpAv/TMpRnZcUupFSg7iQZUSd zQqOxDMhVLiKmikfkihehvTLmIYnR5a0QpHbvH5VYaH3PR6tCPuEWBYoCRPpWJgPF0FNcI1Jx BF4v7gklJEXFLsNAAr+fQFRhoG7B21g5tKYr5osKi2pXOgKq88Kkulnoc/QtMPmofYyMPozGJ musqa6oZrm2h+i/142Tc+0CLzmsQolG4XOQJEVLbLvBI6RysP/3J+vgaVrI7kXCI7L5KSAmiM FGuXwtkf0Y5+zjEDjsjQyEJGwTFTqa7u4/WJ3a959t5JcK1DeDKi3KlNQPCoytL9u8/Oow7Wq Xvdms93teA12Mo3Eon0yxrbwMwTxwCulTTJQCPW5LN4OXia7bYvBMy76RjCLQkq0rUSU9SvM6 v+SncSb047JTvAx535qgQA6VK3 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=212.227.17.21; envelope-from=deller@gmx.de; helo=mout.gmx.net X-Spam_score_int: -25 X-Spam_score: -2.6 X-Spam_bar: -- X-Spam_report: (-2.6 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @gmx.net) X-ZM-MESSAGEID: 1663716147964100003 Content-Type: text/plain; charset="utf-8" On the parisc architecture the stack grows upwards. Move the TASK_UNMAPPED_BASE to high memory area as it's done by the kernel on physical machines. Signed-off-by: Helge Deller --- linux-user/mmap.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/linux-user/mmap.c b/linux-user/mmap.c index 048c4135af..dba6823668 100644 --- a/linux-user/mmap.c +++ b/linux-user/mmap.c @@ -251,8 +251,12 @@ static int mmap_frag(abi_ulong real_start, # define TASK_UNMAPPED_BASE (1ul << 38) #endif #else +#ifdef TARGET_HPPA +# define TASK_UNMAPPED_BASE 0xfa000000 +#else # define TASK_UNMAPPED_BASE 0x40000000 #endif +#endif abi_ulong mmap_next_start =3D TASK_UNMAPPED_BASE; unsigned long last_brk; -- 2.37.3 From nobody Fri Apr 26 10:25:32 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=gmx.de ARC-Seal: i=1; a=rsa-sha256; t=1663711663; cv=none; d=zohomail.com; s=zohoarc; b=Zgz20zumRHwgwl+MrlvnmnP8xH/ki9K9+GZD8W2RaUBD+NzpoZiTekibmbE0ouLeUPWNpDt+7PULcr3CAizTf+OBzHvMGzEZUGfuZKQxIIf/74VuEsBeV1vkFO3FzWCSip59tkESr1mJUFCqVxnwhOK8u9j2osvW7qsnQ7pEUsE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1663711663; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=lRuzQstL9ynm3d2SJCv789J2zTHsyq89zNfbQuVLkhs=; b=aCULjg6vh5oQ6bgfeYVQDyo4M9Z5vx6hJFOIltPSnIhFcUbSX6CFTDCmqSVddtRT5fj+xJt7SNy+G6VUnFqQggCu29ynyv1cOldHM/d+gABcTanuL0bCwfahzyrdxZfXsEroWbnAE0dhzqWUA4M0eN7/m4dhj5Ef0g9TJn7BBGQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 16637116638041016.6651773387633; Tue, 20 Sep 2022 15:07:43 -0700 (PDT) Received: from localhost ([::1]:53752 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oalP3-0002DW-MU for importer@patchew.org; Tue, 20 Sep 2022 18:07:41 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:52868) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oah6M-00049g-AJ for qemu-devel@nongnu.org; Tue, 20 Sep 2022 13:32:09 -0400 Received: from mout.gmx.net ([212.227.17.22]:47441) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oah6D-0003Ii-V2 for qemu-devel@nongnu.org; Tue, 20 Sep 2022 13:32:05 -0400 Received: from p100.fritz.box ([92.116.174.94]) by mail.gmx.net (mrgmx104 [212.227.17.168]) with ESMTPSA (Nemesis) id 1N0X8u-1pWlw62jPY-00wYxV; Tue, 20 Sep 2022 19:31:54 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1663695115; bh=cs05Q1ht9PiLq7agrRMMSzOgL2oo2VY1N/Ee55XqK88=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References; b=ccMRL76p6MxynGZ6G4XxdDNnfN0n5jtH9Q+KJXiVWastqhU5CeoxO0i5rB4CbyR+y e5qTt51eJO5ilZYspWdRn6BIw+koiG+9NopzsFTu5ipyLg7gGJCnwCa2YuFDEkdJIs Ud/QMgUu8GoBR6v7Ql3o6MKBPgXW9RL2xbYDpiTo= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c From: Helge Deller To: qemu-devel@nongnu.org, Laurent Vivier , Richard Henderson , Stefan Hajnoczi Cc: deller@gmx.de Subject: [PULL 09/12] linux-user: Add strace for clock_nanosleep() Date: Tue, 20 Sep 2022 19:31:49 +0200 Message-Id: <20220920173152.199359-10-deller@gmx.de> X-Mailer: git-send-email 2.37.3 In-Reply-To: <20220920173152.199359-1-deller@gmx.de> References: <20220920173152.199359-1-deller@gmx.de> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Provags-ID: V03:K1:hHc/k24NENLWwS5GPMapwfGlA896zoLOCuSmQ8DUnfNPcOqHdKs saG7gh5ec/0BPqSbgSd+LlUYH4wRuSJ1ZhvLyrHDkssvWou9Q4HAhfLKlKU006TGsNb248R LqybSsTgoXAuY2ERyUt3REI8itOn3di41hWVP9GZgnWtBUFaN6s/50m8xzXu88EUm4SsXoF VFzVOdUyVlcdU3/ZmjCWA== X-UI-Out-Filterresults: notjunk:1;V03:K0:DNYqATqkD3E=:VPatlAGIl/aK8j6VAQGTw2 ekIhKjVV4VXCzNg4t/Prj1JBdGjaeMljdnL7IlERQKoJ2Cie/BNQPJgJrLy2az+k1VrSNAIy/ F2P0NsNWeenaV6FKJxHR+j0Mv3kG3z2x7ES4yWngjvgPCQHznbilxJxswSW0YKNLjYzyNGlzt Jv4yOKe/wjDJR/G/cEjbggpf8vMebU6a8LU1q+lab6nAnUbBkE+XCEy6ym/Q6YDpxvVlG33Lh lsmlVDafI9iHcXCtHtv9KzbFxvQOJTzH6/cBy6AI9PthOfV9rjs6kZh1Luow4AS7MA/3F3Pj5 k4CA9WQ5ltKPPmkArIF3bdrximdgKZaMTbNgQxS2HyW8jEWIqAxhxn5FMcVc7KGSyGf9Mr1uQ iXwo/ybKTWWHkCQSv/aA2oMh4WYB8nlGbVFGVh7rZ/xdr/r8xV5+1GfT40Dfh+hdkwOc3fub3 8JyTK4Gk2r+U9sZy1E+sYBFhLkIG8FS17PONHpeHlZUKd4mfV8NiV5xy32PltOA+3057MEZbg UFjBPyRSGHQjJG0RO9TvTEbK3HBSmKtWS07B3pBL4hZSR5WHCCDTeZxukNF6X4lc0OxqWj9kc qXMuKepbz2WPS9CdI73ruyWJRkYFbnfgqV0JsEXm1Awa4uPmPulExtBEKOttCBanFezY7jdoj dgHnkqxbXt+P+ZVOTv7I8szg015XK7PjCH89Mq+T9zEfQaCpEklnarkcax1Tfy+s2YouumGDa z/15U4oir8qBk14uttZqyB2Mina9oDFaiyc6JxLmbTizwPt3EOJ4guZlxbWaXtMsdJ8HcKVUI T7r48+5Au4gC45eaPSCzXBfIYn3IZyFHFfg5FZp+eUnYoniBqTSxmMapjCBM+/6argYUI/dO9 R/I34Iogfef/Zk2hoEVAIo1BGTd6UuLvZtNXCTekLI3CC6woG+nnke5aMtN0yoiZRF1rQ+JK2 QSFxZsIurW0cvOB+xendXr6UJHh19zYzaEBt4Er7OIzLR5YbY+D8tOKJV06R4n88REPVvHZI4 nFD84rrj4XZ3121q7ex8jDzBdg0uxjVOOHd8hf0nh/B8F6E/izotIqR4GVZhTQtbq5wYDbQZW sK3sBwEwCGffxbUz0nmuB/CsMD6Qq6LZesVWFJHsodTbnfTnJNsT0fXEMiF7zPxt4Zyu3rXDb QwhVrsNit7sf63dJPp85ghb0Ke Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=212.227.17.22; envelope-from=deller@gmx.de; helo=mout.gmx.net X-Spam_score_int: -25 X-Spam_score: -2.6 X-Spam_bar: -- X-Spam_report: (-2.6 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H2=-0.001, SPF_PASS=-0.001, T_SPF_HELO_TEMPERROR=0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @gmx.net) X-ZM-MESSAGEID: 1663711664338100001 Content-Type: text/plain; charset="utf-8" Signed-off-by: Helge Deller --- linux-user/strace.c | 15 +++++++++++++++ linux-user/strace.list | 3 ++- 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/linux-user/strace.c b/linux-user/strace.c index 2f539845bb..6f818212d5 100644 --- a/linux-user/strace.c +++ b/linux-user/strace.c @@ -3567,6 +3567,21 @@ print_unshare(CPUArchState *cpu_env, const struct sy= scallname *name, } #endif +#ifdef TARGET_NR_clock_nanosleep +static void +print_clock_nanosleep(CPUArchState *cpu_env, const struct syscallname *nam= e, + abi_long arg0, abi_long arg1, abi_long arg2, + abi_long arg3, abi_long arg4, abi_long arg5) +{ + print_syscall_prologue(name); + print_enums(clockids, arg0, 0); + print_raw_param("%d", arg1, 0); + print_timespec(arg2, 0); + print_timespec(arg3, 1); + print_syscall_epilogue(name); +} +#endif + #ifdef TARGET_NR_utime static void print_utime(CPUArchState *cpu_env, const struct syscallname *name, diff --git a/linux-user/strace.list b/linux-user/strace.list index 4d8b7f6a5e..215d971b2a 100644 --- a/linux-user/strace.list +++ b/linux-user/strace.list @@ -91,7 +91,8 @@ print_syscall_ret_clock_gettime }, #endif #ifdef TARGET_NR_clock_nanosleep -{ TARGET_NR_clock_nanosleep, "clock_nanosleep" , NULL, NULL, NULL }, +{ TARGET_NR_clock_nanosleep, "clock_nanosleep" , NULL, print_clock_nanosle= ep, + NULL }, #endif #ifdef TARGET_NR_clock_settime { TARGET_NR_clock_settime, "clock_settime" , NULL, print_clock_settime, NU= LL }, -- 2.37.3 From nobody Fri Apr 26 10:25:32 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=gmx.de ARC-Seal: i=1; a=rsa-sha256; t=1663715821; cv=none; d=zohomail.com; s=zohoarc; b=VWIs3hEScw1Xczq5Sv0GngP+boc4ndIYUJt8d3SEMgBgVwimuXXzc9SPY+dlbsXy4FPQM3SVBnmaIU1Fy7OZ5rg28VmAyaRAQ5Ou1lvmcTdPJZE3XGh2S3p0tEwjShGRBb13e3BDWvPxFj72C0QlBA5vmULZdVj6Dr7XEXGP9q4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1663715821; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=Z00jicLnFvNUpy0AqkFZ/y2mcwbBm5fmFX5MjDI2VXw=; b=kPwFBrh/77F+k9iWUrVTbyPIvrRTkrKn/eHQxynEncA0te6tSNyU7v0wD7SSxkMi6/mBap7xPot1A0jlUix4a0AEIHFK89bYl9kSXfGexT5ufBUK67qH0a9FDFBYRStaEkFM4OR+Oxu8t0hN3xCg2Q+0YeDMhPt/G+IiAMU9ZF8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1663715821561642.1021369436307; Tue, 20 Sep 2022 16:17:01 -0700 (PDT) Received: from localhost ([::1]:44306 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oamU7-0004Sw-6V for importer@patchew.org; Tue, 20 Sep 2022 19:16:59 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33224) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oah6J-00046L-GY for qemu-devel@nongnu.org; Tue, 20 Sep 2022 13:32:03 -0400 Received: from mout.gmx.net ([212.227.17.21]:47709) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oah6E-0003IT-Bz for qemu-devel@nongnu.org; Tue, 20 Sep 2022 13:32:02 -0400 Received: from p100.fritz.box ([92.116.174.94]) by mail.gmx.net (mrgmx104 [212.227.17.168]) with ESMTPSA (Nemesis) id 1MysRu-1pWDhg3VA2-00w1GJ; Tue, 20 Sep 2022 19:31:54 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1663695115; bh=Ch0VD1RjoPxJVBQy7NTTlp4njBGwmtHPyvXwy03EIcQ=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References; b=On+NSD9rcLQ6RFPUPOhFkjcUzKKNeUhdaoO22HFQyYCOAt8xqb/kIXA7Jm281TL0M LPuZML8+a/YW3GdN4+wQHpCbCnvxYFogTxBXQb8SiWy3M4O0T12LFfJ19DnDrqEs8B RV0qm4K2N90Vmw4Avqi8WdPC1FzhVuRswUwhonkI= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c From: Helge Deller To: qemu-devel@nongnu.org, Laurent Vivier , Richard Henderson , Stefan Hajnoczi Cc: deller@gmx.de Subject: [PULL 10/12] linux-user: Show timespec on strace for futex() Date: Tue, 20 Sep 2022 19:31:50 +0200 Message-Id: <20220920173152.199359-11-deller@gmx.de> X-Mailer: git-send-email 2.37.3 In-Reply-To: <20220920173152.199359-1-deller@gmx.de> References: <20220920173152.199359-1-deller@gmx.de> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Provags-ID: V03:K1:kRfQ2ILoRv44pI/bQcfy0c8wnGLNml73rEnHLatdnFy3HFO75ON rowBrDQmydpkQlNf29OEgrq+mpyDh19VdFVUZDvw1mRFpQbtjeUCA26oxoIg7qgOetLaDTU Opctds4VrmGR66TaUtEUVCBvjJiFURpHLfi98pCEtJbK4zH7PQq7K3Pndi22nfdkWuL0iMe xNbzyMk8sXct8P1km+eUw== X-UI-Out-Filterresults: notjunk:1;V03:K0:lO9lN6p6NBU=:WVbw4MPWPgSiuhMyxaIW8Y Yhd6JI1VdfyTrv9FlNomYGUO0XVh6wj6tXF/Q5HQMSGAehSElZs4LFdnefIYzu731qevHhkD6 HsYSvveuTs02wwN5KYz9pKWVC7kVBCgyPuRVRLh3p0UPXAXU1cWMO34PZDabhcXSEgZYOzZDl BAFy3KEjg8OKBqz9Bi+TFGrz/Nr0ERtJ7YrVhmsv3e5Ugq6Y2MD+4G34wc3nw8U+SpMnC2wxa SMtxZE9A+y8HTjaEaMLERtBXZuebCBXdyoXIRQw1q3g0hi9mUAL/HY/RXVOm2R2xFMs5DsMpo UrYzdzC+ozSxLtrMXkbFoy43QKUyRYHuB/Bt83h2wWBuRyOh9E99ItAJKhXR6ALFMDx2dMOzX gpxYc150Hv5t+Yex/rhuIpCa5IvoJG3QLXTyM7MbeTkiPhDS73VNgOp2+AdkkPNliVsu30JO1 j6BFL64fFO9IboIuMdfRw732fi5d1X9WvKX+kjUNzOyA0btPZuFPElN5G7nioFwQbZB6Y4T4s Dq1k55BANoM6Ma2k5dAkeJ4qjN/Zmrgp0vHCbzBX1tLf6v5uU/UTBWPpDEo+Qy2kgwGtP6+di wqPwj84SJURRuL18qa4wJJW/Qph+MMWzFJUELyIeUKR2ayQ0CiJzWLwx2MmhVH6i2PF+cK+v7 mr4bbPI8LuVXPu48cobt1h3WYeMuXutSCaKUOIxH2iC7/ltKv0qS31j2QZGTItJlWrxbTLRvr Rf48Va4/z6eGszIwTZR6qHEERJBC1xbfwllVBQknl2d7wBFf2+jDGmiO7uRlOQCRiS0Y2H5XW kk2ZExGUnUFwPeqZMGS/Wjm0/esLBuJ9zs2pXmqtKCsd5q1c2sgbbdLU1CJ3pWTyJFagILSAe nrfKiu2vGZDA2eRhwjvQSS0eQYzXbO1a8evXlaJfpZkihR0IyW1G0phF0GVJ9PjU2+2+mu4nS pXTs8pRmMRTgTiGDp5DTRt0cGp+8e8mty5oOZJKRJnC9aaDZQPaILagtphs8ta4QaYxrki5hY WN3tIoYPoBNoRVDANahIfXMgEduCAYjGDEkMAZCzFtXE2tcKS/8ymkYM3noaGooJM1frcbbAn 9SELkBHiTgMKxurOdbTTFgPUj2/T0czxDJ5/Wv6Ijg8tEdhRoYEXh+LcBBjNQmYBINEBIRe7h P+ooc= Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=212.227.17.21; envelope-from=deller@gmx.de; helo=mout.gmx.net X-Spam_score_int: -25 X-Spam_score: -2.6 X-Spam_bar: -- X-Spam_report: (-2.6 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @gmx.net) X-ZM-MESSAGEID: 1663715822019100001 Content-Type: text/plain; charset="utf-8" Signed-off-by: Helge Deller --- linux-user/strace.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/linux-user/strace.c b/linux-user/strace.c index 6f818212d5..b6b9abaea4 100644 --- a/linux-user/strace.c +++ b/linux-user/strace.c @@ -3714,11 +3714,20 @@ print_futex(CPUArchState *cpu_env, const struct sys= callname *name, abi_long arg0, abi_long arg1, abi_long arg2, abi_long arg3, abi_long arg4, abi_long arg5) { + abi_long op =3D arg1 & FUTEX_CMD_MASK; print_syscall_prologue(name); print_pointer(arg0, 0); print_futex_op(arg1, 0); print_raw_param(",%d", arg2, 0); - print_pointer(arg3, 0); /* struct timespec */ + switch (op) { + case FUTEX_WAIT: + case FUTEX_WAIT_BITSET: + print_timespec(arg3, 0); + break; + default: + print_pointer(arg3, 0); + break; + } print_pointer(arg4, 0); print_raw_param("%d", arg4, 1); print_syscall_epilogue(name); -- 2.37.3 From nobody Fri Apr 26 10:25:32 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=gmx.de ARC-Seal: i=1; a=rsa-sha256; t=1663713957; cv=none; d=zohomail.com; s=zohoarc; b=VNFpjwWTytijMMA8IXE3tveodYvreF2Od17VFvtS0Uw35eI3TB7Lqwc7MRpFTfd9a19j0qmfcvY04gJZ7IUnpNlbu39w08q802wxAVo1H7KLQV7J+pJIMs4jdpFB0M8nU8LQ9Rh4pgdAqc/MCPkh6g+O2XRXWUl3k491VKfK18k= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1663713957; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=kyYxL3/CdHZUlz4un+3HbMcVfUuCJuKWycmQW+E4mBY=; b=jnhW3FKdHZbO/hNO04KoBgh3mfOLOTLVgKtNReiRyfmbugDQNKku6nikQCPYmr/32374gyupXQeh8ZkAlKYfRjVGz3LuTWWwJi2SLpHXgWoYonc7KYaOib2T4VAchCCL0GJGyyr6L+Z7v+dx31QdTKr1/TW20UgwLIWuksJJnJQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1663713956625266.9893705777812; Tue, 20 Sep 2022 15:45:56 -0700 (PDT) Received: from localhost ([::1]:49568 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oam02-0005M5-5c for importer@patchew.org; Tue, 20 Sep 2022 18:45:54 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33214) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oah6F-0003zq-Ap for qemu-devel@nongnu.org; Tue, 20 Sep 2022 13:31:59 -0400 Received: from mout.gmx.net ([212.227.17.21]:57563) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oah6D-0003IX-Dt for qemu-devel@nongnu.org; Tue, 20 Sep 2022 13:31:59 -0400 Received: from p100.fritz.box ([92.116.174.94]) by mail.gmx.net (mrgmx104 [212.227.17.168]) with ESMTPSA (Nemesis) id 1MoO24-1p35yV00ue-00okwP; Tue, 20 Sep 2022 19:31:55 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1663695115; bh=eTqsOAZEvSr87I7k2ZocXc4S7Y4RRkoU5ruRaHuVfIs=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References; b=IvzikMhYRAax7tsioVUbkeVF3EkVvzPtRLJ7GsheSgxIdiPmCAPmHpQibD983qUoH ENBCSZqNZdNrTyK1HHWqSrebAg/o8+6oN3jISaxEQyQgcKgEwNdXxly4RZ21xlMneO sFKRQeqws3X3QOwoHkUGr1+FthDTEbsLg8dWQKPo= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c From: Helge Deller To: qemu-devel@nongnu.org, Laurent Vivier , Richard Henderson , Stefan Hajnoczi Cc: deller@gmx.de Subject: [PULL 11/12] linux-user: Add close_range() syscall Date: Tue, 20 Sep 2022 19:31:51 +0200 Message-Id: <20220920173152.199359-12-deller@gmx.de> X-Mailer: git-send-email 2.37.3 In-Reply-To: <20220920173152.199359-1-deller@gmx.de> References: <20220920173152.199359-1-deller@gmx.de> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Provags-ID: V03:K1:u7r0yQYQ7/lVpsZQGKWdXfHn2cep2/o+IoVjdRKMD5aIEKpkhCe X2Jv+jOoh+4MUUq8bsX+tB6hHZ5H2mGEg6ZNF2uISLFPLHyNgl59pN7XG5XhK4SU5YVfMNW yiyvzT5S3y7xWTk+woeTI/9g4PUMoqALLjZ+kzrn6YxUzHBPcb9IHcZgKaGCW4wwU6d+b95 eNXzYYcJNBK5O6iqQBZ4w== X-UI-Out-Filterresults: notjunk:1;V03:K0:g9J0BUo0XvU=:W0myMmJmXQyCpHn6h0lhoz /1JEYb7xSkNckhlKDvoax9EGQsje1yXbPbUEBRl1UdlayAe/iMEYS6RsIfOOMmLXcwF15ImEe A256kjaUVcQDUrCEr1eeMdONPPgNdQiGH+mYbCyBffj/dFwDDyfmbvWbLG2jak9VkCkwTKBNt PoeVcW19LRt+IlcEXeyBnF8eZqzLt7WHIDZ2pOsZi1zKl0hE2qV7mk0BP4z3pLUXP3Xv8pK+Q dISxChd8rQhbxkxtCIPT6tqIjeu+F9YPL3L+C88+xPdYiMsipzJL7ma8m8hbKCmsuZ0Aqy5kT AClz9Ht1JL8DBxDIZoVo2ny9XBfVgyc2OguY58mVVb16a2QsAJMLZWemhkFOyrM5sdcRMLALg je8O+JQ3MVz/m5OvEKOJNcyCi3/sSEwW6MSAS93TmwB1WcnU5n/V411jEz8qbCcLGJaYG4IHa lDGnzRcnOTzkdK1LgdmzXDOq6lRz4POnL6GcNxl+j08YIR5rhLz2eBJINEzq6zUX2rS2NWA+M z2iUIKq4qDILKGVMVlTSbI1qd7tsteFu1oYH5+ql4uaky2qxaAyIzdURTVjvgf0kkq3kFfkl9 c4+O/YQPwWmqrSJ9Q3MYiPYy9LYH6yWGLJTrR38om7kF70pgZDTqXXbOgM07UsdljI4/gU9CA K8hoc1sLjf20aEYKwuqioGWSw6RpJ28PC/92qC8mBrtxOkrjqMzhP96xHxdWPeKP0Rnar6UhQ MBPY22dJeEHoffIUsraN/byds3CxM88mKyolpoIcXWquxwbrnifMHgi9SXL7Qx0twCjRhxhhN eXs3VKjrZEs9ymoBtS9B075znAnDk49Ymru+xK2AB/4m97qtrydEAraIgO/LrNt06n+wa7NXC oek6srfut74hsFNxHHQ5xT3IDMxWlSHUkbw6Z70bBk4Mhdyki3QKwe/ThqAzQoUtdLPzMR6Y8 b6QIxubIGYaRW5FW2SvT826lEE0Fw8GYLInCvSwxwJ0xrP97jTzci937zXkKAcbV9wW55ZoG5 BgvyQriqxQYXLW+J2+puowh3OcZrqLT4x5EUO84gpZs5WHBjlYHeXFzFyX2JjOcO2lUbFSz3Y pifc8g/vlLOojcj9Ls1fzQ+9ZxVnRYI/aoEQrqUyoVE5wDYx0Iq8nx9dcQKza8Hg1h61dHJh1 mo//0= Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=212.227.17.21; envelope-from=deller@gmx.de; helo=mout.gmx.net X-Spam_score_int: -25 X-Spam_score: -2.6 X-Spam_bar: -- X-Spam_report: (-2.6 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @gmx.net) X-ZM-MESSAGEID: 1663713958360100001 Content-Type: text/plain; charset="utf-8" Signed-off-by: Helge Deller --- linux-user/strace.list | 3 +++ linux-user/syscall.c | 16 ++++++++++++++++ 2 files changed, 19 insertions(+) diff --git a/linux-user/strace.list b/linux-user/strace.list index 215d971b2a..ad9ef94689 100644 --- a/linux-user/strace.list +++ b/linux-user/strace.list @@ -103,6 +103,9 @@ #ifdef TARGET_NR_close { TARGET_NR_close, "close" , "%s(%d)", NULL, NULL }, #endif +#ifdef TARGET_NR_close_range +{ TARGET_NR_close_range, "close_range" , "%s(%d,%d,%d)", NULL, NULL }, +#endif #ifdef TARGET_NR_connect { TARGET_NR_connect, "connect" , "%s(%d,%#x,%d)", NULL, NULL }, #endif diff --git a/linux-user/syscall.c b/linux-user/syscall.c index ca39acfceb..2e0e974562 100644 --- a/linux-user/syscall.c +++ b/linux-user/syscall.c @@ -338,6 +338,10 @@ _syscall3(int,sys_syslog,int,type,char*,bufp,int,len) #ifdef __NR_exit_group _syscall1(int,exit_group,int,error_code) #endif +#if defined(__NR_close_range) && defined(TARGET_NR_close_range) +#define __NR_sys_close_range __NR_close_range +_syscall3(int,sys_close_range,int,first,int,last,int,flags) +#endif #if defined(__NR_futex) _syscall6(int,sys_futex,int *,uaddr,int,op,int,val, const struct timespec *,timeout,int *,uaddr2,int,val3) @@ -8721,6 +8725,18 @@ static abi_long do_syscall1(CPUArchState *cpu_env, i= nt num, abi_long arg1, case TARGET_NR_close: fd_trans_unregister(arg1); return get_errno(close(arg1)); +#if defined(__NR_close_range) && defined(TARGET_NR_close_range) + case TARGET_NR_close_range: + { + abi_long fd; + abi_long maxfd =3D (arg2 =3D=3D (abi_long)-1) ? target_fd_max = : arg2; + + for (fd =3D arg1; fd <=3D maxfd; fd++) { + fd_trans_unregister(fd); + } + } + return get_errno(sys_close_range(arg1, arg2, arg3)); +#endif case TARGET_NR_brk: return do_brk(arg1); -- 2.37.3 From nobody Fri Apr 26 10:25:32 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=gmx.de ARC-Seal: i=1; a=rsa-sha256; t=1663711337; cv=none; d=zohomail.com; s=zohoarc; b=WHpuzUWVEgC5jh5CQcgv8wBSLzts/B4ZuaUh2zlkEpl4woghHempbWuWN2NgXzgZPyY0RYHxddfW2sFLHH72fPn5dwG/0LGAH+nsNOAZYfNE5mL4hyDN9RAqC8IfyyMfaeEkaO/4zEOylIhqnn8n9uOOmzvZrxtKJajCUh9tHno= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1663711337; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=roH/tkWQlaK8ZoFaWtgJx1vvKW8Za+SwcdWg6wbUaY4=; b=JyDPIDLH+VZdAu0kfsT4TDHsRdSvztQz6ToyPS6wfQ+0fY3SkDtBNQHSrzMv09iVriZWMvSARxVfN45jvCNdlibHfL0VWPm8UnQ05YWzs68yKRbYnhfY57rOsswG8k3va6WCe+4Z61P0bPGuvauC170Nqy1d24J+Y/+lmEXoI5U= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1663711337878915.6166338215544; Tue, 20 Sep 2022 15:02:17 -0700 (PDT) Received: from localhost ([::1]:58486 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oalJo-0004N4-EI for importer@patchew.org; Tue, 20 Sep 2022 18:02:16 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33230) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oah6J-00047l-R2 for qemu-devel@nongnu.org; Tue, 20 Sep 2022 13:32:03 -0400 Received: from mout.gmx.net ([212.227.17.20]:48285) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oah6D-0003Ib-KF for qemu-devel@nongnu.org; Tue, 20 Sep 2022 13:32:03 -0400 Received: from p100.fritz.box ([92.116.174.94]) by mail.gmx.net (mrgmx104 [212.227.17.168]) with ESMTPSA (Nemesis) id 1Mqs4f-1p51mk0i49-00mq3w; Tue, 20 Sep 2022 19:31:55 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1663695115; bh=roH/tkWQlaK8ZoFaWtgJx1vvKW8Za+SwcdWg6wbUaY4=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References; b=V7GAILFzyVNyTBOq3Ijxj0yr4Nvh338Ceyoba2ZEk+2SJjMyr1z/qvpYrmKfXRkDN jWmrCwRSwgm5BfZKnr7KDr7eweWd734aX54VTanOE/BY7qQNoA6KieSqiol2pZrauv +ZLYGGP4l7VXXLDZ/r3QjwptmcZ0GwGu4oBDqE+o= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c From: Helge Deller To: qemu-devel@nongnu.org, Laurent Vivier , Richard Henderson , Stefan Hajnoczi Cc: deller@gmx.de Subject: [PULL 12/12] linux-user: Add parameters of getrandom() syscall for strace Date: Tue, 20 Sep 2022 19:31:52 +0200 Message-Id: <20220920173152.199359-13-deller@gmx.de> X-Mailer: git-send-email 2.37.3 In-Reply-To: <20220920173152.199359-1-deller@gmx.de> References: <20220920173152.199359-1-deller@gmx.de> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Provags-ID: V03:K1:RB+RQYfaS5qaA7iI5fTBcWlbNOIxBHRIsZ9CWUeQEjGOv54i3ZC eWYrG7Wbbq09tJ+FCjy15eYiV9gDvpKhO5JfVDv0xDDl1NXlQ0c7Ge5eZkeXOwVM26vaEJS DfiUwIla2uQBDFHX55Q9931MLGZGmyVznLShage5TUot/1+sKFGsN36RD9EnUkjEDQ4XNKp I/gJ38y/lRnhu1StfEPxA== X-UI-Out-Filterresults: notjunk:1;V03:K0:5ZpqlhZsQMA=:9YpM7vGm3sc1KvsdyyUSqy /So87o+UrFe2DHamilfe7ZWaH1ZlDyrZhOUxTYMO0hko7/QtAazUHobGM5KL9JzfoAfsaQiwE xNzr3gAQhe1N0lHElETqIqnOwjMcV4nLrAYEIHylwXOykbrL25zcw+djdBSgKJj8A2yz6NzuU yQ9SnyW3M18uBDyN8HpB6A976XtUt3LnGqnIaxDjEMIBkoGRyJNmw/MyUmsn9v8oiRzSjKJhf tuTW9wPgJZXQOhLclFElDHFPtogYdivzV1kZvC379hLRhsBXfVh8h2xOT4dozTm5KGeEEYpx0 PNxGwgGBAvjmuyritH1tbXu4B/eAk3x1OvtgABGrCLjtxRefjFuzqA3TyiQKqL2Povn7cGq87 88jtXPNVSxntM+wbCyISlAqLRQzTTp/C/EbLWCpRTVtjOMyDf+/h/gkfLlGhPPtKwYkvmXXhn PDJ28NQ7ByL/1Uv1V6GvKdRGyEjvh28rV6U32jC90DsBmKYxrWiPYVszqkRGYYBp3DGdh60AD +KfzaBUOt18OwIyla7h0dmB0zesMxVoxNAhvb7p+pz5Qw+OmSk7jPl2OsHyjlXvRvlbON5eEi e9gYzHOwuEC6o3TKewfUbEvrvepQYoj3UtrR2sC4V76gM27+wUbJvsKf9rEmrmKPGqU2BVssH 1B5ZECP2NfK7s5F7wvWsHEXt3SXKg8Z/r1qpRbpvdw7q4pzx6YP/l02Jzin8qZk0WJjrTWBtX 84k+ZeGEnX5tgJWeDDDP4h0SFFllwa93tKQgHcNzpRQ0SHp8HErcg/HWBrirDqY1UL86NgUaq fH9H+cowBZvTrT5hNIO/bOHRadjlD6jTCa1qrt0CuG7OmMeG5exIJs8jN3YxQNGs4rxPAz+a0 8gfgcR9pNuanCO/ltOvcMWphu3+NndTLkJ6Pc9bXggbBZUHo/qSaL1fZppoL45nY5a6doF1wR /MBk8IvOs8mD5NrUmGl4g6gPKlzQ/HODal5qtDS8V51qyihq898Q+6WZjQXbbKPr2tsCTstmo ncPou/F7fx9LJxZ8kpiI3MBLe5I7lnYlmCZZIurKofcgkencVYx7gwXToYBEeftx9btnthc0O FZs3CM1cR0UmnF6m6h3cal370vRXlHtOaz/Y/1n7mq74lQuxo1DDCHUvQtgwukU74gjzogTnR js+1RQx85qhlnfOUavr7GuZXr1 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=212.227.17.20; envelope-from=deller@gmx.de; helo=mout.gmx.net X-Spam_score_int: -25 X-Spam_score: -2.6 X-Spam_bar: -- X-Spam_report: (-2.6 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @gmx.net) X-ZM-MESSAGEID: 1663711339834100001 Content-Type: text/plain; charset="utf-8" Signed-off-by: Helge Deller --- linux-user/strace.list | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/linux-user/strace.list b/linux-user/strace.list index ad9ef94689..97d8ccadac 100644 --- a/linux-user/strace.list +++ b/linux-user/strace.list @@ -355,7 +355,7 @@ { TARGET_NR_getpriority, "getpriority", "%s(%#x,%#x)", NULL, NULL }, #endif #ifdef TARGET_NR_getrandom -{ TARGET_NR_getrandom, "getrandom", NULL, NULL, NULL }, +{ TARGET_NR_getrandom, "getrandom", "%s(%p,%u,%d)", NULL, NULL }, #endif #ifdef TARGET_NR_getresgid { TARGET_NR_getresgid, "getresgid" , NULL, NULL, NULL }, -- 2.37.3