From patchwork Sat Jun 6 13:14:59 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 1304515 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 49fKpj2kpyz9sSS for ; Sat, 6 Jun 2020 23:18:53 +1000 (AEST) Received: from localhost ([::1]:35688 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jhYip-00013Q-0h for incoming@patchwork.ozlabs.org; Sat, 06 Jun 2020 09:18:51 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:38958) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jhYfc-00061r-Q3 for qemu-devel@nongnu.org; Sat, 06 Jun 2020 09:15:32 -0400 Received: from mout.kundenserver.de ([217.72.192.75]:33563) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jhYfa-0007Zw-UD for qemu-devel@nongnu.org; Sat, 06 Jun 2020 09:15:32 -0400 Received: from localhost.localdomain ([82.252.135.106]) by mrelayeu.kundenserver.de (mreue109 [212.227.15.183]) with ESMTPSA (Nemesis) id 1MYNW8-1jTtOc45Uw-00VQi8; Sat, 06 Jun 2020 15:15:21 +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:14:59 +0200 Message-Id: <20200606131517.1250346-2-laurent@vivier.eu> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200606131517.1250346-1-laurent@vivier.eu> References: <20200606131517.1250346-1-laurent@vivier.eu> MIME-Version: 1.0 X-Provags-ID: V03:K1:fUnHutHA0ugdfgc+RZwN39djWZCuGpsPP7zroYTbwqqj5FZ9LfG GS4EVanCAXxKZqh4lPDwlPIEO2V6jsErmlm/pawQHqHK1szpu2IzKw4KNDLDc6EU5bhEl2B 2VF/mv6AUWDEhi7UJQD2lfLiZS6tO7kl5062MMal4VYcP4+tCLumsngdB00ROaRgQ892g9m cugiLJDBVcwLTt0ahbxaQ== X-UI-Out-Filterresults: notjunk:1;V03:K0:N8hVkgN1z8c=:hXBNbTVBNBA9iEzMpsE5QY 3lCoAJ2IvLakYi3Pub+IP9ZxUkvrucORRDo+2QkNqm4YL3gjzO+SqCa4gxCLH3f5kdChnm0fQ C8N/+MangqBx/RKNbW6BvAF8kPv32imxo/eCXExHvbJK+qDLkJOlqebobaxIRQvibASCVngGP VYQCqOOHzzYEvSHNHtZjN0ElUaifE6DvKogWjhqPsCMahdyHpNsJCN1PPkCIzNCI+FOQveBcp e1OT82xuuhB6bx8K3eq1I/jQQpNOPAZuPdJM4K35P5l2uNu0upaNcnz07WJyx+qwilBZc9PKg hxTg5CTVHFvBrqzowC8nPnoL1WhfSsDkYlXwPxrp6eLyB2neIuaQVSMk/Q684DtGOCdNjdoGN e5yHdV9SQme+mvUka61m4AfWSN32NX7mCUP5JA2CENRYgj6kPrNALkNkc6iKRJ9PG9dmYsRsW H6ZTrYRdHI52xw39SKiv/TIOAjXei0EDE5NucEHIn7RHSWfDXs11BI9X2K6P1T5JztaTCVETI G+EEeTCvIHVbtof9uvbIsHTu1ik2Qc2xXvhTxPhVqiyCFhraKymN0LZeZyTRAVflQpZxQV19Z q0mkOJD0pSn36oBBL+MutQkeGReCUT/VHu9GlatveOPCLZR5VHgUwhD9QTylTukWVQBoFfQeG UNgFSX9vXdxUG/GPuQxnY66zRi4nRfjiAE60RCTAB/lzQk295+b/MgnuJDU64JbHJNvsdM2QT BhfQ2jezbyi6HpVOpP23LLextTOFzZA4or9ZHYn8XFTcVs94pvZKxCeAuNLTRgMCkZdvJyZvC Jz8zHEF2SwkTYRzOt++BKXRFsfsaixNwqMuUjK50Q5sFTZqolDmKlovU90xni6GyTUlpl1r Received-SPF: none client-ip=217.72.192.75; envelope-from=laurent@vivier.eu; helo=mout.kundenserver.de X-detected-operating-system: by eggs.gnu.org: First seen = 2020/06/06 09:15:29 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:00 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 1304512 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 49fKls2NTpz9sSc for ; Sat, 6 Jun 2020 23:16:23 +1000 (AEST) Received: from localhost ([::1]:56164 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jhYgO-00065a-Qv for incoming@patchwork.ozlabs.org; Sat, 06 Jun 2020 09:16:20 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:38960) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jhYfd-00062Y-GX for qemu-devel@nongnu.org; Sat, 06 Jun 2020 09:15:33 -0400 Received: from mout.kundenserver.de ([212.227.17.13]:57249) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jhYfZ-0007Zp-W7 for qemu-devel@nongnu.org; Sat, 06 Jun 2020 09:15:33 -0400 Received: from localhost.localdomain ([82.252.135.106]) by mrelayeu.kundenserver.de (mreue109 [212.227.15.183]) with ESMTPSA (Nemesis) id 1Mk0FS-1jErg11vJo-00kMKw; Sat, 06 Jun 2020 15:15:21 +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:00 +0200 Message-Id: <20200606131517.1250346-3-laurent@vivier.eu> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200606131517.1250346-1-laurent@vivier.eu> References: <20200606131517.1250346-1-laurent@vivier.eu> MIME-Version: 1.0 X-Provags-ID: V03:K1:vSvE8yzZQ+/jhlqHLs9KtejW7Ampq8TfsPaedVkwpuOrylfQ2ER rGdcECFpZX6PonpreSaje50d1d2A4WTu8o92o4Lv8XRKFe4RQxhoQXxUJ7rdJlhX92IhQ3b l6I6BUtyuZGpSx8jPQvdd6IjKoRY2H+4qdF74hHTvm/4X2ckTfAQfLpQRaaQnHADkFCvkPZ vo7x4MpBUxCS3WwG9xO8g== X-UI-Out-Filterresults: notjunk:1;V03:K0:TdF/lp0OqK0=:0m599vtsLyEnGmlf618jMb bbdk49pW54bCL1VCs4H8GreIAMn3jBPesYGSRMTWcIhoS530hlQEJ+IZcoodKFDXu2DygsEGv bMGeErVTADBvxkkjyP2cOebaod75iv/eWHJpNkPlntpZFd6MyZ++WucQeEQKO2WrOwpL1CEx3 kseDFIXOJbZ2E0k4Qh4EI7dYHdSJUdYa5H9nxgSgWjnZKZvQ1FWwklvzNUOdqpvyhX5uP/Gri 3RHOt4nNfphToquST5KXSE0Sf+5QviTEPHPaAuQmQsUsrBwFWyaVqRBchAW4OfVPL6YdgoXWh +ZLb5R6EV0t90Y8WiheVx5mBqs/7Pi81PdmqQkOsHvg8PUFBv59iqo0DLkb08+enQfU1qOBWf 9mOYzt403yqdZ59QuyBEjFqZqF9VkOg0vlTXMBWgTI28b6SMN6xxXkObFh48zUt0pY6BSqJLe okBuYPg7pUceo92UPpyIDDCKv7+Mmom2l848pbxfzYrdlI2PvcjvKmyxhXOCEGNxdbW3c6SZz gligXTXOxn6XnvPtquUEdjH5FuUF4T0rOlndDZEoPMjqe1rmkhrJZHLjVYkr8qweHwwalXjrK tPjeaONamBwIM+km3HnhfY4hTg1gs84SDXvJFsEAux+Iz7jWxgpYTp4duL6GZfWaTxd1dRvWr 6iwSfX0sdmNFbYcI1DNTQPHttitDXw7qb7H/TupCW2+v2qVJjjmWpsdJ5whhWFSw2DQGaRM7g fSaA+af2bicQ0jDHm7YXjVdkoTbMIl02uTvocQHx5UFIUzNJ9/tFjKwNxxDmUR01rQAzZYE9o mRt78/clmgol9kMg2KN4P1YiuS6Ah8h+aXso2pN+9R/1uId9AFmMcFiOHOoLsh22fb4ZaCQ Received-SPF: none client-ip=212.227.17.13; envelope-from=laurent@vivier.eu; helo=mout.kundenserver.de X-detected-operating-system: by eggs.gnu.org: First seen = 2020/06/06 09:15:28 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, URIBL_BLOCKED=0.001 autolearn=_AUTOLEARN X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Helge Deller , Riku Voipio , Laurent Vivier Errors-To: qemu-devel-bounces+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:01 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 1304511 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 49fKlr5xWZz9sQx for ; Sat, 6 Jun 2020 23:16:23 +1000 (AEST) Received: from localhost ([::1]:56090 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jhYgM-00061v-II for incoming@patchwork.ozlabs.org; Sat, 06 Jun 2020 09:16:18 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:38954) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jhYfb-00061d-It for qemu-devel@nongnu.org; Sat, 06 Jun 2020 09:15:31 -0400 Received: from mout.kundenserver.de ([217.72.192.73]:34983) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jhYfZ-0007ZX-UU for qemu-devel@nongnu.org; Sat, 06 Jun 2020 09:15:31 -0400 Received: from localhost.localdomain ([82.252.135.106]) by mrelayeu.kundenserver.de (mreue109 [212.227.15.183]) with ESMTPSA (Nemesis) id 1Macay-1j5Tl204lO-00c8rI; Sat, 06 Jun 2020 15:15:22 +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:01 +0200 Message-Id: <20200606131517.1250346-4-laurent@vivier.eu> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200606131517.1250346-1-laurent@vivier.eu> References: <20200606131517.1250346-1-laurent@vivier.eu> MIME-Version: 1.0 X-Provags-ID: V03:K1:o+dKIZbsRKlufLowFdEydXySFCUi5viJJfmZ+W6DMnk+ETn8pdh c7mZ+ASSBOAQlGHtkSWBJgxqFOw4OUA7+553TrM88KBFJZJDTDbY+OqT3fnbsKWAvbO8Z8m 1PO/2tLnGOLx+iABnMHhAewxejrky+7KBLAzPtmsQitIwGveQv9l6cmCIfRGq76NTktAkd2 lYQbAQB9hFaUKqcttnilQ== X-UI-Out-Filterresults: notjunk:1;V03:K0:pxMZuhs9OTE=:Mjik3BBGlrR93nCLhQxxHu J/op1KDqyUgZIreIl+P2H7Ya41DNH0CgovRHCDlVBnf3criuxg+WcJVrk+ql/yhP7sib+tDU8 T0iV6Ad2x637K6NIxHtYrtP9Ze/PWnLpgOudY+TDAjPMoEyic3WgDQ9NS4EFlNwWtrkHUZ26m ZLMk1L/LXWX8cT7xy4pdHaJDG+jTE5ts7GLONr+VZmMxO/MCgwSe69ZVanF9G56HiDm8COnqE E4sCDJHNNZRv2/mK4AjEly1q1IxQhtgijZGnhf5r5oDu2VFuhIirmnPL5u8Xe4qeHj+qUZsRs j8ODt5b2qZvnIxVBKjyCu3eL2yNsHHpkpeYU5lD7GdjMAZW27g66Js4AFs/25D/tl4h6WDVbI I5ckNX4qRWWgB2/1uo9o+OiBw+LXuN5IYeCXsqqNMtve6BPXjSPypTcev+uqKs3eo85oEB9Y4 nghNxsS5tpqQ2oX8ZEtjlWHeHesG2X15PppLTblxW1FBegdlXO7MSTQelxFVr+2sbPCEGKqfX xxo/4pOnb/KZFLOXjRw5IfAUQYQNQ4AI72dBTzFxwhmOK/YJz8wf7aNNzGki7lpyid62gHIRQ c5sdJjyuhXtBSNq5s1X65draMLSyrzEPwTmYqw5vV2a7D9sFYCOStr/TVw/JZJJTuu/Qc7AgA RDXQPJ6pFpfVjuv+zMlyAN0mqbBepQXyUw3pXz6d8SfI+SBTWbcQrX6cefasMKOYSVNpeNbhU ZwLpnQdSQg3zLd1tOKTOuAENrOBsSlTGdjpBftf+izrsZHSr9CuHexqeVxQQ9sh1Ko5iFpuk8 SPAA7nf94S1yKmcBDHipD1Lel4j14apzXnRtFuhyrHGJNSwqngw6rUNt+eu1RJEdgSyG+JZ Received-SPF: none client-ip=217.72.192.73; envelope-from=laurent@vivier.eu; helo=mout.kundenserver.de X-detected-operating-system: by eggs.gnu.org: First seen = 2020/06/06 09:15:24 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:55 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 1304514 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 49fKmh2T0Rz9sQx for ; Sat, 6 Jun 2020 23:17:08 +1000 (AEST) Received: from localhost ([::1]:58342 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jhYh8-00075L-2V for incoming@patchwork.ozlabs.org; Sat, 06 Jun 2020 09:17:06 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:39020) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jhYgQ-0006zl-0E for qemu-devel@nongnu.org; Sat, 06 Jun 2020 09:16:22 -0400 Received: from mout.kundenserver.de ([212.227.126.133]:51451) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jhYgO-0007eL-Va 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 1MuUza-1iq8qb25mU-00rWhI; Sat, 06 Jun 2020 15:16:15 +0200 From: Laurent Vivier To: qemu-devel@nongnu.org Subject: [PULL v2 07/19] Makefile: Only build virtiofsd if system-mode is enabled Date: Sat, 6 Jun 2020 15:15:55 +0200 Message-Id: <20200606131607.1250819-8-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:kR6Glro0iE2IiwhSW8XBSZzUErqBsgKd+ANlyyEybyGpVz9sqWM CrFh+lv6QonGpHAdkfCF3gdEnbi4i84lAMoTRigBGxqJSxLDsrX2Ksu01/2ZJziIkcouYG5 1t8hY3TE4gVhf4k9kHmHbDTNBU9XGJD0ggrpLFwiNzCbIdK10ZlA94ZjE0/3zJR35gPpvbL +BPE7T8KBBZH2BdZRbJgg== X-UI-Out-Filterresults: notjunk:1;V03:K0:YSsFSs0MX5o=:AQEftK5myj91suvnjLaBYe /WgqLm6MeKaeXH21ye7/3iCpph5h9cNl2NfmVdcbOEwXyRxD12vi03LrF6wIHeGotUurrykce dNMHPPefNa37vcWRTM1UOAUkkin3CxoLNZMxrnf07LzMJLr5XviPmNM8tFgmqb5Z3MRZRdQzM qy6lNyncBuURR9ovjiKBM0xNiBfC5a7nEBzcSRX4QBy7wgmUbzBk0LWo3Zy7/ayvKTMViFwaT Uog8CWmoiBl849s/fZI5I4aSAES4Usfv4ho9dTxycWXjA9/YGqAmqNAYVJ8c+htTNndC/rzMU 0kKy1CvYnIxC6jEIdA/GEASTRvmTtk4UAK8/i55ZHqabFYmeA45ceRH8aHQCmXsyLmPN4lnkf Tf3ooZLHhjrqnqQxQuKCPWnad2Bp7I1uIQ9A+S//IwqsZCaIqfyZzlubYotpB+9YgR+/3AfiL 2vVlMYkPNn7EOobSI/HIPFVRh/SCYLpXYknpxdDH9/aJsrAXB8/PPorzlwMDZJKNYe+jYr+WO yrTCnSDCOsvSWrdPrImM24SuRJCcNHkaovaqbohMlncMeffVs06eZhxc5yhpoP31caJDY55Pm hg1DhBxTCM6FlcbauSy8pSCS71VdAefMgwJZQiq1Kak920qPMgD84/Q6L04UM+I8PkXufXUpz Sarn91hBMWr22hnK8rABFDixgBOYnfaMPBLqsUaiunZ+QgfxeDOOEp7lcgGF2tacVOBygVL5L 6MWmp9+3/Ef5ZDBdjIchKQdExt8+6R7imS5PMRh0I1lK438l/PD8Nm4KnSJNfZ7Fzkt6zJziM eqOVM8ez9jcVtiNQ5NH4fEtAzij0ty3+lpjVSLpxl88RDVXJOp+d20xpLYA3E63lWjXuLd1 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 , "Dr . David Alan Gilbert" Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Philippe Mathieu-Daudé Do not build the virtiofsd helper when configured with --disable-system. Reviewed-by: Richard Henderson Acked-by: Dr. David Alan Gilbert Reviewed-by: Laurent Vivier Tested-by: Laurent Vivier Signed-off-by: Philippe Mathieu-Daudé Message-Id: <20200522172510.25784-2-philmd@redhat.com> Signed-off-by: Laurent Vivier --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 40e4f7677bde..d1af126ea194 100644 --- a/Makefile +++ b/Makefile @@ -345,7 +345,7 @@ HELPERS-y += vhost-user-gpu$(EXESUF) vhost-user-json-y += contrib/vhost-user-gpu/50-qemu-gpu.json endif -ifeq ($(CONFIG_LINUX)$(CONFIG_SECCOMP)$(CONFIG_LIBCAP_NG),yyy) +ifeq ($(CONFIG_SOFTMMU)$(CONFIG_LINUX)$(CONFIG_SECCOMP)$(CONFIG_LIBCAP_NG),yyyy) HELPERS-y += virtiofsd$(EXESUF) vhost-user-json-y += tools/virtiofsd/50-qemu-virtiofsd.json endif