From patchwork Sat Jun 6 13:15:49 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 1304520 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=vivier.eu Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 49fKs82SGLz9sSc for ; Sat, 6 Jun 2020 23:21:00 +1000 (AEST) Received: from localhost ([::1]:44250 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jhYks-0004fz-0c for incoming@patchwork.ozlabs.org; Sat, 06 Jun 2020 09:20:58 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:39012) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jhYgO-0006vl-54 for qemu-devel@nongnu.org; Sat, 06 Jun 2020 09:16:20 -0400 Received: from mout.kundenserver.de ([212.227.126.187]:46565) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jhYgN-0007dx-6b for qemu-devel@nongnu.org; Sat, 06 Jun 2020 09:16:19 -0400 Received: from localhost.localdomain ([82.252.135.106]) by mrelayeu.kundenserver.de (mreue010 [212.227.15.167]) with ESMTPSA (Nemesis) id 1M58vU-1jiebu1pDQ-001DYg; Sat, 06 Jun 2020 15:16:10 +0200 From: Laurent Vivier To: qemu-devel@nongnu.org Subject: [PULL v2 01/19] linux-user, alpha: fix oldumount syscall Date: Sat, 6 Jun 2020 15:15:49 +0200 Message-Id: <20200606131607.1250819-2-laurent@vivier.eu> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200606131607.1250819-1-laurent@vivier.eu> References: <20200606131607.1250819-1-laurent@vivier.eu> MIME-Version: 1.0 X-Provags-ID: V03:K1:bZwLyqN3aA/vnQtCiqR+H1k3Suwq80XSSM8MTVmU33K7Hh6BFEV 04IdS0QP3GlndsDALpsaeNjlFK2avqP5bQbFlnl5SULr3ifbwh0/7jKaIGWV+YMV7O+6m1M PFe/rin3iv/gRhffDrD0Zfl2BJlKHuAv/ZYW6bubR3kqtB7HDH/H7lEQPG63fOQEkpJ0le8 2ZP8vqxsCQjTMvAd/cfew== X-UI-Out-Filterresults: notjunk:1;V03:K0:99abd0PLyYw=:8d2dMyzivEY2uw4jR8kTkN Nt8WqdXcWEGl82uLh4k+clMHFJeHVUCZym2kb2d4EPJYyk6TxphlpepU+JIWteetJqS8EzPcH nzH6wTg9JNwJ2wVA44MKOANP8q7+OHAEeRyloToPddf+jTJ6sdFsOsaxnZ8Tfbcf4g65Id5dS skqRPGAUMyzCeJJHb6eGF2uBJvSYsxcpqlb+TugrxP/8imgEXs4TOkratEnQR5qrGPvszBmQE rlfmaZ56zvhtNdenU1vaOI+wIXRPo7mOxXUfaa3Gm1JgqiO7VQzEus2e10p/C+S0KqtM0sR04 DzZtTcUT1WrRBBxNki9PHSRoXd+BudVB0XUWbFOgNETwbHo4JBDkA3ch8gdUy+2BbCKs8jQrk +TkxEBB51Ovu5S4Kxz0a7mN5s9QHryK241x/JzroMpxGOIzcHRneVQiFj0QdS429vkNmu9SHD ELu0xfECJtOTGXh09UYPXyCe+y1qGpFgmX52hVpYPqvgT8kSK3R5xby9q5Ujr9wpd2galOleO CNEvVTJbMdpq2JUUyaN8O6WH7rAjNs/e+qXDpZwCl/7WyajK6ms0Q0evdOJx6wYzSyaezvb5Z JBj/dmeM629ljsKvRaCuHg9qHVeg4g/A9jFu1D8E7dJtJ3a4IEO7mRXusLVM0ZK8GfEx6+LNs 2ZZlxPWy18q5FLAct5zI9H9rtiFclhO+FwWCn+P6S8eb+cxCJJis27kNTdPArSkj+QtqO3EJ0 a+eO16jTZaiyxQcfPC6lfSgDxdz82tcv0ePLtdCFJ3J0QjiPGJrpeaE/1t24FiXd4rVgw2GJ/ 9PwGinuWSH/3IRcVXZxFaF4J0I9M5C0pUNaKEeP5HAkPmg7mVoCnFZs5S5lzj3fKbKhxS9Q Received-SPF: none client-ip=212.227.126.187; envelope-from=laurent@vivier.eu; helo=mout.kundenserver.de X-detected-operating-system: by eggs.gnu.org: First seen = 2020/06/06 09:16:17 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+incoming=patchwork.ozlabs.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 Sat Jun 6 13:15:50 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 1304516 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=vivier.eu Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 49fKpn06T1z9sSc for ; Sat, 6 Jun 2020 23:18:54 +1000 (AEST) Received: from localhost ([::1]:35766 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jhYip-00015F-OL for incoming@patchwork.ozlabs.org; Sat, 06 Jun 2020 09:18:51 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:39014) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jhYgO-0006wA-BD for qemu-devel@nongnu.org; Sat, 06 Jun 2020 09:16:20 -0400 Received: from mout.kundenserver.de ([212.227.126.130]:43461) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jhYgN-0007e1-BI for qemu-devel@nongnu.org; Sat, 06 Jun 2020 09:16:19 -0400 Received: from localhost.localdomain ([82.252.135.106]) by mrelayeu.kundenserver.de (mreue010 [212.227.15.167]) with ESMTPSA (Nemesis) id 1MryGj-1jDSb13tf3-00o0iB; Sat, 06 Jun 2020 15:16:11 +0200 From: Laurent Vivier To: qemu-devel@nongnu.org Subject: [PULL v2 02/19] linux-user: return target error codes for socket() and prctl() Date: Sat, 6 Jun 2020 15:15:50 +0200 Message-Id: <20200606131607.1250819-3-laurent@vivier.eu> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200606131607.1250819-1-laurent@vivier.eu> References: <20200606131607.1250819-1-laurent@vivier.eu> MIME-Version: 1.0 X-Provags-ID: V03:K1:GH+GrF61wHfttu5TUBrKLAny1ovnhkSV9hrq+T78UXDQd2VTHXN v8oOSdcx9UAFcnEz2F6AcL64oi3dDbAyNdy7XV7woA7/sUKFD1v54ZEvL1OkB49lE3fo1BR m9nSHkRFiS7aXkGFSein0PMPqc3DfzfpgRf0jK4qXZRz8OaWaE1uxS8DEbpi6bY+6rrB8ow ZSi/56H37FvvVu2nrIz9g== X-UI-Out-Filterresults: notjunk:1;V03:K0:zUKadZFEiHw=:jXE6eTZp9BEDYrUzZBw8FJ ia9iyFbyY7ypzCOTZ4ItB05eNnrRRLaG4rTyzkytKBXkf57hPHCzCra2EiG5YMjBmHI3Pks4W OniFcXnWVMBq1ttwCDZQSv6QnPKSiUA7kPhvvBi27RZ+Ap5GLFKgtWGzemMFvRS4hSjg8TuN7 LEAMwxk/h3/vlHWZxbLb/ZfuzYNMCMIZeTav3gHR+vRT/HIE9hVwQ/0Z3atyauo+XoxlfNetI p8VjM6PXP9vD5QQKwG3G6dpI/yYtOwtFfTHpkeD9pUj/ZIM5wJFa3AWX/o+Yl4l/CUOir1vqV tqWGD9mCubMtvZjAwSQBIlszN0tlTeFpJyJ5h2XMqVlOzwq0tMUf2hFBijTo6D8kuetHDBQot zumimwtGrCyNJxC20vgzTCnSNWL2iuZatAV6kShLnn2w97dOZ/EBjtNDjx7OYIgUS06Ukq0ve ZDwJ6osgoEF6a/xDwi71hP11is7Cbsylzr2tH7ia7HXyQ60cvLFYASWV0kE5ZIj24HEuOH3+k 7TBIhFU8mhZIvYHh06oFyBg1ve6WJQ5w/hkwoW/OtSEPC6rQQpjB/8dEI834ilBAXgkr8w5xq kufYE67lOAzWHW7W+MaZ8Mj1TKquQs1YKyzovbkBDefeHcoD2Nurmq2PbXVXkz0cdd8eP+rQn swAAoJBuwg7ic17Syl1aKKSjHLV/ve90WsLJAJ5yV1YmVhdXdqECHI15Z8iPZD0XTdpBPc7+2 p5EV0OGf4r920Ga0Vk199s+rkQbJbL01TsLqmQqC1BMgruUnpJ0mrYxjj/phYWoXvhtrCCeBX MsSS8Q4g4mU9dKfL3W5k0V1sJ5s8Yc7OOnxOvezGsdSnO/gPBFhpZOViS7qWLL2m3ULV2FV Received-SPF: none client-ip=212.227.126.130; envelope-from=laurent@vivier.eu; helo=mout.kundenserver.de X-detected-operating-system: by eggs.gnu.org: First seen = 2020/06/06 09:16:18 X-ACL-Warn: Detected OS = Linux 3.11 and newer 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+incoming=patchwork.ozlabs.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 Sat Jun 6 13:15:51 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 1304519 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=vivier.eu Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 49fKs66TfFz9sQx for ; Sat, 6 Jun 2020 23:20:58 +1000 (AEST) Received: from localhost ([::1]:44138 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jhYkq-0004cQ-H3 for incoming@patchwork.ozlabs.org; Sat, 06 Jun 2020 09:20:56 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:39022) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jhYgQ-00070J-6t for qemu-devel@nongnu.org; Sat, 06 Jun 2020 09:16:22 -0400 Received: from mout.kundenserver.de ([212.227.126.133]:48845) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jhYgP-0007eU-62 for qemu-devel@nongnu.org; Sat, 06 Jun 2020 09:16:21 -0400 Received: from localhost.localdomain ([82.252.135.106]) by mrelayeu.kundenserver.de (mreue010 [212.227.15.167]) with ESMTPSA (Nemesis) id 1MfHUx-1j0mrw23lz-00gsdJ; Sat, 06 Jun 2020 15:16:11 +0200 From: Laurent Vivier To: qemu-devel@nongnu.org Subject: [PULL v2 03/19] linux-user: Add support for /proc/cpuinfo on hppa platform Date: Sat, 6 Jun 2020 15:15:51 +0200 Message-Id: <20200606131607.1250819-4-laurent@vivier.eu> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200606131607.1250819-1-laurent@vivier.eu> References: <20200606131607.1250819-1-laurent@vivier.eu> MIME-Version: 1.0 X-Provags-ID: V03:K1:THmXRfsdvAcLBP+SJvjaIxid7FGcXSr0p2Uioo8O0+LTnWtXtvR +PVpOh46cLnhT92dMtSzSrBrldXsbvfSFk7/SRV1GUSOYzotxVHW69HtEV6MinsYBu7oacG DBUqMgnQFcQgSE12DL16kmH/TkmDbd4P7MqjKpWEiCV7fqV6GH9cYGVZy1KOcPd+L/1mR1E gqIytfY0ipIWb+G/6Wyow== X-UI-Out-Filterresults: notjunk:1;V03:K0:KTNSjse3MWc=:tZvT6K5ehiDUlfiy/Q4P+c X1YUAzEonyAZmLMC2US0foWrdd6dQTZPfkAHv/3yBJuZ4vukHAc5rQMLxVW/IwRSVb4v6acDT uqDOLG4DfA2Uo2Igdplaig1kd5mwYQoB0sj208LRlOgaWvp35OfzE7QaxLPWrbWKdoV8jZry0 BmUmkHo/FZP89oMiwfcd3//BUK2Ywo8n5NMakytS09+71Khg2a+A27qaIC075t+o9nuNhDIMI xuugcknkpSeACIeH5YBaiNd4eYiDPVV8FhhLz5adYDCXGkzLpvUZ2JQ8p1NqkPmR1FYcg2pfT YQBUZicPafDNOYGL1huV8+8aU9tBFlmErZuc4Wm6PRwlZER7b1Zcck0G2Ww/NAJSMv6zF+56i eMyidArlm6RA0r1wMcE8/y1DQ5QgMonbNR79tTuUnp54CfBHWI3I2qIrz3ijz5pb1JwZlCt2V yySaJQ+4zC1yG5Mk8+y+HSo+moWPHGhw5PyprjE1CQ5J+OMk4IlmjUTlRjz0avCpoiBBTzKMo DA+/cJK7dU/tSWFACoFWcuJ+Y1I5RBmjxCOvcH/qZSULdnWNUZbP05Zys6nnpCVn5BH4bKmuo O0/zT+8encLMJkXSWEIcifPFlK08r77G3F3Dxvkt+Hb7TH7feBQFgVmlM2KShWcq2in9ggdri wuS5+1IR88/IMhTTmJ7oABHvJm93geQuhqQb8QYIFR3pOZZN6Q+YptReuhYi+5R/IieZxgzk8 xef0jGIKnZciSPRTqNzqdtHOuYNFTFo4W30xku8fo6D6pEoZLWx+ehrxSDP2gTvYGr0BxpHwf X3sONpiaiGCau0Ti+UibV/tfEj8cnkeS7wOI5f1r3bDewNcZfk2R6eUXHYicSWqTD3ZCZnN Received-SPF: none client-ip=212.227.126.133; envelope-from=laurent@vivier.eu; helo=mout.kundenserver.de X-detected-operating-system: by eggs.gnu.org: First seen = 2020/06/06 09:16:19 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+incoming=patchwork.ozlabs.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/ and add TARGET_HPPA to guard is_proc()] Signed-off-by: Laurent Vivier --- linux-user/syscall.c | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/linux-user/syscall.c b/linux-user/syscall.c index fd5c4f1d73e6..9ac3af20c176 100644 --- a/linux-user/syscall.c +++ b/linux-user/syscall.c @@ -7378,7 +7378,7 @@ static int is_proc_myself(const char *filename, const char *entry) } #if defined(HOST_WORDS_BIGENDIAN) != defined(TARGET_WORDS_BIGENDIAN) || \ - defined(TARGET_SPARC) || defined(TARGET_M68K) + defined(TARGET_SPARC) || defined(TARGET_M68K) || defined(TARGET_HPPA) static int is_proc(const char *filename, const char *entry) { return strcmp(filename, entry) == 0; @@ -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 Sat Jun 6 13:15: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: 1304527 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=vivier.eu Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 49fKwb2Jvnz9sQx for ; Sat, 6 Jun 2020 23:23:59 +1000 (AEST) Received: from localhost ([::1]:32918 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jhYnl-00038n-23 for incoming@patchwork.ozlabs.org; Sat, 06 Jun 2020 09:23:57 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:39048) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jhYgV-0007EA-W3; Sat, 06 Jun 2020 09:16:28 -0400 Received: from mout.kundenserver.de ([212.227.126.133]:34749) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jhYgU-0007fF-Qd; Sat, 06 Jun 2020 09:16:27 -0400 Received: from localhost.localdomain ([82.252.135.106]) by mrelayeu.kundenserver.de (mreue010 [212.227.15.167]) with ESMTPSA (Nemesis) id 1MnJQq-1jI9Yv2r3c-00jJkg; Sat, 06 Jun 2020 15:16:13 +0200 From: Laurent Vivier To: qemu-devel@nongnu.org Subject: [PULL v2 04/19] linux-user/strace.list: fix epoll_create{, 1} -strace output Date: Sat, 6 Jun 2020 15:15:52 +0200 Message-Id: <20200606131607.1250819-5-laurent@vivier.eu> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200606131607.1250819-1-laurent@vivier.eu> References: <20200606131607.1250819-1-laurent@vivier.eu> MIME-Version: 1.0 X-Provags-ID: V03:K1:SBmLxARCpMkkme1rs+rXrj3ycndHosz/E65A48jUjsIk8xZVuTb hGoLqcJ90InbFK1IF/hN9weDpJfCbe4f2LlVMbdQRTDMC97Sdq3BowBWeK+t9iMNedARH3h EqnJ3+yTYt1bXKhUijwg4LqOxc1CZzwiq+tN23uWN6Plsf+GkUtUS8xpNJCAw147fcsvlZW lvFQJd0Tce1e5F52zV/YA== X-UI-Out-Filterresults: notjunk:1;V03:K0:5V+2sR6BH/w=:FwAWrkIhVbHT0E0a8PAVMB IMC450gHNB/4u1wIjJ4LOrN5FNpwoUOGRLSbQCToyfeBq7vUmXCSLxvLvpzXqqgHFQSQCXzo0 5wlPhmxV6ogvRSKVCMNJBcYKLnVrnal6Yo3VEY/z8DATwavxOwIu0mWR2uB4828DgFb3xLNfc 9nIXE9jk31uwPh68Xr3TIG+X5sngIL0ch2m2TTt6TwA8BAxGZf6OYOh57Sa2kFlpfBnZjydi9 eWnY7TUxvZ6OCqVnuEMOgOFyPyTThGzzRPQiC8Ii/5h8O6MnT7g/Y5fZY7vh/LeyqFrCSjk6e 7u/rqfw7iojMlpmMCX4Ag85uglAHofRvo9Pp4dfcH+0akSJyWX9sbw4pVE3LLoLWzue5oXZdV 9972FTDrBENX5Zm8oz5WwRJXl2INDjs+2swrfPmwLmWN1vtPBwRV1TqPqL/ggBz0SZanbC5C3 fDUzmw0U4uQBY1s2JU7aaDN9/elGVAvwGfoHfW0dgsOPPieMgmKulwK2b6YEgTFbvUk9WuQyi GBT+s6FUZVmLzs1MrwfVLFqMe8j+XOuZSUSwN6qlPDeL7ikxIWYZhvvfc8hpT6yoPt+ppjUkY fwLjMYr6YUdDycP/AXcSMXlzdThu6BrnW+hIrXiCDGr8nNzhbv8MLK/iwtx/Gk8AcV9qridGH bzaXcDKHPTGQoCCI9x85VDKV0uXoQApOGfUBLFNv96mlPdE9YLJq994hqwE5c2c5mBSUoo9kp 8mR0RMfHKGVXjinJTD57wa8xlsX5GSYHwFhT0+v7JWanCgFmpvxYr22je7JlwDVBXYV23tJtf IvafQYEHthT2o6Rglr9dulK0jiM0I+EjK/7iqzzX5DE8h601xnTJLEv8jwfErYY11IakPI+ Received-SPF: none client-ip=212.227.126.133; envelope-from=laurent@vivier.eu; helo=mout.kundenserver.de X-detected-operating-system: by eggs.gnu.org: First seen = 2020/06/06 09:16:19 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+incoming=patchwork.ozlabs.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 Sat Jun 6 13:15:53 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 1304523 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=vivier.eu Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 49fKty4JxRz9sQx for ; Sat, 6 Jun 2020 23:22:34 +1000 (AEST) Received: from localhost ([::1]:52642 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jhYmO-00087u-6K for incoming@patchwork.ozlabs.org; Sat, 06 Jun 2020 09:22:32 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:39030) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jhYgR-00073B-Hi for qemu-devel@nongnu.org; Sat, 06 Jun 2020 09:16:23 -0400 Received: from mout.kundenserver.de ([212.227.126.133]:41469) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jhYgQ-0007eb-FP for qemu-devel@nongnu.org; Sat, 06 Jun 2020 09:16:23 -0400 Received: from localhost.localdomain ([82.252.135.106]) by mrelayeu.kundenserver.de (mreue010 [212.227.15.167]) with ESMTPSA (Nemesis) id 1MYvoW-1jURgM0mJM-00UpGg; Sat, 06 Jun 2020 15:16:14 +0200 From: Laurent Vivier To: qemu-devel@nongnu.org Subject: [PULL v2 05/19] linux-user/mmap.c: fix integer underflow in target_mremap Date: Sat, 6 Jun 2020 15:15:53 +0200 Message-Id: <20200606131607.1250819-6-laurent@vivier.eu> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200606131607.1250819-1-laurent@vivier.eu> References: <20200606131607.1250819-1-laurent@vivier.eu> MIME-Version: 1.0 X-Provags-ID: V03:K1:5vJbdaOyDOX3IMuwj7hoM3dwXxGnuZNYnT2XOSsk1C9ZXpOPz9M FCbrpW+c9RRCHL9YsReuoWlNznlvnesTC/otnrfqiPD2QMO2m+sehww62L8fdXlyeEAV3dc agNzoqwe8i7NNkpXwuOBeTGpJpfjQJYUdrf/GZTZdL2ji+oJWezmj12fsAx+5RMl9N9U3VF +Ajpgr+SPeR4mab4cwv8g== X-UI-Out-Filterresults: notjunk:1;V03:K0:fsqNGXrgIQs=:NH0NKH2RETzBlgDmx00wVf DuxFiBNe2ZWOzxk+T67dNB+XilJGRAtjTxN8R/tQdsmBFjvQiPL0fcd1vxJClDH+XdCbeKaVB VQyjC8GDZHcc4069n5F8t71fmwSw0Il4eJFJ9PSEMX0yBxUUiqfbDMDy3CEz/rLQAvrjykxiP NamrY6YNL7mdn4LqDYo5mjbCJAzv7zy6F+IdF/QdpFHd9+rN7UkQasf3m73rUKUgjmlPP7Ow3 QhiegWrm7fJnn8g9h5gr7Pun6ifBOBRgmskoDaJXkNhRmyAneoxQf8ZqvBlaOSAoB+8K7YyU/ QGryAPFlnDr3baw3GAXrRN05eUcBx88+A7N1yQY5f0EhVbO18sLS/xzaqG9vAFaOi5cQBdYOP 5ImU7TwyRahuHdSkvG85MF65JknkomtAVfPMBqt3tDbI8RRDIOBo/4q8XJYqY7xvlufoxDszq EC8pWK6hErcoxmYufuwDrNgFvDi5ut13fpdVMz5Hcu8YVbLN7gd32pwmjr1oysvIGzdwzsbYX BbzCVDQLpFHWjrhog8NgmsfsySTEaLQlicjq+9KPnJ02u7mtmrwZN4xJgDLjUtOUq2+ewEuJA /9OGAsm2Tkjn8XNWVEP0mUHhm/YuddKK1agXsXzxT92u7kBtMnfVhePEkHQPKC11w6Gnd3lwr rNwEl2HOkyOGdgCNJ6qoZwPUXNTXt3TJ81RRtIaz0ThuYhajZK+qEWuVW+TBhfV0zuKUtOanU SIBCkt0dq0LdusPrx2135+1gCf0tbY28Vm4mVyh7XBbe/JAjJHiJGLTgSO+4z7DqJ6ejN8ABV h1AMKv9HEitlNRsxbMxY8qaKYXX6sy6/qIqRHdtZYGyceP9RMlj0AN4RR01UDUksc+kmxMC Received-SPF: none client-ip=212.227.126.133; envelope-from=laurent@vivier.eu; helo=mout.kundenserver.de X-detected-operating-system: by eggs.gnu.org: First seen = 2020/06/06 09:16:19 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+incoming=patchwork.ozlabs.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 Sat Jun 6 13:15:54 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 1304524 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=vivier.eu Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 49fKtz3XKzz9sSS for ; Sat, 6 Jun 2020 23:22:35 +1000 (AEST) Received: from localhost ([::1]:52764 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jhYmP-0008BK-43 for incoming@patchwork.ozlabs.org; Sat, 06 Jun 2020 09:22:33 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:39038) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jhYgT-00078Z-Lb for qemu-devel@nongnu.org; Sat, 06 Jun 2020 09:16:25 -0400 Received: from mout.kundenserver.de ([212.227.126.187]:50593) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jhYgR-0007es-ET for qemu-devel@nongnu.org; Sat, 06 Jun 2020 09:16:25 -0400 Received: from localhost.localdomain ([82.252.135.106]) by mrelayeu.kundenserver.de (mreue010 [212.227.15.167]) with ESMTPSA (Nemesis) id 1MUY5o-1jYrXC2vMu-00QPQM; Sat, 06 Jun 2020 15:16:14 +0200 From: Laurent Vivier To: qemu-devel@nongnu.org Subject: [PULL v2 06/19] linux-user: implement OFD locks Date: Sat, 6 Jun 2020 15:15:54 +0200 Message-Id: <20200606131607.1250819-7-laurent@vivier.eu> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200606131607.1250819-1-laurent@vivier.eu> References: <20200606131607.1250819-1-laurent@vivier.eu> MIME-Version: 1.0 X-Provags-ID: V03:K1:BYn4zGr7uIuxM6JoSVqH3Eo2qGskmQRusG6ttdwoYfnGF9DvBR5 99j/xqQmlMjUNOvbX2no6gMQM8Dy7VNUOCHvNuzxVVAnZAm2fn7AlWwtqacX9SSRJZ1lXsi GDE4K4Lzg5f1tAOwftaKiUxRMiq0YPZ3X5EBLwuWm1x+k1Zbmb76aQ2AT0k1cUalB/a7Rr6 eOWC0liWaHDuiHl2lPgtA== X-UI-Out-Filterresults: notjunk:1;V03:K0:7r44l3UW59g=:ZQeHtNmVezgTQbv65jocmK jVxPcEpMHcOlx2vDveBjV4numjLEZW+VDGtqdNOIPfxFna6HNudSoQf9hFp/Urlp6VCX0sABr gBiVhFPzKk9rKvYpUF3cv1NBVAXMoYUIzmoyw8f95e6U7PVtIrdC8IEPvI9T5jdDxWojmONBR S83yiPxJbrxXuIFU4D1KUV1ziZJ+gPBK6BAtvuFa3Qb6hSXCHBJS2MA8QGdGpPOVFgFdQc2yB XHT1agQlhXXKRjcBP5rdDa4fJTvFw3d6J0hSYG7FvCSmkn36PuDyWpHjHZdsHFo84tSCvs0a7 pgqOLt+BxPJf9XTEOXAtvKCXB5W1zoxtiwLh2yrJ+1Cr82RoiTFfaP00WeiReKGABLkD96MRj sO38g3OUYbWytnhqYv/8rG+WaxIKvn1ZysmyPZqTygfdrbOtJhBXMXzImCqAnPwxU+B4yMz+u B6IU7g2UVCIygb38RVdtQ8kkEOcx2XRmvuY/bVKA025MstR0MSPobjooDY1xuLgALgHb9LW3q gY0V5BZByn4fZNfPDS4A1qNkKlhVGjI0PG50MBHjmQ7+w+QJHn/a4U/xAy1OeMpiiV1Yk/MUm q2Aj/XJO9ZRz/TMhrYCySgZFSod7PbsjAMe1lWsE3IE6+gJxNPKqGlwgZQVR0EONpggQ20WAr 07YnAg0tuf4jaZ5dzTPxgXEA1hFH0q+bNDp+A/iPGNkO/hl9FCQKOYI17ElVk8ThCDpKQFj8I XU5n7t2jZmlKjeMwZbtcLS8dUkfqqm2bVyOQhUXiAwgeTYnKZ3RdvVKcfH7+FVYVtzHEbf3pc JLXIxK1LWnKqs6J43RtMEtIIZY+6i2ONeoScELMG0AVPxJJ5e2OXi0p62/GbaCtyX6+LQVF Received-SPF: none client-ip=212.227.126.187; envelope-from=laurent@vivier.eu; helo=mout.kundenserver.de X-detected-operating-system: by eggs.gnu.org: First seen = 2020/06/06 09:16:17 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+incoming=patchwork.ozlabs.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 9ac3af20c176..2d8125fa53c6 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 Sat Jun 6 13:15: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: 1304530 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=vivier.eu Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 49fKyS6HFYz9sQx for ; Sat, 6 Jun 2020 23:25:36 +1000 (AEST) Received: from localhost ([::1]:41328 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jhYpK-0006f1-LV for incoming@patchwork.ozlabs.org; Sat, 06 Jun 2020 09:25:34 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:39096) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jhYge-0007P4-Gx for qemu-devel@nongnu.org; Sat, 06 Jun 2020 09:16:36 -0400 Received: from mout.kundenserver.de ([212.227.126.131]:45829) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jhYgb-0007fx-Ut for qemu-devel@nongnu.org; Sat, 06 Jun 2020 09:16:36 -0400 Received: from localhost.localdomain ([82.252.135.106]) by mrelayeu.kundenserver.de (mreue010 [212.227.15.167]) with ESMTPSA (Nemesis) id 1MWRmF-1jRQTL1J51-00XqCz; Sat, 06 Jun 2020 15:16:16 +0200 From: Laurent Vivier To: qemu-devel@nongnu.org Subject: [PULL v2 08/19] configure: Avoid building TCG when not needed Date: Sat, 6 Jun 2020 15:15:56 +0200 Message-Id: <20200606131607.1250819-9-laurent@vivier.eu> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200606131607.1250819-1-laurent@vivier.eu> References: <20200606131607.1250819-1-laurent@vivier.eu> MIME-Version: 1.0 X-Provags-ID: V03:K1:euRh+2bSeRHBL0yyFQR5Tn3qrNSUgtcO0BzEgWzoR3PFD5VIN2W Y2YCfjhUH8Uzp+9LI79M6AAHfVq4Zr4jTj6AKKIMM/a9qKbS+O2bbsWbPpFiimALZ2sR2up 6hfa8ZllXd52AE5OR79gTU8QJ93r6SilGsfvqxzGwx/2J2oeDyuf0ZW44JFBI7aS2BHuzR6 2tiR/U+DkZb+zyJ+PljKQ== X-UI-Out-Filterresults: notjunk:1;V03:K0:iFs+jX96zEU=:szVbC4Jtsnaf49lrpV7DDv fttqqejwaLFLlHMYjooGD/Z5ukxhmdwzYfeGsYvnbDyrZT1I6keADM2/iLYmrk4wbPTyIpd99 Y0VLFRgp4O7SoxygUqHMbecu9znNafKfOxT3smrgHeGITlY5Vjk0LK8DLzdIKA3q7rC2eCE8k bj6L0gwniGMJzfV2lzwteUFpWOMbZZMS5nCeONWaS5ztiKrfy1PhLjtUSI7vDYLEhUywaRL1Z pD/pbTbhzmjPCLi813aA60ZjsK+SEt027IVxRuvbMqtK1FXsl7GAXy0zbPck/eHMEUDOFZ7sP /w9n95W12L8d7ltvPwYWcLGKN6FqPMHwEE1PupXSVIMxyavPcXYB/jKnCZ0AfiO+lQHd4Rip0 MM/12D3aUTp1bQfKBB41/DHJjrjAYw91XPhg6gRuyMqX0rsvM26rSy4Hjx5T8PU2EQJE1UV3s hOe8Fw2PTyjGteZBcMNyby8qBPSAK9FuQXRIHVY4Tm1FMk17/fz9J28eS8rSEq1A4b4QVCvXd aLwOjsGVsZ9TplwCwv+uvC3iOuTazyOx1i9pBV65M8Z3jJl5kvfnX6USNwbG2a2CynDduQ09E ZlMN8wntbjaw9hn1HCCjYsh+nfv/QWMkyr5ND43aDisT1JhZTfZMOoryKi+4qTbDjMIYW1Qv4 T43RWKTI9WY33/ONKVRfdEZebdXmLYKXdkks3qurA9FEPEMnDzJAAi7wT6Vz6lPlouWEGjF4r hhgcrkoTNZkkIeK1KGs4k058tt9lqUL9rj5Xh3CsR/QHL3/Nz6a26rMeO3JJAwa/1GZdr7qPI 8wZENyE0JKyq/c1+mik8+qwaIj2RHt7hdFGbKoebVPRlRqLFkaip4luXO0wftTX8yPTFFtp Received-SPF: none client-ip=212.227.126.131; envelope-from=laurent@vivier.eu; helo=mout.kundenserver.de X-detected-operating-system: by eggs.gnu.org: First seen = 2020/06/06 09:16:17 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+incoming=patchwork.ozlabs.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 Sat Jun 6 13:15: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: 1304534 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=vivier.eu Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 49fL0m6XByz9sQx for ; Sat, 6 Jun 2020 23:27:36 +1000 (AEST) Received: from localhost ([::1]:51104 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jhYrF-0002H6-LB for incoming@patchwork.ozlabs.org; Sat, 06 Jun 2020 09:27:33 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:39092) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jhYgd-0007Nd-Tp for qemu-devel@nongnu.org; Sat, 06 Jun 2020 09:16:35 -0400 Received: from mout.kundenserver.de ([212.227.126.187]:35329) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jhYgb-0007fs-T3 for qemu-devel@nongnu.org; Sat, 06 Jun 2020 09:16:35 -0400 Received: from localhost.localdomain ([82.252.135.106]) by mrelayeu.kundenserver.de (mreue010 [212.227.15.167]) with ESMTPSA (Nemesis) id 1MmUcL-1jGmVF3wzB-00iUPH; Sat, 06 Jun 2020 15:16:17 +0200 From: Laurent Vivier To: qemu-devel@nongnu.org Subject: [PULL v2 09/19] tests/Makefile: Only display TCG-related tests when TCG is available Date: Sat, 6 Jun 2020 15:15:57 +0200 Message-Id: <20200606131607.1250819-10-laurent@vivier.eu> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200606131607.1250819-1-laurent@vivier.eu> References: <20200606131607.1250819-1-laurent@vivier.eu> MIME-Version: 1.0 X-Provags-ID: V03:K1:2CwXTbYR6vH8kFpUc7gS93fA+cfHFpzObB0sirNk3bTcC9GMQ6c qdGNZ8W4vdClWcq562PneQZb0b4LH5jO0QenObAluog5+pcTWYlABJpHFTVXKoBwUAio8qh 39Y8dAiduaiSX5Ng3QaTkdwjcANw+ahIT908h1pcPkR9nBfV2FDZH6mamfeByvFuwTr1eW7 9VSm1RwAA7syT8Xt6rbrQ== X-UI-Out-Filterresults: notjunk:1;V03:K0:pM38J6YeDW4=:XVA/q7ucK/yu/WH+dM2GCq OKXTz/FC7c9LpKi34WMF7ywbSMHTxYyZtXfqiA5XCWrK+jE7yvQcyXRiw4/2hVi58WLTINVW6 n0wurbwfuQBcKo29pBhdXUXMt30g28XoVyIidwxa9HjEvyqUXtQF0sksi14HEmXM/XGqDDfus VYxptAn3AXMayfKZ32qIkPk2UiOWIPgnfiIQFUsmYPnd93gwS9hqsWEWKYALUZO6O3FWYFcKE F4cJ/2sz6El+C1kCjLCcJJ86J+oKno3TR3xeEWfG1xwvYVGRftPjrMsn58MSCan+C3Bv8xaR+ Xaf3ydR6pCLHbDGo3xH5bmmuIFJpupWBL/7yb5aUVnr1W981K5DxJND05EFVrEhIebp2RimaQ IVPYvy41+3yfXs/LJ+3ploXHUrUth7ZX+DGHshzwjZJ+tiHPLX47oLk88tLxK/rtr9yO1O+1o WNL9leBqcMxSZ4JOiTsdgFiEf8E44VWPSr7i0pR6zD1S9VcCNalyMzuD0taemf0FetDHBXpNK KnQhsAdm0N+n3p2V074AcwGZb4tO2Zyqk+MKlcboD5z2S6rbD2evUKUThHEaqWlu9AGCPT5Jj 8mC1xMWYqKbaTunpginXnU7818dGnoqseoEoUhQvH6NRvXLOd32zrfQWIWq7CuMYURKDXMQm7 5Jl7ujpRYcCMHzzYwF+VGfLVKhglDhvscSs/m9/mDqlyvfY9nBzJjoZyJQ3LQNcBiIUbSIz1a vmQ7psQi1mWHO24ltt/Vd7z89jU9qTPwgkJ/3eIn0uZ31ulAgv1WL8nSMvriM+0BIgBvlrjGL utEgWc9QKKruk7GicTSczVtS/ztXYfw0eN33aZTrnhtjg89unLQ3DNezlMH2EuDeS2aSGB8 Received-SPF: none client-ip=212.227.126.187; envelope-from=laurent@vivier.eu; helo=mout.kundenserver.de X-detected-operating-system: by eggs.gnu.org: First seen = 2020/06/06 09:16:17 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+incoming=patchwork.ozlabs.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 Sat Jun 6 13:15: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: 1304525 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=vivier.eu Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 49fKvH1bBTz9sSS for ; Sat, 6 Jun 2020 23:22:51 +1000 (AEST) Received: from localhost ([::1]:54060 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jhYme-0000G5-QR for incoming@patchwork.ozlabs.org; Sat, 06 Jun 2020 09:22:48 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:39056) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jhYgX-0007I2-Pn for qemu-devel@nongnu.org; Sat, 06 Jun 2020 09:16:29 -0400 Received: from mout.kundenserver.de ([212.227.126.133]:40297) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jhYgW-0007fa-51 for qemu-devel@nongnu.org; Sat, 06 Jun 2020 09:16:29 -0400 Received: from localhost.localdomain ([82.252.135.106]) by mrelayeu.kundenserver.de (mreue010 [212.227.15.167]) with ESMTPSA (Nemesis) id 1MQuwR-1jLsZS2Jnz-00NzMn; Sat, 06 Jun 2020 15:16:17 +0200 From: Laurent Vivier To: qemu-devel@nongnu.org Subject: [PULL v2 10/19] tests/Makefile: Restrict some softmmu-only tests Date: Sat, 6 Jun 2020 15:15:58 +0200 Message-Id: <20200606131607.1250819-11-laurent@vivier.eu> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200606131607.1250819-1-laurent@vivier.eu> References: <20200606131607.1250819-1-laurent@vivier.eu> MIME-Version: 1.0 X-Provags-ID: V03:K1:0d77vywlXSIr/QyK74MUzi8ToVKmhLC91J+32C5XTUekvll3ZnY n4KIQqOzfZb/hQCuyDH4QDHgq6EnuRbFGQOAjJwHq/jA1ibmruZXit+15Y6wz4sG2XRGgbG 6ggo9duWg3NaqgfRNJVGAvjXopkn+ya1CipC2QNlmcWT+pb4qfIbVPuCEZIda6rw6VQ6VGz Eb8vWSLrP1/BzKwOJMf9g== X-UI-Out-Filterresults: notjunk:1;V03:K0:G1gy5rMAdeI=:PyGoKuG280zSjCpy4kbZ6w gMfIeqQv5Z7kFcUZCR+Ch0A8bvxACYY5ZUKCyiyiXHCf2vqpoEuFv2p3rKPCcJfl282phCie6 iL/A/9ke8bfqXIeJzUJcM99PtZ/OVBRA9fgdPcoyxvby6klPz2n2WkehZcmpIIFAah9eRhysi 6fQsT17N+KnE6BOSJLeOZoYvJ5Yja8/gDrvZcKeqUizGQuiRlCODxtv935nPH7KfOXa+v50/d 9VCbp/Ic+3QDIKPJlMfFv1XlWqzs60BTuf9ySzw2UrpN0clAobzDPSZfJPAo5O5r6kAe9GRPE MZyWRLWwFLac+ZMecPn9DdtKADp6MhRSzcIZtr7NfZkrJegAnEnTfb+JeOzaBpU5R2vzqWpeN nbp7+A3FKhbyqhMFoB/HcznSEvgQYJvZEeecjtA6MCg7pxWGq/70C2vA8e1jTiNlfxxrEiTzg ZZKEX7dDM5AmyTjl8zTVBuzYNfCQVDLAZfrP1dCqWyUp5df3oH0wBnHr4Cf4giCi9AlEF6IwA AZtXqx6anq9CfBV07/3rI2BmwBsFd00ggdVTSIYAjJNmziC6F+o3dfmR5WxOuDiRZ46BmInwi VUFgcjqRwCGK4Yycpw7CrVB7hgP5saUlqDPU35BD6gu5lSS0dDw9UEeK/Fj3Q9I+JZkk0Tdid Sk9SoHxZ5lbXU68aqwiusWpXlf4xcn72ZT4MSdwYGSnFwO4sSUsSGhoXGH8eyaeuE7Ug+D4dd MygUdAh95I97NRdd/nRhPNtXiTEDY7oWaSB71cPiil+n/mMfvPZ2ok07TXWzDswfDl8a3H35F dTm7IsgIAB6roQZWecpNmy+TC48hi5M7X79sFv4ulCJh53TXPmjimfNEal6pIZpF+hhXg+Y Received-SPF: none client-ip=212.227.126.133; envelope-from=laurent@vivier.eu; helo=mout.kundenserver.de X-detected-operating-system: by eggs.gnu.org: First seen = 2020/06/06 09:16:19 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+incoming=patchwork.ozlabs.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 Sat Jun 6 13:15: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: 1304518 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=vivier.eu Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 49fKqT73DRz9sQx for ; Sat, 6 Jun 2020 23:19:33 +1000 (AEST) Received: from localhost ([::1]:38630 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jhYjT-0002GU-Kk for incoming@patchwork.ozlabs.org; Sat, 06 Jun 2020 09:19:31 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:39034) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jhYgR-00073k-P8 for qemu-devel@nongnu.org; Sat, 06 Jun 2020 09:16:23 -0400 Received: from mout.kundenserver.de ([212.227.126.131]:57961) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jhYgQ-0007ed-IG for qemu-devel@nongnu.org; Sat, 06 Jun 2020 09:16:23 -0400 Received: from localhost.localdomain ([82.252.135.106]) by mrelayeu.kundenserver.de (mreue010 [212.227.15.167]) with ESMTPSA (Nemesis) id 1MTR6K-1jXlao0imS-00ThkI; Sat, 06 Jun 2020 15:16:18 +0200 From: Laurent Vivier To: qemu-devel@nongnu.org Subject: [PULL v2 11/19] util/Makefile: Reduce the user-mode object list Date: Sat, 6 Jun 2020 15:15:59 +0200 Message-Id: <20200606131607.1250819-12-laurent@vivier.eu> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200606131607.1250819-1-laurent@vivier.eu> References: <20200606131607.1250819-1-laurent@vivier.eu> MIME-Version: 1.0 X-Provags-ID: V03:K1:V/aHWdl8UrH1CJeMgwlpTbN0wkVZ+UCwr3JP6jfUPF5McYYjZLa ZkS/Of53EfF45tIMdSgqJDrzgu6AIaO50vSzXMMq5eTTObuMb8EL4ARK8YEKZkNSn1aWxgS hv/tz0IBsimmYdUFw4yCVCorcit7Uvd3OevSMDJHIcYdaOkcjtglPab2omQdx2HWuKRTui9 R5AZrmGn7YZ/BEDG5iw7Q== X-UI-Out-Filterresults: notjunk:1;V03:K0:V3qAw+i81rw=:nXcFhrLgti038HofC0CRSv lJrGW8fSzNzDJvIbLWPLOFtjrdNByxK1R6Ty4nfiEnAR8KMzFS9fk1Hu/v6g//iriuafkQNHk 30LBVd5c9RvPFLwrA0BfcYQpN7pt29K+t267hCZ0Whwf1nGHO3Yn1UHXHRxPG8Mm9chZEcY9f 3r7DMVlgKGhebK0y7fKk8/gLkf2M6Y9kRLqNx0G3ZeNHO5o5/KmYeWvMbU/NUA78AioftiaYc RzP/OKcP7UJ7nnWRxy4oCVNJKv4Ezb5CeakTD+/Btaz7i+ojW1qy/PYf33ErCYLL29a0MAmNF iKYNExKizpCb3UOwBfntqQwcGFyf6c3KnJH/u5RUs6CXYJX/hVFtnnaXvbV6a0+L5ND+JaW0t i5sT+zkEU6UUt0lcXT9QCD+3WQ1aTeUP+VypyCiHPKJtpcG7qxUgXhXGrwBlM+J4g2zkRLho0 KI+oM9PKxogTM/ECVUd6u8uVmTa4XjkCchnKwKmthrGgzBUv+HUwdHJUOBVBbmV+x5KdZpMPQ t/i2QPOw3PbHCBLjTxxO/nwZ/E/Nt/JPAZND7krWPH1KaYW4UBHhr5aEHCi+6+X34W8BzEBnj 6XGb2rTKITq6wNuwOQp2jP1ShRrNmogYehm6/lzt8/lT0/LWa841RJImSdjq4JGb5QUmz652q Emxdn5LMyysdBAtJ3iz8q8Oq2xQOf5j5yVi/767ef76MjsrCwM1X4sGCoSweqGM1O9mBpG7tN g8NiF6HPLNtlgQokfx9R+YBfWSsWRzVEl2m+BPke6tSQw3dqAtv2LtKExj4vgex6VjS0xvTCF lj/coY2MpesTWbkp3TvqPzlIm3vMUhGbEOO1ZwHb8zdjxrlTGlpSfDGcUBGc3BRAl+qzvQy Received-SPF: none client-ip=212.227.126.131; envelope-from=laurent@vivier.eu; helo=mout.kundenserver.de X-detected-operating-system: by eggs.gnu.org: First seen = 2020/06/06 09:16:17 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+incoming=patchwork.ozlabs.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 Sat Jun 6 13:16: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: 1304521 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=vivier.eu Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 49fKs81nFVz9sSS for ; Sat, 6 Jun 2020 23:21:00 +1000 (AEST) Received: from localhost ([::1]:44304 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jhYkr-0004hq-Tz for incoming@patchwork.ozlabs.org; Sat, 06 Jun 2020 09:20:57 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:39036) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jhYgS-000756-BA for qemu-devel@nongnu.org; Sat, 06 Jun 2020 09:16:24 -0400 Received: from mout.kundenserver.de ([212.227.126.187]:34975) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jhYgR-0007eo-80 for qemu-devel@nongnu.org; Sat, 06 Jun 2020 09:16:24 -0400 Received: from localhost.localdomain ([82.252.135.106]) by mrelayeu.kundenserver.de (mreue010 [212.227.15.167]) with ESMTPSA (Nemesis) id 1Mj8a5-1j4ctz366X-00fFGl; Sat, 06 Jun 2020 15:16:18 +0200 From: Laurent Vivier To: qemu-devel@nongnu.org Subject: [PULL v2 12/19] stubs/Makefile: Reduce the user-mode object list Date: Sat, 6 Jun 2020 15:16:00 +0200 Message-Id: <20200606131607.1250819-13-laurent@vivier.eu> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200606131607.1250819-1-laurent@vivier.eu> References: <20200606131607.1250819-1-laurent@vivier.eu> MIME-Version: 1.0 X-Provags-ID: V03:K1:hmgqyD69i52pURRa8xNImRDVVBuhd7lG9woVIeaaiIQqDFNJ6zC o+a11w2E++oZB9atYkuLFhq5mU8k53aTQOpaNHGFC6mT2rMFSfgyG1+nC94dkGD8MiNRCPW sjo28eIOTZACwAgLPP/MXqXku871aKTqvWSKlqZpzgv4RDaX1NGdhYiyoa72SqoxuRLuCjx eT5HpfXWwMyfSRLE+imrA== X-UI-Out-Filterresults: notjunk:1;V03:K0:jbT4tsYpI/0=:GlKDOmhgrQxi1VZKmpMrxV jvRA2faz3C5wzPYrSkhJzsSjCKxc3d87kTV29h5cz6lOdccFleaDanpbrc/gXddpXfWUAHINC rgBYYgMp9+uloCMUXq31rGpQow2Bv+FxbyqAVE00pWJ5HzyeNZ0hyMNBArPYkkioikPtZVhfM zHZwz/7g+UZZQIoscuMSNC+Q7ExaO5uvSqw1s6dQJK9iS0RYxouy6PQ6n3d2k7PEiKEuv74gR s1795sw2lwOejUqh7ikFz2sww8B8qAOtSkHwNLC5kcpm/wVXlwt7SnnqWBu5R0gY0kWUTn2xK sUO866ykB8gAXDBJwNAGRt6Ha6dgccnSQeCpLqS6iVhcQUeJjkNsuq65kLWv+uj8uMa07tvlS wrkaWz4twH3l5ymalbb0JOLseib9I9RBRYXO6hTF9rT1n57ffGfavbbiy0J9W90H3/blB6efb dnZl5/Yq1mPXgg2dl15j2p0zPcy9zaraSUSpGJZfmDsdOe5urytdflBn/ZAHyNBM/jMQZHeyn 5DTCZ5D/4qom7V3xFFFrOclPIh6wBR/StIGUtOoprq0ROd8JyCuwmNN6CZ1GfpeLXi3Z/xMGh KVB8yPxGeCzdYjElH4YrH/xnXPo9OmuXhTw62i01FNBbkC46/UocBMYqiR3oNsWs/KWP6w800 A13RE+5QafpLAXxe86aTBBSer9kuuBfN8YkvYyDb8Wv6aZHCH6RSdPAQP1D45mEgEQU28yg12 jqVKjgKwUTYKSr2gTxKt9RNYthDFqvEdTgvlFVbxL7Y1AyylXgl3OQESSrHWnz2xmRwum/faX JbJAkjo4q0lIb89iOFCFPU82t1cWnHFbBYpGK3H6UtOZ0Dh2TZZIKi+p689oWf0+B50MGmm Received-SPF: none client-ip=212.227.126.187; envelope-from=laurent@vivier.eu; helo=mout.kundenserver.de X-detected-operating-system: by eggs.gnu.org: First seen = 2020/06/06 09:16:17 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+incoming=patchwork.ozlabs.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 Sat Jun 6 13:16:01 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 1304533 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=vivier.eu Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 49fL0035Rhz9sQx for ; Sat, 6 Jun 2020 23:26:56 +1000 (AEST) Received: from localhost ([::1]:48692 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jhYqb-0001Hg-6J for incoming@patchwork.ozlabs.org; Sat, 06 Jun 2020 09:26:53 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:39102) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jhYgf-0007Qj-9W for qemu-devel@nongnu.org; Sat, 06 Jun 2020 09:16:37 -0400 Received: from mout.kundenserver.de ([212.227.126.131]:58377) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jhYgb-0007gK-UX for qemu-devel@nongnu.org; Sat, 06 Jun 2020 09:16:36 -0400 Received: from localhost.localdomain ([82.252.135.106]) by mrelayeu.kundenserver.de (mreue010 [212.227.15.167]) with ESMTPSA (Nemesis) id 1M9nlN-1jdxeY1SJJ-005uWB; Sat, 06 Jun 2020 15:16:19 +0200 From: Laurent Vivier To: qemu-devel@nongnu.org Subject: [PULL v2 13/19] target/riscv/cpu: Restrict CPU migration to system-mode Date: Sat, 6 Jun 2020 15:16:01 +0200 Message-Id: <20200606131607.1250819-14-laurent@vivier.eu> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200606131607.1250819-1-laurent@vivier.eu> References: <20200606131607.1250819-1-laurent@vivier.eu> MIME-Version: 1.0 X-Provags-ID: V03:K1:9UhZ8rF6x9qroVqlPvbwJysM18+fds1WlEyFZVqCr530QxMHIFq Gxj0XISe5+D5T1vvli5wQYsVCJ0g2jz3Zgzuy8HQN/X1ZCGOqtW4i+yQd07+8zLwAUr7lIO u817uGTbdj3l1ptg3EcWy/kzs8b1y7RbjvJXqfhw3JVuMkvGh+HgxbriaHdNkF2QJ3x5Cei goOi3SWwLJQIyV8zb/dhA== X-UI-Out-Filterresults: notjunk:1;V03:K0:5RhwfZ8yzgc=:EoEsZ34bgV1AgVlsWga0zT st9WbcEeIot9eAmBUQNq/V5OC4JoLpeoiSyzjqOX4f+g2p1S6i7N0CW63ANOE70cB55PgohUs nk/m/8dfesHUz/fsF/EKkZLD3XF+1tbRlU7XqZHRanVqmVLn5xroqeqyjxAF98RGOSYNW1pja wyLiH9nlVeVBY9H6XQa7xT1zcnx/fq17FCOUwtERb0Q8VnwHLE3SDSdvgs/jOI3RItZBCkLkO Ku2VZ8pQULbGEcLYxvnoFnqHufABr4dbRkTbdz8ZUuqXhT6p/bkVx/HmBRZ2m0J0d3B3K4w/r tYf2kaTpZoe6XS6NzgxpaRY/60HO79ZF5/eZr6uI/SPGcqjqAfx1/hoT+gY2PckQU3f4i2GV1 nx3enDZqTz/2U0DaPFM6dl5F5RL0lD3DVmW6kbJNgPM4uMkFKNYia1UDNRw/A1UMFikLtOD4i h0/x7PwIB/8eeh6gln9It86XxUU5AY7Qwsl+SuvbWPunhJLufLaerDVjXuQTowl53PWNUxcja t4y1wJNlDVb7xB9vbq0uvB6gg9PE2AzKZsQRUrAeSHDGUp8ReydcKqUlTn09M8uYNsbsYkyTA PmyYZ52V5x6ytvHYixJa91irZNTvhO1BPWdTxbJTj0CerJa1KCf/+nhsgaOm4TH28Wo65jvjL 8yFf2hJ8UbRSnfkK60c4IVTMVv4coW7f5Sy4uUx7IzayHi7pO2B+wWaSOWiZzC46mvIwVyWi2 q1TIDES+vmpY+rhoZjHlcsqryKS0scaHFnPrxLVCzgOx6XMJpxG0KaQFK4vSKjn7WNolYKrAM X/ZcXTC0bkDPA5199uLBppPc5gzNWFVIchAH+JiLj3t0Sck3dlzW0JT4IzVLk4Ku8Hai/R7 Received-SPF: none client-ip=212.227.126.131; envelope-from=laurent@vivier.eu; helo=mout.kundenserver.de X-detected-operating-system: by eggs.gnu.org: First seen = 2020/06/06 09:16:17 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+incoming=patchwork.ozlabs.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 Sat Jun 6 13:16:02 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 1304526 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=vivier.eu Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 49fKvj00vsz9sSc for ; Sat, 6 Jun 2020 23:23:12 +1000 (AEST) Received: from localhost ([::1]:55960 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jhYn0-00012g-JP for incoming@patchwork.ozlabs.org; Sat, 06 Jun 2020 09:23:10 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:39100) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jhYgf-0007QP-5o for qemu-devel@nongnu.org; Sat, 06 Jun 2020 09:16:37 -0400 Received: from mout.kundenserver.de ([212.227.126.134]:37593) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jhYgc-0007gS-KK for qemu-devel@nongnu.org; Sat, 06 Jun 2020 09:16:36 -0400 Received: from localhost.localdomain ([82.252.135.106]) by mrelayeu.kundenserver.de (mreue010 [212.227.15.167]) with ESMTPSA (Nemesis) id 1MhUQ7-1j2yk30wJH-00eglx; Sat, 06 Jun 2020 15:16:20 +0200 From: Laurent Vivier To: qemu-devel@nongnu.org Subject: [PULL v2 14/19] exec: Assert CPU migration is not used on user-only build Date: Sat, 6 Jun 2020 15:16:02 +0200 Message-Id: <20200606131607.1250819-15-laurent@vivier.eu> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200606131607.1250819-1-laurent@vivier.eu> References: <20200606131607.1250819-1-laurent@vivier.eu> MIME-Version: 1.0 X-Provags-ID: V03:K1:Ythf28RThGfajgyBsmL9OEYIzfEuxYwUJAyfOXddT66L+gXoDSh 1RXfQwkcPAPxBWMlATfxaxdl/GvQxt30LrofBx2Y9Fgppji3NO113PtChpzApw2ffb2UkX7 4SFfcBs6Q12+zYgAFtCA3uXtQ3nPYQxLbs+60hRHBOXzR6OKSPT6+1CRJaO15XBw6t8QY+E YY8CD6MtL52sWEIdj+dbA== X-UI-Out-Filterresults: notjunk:1;V03:K0:LLtp8ss7yJc=:Xgd3lpW4K47LnwK0tm4Dn8 HFmA/8qegi5heyIZIMCa3xXFX4qyBj/s/6+8E8+p/cqcHKuZTgF3q2rkbnt7BGnVtEvvrw9PM rK/3YKPg+I83FGxN9u2of1qXA/YYbCbdts5PeyCBEE9G6EXhh0GsJs39NeSobaA10Ri+J2ocX u20n+QHPBGbhkZbdxyBOeNerbOQnHDRZK62wL0R41nT1RqXe13xQM2/kJmGG8wLvLwh0tjZs8 xLGVz9ve+fkacc4XY+OvCEPVg1rDm55dqbT12FagaKmRDE1TQmQ2Fs9Q9fEM1mc+/PO1ATlGU LyWudisMNg7P4jni+zjVpuSzh7/LVOIwTfMS84bmt2t55fa9fTt9kc53YeycE9MF+ZmIkarzF //vVkxNOGCwg/LvHWgxxFgdcEHw/HsOjh2LAkWSRXhN4VQUB6MCF3YNeE9zb8UIOK2WH6iVof PDQdxv01x3nBTPbDrNIrYTXq2hyui/VXOtwU45IhDitsknv76wjNynPGhnIlVQdi1pFVohOvL meFJFrTUUNUyT6JzcVHoMREuUvbm7FNaYGmCu6bBK1zu1tz7IrtuTm3JZ+tWveKdHkf6VefsP VBRMQ5bdVhr7aJL5G5HYM7FoxFMU3jBxYKRwa7qxSgSsXqorwZ3+z42yYBfWdkU5sJCGksD5W 8Wg56+VwUjh2HOMrOpVOgtZLwC+BhqgbylkdTa7zYG5q1UuXhFtIIpHtFalUyJgQDvdt1jplZ NP0nmR1T6NEEom/uBjKbR4mq6uCHuc4eJItl8Li0GR8l8C3SBEpWtBsseun1aTEEgsKkefqGf Z3k6/8l2uiiLRY45Ue8LPO95C1OMsI8PR55M5K8DEL/UcICRjpkp2DnFErkpZPcurCZ4Q35 Received-SPF: none client-ip=212.227.126.134; envelope-from=laurent@vivier.eu; helo=mout.kundenserver.de X-detected-operating-system: by eggs.gnu.org: First seen = 2020/06/06 09:16:33 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+incoming=patchwork.ozlabs.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 Sat Jun 6 13:16:03 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 1304528 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=vivier.eu Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 49fKx06l8wz9sQx for ; Sat, 6 Jun 2020 23:24:20 +1000 (AEST) Received: from localhost ([::1]:34398 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jhYo6-0003n8-HG for incoming@patchwork.ozlabs.org; Sat, 06 Jun 2020 09:24:18 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:39094) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jhYge-0007P1-GR for qemu-devel@nongnu.org; Sat, 06 Jun 2020 09:16:36 -0400 Received: from mout.kundenserver.de ([212.227.126.130]:44067) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jhYgc-0007gQ-E5 for qemu-devel@nongnu.org; Sat, 06 Jun 2020 09:16:36 -0400 Received: from localhost.localdomain ([82.252.135.106]) by mrelayeu.kundenserver.de (mreue010 [212.227.15.167]) with ESMTPSA (Nemesis) id 1MqK6l-1jBoQg1q7v-00nSDN; Sat, 06 Jun 2020 15:16:21 +0200 From: Laurent Vivier To: qemu-devel@nongnu.org Subject: [PULL v2 15/19] arch_init: Remove unused 'qapi-commands-misc.h' include Date: Sat, 6 Jun 2020 15:16:03 +0200 Message-Id: <20200606131607.1250819-16-laurent@vivier.eu> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200606131607.1250819-1-laurent@vivier.eu> References: <20200606131607.1250819-1-laurent@vivier.eu> MIME-Version: 1.0 X-Provags-ID: V03:K1:ebDdUmNyWE+JgGJagF70UCUYs+/bfqnwJWD1t7CsFIiXdAvEzjx 7+gvQ1Wu2BHfGpBBtIVo1pOwsbMkMZRfuNfgoGjDBv/wVvAFouA/wrdaVyLtL1Y+dgIeTZV ucYet67GGwQzlmMZqawlz2gDO5uC8nT3wjRJTlIDLsq4lpJ7RkYKzdOGz5E7ggey6Rjhkas 7wK8tSlyafXTg2YZ2iNdg== X-UI-Out-Filterresults: notjunk:1;V03:K0:PFwp7he4/P8=:N94OsXo35uBaB8tKXMNQ7h aBHAupNsRt2sRUffN/NBAIHtDjeHyXlXAUARv9/HoGP2gxbf5oaU76Yi53X+NGPcQiyFOe+UX n3Kt6mQS0TijvFISz9TZjCU0xwTc0SRU7F1U94wAqHPJ/BWuNUV6geNLAbvd4eDh/UmNdbE5H TZyqhUxfVVmPygM7OOzzyPjf429ky6jivs/MhbI3OYCqKVfAtsy7qTHgyZcH75RWVD1B7ZP5+ kb/gbFY8zcH0gnkDMrJyBPb7miy/L/eSrdn6MSrpzy4bmlks5w9CqYFQwFpxYlef69HZGDaa3 MpMX23ikTDEj7VC/FcyANqZb+t+xaUvxNswcdkJ/+hoURwKvRE3xTGMOWGoPENyxm9KYnrcgz ccX5HVZTnn3yc3O1ITHTVffq8BEa1ke8ZBP3AX/aDzfhnBQhAWZhxkWCMlKSFrEE6lcwm8HcR WkFm80vmVGUpqfLVsOAtnhm/8F80YuOqMjnesKXPu/1aBTZxJ0BOKUXE9xaWLFlJ0B2Qc/h2S tHR7WOkCwJAVXI7JLErKP35j2ox53gqI/+BPeFYiewpw4k1pzVD5pCoZAtiO9w2Y+FJVYOb32 l6f1nuFII3sZz2/I5QkKKg/6tqdiafaSNnU784IRstu2o1KbLPGYRrFqhVVVP4r/A0VJQyFZE aBmNqGnfascNCO1LMiYivRSBQVCCujTX+8fdAzeXAghBB4kICAE5ZdeGOCKALFXLOHfeSjoDE L36W3+DG8XZ6zXiNClPjbjbeHE40DRPYraMkTCYo45papYF0mtiJKZDlcOVM34+VKkRpaQoYe R4cAPN6skdle1KtyeqD2InyBEMC1NnPL9ZUKs0jenrA/QOPfIxEfdiEsdRKdoFMy60ZT1pJ Received-SPF: none client-ip=212.227.126.130; envelope-from=laurent@vivier.eu; helo=mout.kundenserver.de X-detected-operating-system: by eggs.gnu.org: First seen = 2020/06/06 09:16:18 X-ACL-Warn: Detected OS = Linux 3.11 and newer 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+incoming=patchwork.ozlabs.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 Sat Jun 6 13:16:04 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 1304522 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=vivier.eu Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 49fKsf5VRtz9sSS for ; Sat, 6 Jun 2020 23:21:25 +1000 (AEST) Received: from localhost ([::1]:47264 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jhYlH-0005xu-EK for incoming@patchwork.ozlabs.org; Sat, 06 Jun 2020 09:21:23 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:39046) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jhYgV-0007CD-6N for qemu-devel@nongnu.org; Sat, 06 Jun 2020 09:16:27 -0400 Received: from mout.kundenserver.de ([212.227.126.187]:54137) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jhYgU-0007fC-2V for qemu-devel@nongnu.org; Sat, 06 Jun 2020 09:16:26 -0400 Received: from localhost.localdomain ([82.252.135.106]) by mrelayeu.kundenserver.de (mreue010 [212.227.15.167]) with ESMTPSA (Nemesis) id 1Myb4H-1ikuC31Eyb-00yy0x; Sat, 06 Jun 2020 15:16:22 +0200 From: Laurent Vivier To: qemu-devel@nongnu.org Subject: [PULL v2 16/19] target/i386: Restrict CpuClass::get_crash_info() to system-mode Date: Sat, 6 Jun 2020 15:16:04 +0200 Message-Id: <20200606131607.1250819-17-laurent@vivier.eu> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200606131607.1250819-1-laurent@vivier.eu> References: <20200606131607.1250819-1-laurent@vivier.eu> MIME-Version: 1.0 X-Provags-ID: V03:K1:hGmWWUrnidlbqWrM475Qa7LsXTKgep3+u42mFTEx0ReD1frOOm6 5d+6hDuGSIh6wspZYRl1iKGNCRGJw/iE8G4u39JAGyuYUjWIys6w5MRFTiplDIGpz8vnC3M gMUvEs8zVDJ12VuP5klqfZFERC4FiWJJELxhPhz2HyzLIGiujk37gx2+EnCNfFPxEooMBja d/NQ6Uzvu2wyhWm8QtCpw== X-UI-Out-Filterresults: notjunk:1;V03:K0:mEjE+vpSH+c=:VZ82BG56nTrURGRfUbGBgf j5xHOxLL76KtbrUpx2dgkWvrZcQgakMuOCmgrpfUWyuR3nGC8WKr2MQNe68yll1y/d8ucTELx 6zNBeiNrKMZogjmpu8akuEJVeBKlMOhk1+lTzMOKcBn1z6tKLuztvaclSjkh/mseyH1mnyUJR LSeLeN+J/pixzmmcofWq0Y5ZLqFjZK9qaTzI2qv+NaP6XCoA1bGyapzcY9s9W9r2uOzzEnFhU 08tUinBcWdFTyBY0EzglRT31mJLA/bVmysGwayGQzcPTGgGl1LyVDBh03Ep7P3uW+DrAGMKYC x6eNEZTZdB0iWFFUzl2v3xxapSZu9MyWK0ru417lEp/c5QlO/92iEk/0sfUGkjAF9oplUXdNr USrYNukcams/fBE3qTnGh8I/RNJ2mKHWafN7bxGL+pzW7+V8wQNir9TZWydRQawVrENVg2Abs aiyTbi9ePGKN1+wpKdJvquCTg+0urAEEuQ0l1kJnw+T6enO6NsgMrIagFGFnewjkpzM7JQoZW e91FQL35foN0tdbU6fBYCgyUE3DOBE3m5Lye5uFBIZ8Fzusd6a23h7cSWO0OhmqeYA3ogBTCo hIzX63MsJ676vK5NCsnL//fjN2vXwHbbyF0dCkLhYqKbd3fxLs624BEezfsskNCyOgVTFvTXu XAno2yUhZDhskVpYwN5KNAmQg9UQAi5W0NLeTYo3zgfAq6YlU7vItMOoJMIH5HDLbCLR3RMgJ SBAI6y0QBeX3j87fzeTj82ddx5cCiHzsecPAccidaMgArrZBIX7w97bFzQusIo25WMDVHNGm9 WUmv2xjd6GxgzRptODdI8wOIzoh+3dc/xoyAZdl2c3Y9I8BS3fYGoBCPSUhnrhfufaYlihO Received-SPF: none client-ip=212.227.126.187; envelope-from=laurent@vivier.eu; helo=mout.kundenserver.de X-detected-operating-system: by eggs.gnu.org: First seen = 2020/06/06 09:16:17 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+incoming=patchwork.ozlabs.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 Sat Jun 6 13:16:05 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 1304532 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=vivier.eu Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 49fKz14yBZz9sSd for ; Sat, 6 Jun 2020 23:26:05 +1000 (AEST) Received: from localhost ([::1]:44538 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jhYpn-00082Z-BI for incoming@patchwork.ozlabs.org; Sat, 06 Jun 2020 09:26:03 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:39070) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jhYgc-0007K6-AQ for qemu-devel@nongnu.org; Sat, 06 Jun 2020 09:16:34 -0400 Received: from mout.kundenserver.de ([212.227.126.130]:41611) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jhYgX-0007fo-KR for qemu-devel@nongnu.org; Sat, 06 Jun 2020 09:16:33 -0400 Received: from localhost.localdomain ([82.252.135.106]) by mrelayeu.kundenserver.de (mreue010 [212.227.15.167]) with ESMTPSA (Nemesis) id 1MHGPA-1jlyWl00sS-00DINq; Sat, 06 Jun 2020 15:16:23 +0200 From: Laurent Vivier To: qemu-devel@nongnu.org Subject: [PULL v2 17/19] target/s390x: Restrict CpuClass::get_crash_info() to system-mode Date: Sat, 6 Jun 2020 15:16:05 +0200 Message-Id: <20200606131607.1250819-18-laurent@vivier.eu> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200606131607.1250819-1-laurent@vivier.eu> References: <20200606131607.1250819-1-laurent@vivier.eu> MIME-Version: 1.0 X-Provags-ID: V03:K1:oVVlg+zAD4r3gNfcMirAhifpwGVg/NT5rl3BdmGJXi43bsT5oCk Eoik894KLLIjRJYd1WZnV2tHbWMt7ECxSYBbhzbGt/WrFSTL72r8mh8UwpCFX/m1x8MBEr7 RbC5xxuMb9k5qgtip0koSuT4dm7GcIfI6Kwxhq9vkf8wOV4OLce6oJ8DxSdHJn1I4aVWFVY MM734jyASbLPqOuhmASuA== X-UI-Out-Filterresults: notjunk:1;V03:K0:ezPdbSSDJUE=:ohDBTnCLNUNVKnqsGXAdyo xuVRKZlh3mZo4VsZxeHsUfupQRyKhmPBHITdZXyrex4jRlc20veKCUAHbfY5fPP9U6++O6wdl 1sQsDWJUvdjGtm7ks6Pxqb6hJY2df4fxJ424Lu3s+V6g4fJ4Qkt3PQEPOTJOuh7tFcRsmO1DD HlFvUx7YtyUoHFX9FfJWe2qT6vVRdKCoqn5nHfz37e23XZiT7rxp0MkVJyGImMNtl2RTEQS6J GqHpPmJvL115bjs47Pl5BESo7//yxcc9pnV/xDNF/3qdKeqiVqtUlmv9eN0/Wh845BEWBFwtV K8Bz1cfd48PqDLHWnsOjT97cy3joOYtbm7Lddh5Xlo/wda/sXPtMDgmNPonic/NKzIgjohZG0 dsKmoovOX9I4u8J72OoldWzlLQ3kNsZnBBQBp3gZzxAswi6aJqcRjOHAWk8lrNXofUvbB/Tcy AV9Fh7EKlFy7ASyko4V/vnui7wLGEQPTkzqbCBOIKOjx6oCNbzJR6eFkRzuD1ol0HiyQF51Q+ ady+WKy47MwIRaI0cTDTEXEAtp4jR+LdjK8gslgWIb1SjORVmOSvwgScV40z81vb3QWvq4gZf S+BXRGi46ZrSK5oGQTq0kFl550Ilq1d8qcUn508kdTRorPwNZECy4GYfBSBSMZQmp3waamLFy nVn2rw5gC56QPVYQjHmS/IFGRzg0Bk7DoAv0eXmwiE3AaBa64K8boirPoL6uRfTheCpgjs70l OKTUdzykEa610avDf1PJ05jqtszq8zIf+XyF4zq5niorKDtaX8Ec5Br3VadqyGUv2uhowXhCE RL87MgyLOH41wFDGHgRe8eblGkSuLmSYLYbiOjRnkK9rBkDskxx00Qwp+Ye/g8PFbM+dUBV Received-SPF: none client-ip=212.227.126.130; envelope-from=laurent@vivier.eu; helo=mout.kundenserver.de X-detected-operating-system: by eggs.gnu.org: First seen = 2020/06/06 09:16:18 X-ACL-Warn: Detected OS = Linux 3.11 and newer 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+incoming=patchwork.ozlabs.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 Sat Jun 6 13:16:06 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 1304529 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=vivier.eu Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 49fKxV3DFNz9sSS for ; Sat, 6 Jun 2020 23:24:46 +1000 (AEST) Received: from localhost ([::1]:36092 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jhYoW-0004Xi-6g for incoming@patchwork.ozlabs.org; Sat, 06 Jun 2020 09:24:44 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:39054) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jhYgX-0007Hg-J0 for qemu-devel@nongnu.org; Sat, 06 Jun 2020 09:16:29 -0400 Received: from mout.kundenserver.de ([212.227.126.135]:48871) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jhYgW-0007fc-CV for qemu-devel@nongnu.org; Sat, 06 Jun 2020 09:16:29 -0400 Received: from localhost.localdomain ([82.252.135.106]) by mrelayeu.kundenserver.de (mreue010 [212.227.15.167]) with ESMTPSA (Nemesis) id 1N8GdE-1iv6vP2Pdg-014A1G; Sat, 06 Jun 2020 15:16:23 +0200 From: Laurent Vivier To: qemu-devel@nongnu.org Subject: [PULL v2 18/19] hw/core: Restrict CpuClass::get_crash_info() to system-mode Date: Sat, 6 Jun 2020 15:16:06 +0200 Message-Id: <20200606131607.1250819-19-laurent@vivier.eu> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200606131607.1250819-1-laurent@vivier.eu> References: <20200606131607.1250819-1-laurent@vivier.eu> MIME-Version: 1.0 X-Provags-ID: V03:K1:GZZSYLrSs7M0urx3dC04OAdGxc8HgaFQr1CphinUO/x2RDeOx0+ MkPLmNUo0Y/dy625VBsoMyasAAwcnWuTmmcwttTdtcZFeXumfB3wYbmW3JlFzPIwsk//40I ZUUmDEuRzMgFNNFKrHveVQ/pFZgY96d0ngKNimcwI+BpmLdWHJGtKaZkvgPzqM7mSUJ6I1R XJeesQzSpnXbF63sgSFqw== X-UI-Out-Filterresults: notjunk:1;V03:K0:XZdTX8sJvSs=:c4b8xpKfWx0os2crdNivhZ lMVAIGkJT4EG7AdnDiLYyPAilzlovKSaaIqPJrduHwNOiVbVpGZp8qYcYT2ylvMFJK7SbAegk duI6EPn1+wyKD46prq9N6ml07JXAWzOWehnRtUWJtjS6uHNpMIExwSx4iHmnW2YSFUiePsqB4 Ax73pa5qS1sRik34eg32AX9sRE39VgukKhvSTO9to06U+gBI1rn7JaGv0cbSHcdlQ9aNRLzvF d7f88+Z8kPmyAfKkmCJao+KUWYNfx9F+cbcbOR3qug7vESU0xkpGbO9aCQs8On8UJGmXfuocu /6rMyRmVw025W0sKByHwrSnHYy+0pfA+7VieyDI0xxUXcpodJHeooIp5LWUzd5BD+QrasdeU6 9VKgDkMvFsNBpsIvQPd5YhUOSm30mvt7sQMC4YQWcL/3m7IWDcCBaQwQzr7DS+GMB+wlBiGtS MoKwQB4hV5gYgYSFLxsawzQQu/USWH7L1vlUsk2fzDQCVyc5hp89om2swywpIr/nYXf9bUduW KEOeKKOP9r02+q/VguVlNkMyfpSSEBnIun85VNdHqZaEL9HVhPGUwv6i78sLdsg7WJvYnDTvW uBufT6UowOeGfsK2jPXqy4YJfB7ZKMYLPUsH6G2Rbc/faS/z0kimWWF53ieFIzsTTpeB9aofQ tEIySvqiuqfUcQDmb3qt5Czroax3Cy3qK3ZGEWBc0vqGMFdLuzcOfaCipkadJlsbJG2yk/T9e QbZzSKW5UhmxigvOur3oTrf51+mZOlujM4OHxRJy401Z6LqygMhGciGxFDWDMHxD1d0fdrAFU 8kd1WwZw/2QuAisb1F9Lnlm53ITJDNm4PwiUhaZEPw8vD/sLbMf5N6/45OYVOwkoaqMM2OD Received-SPF: none client-ip=212.227.126.135; envelope-from=laurent@vivier.eu; helo=mout.kundenserver.de X-detected-operating-system: by eggs.gnu.org: First seen = 2020/06/06 09:16:27 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, 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+incoming=patchwork.ozlabs.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 Sat Jun 6 13:16:07 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 1304531 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=vivier.eu Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 49fKyk1531z9sSc for ; Sat, 6 Jun 2020 23:25:50 +1000 (AEST) Received: from localhost ([::1]:42764 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jhYpX-0007Hu-OM for incoming@patchwork.ozlabs.org; Sat, 06 Jun 2020 09:25:47 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:39098) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jhYge-0007Pj-SO for qemu-devel@nongnu.org; Sat, 06 Jun 2020 09:16:37 -0400 Received: from mout.kundenserver.de ([212.227.126.131]:43317) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jhYgc-0007gO-9c for qemu-devel@nongnu.org; Sat, 06 Jun 2020 09:16:36 -0400 Received: from localhost.localdomain ([82.252.135.106]) by mrelayeu.kundenserver.de (mreue010 [212.227.15.167]) with ESMTPSA (Nemesis) id 1MI5Dj-1jmF710Zdv-00FDvN; Sat, 06 Jun 2020 15:16:24 +0200 From: Laurent Vivier To: qemu-devel@nongnu.org Subject: [PULL v2 19/19] stubs: Restrict ui/win32-kbd-hook to system-mode Date: Sat, 6 Jun 2020 15:16:07 +0200 Message-Id: <20200606131607.1250819-20-laurent@vivier.eu> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200606131607.1250819-1-laurent@vivier.eu> References: <20200606131607.1250819-1-laurent@vivier.eu> MIME-Version: 1.0 X-Provags-ID: V03:K1:wS+S35qY8gAcCYHVFOnRAhwEyvY3OgapuvLcioHH5CMpcAPmO6c OPGSXQjm4YliLtbUdSyzudVAfn1W7VGOJp8PwG9Q+gDgmbKtCSZTj2yQf+4og7zofbsefpR clJxHSxmrh9sNkL1EICF9fl35EDVARtetQ/4mMPpg4QUx0lWxjMuG+Pqk1VgrfTo8NHK4UD iFR8UW+6OLcuLlfP4aOfQ== X-UI-Out-Filterresults: notjunk:1;V03:K0:L1o09oNNyvY=:oLy2d2WnWPw8Qaj6puCw56 y4HlfnndiaQlgqjtFmMJIhbboKIogADapKFK6mgGZjO78HYkmvZIpz5tI6HsEcTjbGMKX4kiy an+KOno0iomszg/9Diajy4yuhWa949Pa79E9wLUyn+9/DGzMet1DtdZ12sMxKsCoFI5pWjikp k7zR0XJMHobv5UC/Cr+bTcrYjfAO1lLe8lz6YyMT631xrDKvnNeZRi/ZhLGqnfPWl/c3LcbMG WPNE4nlQ4BNlrB7LgU+dtqsxWXWF3ja9hLrHdhGMJDCT2SRtDjSxkrw1ZdY28cH5PqCHzUSI4 PlWzPM+d6TzQBzGuwcSc3/f0NVEQihI30Qyf+37A+mzO5+JhPlAkWB0vc5bQNIIlx2/ep7cpJ m4fhdmYLQ8DLzmpcKR2zYleIopnkVNPlaHem3niyAzZ6mC/OLCpOdjkjA8QizFmP1iecGWVPG KXZhJFXiJZ6cHeLUbJHngHRop/qcFCOh5dB1g64AbqB0sHGe7g4CaBSfo+tt3G9Q7IM/oCllh cxezu7fnnLravbkA+wHTjGWOMezv/UncteRfPKLNSApnFrqrFIK8pRC/TBF2QeSgZmJ9H2av4 8b8bO0wNl3t4XWfXS8aZAW8cRSKq34cVy7fQ5KOyrf5VJhd/VeMF1Zhm51C3Dcwy1LzqzSnPD hEd283UgyybpElIx/SGXcYAiMHLu5cyIQ6/t/PpNfsMm1sIQ182UFd3maByKtwmDBu0KFDGn5 UjKlgfzpjcG5BK0sN721wxWFbZ5m1r4i3syvaweHWU1hd49W1/lxRQrnAz3FJvz0ZevMXHhRq jq6hRjW8F1gLpCUnNqrV2VDOT2P4PEj6bdgkUBeIJGF3zg35DFm2MTD29PJwFFhMbu8onWy Received-SPF: none client-ip=212.227.126.131; envelope-from=laurent@vivier.eu; helo=mout.kundenserver.de X-detected-operating-system: by eggs.gnu.org: First seen = 2020/06/06 09:16:17 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+incoming=patchwork.ozlabs.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