From patchwork Sat Oct 23 18:31:13 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 1545215 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=) 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 bilbo.ozlabs.org (Postfix) with ESMTPS id 4Hc8x2545Kz9sR4 for ; Sun, 24 Oct 2021 05:33:25 +1100 (AEDT) Received: from localhost ([::1]:42260 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1meLpX-0005ED-K6 for incoming@patchwork.ozlabs.org; Sat, 23 Oct 2021 14:33:20 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:56946) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1meLno-0005Cm-OR; Sat, 23 Oct 2021 14:31:33 -0400 Received: from mout.kundenserver.de ([212.227.126.187]:56289) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1meLnm-0006Vr-2t; Sat, 23 Oct 2021 14:31:32 -0400 Received: from quad ([82.142.24.54]) by mrelayeu.kundenserver.de (mreue010 [212.227.15.167]) with ESMTPSA (Nemesis) id 1MmlCY-1n4MsV1wqk-00jrTS; Sat, 23 Oct 2021 20:31:25 +0200 From: Laurent Vivier To: qemu-devel@nongnu.org Subject: [PULL 01/11] po: update turkish translation Date: Sat, 23 Oct 2021 20:31:13 +0200 Message-Id: <20211023183123.813116-2-laurent@vivier.eu> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20211023183123.813116-1-laurent@vivier.eu> References: <20211023183123.813116-1-laurent@vivier.eu> MIME-Version: 1.0 X-Provags-ID: V03:K1:q42VG5CpW34qgtqnsD3n0pcV2PKrltN3ceYw+vxEnAkdMd28jOM G8MNbI9NZfKsKUGzy/deqsyeWZEZBLd7+SRw0wMox4rHH9j2QRYRyDl8e2XEZwCdxtXWo84 fYEkuE66sU6YOa8hFcznVKyO02TC5GiMpGFKrvBnX5gziTclYnNIqxAEmJ4OtOpebm47inc 15H3SCZm2T3U12KKL4Kvw== X-UI-Out-Filterresults: notjunk:1;V03:K0:UelQeXauHDY=:1SW5WqoutapakELsUZjrb/ wsN0n3u6e+HhprkDZeWD7oKYTiB0pvJQVbQQAEDyHsTDMpyBHJjhAqrdwKnIx+kzkgt16lWFI wu8rSIQ8GsxTS9x1KkATcSQk/fVVf7oFz7nIEI4wCtngytjatjga3MO6TcUHbCjeQjgb82hHO BrRE7KW3r9PL95kMWBWi3qe4wQrStovUgfAQK0Zn0lbSLzWTmdjM26KcnQM8znK1g/aeGzvaB yDEcc80uNFtXMoynW3UCu4SYF4xyGljmrkcTpjGdIMOZhSyN6b+0OBWP8dkCHewQW2oe0Ql4V 5V+qSF0e6elKKH1AehvQk83Q7FnGC5+P5GeIb3CbTXs4re/X0JjrpEYeqD7gM/UKwnnc62Q+S kAXlpF8+LHgUtq2L13PDrXPCf1Tdll5ZD2a99oVwnOP8lAIypV/XrsZxshIJMVdy3oGQz8InP qzJMSbqaep0Nr1tHDwuJYIjGrumtp5r38oT47MpJBzhw9VngFabB4iVfzdv1ANuOR/29E1MjS rkBCuJ/4bwe8+EArzuZilVmbEgWCL0YvwycCLAvIotXPMzrby7fu5v+bSmt5dm7UoaPJgaSUV fnIBqJG+G1zKeIKj9LvgHvfklpcdqky6akRh+jGL6b+tzmpk7O/rYjgo37XCATP7vtaDQH9yv 9puPBTYJUf7UgKzqAM4hP/qNVHjEO/2U1jcZJDGiztEPXp2q2U7gT8KFoFUYWyU16tG0= Received-SPF: none client-ip=212.227.126.187; envelope-from=laurent@vivier.eu; helo=mout.kundenserver.de 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, SPF_HELO_NONE=0.001, SPF_NONE=0.001 autolearn=ham autolearn_force=no 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: qemu-trivial@nongnu.org, =?utf-8?q?O=C4=9Fuz_Ersen?= , Laurent Vivier Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Oğuz Ersen Message-Id: Signed-off-by: Oğuz Ersen Reviewed-by: Laurent Vivier [lv,pb: s/K_opyala/_Kopyala/;s/Se_kmeleri/_Sekmeleri/] Signed-off-by: Laurent Vivier --- po/tr.po | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/po/tr.po b/po/tr.po index 632c7f385132..f4f0425c4319 100644 --- a/po/tr.po +++ b/po/tr.po @@ -1,14 +1,15 @@ # Turkish translation for QEMU. # This file is put in the public domain. # Ozan Çağlayan , 2013. +# Oğuz Ersen , 2021. # msgid "" msgstr "" "Project-Id-Version: QEMU 1.4.50\n" "Report-Msgid-Bugs-To: qemu-devel@nongnu.org\n" "POT-Creation-Date: 2018-07-18 07:56+0200\n" -"PO-Revision-Date: 2013-04-22 18:35+0300\n" -"Last-Translator: Ozan Çağlayan \n" +"PO-Revision-Date: 2021-08-15 22:17+0300\n" +"Last-Translator: Oğuz Ersen \n" "Language-Team: Türkçe <>\n" "Language: tr\n" "MIME-Version: 1.0\n" @@ -33,24 +34,22 @@ msgid "Power _Down" msgstr "_Kapat" msgid "_Quit" -msgstr "" +msgstr "_Çıkış" msgid "_Fullscreen" -msgstr "" +msgstr "_Tam Ekran" msgid "_Copy" -msgstr "" +msgstr "_Kopyala" -#, fuzzy msgid "Zoom _In" -msgstr "Yakınlaş ve Sığ_dır" +msgstr "_Yakınlaş" -#, fuzzy msgid "Zoom _Out" -msgstr "Yakınlaş ve Sığ_dır" +msgstr "_Uzaklaş" msgid "Best _Fit" -msgstr "" +msgstr "_En Uygun" msgid "Zoom To _Fit" msgstr "Yakınlaş ve Sığ_dır" @@ -62,13 +61,13 @@ msgid "_Grab Input" msgstr "Girdiyi _Yakala" msgid "Show _Tabs" -msgstr "Se_kmeleri Göster" +msgstr "_Sekmeleri Göster" msgid "Detach Tab" -msgstr "" +msgstr "Sekmeyi Ayır" msgid "Show Menubar" -msgstr "" +msgstr "Menü Çubuğunu Göster" msgid "_Machine" msgstr "_Makine" From patchwork Sat Oct 23 18:31:14 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 1545224 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=) 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 bilbo.ozlabs.org (Postfix) with ESMTPS id 4Hc91s2DnRz9s0r for ; Sun, 24 Oct 2021 05:37:37 +1100 (AEDT) Received: from localhost ([::1]:52804 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1meLtf-00043l-2O for incoming@patchwork.ozlabs.org; Sat, 23 Oct 2021 14:37:35 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57038) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1meLny-0005HB-C3; Sat, 23 Oct 2021 14:31:43 -0400 Received: from mout.kundenserver.de ([212.227.126.134]:37841) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1meLnv-0006d8-Ug; Sat, 23 Oct 2021 14:31:42 -0400 Received: from quad ([82.142.24.54]) by mrelayeu.kundenserver.de (mreue010 [212.227.15.167]) with ESMTPSA (Nemesis) id 1MWAf4-1mCGFb4BpK-00XZJq; Sat, 23 Oct 2021 20:31:26 +0200 From: Laurent Vivier To: qemu-devel@nongnu.org Subject: [PULL 02/11] disas/nios2: Fix style in print_insn_nios2() Date: Sat, 23 Oct 2021 20:31:14 +0200 Message-Id: <20211023183123.813116-3-laurent@vivier.eu> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20211023183123.813116-1-laurent@vivier.eu> References: <20211023183123.813116-1-laurent@vivier.eu> MIME-Version: 1.0 X-Provags-ID: V03:K1:J2imc0LOif9UCAQ+mHsql75U60CbN8h+9UQl51APvZ1v6491qtc IRNML1HKxtcM/JA5erO+CibWZXITubto78V4LQyKWAZ/vPicPer9yEdeAINaN2huA1WxhUL 543X2t39XPbYzNFstXzN/ddTfJBDn87HLZbSs9ICRLbtLSSjgwooqnz29cfg6V6Fa9FAxD8 yqkjGMIs2L0rkuXVR9EGg== X-UI-Out-Filterresults: notjunk:1;V03:K0:CKLP98HpyR8=:1+SbtK2Ft5C1Xvom8IoISY 7s7Jq3EsrL/AtyH3S/V0QV+w+J2av1E2l3t1EqUiHx7B2BQrJ5xAPbVJxBt5yO4eiQIYNdwdk AGgZhnNY6HrcenogRDCjN2rZCo28EsWJicPdOpJjyvcgwIgsDkgELsKL/VOlTFVrImqyGLfc7 KArhAzvPtJUhzWkIsqvzJatlDuwCdE0ICpafewv34bYD70nGcKsMDPaP5zbHs4Soa4heV0Gwy RcvLXrW8OHwYzbW7I5BvKFx0lxSciQ3mRIznYUe+e/jM1SJf5MXJ98+bpp83MiBU9u1hHGohF JxqyYbJKaGvCULioZkBqYoLHXQhqoQiCdOIdPsQs2cjnafs0oRdpJwNdd68N/Z63gBdzq/Zoo gPhqX9TGbU/0DNR3M0HQAbx/IZNS6jgbYEP/GBYiFtPcrTyRrqGk5GJ1poCnaUpje5qZxe1M9 jGhqu3dKatec+g+E0tcvFFOFZP5CchfvYtxQ8wS9oxvX/U2ZxXgQeHwR063eceZ17OH5u7h7B 2yTxVYMYE3FlVZGvchyAIOoYpdHjJ4ZArWmpmsvHU5ORze5d+IviSKwrxBFaT3FOhzGsAm8jw mRn+imyLhjYoPNsZ3Xk7yKRA4q/TnJvAK4D6AeYjE3emxUlAvHwsEAzWSDYtwZI5vwk9vitcZ 5r8kgEcrEx3Df52kENabrd0CQ+EW5NvxKmRk4vgDMfQmZiOAgtv1M8rTS90PwkRaqnHA= Received-SPF: none client-ip=212.227.126.134; envelope-from=laurent@vivier.eu; helo=mout.kundenserver.de 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_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_NONE=0.001 autolearn=ham autolearn_force=no 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: qemu-trivial@nongnu.org, Thomas Huth , =?utf-8?q?Phili?= =?utf-8?q?ppe_Mathieu-Daud=C3=A9?= , Laurent Vivier Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Philippe Mathieu-Daudé We are going to modify this function, fix its style first. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Laurent Vivier Reviewed-by: Thomas Huth Message-Id: <20210807110939.95853-2-f4bug@amsat.org> Signed-off-by: Laurent Vivier --- disas/nios2.c | 55 +++++++++++++++++++++++++-------------------------- 1 file changed, 27 insertions(+), 28 deletions(-) diff --git a/disas/nios2.c b/disas/nios2.c index c3e82140c798..d124902ae3e1 100644 --- a/disas/nios2.c +++ b/disas/nios2.c @@ -3482,38 +3482,37 @@ static int print_insn_nios2 (bfd_vma address, disassemble_info *info, enum bfd_endian endianness) { - bfd_byte buffer[INSNLEN]; - int status; - - status = (*info->read_memory_func) (address, buffer, INSNLEN, info); - if (status == 0) - { - unsigned long insn; - if (endianness == BFD_ENDIAN_BIG) - insn = (unsigned long) bfd_getb32 (buffer); - else - insn = (unsigned long) bfd_getl32 (buffer); - return nios2_disassemble (address, insn, info); + bfd_byte buffer[INSNLEN]; + int status; + + status = (*info->read_memory_func)(address, buffer, INSNLEN, info); + if (status == 0) { + unsigned long insn; + if (endianness == BFD_ENDIAN_BIG) { + insn = (unsigned long) bfd_getb32(buffer); + } else { + insn = (unsigned long) bfd_getl32(buffer); + } + return nios2_disassemble(address, insn, info); } - /* We might have a 16-bit R2 instruction at the end of memory. Try that. */ - if (info->mach == bfd_mach_nios2r2) - { - status = (*info->read_memory_func) (address, buffer, 2, info); - if (status == 0) - { - unsigned long insn; - if (endianness == BFD_ENDIAN_BIG) - insn = (unsigned long) bfd_getb16 (buffer); - else - insn = (unsigned long) bfd_getl16 (buffer); - return nios2_disassemble (address, insn, info); - } + /* We might have a 16-bit R2 instruction at the end of memory. Try that. */ + if (info->mach == bfd_mach_nios2r2) { + status = (*info->read_memory_func)(address, buffer, 2, info); + if (status == 0) { + unsigned long insn; + if (endianness == BFD_ENDIAN_BIG) { + insn = (unsigned long) bfd_getb16(buffer); + } else { + insn = (unsigned long) bfd_getl16(buffer); + } + return nios2_disassemble(address, insn, info); + } } - /* If we got here, we couldn't read anything. */ - (*info->memory_error_func) (status, address, info); - return -1; + /* If we got here, we couldn't read anything. */ + (*info->memory_error_func)(status, address, info); + return -1; } /* These two functions are the main entry points, accessed from From patchwork Sat Oct 23 18:31:15 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 1545225 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=) 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 bilbo.ozlabs.org (Postfix) with ESMTPS id 4Hc91s4TKfz9sR4 for ; Sun, 24 Oct 2021 05:37:37 +1100 (AEDT) Received: from localhost ([::1]:52828 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1meLtf-00044f-Ct for incoming@patchwork.ozlabs.org; Sat, 23 Oct 2021 14:37:35 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57040) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1meLny-0005HG-GK; Sat, 23 Oct 2021 14:31:43 -0400 Received: from mout.kundenserver.de ([212.227.126.133]:39041) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1meLnv-0006dH-VM; Sat, 23 Oct 2021 14:31:42 -0400 Received: from quad ([82.142.24.54]) by mrelayeu.kundenserver.de (mreue010 [212.227.15.167]) with ESMTPSA (Nemesis) id 1McpaE-1nEEma27d4-00a07O; Sat, 23 Oct 2021 20:31:26 +0200 From: Laurent Vivier To: qemu-devel@nongnu.org Subject: [PULL 03/11] disas/nios2: Simplify endianess conversion Date: Sat, 23 Oct 2021 20:31:15 +0200 Message-Id: <20211023183123.813116-4-laurent@vivier.eu> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20211023183123.813116-1-laurent@vivier.eu> References: <20211023183123.813116-1-laurent@vivier.eu> MIME-Version: 1.0 X-Provags-ID: V03:K1:riQ16zf5RV25qJFl9Nk4jao47KG07vr3rF+mqJXDYXBWy47jscK +TV/TkwPQxd4F6LSddgDdGD+2ne8W4X1jUVk8cA8RS9aUJePc6QkBekP7zZkqPeBCvwBjpf L3Q5y3QVaEyvyCZBh45EM3l6m+7k/vgbcLKjkwWksncpqehdAncTa2mXuiTKfOSCTWwDhPw ei7qCsOSXDiaZpBv2WghQ== X-UI-Out-Filterresults: notjunk:1;V03:K0:1AqNrkvikGw=:7HkOkUKuebtSuUotmK2L6L Drhh8g6PN5Iumlk0UHfH/dz2Dz3l/cOh+pBfjycas+Cmuez4rZlGPPAKy0zMk2WoIjnb1M+5T pRCG3JK2jNnFajJ63Ho/DInsuyBPr5w3gZKIAf3+41AeRd7duo2iiE5MOhp64/0+n/jSqB+59 Eg2CRfibFxlGbE9DDMwPgQfFA6U5fP150JORXYtr2X0ZyLRtaSIClPTrlOHrZVfs2ST0S8xTR mzDFozAV+9OWAsJF5xOmC2u1TI+E8wBzK7eCbl8p9Fo18qhYN3LiK7BUVXjDKzAxZL8juJsWH n3rMmDN66UWBmAgFClKY7nc013WjyW+m2YUzOLyeUY0DoGmfdGzJnXKlG0f4dx/W68ZilmlX7 CLcss576onzqgLQUAljnDPJb49qMp2pVjQNMQpFaX1ykX46OkDJm3Lyy7iecvE2icX/Dyvdxp zfvlEHoOLdB6KlBasgvMYoyGUhKKj6bXqm4ew6z4oU2ppsBkE33K+flZ7WG2W6ekf/OjmOMjY zi/mkv1U6Vs7JOndjmZ4caOxL83cQZPPV9NE19fXNYyoeg5qG7PyZz7nw72zwfiu/6AlKmZfW h347jAPXADhwjZnqeyVnNNoJTuXib4lfHa2a0E0kgF5OId5IAy5yVPVKgdlmL45ciNFUq0c2V h9ptStbvAQQkIGiJkV4i5zozbhFO3Q2jMV9B+wFLJEzUz3hD/qASsGHnVGtlLXajkkBo= Received-SPF: none client-ip=212.227.126.133; envelope-from=laurent@vivier.eu; helo=mout.kundenserver.de 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_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_NONE=0.001 autolearn=ham autolearn_force=no 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: qemu-trivial@nongnu.org, Thomas Huth , =?utf-8?q?Phili?= =?utf-8?q?ppe_Mathieu-Daud=C3=A9?= , Laurent Vivier Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Philippe Mathieu-Daudé Since commit 12b6e9b27d4 ("disas: Clean up CPUDebug initialization") the disassemble_info->bfd_endian enum is set for all targets in target_disas(). We can directly call print_insn_nios2() and simplify. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Laurent Vivier Reviewed-by: Thomas Huth Message-Id: <20210807110939.95853-3-f4bug@amsat.org> Signed-off-by: Laurent Vivier --- disas/nios2.c | 22 +++------------------- include/disas/dis-asm.h | 3 +-- target/nios2/cpu.c | 6 +----- 3 files changed, 5 insertions(+), 26 deletions(-) diff --git a/disas/nios2.c b/disas/nios2.c index d124902ae3e1..98ac07d72e9d 100644 --- a/disas/nios2.c +++ b/disas/nios2.c @@ -3478,9 +3478,7 @@ nios2_disassemble (bfd_vma address, unsigned long opcode, instruction word at the address given, and prints the disassembled instruction on the stream info->stream using info->fprintf_func. */ -static int -print_insn_nios2 (bfd_vma address, disassemble_info *info, - enum bfd_endian endianness) +int print_insn_nios2(bfd_vma address, disassemble_info *info) { bfd_byte buffer[INSNLEN]; int status; @@ -3488,7 +3486,7 @@ print_insn_nios2 (bfd_vma address, disassemble_info *info, status = (*info->read_memory_func)(address, buffer, INSNLEN, info); if (status == 0) { unsigned long insn; - if (endianness == BFD_ENDIAN_BIG) { + if (info->endian == BFD_ENDIAN_BIG) { insn = (unsigned long) bfd_getb32(buffer); } else { insn = (unsigned long) bfd_getl32(buffer); @@ -3501,7 +3499,7 @@ print_insn_nios2 (bfd_vma address, disassemble_info *info, status = (*info->read_memory_func)(address, buffer, 2, info); if (status == 0) { unsigned long insn; - if (endianness == BFD_ENDIAN_BIG) { + if (info->endian == BFD_ENDIAN_BIG) { insn = (unsigned long) bfd_getb16(buffer); } else { insn = (unsigned long) bfd_getl16(buffer); @@ -3514,17 +3512,3 @@ print_insn_nios2 (bfd_vma address, disassemble_info *info, (*info->memory_error_func)(status, address, info); return -1; } - -/* These two functions are the main entry points, accessed from - disassemble.c. */ -int -print_insn_big_nios2 (bfd_vma address, disassemble_info *info) -{ - return print_insn_nios2 (address, info, BFD_ENDIAN_BIG); -} - -int -print_insn_little_nios2 (bfd_vma address, disassemble_info *info) -{ - return print_insn_nios2 (address, info, BFD_ENDIAN_LITTLE); -} diff --git a/include/disas/dis-asm.h b/include/disas/dis-asm.h index 524f29196d9d..08e1beec854f 100644 --- a/include/disas/dis-asm.h +++ b/include/disas/dis-asm.h @@ -455,8 +455,7 @@ int print_insn_crisv32 (bfd_vma, disassemble_info*); int print_insn_crisv10 (bfd_vma, disassemble_info*); int print_insn_microblaze (bfd_vma, disassemble_info*); int print_insn_ia64 (bfd_vma, disassemble_info*); -int print_insn_big_nios2 (bfd_vma, disassemble_info*); -int print_insn_little_nios2 (bfd_vma, disassemble_info*); +int print_insn_nios2(bfd_vma, disassemble_info*); int print_insn_xtensa (bfd_vma, disassemble_info*); int print_insn_riscv32 (bfd_vma, disassemble_info*); int print_insn_riscv64 (bfd_vma, disassemble_info*); diff --git a/target/nios2/cpu.c b/target/nios2/cpu.c index 947bb09bc1ed..58ecd27d757e 100644 --- a/target/nios2/cpu.c +++ b/target/nios2/cpu.c @@ -147,11 +147,7 @@ static void nios2_cpu_disas_set_info(CPUState *cpu, disassemble_info *info) { /* NOTE: NiosII R2 is not supported yet. */ info->mach = bfd_arch_nios2; -#ifdef TARGET_WORDS_BIGENDIAN - info->print_insn = print_insn_big_nios2; -#else - info->print_insn = print_insn_little_nios2; -#endif + info->print_insn = print_insn_nios2; } static int nios2_cpu_gdb_read_register(CPUState *cs, GByteArray *mem_buf, int n) From patchwork Sat Oct 23 18:31:16 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 1545223 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=) 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 bilbo.ozlabs.org (Postfix) with ESMTPS id 4Hc91n23spz9s0r for ; Sun, 24 Oct 2021 05:37:33 +1100 (AEDT) Received: from localhost ([::1]:52548 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1meLtb-0003tI-31 for incoming@patchwork.ozlabs.org; Sat, 23 Oct 2021 14:37:31 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:56976) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1meLnq-0005DX-9B; Sat, 23 Oct 2021 14:31:34 -0400 Received: from mout.kundenserver.de ([212.227.126.130]:36341) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1meLnn-0006X9-Le; Sat, 23 Oct 2021 14:31:33 -0400 Received: from quad ([82.142.24.54]) by mrelayeu.kundenserver.de (mreue010 [212.227.15.167]) with ESMTPSA (Nemesis) id 1Mw99Y-1muugE43Fs-00s4y4; Sat, 23 Oct 2021 20:31:27 +0200 From: Laurent Vivier To: qemu-devel@nongnu.org Subject: [PULL 04/11] MAINTAINERS: Add myself as reviewer of 'Machine core' API Date: Sat, 23 Oct 2021 20:31:16 +0200 Message-Id: <20211023183123.813116-5-laurent@vivier.eu> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20211023183123.813116-1-laurent@vivier.eu> References: <20211023183123.813116-1-laurent@vivier.eu> MIME-Version: 1.0 X-Provags-ID: V03:K1:BvcAaw+R/IwhQ4xfQkGCnhA5wh/x5okd9ZFDYBS3QRl8/mHhl6q ffJeq12APrx2mcYaKuNUUwVRchX5wfuDZMzPMZeQeZlET3SbdgmBqtxhau9wUQDMwYZEum8 VJ/8JmqZP73TUhGgpd4iRTxhe1gzInDoDGlulQ30Ou9RRwey109E7nWb3q4u+vy6NFxsgAt 5BBRfbF+dfMmZIXBw1zdg== X-UI-Out-Filterresults: notjunk:1;V03:K0:3o8ni+6GUSw=:d8dCzrCjqKLIYW9yu79q1f AV98GARjT2extYWcw67fQG+H4/C/iFKgnDuAO0OzestQlzBtoiP5gK9bwe3UfnN4qn3NO2SVf iyMQz1KtOR/k6RvVQoBNukFYNnuVfQ0QG44jIORamE5E+Kbg8r+hIxR8K89hbeBQdaoo3oqm2 iDE2x/woih2zVbv1ZLXir73SesJ1fxa/ZWaYEKP5JH8EgREwrvzBb4Gt7e16R++S+PvnP8yDN dk1fXu2b9+OoqPKqGr8ZHldaWglmuh4CNCX9OeJU5bIgFfr7jEOiEIrqnAkFi39nTUrvkOfG9 M06sdpKWWabRM4nqbNii5VTXZZaqkf2I+OJFXbh0TqGJKeQh/OEpTfpunR5RTk/3GP41Q27el dpYXCfhAcCP11wjun9fZiZWbYofiy8zsYdO67Kjg8JVP8jPyQe+vqyQonLUBxCwF5a/dCfYuR HMCocwSp9KOa46x9DmK5/s4gIaYGc9oqDCHt0brVx1/OCMyQTDqfSRUT9C2JM7h6VxO76pn1E TR+joYRwrFSrUlDwxAbqjTpBF6nV8+E4+139XxTElnLG9D+r2RXV1A941Y6gmdEEssjh/RCEc Y2GCtduqvt4wyj4D4gPq/JI9aTs7tIv8eZNiKb2A2ZlkCVEA/pvtMYznegQxhSvRLzYSITi/b 7Io9f/cvcix0QPSoNZZ6v2Lk2PcqLMzYmVi5JvSqhpfBmLOp8KR4tSFtz9viD3zENBf0= Received-SPF: none client-ip=212.227.126.130; envelope-from=laurent@vivier.eu; helo=mout.kundenserver.de 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, SPF_HELO_NONE=0.001, SPF_NONE=0.001 autolearn=ham autolearn_force=no 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: qemu-trivial@nongnu.org, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Laurent Vivier Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Philippe Mathieu-Daudé In order to help Eduardo and Marcel with the machine core API, add myself as reviewer. That will also help me to learn more about this subsystem :) Signed-off-by: Philippe Mathieu-Daudé Reviewed by: Marcel Apfelbaum Message-Id: <20211007093108.323223-1-philmd@redhat.com> Signed-off-by: Laurent Vivier --- MAINTAINERS | 1 + 1 file changed, 1 insertion(+) diff --git a/MAINTAINERS b/MAINTAINERS index 4e77d03651bb..894dc4310526 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1617,6 +1617,7 @@ F: pc-bios/bios-microvm.bin Machine core M: Eduardo Habkost M: Marcel Apfelbaum +R: Philippe Mathieu-Daudé S: Supported F: cpu.c F: hw/core/cpu.c From patchwork Sat Oct 23 18:31:17 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 1545222 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=) 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 bilbo.ozlabs.org (Postfix) with ESMTPS id 4Hc91N1rFJz9s0r for ; Sun, 24 Oct 2021 05:37:12 +1100 (AEDT) Received: from localhost ([::1]:50698 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1meLtG-0002ZO-1Q for incoming@patchwork.ozlabs.org; Sat, 23 Oct 2021 14:37:10 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:56970) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1meLnq-0005Cx-29; Sat, 23 Oct 2021 14:31:34 -0400 Received: from mout.kundenserver.de ([212.227.126.133]:54297) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1meLno-0006Xr-7y; Sat, 23 Oct 2021 14:31:33 -0400 Received: from quad ([82.142.24.54]) by mrelayeu.kundenserver.de (mreue010 [212.227.15.167]) with ESMTPSA (Nemesis) id 1M8hph-1maD422au1-004oIr; Sat, 23 Oct 2021 20:31:27 +0200 From: Laurent Vivier To: qemu-devel@nongnu.org Subject: [PULL 05/11] softmmu/physmem.c: Fix typo in comment Date: Sat, 23 Oct 2021 20:31:17 +0200 Message-Id: <20211023183123.813116-6-laurent@vivier.eu> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20211023183123.813116-1-laurent@vivier.eu> References: <20211023183123.813116-1-laurent@vivier.eu> MIME-Version: 1.0 X-Provags-ID: V03:K1:y8oI+oP3VZBJGE7Vh5vENUQtDo2GgcjKJ7Zk2XTisExJFLPOyV+ R5TI9b4LUtPzIDYDFaKiAvNuOuNAyRgj3jBeEvIYLhZ15WDGEudEzB/z7RTak56vNtbVkFO fIRghNvV9hR/QP3wNwJpsg6Ge9+WMQbgg3yNj0Xm8C9tI8dxSilBs3A0napWEYewegEf5tf HnIoOcgpp+Qhw5iLXrAhg== X-UI-Out-Filterresults: notjunk:1;V03:K0:UMVT3kHt2GE=:1x3C4wPoi7Mf96+2V4dHUH vQNURsYVSHsuaSU1nmm3Ss35OaxWFURQnDLh1Fl60deN+v3KHE82UBwFp4oYPUQX9lBeECyII d8wQYReEolsNeUk9ReOjwzzd86CPA741Ir6bRreg2lNFOOiaFs0aWw/rqNlQKw+9l3KGvEm79 39muCwgKfrB8QcN7DZaOmU2dqg1+1aAZ96MyafQyMOB2vQZZfWz5EXKHjSxRSZWkLvYoOWNIC uqDZ6x7VmwsYIlRz2bUzj1xe4b/CNvAnVK2JPOTggDd0DygJYRxi4cunBp+ifJX5anEhQDJ8j PZUL6M7jGYuy8goGFmr8HsKQdY6u3R8g9zv8u1MMfh8uDfHQTmC3av2zShokSp4TA8h+X0dL9 ty2RU/imE6dwVXkdWsTH8ZKpA8FryNLy3Qvo+X8RJmBBlw1NUXClrK5of8UYb+wksAbMwsDg1 PqJDT5vdQxt6rLRhShOahy1XzReUmTbe+FJKimJcm2BlZmvGv+rF2aPkA7QLkdw98CWtmylyY z0GGE2/tXfzn+BN8fHlrD6LEDVVgP9iA5RAD4OWPQE6KqENzbiblE8NrIG//RUZFeHmcc/17N bd9O6U/IqoWUK7Q3Sr7/+1DbhdQA/TTVX2a1qxze095jIJ7mb2vJKrtOhTgn0/WzXA0QSBpD/ 9iLxaJoRQ7JRipTRbG5lDwQU2Mbv4qN0+o70WIjPrwrvLO9tTn1Mtwm/CZjtx5VB5Q3g= Received-SPF: none client-ip=212.227.126.133; envelope-from=laurent@vivier.eu; helo=mout.kundenserver.de X-Spam_score_int: 0 X-Spam_score: 0.0 X-Spam_bar: / X-Spam_report: (0.0 / 5.0 requ) RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_NONE=0.001 autolearn=ham autolearn_force=no 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: qemu-trivial@nongnu.org, Laurent Vivier , Greg Kurz , David Hildenbrand Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Greg Kurz Fix the comment to match what the code is doing, as explained in the changelog of commit 86cf9e154632cb28d749db0ea47946fba8cf3f09 that introduced the change: Commit 9458a9a1df1a4c719e24512394d548c1fc7abd22 added synchronization of vCPU and migration operations through calling run_on_cpu operation. However, in replay mode this synchronization is unneeded, because I/O and vCPU threads are already synchronized. This patch disables such synchronization for record/replay mode. Signed-off-by: Greg Kurz Reviewed-by: David Hildenbrand Message-Id: <163429018454.1146856.3429437540871060739.stgit@bahia.huguette> Signed-off-by: Laurent Vivier --- softmmu/physmem.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/softmmu/physmem.c b/softmmu/physmem.c index f67ad2998121..555c907f6743 100644 --- a/softmmu/physmem.c +++ b/softmmu/physmem.c @@ -2633,7 +2633,7 @@ static void tcg_log_global_after_sync(MemoryListener *listener) * In record/replay mode this causes a deadlock, because * run_on_cpu waits for rr mutex. Therefore no races are possible * in this case and no need for making run_on_cpu when - * record/replay is not enabled. + * record/replay is enabled. */ cpuas = container_of(listener, CPUAddressSpace, tcg_as_listener); run_on_cpu(cpuas->cpu, do_nothing, RUN_ON_CPU_NULL); From patchwork Sat Oct 23 18:31:18 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 1545228 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=) 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 bilbo.ozlabs.org (Postfix) with ESMTPS id 4Hc96Y30vQz9s0r for ; Sun, 24 Oct 2021 05:41:41 +1100 (AEDT) Received: from localhost ([::1]:33462 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1meLxb-0001mV-4v for incoming@patchwork.ozlabs.org; Sat, 23 Oct 2021 14:41:39 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57064) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1meLo1-0005Ki-2F; Sat, 23 Oct 2021 14:31:45 -0400 Received: from mout.kundenserver.de ([212.227.126.133]:56111) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1meLnx-0006dx-T8; Sat, 23 Oct 2021 14:31:44 -0400 Received: from quad ([82.142.24.54]) by mrelayeu.kundenserver.de (mreue010 [212.227.15.167]) with ESMTPSA (Nemesis) id 1N0WsG-1mqUwG2Jhk-00wUou; Sat, 23 Oct 2021 20:31:28 +0200 From: Laurent Vivier To: qemu-devel@nongnu.org Subject: [PULL 06/11] hw/nvram: Fix Memory Leak in Xilinx eFuse QOM Date: Sat, 23 Oct 2021 20:31:18 +0200 Message-Id: <20211023183123.813116-7-laurent@vivier.eu> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20211023183123.813116-1-laurent@vivier.eu> References: <20211023183123.813116-1-laurent@vivier.eu> MIME-Version: 1.0 X-Provags-ID: V03:K1:cXqw9ESDNcHugyGqugIWENMhtlWj0lOJmmCxaatdevUCiZbQwAF 86uBVUyU5FBLNzy/0CuZxLpXyBytKBWRSaHSY4Mo7mGDXRJTxxROJ/7eKvRwFssfMYXnrux xU5GqbMF1wR1TUyclklUjFT7EmOE4ikGBG7uibZT4qkyKXsoUXv6qPDcCtmttakxh/btKmm NIHVM+9ySeokMIKJfsjrg== X-UI-Out-Filterresults: notjunk:1;V03:K0:J9XLkhMOaM8=:cOC5P4jVEtWApA0f9oxVV9 H8IOmS/zRU3vpSdmeZqZMNsl9OFFgYtrmJQGxOnP9SUAslPQrw8KYPPBx20DTY03/RGeTG6Lm c3tEyTgQknxcZCW29KPZeipnheFAV7h4MA+mdXPZb52pJ2WamuPFqGYDyEx8YL7umnFkAFFOr ZWptsDzr+BCVQpY9Lokfc7R2tvDw1xCotKtQsaCD/ak58LpmsgK/y7Bah1a89B3ubNal34l54 c6pnyLCLWxsZUVkSEK3uUCHvDprum5xbeeFFYXo2XCr4JRmg71SEbnZHO7Ifh0I4qdUCpzdfK KaU1WtD25k4vQl27LdEF7L8ZCE9nSwNxnMQrdJCwpQx7scm9Blzrjx5hPNoyyMq+ltMVFi4rv 69hFQOjXuZ9WNFG2auGudZeipat4tT6tNmGZGNq9ocKvxuWUSWGxY/rhWhh10IpFyv0b5pxcl YGcIxJlbBVPAjwtDr7p/XNa7bXx5EjPcvmaNQuGkPC+hJaLG00D71roGfUiV1S6pWpzNnvPaN RoPt5FIqcu6bHydVIK/g357qHS6/OmfMOKRSqJ13/3RnFm4NjZ+4MuR4bN4D8wvHiekTI7xTG DMTqCKaLKt9vAK7KXYETM4bJx39N5AR/fIQVWKaom9+zyOFwnjbrVUk/E44578Mhhouf/RzPu 9vqSJmqgGVWNmLNWpOWjtwZ1SyOgkh34sjc8RrsVMAR5Ju8S1ik+mkJI16snK+iBJbvE= Received-SPF: none client-ip=212.227.126.133; envelope-from=laurent@vivier.eu; helo=mout.kundenserver.de 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_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_NONE=0.001 autolearn=ham autolearn_force=no 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: "Edgar E . Iglesias" , qemu-trivial@nongnu.org, Francisco Iglesias , Laurent Vivier , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Tong Ho Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Tong Ho Signed-off-by: Tong Ho Reviewed-by: Edgar E. Iglesias Reviewed-by: Francisco Iglesias Reviewed-by: Philippe Mathieu-Daudé Message-Id: <20211015203532.2463705-2-tong.ho@xilinx.com> Signed-off-by: Laurent Vivier --- hw/nvram/xlnx-efuse.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/hw/nvram/xlnx-efuse.c b/hw/nvram/xlnx-efuse.c index ee1caab54cba..a0fd77b586dc 100644 --- a/hw/nvram/xlnx-efuse.c +++ b/hw/nvram/xlnx-efuse.c @@ -144,10 +144,11 @@ static bool efuse_ro_bits_find(XlnxEFuse *s, uint32_t k) bool xlnx_efuse_set_bit(XlnxEFuse *s, unsigned int bit) { if (efuse_ro_bits_find(s, bit)) { + g_autofree char *path = object_get_canonical_path(OBJECT(s)); + qemu_log_mask(LOG_GUEST_ERROR, "%s: WARN: " "Ignored setting of readonly efuse bit<%u,%u>!\n", - object_get_canonical_path(OBJECT(s)), - (bit / 32), (bit % 32)); + path, (bit / 32), (bit % 32)); return false; } @@ -202,9 +203,11 @@ static void efuse_realize(DeviceState *dev, Error **errp) efuse_ro_bits_sort(s); if ((s->efuse_size % 32) != 0) { + g_autofree char *path = object_get_canonical_path(OBJECT(s)); + error_setg(errp, "%s.efuse-size: %u: property value not multiple of 32.", - object_get_canonical_path(OBJECT(dev)), s->efuse_size); + path, s->efuse_size); return; } From patchwork Sat Oct 23 18:31:19 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 1545230 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=) 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 bilbo.ozlabs.org (Postfix) with ESMTPS id 4Hc9HR1NqXz9s0r for ; Sun, 24 Oct 2021 05:49:21 +1100 (AEDT) Received: from localhost ([::1]:50658 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1meM4z-0005Fj-R8 for incoming@patchwork.ozlabs.org; Sat, 23 Oct 2021 14:49:17 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57088) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1meLo4-0005Sa-EV; Sat, 23 Oct 2021 14:31:49 -0400 Received: from mout.kundenserver.de ([212.227.126.187]:45775) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1meLnx-0006eI-Vn; Sat, 23 Oct 2021 14:31:48 -0400 Received: from quad ([82.142.24.54]) by mrelayeu.kundenserver.de (mreue010 [212.227.15.167]) with ESMTPSA (Nemesis) id 1MqbDs-1n0VLl0lSi-00mdQm; Sat, 23 Oct 2021 20:31:29 +0200 From: Laurent Vivier To: qemu-devel@nongnu.org Subject: [PULL 07/11] hw/nvram: Fix Memory Leak in Xilinx Versal eFuse device Date: Sat, 23 Oct 2021 20:31:19 +0200 Message-Id: <20211023183123.813116-8-laurent@vivier.eu> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20211023183123.813116-1-laurent@vivier.eu> References: <20211023183123.813116-1-laurent@vivier.eu> MIME-Version: 1.0 X-Provags-ID: V03:K1:Vj8jqpUBdOYe12yja2gXIsPtV7DMUBmye2yDpTeoWYjcudRYBqT u1hKbSluR5gw9z5QyqebCAHSee+5b68fEK4TnMeT4Tzx+myRd6QKpEQjOnlqS2QuPyKeTX8 9MPFltu4sg6dg3was/hJ5VDv6Ewc5To8/L/ijNGcl55wJbZ5XXfy/BFJ76XWNq4EQaAt0QH CEP2NNrsBDJ5H6GGE5lSw== X-UI-Out-Filterresults: notjunk:1;V03:K0:HNf4YdKWleA=:PdM8ozA+7BS00yqu5TvwbV mgRAEinX3RIJTqNOrlcF7NukE1j2xdkAHOXtGnU+PoNXETUaRIFuqnFOkFCzK/uG/XdUEtBwo 4xLnJtRhn4xybqtu6tvrPisAN8GgBjQOnMMKsDDFXA5L0ykYM82YfTH/XoB4QYr8Pbp0hMk8D JrnnE7U0Td5eMXbsaDLppxf/i0+fX4Y92S7GDPRoXmppX83QLaDAjckXRxGMApkqBdEMC+qPd issz714AGikMcl8maBocOE6573GiqXwvAMEsS+xDDt1OAOKKWflxZ8El2hiRFegLfJHJzbMnr Yvm/RP2dqRh4q/5Fp0xv+VD1Zi+UmkQtpajEiSq8ucf1S4TJdqoyvIbwdhhFE4PlVUsI3nlss E6MqDXBwgsxtq03pBwM4VTUgqsc6ke/EPBr9gkQTuzcIGPEf/c+jrth4QPknw1bni+oIYKm/9 Ye8dp5R7CuQvoFAMPTP0YxjWq0Jcp+xkqIfx0hHI5qoPRWr5ccPUML7DwjLYsBfyWW2EmRe2L JzsKvOWaoDV67yN6eCBAsecxUdAIXDh+AZrWpQK9vUk+5dEnAdezr7DtWq1yktKYhOm5ecQh3 8P1MEjxrqeyzw7pxf82cFuon9i5C46AM9x/8PskOsiGGGfaD/HJB+jJijAj4wrCF4BVCKUHhc KB/e8bHgoNK93Y9gN79cqlzZ+zVRJ6r2NUHjGCqqWpAPG3jCq583zrI90ZA5xPh8h5MY= Received-SPF: none client-ip=212.227.126.187; envelope-from=laurent@vivier.eu; helo=mout.kundenserver.de X-Spam_score_int: 0 X-Spam_score: 0.0 X-Spam_bar: / X-Spam_report: (0.0 / 5.0 requ) RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_NONE=0.001 autolearn=ham autolearn_force=no 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: "Edgar E . Iglesias" , qemu-trivial@nongnu.org, Francisco Iglesias , Laurent Vivier , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Tong Ho Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Tong Ho Signed-off-by: Tong Ho Reviewed-by: Edgar E. Iglesias Reviewed-by: Francisco Iglesias Reviewed-by: Philippe Mathieu-Daudé Message-Id: <20211015203532.2463705-3-tong.ho@xilinx.com> Signed-off-by: Laurent Vivier --- hw/nvram/xlnx-versal-efuse-ctrl.c | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/hw/nvram/xlnx-versal-efuse-ctrl.c b/hw/nvram/xlnx-versal-efuse-ctrl.c index d3623767032c..b35ba65ab57b 100644 --- a/hw/nvram/xlnx-versal-efuse-ctrl.c +++ b/hw/nvram/xlnx-versal-efuse-ctrl.c @@ -439,9 +439,11 @@ static void efuse_pgm_addr_postw(RegisterInfo *reg, uint64_t val64) * up to guest to do so (or by reset). */ if (efuse_pgm_locked(s, bit)) { + g_autofree char *path = object_get_canonical_path(OBJECT(s)); + qemu_log_mask(LOG_GUEST_ERROR, "%s: Denied setting of efuse<%u, %u, %u>\n", - object_get_canonical_path(OBJECT(s)), + path, FIELD_EX32(bit, EFUSE_PGM_ADDR, PAGE), FIELD_EX32(bit, EFUSE_PGM_ADDR, ROW), FIELD_EX32(bit, EFUSE_PGM_ADDR, COLUMN)); @@ -478,9 +480,11 @@ static void efuse_rd_addr_postw(RegisterInfo *reg, uint64_t val64) s->regs[R_EFUSE_RD_DATA] = xlnx_versal_efuse_read_row(s->efuse, bit, &denied); if (denied) { + g_autofree char *path = object_get_canonical_path(OBJECT(s)); + qemu_log_mask(LOG_GUEST_ERROR, "%s: Denied reading of efuse<%u, %u>\n", - object_get_canonical_path(OBJECT(s)), + path, FIELD_EX32(bit, EFUSE_RD_ADDR, PAGE), FIELD_EX32(bit, EFUSE_RD_ADDR, ROW)); @@ -625,9 +629,11 @@ static void efuse_ctrl_reg_write(void *opaque, hwaddr addr, s = XLNX_VERSAL_EFUSE_CTRL(dev); if (addr != A_WR_LOCK && s->regs[R_WR_LOCK]) { + g_autofree char *path = object_get_canonical_path(OBJECT(s)); + qemu_log_mask(LOG_GUEST_ERROR, "%s[reg_0x%02lx]: Attempt to write locked register.\n", - object_get_canonical_path(OBJECT(s)), (long)addr); + path, (long)addr); } else { register_write_memory(opaque, addr, data, size); } @@ -681,16 +687,20 @@ static void efuse_ctrl_realize(DeviceState *dev, Error **errp) const uint32_t lks_sz = sizeof(XlnxEFuseLkSpec) / 2; if (!s->efuse) { + g_autofree char *path = object_get_canonical_path(OBJECT(s)); + error_setg(errp, "%s.efuse: link property not connected to XLNX-EFUSE", - object_get_canonical_path(OBJECT(dev))); + path); return; } /* Sort property-defined pgm-locks for bsearch lookup */ if ((s->extra_pg0_lock_n16 % lks_sz) != 0) { + g_autofree char *path = object_get_canonical_path(OBJECT(s)); + error_setg(errp, "%s.pg0-lock: array property item-count not multiple of %u", - object_get_canonical_path(OBJECT(dev)), lks_sz); + path, lks_sz); return; } From patchwork Sat Oct 23 18:31:20 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 1545229 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=) 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 bilbo.ozlabs.org (Postfix) with ESMTPS id 4Hc9CZ0mjGz9s0r for ; Sun, 24 Oct 2021 05:46:02 +1100 (AEDT) Received: from localhost ([::1]:42138 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1meM1n-0007f0-Tw for incoming@patchwork.ozlabs.org; Sat, 23 Oct 2021 14:45:59 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57066) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1meLo1-0005Kj-6C; Sat, 23 Oct 2021 14:31:45 -0400 Received: from mout.kundenserver.de ([212.227.126.187]:55043) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1meLny-0006er-0G; Sat, 23 Oct 2021 14:31:44 -0400 Received: from quad ([82.142.24.54]) by mrelayeu.kundenserver.de (mreue010 [212.227.15.167]) with ESMTPSA (Nemesis) id 1N4A1h-1mnWng3XA9-0101Zx; Sat, 23 Oct 2021 20:31:30 +0200 From: Laurent Vivier To: qemu-devel@nongnu.org Subject: [PULL 08/11] hw/nvram: Fix Memory Leak in Xilinx ZynqMP eFuse device Date: Sat, 23 Oct 2021 20:31:20 +0200 Message-Id: <20211023183123.813116-9-laurent@vivier.eu> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20211023183123.813116-1-laurent@vivier.eu> References: <20211023183123.813116-1-laurent@vivier.eu> MIME-Version: 1.0 X-Provags-ID: V03:K1:NwSi9Ss8j1VXdmTgo13aOsmLR+XhahedXiwgM/x3gOJG9e4tLOU FgsE5D5grYr0n9qiY6RVjsBewwuuUA2IFlOIZV/V1d3QMQcgAVGKIgc28GNGjHuqOtjIxvi +omzsPJfvq/hi+X9WsLEZOowXoE1BeRNXRrKcH+zVCPdgLywP/NwDQCmVIqY9j2b8jgqG0A mL+QqAebwqbCejmYlD3rA== X-UI-Out-Filterresults: notjunk:1;V03:K0:XWEbJ8JYNfs=:NUNIszOwJIvOhxuB19LFoW w9B1LBRoXArRUWpykKpAosjapAptZbPhxHgFFujX8mY2OYd7arsgMCWtB32YNDak5iLDwUXUQ K7oCdZXBaY9gB/KpU+4VLGYRAkOT6YoaB26HJ6AqXC2ei7ULoi0cMxlghK/JI9gfTRjZ0TBUO ABkF2V1BpXzgSiCswZAb27Yc3anZmYY4xDhJ7CONhZilADCzvfyNZXq+nr9wMrNphmnzjw6gu g2wJesHE9IXMis0P0HaP4TInQTcghPX6CsEZMFMAauh8sguI9arq+BlJj0hbERjFdw4c+gI06 BhReDAwZkTGnvz/onbsWo1VwA77YqvYICJQapRGXhLdAsJ4jTsOJhquFDYfftWC7bHWupfeRM ix3KrGfP/1sYo+inm/9bO/lrIhMQiEokv0mnmOPSU8LzlaLnu1L+YGnokz01EIRN1GnfF1AaM 7/KDeXO6+0ABjHsp7M3JV3O3cMJVj/d8fLnMDXzRqKF2iWOfKqvRS2XVC5CtXWMbGECvZJ7EW 4MlfN9WZDBgZGDQYyM+gcRbOSyU4C0M1YF/IBdfClTEoUMsJpoXH9KJXLCnwvUOJvCxfMn9cq TEs0j1Thk4tLEx0BB5DvqohrKnFOlffcMGKI/JQViT2mIGCcJj5neVMOxsWFauwysH7XBDwil h2Sc4l4azgQxTvFRGaD3sUxl68xhWnpEi4aIaFz0l0G1AlBVGKBRRrCLuIev043HPx5E= Received-SPF: none client-ip=212.227.126.187; envelope-from=laurent@vivier.eu; helo=mout.kundenserver.de 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, SPF_HELO_NONE=0.001, SPF_NONE=0.001 autolearn=ham autolearn_force=no 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: "Edgar E . Iglesias" , qemu-trivial@nongnu.org, Francisco Iglesias , Laurent Vivier , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Tong Ho Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Tong Ho Signed-off-by: Tong Ho Reviewed-by: Edgar E. Iglesias Reviewed-by: Francisco Iglesias Reviewed-by: Philippe Mathieu-Daudé Message-Id: <20211015203532.2463705-4-tong.ho@xilinx.com> Signed-off-by: Laurent Vivier --- hw/nvram/xlnx-zynqmp-efuse.c | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/hw/nvram/xlnx-zynqmp-efuse.c b/hw/nvram/xlnx-zynqmp-efuse.c index 1f87dbf988d1..228ba0bbfaf1 100644 --- a/hw/nvram/xlnx-zynqmp-efuse.c +++ b/hw/nvram/xlnx-zynqmp-efuse.c @@ -434,11 +434,12 @@ static void zynqmp_efuse_pgm_addr_postw(RegisterInfo *reg, uint64_t val64) if (!errmsg) { ARRAY_FIELD_DP32(s->regs, EFUSE_ISR, PGM_ERROR, 0); } else { + g_autofree char *path = object_get_canonical_path(OBJECT(s)); + ARRAY_FIELD_DP32(s->regs, EFUSE_ISR, PGM_ERROR, 1); qemu_log_mask(LOG_GUEST_ERROR, "%s - eFuse write error: %s; addr=0x%x\n", - object_get_canonical_path(OBJECT(s)), - errmsg, (unsigned)val64); + path, errmsg, (unsigned)val64); } ARRAY_FIELD_DP32(s->regs, EFUSE_ISR, PGM_DONE, 1); @@ -448,6 +449,7 @@ static void zynqmp_efuse_pgm_addr_postw(RegisterInfo *reg, uint64_t val64) static void zynqmp_efuse_rd_addr_postw(RegisterInfo *reg, uint64_t val64) { XlnxZynqMPEFuse *s = XLNX_ZYNQMP_EFUSE(reg->opaque); + g_autofree char *path = NULL; /* * Grant reads only to allowed bits; reference sources: @@ -538,10 +540,10 @@ static void zynqmp_efuse_rd_addr_postw(RegisterInfo *reg, uint64_t val64) return; denied: + path = object_get_canonical_path(OBJECT(s)); qemu_log_mask(LOG_GUEST_ERROR, "%s: Denied efuse read from array %u, row %u\n", - object_get_canonical_path(OBJECT(s)), - efuse_ary, efuse_row); + path, efuse_ary, efuse_row); s->regs[R_EFUSE_RD_DATA] = 0; @@ -731,9 +733,11 @@ static void zynqmp_efuse_reg_write(void *opaque, hwaddr addr, s = XLNX_ZYNQMP_EFUSE(dev); if (addr != A_WR_LOCK && s->regs[R_WR_LOCK]) { + g_autofree char *path = object_get_canonical_path(OBJECT(s)); + qemu_log_mask(LOG_GUEST_ERROR, "%s[reg_0x%02lx]: Attempt to write locked register.\n", - object_get_canonical_path(OBJECT(s)), (long)addr); + path, (long)addr); } else { register_write_memory(opaque, addr, data, size); } @@ -784,8 +788,10 @@ static void zynqmp_efuse_realize(DeviceState *dev, Error **errp) XlnxZynqMPEFuse *s = XLNX_ZYNQMP_EFUSE(dev); if (!s->efuse) { + g_autofree char *path = object_get_canonical_path(OBJECT(s)); + error_setg(errp, "%s.efuse: link property not connected to XLNX-EFUSE", - object_get_canonical_path(OBJECT(dev))); + path); return; } From patchwork Sat Oct 23 18:31:21 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 1545219 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=) 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 bilbo.ozlabs.org (Postfix) with ESMTPS id 4Hc8xv6lLhz9sX3 for ; Sun, 24 Oct 2021 05:34:11 +1100 (AEDT) Received: from localhost ([::1]:44258 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1meLqL-0006hF-N9 for incoming@patchwork.ozlabs.org; Sat, 23 Oct 2021 14:34:09 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:56980) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1meLnr-0005EC-7w; Sat, 23 Oct 2021 14:31:35 -0400 Received: from mout.kundenserver.de ([212.227.126.131]:39255) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1meLnp-0006Xx-3K; Sat, 23 Oct 2021 14:31:34 -0400 Received: from quad ([82.142.24.54]) by mrelayeu.kundenserver.de (mreue010 [212.227.15.167]) with ESMTPSA (Nemesis) id 1N6bPS-1mkUfc1MVi-01804E; Sat, 23 Oct 2021 20:31:30 +0200 From: Laurent Vivier To: qemu-devel@nongnu.org Subject: [PULL 09/11] README: Fix some documentation URLs Date: Sat, 23 Oct 2021 20:31:21 +0200 Message-Id: <20211023183123.813116-10-laurent@vivier.eu> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20211023183123.813116-1-laurent@vivier.eu> References: <20211023183123.813116-1-laurent@vivier.eu> MIME-Version: 1.0 X-Provags-ID: V03:K1:5izw5EsDHrbMdDYzse6zcZydMtlEL3iEpqvu0DOXI1ywbNhdfJZ /2zy69k7fHFl8ZupNVInLoPegejhLb4fVIZsWl53Womkr+y6S8dtiT2veEeuEY2YX/Y/6Cb +8/Q4IWC/ACat/G0IoaKAckia3UMd4BmWgLSppevF2u8ETOqCBFzokjJMeuW04Bd7vzCB+s 4zNvjICSVy+khDRYc/CBg== X-UI-Out-Filterresults: notjunk:1;V03:K0:bmbfWlDUQGk=:nBkb7Dfk9nr1XEc1MKChHb eHB5HGVBOHGVCnFmJI0XKl2YH805mXpckMWLHSzeesC84KnDnEO47deDBYwSLPtShUH0Fv9mP 9cmbRDrxhX7fsDO21S07SvqSeQZDWcVZv81Sd//CppkW7U+WBWGZP4xUJ1E39Nsp6eWQzR248 5Q+kmCFOIJuZBju0o+Tnd/1LHPegczdw9ByKrQnlfHt7tfztEfSo0f2ix862BJquhvGd46/vv KtHeYB23VV9enBU5yg4/yzTjNhJtTXbgd4FQis0Z0/s9AM3HE9+n+R40mAWG21+76T428JfMJ EZKwdKmhDlw0RInkfmNovqqE8+8wB8A+qc7ZoalFnYal9C/6cK0CBGmQtJdB7JlfHZ5VIEOFh TYk84QXSde9k01wrup52DbjgMCQsHjpqbF/PUXS6E8E2UjvEdweS5+7XABl4lPPX1p2ajY3m7 3Cx9ru7n1E4pTa5/bBerL2qILLstjQ8Qa5BDAZ+vgCl33SChkN6reVa/Gshr+LWYJ7mNiOBVg 8NZu+3XLZqNPfsSTs8y4JBIoDPieGaHivzzZaALB7UW6BsocGlNYmD/5h/IzN9Zi6izHtToho cTaUdaAZ5nggwizSYFSqKc2XxMkwWa4WpJtdyYHNoOorpM/ZvBLP0dIwAQj3z777gyXQYSL8+ J7dROGQVVTeu2t2aVyiTjFxRhfJ0CITaqVa/vgd1CHmso4R314kPtc8xzza9kBBJq1jQ= Received-SPF: none client-ip=212.227.126.131; envelope-from=laurent@vivier.eu; helo=mout.kundenserver.de 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_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_NONE=0.001 autolearn=ham autolearn_force=no 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: qemu-trivial@nongnu.org, Greg Kurz , Laurent Vivier Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Greg Kurz All of these pages live in the wiki, not in the main web site. Signed-off-by: Greg Kurz Reviewed-by: Laurent Vivier Tested-by: Laurent Vivier Message-Id: <163456470882.196333.17366490695504718038.stgit@bahia.huguette> Signed-off-by: Laurent Vivier --- README.rst | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/README.rst b/README.rst index 79b19f1481e1..23795b837740 100644 --- a/README.rst +++ b/README.rst @@ -59,9 +59,9 @@ of other UNIX targets. The simple steps to build QEMU are: Additional information can also be found online via the QEMU website: -* ``_ -* ``_ -* ``_ +* ``_ +* ``_ +* ``_ Submitting patches @@ -84,8 +84,8 @@ the Developers Guide. Additional information on submitting patches can be found online via the QEMU website -* ``_ -* ``_ +* ``_ +* ``_ The QEMU website is also maintained under source control. @@ -144,7 +144,7 @@ reported via GitLab. For additional information on bug reporting consult: -* ``_ +* ``_ ChangeLog @@ -168,4 +168,4 @@ main methods being email and IRC Information on additional methods of contacting the community can be found online via the QEMU website: -* ``_ +* ``_ From patchwork Sat Oct 23 18:31:22 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 1545227 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=) 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 bilbo.ozlabs.org (Postfix) with ESMTPS id 4Hc96N0QHqz9s0r for ; Sun, 24 Oct 2021 05:41:32 +1100 (AEDT) Received: from localhost ([::1]:33142 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1meLxR-0001Zu-Qh for incoming@patchwork.ozlabs.org; Sat, 23 Oct 2021 14:41:29 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57030) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1meLnx-0005H7-RY; Sat, 23 Oct 2021 14:31:43 -0400 Received: from mout.kundenserver.de ([212.227.126.187]:60345) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1meLns-0006Zw-Ap; Sat, 23 Oct 2021 14:31:40 -0400 Received: from quad ([82.142.24.54]) by mrelayeu.kundenserver.de (mreue010 [212.227.15.167]) with ESMTPSA (Nemesis) id 1N2Unv-1mpBUr3Y23-013rKZ; Sat, 23 Oct 2021 20:31:31 +0200 From: Laurent Vivier To: qemu-devel@nongnu.org Subject: [PULL 10/11] analyze-migration.py: fix a long standing typo Date: Sat, 23 Oct 2021 20:31:22 +0200 Message-Id: <20211023183123.813116-11-laurent@vivier.eu> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20211023183123.813116-1-laurent@vivier.eu> References: <20211023183123.813116-1-laurent@vivier.eu> MIME-Version: 1.0 X-Provags-ID: V03:K1:gh06F+74oA6StfovsGBNpmNQWQNQxicljU8ZhpCb/oP1DHJDoK8 MJfwckMAxCUOI8d071lZlFdpLMp8DyfM3eMjOkp56sl/ZKRSGcLgTnJMC1EVZ7kfuhV8JlJ hRLK65hClCdsOsBYGXMjZK2nXicKeqEcQsWt2OLE2SBohDyM8zNU9g/E1sfGh5Gj0wInpEt ZmG5y1NuS2KkJ+f3rBS/A== X-UI-Out-Filterresults: notjunk:1;V03:K0:/0Jaj9Cwajk=:+3LF5aEWV44siaLIWI8Ky0 bjRNbcr0yP7+EWA2Lt40Vi8vDpCTn7H7NsIpuOYcWSdJXCtyiaF+zugClcbQaTQiuyOnTdXRM w4/Dav0QX7pGFkr8f6IxyFy5bTdB6LTIDB4C90TtPzlJVEfUNb34I/jpYsrmU4ZFf5koeIJeN 4rNVg1FtXu57c75bLUbZorvDK3/B2dYK80aGIlPVWQn13awL4I92BQ/1FM6qG2dWgNqp+UAqQ xE4hV2QgzEOtuI2HPQXm+uMBLO/MoYIYV0HFn9mpEbx6+1S5tIJ/bjJviFPuPLpcL9HZPqSlI TmrY0QRu+rQTlPXc0w6feszmf7UKkJInZjJk2E4BWWCXWN/ea8IZMBR1BOW15C2MQ4LTI90bK m3xCsfcH6i0Jm02Xa8UfoDp2qv2PeunNWg2r35pTeNtGyCi04bWoakVBO7YHHMJPjyUoiZ9jS +p3VGvkuWJgK/2ZmuAhhQwgIUezPzrFR81V5g1kh4rjCmBedbkbNrXYNyxTbAUYXu6fLV+N57 jP/x8rD6h/SVRGqA58pE5q/v7xIJ3GQgyXymm6ucw2m9/rMn4WA1czUXUVLLmjDWtryvmxVUc 9EoKmj+7CHLpn4mP+DYxyBRfG9LA+voPQdv7p/DQpTGZ2v2H+bjtdIkvjTqufK/SmMSLM1+yH jvXvNr55pz2Z8TAkjP5q+BaB+cKFickbdqljZ/qK1N+qCFd6nPvYaIIU3Q/3Bqc7sIuY= Received-SPF: none client-ip=212.227.126.187; envelope-from=laurent@vivier.eu; helo=mout.kundenserver.de 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, SPF_HELO_NONE=0.001, SPF_NONE=0.001 autolearn=ham autolearn_force=no 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: qemu-trivial@nongnu.org, Laurent Vivier , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Laurent Vivier Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Laurent Vivier The parameters of '-d' can be either 'state' or 'desc', not 'dump' as it is reported in the error message. Fixes: b17425701d66 ("Add migration stream analyzation script") Signed-off-by: Laurent Vivier Reviewed-by: Philippe Mathieu-Daudé Message-Id: <20211015131645.501281-2-lvivier@redhat.com> Signed-off-by: Laurent Vivier --- scripts/analyze-migration.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/analyze-migration.py b/scripts/analyze-migration.py index d7177b212c86..9d239d309f33 100755 --- a/scripts/analyze-migration.py +++ b/scripts/analyze-migration.py @@ -610,4 +610,4 @@ def default(self, o): dump.read(desc_only = True) print(jsonenc.encode(dump.vmsd_desc)) else: - raise Exception("Please specify either -x, -d state or -d dump") + raise Exception("Please specify either -x, -d state or -d desc") From patchwork Sat Oct 23 18:31:23 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 1545226 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=) 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 bilbo.ozlabs.org (Postfix) with ESMTPS id 4Hc9682gG4z9s0r for ; Sun, 24 Oct 2021 05:41:18 +1100 (AEDT) Received: from localhost ([::1]:60822 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1meLxD-00018u-KD for incoming@patchwork.ozlabs.org; Sat, 23 Oct 2021 14:41:15 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57008) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1meLnw-0005Gc-1Z; Sat, 23 Oct 2021 14:31:41 -0400 Received: from mout.kundenserver.de ([212.227.126.133]:45897) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1meLnr-0006Zo-S0; Sat, 23 Oct 2021 14:31:39 -0400 Received: from quad ([82.142.24.54]) by mrelayeu.kundenserver.de (mreue010 [212.227.15.167]) with ESMTPSA (Nemesis) id 1MAOeB-1mYcW01XqN-00BthL; Sat, 23 Oct 2021 20:31:31 +0200 From: Laurent Vivier To: qemu-devel@nongnu.org Subject: [PULL 11/11] analyze-migration.py: fix extract contents ('-x') errors Date: Sat, 23 Oct 2021 20:31:23 +0200 Message-Id: <20211023183123.813116-12-laurent@vivier.eu> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20211023183123.813116-1-laurent@vivier.eu> References: <20211023183123.813116-1-laurent@vivier.eu> MIME-Version: 1.0 X-Provags-ID: V03:K1:CarLG2sdS3W7idOI9tEpAj1vPolrYUWKi5sgCd+ep0jBCVUjNGB jJ8jdY7NffvHY6iY7Mw3R0PNTQJn2vdFLy6s4bObMnjShrdzblgrWpmYVOSHvbnShIWAyyq KrMeM5Pu0SpuiOyDHyFGX3RAYxKU+ecMYBZXAoMq6PJQlRD8/tc2N8VzpDsLIorLbMICoER ZRBE+czLpcOT0ZBaEMd4w== X-UI-Out-Filterresults: notjunk:1;V03:K0:MMtDmQYFf9A=:g1EcDkUnbGVR+dCJjcsLe7 ohKx5boA2wM7A9AUe0Jcbvm0fx4TEPHF4QOfL5N4J+WqJ0aUtMerstKWFdxDvYliTE3TaFBT5 hN5h6IEgCC0ZYDTKtX/qGbKK6EMLVj/y1P0QaDlXYCaBZpUt428Nhq9BnzvZL9XDZXnq1qcjX M8Jjb9J9Ok5OHmdUtEv27BrLomAidZBS8B9M8W+JWkLqsNb2yyTt647mlRBekrvMCiMIn+Aki XMa+VjWeQgbbBLF/e+kyKvsh0J0zWuUnfSiH0oz9U6+dbFnFytLhG9aPXXXtRFl0uMw974/IL +Y5XtF/WvcQDKYDr0YEvM7+6a7cRYD5j+5rLI6fTtZnmt1qZ+DMhsBzGXSr3bo8n3MRzwI30D Ge4+1/tNjDnm2z/QE/+weHYJU86OzRf7qwXRtzPH7Mh94TJb/FH+3klOzPC15y07Rhx4ue3XI y7go1PH2G4XPc1F0e6klFKT0P+N4qGnN8dXsFf0LpeT+cIwHmeLR7I2veotZNOJMeytOw1hwb JbeA/U3SHtNhxBmR0/ZDXvx6aoxlARU1YvH8xrG9uC0umKWMDS2B4fUZywqOUzrpdTPt7ZvpE 5yhUBoNWiPwlWDxy6aSjYBCWm/rNcTOEI3lXlX8TlU85jDpKXjHjFAufNfiG2Cse3IFDPpDNi oDKA+AJSw/eiqV/jfDBsJmu/mjr1xQYstfe+RejvKuhfTl+tUo8/MM2aym9KVJ2pgXiY= Received-SPF: none client-ip=212.227.126.133; envelope-from=laurent@vivier.eu; helo=mout.kundenserver.de 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_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_NONE=0.001 autolearn=ham autolearn_force=no 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: qemu-trivial@nongnu.org, Laurent Vivier , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Laurent Vivier Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Laurent Vivier When we try to use 'analyze-migration.py -x' with python3, we have the following errors: Traceback (most recent call last): File "scripts/analyze-migration.py", line 593, in f.write(jsonenc.encode(dump.vmsd_desc)) TypeError: a bytes-like object is required, not 'str' Traceback (most recent call last): File "scripts/analyze-migration.py", line 601, in f.write(jsonenc.encode(dict)) TypeError: a bytes-like object is required, not 'str' This happens because the file 'f' is open in binary mode while jsonenc.encode() returns a string. The results are human-readable files, 'desc.json' and 'state.json', so there is no reason to use the binary mode. Signed-off-by: Laurent Vivier Reviewed-by: Philippe Mathieu-Daudé Message-Id: <20211015131645.501281-3-lvivier@redhat.com> Signed-off-by: Laurent Vivier --- scripts/analyze-migration.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/analyze-migration.py b/scripts/analyze-migration.py index 9d239d309f33..b82a1b0c58c4 100755 --- a/scripts/analyze-migration.py +++ b/scripts/analyze-migration.py @@ -588,7 +588,7 @@ def default(self, o): dump.read(desc_only = True) print("desc.json") - f = open("desc.json", "wb") + f = open("desc.json", "w") f.truncate() f.write(jsonenc.encode(dump.vmsd_desc)) f.close() @@ -596,7 +596,7 @@ def default(self, o): dump.read(write_memory = True) dict = dump.getDict() print("state.json") - f = open("state.json", "wb") + f = open("state.json", "w") f.truncate() f.write(jsonenc.encode(dict)) f.close()