From nobody Wed May 15 15:58:12 2024 Delivered-To: importer@patchew.org Received-SPF: temperror (zoho.com: Error in retrieving data from DNS) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=temperror (zoho.com: Error in retrieving data from DNS) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1556823693; cv=none; d=zoho.com; s=zohoarc; b=d/8bKNTN7f9XuZxez9v+koeqhvhBShQl4kJE1ZPH7xoE05hYQJsqeid+wWA0GYQatawGB+1mWBi8vNy1C+Ks8WRpv6P7XNFF5vDp6V0Uf0vAZBlFxgAwoSq1TBl7JqWYpPqypA/l3VzFu72M3nxUFl2xeMU9smlBgMHdNz2A4WE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1556823693; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=9qifjDO/490KpoE1IBkw36CRMb78JqGh3xrncujuu88=; b=MzfMIA9lqLoM8Pd8FRryj8LoL0+QvcbEMd0dhltje/x8R9rJzcM4ps7LRzH+3NgJbbfZZJn2eSy7CwjqlrqWcLkgYVn5IQBa+ozQRaQxjIBK2o96nmU9cwVMyPAwXnwea3xWFXQY2P8hHqZ+vqPGBymXCZPhaUw22GEn7fX5J9Y= ARC-Authentication-Results: i=1; mx.zoho.com; spf=temperror (zoho.com: Error in retrieving data from DNS) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (209.51.188.17 [209.51.188.17]) by mx.zohomail.com with SMTPS id 1556823692993693.0030933590084; Thu, 2 May 2019 12:01:32 -0700 (PDT) Received: from localhost ([127.0.0.1]:57363 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hMGxJ-0004eI-7x for importer@patchew.org; Thu, 02 May 2019 15:01:17 -0400 Received: from eggs.gnu.org ([209.51.188.92]:36107) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hMGvM-0003UE-Ua for qemu-devel@nongnu.org; Thu, 02 May 2019 14:59:17 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hMGvM-0002vv-1f for qemu-devel@nongnu.org; Thu, 02 May 2019 14:59:16 -0400 Received: from mout.kundenserver.de ([212.227.17.24]:48011) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hMGvL-0002u6-Ou; Thu, 02 May 2019 14:59:15 -0400 Received: from localhost.localdomain ([78.238.229.36]) by mrelayeu.kundenserver.de (mreue107 [212.227.15.183]) with ESMTPSA (Nemesis) id 1Mrggc-1h1SDp3B6i-00njoP; Thu, 02 May 2019 20:58:46 +0200 From: Laurent Vivier To: qemu-devel@nongnu.org Date: Thu, 2 May 2019 20:58:23 +0200 Message-Id: <20190502185835.15185-2-laurent@vivier.eu> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190502185835.15185-1-laurent@vivier.eu> References: <20190502185835.15185-1-laurent@vivier.eu> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Provags-ID: V03:K1:oR1ObyDzheuCsJYSoWaCS0YXv/NblZRyYkeYRMY0/IHirEPRzri GQXfKFKKG9YdybfH3SpL6eYzYkK9mFXumKxJQTv0q1cQBaqrQMhyktlVL0s6VwPUDSU4MhJ 1Jd9SZjuV/y7XvD0yCzxIjxCyvxmFjN//Pt+pbNlYTaUwO8tz5J6hIjOk6/p+wo80kXInYu WfDwKuUR287HlzGOE9AWg== X-UI-Out-Filterresults: notjunk:1;V03:K0:q4IYYtPfPiw=:Px5YNL/p0EsP4zXvcDDciV AoULs0Vh4aeJ/26Qj0VVpEfiUngffXUGM23tfJS5Oe1ft7K4zfiLCGtZrypNwA2JcT5n4faXC ve3+TZUl9vtbpg3Yb/bekle9nDMRqgMVsh6UwHl4K5TQsI42JalrI/E0OHej/KO9Akkkvl/rE h7EkKsXZiFPmNIgmo4HBmr20/PlLHfKcAsQoUNJnYafwZDiyzNPucyQ49udPFwtBo+qE4cNoa uvaEAcYzrWiTB3U9sgMkTzranaE0yUagJeiYa4g50l83PmK4hxy8X2R75UNzY0EbTGNOWvnM7 8lDn3s1OyuOtwpqKsltat+tExVkRnLsL346jgPfShShezryWKzoNff2leq/2rrRyaiIVlSRPF UvldwMAXcqIRFnmB4u5hkTE1oGhUNs7o6WFYRV1SJMGk5iGDPBmD3lLr+WAaV/BHjhGoTqwjZ ASDk9U5HLB19xv5WfKdItVb5CbW4zsGQl9YxGUB42T3Sai0jm996RS4ODAlIJa57fHmMdoP8Z B6wNfZas+mKD7PB072oGRmM1gMe5kf0xqNBCkmUnREIKmtbWNEbbXewinlNq9j2bo5b9kajVN 1S2OBtEmvcMXHfZASvyeCavoznqkVfHUQAA9mCngja0w5aof6gslv/oZQtiO4kWhwe5Kz+s3B 5drosIK3ErzNOaMcMMiUNqPV3wbca1MS/BPLgUWr5KKIu/1Le/ha22sx1cw7IvlUTvVG6wn6v v2DctFfxZkzhU4JhaSJi3wrqENTBawkKN2J/LTqft6+t2uR9b62wIoff9wo= X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 212.227.17.24 Subject: [Qemu-devel] [PULL 01/13] hw/net/pcnet: Use qemu_log_mask(GUEST_ERROR) instead of printf X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Maydell , Jason Wang , Michael Tokarev , Gerd Hoffmann , qemu-trivial@nongnu.org, Michael Roth , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Artyom Tarasenko , Laurent Vivier , Thomas Huth , Eduardo Habkost , Mark Cave-Ayland , Fabien Chouteau , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Richard Henderson , Viktor Prutyanov , Laurent Vivier , Paolo Bonzini , =?UTF-8?q?Andreas=20F=C3=A4rber?= , Aurelien Jarno Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" From: Philippe Mathieu-Daud=C3=A9 Avoid to clutter stdout until explicitly requested (with -d guest_errors): $ qemu-system-mips -M malta -m 512 -kernel vmlinux-3.2.0-4-4kc-malta Bad SWSTYLE=3D0x04 Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Thomas Huth Message-Id: <20190311102712.8572-1-philmd@redhat.com> Signed-off-by: Laurent Vivier --- hw/net/pcnet.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/hw/net/pcnet.c b/hw/net/pcnet.c index d9ba04bdfc62..16683091c939 100644 --- a/hw/net/pcnet.c +++ b/hw/net/pcnet.c @@ -36,6 +36,7 @@ */ =20 #include "qemu/osdep.h" +#include "qemu/log.h" #include "hw/qdev.h" #include "net/net.h" #include "net/eth.h" @@ -1501,7 +1502,8 @@ static void pcnet_bcr_writew(PCNetState *s, uint32_t = rap, uint32_t val) val |=3D 0x0300; break; default: - printf("Bad SWSTYLE=3D0x%02x\n", val & 0xff); + qemu_log_mask(LOG_GUEST_ERROR, "pcnet: Bad SWSTYLE=3D0x%02x\n", + val & 0xff); val =3D 0x0200; break; } --=20 2.20.1 From nobody Wed May 15 15:58:12 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1556824133; cv=none; d=zoho.com; s=zohoarc; b=lzDl6dsxaBiqHBblxXmgVKQz6upNOyCeuk52Qqu+1+eCJ5G1iQiIb4T2obvRuS3PpiM+iYYusDj90oOZbVNoC5rBLJhWUifd3ZuFMXfFvAJdMO4DbjjbeYh8r33PvpAH7aMOKwOUjpfcbMYLploZsI5Xp3DxP7TaHBwHPPzYZ0A= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1556824133; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=T6+S1LdylRhcpnVt6w7n43oLE3SwQ1r7H9im40xgn7Y=; b=A//JDeoWi+uv2/xB5xxgpwIYJLzDvQBQBD+UZGxDvTryyCU+9b3OlbOA6bFqYfgE4/bbnhhyvL5wrt1/BFnY9DYCM9NmlAmFDMWpuffMsYegvIjh5vQTZJYNNvIBWo56rPYHekD491UJWJDd2GSQQoVv9SItKeKed6Um83ysm6Q= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1556824133674393.66833047319494; Thu, 2 May 2019 12:08:53 -0700 (PDT) Received: from localhost ([127.0.0.1]:57476 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hMH4a-00031z-Im for importer@patchew.org; Thu, 02 May 2019 15:08:48 -0400 Received: from eggs.gnu.org ([209.51.188.92]:36503) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hMGvw-0003vW-B2 for qemu-devel@nongnu.org; Thu, 02 May 2019 14:59:53 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hMGvv-0003G5-6g for qemu-devel@nongnu.org; Thu, 02 May 2019 14:59:52 -0400 Received: from mout.kundenserver.de ([212.227.17.13]:43817) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hMGvp-00037H-V9; Thu, 02 May 2019 14:59:47 -0400 Received: from localhost.localdomain ([78.238.229.36]) by mrelayeu.kundenserver.de (mreue107 [212.227.15.183]) with ESMTPSA (Nemesis) id 1MpDa5-1gyQDg3Xkl-00qlx4; Thu, 02 May 2019 20:58:48 +0200 From: Laurent Vivier To: qemu-devel@nongnu.org Date: Thu, 2 May 2019 20:58:24 +0200 Message-Id: <20190502185835.15185-3-laurent@vivier.eu> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190502185835.15185-1-laurent@vivier.eu> References: <20190502185835.15185-1-laurent@vivier.eu> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Provags-ID: V03:K1:6WagXE00vi4QQwZmMsAKXeAEG8kmGBrv5XeQQE+7L0RCxCtE7Js jq6jbWP61ZHHNq+v7NLOMfdcrnu28ZBfEYOWFS5ovRmHItkypDs/yRNfjbxEFe6/hZTCs01 fVuG1JxM86snyRsthdUTLnSKry+a6IttZgcISmGu4hkyFaLckwTWhxkpSGWbdACHR34MT8s GYoZu6M4d3REkxe8o2p6g== X-UI-Out-Filterresults: notjunk:1;V03:K0:4gERy3jqQls=:n7b7aYxZ6tzSKomNnFGpSP H7CApcDXg6j5EC7aTR8gunAfjZXEQFVpei4LS0pSyZf2DGadLpWE8LDfBHW7/zpofrergnfTx PpRtm3BL0Q5kRNLVCiY2gpRhOnj1IE2N+4bmro4ZBcJNeSRDbaL7w87VkQC+u9Z6dpxzAfMHS ib7c5IdfIhOXxQ/xNWIlCVNMvXFBkjL6p/5xym3kpl9t0YVFrgEi/yFIx6qcM/mGysbMY7pcK cRs46XQqLV01c9HbHVRHo0L26v16YQD5zUfYq04zsrVqhmamfE3C1QiZ4VJAUoIBuvZo2keJ7 G7DVz48DOzk05M5D/FsZSLPGomBQ7nkVP2+n0x8Wqq7TFA8a4E7D1Z6Bz3Z17XMN67FWQmPc9 xieFXWlzXDwvfcnNVzf+7tSL4a6SD6VddfMRzrb66kP0DYq8BuduJTHwIs9iCowlVxWQuFsPg 40XD0oh+AIMcwQJH+DLhL/DwTYXTb2TAEWpzKPe91+vVdrGh91309V+c3SexmkARzoiLEFnoJ INTRcBeWLdEFgJkxoy23wILmuQU5DzgmTUcNSgNQmvejHOk+gVtYkav0lniIhRpbZgVgPlJPe byNLtKf8CjqFnr56sM+tVEGWzw3bSB0fUBsZy6Yr79GliJMzBGnE6Pu2A8/ubdk2JF/Lf9/zB LrXYUtCrXwlNOOICAGa+hMyQuiFTe5oW8B4AE1qqT/pT95LeKZyK3tHl5r/cJTq1r875r5q7l CPMCB4RGcPt409+weCzOlFWNX5UdetFESeWEEw== X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 212.227.17.13 Subject: [Qemu-devel] [PULL 02/13] CODING_STYLE: specify the indent rule for multiline code X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Maydell , Jason Wang , Michael Tokarev , Gerd Hoffmann , qemu-trivial@nongnu.org, Michael Roth , Artyom Tarasenko , Stefano Garzarella , Laurent Vivier , Thomas Huth , Eduardo Habkost , Mark Cave-Ayland , Fabien Chouteau , Igor Mammedov , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Richard Henderson , Viktor Prutyanov , Laurent Vivier , Wei Yang , Paolo Bonzini , =?UTF-8?q?Andreas=20F=C3=A4rber?= , Aurelien Jarno Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" From: Wei Yang We didn't specify the indent rule for multiline code here, which may mislead users. And in current code, the code use various styles. Add this rule in CODING_STYLE to make sure this is clear to every one. Signed-off-by: Wei Yang Suggested-by: Igor Mammedov Reviewed-by: Igor Mammedov Reviewed-by: Stefano Garzarella Message-Id: <20190304071631.27567-2-richardw.yang@linux.intel.com> Signed-off-by: Laurent Vivier --- CODING_STYLE | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) diff --git a/CODING_STYLE b/CODING_STYLE index ec075dedc4a8..90321e9c2821 100644 --- a/CODING_STYLE +++ b/CODING_STYLE @@ -29,6 +29,45 @@ Spaces of course are superior to tabs because: =20 Do not leave whitespace dangling off the ends of lines. =20 +1.1 Multiline Indent + +There are several places where indent is necessary: + + - if/else + - while/for + - function definition & call + +When breaking up a long line to fit within line width, we need a proper in= dent +for the following lines. + +In case of if/else, while/for, align the secondary lines just after the +opening parenthesis of the first. + +For example: + + if (a =3D=3D 1 && + b =3D=3D 2) { + + while (a =3D=3D 1 && + b =3D=3D 2) { + +In case of function, there are several variants: + + * 4 spaces indent from the beginning + * align the secondary lines just after the opening parenthesis of the + first + +For example: + + do_something(x, y, + z); + + do_something(x, y, + z); + + do_something(x, do_another(y, + z)); + 2. Line width =20 Lines should be 80 characters; try not to make them longer. --=20 2.20.1 From nobody Wed May 15 15:58:12 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1556823894; cv=none; d=zoho.com; s=zohoarc; b=Yr961N496lvtLaX5luFd6zRsh5x4W11CjqudilZZ63wTuRia8XC+Q54NrpkY2YMeYCAT2UmIpd4lu+qDRFRNvLeP1TXBiEu3o3ptFYQiQNXwgh6tX+R2K1aGqoSZwuMLImBy5FD6HPY7ctozNmt50CXFxNiu3TwiShHmzXKayng= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1556823894; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=1NdZTnPHMQqyvJlrqk4KOIug3/by1q6lAvWSM6iilHA=; b=W6ohYgKgMRXPrWEQzR5ZYb5DpVl2AaUsnNjEn+lGUUM/KSEn4p14MRrmB0S8kGvUKnF6PltP/AFD37TnAAIeo4EhyFZzvhMp/xHHXTzs8C3b3Keaa/LsXhSe6ZV/M6uGsC7SngUEp8+1JI1Uxx8oY3aAz1sO3HGD9WDnKOD0YKU= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1556823894270152.91127259232428; Thu, 2 May 2019 12:04:54 -0700 (PDT) Received: from localhost ([127.0.0.1]:57403 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hMH0l-0007nh-83 for importer@patchew.org; Thu, 02 May 2019 15:04:51 -0400 Received: from eggs.gnu.org ([209.51.188.92]:36405) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hMGvs-0003qG-1G for qemu-devel@nongnu.org; Thu, 02 May 2019 14:59:49 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hMGvq-00038P-16 for qemu-devel@nongnu.org; Thu, 02 May 2019 14:59:47 -0400 Received: from mout.kundenserver.de ([217.72.192.73]:49225) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hMGvo-00036L-63; Thu, 02 May 2019 14:59:45 -0400 Received: from localhost.localdomain ([78.238.229.36]) by mrelayeu.kundenserver.de (mreue107 [212.227.15.183]) with ESMTPSA (Nemesis) id 1MulVd-1gUrBS2fkB-00rmX0; Thu, 02 May 2019 20:58:49 +0200 From: Laurent Vivier To: qemu-devel@nongnu.org Date: Thu, 2 May 2019 20:58:25 +0200 Message-Id: <20190502185835.15185-4-laurent@vivier.eu> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190502185835.15185-1-laurent@vivier.eu> References: <20190502185835.15185-1-laurent@vivier.eu> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Provags-ID: V03:K1:i8N48vf6fYeQrXRpmliB1WbbQePfY7u70TUSvgRUwugwD4qm+PH LPLdWWdX/TDJimYRhNRBrRbClzUyzlva6Nl7/bjaKkIQE3lof3IU0/YS8P8/+PONtT11Syl puSoX5vr5YsnSU6lmTMBdhipO++qof5PiWsTDF5xbKXHVrB5t6PL8768pcWZCagmNyxF4jP veBVFUtq+nADNt8DlQzdA== X-UI-Out-Filterresults: notjunk:1;V03:K0:hdmbE3AA+90=:UDPPnU0TVO8VM3YtriMX0F 3iK+TZOru1Qh/OtPoueav0a4Mx5ann9iSjpNNAm3TNFdDkqss0y5N4GZdlYS6AI0ooKhNVAc7 IjH8QL6RQJxA6/RIk0F+7PlZrgwfeynR+ruM/i2tnvsrosKAFpUc1c4oVPc+oaZ6W/3LcqRLy zy5DBVSisyvv9jhjRJy5rAwydyToYUguJqO5jf3egxy6x2j5VUYEOQGp13VHyC5PE0i21Hk7+ Vh9qfdsdVyJK7W4i2CUNPwr+1SOKGu4sWhHhykgQlgDBBCqtfbCal+RPYstygrUNh85fk54qo 7+PbXlqm0ppYD79DWuzdBAi2LDEXBAAfpMY5BOMiuNEaWa21fka7a/x/nDrK+n4phKvXTYwtE UtrRQIKK1jdxevERlL9cH2/hxoQYGGGur8cMMFkmvreHn+eEyIgq8BuG84KJydvEvM+XQ3iJU LtW/zrLsb74xTgOVyItUK+iV2tKf2H2cAT5wc0TIzYBEkMLBgVP0uUwjfeEEsKz5CK3Q0LPT8 pe3EGWdoNvNme8me/lBiuVkGwAwAXXY+rlNPQS4PmLuWOjSNojy02VRd/pt9v3m6HNcnChG7i wK6MVcbaW3Q2pHzt3SciZ1kD9rrttjiPUbkkxjPz89H3V6CXRpOpRrunjOaT+CiCPjTG69a7W VLc/lM/s/aNfmrlXAcPkfkvrKw0hhXGEhKdGAMmZzMI3OIHGO7CalWb3xxqsORflC2udqUqFJ TgxkZie0JRESHcq+K/AtvwutGNowcFHhRm3obFs5Jvyp5E14DGE6hFaXjMU= X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 217.72.192.73 Subject: [Qemu-devel] [PULL 03/13] CODING_STYLE: indent example code as all others X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Maydell , Jason Wang , Michael Tokarev , Gerd Hoffmann , qemu-trivial@nongnu.org, Michael Roth , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Artyom Tarasenko , Stefano Garzarella , Laurent Vivier , Thomas Huth , Eduardo Habkost , Mark Cave-Ayland , Fabien Chouteau , Igor Mammedov , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Richard Henderson , Viktor Prutyanov , Laurent Vivier , Wei Yang , Paolo Bonzini , =?UTF-8?q?Andreas=20F=C3=A4rber?= , Aurelien Jarno Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" From: Wei Yang All the example code are indented with four spaces except this one. Fix this by adding four spaces here. Signed-off-by: Wei Yang Reviewed-by: Eric Blake Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Igor Mammedov Reviewed-by: Stefano Garzarella Message-Id: <20190304071631.27567-3-richardw.yang@linux.intel.com> Signed-off-by: Laurent Vivier --- CODING_STYLE | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/CODING_STYLE b/CODING_STYLE index 90321e9c2821..cb8edcbb3692 100644 --- a/CODING_STYLE +++ b/CODING_STYLE @@ -147,10 +147,10 @@ block to a separate function altogether. When comparing a variable for (in)equality with a constant, list the constant on the right, as in: =20 -if (a =3D=3D 1) { - /* Reads like: "If a equals 1" */ - do_something(); -} + if (a =3D=3D 1) { + /* Reads like: "If a equals 1" */ + do_something(); + } =20 Rationale: Yoda conditions (as in 'if (1 =3D=3D a)') are awkward to read. Besides, good compilers already warn users when '=3D=3D' is mis-typed as '= =3D', --=20 2.20.1 From nobody Wed May 15 15:58:12 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1556823714; cv=none; d=zoho.com; s=zohoarc; b=FF0xlqKtN7JMEXM7GQwbn6ZFYrD8McljXyb9Qzw8sxgJy0J/4E1nCkcV7Wz1n26iaYCP2Vc+UDr+kWi4TnY7RofbPeJb8Ve0yGMBd+rxJZ5SeNIstpT6CB77UnZJTqW7aICHNclppl5qhS8Zc4YrarLMiAVOEcaB3a3XzPyLmQY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1556823714; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=H5xQErNvLcxjuefTKDK7ngdGevSf+zIx7SeAb9j8h2U=; b=WIiNV43IGvesHRZWrEdotv2kTt2WhOOgEpfty9+dhIOIvU4FaHT/1Iic9wnT2DsOTLjzgLS6u+t3qrnyl2mAACu68CQSQ+JsKVMXzCULl7qrWsAazB3KsNjsyLUDEqU98pMk6mfWhzxE6x5CjXR3Hoe4ijgOEexbRMYg7cZpgW0= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1556823714116885.605866684985; Thu, 2 May 2019 12:01:54 -0700 (PDT) Received: from localhost ([127.0.0.1]:57371 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hMGxm-0005AE-UA for importer@patchew.org; Thu, 02 May 2019 15:01:47 -0400 Received: from eggs.gnu.org ([209.51.188.92]:36243) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hMGvk-0003jW-1J for qemu-devel@nongnu.org; Thu, 02 May 2019 14:59:42 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hMGvh-00034P-Ve for qemu-devel@nongnu.org; Thu, 02 May 2019 14:59:39 -0400 Received: from mout.kundenserver.de ([212.227.17.24]:54335) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hMGvg-00033d-0R; Thu, 02 May 2019 14:59:37 -0400 Received: from localhost.localdomain ([78.238.229.36]) by mrelayeu.kundenserver.de (mreue107 [212.227.15.183]) with ESMTPSA (Nemesis) id 1MQ5f4-1h97kp1GwC-00M0HN; Thu, 02 May 2019 20:58:51 +0200 From: Laurent Vivier To: qemu-devel@nongnu.org Date: Thu, 2 May 2019 20:58:26 +0200 Message-Id: <20190502185835.15185-5-laurent@vivier.eu> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190502185835.15185-1-laurent@vivier.eu> References: <20190502185835.15185-1-laurent@vivier.eu> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Provags-ID: V03:K1:xVhJC29hi64K8Mo9KwgOZ8dLwMyyjb7cCfI8WpjTj+J/1NYL+Qm Voo0cOPqv1EUxVYbM/VRS/Bs7RZpK3EZ/gMsUB9Xs9FPXlvA3pRs6HIds7fO3wjVeuqGDTP Omc5HWKWoTNY1g/NWXMbPA5arCrFvmZTB+nPplx+kdp6xiOKd7NqRMNL5XYEUBAFzHHM3d9 gQ0hK8lqpVG4jHiVusFXw== X-UI-Out-Filterresults: notjunk:1;V03:K0:oSm8HSqA+gY=:XwAhgy9L85c3CyL1iSZyyX jELqtg/xXpnnrP7tz/BHAUkvE8vAW9qMQW2v1pR0mBRwh1stHyIDKGSGEmIkRgeD6wwitjVBm dG0A4asqc4Be4g50w7cZhnBXlTFVXLfY5IbTCbpDT71fCquvcYRFCF9wz2/19AB4vQL9qCIJ7 +M2qX6VELbnfO3OgaJ4hMd2z1YJXJ8F4lrQmP/NWUolETkIMEN8Axav1SaW+L/xbnAMcslN/k SKPP3m6o1Zo1XC8qYFFH03lknOQouvxzRC1TpGq2DMy3jU9gsRfriXpTqXFVpJBodsjui2+aB xfotr5NB9Y9Rcm29m78XyqDqHOWLCKFjUI/81ClbJa2M1qxo1DUYixdvLyE03J0kzr4HBWS99 weAkaD3yYhxJ7IBjGi6K20doj1OjBq85Fa8d6g5oV1hIvK6EOXRwbixH12LHgg3B+1p3Bqhgb Tau0Em0K26WqaMIBIQsSY4JvUKMIPU5TK9jhL+DH9y6OMd0qfAajYi2Lx2ODObEClbyXHqRlW Qs82h7We6fASG4AxxR8QfW0CoRPNHmEUmd5Zma7nUZwy6jX010wz872KOhF7TggtWYGzX+CTJ x1Vlj9AbEykJDPky2FX0fRU9g/lfxb4Yg2EAdYRFU/YYN7TihCwwwxH7g/kr2aDkvXA+/etk7 2EQrc3roOKCej5/qlQKbhC3eHOliLMUo3IrMCmkR+zaE2npgw8+HB+wniP9oYLd8mvlSxk+R6 i2hjXVCCZdO/9aAR7HBqshv0lp0zY42mYXdbmA== X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 212.227.17.24 Subject: [Qemu-devel] [PULL 04/13] Clean up includes X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Maydell , Jason Wang , Michael Tokarev , Markus Armbruster , Gerd Hoffmann , qemu-trivial@nongnu.org, Michael Roth , Artyom Tarasenko , Laurent Vivier , Thomas Huth , Eduardo Habkost , Mark Cave-Ayland , Fabien Chouteau , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Richard Henderson , Viktor Prutyanov , Laurent Vivier , Paolo Bonzini , =?UTF-8?q?Andreas=20F=C3=A4rber?= , Aurelien Jarno Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" From: Markus Armbruster Clean up includes so that osdep.h is included first and headers which it implies are not included manually. This commit was created with scripts/clean-includes, with the changes to the following files manually reverted: contrib/libvhost-user/libvhost-user-glib.h contrib/libvhost-user/libvhost-user.c contrib/libvhost-user/libvhost-user.h linux-user/mips64/cpu_loop.c linux-user/mips64/signal.c linux-user/sparc64/cpu_loop.c linux-user/sparc64/signal.c linux-user/x86_64/cpu_loop.c linux-user/x86_64/signal.c slirp/src/* target/s390x/gen-features.c tests/migration/s390x/a-b-bios.c tests/test-rcu-simpleq.c tests/test-rcu-tailq.c tests/uefi-test-tools/UefiTestToolsPkg/BiosTablesTest/BiosTablesTest.c We're in the process of spinning out slirp/. tests/uefi-test-tools/ is guest software. The remaining reverts are the same as in commit b7d89466dde. Signed-off-by: Markus Armbruster Reviewed-by: Eric Blake Reviewed-by: Thomas Huth Message-Id: <20190313162812.8885-1-armbru@redhat.com> Signed-off-by: Laurent Vivier --- hw/display/ati_int.h | 1 - include/hw/cpu/cluster.h | 1 - tests/fp/platform.h | 1 - tests/libqos/qgraph.h | 4 ---- contrib/elf2dmp/main.c | 3 +-- contrib/elf2dmp/pdb.c | 3 +-- hw/display/ati.c | 1 + hw/display/ati_2d.c | 1 + hw/display/ati_dbg.c | 1 + tests/qos-test.c | 2 +- 10 files changed, 6 insertions(+), 12 deletions(-) diff --git a/hw/display/ati_int.h b/hw/display/ati_int.h index a6f3e20e6319..2f426064cf7d 100644 --- a/hw/display/ati_int.h +++ b/hw/display/ati_int.h @@ -9,7 +9,6 @@ #ifndef ATI_INT_H #define ATI_INT_H =20 -#include "qemu/osdep.h" #include "hw/pci/pci.h" #include "vga_int.h" =20 diff --git a/include/hw/cpu/cluster.h b/include/hw/cpu/cluster.h index 549c2d31d438..01c1e50cd221 100644 --- a/include/hw/cpu/cluster.h +++ b/include/hw/cpu/cluster.h @@ -20,7 +20,6 @@ #ifndef HW_CPU_CLUSTER_H #define HW_CPU_CLUSTER_H =20 -#include "qemu/osdep.h" #include "hw/qdev.h" =20 /* diff --git a/tests/fp/platform.h b/tests/fp/platform.h index c20ba70baa07..f8c423dde3dc 100644 --- a/tests/fp/platform.h +++ b/tests/fp/platform.h @@ -29,7 +29,6 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE O= F THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config-host.h" =20 #ifndef HOST_WORDS_BIGENDIAN #define LITTLEENDIAN 1 diff --git a/tests/libqos/qgraph.h b/tests/libqos/qgraph.h index ef0c73837a60..e799095b308a 100644 --- a/tests/libqos/qgraph.h +++ b/tests/libqos/qgraph.h @@ -19,11 +19,7 @@ #ifndef QGRAPH_H #define QGRAPH_H =20 -#include -#include -#include #include -#include #include "qemu/module.h" #include "malloc.h" =20 diff --git a/contrib/elf2dmp/main.c b/contrib/elf2dmp/main.c index 1bfeb89ba7bd..9a2dbc290214 100644 --- a/contrib/elf2dmp/main.c +++ b/contrib/elf2dmp/main.c @@ -5,9 +5,8 @@ * */ =20 -#include - #include "qemu/osdep.h" + #include "err.h" #include "addrspace.h" #include "pe.h" diff --git a/contrib/elf2dmp/pdb.c b/contrib/elf2dmp/pdb.c index 64af20f5842e..a5bd40c99dca 100644 --- a/contrib/elf2dmp/pdb.c +++ b/contrib/elf2dmp/pdb.c @@ -18,9 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, U= SA */ =20 -#include - #include "qemu/osdep.h" + #include "pdb.h" #include "err.h" =20 diff --git a/hw/display/ati.c b/hw/display/ati.c index db409be3c958..75716dd944ec 100644 --- a/hw/display/ati.c +++ b/hw/display/ati.c @@ -16,6 +16,7 @@ * No 3D at all yet (maybe after 2D works, but feel free to improve it) */ =20 +#include "qemu/osdep.h" #include "ati_int.h" #include "ati_regs.h" #include "vga_regs.h" diff --git a/hw/display/ati_2d.c b/hw/display/ati_2d.c index bc98ba6eebf6..f31b3c27c7d8 100644 --- a/hw/display/ati_2d.c +++ b/hw/display/ati_2d.c @@ -7,6 +7,7 @@ * This work is licensed under the GNU GPL license version 2 or later. */ =20 +#include "qemu/osdep.h" #include "ati_int.h" #include "ati_regs.h" #include "qemu/log.h" diff --git a/hw/display/ati_dbg.c b/hw/display/ati_dbg.c index 1e6c32624e5a..b045f81d0602 100644 --- a/hw/display/ati_dbg.c +++ b/hw/display/ati_dbg.c @@ -1,3 +1,4 @@ +#include "qemu/osdep.h" #include "ati_int.h" =20 #ifdef DEBUG_ATI diff --git a/tests/qos-test.c b/tests/qos-test.c index 6b1145ecccff..ae2fb5de1c9b 100644 --- a/tests/qos-test.c +++ b/tests/qos-test.c @@ -16,8 +16,8 @@ * License along with this library; if not, see */ =20 -#include #include "qemu/osdep.h" +#include #include "libqtest.h" #include "qapi/qmp/qdict.h" #include "qapi/qmp/qbool.h" --=20 2.20.1 From nobody Wed May 15 15:58:12 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1556823891; cv=none; d=zoho.com; s=zohoarc; b=OkAGzKA8MectovWZ54Wg7KAHOZ6djNRd1+mJOgtMOtokaEpLrkKx54Ruk7PiG39Cp6eCXjdztkmmeUV5PYpN78uWLHMQUWGcp6g9gYmYWCTLlLlD+rW8NKJ2xIL7HGkd7i4NqygTtIvoHpq+i9bTq1/5Uk2jH/AcccC/TCu3lsc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1556823891; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=EyFxv6MktR+0J/f1CQ4qUvhledY+W+hlpGzowYF2CaQ=; b=fwghn41RB6x5OrhJyxH38myrVb3U4xJ9il2rY4hgLsK8u88SKkQvArmimWvQDgoJW9QrFwVZHGsdyzfJKDUIzYxv9cPWq3Bxs4RRDLQZMZgq4IOSI44J7V2cMT/P0NzItKE089xWVgb0gyKeZDJ3B3u9QifDdHZKWrFhq8FSJfk= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1556823891997357.2806238455187; Thu, 2 May 2019 12:04:51 -0700 (PDT) Received: from localhost ([127.0.0.1]:57399 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hMH0i-0007jS-W0 for importer@patchew.org; Thu, 02 May 2019 15:04:49 -0400 Received: from eggs.gnu.org ([209.51.188.92]:36266) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hMGvm-0003jj-AY for qemu-devel@nongnu.org; Thu, 02 May 2019 14:59:43 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hMGvh-00034G-VK for qemu-devel@nongnu.org; Thu, 02 May 2019 14:59:41 -0400 Received: from mout.kundenserver.de ([212.227.17.24]:43023) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hMGvf-00033M-UL; Thu, 02 May 2019 14:59:37 -0400 Received: from localhost.localdomain ([78.238.229.36]) by mrelayeu.kundenserver.de (mreue107 [212.227.15.183]) with ESMTPSA (Nemesis) id 1MploR-1gyyBN4BJN-00qDii; Thu, 02 May 2019 20:58:53 +0200 From: Laurent Vivier To: qemu-devel@nongnu.org Date: Thu, 2 May 2019 20:58:27 +0200 Message-Id: <20190502185835.15185-6-laurent@vivier.eu> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190502185835.15185-1-laurent@vivier.eu> References: <20190502185835.15185-1-laurent@vivier.eu> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Provags-ID: V03:K1:EuFW6QXXDhfSBoO1sW1/UpU4tStfXqkjNUl5Qim3N6zbnDiHy/K SCms3QSP2GMuS5W5tH7CR8vYoLgxir32oTn5V2PGKPe8JMCeVyccG4YTxyH9aaDcRDaXCCO 0hq8TtP3h67eyp1cRVOn0pQZOf0H/g+ctEIOwNllIgd1SUgjBJAa62BRkI1Te+5b0GhOLoe D4Rg9TokUeFWw8D300Wsw== X-UI-Out-Filterresults: notjunk:1;V03:K0:hoDHAHMzAj4=:SWm2wVIyRvcOI1GsCp0Bj0 tOywv8KcH+ASk1Fws3BFCQ552mzcict0QUMUFW890qKpJhespBSt8dEo4tUm5F1ysXpnngoy6 hDOGLUzz12DZQrBMKVn/vraCcssnVMf9oKZKfryF4y+39E+URCFTH1BeBBHGMhqSyyk0dWr59 ZPSQHKEqnXb/SLR0z8/TAv08rfiMvWBXEVPlI/vgc+FmL8Pm8YSlgTeMBYCOgMw+BzWEYE15b D9sO99LpRoSISfUVwXABWGpoF/Xm1L7x1grInXqOt48gu0qsnEHmRR3xyx61CXEd52GYEr3RQ 9FZ+edObcxDiml59lDJDtBRUB1mb3a9v3YBvMJO82OXOZAI7cvMfHutu/UVL1wZL3JPjgCnlt V/tDyluGZ0JpDMo8Vq94EoYh5duVCgOdVQBcxGdUdqKZxUBnp1v/TXDN4Zx8ClFR5LtMYiQWg SHAo9fhHh8wHwS8CV0rMAofHCoxPovwCCd/A8Otrf0fgD6jc3GJpaDSfD/s8yCrf4YA13VNJe JifLnjaBU2wwwJN5V9MQGO2AhCQNzPKiuyQvJbFY/BYS0B4at3X0aO6vpPClC1yF69+TM0tvg 615Jdn33PiGnOZmzD3dnBpOZuTWcS0pS50dUPMrYAiXew4t8tjBtYYQ+oqQkqeSAgoy0EJt40 SDE/Q4Mp1kRNLSHhj3zhQ6QgzgI2hueHU/oCihnbItioVRXBFWmlXxN+ohBC2F6E4mQ8PRKJg ZYzMzNlQ6VvNVJnWw5JGLqNpQSDmGFjeIE0kH69BlJTgPIQ/FNdN8A0rLPQ= X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 212.227.17.24 Subject: [Qemu-devel] [PULL 05/13] doc: fix the configuration path X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Maydell , Jason Wang , Michael Tokarev , Gerd Hoffmann , qemu-trivial@nongnu.org, Michael Roth , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Artyom Tarasenko , Laurent Vivier , Thomas Huth , Eduardo Habkost , Mark Cave-Ayland , Fabien Chouteau , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Richard Henderson , Viktor Prutyanov , Laurent Vivier , Paolo Bonzini , =?UTF-8?q?Andreas=20F=C3=A4rber?= , Aurelien Jarno Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" From: Marc-Andr=C3=A9 Lureau Use a CONFDIR variable to show the configured sysconf path in the generated documentations (html, man pages etc). Related to: https://bugzilla.redhat.com/show_bug.cgi?id=3D1644985 Signed-off-by: Marc-Andr=C3=A9 Lureau Reviewed-by: Philippe Mathieu-Daud=C3=A9 Message-Id: <20181126105125.30973-1-marcandre.lureau@redhat.com> Signed-off-by: Laurent Vivier --- qemu-ga.texi | 4 ++-- Makefile | 9 ++++++--- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/qemu-ga.texi b/qemu-ga.texi index 4c7a8fd16329..f00ad830f283 100644 --- a/qemu-ga.texi +++ b/qemu-ga.texi @@ -30,7 +30,7 @@ set user's password @end itemize =20 qemu-ga will read a system configuration file on startup (located at -@file{/etc/qemu/qemu-ga.conf} by default), then parse remaining +@file{@value{CONFDIR}/qemu-ga.conf} by default), then parse remaining configuration options on the command line. For the same key, the last option wins, but the lists accumulate (see below for configuration file format). @@ -58,7 +58,7 @@ file format). Enable fsfreeze hook. Accepts an optional argument that specifies script to run on freeze/thaw. Script will be called with 'freeze'/'thaw' arguments accordingly (default is - @samp{/etc/qemu/fsfreeze-hook}). If using -F with an argument, do + @samp{@value{CONFDIR}/fsfreeze-hook}). If using -F with an argument, do not follow -F with a space (for example: @samp{-F/var/run/fsfreezehook.sh}). =20 diff --git a/Makefile b/Makefile index 1211e78c91ed..43a7a047b452 100644 --- a/Makefile +++ b/Makefile @@ -899,11 +899,14 @@ ui/shader.o: $(SRC_PATH)/ui/shader.c \ MAKEINFO=3Dmakeinfo MAKEINFOINCLUDES=3D -I docs -I $( $@,"GEN","$@") +docs/version.texi: $(SRC_PATH)/VERSION config-host.mak + $(call quiet-command,(\ + echo "@set VERSION $(VERSION)" && \ + echo "@set CONFDIR $(qemu_confdir)" \ + )> $@,"GEN","$@") =20 %.html: %.texi docs/version.texi $(call quiet-command,LC_ALL=3DC $(MAKEINFO) $(MAKEINFOFLAGS) --no-headers= \ --=20 2.20.1 From nobody Wed May 15 15:58:12 2024 Delivered-To: importer@patchew.org Received-SPF: temperror (zoho.com: Error in retrieving data from DNS) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=temperror (zoho.com: Error in retrieving data from DNS) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1556824079; cv=none; d=zoho.com; s=zohoarc; b=aCseqcXsJe8KnYGHUhYmp5yW7VAplgSGFMX5Dtf4QdfqOWywCG8ZgNWLU4IUBWRZGk8/UDBxAcDjX0xMJhx6jyqRFX/64a6rk4jHnHMPLC6uugu8sfPExS8h/OLwmD0tr3B6QjVHYP8QYbyCDWOAlCluGJU15G0qFw+1gxU2cQc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1556824079; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=KgnllEvhCWGeWdsSdEuzz7MM0PT5TDXBzevZ1LBU8iE=; b=WjlwYtZmxHDXboLAGXKblrEf4UNbiW5oC4apVh3oqOea8hF4YiQEx6GjElSoGA1u/cQiJalKweGHWmiCn+8gGT7uXIaCS7rh1vJSYRKaLKHsk6ifLLGdQ2jUjNWXjxL/vnOqZiTBk4YcPXaHqZnyPyRqBL5JKo+WVC8f5TWiw2Q= ARC-Authentication-Results: i=1; mx.zoho.com; spf=temperror (zoho.com: Error in retrieving data from DNS) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (209.51.188.17 [209.51.188.17]) by mx.zohomail.com with SMTPS id 1556824079184208.86499249018948; Thu, 2 May 2019 12:07:59 -0700 (PDT) Received: from localhost ([127.0.0.1]:57472 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hMH3X-0002Bl-TG for importer@patchew.org; Thu, 02 May 2019 15:07:43 -0400 Received: from eggs.gnu.org ([209.51.188.92]:36466) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hMGvu-0003tu-Tu for qemu-devel@nongnu.org; Thu, 02 May 2019 14:59:51 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hMGvt-0003AL-Sm for qemu-devel@nongnu.org; Thu, 02 May 2019 14:59:50 -0400 Received: from mout.kundenserver.de ([217.72.192.75]:58473) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hMGvn-000369-Vm; Thu, 02 May 2019 14:59:44 -0400 Received: from localhost.localdomain ([78.238.229.36]) by mrelayeu.kundenserver.de (mreue107 [212.227.15.183]) with ESMTPSA (Nemesis) id 1MNcYX-1h65kT2sN1-00P2Q2; Thu, 02 May 2019 20:58:54 +0200 From: Laurent Vivier To: qemu-devel@nongnu.org Date: Thu, 2 May 2019 20:58:28 +0200 Message-Id: <20190502185835.15185-7-laurent@vivier.eu> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190502185835.15185-1-laurent@vivier.eu> References: <20190502185835.15185-1-laurent@vivier.eu> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Provags-ID: V03:K1:ur/Wju8uHKEhby/1Bd7kRz2oP+WPX2g2aOyNZSbku383Jx7XDj/ 2gQN9Bgozg3RGKscB8lIGhiWqY0Wz56RIHJkHCqd7709G70D1H1b03cS4Cx6AUMfcLBk/K8 /7mdtp5ZRF6KyP2UKCLoryDWmaFCMr8ukZWOcLCC24aEVF9a8dXTeXTnbaM/XDk9fZKNlzA lcLQz3X7a59XdpN/LMRog== X-UI-Out-Filterresults: notjunk:1;V03:K0:rc3vUDtaI6Q=:3NtnypnZDcRZWrct7S1Ek2 sbrvRdWLr6jVKAgIt9LI+WgXJ7fZ/+cR4hsvqhS+ZiUEFkLKaFtsS3hWn0BnsZXnuapykTWWQ O0KOqrCQjBYoIjogYG7d/hF009G8/zzNYYyvNNvIuVtXn/HQo6DjrS9KOrkg23glEhHi00I1W ftTLh8NhbnMEpzKP6auQmkf0PydnpovTK8VHDNxltY7vAIulDFaQVRZB54dwXsjG9rw8isHEI DVfHZGDmwKoNJ0Fs0n2sh1dUFjyl2gRIE6G5Q1+K6ca9Xlxzon2bTuANpMVGQY28amTS2fNBy dB2V/g/jl4xADMv7mK7zBjfeIio7ovBngNCFMYZaGhZl6lQ71qVRmcE7WFkfkGbIkGapxmLm4 kuEW/kpa1wiLdBl8cSCNWv+GS3bX/G7eOJXxlZzPhWYjKjvKLdebju8Or8RvE+0sHRWFO4zUA KomQa1Xp390Z+Riy1GmM+IGwwIWb3lRr4g+5KTuRHB6SchWLhVFQewOniMMayovD84FfeaUca TXG7pazDNUdZJ8HUyM5sVgfMQg9iJK+aj/I1BDw3VmqnwJRxoSW8huBnQMCPGmBi2RVAZsk2e cWoV90pao3oGw0lZGbc/sal2HIII+fKz52URt0kD56IvbmvZW263PSdnBRxoXcVcf1kxpxffP 7MXbcJCqjCr2a7MU83IUnmM9lgXFzIKaYegS5L+Mmo4/vOnx1uHCRReFIJMYs0C4ObRQbBy8F hA1zEhIYKCzZDWGYZEtJwnxTy0/v6x2ymCM4qq5FbZ+fFZjUTDS47bLxWJo= X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 217.72.192.75 Subject: [Qemu-devel] [PULL 06/13] qom: use object_new_with_type in object_new_with_propv X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Maydell , Jason Wang , Michael Tokarev , Gerd Hoffmann , qemu-trivial@nongnu.org, Michael Roth , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Artyom Tarasenko , Stefano Garzarella , Laurent Vivier , Thomas Huth , Eduardo Habkost , Mark Cave-Ayland , Fabien Chouteau , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Richard Henderson , Viktor Prutyanov , Laurent Vivier , Wei Yang , Paolo Bonzini , =?UTF-8?q?Andreas=20F=C3=A4rber?= , Aurelien Jarno Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" From: Wei Yang Function object_new_with_propv already get the Type of the object, so we could leverage object_new_with_type here. Signed-off-by: Wei Yang Reviewed-by: Marc-Andr=C3=A9 Lureau Reviewed-by: Stefano Garzarella Message-Id: <20190311083234.20841-1-richardw.yang@linux.intel.com> Signed-off-by: Laurent Vivier --- qom/object.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qom/object.c b/qom/object.c index e3206d6799ee..d3412e7fdca6 100644 --- a/qom/object.c +++ b/qom/object.c @@ -679,7 +679,7 @@ Object *object_new_with_propv(const char *typename, error_setg(errp, "object type '%s' is abstract", typename); return NULL; } - obj =3D object_new(typename); + obj =3D object_new_with_type(klass->type); =20 if (object_set_propv(obj, &local_err, vargs) < 0) { goto error; --=20 2.20.1 From nobody Wed May 15 15:58:12 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1556824219; cv=none; d=zoho.com; s=zohoarc; b=mJ4JDmB32PH4nmXht2FdNL+LYxJS/BtZpMIjxBWGmPgPQaQEytz7FydOMYNM5hfMlcTQttFqRR93DUcCc/Nn6dY748wbhEBuA+brUXNaalFKI7qi7RnvzNHzPo/JZnVQvrTECH2PR4TDLTE062bi65wtZJ1mOt2L3AHZT9XUAR0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1556824219; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=szmoouXf4/nD6CKMT99tn3JsKxnh2gMX2Az+qEWPK1U=; b=mxjuTSTlg0iz4thQ+imasbQXNZ302CntWDh9uq592x4c5tCe67zw5xB1BzCA18RtuA19G/F3H/B6T9OKl826gRTWIHpsPEZY9r/IieVWPlUdGMuUfKlnIHaLElHkiHHBiW/Yv7WLTpB9/TVmNafqBIDWhzFy4aXcNWAGFq44Ovo= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1556824219358564.0214889399882; Thu, 2 May 2019 12:10:19 -0700 (PDT) Received: from localhost ([127.0.0.1]:57494 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hMH60-00049C-2g for importer@patchew.org; Thu, 02 May 2019 15:10:16 -0400 Received: from eggs.gnu.org ([209.51.188.92]:36401) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hMGvs-0003qD-0q for qemu-devel@nongnu.org; Thu, 02 May 2019 14:59:51 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hMGvp-00037x-VH for qemu-devel@nongnu.org; Thu, 02 May 2019 14:59:47 -0400 Received: from mout.kundenserver.de ([212.227.17.10]:60361) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hMGvk-00034c-34; Thu, 02 May 2019 14:59:41 -0400 Received: from localhost.localdomain ([78.238.229.36]) by mrelayeu.kundenserver.de (mreue107 [212.227.15.183]) with ESMTPSA (Nemesis) id 1M27ep-1hJmsj1MmP-002Zci; Thu, 02 May 2019 20:58:56 +0200 From: Laurent Vivier To: qemu-devel@nongnu.org Date: Thu, 2 May 2019 20:58:29 +0200 Message-Id: <20190502185835.15185-8-laurent@vivier.eu> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190502185835.15185-1-laurent@vivier.eu> References: <20190502185835.15185-1-laurent@vivier.eu> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Provags-ID: V03:K1:H2H9MCyc2DmTRCDkaDfCsZnR9i4GjOwsHzexMHM4iJ4N79E0Nrz z7VLPeXiOB609DA8DfrC4ik8IZKVf5d0MSqPEVo8crqjMwQtJ2dLc7KJ4uzbNzIeUxEHYIT aAHqXjt5T1S3dbTLuarmRJGDIhGzLC3tnP9d03slfkvQiN9iO0VHNRy/Dp2ppNvbsxwNH5g lZDDJJAUOP3QsDr/bl+kQ== X-UI-Out-Filterresults: notjunk:1;V03:K0:RDClypQPHAo=:nkd5Cm1c8uUMu35oJ6Scbl qJa7kaujlR7g86WeB4W+yFqLlJaZryPcQi1BWS+UmUXFfkqQehSwzMkrod8cwu/13TqeFPg1l GIFyhRttLWCOV3lVuKu5bunRWXw9HrtnQn68cdqa2Iq6XCrNkDFRLPNYQTHn6uRVl/OyZEqbb zOaIHQ2kL8Ac7cDkNg3GAIrakAsVsWDtmlDD5l3XcFv24fTIY90G+68qopEwHsXCixjqSOnNS b8no5/NLsV8ylr+2REYvuN7x9wNT9LYoA2bRaXT2Fyl9gVAfmGOECDyNA6FPG5h3P+k8aThFr +MWV/cSs9u5P68jOTO5M5KMIek76PyCLvR6GKzYAswksPAqM3ufCjTWGHBU2PjK6vehTY+FJt 4w0QqHIwxVaeY3PnqfQA/C4N6ciyo2T//TLhtQ3W9zLQB5X/GMFJyPHbKaD0Jdrd5g3UqgUAq TVWSsznG8kqaETVBsMI7e2jj0uOguqQjC2mkLTOeMSQT19YDs/WBC7cZpzGGb/A9YiZcZP+MA 7G1SseI2/Ek/0+QBEP5ousAehPmAuggCof4C6x3eKYvnsKsAmsBonV7SG5kDSt3beQJtPldOB 3Q5HkUmXCbBFYvcydFaTB9KX/KsS7eEogR5WVlCK10dSBFKjlp65aZbFNKkosJyEOTQ/Diqaj JgpZowm8HLLBMisbJ0wLVmZXrNTq9PC+gASNUXVjCx4K7p8+zDVBqJNgikmFG/oQ315vCoXCn ZwbZGN+SHB6yLzxNg6yzHMxNNqOVN2hXYNh7Hvi1PZMttsXbjTlyZ1XEauw= X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 212.227.17.10 Subject: [Qemu-devel] [PULL 07/13] configure: fix pam test warning X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Maydell , Jason Wang , Michael Tokarev , Gerd Hoffmann , qemu-trivial@nongnu.org, Michael Roth , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Artyom Tarasenko , Laurent Vivier , Thomas Huth , Eduardo Habkost , Mark Cave-Ayland , "Dr. David Alan Gilbert" , Fabien Chouteau , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Richard Henderson , Viktor Prutyanov , Laurent Vivier , Paolo Bonzini , =?UTF-8?q?Andreas=20F=C3=A4rber?= , Aurelien Jarno Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" From: "Dr. David Alan Gilbert" The pam test generates a warning on Fedora 29 with -O3 compilation because the headers declare that the pam_conversation pointer to pam_start must be non-NULL. Change it to use the same 0 initialised structure as we actually use in qauthz. Signed-off-by: Dr. David Alan Gilbert Acked-by: Daniel P. Berrang=C3=A9 Reviewed-by: Philippe Mathieu-Daud=C3=A9 Message-Id: <20190404091725.20595-1-dgilbert@redhat.com> Signed-off-by: Laurent Vivier --- configure | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configure b/configure index 60719ddcc5b0..a2607afb3408 100755 --- a/configure +++ b/configure @@ -2940,9 +2940,9 @@ if test "$auth_pam" !=3D "no"; then int main(void) { const char *service_name =3D "qemu"; const char *user =3D "frank"; - const struct pam_conv *pam_conv =3D NULL; + const struct pam_conv pam_conv =3D { 0 }; pam_handle_t *pamh =3D NULL; - pam_start(service_name, user, pam_conv, &pamh); + pam_start(service_name, user, &pam_conv, &pamh); return 0; } EOF --=20 2.20.1 From nobody Wed May 15 15:58:12 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1556823699; cv=none; d=zoho.com; s=zohoarc; b=AFbUDGTxvf2YKk8HMD+TJeunpBkcRX8r68RKk3exc9hsZ0FBx8wt2nP7cd+tCFrXGR6YJLCoGg4KXaCuFDvpAg5KDdJzmOipyEugLCjENpNAUJ5hluuL19vyromFwRF5kWhQ8UnWJ/lKrOhcl9dJtWtdmU44bpEUhQLGXl4x++s= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1556823699; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=gXY6wZU3DzV9GtIrK6xtMUlKwVmfR+hGO5NyTmgoclQ=; b=LyHdPchHr7FDK5CkLN/InPRgldoWS8YJ6Tohs2r76a53tndK9rO4D4LFyhfU/COnvdxCwyhdCE8RboKVij345mhHDXxwND6f4byf0YUF/0R1NA8gopTy3PrNoLwssvl48pgugN9iaVQXuxRcY3n89wy2ldMpChBWvt4PYi29y7c= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (209.51.188.17 [209.51.188.17]) by mx.zohomail.com with SMTPS id 155682369865353.60608313668729; Thu, 2 May 2019 12:01:38 -0700 (PDT) Received: from localhost ([127.0.0.1]:57365 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hMGxT-0004nr-8B for importer@patchew.org; Thu, 02 May 2019 15:01:27 -0400 Received: from eggs.gnu.org ([209.51.188.92]:36169) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hMGvU-0003Y9-B8 for qemu-devel@nongnu.org; Thu, 02 May 2019 14:59:27 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hMGvT-0002xz-DY for qemu-devel@nongnu.org; Thu, 02 May 2019 14:59:24 -0400 Received: from mout.kundenserver.de ([217.72.192.74]:60421) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hMGvT-0002xl-4y; Thu, 02 May 2019 14:59:23 -0400 Received: from localhost.localdomain ([78.238.229.36]) by mrelayeu.kundenserver.de (mreue107 [212.227.15.183]) with ESMTPSA (Nemesis) id 1MCJzI-1hUUNc0Puk-009TeR; Thu, 02 May 2019 20:58:58 +0200 From: Laurent Vivier To: qemu-devel@nongnu.org Date: Thu, 2 May 2019 20:58:30 +0200 Message-Id: <20190502185835.15185-9-laurent@vivier.eu> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190502185835.15185-1-laurent@vivier.eu> References: <20190502185835.15185-1-laurent@vivier.eu> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Provags-ID: V03:K1:/E9PJ8wbSag3h+mggOHhfRYm3tDrSS9uN8E8fxK4PJ8y8ov7hkq pz6L43/G7pw9ScQ4R824iVA9mGysIYRlFXQPNaGymqb83wGbDrBRRlwxno0+Ml+HAGxot/h 3FPenIk+eEoI8tg6Rt7fc4Tt8c9WAdNVRzoDcZwRoEHbHY2QuzjoyHdDj6SMzVIHAz/RS4Q nOEtHLCS5qipvZffAW29Q== X-UI-Out-Filterresults: notjunk:1;V03:K0:xASIYm1eMQk=:77XxnSLJxTNgLzGbLODGDD zLW8dCp11d5R93/sdrFMriQ4M/IynBcyKeO/TitxQAF+qzybjBQo1F8UXdStALaCWPDt0dLh7 O5/yO8JhErQqSOzTtBjPknbXdxNab173drG2PQtPnYh45v88gwOEUaM5DDzLjUrWMXL4rKJxr Tn6/ef2bez261jeggziznHOHqD5r6dUrbRky8DRE61RyMPzBN9+Vu15dIjDpbjJ8xrmUl4ukU 8QPm6wJLT6CdD0/aF5Kq6MHkMI0+jCA5SGmuNivFJAxFUJ4tHPKkS1du8dP92xAmQkatUUe8U ukaSRioYcNY2+Nfus/4Z2MW+gAHttsnPPFHSbpH2bxY/rrR4njE0tFKcQjgaUx3/7Qm2Sm4mH KR6oOPyylW3DcXTnMULNrcigo6jIdHZ0AZEF6A8/n1iXJH0MzaTh1087w8v8Ugar+eeB80S3M 6QqzwhNx5MvkzGVNDgrtHsSF2uIpU2aRqN6YuTGKb0J+Im46RfxEv1pt+rJvylgXli2T2XgfX c7tcI4LW2y6Db4Hox7Dq1bRv+k82VVdTfMqKQAvoI+EVyxtyeLyWyNIpwi1yv1qt/v9y6Kcso XlnHDeQ4bUp1gUgF+QoLo8gPz3Sb+DmGDgUfdSbxUq42INPR7W+P3cxu8DtQBdtzxUmWuKJvR AfO6YI75GR8BSYjyHw5D57pK6QZgC06iVYCg4Nvo/UwRX931JyHey4mvwV6W0bcE6fwIeK4O3 c+AtwgXfZtpmK4CshcVVDBW3U3KfjwcYaj0nvpugupROI4aBQn4RLwYarRY= X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 217.72.192.74 Subject: [Qemu-devel] [PULL 08/13] Update configure X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Maydell , Jason Wang , Michael Tokarev , Gerd Hoffmann , qemu-trivial@nongnu.org, Michael Roth , Stefan Weil , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Artyom Tarasenko , Laurent Vivier , Thomas Huth , Eduardo Habkost , Mark Cave-Ayland , Fabien Chouteau , Igor Mammedov , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Richard Henderson , Viktor Prutyanov , Laurent Vivier , Paolo Bonzini , =?UTF-8?q?Andreas=20F=C3=A4rber?= , Aurelien Jarno Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" From: Stefan Weil The last *.aml file was removed in commit 13b1881aacc7e5018773bd545bbaf8d54= 76699ee. Signed-off-by: Stefan Weil Reviewed-by: Igor Mammedov Reviewed-by: Philippe Mathieu-Daud=C3=A9 Message-Id: <20190409053320.14612-1-sw@weilnetz.de> Signed-off-by: Laurent Vivier --- configure | 1 - 1 file changed, 1 deletion(-) diff --git a/configure b/configure index a2607afb3408..14f02452f9d4 100755 --- a/configure +++ b/configure @@ -7880,7 +7880,6 @@ LINKS=3D"$LINKS python" for bios_file in \ $source_path/pc-bios/*.bin \ $source_path/pc-bios/*.lid \ - $source_path/pc-bios/*.aml \ $source_path/pc-bios/*.rom \ $source_path/pc-bios/*.dtb \ $source_path/pc-bios/*.img \ --=20 2.20.1 From nobody Wed May 15 15:58:12 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1556823893; cv=none; d=zoho.com; s=zohoarc; b=l1l+0U2zZx4sLZlpLqhFTaurj/PCjZDssHeCD3So1jjmnKwy88BNYBY/S4HFGhrBbXbF5dzmQg+pYgcCQyBEQBl8fWsn9Yihe3FlyKB/ezVFEgDmdPBf//9qCvK5MYtYOzIulYuOsUGb/9NjsO8LO5tUlA0EGflYOHXnVDTXdio= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1556823893; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=2FjOfdWMT4t0oOFyLX61AhF3JnTwh8BmCFcRkVfnJh4=; b=DggFLzp2rM2w8+zZ/yTh4AiNFfBeoDKGsc2cdUeWm+t9qM3WLzVQpumjk0eode7FoVekm60hpF0yniP0zIiTkwsMNv0H75RRfU+sM9ipmIEN3NvprBJEN5BnjTGIrHWo941nKxbbAdyVmzDByoom6IP8QdNubO0Fe20HyzVYbhg= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1556823893368438.1043928521566; Thu, 2 May 2019 12:04:53 -0700 (PDT) Received: from localhost ([127.0.0.1]:57401 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hMH0k-0007lD-BO for importer@patchew.org; Thu, 02 May 2019 15:04:50 -0400 Received: from eggs.gnu.org ([209.51.188.92]:36351) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hMGvq-0003nc-0E for qemu-devel@nongnu.org; Thu, 02 May 2019 14:59:47 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hMGvn-00036g-WE for qemu-devel@nongnu.org; Thu, 02 May 2019 14:59:45 -0400 Received: from mout.kundenserver.de ([217.72.192.74]:42833) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hMGve-00030R-2c; Thu, 02 May 2019 14:59:35 -0400 Received: from localhost.localdomain ([78.238.229.36]) by mrelayeu.kundenserver.de (mreue107 [212.227.15.183]) with ESMTPSA (Nemesis) id 1McHQA-1gm69o2gvc-00cjJx; Thu, 02 May 2019 20:59:00 +0200 From: Laurent Vivier To: qemu-devel@nongnu.org Date: Thu, 2 May 2019 20:58:31 +0200 Message-Id: <20190502185835.15185-10-laurent@vivier.eu> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190502185835.15185-1-laurent@vivier.eu> References: <20190502185835.15185-1-laurent@vivier.eu> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Provags-ID: V03:K1:PuriRZNUZFML41VXaNZWRCel79SGpp1LmytZAYC3+G2pC7PABVC 4fbdHg/iUeowiTFVklAdZM1meAPzMhOx5Y0fjH2nwzAuXDMKTAhSHe3WXzJFai0k09YXVSb dpTg2+MIALR+F4gr0AsrFSMNC9J9LdFf+cDkILhDBzCc3cL2Wn9TybO9gJ5w2rcGwVVPL98 +qbxiaO5RDSPyCqg8QNzQ== X-UI-Out-Filterresults: notjunk:1;V03:K0:VKA+zKdUgW4=:O18ZjeSPBOeFxsOKQ0Mw1Z ryDcUh83BszOXOaIhOfdg7fDTtL9X3hC6qs0/5TzL2UlhwB2guP/ZJs5HJna7Q9DSmhGDP85o GCbJ59Z5UgQbPgVKe2sz04z5jNJGXm5GWOpvmEyDaEwf6EwgQHFZTswz/D7eseFN8davo/4Og qrHTcb/f1DL+1eSvShOEcfyXBy0rVgtA/b3TL5JKK0Qp4KO9m22m4ZK/ivimyF8D9JjHwtk0/ ZZEYBk5hL5zEHEl/3zkVgqJV4GSZlgEGkDIbqLa7/45teROh8Vj/NasBALXTCJfGPbLLtN8Jo r4kJza9sGI2m2GJvHlYQSv7hAa3AlMJlq/SxEGEQ9DJrt72DGf2APCiXATrYjsuILYHxdpf0+ RzvxERIQSWxUl2zxdabqSOhElYeCamGGvyClACNlHrnIc/QOeFHDNLkIjCYKPFbx37v0Xiep3 xbmTRpHDJB3QnDK7cTH4drIDrkm4fro5ZUrcPXpq0lixJxJDMJ0EWWIcKDzVC9VXv2rIfANkd 97WJ3jXYmgrb6vPCy9FdA01rBedmJO/IGA2oj4cYbupVYVIwaDcPgac01Xd0nwFqmngOcgGE0 W6cltf+ZWpUlWvKMXs2o0OnJEWXNC70+sQ7XyCwcAwYalnc31WJOP+PjKIy8RT6iNI7F5fQjT rx2FGKibU8ohmIt7ZVgnS6JdJEz5YwvZRytbNK+eXyX+8C4YTHbxBj/mb3iCRt55/X7aCpm/U kJ2RoHX7VC2v3IaUGL1wTox4na8u5M8q9jC8aw== X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 217.72.192.74 Subject: [Qemu-devel] [PULL 09/13] Header cleanups X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Maydell , Jason Wang , Michael Tokarev , Gerd Hoffmann , Aruna Jayasena , qemu-trivial@nongnu.org, Michael Roth , Artyom Tarasenko , Laurent Vivier , Thomas Huth , Eduardo Habkost , Mark Cave-Ayland , Fabien Chouteau , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Richard Henderson , Viktor Prutyanov , Laurent Vivier , Paolo Bonzini , =?UTF-8?q?Andreas=20F=C3=A4rber?= , Aurelien Jarno Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" From: Aruna Jayasena Removed unwanted includes from cpu-common.h This task was under https://wiki.qemu.org/Contribute/BiteSizedTasks Signed-off-by: Aruna Jayasena Reviewed-by: Peter Maydell Reviewed-by: Thomas Huth Message-Id: <20190409155635.10276-1-aruna.15@cse.mrt.ac.lk> [lv: fix conflict on rebase] Signed-off-by: Laurent Vivier --- include/exec/cpu-common.h | 3 --- 1 file changed, 3 deletions(-) diff --git a/include/exec/cpu-common.h b/include/exec/cpu-common.h index 848a4b94ab73..f7dbe75fbc38 100644 --- a/include/exec/cpu-common.h +++ b/include/exec/cpu-common.h @@ -7,9 +7,6 @@ #include "exec/hwaddr.h" #endif =20 -#include "qemu/bswap.h" -#include "qemu/queue.h" - /* The CPU list lock nests outside page_(un)lock or mmap_(un)lock */ void qemu_init_cpu_list(void); void cpu_list_lock(void); --=20 2.20.1 From nobody Wed May 15 15:58:12 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1556824092; cv=none; d=zoho.com; s=zohoarc; b=QDl0Y30GmONP4Q04V/LXiSEU7Hk8gXku7Okc4+YaVUsyT9VGzmlwYF29oJ/DVUbxVfEh9DciEVQrObfiroY0j7NbTLeuil7U8xdxosbcQxHQMepqzqpfR/TFJdijdZ7LGOuY+mVqv4cqLbdL/6+K08WNzIwa6aInbAWopv4muXk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1556824092; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=Hoa0DzLp5Vcz7xzfh8ltJfwT0BE/ALemN/ckTrlzMT0=; b=IIKd02XhiOwqQMMovk3m7TElMwhRO+0nSy0kpuuNdOyfqPuRCPFBZgn9OCQkx9b4s8iTkdUt6+ArrmyQt8kvZsizNRkOnJ3wRU+OUlvDcTEwvDrcN0ClJCtQfD0fgJBKUKTIGv9CrGYpPyrao+xh3bu3SnusHsIw+PLnl3/MZ+Q= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1556824092370936.1739273105143; Thu, 2 May 2019 12:08:12 -0700 (PDT) Received: from localhost ([127.0.0.1]:57474 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hMH3o-0002R9-7B for importer@patchew.org; Thu, 02 May 2019 15:08:00 -0400 Received: from eggs.gnu.org ([209.51.188.92]:36352) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hMGvq-0003nd-0E for qemu-devel@nongnu.org; Thu, 02 May 2019 14:59:47 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hMGvo-00036r-0t for qemu-devel@nongnu.org; Thu, 02 May 2019 14:59:45 -0400 Received: from mout.kundenserver.de ([212.227.17.13]:51429) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hMGvi-000345-00; Thu, 02 May 2019 14:59:39 -0400 Received: from localhost.localdomain ([78.238.229.36]) by mrelayeu.kundenserver.de (mreue107 [212.227.15.183]) with ESMTPSA (Nemesis) id 1MbjBo-1glYC01KHe-00dHYJ; Thu, 02 May 2019 20:59:02 +0200 From: Laurent Vivier To: qemu-devel@nongnu.org Date: Thu, 2 May 2019 20:58:32 +0200 Message-Id: <20190502185835.15185-11-laurent@vivier.eu> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190502185835.15185-1-laurent@vivier.eu> References: <20190502185835.15185-1-laurent@vivier.eu> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Provags-ID: V03:K1:emdVrM76Q9ZEwCt3gx+FcPMEVNlFoFdGjNYiDdUfivFiNUywUmo Pdm93O77b65iwG8WV78xD0AOErIyYJek7OJKojo8+TDeBLZsV+aLxMDL9Mm82nDhEeiNsiP ficUJejGofvek/lDs7yvaOygFoMjShIcNFToa+y1fbYIwpeCVef1R8koBbBb2A2B4uEFpjk eWXrl06DqhqnSdM36vljQ== X-UI-Out-Filterresults: notjunk:1;V03:K0:un3pcgT1kvc=:Ee2aYE/fsfQN4vI90Ph2Ut Eq2QcByaDVoRJCK+dRQsZg6yt04d2dgJVNTDnJkz9YIw62S6rM9lK4mbZfjgW3Fq1QLT9x3rs pgiFgXXqhP6fu755rVnzGIAZPrhk7zkgLln8SVU7EjVPY1DXJOWL8BWKRhfZJkDhp6dWyhKFE CkRIMBPtHlFuFg+PEZPtz8hbrO+/1E2ETa2xQ7B795T/EDLEUDyPv1RLma6VR9wlNZW60dvqi uxvTvJUKbXTRcGDX/ZwtCgkImGvcD6sSuB8dPZieg5lGDtmUQ2rUZ2zn4+OZzVncSozbOlYSb 2KBdjEYDFrC/WwsLzbLPCWWsMLHaLXfLye33fDocHkOVcL68zd3ZU3ANjDXNSSWt2IsUw1liq ny63RRxP8lMDImZj0Jpa8w+4l6j2HRFm7uSWwCtXf4WLSB88Mfg6aTHB9aXUtywBB2KFrNqkN pSasz/xVu1Erb+emN8YCuttjPvM3mYeIXdn6fs/j/l+4nAofjnRiQwE6MsedaqDFwimszSwcK KQV0eOdfT6xtFBdKYgAJz/1sb0lCvX1NMG34VMY7EptGh7H+Ppt51Yey4mWJ1qmI2Pcg94mxR N29KuI3QoMtLwhd2ULna9VimbM7KOsSlwbYJ2cPRVb4TK85qo4qJuYehRehzIoJPc0ywX+5fX sTMi1lIuqm83hbEUAciuDBhr9wIJx6mwXk65XJVxzvDYCYeZ+LvsoKGoroaT+z2vClaVJaZxO pWzfOaMvLCfijWIGR3Tw0dsXf9Uewqc2cYfjBBRbWDCRTM56IwIBSDQhDqE= X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 212.227.17.13 Subject: [Qemu-devel] [PULL 10/13] net: Print output of "-net nic, model=help" to stdout instead of stderr X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Maydell , Jason Wang , Michael Tokarev , Gerd Hoffmann , qemu-trivial@nongnu.org, Michael Roth , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Artyom Tarasenko , Laurent Vivier , Thomas Huth , Eduardo Habkost , Mark Cave-Ayland , Fabien Chouteau , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Richard Henderson , Viktor Prutyanov , Laurent Vivier , Paolo Bonzini , =?UTF-8?q?Andreas=20F=C3=A4rber?= , Aurelien Jarno Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" From: Thomas Huth We are printing all other help output to stdout already (e.g. "-help", "-cpu help" and "-machine help" output). So the "-net nic,model=3Dhelp" output should go to stdout instead of stderr, too. And while we're at it, also print the NICs line by line, like we do it e.g. with the "-cpu help" or "-M help" output, too. Buglink: https://bugs.launchpad.net/qemu/+bug/1574327 Signed-off-by: Thomas Huth Reviewed-by: Eric Blake Reviewed-by: Philippe Mathieu-Daud=C3=A9 Message-Id: <20190423160608.7519-1-thuth@redhat.com> Signed-off-by: Laurent Vivier --- net/net.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/net/net.c b/net/net.c index f3a3c5444cc3..2cf5e7646997 100644 --- a/net/net.c +++ b/net/net.c @@ -837,9 +837,10 @@ int qemu_show_nic_models(const char *arg, const char *= const *models) return 0; } =20 - fprintf(stderr, "qemu: Supported NIC models: "); - for (i =3D 0 ; models[i]; i++) - fprintf(stderr, "%s%c", models[i], models[i+1] ? ',' : '\n'); + printf("Supported NIC models:\n"); + for (i =3D 0 ; models[i]; i++) { + printf("%s\n", models[i]); + } return 1; } =20 --=20 2.20.1 From nobody Wed May 15 15:58:12 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1556823929; cv=none; d=zoho.com; s=zohoarc; b=LXcSW0DDeTx2VZUK+FTHC0xFKZhgv//Xoc/VEoVHMeGwFhwraSXmXzCPC+Pj9snnqKMQjKxAzMvMCA5P6WMM/JRjdKZBPV9zYkiFeLpNeIqmHE+4F1K9MKX1OOUHiMyToHhnfq79bcF+1mN0JhUXwsBaSm9A8UqzEvBu34ZGJzQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1556823929; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=yB//6bZgACplIT2o7Dez8spNLmb59OI6uomikoNp0Ts=; b=Rh5YtUz69rDUSoZSGc5o0tYOE9y61o3UWOIkd5q661vLP8TQHjoi8+oAkyVD+ts1EjirFtSDqCq0nmGz+A3bzQu2cTRLHduuDyz9DG16uDR7DfUGFNlZufg3f6VLAb5lCwIsU7INxk1yShprviENLZWOmJW5S9SLOrJUbUtVxEY= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1556823929189643.816165399059; Thu, 2 May 2019 12:05:29 -0700 (PDT) Received: from localhost ([127.0.0.1]:57405 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hMH1J-0008D9-3f for importer@patchew.org; Thu, 02 May 2019 15:05:25 -0400 Received: from eggs.gnu.org ([209.51.188.92]:36299) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hMGvo-0003lJ-1k for qemu-devel@nongnu.org; Thu, 02 May 2019 14:59:45 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hMGvm-00035o-2B for qemu-devel@nongnu.org; Thu, 02 May 2019 14:59:43 -0400 Received: from mout.kundenserver.de ([212.227.17.13]:51701) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hMGvk-00034V-1e; Thu, 02 May 2019 14:59:41 -0400 Received: from localhost.localdomain ([78.238.229.36]) by mrelayeu.kundenserver.de (mreue107 [212.227.15.183]) with ESMTPSA (Nemesis) id 1N9M5y-1gjvKl3vXg-015GfB; Thu, 02 May 2019 20:59:04 +0200 From: Laurent Vivier To: qemu-devel@nongnu.org Date: Thu, 2 May 2019 20:58:33 +0200 Message-Id: <20190502185835.15185-12-laurent@vivier.eu> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190502185835.15185-1-laurent@vivier.eu> References: <20190502185835.15185-1-laurent@vivier.eu> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Provags-ID: V03:K1:Jbw4DFL3kvmwxXXd9rzfjPC2Ip/dTFEAYMbD8QAvxeCw5T+swVq w6UKqnjj/kzVazLA1918SMeXEWtkyutlNkix1ViekyBV4m150PTXokWytCraJd0F7mmiMy6 1pNcUZsN8p2O9tKg92xJPEblyBULzpezZhScFHgjkhGfhEnMgUqJm11xr2Mng61+soJbdVA 5qxWaYo1pXoAMlfzvG5aA== X-UI-Out-Filterresults: notjunk:1;V03:K0:hyiRxIsEq0A=:wEJ0I4jLEfp8BiJPKbQR4k 24tKzc5osHLwzNNaj31hHFTIvFDq23RafyVJ8PDZjS8dRS+awJzLFXb4vrZNHlj8x+Y1hhi/0 wH14l6aR8/3vEDEZ3zEZG9VG8Yl/Ys6Vs5Ed1ltacVqC16hfymGFUXBA/KyLbZwzFV9Q1TkKb 6MENWDlVeLCV1hmhgzSHud1zp8nK4jasIXl0Dfu2eSWjkCLkjWivdJXr6+qJT2zhVJBd59sWO pqWXGImEK7QYtuSHZLNYuidzdHr8pNDFGoIylepvcJRkzg63JjikbS3wipqcCRq90UsfDR9t3 HOF/cqHwkIZXg/my3hrJfR9+a0hiBaYkb5vl6ROrFg3okSnpYd2yW92Mb1ayVdAacIpq99vUi GMv93NiaXMVPh+6ygwAjOTxdjxlzTh7JbNthNQ7yNvchZe82kQoniiwXqHnW0GJtMyvG5xv0N aN2piYn45OPV8c1yUFmtPkD03JLqfS5j9OZUfRe5/i7tq5XOvqfjXzbowa+si9nXsxKoNKvDJ G3FyN4NE+B+4V7DCJYvb10LgBs8ZAtKpT1vN9t5Q7D/XxxbETdL1l6yukUdDlPmWTzh2NFL87 BqxfkE5vXOQ5iEKjhLxrTzYuGnfOwCgkAkmLnEIFqNhvTw3SHRdVknJ2lYuD1VXfzLwn4GPpz oYj3jRaRwGrhq3T5tPBJqYfv6k7EtGH97ehy1w7K2IeKSJ2zWkHvPxnACdVtm6Aek8jWNmVul SM6pRmvDClODmHutaNeB0bcZjMGB/YpUuhF0Za5g/RTJVcctL+4Sf2Mwftg= X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 212.227.17.13 Subject: [Qemu-devel] [PULL 11/13] Makefile: Let the 'clean' rule remove qemu-ga.exe on Windows hosts X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Maydell , Jason Wang , Michael Tokarev , Gerd Hoffmann , qemu-trivial@nongnu.org, Michael Roth , Stefan Weil , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Artyom Tarasenko , Laurent Vivier , Thomas Huth , Eduardo Habkost , Mark Cave-Ayland , Fabien Chouteau , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Richard Henderson , Viktor Prutyanov , Laurent Vivier , Paolo Bonzini , =?UTF-8?q?Andreas=20F=C3=A4rber?= , Aurelien Jarno Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" From: Philippe Mathieu-Daud=C3=A9 Commit 48ff7a625b36 added the QEMU Guest Agent tool with the optional ".exe" suffix for Windows hosts, but forgot to use this suffix in the 'clean' rule. Calling this rule let a dangling executable in the build directory. Correct this by using the proper optional suffix. Fixes: 48ff7a625b36 Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Stefan Weil Message-Id: <20190427161322.24642-1-philmd@redhat.com> Signed-off-by: Laurent Vivier --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 43a7a047b452..e223bfe2a3a1 100644 --- a/Makefile +++ b/Makefile @@ -639,7 +639,7 @@ clean: ! -path ./roms/edk2/BaseTools/Source/Python/UPT/Dll/sqlite3.dll \ -exec rm {} + rm -f $(edk2-decompressed) - rm -f $(filter-out %.tlb,$(TOOLS)) $(HELPERS-y) qemu-ga TAGS cscope.* *.p= od *~ */*~ + rm -f $(filter-out %.tlb,$(TOOLS)) $(HELPERS-y) qemu-ga$(EXESUF) TAGS csc= ope.* *.pod *~ */*~ rm -f fsdev/*.pod scsi/*.pod rm -f qemu-img-cmds.h rm -f ui/shader/*-vert.h ui/shader/*-frag.h --=20 2.20.1 From nobody Wed May 15 15:58:12 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1556824268; cv=none; d=zoho.com; s=zohoarc; b=fs5JsO+b4hA6vss1gBMtUOHSU5Vh/1XvQQrGktjYsIGc61YVP3Gjn17iMPJD/1s+9iypYghSahLCvNZQpgvARoPybc1K7j9vYiESY5EGPrS5AmuEb8BbF+2sGwAgf0uFqElIWse9Cd+EqX4Xa2MeXlJLxaK7Gmsihwu3zmLyqqY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1556824268; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=+LQApKPYBVvGFa3Hh+JshImcp1aWl72VW20e7ebBQBw=; b=hJclM5ASNwCa8Xo7sH+hBP2oIQaUbCqFW1nuDroD6CnBspvSBSgZ0nKSE5VOAqv722KXMtDya3tmh3lLuuNSSn4Ih8cheK3MitPv/BPMtN+LbxMpEXEAs+40dIURCaMC7xV+LtdHPW5kzRNGyH6KJE8GzDCftQSy5BLT03fzrnk= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1556824268571491.00874787545945; Thu, 2 May 2019 12:11:08 -0700 (PDT) Received: from localhost ([127.0.0.1]:57526 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hMH6l-0004q3-Hk for importer@patchew.org; Thu, 02 May 2019 15:11:03 -0400 Received: from eggs.gnu.org ([209.51.188.92]:36522) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hMGvx-0003x6-LN for qemu-devel@nongnu.org; Thu, 02 May 2019 14:59:54 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hMGvw-0003Ji-Gu for qemu-devel@nongnu.org; Thu, 02 May 2019 14:59:53 -0400 Received: from mout.kundenserver.de ([217.72.192.75]:35597) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hMGvr-00037s-Ux; Thu, 02 May 2019 14:59:49 -0400 Received: from localhost.localdomain ([78.238.229.36]) by mrelayeu.kundenserver.de (mreue107 [212.227.15.183]) with ESMTPSA (Nemesis) id 1N18MG-1gbgno05v8-012YBD; Thu, 02 May 2019 20:59:06 +0200 From: Laurent Vivier To: qemu-devel@nongnu.org Date: Thu, 2 May 2019 20:58:34 +0200 Message-Id: <20190502185835.15185-13-laurent@vivier.eu> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190502185835.15185-1-laurent@vivier.eu> References: <20190502185835.15185-1-laurent@vivier.eu> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Provags-ID: V03:K1:etxrxyk3g6X+Z5FhH+RnYk0C83SJR5qHK8q7N9KYUZGb8a4tPZb iq/Y3sgd6Vw9JLD+pMqFifrsR+HUK9sk8TkF6KsxSD9uOY+7f7JLvbxtOl8hih1WYRZFOdZ zlGy7X3Y7iQM+IXG/OqMHyjKYXSmfXaLBpVT2d7Gvp60WBgSKXp+WRE8R3ESjDHoa3iEmft m3h5SOrU/lZwHa3Z/fHbQ== X-UI-Out-Filterresults: notjunk:1;V03:K0:wWgyZLtQSP8=:i5VQcNGCsivLO7nHSV/6Hw lGumRQn5vy4nlg8RtkOiFj8SOkRRUP7TCfGFL4HPT6JGrzHdpwyLjQR84T2sE59+rf4XPsH5M FbEssvsyoBAXb6auDYZXdgqXNWUkaokgwMAlQjeNX8WlEWvrXOM/D4mtbBkCC0mWAH4kBB2cb OfLMVi1lMqQcuRn8hNB/743Xhplb1SYSR2oi7Nrag1D6A47NLjSkGd0cks2oK2Z2aD4ue+ZVD pooITY9NtF/5zwmJItsHgo3g6zpoznm4Md1ZeVp00l3FRZNTIP5KbLoEKJ/AXD1EhTJr7pERK t0KIkwZ/C50Oz1+OnOO3GeJgm3F8tHcuXBYSpHS6lkDAeN3t17HSeBQXnUS78XnLMN+UvNq19 /YaFjr3EAsLac3AxAWV+IBBEg0f89OAqDvHaxG2/vmUkZCipjCA59SLvDRZwwNj7MQpbVzVbS 3IJYDze40tXPW5s0YEb4ZTtY8FyzoCwbt+Q+7EecKCiglkyP4kvcogfpdKTOIwRobSCDta6lE Uvc9OukuRxBU+5YR/w8fS1szBZtaPRks/55io4DK3peim/6ZNDVpqhlxEWY0uh427FG5wOT6z JwdFZiz0LXsPAgNWbOEFD8E7IoisaOeb00iJlcBsY2nENXPj6kzRDmx2jD63F2fhW5hD0uA1i qrkwlUK05igTP/vgC1K7hgWak6uVExaT8nNBW2UuAUsr/LSvl5KLKWHBQqem/kBxC5VqfQFE+ sjUHdmyQ2q+4knY6NUITACjvMwpDZIVIZ5WjlB7rgNLxHVKeJ7nA3YwtRZ8= X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 217.72.192.75 Subject: [Qemu-devel] [PULL 12/13] hw/sparc/leon3: Allow load of uImage firmwares X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Maydell , Jason Wang , Michael Tokarev , Laurent Vivier , KONRAD Frederic , Gerd Hoffmann , qemu-trivial@nongnu.org, Michael Roth , Artyom Tarasenko , Laurent Vivier , Thomas Huth , Eduardo Habkost , Mark Cave-Ayland , Fabien Chouteau , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Richard Henderson , Viktor Prutyanov , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Paolo Bonzini , =?UTF-8?q?Andreas=20F=C3=A4rber?= , Aurelien Jarno Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" From: Philippe Mathieu-Daud=C3=A9 Currently the Leon3 machine doesn't allow to load legacy u-boot images: $ qemu-system-sparc -M leon3_generic -d in_asm \ -kernel HelenOS-0.6.0-sparc32-leon3.bin qemu-system-sparc: could not load kernel 'HelenOS-0.6.0-sparc32-leon3.bin' $ file HelenOS-0.6.0-sparc32-leon3.bin HelenOS-0.6.0-sparc32-leon3.bin: u-boot legacy uImage, HelenOS-0.6.0,\ Linux/ARM, OS Kernel Image (Not compressed), 2424229 bytes,\ Sun Dec 21 19:18:09 2014,\ Load Address: 0x40000000, Entry Point: 0x40000000,\ Header CRC: 0x8BCFA236, Data CRC: 0x37AD87DF Since QEMU can load uImages, add the necessary code, so the Leon3 machine can load these images: $ qemu-system-sparc -M leon3_generic -d in_asm \ -kernel HelenOS-0.6.0-sparc32-leon3.bin ---------------- IN: 0x40000000: b 0x400007a8 0x40000004: nop ---------------- IN: 0x400007a8: save %sp, -136, %sp 0x400007ac: call 0x40000020 0x400007b0: sethi %hi(0x4000b800), %i1 ... Tested with the following firmware: http://www.helenos.org/releases/HelenOS-0.6.0-sparc32-leon3.bin Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: KONRAD Frederic Tested-by: KONRAD Frederic Message-Id: <20190427162922.4207-1-f4bug@amsat.org> Signed-off-by: Laurent Vivier --- hw/sparc/leon3.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/hw/sparc/leon3.c b/hw/sparc/leon3.c index 774639af3393..0383b17c298f 100644 --- a/hw/sparc/leon3.c +++ b/hw/sparc/leon3.c @@ -193,6 +193,10 @@ static void leon3_generic_hw_init(MachineState *machin= e) kernel_size =3D load_elf(kernel_filename, NULL, NULL, NULL, &entry, NULL, NULL, 1 /* big endian */, EM_SPARC, 0, 0); + if (kernel_size < 0) { + kernel_size =3D load_uimage(kernel_filename, NULL, &entry, + NULL, NULL, NULL); + } if (kernel_size < 0) { error_report("could not load kernel '%s'", kernel_filename); exit(1); --=20 2.20.1 From nobody Wed May 15 15:58:12 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1556824206; cv=none; d=zoho.com; s=zohoarc; b=NvJpHfdcOnwlVXeXo2MFnRXffSx0H5g/c0IZ4ntKf7gYk42Fogd9tXCWwQ9hG7FDXWXxuhrkgdXbQwJkCYZq7ZcIuenbTUBJ0ce3e174rPuQK9KKIlIxdjLU1AHYeuXzxqQw+AX0xrFXEirDk2VcjRqpjZvb4sLGwCmBaT7HxKU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1556824206; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=PryaSMjW2m2et5+XwrG31XUz91I1w7aNiotaGWKeGI4=; b=Sw/VbktucsOqQhUecA+v+S0Yl65hH9+NZmu8tOfAdt8krg4glW6TTorsUnIXJjfxFaRRbJC7oqfCvvu4WHHiPU7KURc4V1pQAVD6lSXb7PMicG0GljhP+dbm45zVJ1AzTmIoAJb6pOAV0FB3tvM8sVipc+Rv5NM8tBU0X7mVtXk= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1556824206466172.17688066586493; Thu, 2 May 2019 12:10:06 -0700 (PDT) Received: from localhost ([127.0.0.1]:57492 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hMH5l-0003x9-AU for importer@patchew.org; Thu, 02 May 2019 15:10:01 -0400 Received: from eggs.gnu.org ([209.51.188.92]:36471) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hMGvv-0003uF-7V for qemu-devel@nongnu.org; Thu, 02 May 2019 14:59:52 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hMGvt-0003Ai-V4 for qemu-devel@nongnu.org; Thu, 02 May 2019 14:59:51 -0400 Received: from mout.kundenserver.de ([212.227.17.24]:48925) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hMGvr-00037l-RF; Thu, 02 May 2019 14:59:49 -0400 Received: from localhost.localdomain ([78.238.229.36]) by mrelayeu.kundenserver.de (mreue107 [212.227.15.183]) with ESMTPSA (Nemesis) id 1MeTHG-1goJ5D2reG-00aWOX; Thu, 02 May 2019 20:59:07 +0200 From: Laurent Vivier To: qemu-devel@nongnu.org Date: Thu, 2 May 2019 20:58:35 +0200 Message-Id: <20190502185835.15185-14-laurent@vivier.eu> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190502185835.15185-1-laurent@vivier.eu> References: <20190502185835.15185-1-laurent@vivier.eu> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Provags-ID: V03:K1:johlun5VbqcFFeXrYbcsP3qULCYtVfsxhJ0z39MAyC1YkfTLvrZ 7zip1xJrieVu35UEQ+V5YlcsBmCskkF3JMsMbUEdTAJuzmepg0GifQn0+/c9WinCoLhoSSq EWCQLcv1zj+w+ZryTUSgTuJ1yBc4P36BZX3s086YICNmsv15IwxY99KI/kSNuCbNhluUJ3B sV+cw+Lq78WCz1dLoAk2A== X-UI-Out-Filterresults: notjunk:1;V03:K0:AyS5xkSKc/4=:dYbQfipr5uRL0uioQB0yuJ ZANmGH/T/igME9DASM/EyL+8+YxkZHBExlwzb04daIuzzF0D9aM26oqt1sTZKwZcga6ny84l8 Lbd4CkqQmc6whFK+XyKRyFUFSYv/ntw9Tx8NyZDuJMaJvefahYJmuBNFKZgegz2baZVhBlzY7 zrrjboUxwhP2DBYp0r27VGnCHGLKUw+hWs7w/tGJqsgSstMvzGuddaElmpKoa7skKAJBqpOF0 nnyCCTIk9kSCU4Fe3tXozFQqiKnBQcd4ADjbh6RS7DqG99bDyoXAvbgSmyh+B8TnJxGJU8DTr lYZDl1WSitSfwhJW8VGEG6SFzzyNlcfpaTD73/wXVqasI67xIop+8wnZA6ZW7fX7jehB7USbf 5tEMM+thJ/QohdVXOegleBXHLem15kFXbzVI4VcnUc8NbTw3OnUp3TTGMoxzEURd44A2kDd76 QalIz6PZW4qkL0EhioROIPeqUs1mgJZJE2GEJhGEmYWbUKmifTaFfE/W+Hzzo23ya/CaV9N1N ZQ3Ip5I0Vtv+jaQfX0ADfDEu72vnFc7WMUU93qoM/g1gzY9PknypJUlZVhWqmdk+c9vBbOAiW eY0RUjw1zXYedBwrUIlxX8rIJo9dd8lQU5VkPKpf9J05SE42xoSiiT4GR5TEnKEs1VYD/a2Ys moi1oxuXJP4kn/mCouAhDvULVNeilE/ZRja/dgdr+jAxawTMSp+elgFy3aa/ZYciRRMR2sDJH UrRgWhoN5wILjoT8xLveez9KfIZFZakRrOqjAk+0/0Z/LKcdcZ0Tjpdk8XQ= X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 212.227.17.24 Subject: [Qemu-devel] [PULL 13/13] sockets: avoid string truncation warnings when copying UNIX path X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Maydell , Jason Wang , Michael Tokarev , Gerd Hoffmann , qemu-trivial@nongnu.org, Michael Roth , Artyom Tarasenko , Stefano Garzarella , Laurent Vivier , Thomas Huth , Eduardo Habkost , Mark Cave-Ayland , Fabien Chouteau , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Richard Henderson , Viktor Prutyanov , Laurent Vivier , Paolo Bonzini , =?UTF-8?q?Andreas=20F=C3=A4rber?= , Aurelien Jarno Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" From: Daniel P. Berrang=C3=A9 In file included from /usr/include/string.h:494, from include/qemu/osdep.h:101, from util/qemu-sockets.c:18: In function =E2=80=98strncpy=E2=80=99, inlined from =E2=80=98unix_connect_saddr.isra.0=E2=80=99 at util/qemu-s= ockets.c:925:5: /usr/include/bits/string_fortified.h:106:10: warning: =E2=80=98__builtin_st= rncpy=E2=80=99 specified bound 108 equals destination size [-Wstringop-trun= cation] 106 | return __builtin___strncpy_chk (__dest, __src, __len, __bos (__de= st)); | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~= ~~~~ In function =E2=80=98strncpy=E2=80=99, inlined from =E2=80=98unix_listen_saddr.isra.0=E2=80=99 at util/qemu-so= ckets.c:880:5: /usr/include/bits/string_fortified.h:106:10: warning: =E2=80=98__builtin_st= rncpy=E2=80=99 specified bound 108 equals destination size [-Wstringop-trun= cation] 106 | return __builtin___strncpy_chk (__dest, __src, __len, __bos (__de= st)); | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ We are already validating the UNIX socket path length earlier in the functions. If we save this string length when we first check it, then we can simply use memcpy instead of strcpy later, avoiding the gcc truncation warnings. Signed-off-by: Daniel P. Berrang=C3=A9 Reviewed-by: Eric Blake Reviewed-by: Stefano Garzarella Message-Id: <20190501145052.12579-1-berrange@redhat.com> Signed-off-by: Laurent Vivier --- util/qemu-sockets.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/util/qemu-sockets.c b/util/qemu-sockets.c index 970505169000..ba6335e71a95 100644 --- a/util/qemu-sockets.c +++ b/util/qemu-sockets.c @@ -830,6 +830,7 @@ static int unix_listen_saddr(UnixSocketAddress *saddr, int sock, fd; char *pathbuf =3D NULL; const char *path; + size_t pathlen; =20 sock =3D qemu_socket(PF_UNIX, SOCK_STREAM, 0); if (sock < 0) { @@ -845,7 +846,8 @@ static int unix_listen_saddr(UnixSocketAddress *saddr, path =3D pathbuf =3D g_strdup_printf("%s/qemu-socket-XXXXXX", tmpd= ir); } =20 - if (strlen(path) > sizeof(un.sun_path)) { + pathlen =3D strlen(path); + if (pathlen > sizeof(un.sun_path)) { error_setg(errp, "UNIX socket path '%s' is too long", path); error_append_hint(errp, "Path must be less than %zu bytes\n", sizeof(un.sun_path)); @@ -877,7 +879,7 @@ static int unix_listen_saddr(UnixSocketAddress *saddr, =20 memset(&un, 0, sizeof(un)); un.sun_family =3D AF_UNIX; - strncpy(un.sun_path, path, sizeof(un.sun_path)); + memcpy(un.sun_path, path, pathlen); =20 if (bind(sock, (struct sockaddr*) &un, sizeof(un)) < 0) { error_setg_errno(errp, errno, "Failed to bind socket to %s", path); @@ -901,6 +903,7 @@ static int unix_connect_saddr(UnixSocketAddress *saddr,= Error **errp) { struct sockaddr_un un; int sock, rc; + size_t pathlen; =20 if (saddr->path =3D=3D NULL) { error_setg(errp, "unix connect: no path specified"); @@ -913,7 +916,8 @@ static int unix_connect_saddr(UnixSocketAddress *saddr,= Error **errp) return -1; } =20 - if (strlen(saddr->path) > sizeof(un.sun_path)) { + pathlen =3D strlen(saddr->path); + if (pathlen > sizeof(un.sun_path)) { error_setg(errp, "UNIX socket path '%s' is too long", saddr->path); error_append_hint(errp, "Path must be less than %zu bytes\n", sizeof(un.sun_path)); @@ -922,7 +926,7 @@ static int unix_connect_saddr(UnixSocketAddress *saddr,= Error **errp) =20 memset(&un, 0, sizeof(un)); un.sun_family =3D AF_UNIX; - strncpy(un.sun_path, saddr->path, sizeof(un.sun_path)); + memcpy(un.sun_path, saddr->path, pathlen); =20 /* connect to peer */ do { --=20 2.20.1