From patchwork Fri Jun 5 11:46:42 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 11589511 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 6EB6C90 for ; Fri, 5 Jun 2020 11:48:16 +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 4F72B2070B for ; Fri, 5 Jun 2020 11:48:16 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 4F72B2070B 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+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Received: from localhost ([::1]:60576 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jhApb-0001XO-HN for patchwork-qemu-devel@patchwork.kernel.org; Fri, 05 Jun 2020 07:48:15 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54742) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jhAoV-00084t-0M for qemu-devel@nongnu.org; Fri, 05 Jun 2020 07:47:07 -0400 Received: from mout.kundenserver.de ([212.227.17.24]:41695) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jhAoT-0006fq-RN for qemu-devel@nongnu.org; Fri, 05 Jun 2020 07:47:06 -0400 Received: from localhost.localdomain ([82.252.135.106]) by mrelayeu.kundenserver.de (mreue106 [212.227.15.183]) with ESMTPSA (Nemesis) id 1N4Q4m-1izu760FqI-011VBZ; Fri, 05 Jun 2020 13:47:02 +0200 From: Laurent Vivier To: qemu-devel@nongnu.org Subject: [PULL 01/19] linux-user, alpha: fix oldumount syscall Date: Fri, 5 Jun 2020 13:46:42 +0200 Message-Id: <20200605114700.1052050-2-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:2Oj8vDMsHbhMBr2a/7CtfQmxdmKX3CIUbJJJDHty0cknIcfUYGN aDEsk+kW1oIGfyiVhzuNqNQ3l49hzITiruvVfVm3QZyVAkhO1HYqWYPcEeh2nZALfIibVBr a+r6Gv+1rXBUGQZF7FPXc/Ad9Ru/W1volLqloclugUeUa9sIEYbiBDiHsYMOLQNleZnwwjS RBq/No3Fxk4nLXeEpy7QA== X-UI-Out-Filterresults: notjunk:1;V03:K0:DPg8NX6s2yY=:+R6nJfAaOAJ5j3P9kkWkex 2+WOYwy9hFF2HmhI4IJzCqYjDp7mqDalV32qEccMzCPxfGCQ3yaxiyfK0Y+dSpJ/ivgsxqGlr srbCO9ny/hABwuYWJcL7MHJriKr4Kl5khcpH17QOaNNEk7uZ40az9os2xvb50hwDrF44pcDkN r/TMFniaZYBvRaCJ97mjRZd8fDHGkYKfhpNAnQG24jcqagXBiEq2/eGcF8AANPxuqJNriWhaH dQ3myUiezqKh7bS8WFsig896QlKjOeVozLJMuBtRkCZLy1e3mD68Xg5WjC2Mu8Ik5bJkW/KiK OOfT4RQ3w9Exuti7S4LYNJeiyXlXYLZ862NxOyZBlClm0zXltKliX8MkHD4H6HBvjeWkl7fMY FDuCO1nvii+6sfuJD1xPUnuAwlSu/NjReKR49vVqdD8wPTMuWMvoNHoipE5VxQQ1bDvr2Z2kr iBCYUKUVX05ro4oaW0aObpTYsCZzs0i0/9F89fAmghX1Ok0V4hEkQznavwUuNoB8Y96c8wj7z wXBnhP8X70oHXYst8XnqIduZZXAYmmKmko7gXl2qIjAJF/Dx1bywV5nXELgI5j3XYVosS+rPo UXgUM+VTtZVjwjwo+SuySiiDJMHBYjTfjY2gYxUETKWbPftRCTB6MFbqUWIj4uj/CziPQnKqZ 4tvyTQj5q527PyY4gAtfHPrdA33enHuCl8oa3e5EBkV0hBpZKq/9DBWmKCQ+8NTqDNKsUOUxE Fa4OAHs9yOj2kJDIOvo+t/Z63h7epKHcMrMMAlfQKDMdPNTRSRYvUkLbFOXwEgAb+/BPiRvY9 CR9/uJcJ0Nz6GCCCA9H0OqkBK1npdXo47sZ6+lIl6eRnM4GlF+yKuQJHxKb8gtuHgGMfA1V 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: Riku Voipio , Laurent Vivier Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" When we try to bootstrap debian/lenny for alpha, it fails because it cannot umount /.root directory: ... Setting up initscripts (2.86.ds1-61) ... umount: /.root: Function not implemented dpkg: error processing initscripts (--configure): subprocess post-installation script returned error exit status 1 dpkg: sysvinit: dependency problems, but configuring anyway as you request: sysvinit depends on initscripts; however: Package initscripts is not configured yet. This is because, when we switched from syscall_nr.h to syscall.tbl, the syscall #321 has been renamed from umount to oldumount and syscall.c has not been updated to manage the new name. oldumount has been introduced in linux 2.1.116pre1 by: 7d32756b2 ("Import 2.1.116pre1") ... * We now support a flag for forced unmount like the other 'big iron' * unixes. Our API is identical to OSF/1 to avoid making a mess of AMD ... Fixes: 6116aea994 ("linux-user, alpha: add syscall table generation support") Signed-off-by: Laurent Vivier Message-Id: <20200502194642.32823-1-laurent@vivier.eu> Signed-off-by: Laurent Vivier --- linux-user/syscall.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/linux-user/syscall.c b/linux-user/syscall.c index 05f03919ff07..e89b815ce983 100644 --- a/linux-user/syscall.c +++ b/linux-user/syscall.c @@ -8028,8 +8028,13 @@ static abi_long do_syscall1(void *cpu_env, int num, abi_long arg1, } } return ret; -#ifdef TARGET_NR_umount +#if defined(TARGET_NR_umount) || defined(TARGET_NR_oldumount) +#if defined(TARGET_NR_umount) case TARGET_NR_umount: +#endif +#if defined(TARGET_NR_oldumount) + case TARGET_NR_oldumount: +#endif if (!(p = lock_user_string(arg1))) return -TARGET_EFAULT; ret = get_errno(umount(p)); 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: 11589513 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 2015B90 for ; Fri, 5 Jun 2020 11:48:20 +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 016682070B for ; Fri, 5 Jun 2020 11:48:20 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 016682070B 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+patchwork-qemu-devel=patchwork.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 1jhApf-0001jC-5E for patchwork-qemu-devel@patchwork.kernel.org; Fri, 05 Jun 2020 07:48:19 -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+patchwork-qemu-devel=patchwork.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: 11589521 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 2B073618 for ; Fri, 5 Jun 2020 11:50:21 +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 0C8A32063A for ; Fri, 5 Jun 2020 11:50:21 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 0C8A32063A 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+patchwork-qemu-devel=patchwork.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 1jhArc-0005GA-7i for patchwork-qemu-devel@patchwork.kernel.org; Fri, 05 Jun 2020 07:50:20 -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+patchwork-qemu-devel=patchwork.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: 11589525 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 54D58618 for ; Fri, 5 Jun 2020 11:50:52 +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 35AE02063A for ; Fri, 5 Jun 2020 11:50:52 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 35AE02063A 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+patchwork-qemu-devel=patchwork.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 1jhAs7-0006Dd-Ey for patchwork-qemu-devel@patchwork.kernel.org; Fri, 05 Jun 2020 07:50:51 -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+patchwork-qemu-devel=patchwork.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:46 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 11589523 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id BF3A0618 for ; Fri, 5 Jun 2020 11:50:26 +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 9FDCC2063A for ; Fri, 5 Jun 2020 11:50:26 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 9FDCC2063A 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+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Received: from localhost ([::1]:41434 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jhArh-0005L8-QF for patchwork-qemu-devel@patchwork.kernel.org; Fri, 05 Jun 2020 07:50:25 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54836) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jhAoi-0008Gm-Gf for qemu-devel@nongnu.org; Fri, 05 Jun 2020 07:47:20 -0400 Received: from mout.kundenserver.de ([217.72.192.75]:42897) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jhAoh-0006iw-1K 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 1N4Q4m-1izu7J2HVm-011VBZ; Fri, 05 Jun 2020 13:47:07 +0200 From: Laurent Vivier To: qemu-devel@nongnu.org Subject: [PULL 05/19] linux-user/mmap.c: fix integer underflow in target_mremap Date: Fri, 5 Jun 2020 13:46:46 +0200 Message-Id: <20200605114700.1052050-6-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:ga9jgcQO+kjdoOyWdWYM+CF0HEBsS0q9SxmybE2WV2mpG8z0Tnm q7tH18xVoj77aWbFCpvPmbqpzpdbGBGFAm8DLE4u9slcTmhh6qu0ZP+sjDF6wMEDTbI3iqR YSnhwKzuEJvGBVpH1WAvGvJjsPbdQr6/ujR7xxGuz8+3D5k1WAz6Pq7C4aXX6eY2a2hp4mJ S3u3CPE7r5XjVyvw5FD5A== X-UI-Out-Filterresults: notjunk:1;V03:K0:CYjl3Us4nIw=:8d2MiDOkbv1i/MkGhLxav3 xeubtyWPGDyJmTnOAd1vP56SaWK4HRq0oB4Wh2h4qQ9zF/1iQUDXDKlu6v8ZkXafHV4CeVpYe 0jgIzAswb+fd1xsIV6kxV6Dzvl4ogwJxbVu5mR3r0rfylAZBq5ImS2DIYx+6xEBZ2/V/kZuDf xbQoGj5aLVzCdkMlWtJcngc3fMHTSb2+eSzOj7dFp5kBtNT9NfEYZ3Cd5A9xJELldmx+oBLvC nc1+OPdQpFEMtnjpY59GByG0LGs9wPQfm/V22FmbnK97i+G5wUR040PugWK8mVe/W/3zxLXEX 5L0aYGZqnmceV6QdLj62FSXbNnp/Gk0zAnbS9fBXMpRYWjBv8qn/DYzgGauzlxS+ABcQ8pe2U ueDOh8mQGbN/VZpFPEUZxpOlPBh+R/PMqgL/pBPdgC59UIoh5UyZu6UxrFLVS1VplHTOJrnx2 A1af3+PvwfCesQ3fZWYlHv+p8J3Efk4EQCtdCYm5gj61g7nQhAyuhfPlLCMphmv/JhHcVRLqc VcxrLVWJvd6YknK+MJ3zK4WXonvIb+mJHBsBhVbo4jTCggGEhFi0PTXkWm6cUFceqqHhvx56G jpOCiYg2zZHx0U7zDZuF6PDuLapaFKhsX/sus5u3eXX4lEQstnnxwfNkInClw+eS2s/eeEqyQ GVzkzmTdCR0oVwPUgpQMgvw2ckInTRUbt4cnYZKGMjH7Wgfg6JS+K3NrCP5wLQrAsGu/XT2jN 27uqFKMGQduHh4OEQK3jR+vYWCCZkvB46X31Pyz7tJmkydE11JQq2suMvUkmND8uPfeew30/v 1xg5WllMrvzVRrAy0wSqgT+LadkKt+MiM7YZG4rk4waMTXGJ4IqVXczj065HxsVE1HPUf4L 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: Riku Voipio , Jonathan Marler , Laurent Vivier Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" From: Jonathan Marler Fixes: https://bugs.launchpad.net/bugs/1876373 This code path in mmap occurs when a page size is decreased with mremap. When a section of pages is shrunk, qemu calls mmap_reserve on the pages that were released. However, it has the diff operation reversed, subtracting the larger old_size from the smaller new_size. Instead, it should be subtracting the smaller new_size from the larger old_size. You can also see in the previous line of the change that this mmap_reserve call only occurs when old_size > new_size. Bug: https://bugs.launchpad.net/qemu/+bug/1876373 Signed-off-by: Jonathan Marler Reviewded-by: Laurent Vivier Message-Id: <20200502161225.14346-1-johnnymarler@gmail.com> Signed-off-by: Laurent Vivier --- linux-user/mmap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/linux-user/mmap.c b/linux-user/mmap.c index e37803379747..caab62909eb1 100644 --- a/linux-user/mmap.c +++ b/linux-user/mmap.c @@ -708,7 +708,7 @@ abi_long target_mremap(abi_ulong old_addr, abi_ulong old_size, if (prot == 0) { host_addr = mremap(g2h(old_addr), old_size, new_size, flags); if (host_addr != MAP_FAILED && reserved_va && old_size > new_size) { - mmap_reserve(old_addr + old_size, new_size - old_size); + mmap_reserve(old_addr + old_size, old_size - new_size); } } else { errno = ENOMEM; From patchwork Fri Jun 5 11:46:47 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 11589531 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 43D14618 for ; Fri, 5 Jun 2020 11:52:02 +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 2456A2063A for ; Fri, 5 Jun 2020 11:52:02 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 2456A2063A 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+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Received: from localhost ([::1]:49592 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jhAtF-0000Gz-CQ for patchwork-qemu-devel@patchwork.kernel.org; Fri, 05 Jun 2020 07:52:01 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54840) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jhAoi-0008HN-Oo for qemu-devel@nongnu.org; Fri, 05 Jun 2020 07:47:20 -0400 Received: from mout.kundenserver.de ([217.72.192.74]:39505) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jhAoh-0006ip-18 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 1MGhds-1jkyQI0Mmw-00DoPN; Fri, 05 Jun 2020 13:47:08 +0200 From: Laurent Vivier To: qemu-devel@nongnu.org Subject: [PULL 06/19] linux-user: implement OFD locks Date: Fri, 5 Jun 2020 13:46:47 +0200 Message-Id: <20200605114700.1052050-7-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:vkFt+5HVP+GXJ1RSohT/ydQFJAnHvmtqpph0SGnYR62YJqfg418 o8qrK19SuuJTnaPJnAg8DJG7uoYafxty9DyJu0DNMnRECLOuTDinkxbw+208uBitCXcddRc zzc8kqDtCCSq530rqH7HKJwaVjQ3Szj9eCAfuOwzyRz0xHbkve9Z/ChuqxrJj83Zn38qSiN uWAXsj62FrD9IMeVGCviA== X-UI-Out-Filterresults: notjunk:1;V03:K0:qMiX3Kl+18U=:lwfMqII+xn3RRboMbV4/hq xYARZUQg3rxpo7cv/qOLZMzucnPDhJXWl1EFiaEve8mapYLjvn3GrOuvdPNKY3dJGb+XYMdtq 0dvHmoFFcXzcBA7oUhU1RS1/Fe0NwOufjvcM78CacpqJvJhllom6RRzwLmNJnl5eYvuefdk8E y15lxkQE7AhIrNUZdIm8PVUsoVTKLZYJNdgABYGpUnmpmof0AsIZY1fu7wAxtq/4+5tnDdjHn 43im3wEfUZbLj6W2swHojtfSUn92Lh3jrgVmN8ceOz5N7zYYxxwLBQ7RyREBBfCmtQdRMW06v McqwHHS95An3WyA2Toy2C5rzgrFREdRvUS07ZGp16P7e/ve9+pKN0Y0V8pns5ZgFzRX6QD9zO bhcEjFbQYuC/iATIvHEwy3SGtK9+OffF1DRk/vi95Ic7E7IC+XUbEB2PcLMeJDLx+rwwJW5qO cw8EHnolw8KNy5QyoH8J7mTROr2KVXfri61rY1NK5MXo9CvNZ0vbF+cWYxdutZQJVDZ9t6TAt GGxksolAjWS3Z3JwS8Nd7CREtnT4AIDnT3K+U43x+nSgVM4irS7XVBGZKxmUnp8MeD5e/9743 +lGXCjzvXLexigCkiuEryt7qvGfQhpXjRw6Q9Xy9BvBkz4VNokNjgAByizidjv0tt4AEBEQMJ n5+aZAdc4OeeOfMUc8KQoSSf8JTkN0l9ATfmCfMVoEAN+Rnp96sS9UhCI2qBdQqkjB8KM/UdR 4/iszbEOPulzSmiZVn/09EV1R2+1sQR/Y82NlTVHqb9yG3gtiPzK64srKcwiTvzr+yAszkgg8 GPjh1fhd7vohIe9BtHIorOvDyzL250MslvaeJUNyuAmPUANhOjHsriUwrjQjbJVT2hzwinF 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: Andreas Schwab , Riku Voipio , Laurent Vivier Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" From: Andreas Schwab Signed-off-by: Andreas Schwab Reviewed-by: Laurent Vivier Message-Id: Signed-off-by: Laurent Vivier --- linux-user/generic/fcntl.h | 4 ++++ linux-user/syscall.c | 6 ++++++ 2 files changed, 10 insertions(+) diff --git a/linux-user/generic/fcntl.h b/linux-user/generic/fcntl.h index 9f727d4df2c8..c85c5b9fed65 100644 --- a/linux-user/generic/fcntl.h +++ b/linux-user/generic/fcntl.h @@ -99,6 +99,10 @@ #define TARGET_F_SETLKW64 14 #endif +#define TARGET_F_OFD_GETLK 36 +#define TARGET_F_OFD_SETLK 37 +#define TARGET_F_OFD_SETLKW 38 + #ifndef TARGET_F_SETOWN_EX #define TARGET_F_SETOWN_EX 15 #define TARGET_F_GETOWN_EX 16 diff --git a/linux-user/syscall.c b/linux-user/syscall.c index 63c40c48e31f..1cf638208201 100644 --- a/linux-user/syscall.c +++ b/linux-user/syscall.c @@ -6098,6 +6098,9 @@ static int target_to_host_fcntl_cmd(int cmd) case TARGET_F_SETFD: case TARGET_F_GETFL: case TARGET_F_SETFL: + case TARGET_F_OFD_GETLK: + case TARGET_F_OFD_SETLK: + case TARGET_F_OFD_SETLKW: ret = cmd; break; case TARGET_F_GETLK: @@ -6383,6 +6386,7 @@ static abi_long do_fcntl(int fd, int cmd, abi_ulong arg) break; case TARGET_F_GETLK64: + case TARGET_F_OFD_GETLK: ret = copy_from_user_flock64(&fl64, arg); if (ret) { return ret; @@ -6394,6 +6398,8 @@ static abi_long do_fcntl(int fd, int cmd, abi_ulong arg) break; case TARGET_F_SETLK64: case TARGET_F_SETLKW64: + case TARGET_F_OFD_SETLK: + case TARGET_F_OFD_SETLKW: ret = copy_from_user_flock64(&fl64, arg); if (ret) { return ret; From patchwork Fri Jun 5 11:46:48 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 11589541 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 3C7B5912 for ; Fri, 5 Jun 2020 11:54: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 1C3382063A for ; Fri, 5 Jun 2020 11:54:24 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 1C3382063A 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+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Received: from localhost ([::1]:33518 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jhAvX-0005P4-DU for patchwork-qemu-devel@patchwork.kernel.org; Fri, 05 Jun 2020 07:54:23 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54874) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jhAom-0008KG-P6 for qemu-devel@nongnu.org; Fri, 05 Jun 2020 07:47:24 -0400 Received: from mout.kundenserver.de ([217.72.192.75]:60385) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jhAoi-0006lA-EY for qemu-devel@nongnu.org; Fri, 05 Jun 2020 07:47:24 -0400 Received: from localhost.localdomain ([82.252.135.106]) by mrelayeu.kundenserver.de (mreue106 [212.227.15.183]) with ESMTPSA (Nemesis) id 1M2fQ9-1jfoZ93QBL-0048BE; Fri, 05 Jun 2020 13:47:09 +0200 From: Laurent Vivier To: qemu-devel@nongnu.org Subject: [PULL 07/19] Makefile: Only build virtiofsd if system-mode is enabled Date: Fri, 5 Jun 2020 13:46:48 +0200 Message-Id: <20200605114700.1052050-8-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:bEROMtZroekkaERMDWQMfVyBm/Mb1pysJf7hxC70V4IKzUewtOq ozxfqyzxhixEF8udt9rU2dm/WXfVPPlM3CSeqofr8Ro+4ExZMYqtrjfhFg+pwdiGLo5ngLU 3l0Vd5+mAUn8lYUKZ4w72cTcLX/STm+wu+q7iEcxJjDAX0FPwgUiWdnKZH/mkxQH/zueKDe aEhge70Hk6ShJA5j0r4xw== X-UI-Out-Filterresults: notjunk:1;V03:K0:U9R+YuYYWHw=:e3tuDCwg3DNmX8HASVRs2/ PpPDFqf8lmAERc6JemDKbOF1YnKkgKNebDK+yZVkIvo6MOvtx1ynbVMzvVLuRUzG+A4IpyoQ7 IvhBd4bYx1KB2+3nlWNk1ZTyKUYrArZtsEJ+b36MRDIieg5hVld4VlxiB62h4KlkwBJzvuqKv qE/cJ+HdiXLf5ymFg8ZH49BQ/JFNxZKmgiAJA2vj0IY+7X0HFqwyZ3IJO0AToC4ZWKjlgBCcN /2h/4EjGxErwaFBTxIP2DsHIcg3XHkRitulHmRfY9jfHLJkqizr5r1RyTsZuySNLagn9VzWCf P2NMmOGRjSvkZx41LX0RRB1v24lUsHbPVPrU43xZyhZb4G9Us2WZ3T9pjnzXU3etSKQGybEcn TAIxwaN5yIYTJYPFYxoMhoD2xFevVNJMXMQnu7cg6Dg/tww9Ah6hvXMfQe4NLXgcnlICy/jK0 AQYRGjk36pimk/7SjE/EIC9PD9TOnK1yvGw0Mzbjg+XbY5kycamBA+PckJfdi53Xcbck+5DPx Ae8Ynoe0nxVACdMp5Ly3f/RNWRNFfI7RLZiN/JFIsod0VKpt7NhsRD1hqAnQsF/5nVtl25yH/ kjcqR3/ZEgQRpqZsD+FlW+V5qLCINauKAG3CQjruoHPWWyiTCOIeR9TawrB/ZgUP/jSJ/AcVo qJRTwZyC+Rb81jj7HH5W7x1wrOFyc6pj76I1tbyfdKACgh7ssPVvQpl5DO62Nlgcxk0D0HLAE 1Ovr/Q+SzsZ25RiNksQmNAJpu3Sp6ebghwaWNuxWghe+mAntjAspdQODaJUeZm+Vuh0lUidbB DcIsCQFx5ZV/QZ5pbpeTZs3r2dfJKuxNA1beRNFiyKb7Xd0q+8rIGR3A8tW9JX/CZFZo/UO 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 , Riku Voipio , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Laurent Vivier , "Dr . David Alan Gilbert" Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" From: Philippe Mathieu-Daudé Do not build the virtiofsd helper when configured with --disable-system. Reviewed-by: Richard Henderson Acked-by: Dr. David Alan Gilbert Reviewed-by: Laurent Vivier Tested-by: Laurent Vivier Signed-off-by: Philippe Mathieu-Daudé Message-Id: <20200522172510.25784-2-philmd@redhat.com> Signed-off-by: Laurent Vivier --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 40e4f7677bde..d1af126ea194 100644 --- a/Makefile +++ b/Makefile @@ -345,7 +345,7 @@ HELPERS-y += vhost-user-gpu$(EXESUF) vhost-user-json-y += contrib/vhost-user-gpu/50-qemu-gpu.json endif -ifeq ($(CONFIG_LINUX)$(CONFIG_SECCOMP)$(CONFIG_LIBCAP_NG),yyy) +ifeq ($(CONFIG_SOFTMMU)$(CONFIG_LINUX)$(CONFIG_SECCOMP)$(CONFIG_LIBCAP_NG),yyyy) HELPERS-y += virtiofsd$(EXESUF) vhost-user-json-y += tools/virtiofsd/50-qemu-virtiofsd.json endif 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: 11589543 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id EC8B8618 for ; Fri, 5 Jun 2020 11:54:26 +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 CC0A42063A for ; Fri, 5 Jun 2020 11:54:26 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org CC0A42063A 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+patchwork-qemu-devel=patchwork.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 1jhAva-0005Vg-3h for patchwork-qemu-devel@patchwork.kernel.org; Fri, 05 Jun 2020 07:54:26 -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+patchwork-qemu-devel=patchwork.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:50 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 11589537 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 2070E912 for ; Fri, 5 Jun 2020 11:53:14 +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 00C222063A for ; Fri, 5 Jun 2020 11:53:13 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 00C222063A 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+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Received: from localhost ([::1]:55648 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jhAuO-0002k4-Rr for patchwork-qemu-devel@patchwork.kernel.org; Fri, 05 Jun 2020 07:53:12 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54848) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jhAoj-0008I1-0Y for qemu-devel@nongnu.org; Fri, 05 Jun 2020 07:47:21 -0400 Received: from mout.kundenserver.de ([217.72.192.73]:44385) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jhAoh-0006jI-1x 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 1M9W78-1jdrQI1BGG-005Wx1; Fri, 05 Jun 2020 13:47:10 +0200 From: Laurent Vivier To: qemu-devel@nongnu.org Subject: [PULL 09/19] tests/Makefile: Only display TCG-related tests when TCG is available Date: Fri, 5 Jun 2020 13:46:50 +0200 Message-Id: <20200605114700.1052050-10-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:zJtpyEOkuSYXyASOplonEvbFhibM7FywdmyfFiRGgQg3CReCWg9 yr5MAftiNHWqi8H56oITEtZWyqukEaPyM1bf+T8mf2TsNLB+ltbZET5nuvfZXzOvg31c+VZ 8Yac3XFJuPji1TvdDU0QfcHBelw2Fr3s79ekaenQEjQqeKPxN5utZReXWrlQOZgokrtLK6d LDnNe1KUX7FB+A9xQArrw== X-UI-Out-Filterresults: notjunk:1;V03:K0:YMmjw8aiFEU=:X/F5nAWK1Wu5e0FQZoiqov x6ex9SHfUbOpMXSTHiullSrtvz+Z/DlGuK79VQ9w3n2UOh1mlfl7xjsr3vHrw7XiIXsrYVqX/ h4w5PN9XP3eP/USz96FwODqvzCi+rEYVlgo7V056qWGCVK8eQ5V5/PTcv0HuS7GZNFJu4egsn 6akdl+zOmVNeNVrfdJszjVRoL73NPXodGZwIpB1X2bTf2TnAiEGmHzNsPoWQF6dzZbyzU0G2M flCB/FBjaLDXKLonfNEre8aQnfoeb4jza+6BOrHsST1WsAAH6VjLk58SfJMOPAnMA5/YvQtC3 si/7ElA79y934IN9x9ghv8UEvJ8JsFvayazfpfLd/8UQdZ50iigXMoSCzYXx0pPjiUgY0PMwb AwesugkDLWgG9xGaUvYpWopS5P74+izKSIq0fHGO/ANNGEBDoht4Q2gqhf4CsXZEeu2WZa2Ae YFKHKdH0l1iUZd/4V+vhA8grfqcPyMcxpWvQxTFGSdvlPUbeA5zvM5oJ6YLK7ABKy6IGldcpm zrwJ3NIQWUyrs/Oz/cnTMvr7IEQoQtUx8zQc597Za9vfOCYeRmgEhG/NzSi6gT7IY0DTk7JeY HSisKNwtxXmm4uN+JfzeoGKMF9Ydcg48ifZE3TnvbdFAfjsrm/6jFOM2c+S8O0Ax3rjTo8JQd 0sohamCK4xMzZYQBCOObvZgBjTmg48A8uiC+pm+zsWyX9lZpoHrEWMf0WWAbsLlej63v9ity9 LCr7nqEuV3JmEnbU+YG+3myNF1bxJzi+4bYp1RUlme5E1IuOgsIhivPapQOKST9lWGkrfhdbr HSkQKP8WVwItXyfBR2r3SJj7JAGhD6eMhuykRluem1zMbWnxihYf+fTW+ga+hKEy8CkJgf6 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=C3=A9?= , Laurent Vivier Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.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-4-philmd@redhat.com> Signed-off-by: Laurent Vivier --- tests/Makefile.include | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tests/Makefile.include b/tests/Makefile.include index 03a74b60f6b2..6bc3d1096bc9 100644 --- a/tests/Makefile.include +++ b/tests/Makefile.include @@ -12,8 +12,10 @@ check-help: @echo " $(MAKE) check-speed Run qobject speed tests" @echo " $(MAKE) check-qapi-schema Run QAPI schema tests" @echo " $(MAKE) check-block Run block tests" +ifeq ($(CONFIG_TCG),y) @echo " $(MAKE) check-tcg Run TCG tests" @echo " $(MAKE) check-softfloat Run FPU emulation tests" +endif @echo " $(MAKE) check-acceptance Run all acceptance (functional) tests" @echo @echo " $(MAKE) check-report.tap Generates an aggregated TAP test report" From patchwork Fri Jun 5 11:46:51 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 11589545 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 22C5D912 for ; Fri, 5 Jun 2020 11:54: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 03DDA2063A for ; Fri, 5 Jun 2020 11:54:31 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 03DDA2063A 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+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Received: from localhost ([::1]:34190 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jhAve-0005fb-7o for patchwork-qemu-devel@patchwork.kernel.org; Fri, 05 Jun 2020 07:54:30 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54858) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jhAok-0008Jr-K9 for qemu-devel@nongnu.org; Fri, 05 Jun 2020 07:47:24 -0400 Received: from mout.kundenserver.de ([212.227.17.10]:60211) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jhAod-0006iH-US 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 1Mt7x1-1iofRv3XtB-00tTeI; Fri, 05 Jun 2020 13:47:11 +0200 From: Laurent Vivier To: qemu-devel@nongnu.org Subject: [PULL 10/19] tests/Makefile: Restrict some softmmu-only tests Date: Fri, 5 Jun 2020 13:46:51 +0200 Message-Id: <20200605114700.1052050-11-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:oQKwhrkEiFwCnvvwNMxzM/AINxfavth2I5iOWmIU9UYGXq027Rg bz87Ma6b6FDHxylZ1xiA4nk4jm5NIG/KaQjd+4wuWXJ45n++4Kj1G1TDbd0DqJaILbFZojU AeC6g2Xsx0jW94eJlvbdK+sEb6nD39nTPYKuZ+ciApvwwfnXi8matvnHbKzURXv7S+71SsI kaSUASLme2/utBytlg5vQ== X-UI-Out-Filterresults: notjunk:1;V03:K0:MZgOMM32aWs=:rFnGVlxpTB8cJwSOPVuMyB HCEq/DNC3dq801aUxD4AgMEUJfw8vMZAfjM1V4y1fHizeP3rJxmnTWj/TCCnJnUUhRVYt1bHo k7OWN4thFwtzUFZlibgkWAdInMMA5cYXL9qsW5wkgu5bwngB7oVZSYlJvqbBxz7RUoOE9zlxa 76J6D4axzbds+h7kDIPZ4/Se6gMU388cjWoGIbRimlrRgE55GUjac1hu1YmWrxoEtYXXbQvFO ROwUqGFtBvrSo+JYTsKQKX7Ip21BQtox3Qcc6MHxbniqb1MQfdk8tok1Mc8+/eIoPEgUhD5mv Frqj12KQ+aJ7iSI+yfAYb0rEV4naZMkeOiOn44B2+J/CqYTqgnX3B3sMc3W3LKg1uH3+cWZHE gnvBPPm7Nt/2nyRmzRxhO5gt4uOa/5fMJKHqZaq5c2Bd/nkr8nEWFTjAIuGcUBEiMLr+vF1CR owxRcXt+TsvhC3jRchQs2kgfzcY46uQUSatN7tFyQlk611aemJ8/ZVSOHaRoO7EEKixgfr6Gu PqT6GjzQodCkVEuifb3QYXgUVYfsOHO31ZJXiPivCm9z2FIZ/FpUeyfGCd5BOA/DVWCd57eV1 qtqGjewesO24WZe7fcAaFc4Omc3PBHmn5Y4N0HTYPcE1vwNq3juObnoogpsZIYmAcPvkv5xz1 phyoNm85+yrMDTH5SYpUw7dsdSYGDWJrcu+W6URk/y7rc+DGvAJKKSvuzW86t8wmE86MH5ILB EE2Geh6eVIfQ6BPEyASwTwqRrRmJrYNdHdT/uWDQghbWdNEBA/UDaIaNpcF6DwhkleJ0nljpr glqOVZ+6T5qy2oaWXwgYWmCNJfqJazwxXbOF83eyG4nxjHcEK4WmTVfdDeQOk5dEzUMQDWx 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: Richard Henderson , Riku Voipio , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Laurent Vivier Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" From: Philippe Mathieu-Daudé In the next commit we are going to remove some objects from the util-obj-y variable (objects which are not used by user-mode, when configured with --disable-system). Then some system-mode tests are going to fail, due to the missing objects: $ make check-unit -k LINK tests/test-iov /usr/bin/ld: tests/test-iov.o: in function `iov_from_buf': include/qemu/iov.h:49: undefined reference to `iov_from_buf_full' make: *** [rules.mak:124: tests/test-iov] Error 1 LINK tests/test-timed-average /usr/bin/ld: tests/test-timed-average.o: in function `account': tests/test-timed-average.c:27: undefined reference to `timed_average_account' make: *** [rules.mak:124: tests/test-timed-average] Error 1 LINK tests/test-util-filemonitor /usr/bin/ld: tests/test-util-filemonitor.o: in function `qemu_file_monitor_test_event_loop': tests/test-util-filemonitor.c:83: undefined reference to `main_loop_wait' make: *** [rules.mak:124: tests/test-util-filemonitor] Error 1 LINK tests/test-util-sockets /usr/bin/ld: tests/test-util-sockets.o: in function `test_socket_fd_pass_name_good': tests/test-util-sockets.c:91: undefined reference to `socket_connect' make: *** [rules.mak:124: tests/test-util-sockets] Error 1 LINK tests/test-base64 /usr/bin/ld: tests/test-base64.o: in function `test_base64_good': tests/test-base64.c:35: undefined reference to `qbase64_decode' collect2: error: ld returned 1 exit status make: *** [rules.mak:124: tests/test-base64] Error 1 LINK tests/test-bufferiszero /usr/bin/ld: tests/test-bufferiszero.o: in function `test_1': tests/test-bufferiszero.c:31: undefined reference to `buffer_is_zero' make: *** [rules.mak:124: tests/test-bufferiszero] Error 1 make: Target 'check-unit' not remade because of errors. Instead, restrict these tests to system-mode, by using the $(CONFIG_SOFTMMU) variable. Reviewed-by: Richard Henderson Tested-by: Richard Henderson Reviewed-by: Laurent Vivier Tested-by: Laurent Vivier Signed-off-by: Philippe Mathieu-Daudé Message-Id: <20200522172510.25784-5-philmd@redhat.com> Signed-off-by: Laurent Vivier --- tests/Makefile.include | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/tests/Makefile.include b/tests/Makefile.include index 6bc3d1096bc9..0cb58aad2685 100644 --- a/tests/Makefile.include +++ b/tests/Makefile.include @@ -66,14 +66,14 @@ check-unit-y += tests/check-qlit$(EXESUF) check-unit-y += tests/test-qobject-output-visitor$(EXESUF) check-unit-y += tests/test-clone-visitor$(EXESUF) check-unit-y += tests/test-qobject-input-visitor$(EXESUF) -check-unit-y += tests/test-qmp-cmds$(EXESUF) +check-unit-$(CONFIG_SOFTMMU) += tests/test-qmp-cmds$(EXESUF) check-unit-y += tests/test-string-input-visitor$(EXESUF) check-unit-y += tests/test-string-output-visitor$(EXESUF) check-unit-y += tests/test-qmp-event$(EXESUF) check-unit-y += tests/test-opts-visitor$(EXESUF) check-unit-$(CONFIG_BLOCK) += tests/test-coroutine$(EXESUF) check-unit-y += tests/test-visitor-serialization$(EXESUF) -check-unit-y += tests/test-iov$(EXESUF) +check-unit-$(CONFIG_SOFTMMU) += tests/test-iov$(EXESUF) check-unit-y += tests/test-bitmap$(EXESUF) check-unit-$(CONFIG_BLOCK) += tests/test-aio$(EXESUF) check-unit-$(CONFIG_BLOCK) += tests/test-aio-multithread$(EXESUF) @@ -108,7 +108,7 @@ check-unit-y += tests/test-qht$(EXESUF) check-unit-y += tests/test-qht-par$(EXESUF) check-unit-y += tests/test-bitops$(EXESUF) check-unit-y += tests/test-bitcnt$(EXESUF) -check-unit-y += tests/test-qdev-global-props$(EXESUF) +check-unit-$(CONFIG_SOFTMMU) += tests/test-qdev-global-props$(EXESUF) check-unit-y += tests/check-qom-interface$(EXESUF) check-unit-y += tests/check-qom-proplist$(EXESUF) check-unit-y += tests/test-qemu-opts$(EXESUF) @@ -126,9 +126,9 @@ check-unit-$(call land,$(CONFIG_BLOCK),$(CONFIG_GNUTLS)) += tests/test-crypto-tl ifneq (,$(findstring qemu-ga,$(TOOLS))) check-unit-$(call land,$(CONFIG_LINUX),$(CONFIG_VIRTIO_SERIAL)) += tests/test-qga$(EXESUF) endif -check-unit-y += tests/test-timed-average$(EXESUF) -check-unit-$(CONFIG_INOTIFY1) += tests/test-util-filemonitor$(EXESUF) -check-unit-y += tests/test-util-sockets$(EXESUF) +check-unit-$(CONFIG_SOFTMMU) += tests/test-timed-average$(EXESUF) +check-unit-$(call land,$(CONFIG_SOFTMMU),$(CONFIG_INOTIFY1)) += tests/test-util-filemonitor$(EXESUF) +check-unit-$(CONFIG_SOFTMMU) += tests/test-util-sockets$(EXESUF) check-unit-$(CONFIG_BLOCK) += tests/test-authz-simple$(EXESUF) check-unit-$(CONFIG_BLOCK) += tests/test-authz-list$(EXESUF) check-unit-$(CONFIG_BLOCK) += tests/test-authz-listfile$(EXESUF) @@ -139,7 +139,7 @@ check-unit-$(CONFIG_BLOCK) += tests/test-io-channel-file$(EXESUF) check-unit-$(call land,$(CONFIG_BLOCK),$(CONFIG_GNUTLS)) += tests/test-io-channel-tls$(EXESUF) check-unit-$(CONFIG_BLOCK) += tests/test-io-channel-command$(EXESUF) check-unit-$(CONFIG_BLOCK) += tests/test-io-channel-buffer$(EXESUF) -check-unit-y += tests/test-base64$(EXESUF) +check-unit-$(CONFIG_SOFTMMU) += tests/test-base64$(EXESUF) check-unit-$(call land,$(CONFIG_BLOCK),$(if $(CONFIG_NETTLE),y,$(CONFIG_GCRYPT))) += tests/test-crypto-pbkdf$(EXESUF) check-unit-$(CONFIG_BLOCK) += tests/test-crypto-ivgen$(EXESUF) check-unit-$(CONFIG_BLOCK) += tests/test-crypto-afsplit$(EXESUF) @@ -147,7 +147,7 @@ check-unit-$(call land,$(CONFIG_BLOCK),$(CONFIG_QEMU_PRIVATE_XTS)) += tests/test check-unit-$(CONFIG_BLOCK) += tests/test-crypto-block$(EXESUF) check-unit-y += tests/test-logging$(EXESUF) check-unit-$(call land,$(CONFIG_BLOCK),$(CONFIG_REPLICATION)) += tests/test-replication$(EXESUF) -check-unit-y += tests/test-bufferiszero$(EXESUF) +check-unit-$(CONFIG_SOFTMMU) += tests/test-bufferiszero$(EXESUF) check-unit-y += tests/test-uuid$(EXESUF) check-unit-y += tests/ptimer-test$(EXESUF) check-unit-y += tests/test-qapi-util$(EXESUF) 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: 11589517 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 0351190 for ; Fri, 5 Jun 2020 11:48:30 +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 D8AA12070B for ; Fri, 5 Jun 2020 11:48:29 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org D8AA12070B 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+patchwork-qemu-devel=patchwork.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 1jhApo-00029H-VL for patchwork-qemu-devel@patchwork.kernel.org; Fri, 05 Jun 2020 07:48:28 -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+patchwork-qemu-devel=patchwork.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:53 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 11589519 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 326A1618 for ; Fri, 5 Jun 2020 11:50:15 +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 12ED62063A for ; Fri, 5 Jun 2020 11:50:15 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 12ED62063A 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+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Received: from localhost ([::1]:40800 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jhArW-00050l-7H for patchwork-qemu-devel@patchwork.kernel.org; Fri, 05 Jun 2020 07:50:14 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54822) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jhAoh-0008EY-AG for qemu-devel@nongnu.org; Fri, 05 Jun 2020 07:47:19 -0400 Received: from mout.kundenserver.de ([212.227.17.24]:43681) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jhAoe-0006iN-15 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 1MBDzc-1joItq02H8-00Cgsz; Fri, 05 Jun 2020 13:47:12 +0200 From: Laurent Vivier To: qemu-devel@nongnu.org Subject: [PULL 12/19] stubs/Makefile: Reduce the user-mode object list Date: Fri, 5 Jun 2020 13:46:53 +0200 Message-Id: <20200605114700.1052050-13-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:o6yxUzAJ+EbUPUl5mF2vB1ArVVZM207EPI0BqVf5XnDMEkm9I4C qvSDy/HlxrFqUbybUOQ+I+GegQqmGfWb7AsrXxoW9eq8YHVYhKNiMeAA/UHI0I1g/aaUMIo KTCJJW25sBXA+/Hj7PTcOIVRkWbchRool2Nj785WYQDNBt2oLqbrfHdoFLx7nlc1o0dx2W4 sTUJthEluVDfzF+95HUWA== X-UI-Out-Filterresults: notjunk:1;V03:K0:wPCU3FBInFE=:s2Qz8gE8GHwzhdjvbr1xge 4ZR8kzfY30DbI0Xs6f/khNUBgkacxu/eRimsLgH/HYw4uqQaYyg53bV04ZLoq6EDykdruHGdi bmQ2hfquLRw0+QuKHPpnaTKXs8GzpJ/21x9thTAJ99p7Tj+7CZjccZrQnvAzNy4YwnmdBCqvt FEyIvNsuIy3WSZrElARpChQwbEqfK0qe2PoTBa5/G2zFbD4tdm9NACEu1uSgYw/VsDK7YZe5e +5duwGEr2WjsdOfSM3fk50qzTiV8X7y+qGcoA4BfRmPn+9kOJ9SY2joYnk1Et81z4XG7Yk+gQ OoM0MDZa3txG7uRWi4gI/49ZBAWcBcqx/NVHxTMuKl6QmzFO4YfKnoNuWLYI9H8wh39Gxyd9M wGka8AgURKykeioPmMT/nOszNAXmywdbCFEemDcLyVOZv09GkfRZD373hixOY1WvOIDHmKINr uWdae7b8NL87TD/QoKl0nY0efOU6wEXkuu5HZf1m5K2LsEiIne1vEFU32b3mkgtssChkcgp3K 4oi0huHncpiewVHzOJHOqGuCGRK60O5DgRjODgYl3uUOZagrqZBmh9hQB05WEV0wmiUzviP9v aP3pTOilNmtzbnIGEbURh+WnzLOoycJhXiFrzo58mKlYmkvHEmZzrkjRX1eWZYeZXB83afB89 QGo9grGzXJweCU8hlQXmIpWUkLaz5D1SI09vZ/ZY507pTHR5mmWTUACD5jniciz89hl8qyl+C dGxNYuNRlTq/rqYBkCgsbw1ePRJ7pfFVEi7rjcnaofqacLMsHFMQNP52s9c7KtqzkY+nI9T9Y Mg/GM+9LQPIVmc5VbM8CLtFG598YMhIQkJzfQhMlI4A64RuaIeRtqlTNZRM0heK1/rrujAL 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+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" From: Philippe Mathieu-Daudé These stubs 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-7-philmd@redhat.com> Signed-off-by: Laurent Vivier --- stubs/Makefile.objs | 50 ++++++++++++++++++++++++++------------------- 1 file changed, 29 insertions(+), 21 deletions(-) diff --git a/stubs/Makefile.objs b/stubs/Makefile.objs index 6a9e3135e8f9..f54125de317d 100644 --- a/stubs/Makefile.objs +++ b/stubs/Makefile.objs @@ -1,47 +1,55 @@ -stub-obj-y += arch_type.o -stub-obj-y += bdrv-next-monitor-owned.o stub-obj-y += blk-commit-all.o -stub-obj-y += blockdev-close-all-bdrv-states.o -stub-obj-y += clock-warp.o stub-obj-y += cpu-get-clock.o stub-obj-y += cpu-get-icount.o stub-obj-y += dump.o stub-obj-y += error-printf.o stub-obj-y += fdset.o stub-obj-y += gdbstub.o -stub-obj-y += get-vm-name.o -stub-obj-y += iothread.o stub-obj-y += iothread-lock.o stub-obj-y += is-daemonized.o stub-obj-$(CONFIG_LINUX_AIO) += linux-aio.o stub-obj-$(CONFIG_LINUX_IO_URING) += io_uring.o -stub-obj-y += machine-init-done.o -stub-obj-y += migr-blocker.o -stub-obj-y += change-state-handler.o -stub-obj-y += monitor.o stub-obj-y += monitor-core.o stub-obj-y += notify-event.o +stub-obj-y += qmp_memory_device.o stub-obj-y += qtest.o +stub-obj-y += ramfb.o stub-obj-y += replay.o -stub-obj-y += replay-user.o stub-obj-y += runstate-check.o +stub-obj-$(CONFIG_SOFTMMU) += semihost.o stub-obj-y += set-fd-handler.o +stub-obj-y += vmgenid.o stub-obj-y += sysbus.o stub-obj-y += tpm.o stub-obj-y += trace-control.o -stub-obj-y += uuid.o -stub-obj-y += vm-stop.o stub-obj-y += vmstate.o stub-obj-y += win32-kbd-hook.o + +####################################################################### +# code used by both qemu system emulation and qemu-img + +ifeq ($(call lor,$(CONFIG_SOFTMMU),$(CONFIG_TOOLS)),y) + +stub-obj-y += arch_type.o +stub-obj-y += bdrv-next-monitor-owned.o +stub-obj-y += blockdev-close-all-bdrv-states.o +stub-obj-y += change-state-handler.o +stub-obj-y += clock-warp.o stub-obj-y += fd-register.o -stub-obj-y += qmp_memory_device.o -stub-obj-y += target-monitor-defs.o +stub-obj-y += fw_cfg.o +stub-obj-y += get-vm-name.o +stub-obj-y += iothread.o +stub-obj-y += machine-init-done.o +stub-obj-y += migr-blocker.o +stub-obj-y += monitor.o +stub-obj-y += pci-host-piix.o +stub-obj-y += ram-block.o +stub-obj-y += replay-user.o stub-obj-y += target-get-monitor-def.o -stub-obj-y += vmgenid.o +stub-obj-y += target-monitor-defs.o +stub-obj-y += uuid.o +stub-obj-y += vm-stop.o stub-obj-y += xen-common.o stub-obj-y += xen-hvm.o -stub-obj-y += pci-host-piix.o -stub-obj-y += ram-block.o -stub-obj-y += ramfb.o -stub-obj-y += fw_cfg.o -stub-obj-$(CONFIG_SOFTMMU) += semihost.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: 11589529 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 8AADC618 for ; Fri, 5 Jun 2020 11:51: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 6B8552063A for ; Fri, 5 Jun 2020 11:51:59 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 6B8552063A 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+patchwork-qemu-devel=patchwork.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 1jhAtC-00009B-O9 for patchwork-qemu-devel@patchwork.kernel.org; Fri, 05 Jun 2020 07:51:58 -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=C3=A9?= , Laurent Vivier Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.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: 11589547 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 19D85618 for ; Fri, 5 Jun 2020 11:55:50 +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 EE88420659 for ; Fri, 5 Jun 2020 11:55:49 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org EE88420659 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+patchwork-qemu-devel=patchwork.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 1jhAwv-0008Lj-7x for patchwork-qemu-devel@patchwork.kernel.org; Fri, 05 Jun 2020 07:55:49 -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+patchwork-qemu-devel=patchwork.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: 11589551 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id A5F24912 for ; Fri, 5 Jun 2020 11:56:11 +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 86C0720659 for ; Fri, 5 Jun 2020 11:56:11 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 86C0720659 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+patchwork-qemu-devel=patchwork.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 1jhAxG-0000kx-Ro for patchwork-qemu-devel@patchwork.kernel.org; Fri, 05 Jun 2020 07:56:10 -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=C3=A9?= , Laurent Vivier Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.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: 11589539 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 2D8D2618 for ; Fri, 5 Jun 2020 11:53:21 +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 0E3652063A for ; Fri, 5 Jun 2020 11:53:21 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 0E3652063A 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+patchwork-qemu-devel=patchwork.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 1jhAuW-0002uv-AZ for patchwork-qemu-devel@patchwork.kernel.org; Fri, 05 Jun 2020 07:53:20 -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+patchwork-qemu-devel=patchwork.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:46:58 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 11589549 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 95C8A618 for ; Fri, 5 Jun 2020 11:55:54 +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 7671E20659 for ; Fri, 5 Jun 2020 11:55:54 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 7671E20659 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+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Received: from localhost ([::1]:40490 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jhAwz-0008VA-Og for patchwork-qemu-devel@patchwork.kernel.org; Fri, 05 Jun 2020 07:55:53 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54860) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jhAok-0008Jt-MY for qemu-devel@nongnu.org; Fri, 05 Jun 2020 07:47:24 -0400 Received: from mout.kundenserver.de ([212.227.17.13]:58457) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jhAoj-0006ld-Bo 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 1MnItm-1jHyx51YLE-00jHXv; Fri, 05 Jun 2020 13:47:15 +0200 From: Laurent Vivier To: qemu-devel@nongnu.org Subject: [PULL 17/19] target/s390x: Restrict CpuClass::get_crash_info() to system-mode Date: Fri, 5 Jun 2020 13:46:58 +0200 Message-Id: <20200605114700.1052050-18-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:j05KdHmdCVgMP8p1kUx62yWEaDCFPR+YNFkE+3yH5fYYGyLFBAR HuogOPZIKXX3g+D0Wlq9waEj1N2YUVqHUqMAXVhaxzOArWVe2FZh1V1yfQbRwuVimYNRF9Y NMLlDc2SlL4lossZ55UO1ML4y5gd5hzXl4yvV1KEMg36OQ0ObDvwXbtzSjqABfXmReiowV4 fcoIOoUePNLSFiu/vg8Og== X-UI-Out-Filterresults: notjunk:1;V03:K0:JB7nqQ54VMU=:tZXkYWHTfvlaC6e6UErCXs WaAeDdUtNvcHjUP5rF7Pu1AMUgP5oZyJaeVWza9DZtEfP4PGFkspv1PzVwOKyqYaq7qTNWbS7 GBSoaBKc9N4jzgLdgARXwPvY6lR/Ir/iss1jkadnQKzlMWrCvq9Pg5jbuERn+Wb4ZV6L4cVhX nBb8oOv1Mg0nSgg+4XmXRJSzIkVSvASG+zLL/hWBbo/cR6riYQaNpvuhvztrGaeinlMDaxh3g QnJNShwQ4XTIW/HvXQhFRW4DFqnb1gEp4I6oU0h2X8gcACnvhzWzqKzZvvSxigmO83o6SCFAV s+9/uZ6IzbId/U6lCO21HcTQSGi3VEUKtPsQFYCuD+rwkxXn8ELG2ZDvVuc0+TI5GJaMGPAhv hSMW8e7p0NaNiOGXTouAA1QEhdvnGZhuMxRcicWuitrxpnKAuiyr2xWh4hCaHygt93C3oVODe NguJlJbKeCQWe3DhShEHZLPXEqtnalLykDy8yrKw7jhL5p5lpudLiRr8TKgpwnVQVUj+H6aon 7QN0YKfI+2uapIX+qadYbb4BBBdfZwl5MyKhcTyPd7pRDy8BA1NgpQWYBFzpadkFBxHmeHZv3 Q5+URJqQYI9fid23QWXpDwxiumu8VWKrf/gbCQm1rG2L7SzbFApdeAXK4+LR/A/qilLl2VhC6 +81n0Cwzi+KXc7HWMvSERYOHAN8zAbTPLcYvw2Kf6nlLNyKeIiQsICxu0wHn7ptc1lIPz4/Jk OSV+Ozkj3sOJAGaW2Wk77haUaywQScCtJXdOnltbSZpemhlgx5vffl/Lp1xXBwFZWFuePxtdZ uw22/3/+qn4+o0NWbE77n3qyB75E7gib+R2hm+i2ScTTMqskKkwnDgiaocP5/WDE9DPGg7K Received-SPF: none client-ip=212.227.17.13; envelope-from=laurent@vivier.eu; helo=mout.kundenserver.de X-detected-operating-system: by eggs.gnu.org: First seen = 2020/06/05 07:47:20 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 , Cornelia Huck Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" From: Philippe Mathieu-Daudé Reviewed-by: Richard Henderson Reviewed-by: Cornelia Huck Reviewed-by: Laurent Vivier Tested-by: Laurent Vivier Signed-off-by: Philippe Mathieu-Daudé Message-Id: <20200522172510.25784-12-philmd@redhat.com> Signed-off-by: Laurent Vivier --- target/s390x/cpu.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/target/s390x/cpu.c b/target/s390x/cpu.c index ca50b7045198..08eb674d22b4 100644 --- a/target/s390x/cpu.c +++ b/target/s390x/cpu.c @@ -247,6 +247,7 @@ out: error_propagate(errp, err); } +#if !defined(CONFIG_USER_ONLY) static GuestPanicInformation *s390_cpu_get_crash_info(CPUState *cs) { GuestPanicInformation *panic_info; @@ -256,11 +257,7 @@ static GuestPanicInformation *s390_cpu_get_crash_info(CPUState *cs) panic_info = g_malloc0(sizeof(GuestPanicInformation)); panic_info->type = GUEST_PANIC_INFORMATION_TYPE_S390; -#if !defined(CONFIG_USER_ONLY) panic_info->u.s390.core = cpu->env.core_id; -#else - panic_info->u.s390.core = 0; /* sane default for non system emulation */ -#endif panic_info->u.s390.psw_mask = cpu->env.psw.mask; panic_info->u.s390.psw_addr = cpu->env.psw.addr; panic_info->u.s390.reason = cpu->env.crash_reason; @@ -286,6 +283,7 @@ static void s390_cpu_get_crash_info_qom(Object *obj, Visitor *v, errp); qapi_free_GuestPanicInformation(panic_info); } +#endif static void s390_cpu_initfn(Object *obj) { @@ -295,16 +293,16 @@ static void s390_cpu_initfn(Object *obj) cpu_set_cpustate_pointers(cpu); cs->halted = 1; cs->exception_index = EXCP_HLT; +#if !defined(CONFIG_USER_ONLY) object_property_add(obj, "crash-information", "GuestPanicInformation", s390_cpu_get_crash_info_qom, NULL, NULL, NULL); - s390_cpu_model_register_props(obj); -#if !defined(CONFIG_USER_ONLY) cpu->env.tod_timer = timer_new_ns(QEMU_CLOCK_VIRTUAL, s390x_tod_timer, cpu); cpu->env.cpu_timer = timer_new_ns(QEMU_CLOCK_VIRTUAL, s390x_cpu_timer, cpu); s390_cpu_set_state(S390_CPU_STATE_STOPPED, cpu); #endif + s390_cpu_model_register_props(obj); } static void s390_cpu_finalize(Object *obj) @@ -488,13 +486,13 @@ static void s390_cpu_class_init(ObjectClass *oc, void *data) cc->do_interrupt = s390_cpu_do_interrupt; #endif cc->dump_state = s390_cpu_dump_state; - cc->get_crash_info = s390_cpu_get_crash_info; cc->set_pc = s390_cpu_set_pc; cc->gdb_read_register = s390_cpu_gdb_read_register; cc->gdb_write_register = s390_cpu_gdb_write_register; #ifndef CONFIG_USER_ONLY cc->get_phys_page_debug = s390_cpu_get_phys_page_debug; cc->vmsd = &vmstate_s390_cpu; + cc->get_crash_info = s390_cpu_get_crash_info; cc->write_elf64_note = s390_cpu_write_elf64_note; #ifdef CONFIG_TCG cc->cpu_exec_interrupt = s390_cpu_exec_interrupt; From patchwork Fri Jun 5 11:46:59 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 11589527 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 30896618 for ; Fri, 5 Jun 2020 11:51:57 +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 10E7A2063A for ; Fri, 5 Jun 2020 11:51:57 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 10E7A2063A 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+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Received: from localhost ([::1]:49050 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jhAtA-0008V7-Bo for patchwork-qemu-devel@patchwork.kernel.org; Fri, 05 Jun 2020 07:51:56 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54856) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jhAok-0008Jl-2Y for qemu-devel@nongnu.org; Fri, 05 Jun 2020 07:47:24 -0400 Received: from mout.kundenserver.de ([212.227.17.24]:42855) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jhAoi-0006lQ-G0 for qemu-devel@nongnu.org; Fri, 05 Jun 2020 07:47:21 -0400 Received: from localhost.localdomain ([82.252.135.106]) by mrelayeu.kundenserver.de (mreue106 [212.227.15.183]) with ESMTPSA (Nemesis) id 1MdNHa-1j872y2HYG-00ZLOh; Fri, 05 Jun 2020 13:47:16 +0200 From: Laurent Vivier To: qemu-devel@nongnu.org Subject: [PULL 18/19] hw/core: Restrict CpuClass::get_crash_info() to system-mode Date: Fri, 5 Jun 2020 13:46:59 +0200 Message-Id: <20200605114700.1052050-19-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:XKi7JayfZ4bIxgyCevFuE8LkpS48h36jMCNo6wIMbki2NLRjQ2e dEhXtm19lPVfUII39nWqvzWoGn2OzFqyPz64x/LuiaLrcoOYvKVrA1uNcCG4iUwwrOWncHH 6cBON7M8HLr0VKcH9T7MHz8qCAXGRAB3A9fNBuOMyS4Mc8qh5iTtmw+isyyN3276giA1VUV dfaH6afLBiYZEDp16kd8A== X-UI-Out-Filterresults: notjunk:1;V03:K0:xLyV42TbOaI=:zqSL0zpqLVK7m/z+HwG2hX lCBVKG8EYGAVN8wpMz8zuU54SYApinSxyq8+lyWcwhGPxIwGwmYAl/bRQ7d9XWr1+DM94n0Yh j5nhxg38EfxI07kr5ySKy9jOz0RLDrj8yyo+iLm2dJMOh0vdTAAATGQBNV+rq1xUrJTrRM33t PWm6o0RJLXpCW1G+vmP2mqfw79CTQEP38jBh1zkb09LWEOJoHqWVHmKxlT4EIap5Bd0uUqEX3 1oehMPQtY4JQYSyUnZryDqWj7VK6I6d//kn9W2L9mMhZHUE1AUFEZbrPc72mLv/1EISPkRyf7 RqpBpoeeU8acqP+qQhBn84Wn6EHabZ8f2a8tdNvZNsK1RKqpJtlOQfQAZOQg7F8fJu16rWH/g qxv6ECMXLue9BkJmXwQrhKaBmLd0aLcmFTAc0YP8yfM4Wm94dljLqyzgw5AWuT/T2NtDRZkLY C0XMmX1NFHOYPldaCuK/YdMk6TvSOc7SUWEjt2YQ1D2OYvjdyhYW4OlhYC89Xr7pt9o9n3Aly gf9fStXAl59tNFClpmsaVjI0j1nABhtuvHlLvs386QRLKpM9pwgjLcZX4kT7RdRuN8Mf+rsm6 bR1ff1h6s8OqrHZ/swVIDhD4Uztu9WtlvWLTg0VcDiRCfLyRx+DKG7SL6G0USkBOY7BriW/nN L04JJU8aJDKF+ROMzx9y8c4wdTXZLiYBo7teAVzpOWxzBL6gX/EIGPO8tLw36m70Gb896ldGG uu4uycxQykZA/GhdG+vbBd1uPb3evcQyqT/UvBplBAiSx8+gbzaPQ/VinYwI9xhDhVBsrPNq9 VWhvgZUFIxGG6k/By/18fbcTvoujgNyeLqoPBKdCvzyCJH4yl9LsQdoFTeRQCE51bAMYLWU 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+patchwork-qemu-devel=patchwork.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-13-philmd@redhat.com> Signed-off-by: Laurent Vivier --- hw/core/cpu.c | 2 ++ include/hw/core/cpu.h | 7 ++++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/hw/core/cpu.c b/hw/core/cpu.c index 5284d384fb6b..f31ec48ee61e 100644 --- a/hw/core/cpu.c +++ b/hw/core/cpu.c @@ -209,6 +209,7 @@ static bool cpu_common_exec_interrupt(CPUState *cpu, int int_req) return false; } +#if !defined(CONFIG_USER_ONLY) GuestPanicInformation *cpu_get_crash_info(CPUState *cpu) { CPUClass *cc = CPU_GET_CLASS(cpu); @@ -219,6 +220,7 @@ GuestPanicInformation *cpu_get_crash_info(CPUState *cpu) } return res; } +#endif void cpu_dump_state(CPUState *cpu, FILE *f, int flags) { diff --git a/include/hw/core/cpu.h b/include/hw/core/cpu.h index 07f769815502..497600c49efa 100644 --- a/include/hw/core/cpu.h +++ b/include/hw/core/cpu.h @@ -490,6 +490,8 @@ bool cpu_paging_enabled(const CPUState *cpu); void cpu_get_memory_mapping(CPUState *cpu, MemoryMappingList *list, Error **errp); +#if !defined(CONFIG_USER_ONLY) + /** * cpu_write_elf64_note: * @f: pointer to a function that writes memory to a file @@ -539,6 +541,8 @@ int cpu_write_elf32_qemunote(WriteCoreDumpFunction f, CPUState *cpu, */ GuestPanicInformation *cpu_get_crash_info(CPUState *cpu); +#endif /* !CONFIG_USER_ONLY */ + /** * CPUDumpFlags: * @CPU_DUMP_CODE: @@ -632,7 +636,8 @@ static inline int cpu_asidx_from_attrs(CPUState *cpu, MemTxAttrs attrs) } return ret; } -#endif + +#endif /* CONFIG_USER_ONLY */ /** * cpu_list_add: 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: 11589535 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 41DD6912 for ; Fri, 5 Jun 2020 11:53:09 +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 D450F2063A for ; Fri, 5 Jun 2020 11:53:08 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org D450F2063A 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+patchwork-qemu-devel=patchwork.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 1jhAuJ-0002cu-RJ for patchwork-qemu-devel@patchwork.kernel.org; Fri, 05 Jun 2020 07:53:07 -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+patchwork-qemu-devel=patchwork.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