From patchwork Fri May 10 07:15:56 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 163842 Delivered-To: patch@linaro.org Received: by 2002:a05:6e02:142:0:0:0:0 with SMTP id j2csp2007072ilr; Fri, 10 May 2019 00:19:40 -0700 (PDT) X-Google-Smtp-Source: APXvYqwWX6PVzaPCsIN8g7Q4Pcu5yQvQJkdq+z5IcdIqCcNQKbajWb/UcdZrghTQZ7h++vHA4yY8 X-Received: by 2002:adf:dbc1:: with SMTP id e1mr6751871wrj.203.1557472780067; Fri, 10 May 2019 00:19:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1557472780; cv=none; d=google.com; s=arc-20160816; b=UrCgTCInWUKLPDifSM7WAof0BbtsCeiCMr7OYk8X8igAJlwy9wd73LCJndeYapJ+5v sK+A1EimTjtaJhGROGzDLOWq7DF7SEQbJk4BwMmqAxc484wTLMn158hFYpHcoJYVZkVg X10ChKPN3hUrf185733GSJlP+d2ma2ka8WMu9liNFAP8y8PuUuZqcQ13wnXXw2wNUg8Y 3hTd92mSzsfW/gmmwuMzYEOyx3HgdR4B/73LayipFH0cGqocDsFvr9Ko4OSO7TkrEKsx gUhrYeQ5hQJgXEl3YEfLJnboLMEcO1dJHFYf1qc2tHI9ezT1yJA36le/YRzUxiJbJ4bu V1TQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from; bh=BiWS2A+43k0kPne60VuhGRCku7PP2UduexnDqb8ezhc=; b=WG5hNokO0ugKIzvqha/zscvf74z27S9/2ZCwr3mScNQ8HC/gMqSfY+vBcQgHdHFHYx 1VP97eezkSwromuOZhHcyg5sgixiEbfweE99yQOa1qECQMDZyJylariOZmQ3I36Ulqed 7dHwsW6cJbksi7VEuKalMVjeevvSNynl1VH1r0C3XF4d8AjkZ7n2yVSN2YCIpDnIXomi fl55FJ5eN+mo8+1VKWYFjoZt1xoDhXOMcPWVpTk4scd5Czqe6Ye7Pz3nF5VpVBC1t73k 5ITDR2TfGiS+ZExUGcio8ATDcsgchkiYrnUsL1tZ5mUnpCshx1ciB5HXg172EzcJf014 CnZg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org" Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id h14si4008491wrx.1.2019.05.10.00.19.39 for (version=TLS1 cipher=AES128-SHA bits=128/128); Fri, 10 May 2019 00:19:40 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org" Received: from localhost ([127.0.0.1]:38190 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hOzoh-0008An-1k for patch@linaro.org; Fri, 10 May 2019 03:19:39 -0400 Received: from eggs.gnu.org ([209.51.188.92]:49070) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hOzlR-0005lm-FJ for qemu-devel@nongnu.org; Fri, 10 May 2019 03:16:18 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hOzlQ-0001j1-Fc for qemu-devel@nongnu.org; Fri, 10 May 2019 03:16:17 -0400 Received: from mout.kundenserver.de ([212.227.17.24]:36127) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hOzlQ-0001iM-73 for qemu-devel@nongnu.org; Fri, 10 May 2019 03:16:16 -0400 Received: from localhost.localdomain ([78.238.229.36]) by mrelayeu.kundenserver.de (mreue109 [212.227.15.183]) with ESMTPSA (Nemesis) id 1MNKuK-1h5qLV3Xj8-00Opf7; Fri, 10 May 2019 09:16:08 +0200 From: Laurent Vivier To: qemu-devel@nongnu.org Date: Fri, 10 May 2019 09:15:56 +0200 Message-Id: <20190510071557.30126-7-laurent@vivier.eu> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190510071557.30126-1-laurent@vivier.eu> References: <20190510071557.30126-1-laurent@vivier.eu> MIME-Version: 1.0 X-Provags-ID: V03:K1:hpNSk8jCFA1gGs/HUMOgsJ+gKep+ZKMO7Go9f1u9v+bd64gSuHe Fhn4mtwWDfPfWJcxVMpwuoYm+RC2x2HQ963dagxHtlgrSHDZrXnNXp34cUo1HD4sqOtzCyg jlLxfd3yCYix9zzdkUkKsmxdGh5xcVDNUrv8yIQBpbSg5wC5H092uDcbDyn7sts22W6FE5F q+zrduuayQxqbp9ii1nww== X-UI-Out-Filterresults: notjunk:1; V03:K0:+LoJWPF+eIs=:W9XGFgsfveehGrK7iGXTE4 xxAHNVumVxtkTyt04QT+1o3JWnRxhu+c2l9eRtluyseIunuP52ZdA/PlHUsk6eOeSxGZg1swF c+1AiLTAgIjWTpQMn9ss/rAJtfOAHDAVPi40v7egnW8lQRoqE+G2I9IgBCZCDrRnyOCgrndrx ioUDuwk9Xz3w5fKVZRLE/NrDUm3M5LVscIMqqXMYtg2G5l5fcTFXg8yDJmHRR4aV7nZC/ISvs aJjIdFrQkUT26IYAv6MgwKYG8BX3cYc0Q/gb71juagTng9lswdXVtNRYBZTXfiAlbtQSo83vB RNKihDzN8BOJotnKMXWUyVRhKYr5C4vv/2YqLwLU2muBLLyWO5qcWiYSV/N24mm7lR4B7xD4i Jrxj4VRVL97YkYrVaPB4zhu5c5uUX4bkdI/KMekKE0I4AsgGNhEPFIAGaf0cHBtYTFo6HbKEY q+fYx6arJN16A+r/x8LA9wEmIqx5Xi+WxzyDilaSAd9geIAFj5Wo7PWCosK+Ik7j7vqDR3Q9E YqG6aF04CiRhQ+Vxy6GenbPFP86I4M+/itD57E/NJvaVu9qSIlhsbbinRI++DiNkOfEO7jL8u AmO+cvbfj9+i+gGoPEvG+tKR+lDy5y79H//eDSQe/iZinWl86OHf2wRfVXDgwuRZcERvBZhAO t4OMSFZdRe95IktdY4uCraMyVl3f2F6v5OT0JarBn/uyPSFl60xDLV63fQrM2mTWTw4px22qN nqc4IFFw73Mrep4dKf3kKziSbT50+pHKq1gTmkgEDg0xx/XoxRLqypf6j/g= X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 212.227.17.24 Subject: [Qemu-devel] [PULL 6/7] linux-user: avoid treading on gprof's SIGPROF signals X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Riku Voipio , =?utf-8?q?Alex_Benn=C3=A9e?= , Laurent Vivier Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Alex Bennée The guest tends to get confused when it receives signals it doesn't know about. Given the gprof magic has also set up it's own handler we would do well to avoid stomping on it as well. Signed-off-by: Alex Bennée Message-Id: <20190502145846.26226-1-alex.bennee@linaro.org> Signed-off-by: Laurent Vivier --- linux-user/signal.c | 5 +++++ 1 file changed, 5 insertions(+) -- 2.20.1 diff --git a/linux-user/signal.c b/linux-user/signal.c index e2c0b3717357..44b2d3b35a0d 100644 --- a/linux-user/signal.c +++ b/linux-user/signal.c @@ -508,6 +508,11 @@ void signal_init(void) act.sa_flags = SA_SIGINFO; act.sa_sigaction = host_signal_handler; for(i = 1; i <= TARGET_NSIG; i++) { +#ifdef TARGET_GPROF + if (i == SIGPROF) { + continue; + } +#endif host_sig = target_to_host_signal(i); sigaction(host_sig, NULL, &oact); if (oact.sa_sigaction == (void *)SIG_IGN) { From patchwork Fri May 10 07:15:57 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 163841 Delivered-To: patch@linaro.org Received: by 2002:a05:6e02:142:0:0:0:0 with SMTP id j2csp2004750ilr; Fri, 10 May 2019 00:16:42 -0700 (PDT) X-Google-Smtp-Source: APXvYqxLeDf8O10NOTjMTardLsSjKLw+WBFW6gUL05CALX0hnwlZBJETyFBNWZbN3ZhlVtpVDWxM X-Received: by 2002:a5d:54cc:: with SMTP id x12mr6541759wrv.303.1557472602064; Fri, 10 May 2019 00:16:42 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1557472602; cv=none; d=google.com; s=arc-20160816; b=K+03jjQF7Zwu+gfRDa2+LylydwTxZZ9G2EkxuIk7E53ffd3RKMQ4qk05uNZvnYw+57 rZ5HaqpqpLYnTL4+PmE5C5K8T/j757ZSMNSo3S7qakEaVXg44RIeE3hZM+ASpIBGF8H6 bXvMXGN5KpcsPMLZBU8g61w2kEvclBhtQxHShCXCnC1nEuQCZFFGWJpKV65b2oai7GzR K/lEsIKxW5b/d7tPW5YK5k2PSxP92vthvl6Ubk1aAcaAtC3rn6KX8RrZNGMyI+ucWu34 lGJmYj4dKSmierfmjBrPpRoKWDAXSQhJfS88yEta89aniVgTbr0YBFjvAEIj25cZ/ZKg 7Z1A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from; bh=iWtD9ZffYzuDD6U+PoeZ6pa5zyFC4QoWf8a0o7NKL5c=; b=RvGi3mbQg8WO9vmkLkZajhNajQtkQX5tKQ5Rrbg756+rsG3Em2E/aAyeF+irVJlk9d b+PFhXbf/KerA4tZMH1pTs43P9AAle/Cnpj3vtGZUBFBwfullB3yL/FCTCFUV4LXyeyU 1HW1KI++Ve/05yytWvUfO3BeIUMYpJssT1ZdiOhW5gj73yvdmwebYJfjyT/5k0lLmFyg PneMJtzFX9p1uEODY3fwn+JKxs7Go44pExDxPK9M7kkuL7bLTS5Wouyp3z5skvmxGBHI IkoFtgWnlumfARbo8jbdN8BksF4LRl7smFPR3f41/E3qJ9HfY27Zt6uE4C3R4FnP2sTs H5iA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org" Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id y8si2918724wmd.191.2019.05.10.00.16.41 for (version=TLS1 cipher=AES128-SHA bits=128/128); Fri, 10 May 2019 00:16:42 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org" Received: from localhost ([127.0.0.1]:38164 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hOzlo-0005jC-U2 for patch@linaro.org; Fri, 10 May 2019 03:16:40 -0400 Received: from eggs.gnu.org ([209.51.188.92]:49040) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hOzlL-0005hW-Uy for qemu-devel@nongnu.org; Fri, 10 May 2019 03:16:12 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hOzlL-0001gB-4H for qemu-devel@nongnu.org; Fri, 10 May 2019 03:16:11 -0400 Received: from mout.kundenserver.de ([212.227.17.10]:58619) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hOzlK-0001fd-RL for qemu-devel@nongnu.org; Fri, 10 May 2019 03:16:11 -0400 Received: from localhost.localdomain ([78.238.229.36]) by mrelayeu.kundenserver.de (mreue109 [212.227.15.183]) with ESMTPSA (Nemesis) id 1N1Oft-1gjefj1bUR-012tSC; Fri, 10 May 2019 09:16:08 +0200 From: Laurent Vivier To: qemu-devel@nongnu.org Date: Fri, 10 May 2019 09:15:57 +0200 Message-Id: <20190510071557.30126-8-laurent@vivier.eu> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190510071557.30126-1-laurent@vivier.eu> References: <20190510071557.30126-1-laurent@vivier.eu> MIME-Version: 1.0 X-Provags-ID: V03:K1:XzJq04w+5M3m2BSeE6X/5R7ET+xs+0l4O0ib+jrUACU8+B1n9xN J69RSVffYV0Tyt+Y0MewNajtzss6nVbO94XYCGrhhkmFYoMOc5z1GPzuaST4HJ5xTY0oMzt Ug1fTCMUIj8fGYYQc8f6I0TLMZ+56kVDVgaQERH1SKIyzgOcj4lUH49KWmnQKOjp86QfQpf PXZjUTmiUInV4x5p+1tiQ== X-UI-Out-Filterresults: notjunk:1; V03:K0:h2wjnWxYZd0=:tlCZ9Szuf0tdY4wTA7ZyIP pHg33CnZoW6KFUqhR3J3CrfeKicCt+fGkh7UwYjvDZqwz/rUNO/MMLejzEFM4kBXW3dLGOvTl fAN2bwwteJ2WDVqcvhoMPGOssQeFcK+t7jGJrMTlHlRDqXmOgdPCe6IbkbXGsBotYUvMB96+T gdIXAEpQsk8xbYJzQ0lkGcTjdpOfJNXJ62zm5rDhlBn4Np3FGn5xAVDr6Otd80plB43oOtmij lTZNiufFC7UpQe02M9LKm7iQZvGIMohUWZFDbZ56k8RB1j0HIZ3VHYwnMF8qoEHnRJWoe4rcl TASpQHAZIcumem+0iquEeSPMWURO1PAuufbhmMnka6WbUOXCZoKJBAiP9TM+ZR2zTz3HLw5S1 EqIKx9RQus2YYc49stP1twXRjIPUIb2CyTiv39uoknyhVC9aTSskPzo+JiZaYTk/n63Uh/Lef wrq5/j/0M9XdKNBkjBSlKB8rBqBhAimQzduhaBPNdhc2IIKvfE+n6lEoEYzo8jqcni49/6ERh b2dW4X7uRdFbhAEwaG68orhqkucEJA5BfySujiXlj+6MC726MNp+E6hUnW8YBLNSvKgUtxKpS yDixn/kZ4V4mUv8bCBSsKJGBzcOn3MeWWm3O/PoZdCTPd2kVh5EobAbsNik5wKuWeNnCgHtVm iP4rbkN5FFcXB1VXleFQQD0xe7gxj89b36HHHro+zU762HABjr5lhW69vdooBoAZPcAJzm4sk KCK8jVopG+nvD+PFFX4qhANaPcguS3rIMI/MFL4Jzxzqzq8pkoLLtjSu3Vc= X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 212.227.17.10 Subject: [Qemu-devel] [PULL 7/7] linux-user: fix GPROF build failure X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Laurent Desnogues , Riku Voipio , =?utf-8?q?Alex_Benn=C3=A9e?= , Laurent Vivier Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Alex Bennée When linux-user/exit was introduced we failed to move the gprof include at the same time. The CI didn't notice because it only builds system emulation. Fix it for those that still find gprof useful. Signed-off-by: Alex Bennée Tested-by: Laurent Desnogues Message-Id: <20190502092728.32727-1-alex.bennee@linaro.org> Signed-off-by: Laurent Vivier --- linux-user/exit.c | 3 +++ linux-user/syscall.c | 3 --- 2 files changed, 3 insertions(+), 3 deletions(-) -- 2.20.1 diff --git a/linux-user/exit.c b/linux-user/exit.c index 14e94e28faf8..bdda7205532e 100644 --- a/linux-user/exit.c +++ b/linux-user/exit.c @@ -18,6 +18,9 @@ */ #include "qemu/osdep.h" #include "qemu.h" +#ifdef TARGET_GPROF +#include +#endif #ifdef CONFIG_GCOV extern void __gcov_dump(void); diff --git a/linux-user/syscall.c b/linux-user/syscall.c index 44b593b81161..f5ff6f5dc8a8 100644 --- a/linux-user/syscall.c +++ b/linux-user/syscall.c @@ -59,9 +59,6 @@ #ifdef CONFIG_TIMERFD #include #endif -#ifdef TARGET_GPROF -#include -#endif #ifdef CONFIG_EVENTFD #include #endif