From patchwork Fri Jun 5 11:46:43 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 281304 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE, SPF_PASS, URIBL_BLOCKED, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id A865EC433E0 for ; Fri, 5 Jun 2020 11:48:31 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 812272070B for ; Fri, 5 Jun 2020 11:48:31 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 812272070B Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=vivier.eu Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:60940 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jhApq-0001jC-IZ for qemu-devel@archiver.kernel.org; Fri, 05 Jun 2020 07:48:30 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54796) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jhAoe-0008Bn-2O for qemu-devel@nongnu.org; Fri, 05 Jun 2020 07:47:16 -0400 Received: from mout.kundenserver.de ([212.227.17.24]:37155) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jhAoZ-0006hV-FG for qemu-devel@nongnu.org; Fri, 05 Jun 2020 07:47:15 -0400 Received: from localhost.localdomain ([82.252.135.106]) by mrelayeu.kundenserver.de (mreue106 [212.227.15.183]) with ESMTPSA (Nemesis) id 1MORR2-1jJakS2Lfi-00PwS1; Fri, 05 Jun 2020 13:47:02 +0200 From: Laurent Vivier To: qemu-devel@nongnu.org Subject: [PULL 02/19] linux-user: return target error codes for socket() and prctl() Date: Fri, 5 Jun 2020 13:46:43 +0200 Message-Id: <20200605114700.1052050-3-laurent@vivier.eu> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200605114700.1052050-1-laurent@vivier.eu> References: <20200605114700.1052050-1-laurent@vivier.eu> MIME-Version: 1.0 X-Provags-ID: V03:K1:GslVJEoSAb5CAZu2Hhc+gEIgvNCar4tstMInCj1qUerLfWfrvTm ejB3GkORYT8WWiAl6tchNwbQRC9mquFGW86XoNNps+S+6BycESLJtFX1gxON+eTb/W4GZOa GJM8jVJDTqEW//phqe2XRGWny4GdCdNvZTc+G9bEydgbkIwK1AIMM3UvP3Lan6Bpcv2OikV v7X+7ZJGBxhcgCXl4cukw== X-UI-Out-Filterresults: notjunk:1; V03:K0:Rovagd2TDYk=:ElE5WBbd2E7lFSXVhKt80I QWU57HULLujUQoeqoVuV2aMpG94TbMakb1eJb2Y1QCzhMh5k+PUa6tDy/h8vI9xBsd+5VdiK0 odM93lIgfct0pQW7U4wNTGIP71VmR+xnOcRVVhcdWCL4qD6bC5V40S1EAyhRgA5IYvXOqqkND 6NnYLwbb1SiHvsWSFxQvH0B3HXm4VbderqPLLKIwg8XhzSN9/FLYdPxKtAzr6lM3PmlPh9Iqg oK17YozI2G3b4hDnFgcmCwnlE7QQXembm0/Er7vmZIlznfAmbB8fUIt8m8Xc3JkolzaxqZluU txiwEPX41WlqN6X7jQk88a4yPPX+F+CKrwaOSKCBuGyPuolO26DZ0SZ2L+uOVxDF7ozWLILQO IWk0QiMgolsXD9m3gVweqsMEioXf00raQVCskzciOMCsS2znO3ys8G73KL3JKe8w5VehgQIIM M2Hvy2bQnZEHHtBQ3LucZlEGik2pivMzPTlmFk23uqYfzIhb+RMG81Wx5r4Wweg7mYsMyuL3f SN/uYkXgRjNBQAynf4sj4k8a65PMOSdWxTvR2q2I46cnUGFX5hPm/h6lDd1Tcxx6fHCXUUs00 QtyW5n/gPcOrbBS0Gv9uGOmDAOjRNzIUCCuakJvb+0x9P2mQu9fo/wXpuhMprVWexI8/wKLgG s7rhDCFNtzHAylr8ehC1Cst2c0vGsjM3jUixd0FSXJr6avQpl6btSwjjkHmUu2sHHQ1Y24aI2 XVgaCBjY0ECbjfKOgkygP+CaOTvydlLxHoI1zLsGVDXTM4RJZjU0XqdOzv7zWFqf6kjrfngBl cSc16pd6ctEqvHPWw0KK7hjuuqW0NxLUW/lHu73fWqmUoLzgSCoWQ47adgloGmlUOoVRxm4 Received-SPF: none client-ip=212.227.17.24; envelope-from=laurent@vivier.eu; helo=mout.kundenserver.de X-detected-operating-system: by eggs.gnu.org: First seen = 2020/06/05 07:47:04 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, URIBL_BLOCKED=0.001 autolearn=_AUTOLEARN X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Helge Deller , Riku Voipio , Laurent Vivier Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" From: Helge Deller Return target error codes instead of host error codes. Signed-off-by: Helge Deller Reviewed-by: Laurent Vivier Message-Id: <20200424220033.GA28140@ls3530.fritz.box> Signed-off-by: Laurent Vivier --- linux-user/syscall.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/linux-user/syscall.c b/linux-user/syscall.c index e89b815ce983..fd5c4f1d73e6 100644 --- a/linux-user/syscall.c +++ b/linux-user/syscall.c @@ -2987,7 +2987,7 @@ static abi_long do_socket(int domain, int type, int protocol) #endif protocol == NETLINK_KOBJECT_UEVENT || protocol == NETLINK_AUDIT)) { - return -EPFNOSUPPORT; + return -TARGET_EPFNOSUPPORT; } if (domain == AF_PACKET || @@ -5856,7 +5856,7 @@ static abi_long do_get_thread_area(CPUX86State *env, abi_ulong ptr) abi_long do_arch_prctl(CPUX86State *env, int code, abi_ulong addr) { - return -ENOSYS; + return -TARGET_ENOSYS; } #else abi_long do_arch_prctl(CPUX86State *env, int code, abi_ulong addr) From patchwork Fri Jun 5 11:46:44 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 281302 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE, SPF_PASS, URIBL_BLOCKED, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id CEDB5C433E0 for ; Fri, 5 Jun 2020 11:50:36 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id A73DE2063A for ; Fri, 5 Jun 2020 11:50:36 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org A73DE2063A Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=vivier.eu Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:41226 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jhArr-0005GA-Tk for qemu-devel@archiver.kernel.org; Fri, 05 Jun 2020 07:50:35 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54814) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jhAoh-0008EO-AC for qemu-devel@nongnu.org; Fri, 05 Jun 2020 07:47:19 -0400 Received: from mout.kundenserver.de ([217.72.192.74]:47031) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jhAoc-0006hs-6t for qemu-devel@nongnu.org; Fri, 05 Jun 2020 07:47:16 -0400 Received: from localhost.localdomain ([82.252.135.106]) by mrelayeu.kundenserver.de (mreue106 [212.227.15.183]) with ESMTPSA (Nemesis) id 1N9M1q-1iw2E70Wd2-015Mnb; Fri, 05 Jun 2020 13:47:03 +0200 From: Laurent Vivier To: qemu-devel@nongnu.org Subject: [PULL 03/19] linux-user: Add support for /proc/cpuinfo on hppa platform Date: Fri, 5 Jun 2020 13:46:44 +0200 Message-Id: <20200605114700.1052050-4-laurent@vivier.eu> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200605114700.1052050-1-laurent@vivier.eu> References: <20200605114700.1052050-1-laurent@vivier.eu> MIME-Version: 1.0 X-Provags-ID: V03:K1:6FKR7BFmLWvONieLKooI/cFR3vSkQZjLovPt6wp+OvviqGHwlwg mxipksbbzyxPoxGkJ9oJV3UZ3xOgh1K+GhlJdSbho2Id4JZr9bcCzGvMN+NK+WfF7qA1Dkq rQJ6XEWPJUtQfb0HvF1SCGfVrbCNrJvLmHgJs4m5zjhzteevdSKVPKEizlHlcQEm3vOC0JM ZfipMMOtIAdRpj5ibDs1w== X-UI-Out-Filterresults: notjunk:1; V03:K0:yYrgXEeJ9NI=:9tMpixFJ2/l3b+fM3lay8L JOovTyrm+c0HbhiVAv4/nzGO8jnH0UMmd+pMCC3liovQqrig/OrLYbMlSshYKbq/80Mtw8fHm 3N4iZCM2SngmpOmTm+l9IpaiA4qvK2oQ4H8pM2RwIG7xV/7yCQUwCuqEjfqKsjkK2NaLXUjMH Q2mVxbnCAc2hItcVHBenxm5AZpmrmCjPrf81NovZeU0J93H2tUr4gzpe4bZRpoCkHhXUNK/FV Iv2A/khK2LiRIxLq426qWSmjTikrUJkQpkV5cJJG5ThAZHQzBD/VxSmdrSNgPzQyZS3LlxSt+ to+RVJq9WNtWwZ77jS4pOiQ/4W1DPVWzZ4FDX1UYJTu4waW+PJnI4UjP1NvSa2jt+FU+MyjDg JkH8DbOy6sAMj/DcLY9veL4uxNRul6QTpx6IUbnL/TiWxItU/ivotuXKIJSGsgSH7rUN/3wlU GADgG20/CbW8rAU++PwsO1KCxXUg2fOhJmJCmD9SEoThRfNVvu5OBdXb/CPAa0iAawVLb5j2n kbTVhFLOavko9k+TL0ovUckEa3IMQAHs2Uy4+5TZ8XxkAcBJCqmOQykyVyRgHOSwXykhm5klB SHOfMiYFKut7soDDO93RKpHDd0C6V/4XCVCPScbotGmYdYwkbPs/PwS5XCwbk8T1NfaDFkEXC Ys6r0ePcjm/QplPMQR6fPcVE1++hUD3bOV7sIxPbF4sv9O1IYI7b37hNV38ujr2V/eDDRQWh2 F1wOtDIB5UDsHm5N/MxLXeUZxWioiHcXobDDlTUcfv36CzbaSJBAvUeyhQhChYdbCnbekEQ3o ioMeZqZrW2eo4cQ8Hbv0HiqM8McyaItEkFWeDzfz+0b4CRHXsEKh5rZ4rRBvexZuZG39V8s Received-SPF: none client-ip=217.72.192.74; envelope-from=laurent@vivier.eu; helo=mout.kundenserver.de X-detected-operating-system: by eggs.gnu.org: First seen = 2020/06/05 07:47:11 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, URIBL_BLOCKED=0.001 autolearn=_AUTOLEARN X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Helge Deller , Riku Voipio , Richard Henderson , Laurent Vivier Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" From: Helge Deller Provide our own /proc/cpuinfo file for the hppa (parisc) platform. Signed-off-by: Helge Deller Reviewed-by: Richard Henderson Reviewed-by: Laurent Vivier Message-Id: <20200424210648.GA26715@ls3530.fritz.box> [lv: s/an/our/] Signed-off-by: Laurent Vivier --- linux-user/syscall.c | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/linux-user/syscall.c b/linux-user/syscall.c index fd5c4f1d73e6..63c40c48e31f 100644 --- a/linux-user/syscall.c +++ b/linux-user/syscall.c @@ -7438,6 +7438,18 @@ static int open_cpuinfo(void *cpu_env, int fd) } #endif +#if defined(TARGET_HPPA) +static int open_cpuinfo(void *cpu_env, int fd) +{ + dprintf(fd, "cpu family\t: PA-RISC 1.1e\n"); + dprintf(fd, "cpu\t\t: PA7300LC (PCX-L2)\n"); + dprintf(fd, "capabilities\t: os32\n"); + dprintf(fd, "model\t\t: 9000/778/B160L\n"); + dprintf(fd, "model name\t: Merlin L2 160 QEMU (9000/778/B160L)\n"); + return 0; +} +#endif + #if defined(TARGET_M68K) static int open_hardware(void *cpu_env, int fd) { @@ -7462,7 +7474,7 @@ static int do_openat(void *cpu_env, int dirfd, const char *pathname, int flags, #if defined(HOST_WORDS_BIGENDIAN) != defined(TARGET_WORDS_BIGENDIAN) { "/proc/net/route", open_net_route, is_proc }, #endif -#if defined(TARGET_SPARC) +#if defined(TARGET_SPARC) || defined(TARGET_HPPA) { "/proc/cpuinfo", open_cpuinfo, is_proc }, #endif #if defined(TARGET_M68K) From patchwork Fri Jun 5 11:46:45 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 281301 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE, SPF_PASS, URIBL_BLOCKED, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id A766FC433DF for ; Fri, 5 Jun 2020 11:51:03 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 7B0652063A for ; Fri, 5 Jun 2020 11:51:03 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 7B0652063A Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=vivier.eu Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:43540 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jhAsI-0006Dd-L2 for qemu-devel@archiver.kernel.org; Fri, 05 Jun 2020 07:51:02 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54882) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jhAoo-0008Nx-73; Fri, 05 Jun 2020 07:47:26 -0400 Received: from mout.kundenserver.de ([217.72.192.75]:44051) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jhAom-0006mc-MZ; Fri, 05 Jun 2020 07:47:25 -0400 Received: from localhost.localdomain ([82.252.135.106]) by mrelayeu.kundenserver.de (mreue106 [212.227.15.183]) with ESMTPSA (Nemesis) id 1MILnm-1jmcql07nw-00EMdf; Fri, 05 Jun 2020 13:47:07 +0200 From: Laurent Vivier To: qemu-devel@nongnu.org Subject: [PULL 04/19] linux-user/strace.list: fix epoll_create{, 1} -strace output Date: Fri, 5 Jun 2020 13:46:45 +0200 Message-Id: <20200605114700.1052050-5-laurent@vivier.eu> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200605114700.1052050-1-laurent@vivier.eu> References: <20200605114700.1052050-1-laurent@vivier.eu> MIME-Version: 1.0 X-Provags-ID: V03:K1:CGhHXAc2i7kqOHRCZsc0t4kcXx+63+sWpGTRZu3br4h8jHywjym l6i8R3CQ74MFoNwzwQHR8TbFwLf8shwAMm0JdAoZIyMuJJIv2f3CzfUi5y3LpDSqN1b+Y0E 9+/BgF0XvdseStT4xSWMJY2m7pd/yc/HIig5mAMEaTK3oCtvYhuKhWSyX3m5mGp9l/ES/aT 0sUFSw2eAVgNJVUnzkr1g== X-UI-Out-Filterresults: notjunk:1; V03:K0:pxSAJMT5SRY=:uTJzpIGbieBpkBn3I1BBEM cCSMckUDkci6qJ8IxWayHnBo142FK1L8xuzTA5Fex2sO9aRajPj7gu3D9A7fG2l2MFcVK5tEh gYczV88N0DY6fCbN52xkKbMCPPzxb+8nHNtuppkYw7Fd5uIeTjnp2k7er3aFUtAy15po5wi+G jS4sivP91UJA8SSdzazqCLsJjnVHizFdmXE+j106BydICUsTG6HtYYg5YwZOGA7V3hxfsLQR7 oX6ueoWZvYkZtobo3DLoe4efxu+5ieJjdb+ZFOyrm0fnNqkAoUPEUQK+sHFm+eW54Yd8lL/Ut GRiljo0dUzDMjB3O+W9AQuKvRrM9t2J5F/SctVx9RDKiZ3LezFM2CYbyxaBOk751dMRvf8ova 2ZXVOFE3RUpNRdy2rxP2ZxvEu3Jtk/MCtN+wR7TwmGvcFZHzk0rK//fnkqVD5o4I9llC9VLKJ vVCmhcUP2iljwcFTXGNTE/I+hL8LBkOZ9uDslFohdX5Kv5w5aYgU+n09jeYG/KKiCAjZlgl8U omW+DytrFvc6L0xG10R2wuJG5yBBm0Brd84RpLpb0HKUtKYNZukNmk01lABGACrsx3Ath9bmq wC959SHWOP/oirUUu9aFbDKZV4kSEgR/D5uJrxw8pe9CB2gT4MGiay1XV3IaVMGVpi40LjT1a zbAJrc4VK04yRLCGRBQ7/2jW2NM6we4R0HiPnPcUP0umRzb49j2tuolM2nVo5HdFoD2/KJa+c 0BQ3JaDxqfERjhWxUr4/FGrmFtQxG6C+9ekS3skGWWot3cxVYpdF642e1zKv0rAZPN7Z7pvnG IYkcU3ojFoJtifcbpfLZH23uiLWYHLEo1JE+KVQuBSYNR5Iq/+ac2zQDUS7RoB8xEG1KrGx Received-SPF: none client-ip=217.72.192.75; envelope-from=laurent@vivier.eu; helo=mout.kundenserver.de X-detected-operating-system: by eggs.gnu.org: First seen = 2020/06/05 07:47:15 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, URIBL_BLOCKED=0.001 autolearn=_AUTOLEARN X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Riku Voipio , Laurent Vivier , Sergei Trofimovich , qemu-stable@nongnu.org Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" From: Sergei Trofimovich Fix syscall name and parameters priinter. Before the change: ``` $ alpha-linux-user/qemu-alpha -strace -L /usr/alpha-unknown-linux-gnu/ /tmp/a ... 1274697 %s(%d)(2097152,274903156744,274903156760,274905840712,274877908880,274903235616) = 3 1274697 exit_group(0) ``` After the change: ``` $ alpha-linux-user/qemu-alpha -strace -L /usr/alpha-unknown-linux-gnu/ /tmp/a ... 1273719 epoll_create1(2097152) = 3 1273719 exit_group(0) ``` Fixes: 9cbc0578cb6 ("Improve output of various syscalls") Signed-off-by: Sergei Trofimovich CC: Riku Voipio CC: Laurent Vivier Cc: qemu-stable@nongnu.org Reviewed-by: Philippe Mathieu-Daudé Message-Id: <20200416175957.1274882-1-slyfox@gentoo.org> Signed-off-by: Laurent Vivier --- linux-user/strace.list | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/linux-user/strace.list b/linux-user/strace.list index d49a1e92a80e..9281c0a75828 100644 --- a/linux-user/strace.list +++ b/linux-user/strace.list @@ -125,10 +125,10 @@ { TARGET_NR_dup3, "dup3" , "%s(%d,%d,%d)", NULL, NULL }, #endif #ifdef TARGET_NR_epoll_create -{ TARGET_NR_epoll_create, "%s(%d)", NULL, NULL, NULL }, +{ TARGET_NR_epoll_create, "epoll_create", "%s(%d)", NULL, NULL }, #endif #ifdef TARGET_NR_epoll_create1 -{ TARGET_NR_epoll_create1, "%s(%d)", NULL, NULL, NULL }, +{ TARGET_NR_epoll_create1, "epoll_create1", "%s(%d)", NULL, NULL }, #endif #ifdef TARGET_NR_epoll_ctl { TARGET_NR_epoll_ctl, "epoll_ctl" , NULL, NULL, NULL }, From patchwork Fri Jun 5 11:46:49 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 281297 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE, SPF_PASS, URIBL_BLOCKED, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 25D0FC433E0 for ; Fri, 5 Jun 2020 11:54:37 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 000002063A for ; Fri, 5 Jun 2020 11:54:36 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 000002063A Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=vivier.eu Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:33790 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jhAvk-0005Vg-9F for qemu-devel@archiver.kernel.org; Fri, 05 Jun 2020 07:54:36 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54866) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jhAol-0008Jw-37 for qemu-devel@nongnu.org; Fri, 05 Jun 2020 07:47:24 -0400 Received: from mout.kundenserver.de ([212.227.17.24]:36931) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jhAoh-0006jF-1U for qemu-devel@nongnu.org; Fri, 05 Jun 2020 07:47:22 -0400 Received: from localhost.localdomain ([82.252.135.106]) by mrelayeu.kundenserver.de (mreue106 [212.227.15.183]) with ESMTPSA (Nemesis) id 1MTikV-1jXb6W2aez-00U52w; Fri, 05 Jun 2020 13:47:09 +0200 From: Laurent Vivier To: qemu-devel@nongnu.org Subject: [PULL 08/19] configure: Avoid building TCG when not needed Date: Fri, 5 Jun 2020 13:46:49 +0200 Message-Id: <20200605114700.1052050-9-laurent@vivier.eu> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200605114700.1052050-1-laurent@vivier.eu> References: <20200605114700.1052050-1-laurent@vivier.eu> MIME-Version: 1.0 X-Provags-ID: V03:K1:hjUC/xLjH0YaY+x4xTptgEWCI6ojMy6nXlGlI1vlOqTTpkEoa5R 0gduAp5J6Bz5Rv4u5rLf6j/R2VUKi+1XBu6ivWOZxAZt577MBdeOnJ0Vy8NPxyuda652cuL qfv/WwG3+kxvEQkzXS8bpNwLkcfd993HXvUUFmtsvVTIMJBFO/VTinWNJzF9l78GnqFTd9O ASWoUr/cFWdIT9RFpE9xA== X-UI-Out-Filterresults: notjunk:1; V03:K0:DsEViz2dYBs=:kqsQQVRlVN+bLVvRqfp+cJ Ql783gKSipkHTfS1IcIn5Z+MVxLfCu+lr/VHxWnGf5SwAp93/f1xjrIlW0rKamMelHnxpX6HF BNVoZOpp6YDCGX18qSJwNp/lJnFgG32uEFVvV6vID5QaoVbZPl+NWVJPw4g23Ysusia07O7Xk SNCLxLOz5z0KAVlGDGI9NJcihWj/UZdZE1902+uLyRIL07ExPTO7lqd04lR+b+t0tF3x59niC rVwirIfueVZykHQaFCsDD2lpPqze3SV5ltmiTeVArIKaRk5ccPLsh2hdhnneN+7LOl8iHGPHr WNTxqZXBscSJeWQjFT5SxK6EclCq4nk0b14Ux+JVUT9Qe++rnUgZakFI+fiHeEd9/rTkhBCix NU9xuLtHut30k9uug23CuJz47qAxUHq/XLDFvkDmYOS4Gcz7xdY4SzxQSfgHmz3cghmCkl8vb 5UCz2VXrE/Uy1jiMt9gOYp+LupJZs7YROJhSu0ge4sHy182homHXUrHqkGBdynk9Zuy54zbNI zQeuhWPazcTVccGEVJ6ykrbDmo/sM8lS2wuUQ6byuX1NHMxeysAEouAEMPWiPwYkBScFv3gv6 3gCBVpPXtkncJ8M6uWvs0p4eDDlmhJXCtgBJqhEBtn0uSORpQ8lezCNGMXqAb7vsVj6r6cb9Y TaFCupf9ttUj3v2JnIue1cyIop6K6ei2e1aLja0qm3JCeJn83GN9CE9WdFSGIz5ZixhXdd6N9 N75PexIqAQzX09N0qBQI7nKhj9YhZXpG0mr2lmKvTYarClF4aA9lb/521NOC5tv+GsQpLmq41 mxCQt7fxetYjLwGlpserS8ux4pYGBSefvgEWw9lF6SOOsJaaWaLbBHtHlGt4YomejHC24vc Received-SPF: none client-ip=212.227.17.24; envelope-from=laurent@vivier.eu; helo=mout.kundenserver.de X-detected-operating-system: by eggs.gnu.org: First seen = 2020/06/05 07:47:04 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, URIBL_BLOCKED=0.001 autolearn=_AUTOLEARN X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Richard Henderson , Alistair Francis , Riku Voipio , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Laurent Vivier Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" From: Philippe Mathieu-Daudé Avoid building TCG when building only tools: ./configure --enable-tools --disable-system --disable-user This saves us from running the soft-float tests enabled since commit 76170102508. Reviewed-by: Richard Henderson Reviewed-by: Alistair Francis Reviewed-by: Laurent Vivier Tested-by: Laurent Vivier Signed-off-by: Philippe Mathieu-Daudé Message-Id: <20200522172510.25784-3-philmd@redhat.com> Signed-off-by: Laurent Vivier --- configure | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/configure b/configure index b969dee675bb..fccc56bd4d1f 100755 --- a/configure +++ b/configure @@ -1663,6 +1663,10 @@ if [ "$ARCH" = "unknown" ]; then linux_user="no" fi +if [ "$bsd_user" = "no" -a "$linux_user" = "no" -a "$softmmu" = "no" ] ; then + tcg="no" +fi + default_target_list="" mak_wilds="" From patchwork Fri Jun 5 11:46:52 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 281303 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE, SPF_PASS, URIBL_BLOCKED, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 77A8DC433DF for ; Fri, 5 Jun 2020 11:48:46 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 4D76A2070B for ; Fri, 5 Jun 2020 11:48:46 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 4D76A2070B Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=vivier.eu Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:33752 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jhAq5-00029H-IT for qemu-devel@archiver.kernel.org; Fri, 05 Jun 2020 07:48:45 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54838) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jhAoi-0008HJ-OZ for qemu-devel@nongnu.org; Fri, 05 Jun 2020 07:47:20 -0400 Received: from mout.kundenserver.de ([212.227.17.24]:41945) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jhAoe-0006iE-1H for qemu-devel@nongnu.org; Fri, 05 Jun 2020 07:47:20 -0400 Received: from localhost.localdomain ([82.252.135.106]) by mrelayeu.kundenserver.de (mreue106 [212.227.15.183]) with ESMTPSA (Nemesis) id 1MxmFk-1ikWyf1nH4-00zHCb; Fri, 05 Jun 2020 13:47:11 +0200 From: Laurent Vivier To: qemu-devel@nongnu.org Subject: [PULL 11/19] util/Makefile: Reduce the user-mode object list Date: Fri, 5 Jun 2020 13:46:52 +0200 Message-Id: <20200605114700.1052050-12-laurent@vivier.eu> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200605114700.1052050-1-laurent@vivier.eu> References: <20200605114700.1052050-1-laurent@vivier.eu> MIME-Version: 1.0 X-Provags-ID: V03:K1:9Ui39A+z0NfgPSmdfqmKFPgf8qRdfo8oQWFPB5rCOGQuFJ6qwSu hSa9XboPjPT/8LdtnYehy8MbtiSTSJvSk/2HMmc5wA8Q0Q7kq5kaw9EmZGe2D3Ea0yHRuGa CcYtIz+/CYNxcxCPMG4LQsuM/nq3x4PLqr6UJPfeDl3l8tpCTy7EFMbV69mEZfb6IqTk+6p rGhI7K3DlHB5689ZgkA4A== X-UI-Out-Filterresults: notjunk:1; V03:K0:lsFFgbt69/g=:6vRmedFwgpAmjBNxXvIam3 bEnoKny8vqbGgetWsEj3ORFu6bNBaVNAZo3vrAVfreiTwgOm6LEMxoXq4s/R2V9LNPqOJpT9w D9d51Hg5O4V8rPddcjFPGuqkjI4iCPb1oBjLU44QkJfWTpJcZJ7ZlCnlW1PptqtcdvgkPjk99 S3C0H6eeww5LN2v3Wz1XCLBzNXUOSZ/0wdTFfw5LY/9CNwBxM8jaBRwoZKszZyeMKOneYCwhG wzSIktKFK3ZuC3rahH9gr/X9GZnNHyKCshOxEegZZqd3gAM1baqu2OCInBjngfjIW/kG8a2mA mHdJqXnLgUzt8nI+VOu9s8FK9DoUt8VoCr+MCXgUoxOwDXRJnOmVUB7o3fXEAUYCNPUtSnHq4 TTxox0KhLCBWG10OMBw5Qji3Wz04iJGGDO0tsv2VdTMRrQQrYVIlkKSVjIdSdWxw234lG+CtF VmyQ6fg5fBXkFCK3swjm6dCVPibSTneWqtWuNWFWrH2gBilG2owmINfLIlzYY9j3FuLhb7BUt PG9cukIFfSklFczwadFWxFS+Xm+GAWN8Eo6NJKa5T/6oi1xZhDtA4gtOiOPUloBM10H3zGxyx oVALu+x+QwZLTqlOpe86971WDzDLJ4Viadb065W7KAUfG0O5FMWKNV2cRZWbFHkjDhI/K20A6 dfNrbPSisNGt21vwOiqej+rzktHYRniwuqxgx/fXid4kWu/NKg71XjlJSmt00zVEH4QW6n2yT KUtB6LyciC4BrNuE4rtMQv0wdwIG7Wa2uKn6ncf0PEYryCwOgKpyWF3DP8cX93rUf8JCvLgqT SgjvCHAzfwMaSVExDX7orpwuIJqU4wg39uZky8G1qlihsDODgCpQS+/ae+UUwEamkw35rJH Received-SPF: none client-ip=212.227.17.24; envelope-from=laurent@vivier.eu; helo=mout.kundenserver.de X-detected-operating-system: by eggs.gnu.org: First seen = 2020/06/05 07:47:04 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, URIBL_BLOCKED=0.001 autolearn=_AUTOLEARN X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Richard Henderson , Riku Voipio , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Laurent Vivier Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" From: Philippe Mathieu-Daudé These objects are not required when configured with --disable-system. Reviewed-by: Richard Henderson Reviewed-by: Laurent Vivier Tested-by: Laurent Vivier Signed-off-by: Philippe Mathieu-Daudé Message-Id: <20200522172510.25784-6-philmd@redhat.com> Signed-off-by: Laurent Vivier --- util/Makefile.objs | 59 +++++++++++++++++++++++++++++----------------- 1 file changed, 38 insertions(+), 21 deletions(-) diff --git a/util/Makefile.objs b/util/Makefile.objs index fe339c2636ba..cc5e37177afd 100644 --- a/util/Makefile.objs +++ b/util/Makefile.objs @@ -1,8 +1,4 @@ util-obj-y = osdep.o cutils.o unicode.o qemu-timer-common.o -util-obj-y += bufferiszero.o -util-obj-y += lockcnt.o -util-obj-y += aiocb.o async.o aio-wait.o thread-pool.o qemu-timer.o -util-obj-y += main-loop.o util-obj-$(call lnot,$(CONFIG_ATOMIC64)) += atomic64.o util-obj-$(CONFIG_POSIX) += aio-posix.o util-obj-$(CONFIG_POSIX) += fdmon-poll.o @@ -21,31 +17,20 @@ util-obj-$(CONFIG_WIN32) += oslib-win32.o util-obj-$(CONFIG_WIN32) += qemu-thread-win32.o util-obj-y += envlist.o path.o module.o util-obj-y += host-utils.o -util-obj-y += bitmap.o bitops.o hbitmap.o +util-obj-y += bitmap.o bitops.o util-obj-y += fifo8.o -util-obj-y += nvdimm-utils.o util-obj-y += cacheinfo.o util-obj-y += error.o qemu-error.o util-obj-y += qemu-print.o util-obj-y += id.o -util-obj-y += iov.o qemu-config.o qemu-sockets.o uri.o notify.o +util-obj-y += qemu-config.o notify.o util-obj-y += qemu-option.o qemu-progress.o util-obj-y += keyval.o -util-obj-y += hexdump.o util-obj-y += crc32c.o util-obj-y += uuid.o -util-obj-y += throttle.o util-obj-y += getauxval.o -util-obj-y += readline.o util-obj-y += rcu.o util-obj-$(CONFIG_MEMBARRIER) += sys_membarrier.o -util-obj-y += qemu-coroutine.o qemu-coroutine-lock.o qemu-coroutine-io.o -util-obj-y += qemu-coroutine-sleep.o -util-obj-y += qemu-co-shared-resource.o -util-obj-y += coroutine-$(CONFIG_COROUTINE_BACKEND).o -util-obj-y += buffer.o -util-obj-y += timed-average.o -util-obj-y += base64.o util-obj-y += log.o util-obj-y += pagesize.o util-obj-y += qdist.o @@ -54,13 +39,45 @@ util-obj-y += qsp.o util-obj-y += range.o util-obj-y += stats64.o util-obj-y += systemd.o -util-obj-y += iova-tree.o -util-obj-$(CONFIG_INOTIFY1) += filemonitor-inotify.o -util-obj-$(call lnot,$(CONFIG_INOTIFY1)) += filemonitor-stub.o -util-obj-$(CONFIG_LINUX) += vfio-helpers.o util-obj-$(CONFIG_POSIX) += drm.o util-obj-y += guest-random.o util-obj-$(CONFIG_GIO) += dbus.o dbus.o-cflags = $(GIO_CFLAGS) dbus.o-libs = $(GIO_LIBS) util-obj-$(CONFIG_USER_ONLY) += selfmap.o + +####################################################################### +# code used by both qemu system emulation and qemu-img + +ifeq ($(call lor,$(CONFIG_SOFTMMU),$(CONFIG_TOOLS)),y) + +util-obj-y += aio-wait.o +util-obj-y += aiocb.o +util-obj-y += async.o +util-obj-y += base64.o +util-obj-y += buffer.o +util-obj-y += bufferiszero.o +util-obj-y += coroutine-$(CONFIG_COROUTINE_BACKEND).o +util-obj-y += hexdump.o +util-obj-y += lockcnt.o +util-obj-y += iov.o +util-obj-y += iova-tree.o +util-obj-y += hbitmap.o +util-obj-y += main-loop.o +util-obj-y += nvdimm-utils.o +util-obj-y += qemu-coroutine.o qemu-coroutine-lock.o qemu-coroutine-io.o +util-obj-y += qemu-coroutine-sleep.o +util-obj-y += qemu-co-shared-resource.o +util-obj-y += qemu-sockets.o +util-obj-y += qemu-timer.o +util-obj-y += thread-pool.o +util-obj-y += throttle.o +util-obj-y += timed-average.o +util-obj-y += uri.o + +util-obj-$(CONFIG_LINUX) += vfio-helpers.o +util-obj-$(CONFIG_INOTIFY1) += filemonitor-inotify.o +util-obj-$(call lnot,$(CONFIG_INOTIFY1)) += filemonitor-stub.o +util-obj-$(CONFIG_BLOCK) += readline.o + +endif # CONFIG_SOFTMMU || CONFIG_TOOLS From patchwork Fri Jun 5 11:46:54 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 281300 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE, SPF_PASS, URIBL_BLOCKED, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id E78D5C433E0 for ; Fri, 5 Jun 2020 11:52:08 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id BB5A52075B for ; Fri, 5 Jun 2020 11:52:08 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org BB5A52075B Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=vivier.eu Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:49280 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jhAtM-00009B-1d for qemu-devel@archiver.kernel.org; Fri, 05 Jun 2020 07:52:08 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54834) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jhAoi-0008G9-6V for qemu-devel@nongnu.org; Fri, 05 Jun 2020 07:47:20 -0400 Received: from mout.kundenserver.de ([212.227.17.10]:44295) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jhAoh-0006kl-0J for qemu-devel@nongnu.org; Fri, 05 Jun 2020 07:47:19 -0400 Received: from localhost.localdomain ([82.252.135.106]) by mrelayeu.kundenserver.de (mreue106 [212.227.15.183]) with ESMTPSA (Nemesis) id 1MyKU6-1il4vM2d1I-00yiyJ; Fri, 05 Jun 2020 13:47:12 +0200 From: Laurent Vivier To: qemu-devel@nongnu.org Subject: [PULL 13/19] target/riscv/cpu: Restrict CPU migration to system-mode Date: Fri, 5 Jun 2020 13:46:54 +0200 Message-Id: <20200605114700.1052050-14-laurent@vivier.eu> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200605114700.1052050-1-laurent@vivier.eu> References: <20200605114700.1052050-1-laurent@vivier.eu> MIME-Version: 1.0 X-Provags-ID: V03:K1:+yuIL3rhe4m+tkgeYdCUZrkxqjcEDHc1NgD4xZtPGgte7ja/V/8 1+4Ahe1ZfL8kPv98x+UxWrGoTbykYqzIa5DUFTalRCU10KUGg2BzTSgBqclfxOKM/eNmyiY QMplvPYTK76LwosG9FHv+isrUS23NcdIyrSCX8JZ5L7gdZFMCj7hTSSA0HP+rMMOZmgwRA1 7tju7/asfefgDNv7zv+ww== X-UI-Out-Filterresults: notjunk:1; V03:K0:5Hl/0fjJGIA=:9e9bUGouSWDBnaoCqRgATh SADTfpTp6FFUYDlFcR034zbmK/VfYCr+FItCiChnmAnjSAgaXxGVKBv62p4dfBaLEwPgLSpCe qf15Ucnpm4tw8LpOsTqbT+dSmdJjDFKaEryolS17h/d5biV9gbD6eyUMy4w4rTrK8lneExT2I cjleKb1WFuMLB0e2I6XBzXYBM3arxa+pY3AVWluejo76UQpLv4I7CXTbc0HkrIiQsXh7GQxw9 es7+1PYh/S+ZZ2fJn2fjzqHAZcyLb4JLlSlDASUY8PghiTa4dPxvgTJjeBQWH0eIbgzquChin 7yqg5DKNVzw4O+8KGMtyAJCoAdp/FnUwwfdyms39c33Ng98NUjJD7d06elh71jCOF58bfDxaQ yBiZ3rVxmecMoRli0b7mhWzvEgKcDBNtXyqYJ8npjmiZ1RTtBigYqGzNkaeIHxbL0HAGXqBYp iWeUlvaDtGIOtKDcEo/BKw1FLbbEaGzgux/2oFosybVbZsr3A0cU0c6hlp7f/u3b07E44IRCt abDjVKlar+pib5rbwQtI9txqWhcPwNKzwpuz3P2P9QFUb3sqpFFZS7ZZr2dyi5FyAHontIVdV e14dShxCFmC5FL3QYYbfKC40CKN27LSu51UqJucVG66FQRxkTCVNb+Ej1Crz/jx3f9dvWWRnE kriot8F0sDR0rGb6DpL7zzKSoT9aPJ5TrE+T3VVenMRdZ8dXnwz0sEq5Y8A48q+5NuW9RPJY3 71LGwRLFNwzGjs1hJIGluY6uX0ozVnmjWq/XPF5NMar7zcnww0s3TaF+h02xlJ9BiC5YUqXTw upSUF3f3TZ678GkUvxg10KX+wWQMEFIkVIrLDaXfbnlUVfQccQFU29E06KRKFIdACyRJ1ul Received-SPF: none client-ip=212.227.17.10; envelope-from=laurent@vivier.eu; helo=mout.kundenserver.de X-detected-operating-system: by eggs.gnu.org: First seen = 2020/06/05 07:46:13 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, URIBL_BLOCKED=0.001 autolearn=_AUTOLEARN X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Alistair Francis , Richard Henderson , Riku Voipio , =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?b?w6k=?= , Laurent Vivier Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" From: Philippe Mathieu-Daudé Reviewed-by: Alistair Francis Reviewed-by: Richard Henderson Reviewed-by: Laurent Vivier Tested-by: Laurent Vivier Signed-off-by: Philippe Mathieu-Daudé Message-Id: <20200522172510.25784-8-philmd@redhat.com> Signed-off-by: Laurent Vivier --- target/riscv/cpu.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/target/riscv/cpu.c b/target/riscv/cpu.c index 059d71f2c715..6c78337858ad 100644 --- a/target/riscv/cpu.c +++ b/target/riscv/cpu.c @@ -485,10 +485,12 @@ static void riscv_cpu_init(Object *obj) cpu_set_cpustate_pointers(cpu); } +#ifndef CONFIG_USER_ONLY static const VMStateDescription vmstate_riscv_cpu = { .name = "cpu", .unmigratable = 1, }; +#endif static Property riscv_cpu_properties[] = { DEFINE_PROP_BOOL("i", RISCVCPU, cfg.ext_i, true), @@ -544,13 +546,13 @@ static void riscv_cpu_class_init(ObjectClass *c, void *data) cc->do_transaction_failed = riscv_cpu_do_transaction_failed; cc->do_unaligned_access = riscv_cpu_do_unaligned_access; cc->get_phys_page_debug = riscv_cpu_get_phys_page_debug; + /* For now, mark unmigratable: */ + cc->vmsd = &vmstate_riscv_cpu; #endif #ifdef CONFIG_TCG cc->tcg_initialize = riscv_translate_init; cc->tlb_fill = riscv_cpu_tlb_fill; #endif - /* For now, mark unmigratable: */ - cc->vmsd = &vmstate_riscv_cpu; device_class_set_props(dc, riscv_cpu_properties); } From patchwork Fri Jun 5 11:46:55 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 281296 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE, SPF_PASS, URIBL_BLOCKED, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id C2380C433DF for ; Fri, 5 Jun 2020 11:55:59 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 969FE20659 for ; Fri, 5 Jun 2020 11:55:59 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 969FE20659 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=vivier.eu Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:40112 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jhAx4-0008Lj-S8 for qemu-devel@archiver.kernel.org; Fri, 05 Jun 2020 07:55:58 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54888) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jhAoo-0008PT-RJ for qemu-devel@nongnu.org; Fri, 05 Jun 2020 07:47:26 -0400 Received: from mout.kundenserver.de ([217.72.192.75]:58701) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jhAon-0006mt-Rp for qemu-devel@nongnu.org; Fri, 05 Jun 2020 07:47:26 -0400 Received: from localhost.localdomain ([82.252.135.106]) by mrelayeu.kundenserver.de (mreue106 [212.227.15.183]) with ESMTPSA (Nemesis) id 1MadC8-1j5NE316hG-00c5UL; Fri, 05 Jun 2020 13:47:13 +0200 From: Laurent Vivier To: qemu-devel@nongnu.org Subject: [PULL 14/19] exec: Assert CPU migration is not used on user-only build Date: Fri, 5 Jun 2020 13:46:55 +0200 Message-Id: <20200605114700.1052050-15-laurent@vivier.eu> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200605114700.1052050-1-laurent@vivier.eu> References: <20200605114700.1052050-1-laurent@vivier.eu> MIME-Version: 1.0 X-Provags-ID: V03:K1:VrTqMWubQsnZzaCalmzqi/8tWUxzEeChJ88aV28Bmryu8UD1IEt 6NLRMZP0XifqQboRqdz58fOUPJ/SEfSaW7FlPsTfaawp38sKvneqDCv6y1Q9JzjWrGuvOja CMyS/692yoFBrxyGn9wjHNKxb6lyOXWlsP5ek2fCvTcvVlffYp+S335bzBkz26GuFevlKpR oK6nZrGuNSPDQxSSgvQcw== X-UI-Out-Filterresults: notjunk:1; V03:K0:6zSDkmd6TR0=:hCwsosLIEsNMDOPlPmrNj9 t0QrJ3W3UONvuau15X5GsokmbxExyzoDVJ/K1fzLJcRJIst6OCxSJh66IGAWeuz9crYymCUdt iRSsrExSs9JpxSGFGo/WxvFGaLxQPYVWFAqdu4o5OCwLiRkXwufE9oh3VoaCiKNuPRJaNKRvJ uoUO5/7dE6g2UzcqGwl8iBpfyomdgUNP2VljulYF0NF/r36lhnfrIN+CqGv8JXLl6eNtwpSha 0lugtZ+GwGtKWwFgdyR+gGlrrxIl/ZUUgDkEkeJK4aRZ07+CgkWLGmw6IFFTX8iA1fVTi5Jsc j0G10J1/6kvhtga5ROEaFOOdPLcfE0DJny+hSTcub05IUIjUx+a+t0qmox6k/6Oyzc9dsVuFv MZy42UIpIh0nmrTnOQ+5heegA9Z7GMhYs0NEaRKRzE/grS5PMvZOeYG+JfXvW255krYcDoLcs hLFyMjqLpUEklcn+bMp17t+m7Vk8+X5PWMsRV7Ds49G+bwPunR2Qqm8QrebY+7yQlaQAqnkk8 BbrumSN0twP9xMFfFRvnJ+cxIs/TCrzwwhRvj+U4nkNdI1Tp2F25duAtI1l+KRaBxH0UunC4u P3YNPc7KeBpoq0ZH99+7vsTVtWVLVzwmCPx6SCOmcWHu6kb3kx8ZveiMHy6kzHiv2GN34RtIh q9JxpG8NAXl6NTRkXXVavGSqOe/7SLuun5z+5oYVxWTjlVOQJIp0WwvPr15GAW0Vf3H+rheP5 JmCG709HYUP7WSAtNKnOfI9i8bTillubtdiooIKJbgAeWAErAl5iUsL8tXkVvb6HbDQ1B+7q5 yp4GxQ1vDyl3cJ2XRVnY4pVhTUGlt7/JO9PQJZ3ButJFq/YZqkX+TER8hEDvyIVDy9ZGfeR Received-SPF: none client-ip=217.72.192.75; envelope-from=laurent@vivier.eu; helo=mout.kundenserver.de X-detected-operating-system: by eggs.gnu.org: First seen = 2020/06/05 07:47:15 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, URIBL_BLOCKED=0.001 autolearn=_AUTOLEARN X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Richard Henderson , Alistair Francis , Riku Voipio , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Laurent Vivier Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" From: Philippe Mathieu-Daudé Reviewed-by: Richard Henderson Reviewed-by: Alistair Francis Reviewed-by: Laurent Vivier Tested-by: Laurent Vivier Signed-off-by: Philippe Mathieu-Daudé Message-Id: <20200522172510.25784-9-philmd@redhat.com> Signed-off-by: Laurent Vivier --- exec.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/exec.c b/exec.c index 5162f0d12f99..6dfd314469de 100644 --- a/exec.c +++ b/exec.c @@ -946,7 +946,9 @@ void cpu_exec_realizefn(CPUState *cpu, Error **errp) qemu_plugin_vcpu_init_hook(cpu); -#ifndef CONFIG_USER_ONLY +#ifdef CONFIG_USER_ONLY + assert(cc->vmsd == NULL); +#else /* !CONFIG_USER_ONLY */ if (qdev_get_vmsd(DEVICE(cpu)) == NULL) { vmstate_register(NULL, cpu->cpu_index, &vmstate_cpu_common, cpu); } From patchwork Fri Jun 5 11:46:56 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 281295 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE, SPF_PASS, URIBL_BLOCKED, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1A93BC433DF for ; Fri, 5 Jun 2020 11:56:24 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id E443B20659 for ; Fri, 5 Jun 2020 11:56:23 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org E443B20659 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=vivier.eu Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:42178 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jhAxT-0000kx-6r for qemu-devel@archiver.kernel.org; Fri, 05 Jun 2020 07:56:23 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54894) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jhAop-0008QG-LW for qemu-devel@nongnu.org; Fri, 05 Jun 2020 07:47:33 -0400 Received: from mout.kundenserver.de ([217.72.192.73]:51925) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jhAoo-0006n3-P3 for qemu-devel@nongnu.org; Fri, 05 Jun 2020 07:47:27 -0400 Received: from localhost.localdomain ([82.252.135.106]) by mrelayeu.kundenserver.de (mreue106 [212.227.15.183]) with ESMTPSA (Nemesis) id 1MwPjf-1irxjw3h4v-00sOFW; Fri, 05 Jun 2020 13:47:14 +0200 From: Laurent Vivier To: qemu-devel@nongnu.org Subject: [PULL 15/19] arch_init: Remove unused 'qapi-commands-misc.h' include Date: Fri, 5 Jun 2020 13:46:56 +0200 Message-Id: <20200605114700.1052050-16-laurent@vivier.eu> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200605114700.1052050-1-laurent@vivier.eu> References: <20200605114700.1052050-1-laurent@vivier.eu> MIME-Version: 1.0 X-Provags-ID: V03:K1:q7m76VL6Z1ABHzLX5U2AnBtPkTr5HEvLjtuX/ahHDj7T70wcjvc Va4A10cEFQxtWFsZKFx7ZmsdjOw7/EcRKBQLPPs9Ll+a554whW/mmyCVyNhlxGM1jjS4uRV IegJnzXQ+vRdysYBPmPZ9/fCcoSIzTc/NfVRl11rb3k9Muj61QG9jKQdcset7kcmtqvVJPM lRqpuPAQ73UORNFytC4Vw== X-UI-Out-Filterresults: notjunk:1; V03:K0:YxWxEstQVpc=:J3CVIuToeBPHcQ5lDXBDVz g3tKoDiC31FUa0WIbwp35coh6tkQmySQAk/E/e6pcGxpB4djf8E+MDnvaLVsygN0UZu4HQyBK SXY3WMBM+Ow+FMz6OtmTwdWRQfpA1zg7S+UIo+pDRWSpK6JYmX/yUSeEwXz45/WKv0L4P37b5 +Be1/Bkom/oRWfLiqZzhL0m5I/q8glZeYd0eOD2fozDrPg6GAhWI4xMWD01BthHfTWnHLKcx9 k6eVdskmdrNgGn3ZVK40VXTNr0uk5P4dxuU4obHP6zAS7FLaUFQFS5TVIhPGVppjZHutle3kL BSJN/QtIo5oiZG5K/gpzG9iAovw0FVY2xVayRTcbIpdbfynwWN+h1mCglwgwRw5utEfW3rA+V kH7FZAOB9tRdovoJiRfsvZ2VDv+9ZTQAWeLlKPOtZE2MEZ+Ra5UJbX9Ofmva9THFNh9wwBgQ3 M+swiwtqSu4/tLY23k3E7yCoDUTHRu4V8eYMhkJev7qmwCVtsTgP9hcGmpv40DPeZZpAK/cjY AXixCHb0lSpq8oSxgJkH3ww2FU+EyecjFTWJbzzaSMOrOR0c1HuX4RQsF6cM7/sD1AevpWC8l QJk+Fsqo2ZvyFZVF3o6qNN554dJrTyfNHvfuqLHdHuxK5cOto9hTjAvL9onkzKRzQtTiEEwpv q4r9ed5YR9Fb3W/WP0xITncGECpPkLZMNswV3JLJK+t/l73S4cC5DaG1wtLRVYHedPnteKPR1 c2xHsqKgLQ/Zt6E9B5YaiyfNlxkZ7BkDjat2hbHAC7+ttHyQO53/z8z+ZmMOfj6g5cC+nSODh K9OsCy0j9RatiJmLsro9qSpfPA+xfDLzBOsJe4zK+MMUw4SC9T/YTyjI2TiFx9B+Xk0bBCd Received-SPF: none client-ip=217.72.192.73; envelope-from=laurent@vivier.eu; helo=mout.kundenserver.de X-detected-operating-system: by eggs.gnu.org: First seen = 2020/06/05 07:27:03 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, URIBL_BLOCKED=0.001 autolearn=_AUTOLEARN X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Alistair Francis , Richard Henderson , Riku Voipio , =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?b?w6k=?= , Laurent Vivier Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" From: Philippe Mathieu-Daudé Commit ffaee83bcb2 moved qmp_query_target but forgot to remove this include. Reviewed-by: Alistair Francis Reviewed-by: Richard Henderson Reviewed-by: Laurent Vivier Tested-by: Laurent Vivier Signed-off-by: Philippe Mathieu-Daudé Message-Id: <20200522172510.25784-10-philmd@redhat.com> Signed-off-by: Laurent Vivier --- arch_init.c | 1 - 1 file changed, 1 deletion(-) diff --git a/arch_init.c b/arch_init.c index d9eb0ec1dd03..8afea4748bad 100644 --- a/arch_init.c +++ b/arch_init.c @@ -27,7 +27,6 @@ #include "sysemu/arch_init.h" #include "hw/pci/pci.h" #include "hw/audio/soundhw.h" -#include "qapi/qapi-commands-misc.h" #include "qapi/error.h" #include "qemu/config-file.h" #include "qemu/error-report.h" From patchwork Fri Jun 5 11:46:57 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 281298 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE, SPF_PASS, URIBL_BLOCKED, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 16054C433E0 for ; Fri, 5 Jun 2020 11:53:35 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id E27CD2063A for ; Fri, 5 Jun 2020 11:53:34 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org E27CD2063A Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=vivier.eu Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:56032 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jhAuk-0002uv-5O for qemu-devel@archiver.kernel.org; Fri, 05 Jun 2020 07:53:34 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54850) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jhAoj-0008IS-6t for qemu-devel@nongnu.org; Fri, 05 Jun 2020 07:47:21 -0400 Received: from mout.kundenserver.de ([217.72.192.73]:38385) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jhAoh-0006kn-6S for qemu-devel@nongnu.org; Fri, 05 Jun 2020 07:47:20 -0400 Received: from localhost.localdomain ([82.252.135.106]) by mrelayeu.kundenserver.de (mreue106 [212.227.15.183]) with ESMTPSA (Nemesis) id 1M4rHF-1ji0Qf1q59-001wJs; Fri, 05 Jun 2020 13:47:14 +0200 From: Laurent Vivier To: qemu-devel@nongnu.org Subject: [PULL 16/19] target/i386: Restrict CpuClass::get_crash_info() to system-mode Date: Fri, 5 Jun 2020 13:46:57 +0200 Message-Id: <20200605114700.1052050-17-laurent@vivier.eu> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200605114700.1052050-1-laurent@vivier.eu> References: <20200605114700.1052050-1-laurent@vivier.eu> MIME-Version: 1.0 X-Provags-ID: V03:K1:HNbpiXTBSavg1AxxxgVlQ8cq6UVStyJ9Y0yKZ2euPqRl5WhuSGB e1O64fQFfalmMWKsSINtT/3sLVezc6rJTtlky+EVT9lSxdQ/pRu/tJLuHKlUoaQBwcBUSQ6 /TuHk/5Pipdn7kKMuXqlPXpicA9kCDPoKyalFFZCzoknYnl4GeKLbrcPiMDhv31C1v9umc5 HFqf9G/W0zO9+MmtHJaug== X-UI-Out-Filterresults: notjunk:1; V03:K0:lt4v5/XLozA=:jLzzQBN9eOGNekoYPG89sN xA/6grRP86lNUe9UgtvqCkuHXRXoG1cFB9IW+9itlrVsASf7iy0PWRFOMzjmMY2HhdNZftUZ6 A5IBEzck32QYNT0qpkWoemNF/cW0XXWHgf6YJK4BP2Y46Aei9fbsOZ+rPP2BanxsZusyDkyUI xTLxybcQfBhHu5vpT86J7UsyDIPPXoEwHuOPw4BYrnQPLbSY9xgdtOFXatdcYuZ3FvpaL9NyT VrzYo5S9QJOmQMeZzCEBsMlGjd13UayonADvYs/irVSuW7vw5YHMIi6iiNcdrrG/zPh36uiFw +JqacPx4/So9XRfeVQet+lASo6ODpQ8xg0PHW7/Qzm3xws+VUok6Rps3ddFS7lEUXU1f+Pjws +Dp4QSy77co0F7nSAo9EOmiBYZ48772p8rguRh9Bmc8Y9Lq7xVj3rI/P+kqMUBRbRIqtJpSVd rqudFmVG18pYcJl5t/VBZDZL+7XFU7H/45JIjUUO9ndgd4/x7YGOMdhm8NIy7aFgigK/A451I ymPCCgbOUcktRCwJDIyITsa3R0v6eiGzM3PHl82nIRPYPc+akxZ+63LzNYpukMbujzGqV5FK3 GInsIdGwJCVgklWazg4XtX2CEBNmuK3gM/omqYS8gIpN+wj4+ziFKMCnGaS+FJI+j8ahYv63Q hbJwO0Up3cpRFlw6FXXv+i99p5ijb85noE8Vta+ES+HG/ydtkgkZ/LEox2mkQQiEyT831YLR+ 5zkjYj6cvrPHczvHvF6vxdFb/G8yMLaUrzwCAMkIcofJCxtiUCln0EJHES1XZsiSeHDUgz4rc jUpJJ3hHYiTGzMsvlR0zqxp+MvbzlCXXU1QFFFDlys6tiExUyF77RKX8n5DXtv48vb9EyEj Received-SPF: none client-ip=217.72.192.73; envelope-from=laurent@vivier.eu; helo=mout.kundenserver.de X-detected-operating-system: by eggs.gnu.org: First seen = 2020/06/05 07:27:03 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, URIBL_BLOCKED=0.001 autolearn=_AUTOLEARN X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Richard Henderson , Riku Voipio , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Laurent Vivier Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" From: Philippe Mathieu-Daudé Reviewed-by: Richard Henderson Reviewed-by: Laurent Vivier Tested-by: Laurent Vivier Signed-off-by: Philippe Mathieu-Daudé Message-Id: <20200522172510.25784-11-philmd@redhat.com> Signed-off-by: Laurent Vivier --- target/i386/cpu.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/target/i386/cpu.c b/target/i386/cpu.c index 7a4a8e3847f0..dd31c1de5f2b 100644 --- a/target/i386/cpu.c +++ b/target/i386/cpu.c @@ -6843,6 +6843,7 @@ static void x86_cpu_register_feature_bit_props(X86CPU *cpu, x86_cpu_register_bit_prop(cpu, name, w, bitnr); } +#if !defined(CONFIG_USER_ONLY) static GuestPanicInformation *x86_cpu_get_crash_info(CPUState *cs) { X86CPU *cpu = X86_CPU(cs); @@ -6886,6 +6887,7 @@ static void x86_cpu_get_crash_info_qom(Object *obj, Visitor *v, errp); qapi_free_GuestPanicInformation(panic_info); } +#endif /* !CONFIG_USER_ONLY */ static void x86_cpu_initfn(Object *obj) { @@ -6932,8 +6934,10 @@ static void x86_cpu_initfn(Object *obj) x86_cpu_get_unavailable_features, NULL, NULL, NULL); +#if !defined(CONFIG_USER_ONLY) object_property_add(obj, "crash-information", "GuestPanicInformation", x86_cpu_get_crash_info_qom, NULL, NULL, NULL); +#endif for (w = 0; w < FEATURE_WORDS; w++) { int bitnr; @@ -7245,7 +7249,6 @@ static void x86_cpu_common_class_init(ObjectClass *oc, void *data) cc->cpu_exec_interrupt = x86_cpu_exec_interrupt; #endif cc->dump_state = x86_cpu_dump_state; - cc->get_crash_info = x86_cpu_get_crash_info; cc->set_pc = x86_cpu_set_pc; cc->synchronize_from_tb = x86_cpu_synchronize_from_tb; cc->gdb_read_register = x86_cpu_gdb_read_register; @@ -7256,6 +7259,7 @@ static void x86_cpu_common_class_init(ObjectClass *oc, void *data) cc->asidx_from_attrs = x86_asidx_from_attrs; cc->get_memory_mapping = x86_cpu_get_memory_mapping; cc->get_phys_page_attrs_debug = x86_cpu_get_phys_page_attrs_debug; + cc->get_crash_info = x86_cpu_get_crash_info; cc->write_elf64_note = x86_cpu_write_elf64_note; cc->write_elf64_qemunote = x86_cpu_write_elf64_qemunote; cc->write_elf32_note = x86_cpu_write_elf32_note; From patchwork Fri Jun 5 11:47:00 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 281299 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE, SPF_PASS, URIBL_BLOCKED, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 05C5FC433E0 for ; Fri, 5 Jun 2020 11:53:24 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id CE2422063A for ; Fri, 5 Jun 2020 11:53:23 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org CE2422063A Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=vivier.eu Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:55376 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jhAuZ-0002cu-1g for qemu-devel@archiver.kernel.org; Fri, 05 Jun 2020 07:53:23 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54868) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jhAom-0008KF-Oi for qemu-devel@nongnu.org; Fri, 05 Jun 2020 07:47:24 -0400 Received: from mout.kundenserver.de ([217.72.192.73]:37489) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jhAok-0006m9-PW for qemu-devel@nongnu.org; Fri, 05 Jun 2020 07:47:23 -0400 Received: from localhost.localdomain ([82.252.135.106]) by mrelayeu.kundenserver.de (mreue106 [212.227.15.183]) with ESMTPSA (Nemesis) id 1MfZ9C-1j1VLZ0R8y-00fx6N; Fri, 05 Jun 2020 13:47:17 +0200 From: Laurent Vivier To: qemu-devel@nongnu.org Subject: [PULL 19/19] stubs: Restrict ui/win32-kbd-hook to system-mode Date: Fri, 5 Jun 2020 13:47:00 +0200 Message-Id: <20200605114700.1052050-20-laurent@vivier.eu> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200605114700.1052050-1-laurent@vivier.eu> References: <20200605114700.1052050-1-laurent@vivier.eu> MIME-Version: 1.0 X-Provags-ID: V03:K1:RDG/fE4AoCovIdc/3QlTJBWThUPJnw6Nd9aJkQsgHQsFGNUGLuo 3u02hH14ToPlsB2/0y0URZxD6ngsiG7qoq+WN/KKhYYWJnvUgyi+2nzMswc+6XS4UiTnFBG cWNBWl9pBkaX7u62IgdtAVXJGEtn17aDwfkdF9vE1QUZJPiTVx97S5sTm3eAXEj8QrX3lTo ArfWAZMbMlfF4LNbrmFRA== X-UI-Out-Filterresults: notjunk:1; V03:K0:OBvJW1pq640=:ZpDjUr/qHEPshW578NxROF TtRTQN5hXfKu/sVJpKxj4quBaM4Goco02NIg10knSMkDcEiETOxii6PpUOcDRfRE1c09R+X6C qc6j4lyN59W5Jdfg1RE9/Nh8ihdVCwD/JqeR4lgquPyN8cgFGl8YFjEIpE6DgkOZHMetN3rpu hw1sQ4UCIAiz8IM4LwFedS6/PqzsOy1UTMIWN7wqeB9W4qLdsUdEoabsF3CiU2sHWfkn41eVk nORWNcqZXjZ8syT62ny+it1IUC8RH8Pp5beM/nWocO4L07fzx6YqUwxWQctZTYMj0JgpKYMy3 nKbbQAFAr3d84jqPmbaNDwmghyWziBaq0LjrgSY5bCsiM456B2f8RMlVYVYIJvVxlX5t3K3gG tCA+5cqHYYzicXNvvGBtyGC3fimhqMTtNbm+TFGMS/nb+TFVwv0Gry4DsWWCKk2lIJrCXbkv5 j4QVqTOJ4RMJRSvf26KdlHdPaSd9ZwYm6gPVe+JCEdccx0sON1pQc/q2T0Lwm5o1kuemjSqiH ZhMUhX5i57za+PCmXFtXyR8dJq0/ZFAiVl73N9Ew5W2HMkfmOAxGdHJyJ8Hg2rbTLlVki6Nhd xUF0FjOh9u593neT6GmnxvBUuJAOp82XXtq9U33saeHwQZx1BUFZd2tUaEvNXO73yQ6iCFeIw DDE69MWubxYw7k68aoMhDXxg6K2MlX59XrVd69XGs9dpdjH1cQLDD+L2WnorDqTxiMR+iDc9I zk11X4AUW24lmTon87U7obkLit3kCI51lls8gL48RNgZHqs5JZpORAlpkJCRsJ8VbwoYtm3rg 0xx4Eu877bTrDAkvr9r0AQMbkVacrnYyk6mH1s3WlVKQxj5OVICH/h2IOrsSGy0O+darXDf Received-SPF: none client-ip=217.72.192.73; envelope-from=laurent@vivier.eu; helo=mout.kundenserver.de X-detected-operating-system: by eggs.gnu.org: First seen = 2020/06/05 07:27:03 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, URIBL_BLOCKED=0.001 autolearn=_AUTOLEARN X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Richard Henderson , Riku Voipio , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Laurent Vivier Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" From: Philippe Mathieu-Daudé In Makefile.objs, the ui/ directory is restricted to system-mode: 43 ifeq ($(CONFIG_SOFTMMU),y) ... 65 common-obj-y += ui/ 66 common-obj-m += ui/ ... 82 endif # CONFIG_SOFTMMU Restrict the ui/ stub added in commit 2df9f5718df to only build it for system-mode emulation. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Richard Henderson Message-Id: <20200522172510.25784-14-philmd@redhat.com> Signed-off-by: Laurent Vivier --- stubs/Makefile.objs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stubs/Makefile.objs b/stubs/Makefile.objs index f54125de317d..c1e43ac68f87 100644 --- a/stubs/Makefile.objs +++ b/stubs/Makefile.objs @@ -23,7 +23,7 @@ stub-obj-y += sysbus.o stub-obj-y += tpm.o stub-obj-y += trace-control.o stub-obj-y += vmstate.o -stub-obj-y += win32-kbd-hook.o +stub-obj-$(CONFIG_SOFTMMU) += win32-kbd-hook.o ####################################################################### # code used by both qemu system emulation and qemu-img