From patchwork Sat Sep 19 18:44:35 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 1367687 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=vivier.eu Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4Bv06M3LNmz9sSf for ; Sun, 20 Sep 2020 04:46:32 +1000 (AEST) Received: from localhost ([::1]:35536 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kJhsU-00062Y-Be for incoming@patchwork.ozlabs.org; Sat, 19 Sep 2020 14:46:30 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51760) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kJhrC-0005vw-A7; Sat, 19 Sep 2020 14:45:10 -0400 Received: from mout.kundenserver.de ([212.227.126.131]:58745) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kJhr9-0001Ix-4J; Sat, 19 Sep 2020 14:45:09 -0400 Received: from localhost.localdomain ([82.252.129.222]) by mrelayeu.kundenserver.de (mreue012 [212.227.15.167]) with ESMTPSA (Nemesis) id 1MHmuE-1kDgEq0RaI-00EwR4; Sat, 19 Sep 2020 20:45:02 +0200 From: Laurent Vivier To: qemu-devel@nongnu.org Subject: [PULL 01/17] hw/gpio/max7310: Remove impossible check Date: Sat, 19 Sep 2020 20:44:35 +0200 Message-Id: <20200919184451.2129349-2-laurent@vivier.eu> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200919184451.2129349-1-laurent@vivier.eu> References: <20200919184451.2129349-1-laurent@vivier.eu> MIME-Version: 1.0 X-Provags-ID: V03:K1:EyxM392So1fu6050ScU6cNHvupY9nlc9jRJzbI/5EHVPbpIOlLJ ufI/9ZDlvuX+WMPq7eIRanHxvi8ab+CTsPMW8vIMMJjh0kGoSLSiG0zO34YzptGOz80r14S 3O38CgSqnOH8HQSmEfhvAFouEBU5DSAq4F0bg/2VuqYMZ0T+JfXiym9C88JAQdPIGj2tH5T cnYje+1oWZRpf5vDcchOA== X-UI-Out-Filterresults: notjunk:1;V03:K0:kE7iPQC3Dqk=:Gp12VuHmF8Zu7T0sms0h1g P5vdVg2fOGdaqotczCDLksLKURbcYI492MBEzKBwV06uRdXF72lxs+EWuYN6xNm9Tri4jopDT zuURX/KzExMAD+PXWDrACW4cF62Wpzi0tnGl9ztX6R0kSwlp+PSEkAM9EwVUe51LYC1vLtqJw H1y1tUoV2bM5yvbSbDo4W1Q84TNFPzYXjRthYW7knQaNnLjh3mPvwkOMF5z3te1Xc04Lyng+Q PArxde7rBSdFVdy+PLfqiwWMx3b3F/SywOYcwmaKZzFUiSRjYGyR5CiGfrQXQplQfvhSP6EJw vKZf1i0ekgCLYRbzdk2M15mRuCCiQZrYFgF/1Hg/kFYJjeTt85fIDF0WKvOgbJB4dIIZAJvGM OFeqORn1gzY3KiU0bQe4e2rRwLXRMLBaOznA7YprQXlB+W65SvHfQovRZfT4cabgcI1qGiFiQ wJdH47wqMnGl3HaHTDNVykJTtTDYkZduB6cn4t5ZAhMhHwjbK9NJiAEEFheV5M1J445rGisYg +gMB6FI45s9hWlpOWxwUt9wQlDh0yPDtNCDmudGMqGzsF5fr+8SPWIyKsDlZxQoxbLzjH4SS1 vwMwCNQ2UGndZSfiJxiUiPwd1sSubhebYWIyJI2th+9wb9bseOUjjjlduAeZakwNZPr5y/JDn a04fDCHet7l239XrpVhoyE1O4kcFRy2K3+A9ORz0fVgruecssxvKqBLKd/E9fYAlJ8oLXXE4s CihVuM/4L579AFAyWWlSJ7vWAZ1vPASWe2PxOwed+J9GvGrBlna2FZXOcw03FyJUqz8RTZfvB ozd48+ZSx4SXUFppxjOpeCtVMm88c27qlj1n6ht4IzNc3GESNVTZlRFPO4lZHF3I6e96E8Y Received-SPF: none client-ip=212.227.126.131; envelope-from=laurent@vivier.eu; helo=mout.kundenserver.de X-detected-operating-system: by eggs.gnu.org: First seen = 2020/09/19 14:45:05 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, 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: Peter Maydell , qemu-trivial@nongnu.org, Michael Tokarev , Richard Henderson , =?utf-8?q?Philippe_Mathie?= =?utf-8?q?u-Daud=C3=A9?= , Laurent Vivier Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Philippe Mathieu-Daudé The max7310_gpio_set() handler is static and only used by qdev_init_gpio_in, initialized with 8 IRQs. The 'line' argument can not be out of the [0-8[ range. Replace the dead code by an assertion. Suggested-by: Peter Maydell Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Richard Henderson Message-Id: <20200910072325.439344-2-f4bug@amsat.org> Signed-off-by: Laurent Vivier --- hw/gpio/max7310.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/hw/gpio/max7310.c b/hw/gpio/max7310.c index 2888d071ac6b..de375892ef11 100644 --- a/hw/gpio/max7310.c +++ b/hw/gpio/max7310.c @@ -8,9 +8,7 @@ */ #include "qemu/osdep.h" -#include "hw/hw.h" #include "hw/i2c/i2c.h" -#include "hw/hw.h" #include "hw/irq.h" #include "migration/vmstate.h" #include "qemu/log.h" @@ -175,8 +173,7 @@ static const VMStateDescription vmstate_max7310 = { static void max7310_gpio_set(void *opaque, int line, int level) { MAX7310State *s = (MAX7310State *) opaque; - if (line >= ARRAY_SIZE(s->handler) || line < 0) - hw_error("bad GPIO line"); + assert(line >= 0 && line < ARRAY_SIZE(s->handler)); if (level) s->level |= s->direction & (1 << line); From patchwork Sat Sep 19 18:44:36 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 1367692 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=vivier.eu Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4Bv0Dk52cRz9sSC for ; Sun, 20 Sep 2020 04:52:06 +1000 (AEST) Received: from localhost ([::1]:49326 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kJhxs-0003mU-IV for incoming@patchwork.ozlabs.org; Sat, 19 Sep 2020 14:52:04 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51774) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kJhrD-0005x5-W3; Sat, 19 Sep 2020 14:45:11 -0400 Received: from mout.kundenserver.de ([212.227.126.134]:42173) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kJhrC-0001JM-Aq; Sat, 19 Sep 2020 14:45:11 -0400 Received: from localhost.localdomain ([82.252.129.222]) by mrelayeu.kundenserver.de (mreue012 [212.227.15.167]) with ESMTPSA (Nemesis) id 1MwjO6-1khPuE0TQQ-00y9Aw; Sat, 19 Sep 2020 20:45:04 +0200 From: Laurent Vivier To: qemu-devel@nongnu.org Subject: [PULL 02/17] hw/ppc/ppc4xx_pci: Replace magic value by the PCI_NUM_PINS definition Date: Sat, 19 Sep 2020 20:44:36 +0200 Message-Id: <20200919184451.2129349-3-laurent@vivier.eu> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200919184451.2129349-1-laurent@vivier.eu> References: <20200919184451.2129349-1-laurent@vivier.eu> MIME-Version: 1.0 X-Provags-ID: V03:K1:h/h2VcDIwTiLg/hBUwZ4awmd4hH1wKdZFS7+HpDwoIumxXIBznn YsFVomvgZ2oevY6URh5oj9G3HP4KUomazxXYArjoFvO98qc9mgqDUjkVtReXwpFFvK8mtRN siBxP4t6Fl+Utib8vBOiCbULvcoBf5C5JEF3UvwtzhPIxiJ2ADVDtlFfFwcygxEPM0gMrAd PAsd38Txln/0syX/0+q6w== X-UI-Out-Filterresults: notjunk:1;V03:K0:ml0MAjfjsk8=:pPHBOo0xFLotnDC52G50bp NCnFlgCavHHtfGYiEOJ8VUvSwXMgLuVU74r7N4DTavgt3Rg2ocgJo6214C0J261nTO5+VK4rf cUdlkhSAZWvbCEuH6y69G+j1fPAWMTtt0z551NOz1Z9QwcaWpFjuMNdmtBCwg+eokkJZx/ZQ/ Oube/cqZquJh0mUjAxaH4l9Vk29yG+lgNQqcfM9abLqb8wOQf70TYuI/st51+X83WKSHYI4s9 hMRzXdmzUc4PSktqx4ScDOnPk/barjG+V/R580WPLJNpzPBQOYEobDMgkfmjO3CytQsbdAAcQ xGeeBfYrtDKv1DzOi8KliiO09ZaLWF1SUBMuOETwbXSR7R3/Ey3eFuufm+8iBpn1jlObioUwX ++nD/J0LasaYO9A+zfR7ew5u0mPlc3gRCC87Y3q7Bo83n4rsx33BQww/9/02hTcZd5Z3fR9GR EvlgNCsBdUmyeM8SL6GXjJPg8JlC+Ts8WwO7E+PqXMnG0TFJ2Upqwiqv3/pqJlihV/Fe6/Ty0 IZ9UIgrjT3K5n48nrr+iNS1IfvkAcVOBBP09ktuTIIBh61OGIdGaMJDSty/21AIpwxE3Wvx5f z6mA9OuddSRnqO8Ts2zR8yMddvlGNfWf9EyChdULFp4zGt21kKEFV/JawygerMIQuBQ80T3rk UroyEKNccIe+DDrv2i4Hab7ccI2+5yM6NeHr7jy/KRN12kLzu/jP3SgkwvlToAhQZQFS1jtWe YsmbfDW5q31vVOuroKfdmrOm2qNeNZ61wawNFV84vtOtIq9ITCUQ/P5wPCwqTXci+NgKJHdyx DbhVLTnQLJ0Rg9SHscnFIxV16GCvA7KwIgZ1hW6ifU4LHYbbX2GS8IRQJgBd69o6n5TG54G Received-SPF: none client-ip=212.227.126.134; envelope-from=laurent@vivier.eu; helo=mout.kundenserver.de X-detected-operating-system: by eggs.gnu.org: First seen = 2020/09/19 14:45:08 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, 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, Michael Tokarev , Richard Henderson , =?utf-8?q?Philippe_Mathie?= =?utf-8?q?u-Daud=C3=A9?= , Laurent Vivier , =?utf-8?q?C=C3=A9dric_Le_Goater?= , David Gibson Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Philippe Mathieu-Daudé Replace the magic '4' value by the PCI_NUM_PINS definition. Suggested-by: Cédric Le Goater Signed-off-by: Philippe Mathieu-Daudé Acked-by: David Gibson Reviewed-by: Richard Henderson Message-Id: <20200910072325.439344-3-f4bug@amsat.org> Signed-off-by: Laurent Vivier --- hw/ppc/ppc4xx_pci.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/ppc/ppc4xx_pci.c b/hw/ppc/ppc4xx_pci.c index c24bac96c32f..ca2553bf8b75 100644 --- a/hw/ppc/ppc4xx_pci.c +++ b/hw/ppc/ppc4xx_pci.c @@ -56,7 +56,7 @@ struct PPC4xxPCIState { struct PCIMasterMap pmm[PPC4xx_PCI_NR_PMMS]; struct PCITargetMap ptm[PPC4xx_PCI_NR_PTMS]; - qemu_irq irq[4]; + qemu_irq irq[PCI_NUM_PINS]; MemoryRegion container; MemoryRegion iomem; From patchwork Sat Sep 19 18:44:37 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 1367689 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=vivier.eu Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4Bv08s1Whqz9sSC for ; Sun, 20 Sep 2020 04:48:45 +1000 (AEST) Received: from localhost ([::1]:42956 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kJhud-0000wS-4v for incoming@patchwork.ozlabs.org; Sat, 19 Sep 2020 14:48:43 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51766) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kJhrC-0005w7-SB; Sat, 19 Sep 2020 14:45:10 -0400 Received: from mout.kundenserver.de ([212.227.126.131]:58959) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kJhrB-0001J8-9B; Sat, 19 Sep 2020 14:45:10 -0400 Received: from localhost.localdomain ([82.252.129.222]) by mrelayeu.kundenserver.de (mreue012 [212.227.15.167]) with ESMTPSA (Nemesis) id 1MgARS-1kxzLz25yI-00hiko; Sat, 19 Sep 2020 20:45:06 +0200 From: Laurent Vivier To: qemu-devel@nongnu.org Subject: [PULL 03/17] ui/spice-input: Remove superfluous forward declaration Date: Sat, 19 Sep 2020 20:44:37 +0200 Message-Id: <20200919184451.2129349-4-laurent@vivier.eu> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200919184451.2129349-1-laurent@vivier.eu> References: <20200919184451.2129349-1-laurent@vivier.eu> MIME-Version: 1.0 X-Provags-ID: V03:K1:s/2tQlUDlhHrBU5GriJw/AgUzsxIKA2LOX7Y7ALvXTNNQ3WDnRx gXlHkaaQJMf5pxYefSYvgWRD2qs06WAw2BFZS1biI+2OMotndLwh3d28qz2ebdLYyx8TyE+ QPkP1dP/t2wJxYZ72Dsk+pankKE7dXK+o3G0137iREWPaf3xihKLQbnsKP1e/vjhLnpW1CM MQrPrJ4pRebFr7sdUJfUA== X-UI-Out-Filterresults: notjunk:1;V03:K0:uONlk90ihh0=:G3iOqUW3ANj1lOQbfr2R1V Cg6JPIlF4wFCL/kb27cGSHNX6bHWp64w4aKvSjp7B0WQf5xE0E5UPOOQmlxCGHHreny1TIIGE F1PDIsWRZr7hWsNQriLY9g1XM6DSZXTIrU+Mdy72NPhLNuLlP6wat4R/pUInKIzmXx5rVzl3K 6WmHS2ZOsZs53yl5k0V/JLgUdXK5jwgDrh3IQwdVzOZwmFBAhzhjs8u/OsSKFxWui6NVOl809 6eXSqYteUnfPdv+LkJLxiWLT6esy1x51VSm7KdZW6vVlNwTw3QjXyH3uJnnk2CmEmyUS8adkv GU4U2DQ85PaEYGminBt7XDwYv28w0bOmJ8pYAo7rqwkTRyRInf+4G04f8t9dwxQJhAMwTaqon BLiQfH+4t8WWouoazpux0phZaoeJSDZYj5q+lRlZRpilu4uKIOp2OeNz3mO2Gj1QLWG1WQTyT Jlh9FrK59kTnoklKfSLmsWe4TEwNFADrosD9YaCz+qsXDI8kaKRPN3fUw4SOBaB/G4ICfHo5n D19W9WbqpTIGCsPL9Dtl62lKyTyZUhOulFCvNYBQtTLkLQW/cDjCYAw0iw2n8Ommsn1/Iz1eW N22dCxOXRE/i/+hOxfudNw/zfnajffjWyHvcrq4oljhZp6n26XkIb9q+xneGZJoDQzGqr8yUd +87xR11xHVBkMVoUH2bU2lS0m05l6Arn6NevHJ0np6Ni/Qph/sxQpb+aFlgyNYwHLfq0CRieF 0wejDi6hRWTXwpgKtwwDd0jlyH/kFfTCpBd9RZFgqDhYUuAWX+gEGNUOwRuFte/I6cjb7lWEx secYcnI6xIYKdSNfv8MNjs3mx7Rm5dXxZhvqrma3/Xl1HOmOlzMsmwJDfuubbXUe3gl46ck Received-SPF: none client-ip=212.227.126.131; envelope-from=laurent@vivier.eu; helo=mout.kundenserver.de X-detected-operating-system: by eggs.gnu.org: First seen = 2020/09/19 14:45:05 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, 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, Michael Tokarev , =?utf-8?q?Phi?= =?utf-8?q?lippe_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 only need to forward-declare kbd_push_key() and kbd_get_leds() which are used in kbd_interface, not kbd_leds(). Remove this superfluous forward declaration. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Laurent Vivier Message-Id: <20200909171145.350360-1-f4bug@amsat.org> Signed-off-by: Laurent Vivier --- ui/spice-input.c | 1 - 1 file changed, 1 deletion(-) diff --git a/ui/spice-input.c b/ui/spice-input.c index d5bba231c95c..21990fa9962b 100644 --- a/ui/spice-input.c +++ b/ui/spice-input.c @@ -36,7 +36,6 @@ typedef struct QemuSpiceKbd { static void kbd_push_key(SpiceKbdInstance *sin, uint8_t frag); static uint8_t kbd_get_leds(SpiceKbdInstance *sin); -static void kbd_leds(void *opaque, int l); static const SpiceKbdInterface kbd_interface = { .base.type = SPICE_INTERFACE_KEYBOARD, From patchwork Sat Sep 19 18:44:38 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 1367695 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=vivier.eu Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4Bv0Hf3v5Dz9sSC for ; Sun, 20 Sep 2020 04:54:38 +1000 (AEST) Received: from localhost ([::1]:56636 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kJi0K-0006ru-F5 for incoming@patchwork.ozlabs.org; Sat, 19 Sep 2020 14:54:36 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51808) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kJhrH-00064Q-G9; Sat, 19 Sep 2020 14:45:15 -0400 Received: from mout.kundenserver.de ([212.227.126.135]:47551) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kJhrE-0001Jy-P1; Sat, 19 Sep 2020 14:45:15 -0400 Received: from localhost.localdomain ([82.252.129.222]) by mrelayeu.kundenserver.de (mreue012 [212.227.15.167]) with ESMTPSA (Nemesis) id 1Mc1hn-1ktscf3Zs7-00dZtP; Sat, 19 Sep 2020 20:45:07 +0200 From: Laurent Vivier To: qemu-devel@nongnu.org Subject: [PULL 04/17] manual: escape backslashes in "parsed-literal" blocks Date: Sat, 19 Sep 2020 20:44:38 +0200 Message-Id: <20200919184451.2129349-5-laurent@vivier.eu> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200919184451.2129349-1-laurent@vivier.eu> References: <20200919184451.2129349-1-laurent@vivier.eu> MIME-Version: 1.0 X-Provags-ID: V03:K1:wPI1deLKipJ0MVkN0jQDEBDM9BgJZTNx61/434YAL3vXKmY6oMM BT2m/djhLnVFvImmGykPq5nvkUW2iQkO/68j38NqQgTTyCcsdtFOSHXksvR4U0kTEV9kBsA XrHjp+DleYd4Bi8FfQZeYebd0mmRFopH3dDKLodXHqZ0Un0iJgtYLGkHuSXzhPWky07XhU2 +SNpPMdPKEjadZTFC7Yfw== X-UI-Out-Filterresults: notjunk:1;V03:K0:BURtelT40JI=:gdu/L9aTFSGV/kqhShxhA0 c/fSpKo8zpLCXCFGoEpBKV/WaI61/9REwvkAKTOSc1hSE/C00fq+2cgpVcxNgcqrkUlzZlFxo MuE4+CFIAtfuW6Vq4YOE6YRg6jwYAw07quKc4AMW2mD/pWiX9qqcWfW/t44Odw2LuszWTzm1p tkRrJT6jpaSlzhbSdkPBqKXsaQCykUG65RTakJkSNmMUon8r1oWDYnZ8ktM34fzS4gmdk1nhh dqrQeUjKEIE6m1Wt+CO8X5PbJAmcH7YZinm5UhaMoXIn6Je0ejqLxTzB5KcQE3uHaaR6s3QpG /Jvgebs2mjFHTjRah8qdWTfyhU0PEdbvho7Ka0wXUTYhawMjMK9dOmwXtGIJdO+cRvtT4u1sX OgsD606+lcDf+mRF1kZHQLqApePyRFknU2c/6Mkc70zWzb7Cn03XFp32YLt/avlZNm/7+ODQn yuXO5a0M/h7AKlFS9smuQy4E+1FGGjYNL7FB3RI0+TdPU6ltDhDcgUg5ebuenbLjXaHfDsoLS 5CeMqdpFFLUkeG5OKnW/pmby6F3fkMspFByFQ7yIAjJXAmi/v7wRSR288l2dcjS3eWcwc4fwY BthtYv8iCMSG8cLkfudDGxcXkzCulR33TFGUptNC/XW9E+iURm1/VR87TiIAshFHqCVnLBvPT 3dttvleEboRU1XsNEQiHKdnWcbj2QwzzPE7GCCmXltGKTCXy5PXrGkqQexcok7/Dex8qqyzdA wCGXX/3UCDMMEf0uMbS6ScZPDcLdxIbJ7MIdxha7Sugr+i9AWNRS0kQTGferc06cwMXb5LVAt bvexQ4LXC6bewnTR7ktHLXv/fLigTiNgPJeRqg36Vs3IUg+GrME5szV/hH/J2ZcjmvQsBko Received-SPF: none client-ip=212.227.126.135; envelope-from=laurent@vivier.eu; helo=mout.kundenserver.de X-detected-operating-system: by eggs.gnu.org: First seen = 2020/09/19 14:45:11 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, 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: Peter Maydell , qemu-trivial@nongnu.org, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Michael Tokarev , Laurent Vivier , Laszlo Ersek Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Laszlo Ersek According to , "inline markup is recognized and there is no protection from parsing. Backslash-escapes may be necessary to prevent unintended parsing". The qemu(1) manual page (formatted with Sphinx 2.2.2) has several overlong lines on my system. A stand-alone backslash at EOL serves as line continuation in a "parsed-literal" block. Therefore, escape the backslashes that we want to appear as such in the formatted documentation. Cc: Peter Maydell Signed-off-by: Laszlo Ersek Reviewed-by: Philippe Mathieu-Daudé Message-Id: <20200908172111.19072-1-lersek@redhat.com> Signed-off-by: Laurent Vivier --- docs/system/device-url-syntax.rst.inc | 8 +- qemu-options.hx | 108 +++++++++++++------------- 2 files changed, 58 insertions(+), 58 deletions(-) diff --git a/docs/system/device-url-syntax.rst.inc b/docs/system/device-url-syntax.rst.inc index 88d7a372a748..6f6ec8366b7a 100644 --- a/docs/system/device-url-syntax.rst.inc +++ b/docs/system/device-url-syntax.rst.inc @@ -25,8 +25,8 @@ These are specified using a special URL syntax. .. parsed-literal:: - |qemu_system| -iscsi initiator-name=iqn.2001-04.com.example:my-initiator \ - -cdrom iscsi://192.0.2.1/iqn.2001-04.com.example/2 \ + |qemu_system| -iscsi initiator-name=iqn.2001-04.com.example:my-initiator \\ + -cdrom iscsi://192.0.2.1/iqn.2001-04.com.example/2 \\ -drive file=iscsi://192.0.2.1/iqn.2001-04.com.example/1 Example (CHAP username/password via URL): @@ -39,8 +39,8 @@ These are specified using a special URL syntax. .. parsed-literal:: - LIBISCSI_CHAP_USERNAME="user" \ - LIBISCSI_CHAP_PASSWORD="password" \ + LIBISCSI_CHAP_USERNAME="user" \\ + LIBISCSI_CHAP_PASSWORD="password" \\ |qemu_system| -drive file=iscsi://192.0.2.1/iqn.2001-04.com.example/1 ``NBD`` diff --git a/qemu-options.hx b/qemu-options.hx index b0f020594eab..47f64be0c041 100644 --- a/qemu-options.hx +++ b/qemu-options.hx @@ -373,9 +373,9 @@ SRST .. parsed-literal:: - |qemu_system| \ - -add-fd fd=3,set=2,opaque="rdwr:/path/to/file" \ - -add-fd fd=4,set=2,opaque="rdonly:/path/to/file" \ + |qemu_system| \\ + -add-fd fd=3,set=2,opaque="rdwr:/path/to/file" \\ + -add-fd fd=4,set=2,opaque="rdonly:/path/to/file" \\ -drive file=/dev/fdset/2,index=0,media=disk ERST @@ -1338,9 +1338,9 @@ SRST .. parsed-literal:: - |qemu_system| \ - -add-fd fd=3,set=2,opaque="rdwr:/path/to/file" \ - -add-fd fd=4,set=2,opaque="rdonly:/path/to/file" \ + |qemu_system| \\ + -add-fd fd=3,set=2,opaque="rdwr:/path/to/file" \\ + -add-fd fd=4,set=2,opaque="rdonly:/path/to/file" \\ -drive file=/dev/fdset/2,index=0,media=disk You can connect a CDROM to the slave of ide0: @@ -2593,7 +2593,7 @@ SRST .. parsed-literal:: - |qemu_system| -hda linux.img -boot n -device e1000,netdev=n1 \ + |qemu_system| -hda linux.img -boot n -device e1000,netdev=n1 \\ -netdev user,id=n1,tftp=/path/to/tftp/files,bootfile=/pxelinux.0 ``smb=dir[,smbserver=addr]`` @@ -2703,15 +2703,15 @@ SRST #launch a QEMU instance with two NICs, each one connected #to a TAP device - |qemu_system| linux.img \ - -netdev tap,id=nd0,ifname=tap0 -device e1000,netdev=nd0 \ + |qemu_system| linux.img \\ + -netdev tap,id=nd0,ifname=tap0 -device e1000,netdev=nd0 \\ -netdev tap,id=nd1,ifname=tap1 -device rtl8139,netdev=nd1 .. parsed-literal:: #launch a QEMU instance with the default network helper to #connect a TAP device to bridge br0 - |qemu_system| linux.img -device virtio-net-pci,netdev=n1 \ + |qemu_system| linux.img -device virtio-net-pci,netdev=n1 \\ -netdev tap,id=n1,"helper=/path/to/qemu-bridge-helper" ``-netdev bridge,id=id[,br=bridge][,helper=helper]`` @@ -2749,12 +2749,12 @@ SRST .. parsed-literal:: # launch a first QEMU instance - |qemu_system| linux.img \ - -device e1000,netdev=n1,mac=52:54:00:12:34:56 \ + |qemu_system| linux.img \\ + -device e1000,netdev=n1,mac=52:54:00:12:34:56 \\ -netdev socket,id=n1,listen=:1234 # connect the network of this instance to the network of the first instance - |qemu_system| linux.img \ - -device e1000,netdev=n2,mac=52:54:00:12:34:57 \ + |qemu_system| linux.img \\ + -device e1000,netdev=n2,mac=52:54:00:12:34:57 \\ -netdev socket,id=n2,connect=127.0.0.1:1234 ``-netdev socket,id=id[,fd=h][,mcast=maddr:port[,localaddr=addr]]`` @@ -2776,16 +2776,16 @@ SRST .. parsed-literal:: # launch one QEMU instance - |qemu_system| linux.img \ - -device e1000,netdev=n1,mac=52:54:00:12:34:56 \ + |qemu_system| linux.img \\ + -device e1000,netdev=n1,mac=52:54:00:12:34:56 \\ -netdev socket,id=n1,mcast=230.0.0.1:1234 # launch another QEMU instance on same "bus" - |qemu_system| linux.img \ - -device e1000,netdev=n2,mac=52:54:00:12:34:57 \ + |qemu_system| linux.img \\ + -device e1000,netdev=n2,mac=52:54:00:12:34:57 \\ -netdev socket,id=n2,mcast=230.0.0.1:1234 # launch yet another QEMU instance on same "bus" - |qemu_system| linux.img \ - -device e1000,netdev=n3,mac=52:54:00:12:34:58 \ + |qemu_system| linux.img \\ + -device e1000,netdev=n3,mac=52:54:00:12:34:58 \\ -netdev socket,id=n3,mcast=230.0.0.1:1234 Example (User Mode Linux compat.): @@ -2793,8 +2793,8 @@ SRST .. parsed-literal:: # launch QEMU instance (note mcast address selected is UML's default) - |qemu_system| linux.img \ - -device e1000,netdev=n1,mac=52:54:00:12:34:56 \ + |qemu_system| linux.img \\ + -device e1000,netdev=n1,mac=52:54:00:12:34:56 \\ -netdev socket,id=n1,mcast=239.192.168.1:1102 # launch UML /path/to/linux ubd0=/path/to/root_fs eth0=mcast @@ -2803,8 +2803,8 @@ SRST .. parsed-literal:: - |qemu_system| linux.img \ - -device e1000,netdev=n1,mac=52:54:00:12:34:56 \ + |qemu_system| linux.img \\ + -device e1000,netdev=n1,mac=52:54:00:12:34:56 \\ -netdev socket,id=n1,mcast=239.192.168.1:1102,localaddr=1.2.3.4 ``-netdev l2tpv3,id=id,src=srcaddr,dst=dstaddr[,srcport=srcport][,dstport=dstport],txsession=txsession[,rxsession=rxsession][,ipv6][,udp][,cookie64][,counter][,pincounter][,txcookie=txcookie][,rxcookie=rxcookie][,offset=offset]`` @@ -2860,9 +2860,9 @@ SRST # Setup tunnel on linux host using raw ip as encapsulation # on 1.2.3.4 - ip l2tp add tunnel remote 4.3.2.1 local 1.2.3.4 tunnel_id 1 peer_tunnel_id 1 \ + ip l2tp add tunnel remote 4.3.2.1 local 1.2.3.4 tunnel_id 1 peer_tunnel_id 1 \\ encap udp udp_sport 16384 udp_dport 16384 - ip l2tp add session tunnel_id 1 name vmtunnel0 session_id \ + ip l2tp add session tunnel_id 1 name vmtunnel0 session_id \\ 0xFFFFFFFF peer_session_id 0xFFFFFFFF ifconfig vmtunnel0 mtu 1500 ifconfig vmtunnel0 up @@ -2872,7 +2872,7 @@ SRST # on 4.3.2.1 # launch QEMU instance - if your network has reorder or is very lossy add ,pincounter - |qemu_system| linux.img -device e1000,netdev=n1 \ + |qemu_system| linux.img -device e1000,netdev=n1 \\ -netdev l2tpv3,id=n1,src=4.2.3.1,dst=1.2.3.4,udp,srcport=16384,dstport=16384,rxsession=0xffffffff,txsession=0xffffffff,counter ``-netdev vde,id=id[,sock=socketpath][,port=n][,group=groupname][,mode=octalmode]`` @@ -4627,8 +4627,8 @@ SRST .. parsed-literal:: - # |qemu_system| \ - -object tls-cipher-suites,id=mysuite0,priority=@SYSTEM \ + # |qemu_system| \\ + -object tls-cipher-suites,id=mysuite0,priority=@SYSTEM \\ -fw_cfg name=etc/edk2/https/ciphers,gen_id=mysuite0 ``-object filter-buffer,id=id,netdev=netdevid,interval=t[,queue=all|rx|tx][,status=on|off][,position=head|tail|id=][,insert=behind|before]`` @@ -4791,10 +4791,10 @@ SRST .. parsed-literal:: - # |qemu_system| \ - [...] \ - -object cryptodev-backend-builtin,id=cryptodev0 \ - -device virtio-crypto-pci,id=crypto0,cryptodev=cryptodev0 \ + # |qemu_system| \\ + [...] \\ + -object cryptodev-backend-builtin,id=cryptodev0 \\ + -device virtio-crypto-pci,id=crypto0,cryptodev=cryptodev0 \\ [...] ``-object cryptodev-vhost-user,id=id,chardev=chardevid[,queues=queues]`` @@ -4810,11 +4810,11 @@ SRST .. parsed-literal:: - # |qemu_system| \ - [...] \ - -chardev socket,id=chardev0,path=/path/to/socket \ - -object cryptodev-vhost-user,id=cryptodev0,chardev=chardev0 \ - -device virtio-crypto-pci,id=crypto0,cryptodev=cryptodev0 \ + # |qemu_system| \\ + [...] \\ + -chardev socket,id=chardev0,path=/path/to/socket \\ + -object cryptodev-vhost-user,id=cryptodev0,chardev=chardev0 \\ + -device virtio-crypto-pci,id=crypto0,cryptodev=cryptodev0 \\ [...] ``-object secret,id=id,data=string,format=raw|base64[,keyid=secretid,iv=string]`` @@ -4892,9 +4892,9 @@ SRST .. parsed-literal:: - # |qemu_system| \ - -object secret,id=secmaster0,format=base64,file=key.b64 \ - -object secret,id=sec0,keyid=secmaster0,format=base64,\ + # |qemu_system| \\ + -object secret,id=secmaster0,format=base64,file=key.b64 \\ + -object secret,id=sec0,keyid=secmaster0,format=base64,\\ data=$SECRET,iv=$( X-Patchwork-Id: 1367688 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=vivier.eu Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4Bv07P5MYSz9sSC for ; Sun, 20 Sep 2020 04:47:29 +1000 (AEST) Received: from localhost ([::1]:38572 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kJhtP-0007YT-NN for incoming@patchwork.ozlabs.org; Sat, 19 Sep 2020 14:47:27 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51820) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kJhrI-00067I-Vg; Sat, 19 Sep 2020 14:45:17 -0400 Received: from mout.kundenserver.de ([212.227.126.187]:36853) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kJhrH-0001LO-85; Sat, 19 Sep 2020 14:45:16 -0400 Received: from localhost.localdomain ([82.252.129.222]) by mrelayeu.kundenserver.de (mreue012 [212.227.15.167]) with ESMTPSA (Nemesis) id 1MRk8w-1juw063jWE-00T9wI; Sat, 19 Sep 2020 20:45:09 +0200 From: Laurent Vivier To: qemu-devel@nongnu.org Subject: [PULL 05/17] meson: remove empty else and duplicated gio deps Date: Sat, 19 Sep 2020 20:44:39 +0200 Message-Id: <20200919184451.2129349-6-laurent@vivier.eu> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200919184451.2129349-1-laurent@vivier.eu> References: <20200919184451.2129349-1-laurent@vivier.eu> MIME-Version: 1.0 X-Provags-ID: V03:K1:4FM30aVi1Iy2LpVXvJqhXl9Xzp+1An/icoKVmYxtnEIPDbtAQgm G7ZqMhVoVZVIgAdCiQ857ceA5ivEJhe96T6XTu/4fJo44lLBwIzRjMoLTLT8ahpP8JNP/jS KpRJEfOcJ3n04zKeuDr6ECD4MQeXEv70agsaD5DfSujAefxnpsTdEwLfl+MEZezuysSeFPQ VyLQLl0jWL9P4FctmYZ/A== X-UI-Out-Filterresults: notjunk:1;V03:K0:9+3S2RkYR7o=:mSWJHHRbpFGOR69LldglEa jmY2KRjFWjhCUxM7AKN7tmxI3lvk5Fuir6c5TH5+TNf4vI1+atDodBBSE/0zPbb0QvUbYVwql r4yaVU1XPR3zGoUaPuefp89eyJexNO5HOjVKXU7emFnH0fcHERe+whg1e7tXGD2Lpsd6JdNsi w0NccCgYKeWdt8F91z0uDjCp89+6YTZ6PzHao11RmZw8obGlXBif/BuK9BBy22/7t8p6qdA3E OtJk6aGB+8STefPntGQatjZMUgjX+4CIYYJkJiWAkADOExRvJMiH7RBtGkX14dAkYhqVVk2sW qSbRzikGhL6ktr7b2auDmNS+LoW4PM4YQQPWDX89JskthFkN04i6fs8WJIV3KawJhjJ7IeXyF W3viQ20YaSY9Qpqvk5BxY2TYcPYFWRhRGpbUxA7VySzKopJGoLfi6GmeXwuiV/4st2w6VBe0R HxTtinVlvbCTMez2+gCPGpV69CJqxdoBI8J6Qd3LLDVA5uBoW/m27odQ0Z0n+26H6c7scbEZm v0t0zI01NaFLga/bUnSDkF0O4LTQq5EdeZ1D2IZhgVhi78PgJLT1KbzWOp6WqY5ZogovgLPRT T/kgcaQr12b+Hh3urxmTAIUfF5aMIJxnvobNeISknTrfLSbyPe1mp1NNeFbbHeIvlNmrA5lFM TYzEOrF6VfBEwlfc/ZL48aTKo/A6fxRKqzzbQoFRS+CRe/qWoEL+pOpuGKH2hXTCeWf8X12Zl gNcCGmDGyNfH+lUwwM3b6jH+mTqJRy8q1izyL9updRSckt8OqXW3XDzJ4d1H3e9YIE5UCfztB 8ReoEXltEU57YN9xcpF5/Z9x+d9K+07DKLvf8TSIC/NTMHHYuPA7bzXwtZAMyiMFa5tkzFN Received-SPF: none client-ip=212.227.126.187; envelope-from=laurent@vivier.eu; helo=mout.kundenserver.de X-detected-operating-system: by eggs.gnu.org: First seen = 2020/09/19 14:45:13 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, 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: Thomas Huth , =?utf-8?q?Daniel_P_=2E_Berrang=C3=A9?= , qemu-trivial@nongnu.org, Michael Tokarev , Laurent Vivier , Yonggang Luo Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Yonggang Luo Signed-off-by: Yonggang Luo Reviewed-by: Daniel P. Berrangé Reviewed-by: Thomas Huth Message-Id: <20200915171234.236-14-luoyonggang@gmail.com> Signed-off-by: Laurent Vivier --- meson.build | 6 ------ 1 file changed, 6 deletions(-) diff --git a/meson.build b/meson.build index bba766b4bc66..f4d1ab109680 100644 --- a/meson.build +++ b/meson.build @@ -317,7 +317,6 @@ opengl = not_found if 'CONFIG_OPENGL' in config_host opengl = declare_dependency(compile_args: config_host['OPENGL_CFLAGS'].split(), link_args: config_host['OPENGL_LIBS'].split()) -else endif gtk = not_found if 'CONFIG_GTK' in config_host @@ -344,11 +343,6 @@ if 'CONFIG_ICONV' in config_host iconv = declare_dependency(compile_args: config_host['ICONV_CFLAGS'].split(), link_args: config_host['ICONV_LIBS'].split()) endif -gio = not_found -if 'CONFIG_GIO' in config_host - gio = declare_dependency(compile_args: config_host['GIO_CFLAGS'].split(), - link_args: config_host['GIO_LIBS'].split()) -endif vnc = not_found png = not_found jpeg = not_found From patchwork Sat Sep 19 18:44:40 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 1367690 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=vivier.eu Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4Bv09556zlz9sSC for ; Sun, 20 Sep 2020 04:48:57 +1000 (AEST) Received: from localhost ([::1]:43220 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kJhup-00012j-Le for incoming@patchwork.ozlabs.org; Sat, 19 Sep 2020 14:48:55 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51846) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kJhrL-0006A9-1A; Sat, 19 Sep 2020 14:45:19 -0400 Received: from mout.kundenserver.de ([212.227.126.130]:40393) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kJhrJ-0001MA-7B; Sat, 19 Sep 2020 14:45:18 -0400 Received: from localhost.localdomain ([82.252.129.222]) by mrelayeu.kundenserver.de (mreue012 [212.227.15.167]) with ESMTPSA (Nemesis) id 1MHEPI-1kFK7y1S3E-00DHk0; Sat, 19 Sep 2020 20:45:11 +0200 From: Laurent Vivier To: qemu-devel@nongnu.org Subject: [PULL 06/17] hw/timer/hpet: Remove unused functions hpet_ram_readb, hpet_ram_readw Date: Sat, 19 Sep 2020 20:44:40 +0200 Message-Id: <20200919184451.2129349-7-laurent@vivier.eu> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200919184451.2129349-1-laurent@vivier.eu> References: <20200919184451.2129349-1-laurent@vivier.eu> MIME-Version: 1.0 X-Provags-ID: V03:K1:+f0CKISPN4I8D1fl8jFmTnvM2m0WQPyQPUNg7uFBXkPVaL5b/I2 nz7ZqSE4jViHlr8m/IKCRbFM0jqUWRH+tlZ0UHWx+rkGtm+yO+v8y2L8vivMq/cpcmrn0j6 ElVNa10od7F/uF/dQJ/4Hu0kYij5dmYZ7amkRG8DFMRuSY66iLjk5YT5wb1CVkmqAufh/aL ld4BVLRtiz8X99O9XCY1A== X-UI-Out-Filterresults: notjunk:1;V03:K0:HJAjLwYZTO4=:gIEKMcDlBNpPAMTKHq8Yny w8QXeiYp/J+2/v2gLsR1VYSX3T4LMDfKjBwY/JHrTtPM64tMnkLpOiL5IDe0kq0yONu1DZl6f XzGwqrYtGYvGzaGeCzOiFQEPvVdyh930A2jo0gChyezjxKfHkdyl0m7fKTLvkShujyfv/+avQ pu1SLA7llw4PNlMeYo6C5nKKJCKEjbvGUoVnnnCtEv11XxU8W0NMqK1nLld+gqdZRlm5TW9Np yL9oqTIhY6Uj3YgXk0NjHcyQhkZX184rgjeL0cwRw/C1qUwCpMNRkm5swqaJ6n3/cgMwt9iCh Fk9Y7AYxCM5fKBmrM+J9ndmNjHPF6cidWu7ljRxtu0LiBr5XkjJ3dlK8gwUy46cP8X8V4N5H/ J+p1o1KN+SAtj4M6ERimTcsdR47SXEVWI41/6MxPBp/ecX83qj8fwOnrIy5yaR+COpsYwIPde dsslxuf3e3r/Vy3Jhen27pGtxItLFC7VEClgpHPjprNsJMx15k8iyPY3KALJQnXQ05sHJJsgp KS0uI8r5imILUmdL6vAeBP+5JDqO60uY2JlkyTlfZ1YSqCm22TWKyCgirNfVvr0H2jVmQbpkA F98cUDVybyDEY138ZzDbVXeYBEBHXnB9mhe4dHBYRVE5b1UYfOXwNKcqYo0l2RBtcrRHowuAf 2m26u9PDVImSc7H16n4cinqMeJjngJ8vjcJE8NcL4Tvk93rIXueWMBApwLV6R7Nla55PDgd0H +5ouY6PxT0P8NMlFTazj5gEQtJseD1U8xiqvB4oEXmlEpY5GIy+C+64f+fafcapg4UxPZ2IyE Z3twavIoHckkOIDL9df96oLTdr9edwECQCsWHyFR46UkUIkEV7jQuCRQQk5jsG7VLREHx7L Received-SPF: none client-ip=212.227.126.130; envelope-from=laurent@vivier.eu; helo=mout.kundenserver.de X-detected-operating-system: by eggs.gnu.org: First seen = 2020/09/19 14:45:03 X-ACL-Warn: Detected OS = Linux 3.11 and newer X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, 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?= , Dov Murik , Michael Tokarev , Laurent Vivier Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Dov Murik Fix compiler error about defined but not used functions when compiling with -DHPET_DEBUG by deleting the unused debug functions hpet_ram_readb and hpet_ram_readw. Signed-off-by: Dov Murik Reviewed-by: Philippe Mathieu-Daudé Message-Id: <20200909083650.46771-2-dovmurik@linux.vnet.ibm.com> Signed-off-by: Laurent Vivier --- hw/timer/hpet.c | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/hw/timer/hpet.c b/hw/timer/hpet.c index 44bbe3a5361e..07ff82b33358 100644 --- a/hw/timer/hpet.c +++ b/hw/timer/hpet.c @@ -419,20 +419,6 @@ static void hpet_del_timer(HPETTimer *t) update_irq(t, 0); } -#ifdef HPET_DEBUG -static uint32_t hpet_ram_readb(void *opaque, hwaddr addr) -{ - printf("qemu: hpet_read b at %" PRIx64 "\n", addr); - return 0; -} - -static uint32_t hpet_ram_readw(void *opaque, hwaddr addr) -{ - printf("qemu: hpet_read w at %" PRIx64 "\n", addr); - return 0; -} -#endif - static uint64_t hpet_ram_read(void *opaque, hwaddr addr, unsigned size) { From patchwork Sat Sep 19 18:44:41 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 1367701 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=vivier.eu Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4Bv0P326rXz9sSC for ; Sun, 20 Sep 2020 04:59:19 +1000 (AEST) Received: from localhost ([::1]:40834 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kJi4r-0003vR-AE for incoming@patchwork.ozlabs.org; Sat, 19 Sep 2020 14:59:17 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51868) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kJhrN-0006EK-Bf; Sat, 19 Sep 2020 14:45:21 -0400 Received: from mout.kundenserver.de ([212.227.126.135]:48803) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kJhrL-0001Nt-9c; Sat, 19 Sep 2020 14:45:20 -0400 Received: from localhost.localdomain ([82.252.129.222]) by mrelayeu.kundenserver.de (mreue012 [212.227.15.167]) with ESMTPSA (Nemesis) id 1M6YEz-1kQZTV3Kiv-0070Dx; Sat, 19 Sep 2020 20:45:13 +0200 From: Laurent Vivier To: qemu-devel@nongnu.org Subject: [PULL 07/17] hw/timer/hpet: Fix debug format strings Date: Sat, 19 Sep 2020 20:44:41 +0200 Message-Id: <20200919184451.2129349-8-laurent@vivier.eu> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200919184451.2129349-1-laurent@vivier.eu> References: <20200919184451.2129349-1-laurent@vivier.eu> MIME-Version: 1.0 X-Provags-ID: V03:K1:CSSWRgZh6JbcXyahwv74b0wDlMXHchcCc40SQ2MSmlbSCjkOzFo 7nivfKBzWtx6v3f/J3GQxfcpkk+chZ1FUVJXL0PqcVBJ0poMvpFPyvno4HTXLOcggZItKQh Ynk/diSRSaEKuKZQ9O08EneM+sORLs53LPWsF9USvK5Wnw3ts8vJK3BZ09SuKZVmS67g/3a EKbtU6IkroH2XQ57bTl2w== X-UI-Out-Filterresults: notjunk:1;V03:K0:HX8wdJf/Q+4=:ppFnfpa1xF62RSms8tATaF UcwqTy1ao4NSAXBEeelyUx2XfUb7lOnzqSx8uH/HJcZCkGShnoaUiRZKATolq91ryRwRBMmQj dSyT+Z0T4cuzfF+ICODBWLv3xFPXh1F3hq5sFxfbchPY+PZSuYEv7YcB35pEsu4KT0SkjOR+O Iootx1XmjEPLhBO47bgnCZbzq/4ZIOO8ABTo2GSq1DZrkAU6NmGE7UAQCMV8QgmoscCxRX8mH +6JphVRHy9xJhAbd2ZXQUEP6Up0OKB49ulMKyaQ0ouYeD6c02YdPMurDuVE4lAJisO2m6QXo4 f+iqi9ORGMpsomjaxDrHQCI31ETZImeGuLlzYmVxQBZf3knmQvc8spdSrN22ynJk0PiPgO5EQ IYu0LdJ2FX9UMETbZ58fWYQ5L90oaqlJV9qnhhw+ycX0g2pN+B5wmgEijEj1JTFz3gHvArHXa 4uMa2l8X0ofDAJFLg9U0RigFE0DvuGggPLH0GjW0WjadDUGoZDemsvkVmYaCv3vWHfHcMGPmj QsA5wrhrwgUD7mAYm4PTjz+LfHGeS+EX5SmuLFa3o8oCyr6xLdhT3WjfPizsIdl2IcRw3G+RO MOBdZV3ymxsobVc/I5otSf6O15v/rZ917+QjgonrcM9L9xaB9dKxdlFX5JyBrMZEjcBbbxYcS gG3MzfSZqKpRI30VCgI7yCcr64afdvhGGkGvEjr5AudH3j599y7hUS4I2nhm8bHqRxIEMsLvM GR0D0bWxowwcJVnpyDM0bnsptauBgKCCLv8V+CW7l+JKFB/ILCwAwGLdhO9N1DUaWBRu1eIH5 p0HSg1RHWJxDkPzDOWbrN7UWTJCAlq4548d2I2OUqsv/vvN+yowC5wWhfRqWPPtTGDUmUVT Received-SPF: none client-ip=212.227.126.135; envelope-from=laurent@vivier.eu; helo=mout.kundenserver.de X-detected-operating-system: by eggs.gnu.org: First seen = 2020/09/19 14:45:11 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, 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?= , Dov Murik , Michael Tokarev , Laurent Vivier Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Dov Murik Fix compiler errors when compiling with -DHPET_DEBUG due to mismatch between format string token "%x" and the argument type uint64_t. Also "%#x" is replaced by "0x%" PRIx64 according to the coding style. Signed-off-by: Dov Murik Reviewed-by: Philippe Mathieu-Daudé Message-Id: <20200909083650.46771-3-dovmurik@linux.vnet.ibm.com> Signed-off-by: Laurent Vivier --- hw/timer/hpet.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/hw/timer/hpet.c b/hw/timer/hpet.c index 07ff82b33358..edaa5a0adfb5 100644 --- a/hw/timer/hpet.c +++ b/hw/timer/hpet.c @@ -498,7 +498,8 @@ static void hpet_ram_write(void *opaque, hwaddr addr, HPETState *s = opaque; uint64_t old_val, new_val, val, index; - DPRINTF("qemu: Enter hpet_ram_writel at %" PRIx64 " = %#x\n", addr, value); + DPRINTF("qemu: Enter hpet_ram_writel at %" PRIx64 " = 0x%" PRIx64 "\n", + addr, value); index = addr; old_val = hpet_ram_read(opaque, addr, 4); new_val = value; @@ -508,7 +509,7 @@ static void hpet_ram_write(void *opaque, hwaddr addr, uint8_t timer_id = (addr - 0x100) / 0x20; HPETTimer *timer = &s->timer[timer_id]; - DPRINTF("qemu: hpet_ram_writel timer_id = %#x\n", timer_id); + DPRINTF("qemu: hpet_ram_writel timer_id = 0x%x\n", timer_id); if (timer_id > s->num_timers) { DPRINTF("qemu: timer id out of range\n"); return; @@ -640,8 +641,8 @@ static void hpet_ram_write(void *opaque, hwaddr addr, } s->hpet_counter = (s->hpet_counter & 0xffffffff00000000ULL) | value; - DPRINTF("qemu: HPET counter written. ctr = %#x -> %" PRIx64 "\n", - value, s->hpet_counter); + DPRINTF("qemu: HPET counter written. ctr = 0x%" PRIx64 " -> " + "%" PRIx64 "\n", value, s->hpet_counter); break; case HPET_COUNTER + 4: if (hpet_enabled(s)) { @@ -649,8 +650,8 @@ static void hpet_ram_write(void *opaque, hwaddr addr, } s->hpet_counter = (s->hpet_counter & 0xffffffffULL) | (((uint64_t)value) << 32); - DPRINTF("qemu: HPET counter + 4 written. ctr = %#x -> %" PRIx64 "\n", - value, s->hpet_counter); + DPRINTF("qemu: HPET counter + 4 written. ctr = 0x%" PRIx64 " -> " + "%" PRIx64 "\n", value, s->hpet_counter); break; default: DPRINTF("qemu: invalid hpet_ram_writel\n"); From patchwork Sat Sep 19 18:44:42 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 1367698 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=vivier.eu Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4Bv0Ls0Q7Cz9sSC for ; Sun, 20 Sep 2020 04:57:25 +1000 (AEST) Received: from localhost ([::1]:34712 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kJi31-0001Ez-22 for incoming@patchwork.ozlabs.org; Sat, 19 Sep 2020 14:57:23 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51860) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kJhrM-0006Cm-5H; Sat, 19 Sep 2020 14:45:20 -0400 Received: from mout.kundenserver.de ([212.227.126.135]:60969) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kJhrK-0001Mr-9e; Sat, 19 Sep 2020 14:45:19 -0400 Received: from localhost.localdomain ([82.252.129.222]) by mrelayeu.kundenserver.de (mreue012 [212.227.15.167]) with ESMTPSA (Nemesis) id 1MDN3O-1k9IWV25o6-00AWak; Sat, 19 Sep 2020 20:45:13 +0200 From: Laurent Vivier To: qemu-devel@nongnu.org Subject: [PULL 08/17] scripts/git.orderfile: Display meson files along with buildsys ones Date: Sat, 19 Sep 2020 20:44:42 +0200 Message-Id: <20200919184451.2129349-9-laurent@vivier.eu> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200919184451.2129349-1-laurent@vivier.eu> References: <20200919184451.2129349-1-laurent@vivier.eu> MIME-Version: 1.0 X-Provags-ID: V03:K1:A+6bhBMoofjtXKS/JB+fhDqaqGPu2KXHJ17i68ULWgL4QXv03tp zIobRMpTJmNnx+vI0eCugUhvwBLD2NOHkl+1yNgPco3kNlhPYVsONYNGehGkcGFA2UThLzc 96gsnO34xrZyGiP4ItRx2J0AUURnZHobmmH9HedaUIjCZlpfDeKIylOUaiO6jpIy9CdnHi+ U2ewdp4RGhx4lHl6oDQgw== X-UI-Out-Filterresults: notjunk:1;V03:K0:Y6zqzLSkU60=:UakqP4WPN9wUIwZxyyYNN1 I9AW+zwa3c1qWEwqV6nf1YciYzQQyJkdVnD4JlK8j/acv5mVPJiRfnDGNaJttBhBrZAf3PPxx upETvTCPFSpCH+h3ds/ePd9L4N2jFF/+j+Yf8LKFhIrn1EgEZeraustYIbc9BwwhxCA1lFtPM F8tJpOV9Co7rJVmCcM+OkYCziJxSwPBB1Eql1O/hIkr6AZ0YiAPsVvsrnGcNZmcsm9Iekorzn Ib4S8uWcWPkz7M639mnFjNP7Jl+L7QLKrFaFNqh/u+fM5VcRFP3x02B2skECWkUREHefgUYRc TlLOXw3MO+S3WHQ6PQW266YygkgTSbPBYbrBTr7MuwtOQ2KCKb7Z7DHIgJFEJDQrsYF1ViYdf iqNiWjnzxlTPFjHxL+hn36nb/rd7GAwDjANfYQw1ycmDc9d1v5kwneicyZn6LqhuBDyV+iPo0 bpa2Q6HAmvHKUFAhRhQ9spqtY7Fd1ABE4f3rbu575vsMNSWnK0lwdXjgoUUZ1AjixCf99TrRB z30JPnYO2bXuqPXaqtAh5E8kIKs5s34/m7bKiEV/y52Bm499SUgkZRCp67MfJKygUhxMFtrnV HnRQUtTDx0iV1dINhyWQxHhWb+n/pfsiVZ5Sg4SxKj5jiD5KiWNyVhd9umWTZig3Hi8G2Agur PJCo9W84rQ38upCKsdId27cW4CGtu3p9Y1t43xH7YBAp2vXsuPnRvEvmJOOrOrUgZmFj2uAv4 /wwpyIHfJ8XqR4AfPKgNUAeRQPCwz8WluJuM/BU6ojS2YaISKuWHZN6X3/K3URPWkL0rbRd5D XO4zxT708YLBBe4vAsGfqVQg/YHhGeDEqdNvvg7ijE7Fl+nMCe/uFhLgeqVrBTZji7aMMyD Received-SPF: none client-ip=212.227.126.135; envelope-from=laurent@vivier.eu; helo=mout.kundenserver.de X-detected-operating-system: by eggs.gnu.org: First seen = 2020/09/19 14:45:11 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, 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?= , Michael Tokarev , Laurent Vivier , Stefano Garzarella Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Philippe Mathieu-Daudé Since commit a56650518f5 ("configure: integrate Meson in the build system") we replaced many Makefile by Meson files. Adapt the git.orderfile script to display the new file at the same position. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Stefano Garzarella Message-Id: <20200907161222.41915-1-philmd@redhat.com> Signed-off-by: Laurent Vivier --- scripts/git.orderfile | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/git.orderfile b/scripts/git.orderfile index 73fd818d7f3e..a021afc2d517 100644 --- a/scripts/git.orderfile +++ b/scripts/git.orderfile @@ -18,6 +18,7 @@ docs/* configure Makefile* *.mak +meson.build # qapi schema qapi/*.json From patchwork Sat Sep 19 18:44:43 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 1367691 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=vivier.eu Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4Bv0BZ0rcZz9sSn for ; Sun, 20 Sep 2020 04:50:14 +1000 (AEST) Received: from localhost ([::1]:46112 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kJhw4-0002IP-2I for incoming@patchwork.ozlabs.org; Sat, 19 Sep 2020 14:50:12 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51934) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kJhrn-0006M2-SZ; Sat, 19 Sep 2020 14:45:48 -0400 Received: from mout.kundenserver.de ([212.227.126.133]:35761) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kJhrW-0001SS-H8; Sat, 19 Sep 2020 14:45:42 -0400 Received: from localhost.localdomain ([82.252.129.222]) by mrelayeu.kundenserver.de (mreue012 [212.227.15.167]) with ESMTPSA (Nemesis) id 1M6YEz-1kQZTW288P-0070Dx; Sat, 19 Sep 2020 20:45:16 +0200 From: Laurent Vivier To: qemu-devel@nongnu.org Subject: [PULL 09/17] qemu/: fix some comment spelling errors Date: Sat, 19 Sep 2020 20:44:43 +0200 Message-Id: <20200919184451.2129349-10-laurent@vivier.eu> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200919184451.2129349-1-laurent@vivier.eu> References: <20200919184451.2129349-1-laurent@vivier.eu> MIME-Version: 1.0 X-Provags-ID: V03:K1:IwDiWjOEVDYkITSeC/WLI99K4ex7wTlv7iM5iV2yJk4X7FL2IU3 bLtxnVFwlkdrhw+8z1+nodv6A0oU+yPvokmV1UcAezqVXXoVW30NYeSDw6SROTWxNLhFyQB S1JJQLt5n2RHkfDNF7Ly132vvPCWv5TYSL3YNfZm9HpSlgGuwYln5PAjn1nT1g1rsG4ccAY sCisi/D1dk1Smt3tQFw2A== X-UI-Out-Filterresults: notjunk:1;V03:K0:s/P0RJesICY=:6ZGn6HWJ01u6i/2CvOVVyS tN7+dXu1xOYxusas4EfxtPXdpqP9LwG9oCmNrOF+RyfUDV2OLL77G+q5tPlf03okzVFJVniDV WFRDaf3kOqGU+qlMBU+SGqQ9AKVy+qWpr3/nkC0Ze5ODQ6nVO8tb94CBSmN6EddE+oXA2CnBw RdsZlZcPAn64NdttAHlriVyJ3dVUUqC0QgOwMhES3sesdB+rU4232aYfyOWPmqi+N3yw4jUxJ pS7ha0t8N8aGZfry0GyMPvVrWoFxoC4vPWyXnAPtPPTDDdAuxW1Mn2TlmhwY8Lm2pmOoqgRSd FEJzlyNzKHhfi9gjoKk4xb4UoMeykB+K5VhXA5/Ay3SzMUh0AjJsZEYc42wMn4oDezSi/gONP VjJOHQXdPnDFef9TGmaOUXWR7SZ3nvLpkAEAcGG+KgYO92t52bk63sh9uSpNOH55dl9aSNcC8 vRo7JeMwxsFXwFr8i55s9+dFxWRQ7T9W2Ns94h8A+NfJM8mg1eTGnq+duZVd7dywgnOTclhKM xiTYxMFprj00yg2U2AfgSOJ21jK3edPRMXVA4CPTR2Am9iSVlFF7+rv1iATvWVLswbFbQIXiT wWTIDIwTsdriqUGkm7Y76Ww+euvv+Tb9sOf0GWXqQq8xGv0HI2GnEDVPnl8X8oFeWbnQ9rCrW EQ+EaWqBZXQTrKvt7hRChcb5CT6ZnyZF332+YZRCP9VAMCp/0RpsBagCBhOxfeX5Aq6I6kgvu u795K2j/RVFC/nY4PiKS8gXQdWPRF4nKnH8z+84KMLSshgx2w1bkAN7XViem8BIngOXW3xBFA xwbqO0VhxlU+gz+zF+U1aQqsXDzn5PD1r2KRN8lsKMl0CVasgozZa1PdbJWAmjK2X2VfVhS Received-SPF: none client-ip=212.227.126.133; envelope-from=laurent@vivier.eu; helo=mout.kundenserver.de X-detected-operating-system: by eggs.gnu.org: First seen = 2020/09/19 14:45:28 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, 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, Alex Bennee , zhaolichang , Michael Tokarev , Laurent Vivier Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: zhaolichang I found that there are many spelling errors in the comments of qemu, so I used the spellcheck tool to check the spelling errors and finally found some spelling errors in the folder. Signed-off-by: zhaolichang Reviewed-by: Alex Bennee Message-Id: <20200917075029.313-2-zhaolichang@huawei.com> Signed-off-by: Laurent Vivier --- Changelog | 2 +- accel/tcg/user-exec.c | 2 +- audio/audio.c | 2 +- block.c | 2 +- configure | 2 +- fsdev/virtfs-proxy-helper.c | 2 +- hmp-commands.hx | 2 +- libdecnumber/decNumber.c | 2 +- qemu-img.c | 2 +- qobject/qdict.c | 2 +- scsi/pr-manager-helper.c | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/Changelog b/Changelog index 4a90bb9e8b05..f7e178ccc018 100644 --- a/Changelog +++ b/Changelog @@ -241,7 +241,7 @@ version 0.8.0: version 0.7.2: - x86_64 fixes (Win2000 and Linux 2.6 boot in 32 bit) - - merge self modifying code handling in dirty ram page mecanism. + - merge self modifying code handling in dirty ram page mechanism. - MIPS fixes (Ralf Baechle) - better user net performances diff --git a/accel/tcg/user-exec.c b/accel/tcg/user-exec.c index bb039eb32d67..5c96819dedd4 100644 --- a/accel/tcg/user-exec.c +++ b/accel/tcg/user-exec.c @@ -88,7 +88,7 @@ static inline int handle_cpu_signal(uintptr_t pc, siginfo_t *info, * use that value directly. Within cpu_restore_state_from_tb, we * assume PC comes from GETPC(), as used by the helper functions, * so we adjust the address by -GETPC_ADJ to form an address that - * is within the call insn, so that the address does not accidentially + * is within the call insn, so that the address does not accidentally * match the beginning of the next guest insn. However, when the * pc comes from the signal frame it points to the actual faulting * host memory insn and not the return from a call insn. diff --git a/audio/audio.c b/audio/audio.c index ce8c6dec5f47..1a68cfaafb9f 100644 --- a/audio/audio.c +++ b/audio/audio.c @@ -1674,7 +1674,7 @@ static AudioState *audio_init(Audiodev *dev, const char *name) head = audio_handle_legacy_opts(); /* * In case of legacy initialization, all Audiodevs in the list will have - * the same configuration (except the driver), so it does't matter which + * the same configuration (except the driver), so it doesn't matter which * one we chose. We need an Audiodev to set up AudioState before we can * init a driver. Also note that dev at this point is still in the * list. diff --git a/block.c b/block.c index 9538af488459..11ab55f80b00 100644 --- a/block.c +++ b/block.c @@ -2602,7 +2602,7 @@ static void bdrv_replace_child_noperm(BdrvChild *child, /* * Updates @child to change its reference to point to @new_bs, including - * checking and applying the necessary permisson updates both to the old node + * checking and applying the necessary permission updates both to the old node * and to @new_bs. * * NULL is passed as @new_bs for removing the reference before freeing @child. diff --git a/configure b/configure index ce27eafb0a9e..c74d79bfbc24 100755 --- a/configure +++ b/configure @@ -3411,7 +3411,7 @@ EOF xfs="yes" else if test "$xfs" = "yes" ; then - feature_not_found "xfs" "Instal xfsprogs/xfslibs devel" + feature_not_found "xfs" "Install xfsprogs/xfslibs devel" fi xfs=no fi diff --git a/fsdev/virtfs-proxy-helper.c b/fsdev/virtfs-proxy-helper.c index de061a8a0eaa..15c0e79b067b 100644 --- a/fsdev/virtfs-proxy-helper.c +++ b/fsdev/virtfs-proxy-helper.c @@ -518,7 +518,7 @@ static void statfs_to_prstatfs(ProxyStatFS *pr_stfs, struct statfs *stfs) /* * Gets stat/statfs information and packs in out_iovec structure - * on success returns number of bytes packed in out_iovec struture + * on success returns number of bytes packed in out_iovec structure * otherwise returns -errno */ static int do_stat(int type, struct iovec *iovec, struct iovec *out_iovec) diff --git a/hmp-commands.hx b/hmp-commands.hx index 60f395c276d9..27c4bbe0f2fc 100644 --- a/hmp-commands.hx +++ b/hmp-commands.hx @@ -1267,7 +1267,7 @@ ERST }, SRST ``drive_backup`` - Start a point-in-time copy of a block device to a specificed target. + Start a point-in-time copy of a block device to a specified target. ERST { diff --git a/libdecnumber/decNumber.c b/libdecnumber/decNumber.c index 8c197023f456..1ffe458ad837 100644 --- a/libdecnumber/decNumber.c +++ b/libdecnumber/decNumber.c @@ -5626,7 +5626,7 @@ static const uShort LNnn[90] = { /* would certainly save at least one if it were made ten times */ /* bigger, too (for truncated fractions 0.100 through 0.999). */ /* However, for most practical evaluations, at least four or five */ -/* iterations will be neede -- so this would only speed up by */ +/* iterations will be needed -- so this would only speed up by */ /* 20-25% and that probably does not justify increasing the table */ /* size. */ /* */ diff --git a/qemu-img.c b/qemu-img.c index 1d8c5cd778c0..3b7700c780d8 100644 --- a/qemu-img.c +++ b/qemu-img.c @@ -1188,7 +1188,7 @@ static int64_t find_nonzero(const uint8_t *buf, int64_t n) * 'pnum' is set to the number of sectors (including and immediately following * the first one) that are known to be in the same allocated/unallocated state. * The function will try to align the end offset to alignment boundaries so - * that the request will at least end aligned and consequtive requests will + * that the request will at least end aligned and consecutive requests will * also start at an aligned offset. */ static int is_allocated_sectors(const uint8_t *buf, int n, int *pnum, diff --git a/qobject/qdict.c b/qobject/qdict.c index 526de54ceba9..1079bd3f6f68 100644 --- a/qobject/qdict.c +++ b/qobject/qdict.c @@ -33,7 +33,7 @@ QDict *qdict_new(void) } /** - * tdb_hash(): based on the hash agorithm from gdbm, via tdb + * tdb_hash(): based on the hash algorithm from gdbm, via tdb * (from module-init-tools) */ static unsigned int tdb_hash(const char *name) diff --git a/scsi/pr-manager-helper.c b/scsi/pr-manager-helper.c index d735b1e7f6bb..685ce7f92d22 100644 --- a/scsi/pr-manager-helper.c +++ b/scsi/pr-manager-helper.c @@ -127,7 +127,7 @@ static int pr_manager_helper_initialize(PRManagerHelper *pr_mgr, qio_channel_set_delay(QIO_CHANNEL(sioc), false); pr_mgr->ioc = QIO_CHANNEL(sioc); - /* A simple feature negotation protocol, even though there is + /* A simple feature negotiation protocol, even though there is * no optional feature right now. */ r = pr_manager_helper_read(pr_mgr, &flags, sizeof(flags), errp); From patchwork Sat Sep 19 18:44:44 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 1367699 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=vivier.eu Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4Bv0M674FVz9sSC for ; Sun, 20 Sep 2020 04:57:38 +1000 (AEST) Received: from localhost ([::1]:35892 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kJi3E-0001oS-V0 for incoming@patchwork.ozlabs.org; Sat, 19 Sep 2020 14:57:36 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:52050) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kJhs0-0006Zx-E7; Sat, 19 Sep 2020 14:46:00 -0400 Received: from mout.kundenserver.de ([212.227.126.130]:60901) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kJhrw-0001St-Rt; Sat, 19 Sep 2020 14:46:00 -0400 Received: from localhost.localdomain ([82.252.129.222]) by mrelayeu.kundenserver.de (mreue012 [212.227.15.167]) with ESMTPSA (Nemesis) id 1MCXhr-1kAfR02sHz-009h6x; Sat, 19 Sep 2020 20:45:18 +0200 From: Laurent Vivier To: qemu-devel@nongnu.org Subject: [PULL 10/17] migration/: fix some comment spelling errors Date: Sat, 19 Sep 2020 20:44:44 +0200 Message-Id: <20200919184451.2129349-11-laurent@vivier.eu> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200919184451.2129349-1-laurent@vivier.eu> References: <20200919184451.2129349-1-laurent@vivier.eu> MIME-Version: 1.0 X-Provags-ID: V03:K1:Nn2mBXx8oZiaSj79ijuEvTQoywxApOhaT/yDwxJdeE7ptfW2nnp X7pbpvKfeSonaOgczdjBr/kpHEaUWYOrv7k3O8XBRPhgm4Mash1KVlM7NkXLKfioYias6ap 7nwjLXyRVsDxNJh8DkKD5IDa07noRjCGvSmxFHEYx+eHBJf77F731BiWnf9hqeJ3pj/bADp Ggkp5HeLth8cyI9VRS2xw== X-UI-Out-Filterresults: notjunk:1;V03:K0:M980zZuf4Lc=:qLED36jWxTlAgV2vFQVhR5 9kt234b2Dhmxe/lc6lJZ9t5ovCWYoO40YxZWk3nWynKN01L8i+yaehnJECrzmgoDMJVGX7IM0 13PUb6d8RfdtDCCzYdGI3UjHdyfU4hCz3LXmHVai+3Bso9+FXawy3AGvu6l5jkvsRWA2rZgO8 Zey5O4iZQ4Lp87NQtHnFL9FZOZ+DQEwN7uuQLZXy+PWA9XW5eJz164m0AlmR5+QQgE09Z6eqT 5JnPuaEtAaC2w6uzl5soYf9IRW/uGXf7ee4EfVxZLY09XUL83HfD5IvKw8T9LnT5yZZlOwh9Z GYqk1Al7Sqspyj5E9SxsHx8oiYT6omkHsukKdmhq2nyXMs5dEPdwpJ4fzlZmTyeKnGViE+/84 CGYKJ0bQho56WqIALGaQ6GiLLkEeEZ6petj9bXolc0lMBPsiBuo1XE1PVcTnryUbKo+5rOCPf EWgSU2F/d34NstmP8Wrv+f27ypITHP3YDDYr6qoDOavrNlHDfAB53cXjZTqHN2ynpTbp0Zp8t pwfFwpgoNlHyd5c5jMwXdQ//havIxgA5a4aENaQdOOJjtkQU9hwhm0zscW/jolc6PMD6BaGTP tzkemOcl2+e/77OTqQFR/t2Td/szBREFWpzmOfotuP7MJNbXrkwAZLO70Fyr1vhpAP0GjFaRJ r1PYTFQAXVQEvvLoCj+t9qnkshYI4t1SqC/FhupeJMgEV2lYyQTx9gpOLvf864ioZffIwL/uf iE3IlOvsp/73fXZ/ERGCVH3GQTqhhE0QX+TbCHpz7fXneHVtNNlScMkyQLmFOkfoSVkDNRfPF zzBi4tHcmL6QMzqTquQFU/sg8QjLKIPUeBeNNwbnItiAHmLH0dngF0YrSXXz3gLqL+bq9/U Received-SPF: none client-ip=212.227.126.130; envelope-from=laurent@vivier.eu; helo=mout.kundenserver.de X-detected-operating-system: by eggs.gnu.org: First seen = 2020/09/19 14:45:03 X-ACL-Warn: Detected OS = Linux 3.11 and newer X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, 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, Peter Maydell , zhaolichang , Michael Tokarev , Laurent Vivier Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: zhaolichang I found that there are many spelling errors in the comments of qemu, so I used the spellcheck tool to check the spelling errors and finally found some spelling errors in the migration folder. Signed-off-by: zhaolichang Reviewed-by: Peter Maydell Message-Id: <20200917075029.313-3-zhaolichang@huawei.com> Signed-off-by: Laurent Vivier --- migration/colo-failover.c | 2 +- migration/colo.c | 2 +- migration/multifd.c | 4 ++-- migration/postcopy-ram.c | 4 ++-- migration/postcopy-ram.h | 2 +- migration/ram.c | 10 +++++----- migration/rdma.c | 8 ++++---- migration/savevm.c | 4 ++-- 8 files changed, 18 insertions(+), 18 deletions(-) diff --git a/migration/colo-failover.c b/migration/colo-failover.c index e9ca0b47744b..b717edc8e2f6 100644 --- a/migration/colo-failover.c +++ b/migration/colo-failover.c @@ -46,7 +46,7 @@ void failover_request_active(Error **errp) { if (failover_set_state(FAILOVER_STATUS_NONE, FAILOVER_STATUS_REQUIRE) != FAILOVER_STATUS_NONE) { - error_setg(errp, "COLO failover is already actived"); + error_setg(errp, "COLO failover is already activated"); return; } failover_bh = qemu_bh_new(colo_failover_bh, NULL); diff --git a/migration/colo.c b/migration/colo.c index ea7d1e9d4e7b..80788d46b555 100644 --- a/migration/colo.c +++ b/migration/colo.c @@ -632,7 +632,7 @@ out: /* * It is safe to unregister notifier after failover finished. * Besides, colo_delay_timer and colo_checkpoint_sem can't be - * released befor unregister notifier, or there will be use-after-free + * released before unregister notifier, or there will be use-after-free * error. */ colo_compare_unregister_notifier(&packets_compare_notifier); diff --git a/migration/multifd.c b/migration/multifd.c index d0441202aae9..ac84a61797f3 100644 --- a/migration/multifd.c +++ b/migration/multifd.c @@ -731,7 +731,7 @@ static void multifd_new_send_channel_async(QIOTask *task, gpointer opaque) qemu_sem_post(&p->sem_sync); /* * Although multifd_send_thread is not created, but main migration - * thread neet to judge whether it is running, so we need to mark + * thread needs to judge whether it is running, so we need to mark * its status. */ p->quit = true; @@ -1042,7 +1042,7 @@ bool multifd_recv_all_channels_created(void) /* * Try to receive all multifd channels to get ready for the migration. - * - Return true and do not set @errp when correctly receving all channels; + * - Return true and do not set @errp when correctly receiving all channels; * - Return false and do not set @errp when correctly receiving the current one; * - Return false and set @errp when failing to receive the current channel. */ diff --git a/migration/postcopy-ram.c b/migration/postcopy-ram.c index 1bb22f2b6cba..baf094ba3a0d 100644 --- a/migration/postcopy-ram.c +++ b/migration/postcopy-ram.c @@ -237,7 +237,7 @@ release_ufd: * request_ufd_features: this function should be called only once on a newly * opened ufd, subsequent calls will lead to error. * - * Returns: true on succes + * Returns: true on success * * @ufd: fd obtained from userfaultfd syscall * @features: bit mask see UFFD_API_FEATURES @@ -807,7 +807,7 @@ static void mark_postcopy_blocktime_end(uintptr_t addr) low_time_offset = get_low_time_offset(dc); /* lookup cpu, to clear it, - * that algorithm looks straighforward, but it's not + * that algorithm looks straightforward, but it's not * optimal, more optimal algorithm is keeping tree or hash * where key is address value is a list of */ for (i = 0; i < smp_cpus; i++) { diff --git a/migration/postcopy-ram.h b/migration/postcopy-ram.h index 9941feb63aa7..6d2b3cf124e8 100644 --- a/migration/postcopy-ram.h +++ b/migration/postcopy-ram.h @@ -161,7 +161,7 @@ struct PostCopyFD { */ void postcopy_register_shared_ufd(struct PostCopyFD *pcfd); void postcopy_unregister_shared_ufd(struct PostCopyFD *pcfd); -/* Call each of the shared 'waker's registerd telling them of +/* Call each of the shared 'waker's registered telling them of * availability of a block. */ int postcopy_notify_shared_wake(RAMBlock *rb, uint64_t offset); diff --git a/migration/ram.c b/migration/ram.c index 76d4fee5d511..c5f36aeae53b 100644 --- a/migration/ram.c +++ b/migration/ram.c @@ -256,7 +256,7 @@ int64_t ramblock_recv_bitmap_send(QEMUFile *file, /* * Always use little endian when sending the bitmap. This is * required that when source and destination VMs are not using the - * same endianess. (Note: big endian won't work.) + * same endianness. (Note: big endian won't work.) */ bitmap_to_le(le_bitmap, block->receivedmap, nbits); @@ -275,7 +275,7 @@ int64_t ramblock_recv_bitmap_send(QEMUFile *file, qemu_put_buffer(file, (const uint8_t *)le_bitmap, size); /* * Mark as an end, in case the middle part is screwed up due to - * some "misterious" reason. + * some "mysterious" reason. */ qemu_put_be64(file, RAMBLOCK_RECV_BITMAP_ENDING); qemu_fflush(file); @@ -718,7 +718,7 @@ static int save_xbzrle_page(RAMState *rs, uint8_t **current_data, /* * Reaching here means the page has hit the xbzrle cache, no matter what * encoding result it is (normal encoding, overflow or skipping the page), - * count the page as encoded. This is used to caculate the encoding rate. + * count the page as encoded. This is used to calculate the encoding rate. * * Example: 2 pages (8KB) being encoded, first page encoding generates 2KB, * 2nd page turns out to be skipped (i.e. no new bytes written to the @@ -3705,7 +3705,7 @@ int ram_dirty_bitmap_reload(MigrationState *s, RAMBlock *block) /* * Note: see comments in ramblock_recv_bitmap_send() on why we - * need the endianess convertion, and the paddings. + * need the endianness conversion, and the paddings. */ local_size = ROUND_UP(local_size, 8); @@ -3743,7 +3743,7 @@ int ram_dirty_bitmap_reload(MigrationState *s, RAMBlock *block) } /* - * Endianess convertion. We are during postcopy (though paused). + * Endianness conversion. We are during postcopy (though paused). * The dirty bitmap won't change. We can directly modify it. */ bitmap_from_le(block->bmap, le_bitmap, nbits); diff --git a/migration/rdma.c b/migration/rdma.c index 1dc563ec3f1b..8f43d69b066d 100644 --- a/migration/rdma.c +++ b/migration/rdma.c @@ -1511,7 +1511,7 @@ static int qemu_rdma_wait_comp_channel(RDMAContext *rdma) } else { /* This is the source side, we're in a separate thread * or destination prior to migration_fd_process_incoming() - * after postcopy, the destination also in a seprate thread. + * after postcopy, the destination also in a separate thread. * we can't yield; so we have to poll the fd. * But we need to be able to handle 'cancel' or an error * without hanging forever. @@ -2268,7 +2268,7 @@ static inline int qemu_rdma_buffer_mergable(RDMAContext *rdma, * chunk, then start a new chunk and flush() the old chunk. * 3. To keep the hardware busy, we also group chunks into batches * and only require that a batch gets acknowledged in the completion - * qeueue instead of each individual chunk. + * queue instead of each individual chunk. */ static int qemu_rdma_write(QEMUFile *f, RDMAContext *rdma, uint64_t block_offset, uint64_t offset, @@ -3150,7 +3150,7 @@ static size_t qemu_rdma_save_page(QEMUFile *f, void *opaque, if (size > 0) { /* * Add this page to the current 'chunk'. If the chunk - * is full, or the page doen't belong to the current chunk, + * is full, or the page doesn't belong to the current chunk, * an actual RDMA write will occur and a new chunk will be formed. */ ret = qemu_rdma_write(f, rdma, block_offset, offset, size); @@ -4103,7 +4103,7 @@ void rdma_start_outgoing_migration(void *opaque, goto err; } - /* RDMA postcopy need a seprate queue pair for return path */ + /* RDMA postcopy need a separate queue pair for return path */ if (migrate_postcopy()) { rdma_return_path = qemu_rdma_data_init(host_port, errp); diff --git a/migration/savevm.c b/migration/savevm.c index 304d98ff7825..ee21e981ba2c 100644 --- a/migration/savevm.c +++ b/migration/savevm.c @@ -2795,7 +2795,7 @@ void qmp_xen_save_devices_state(const char *filename, bool has_live, bool live, if (!has_live) { /* live default to true so old version of Xen tool stack can have a - * successfull live migration */ + * successful live migration */ live = true; } @@ -2818,7 +2818,7 @@ void qmp_xen_save_devices_state(const char *filename, bool has_live, bool live, * "xen-save-devices-state" and in case of migration failure, libxl * would call "cont". * So call bdrv_inactivate_all (release locks) here to let the other - * side of the migration take controle of the images. + * side of the migration take control of the images. */ if (live && !saved_vm_running) { ret = bdrv_inactivate_all(); From patchwork Sat Sep 19 18:44:45 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 1367703 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=vivier.eu Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4Bv0Tc4CS6z9sPB for ; Sun, 20 Sep 2020 05:03:15 +1000 (AEST) Received: from localhost ([::1]:46542 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kJi8e-0006XC-Rr for incoming@patchwork.ozlabs.org; Sat, 19 Sep 2020 15:03:12 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:52058) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kJhs1-0006be-0K; Sat, 19 Sep 2020 14:46:01 -0400 Received: from mout.kundenserver.de ([212.227.126.187]:40667) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kJhrv-0001Sn-O8; Sat, 19 Sep 2020 14:46:00 -0400 Received: from localhost.localdomain ([82.252.129.222]) by mrelayeu.kundenserver.de (mreue012 [212.227.15.167]) with ESMTPSA (Nemesis) id 1MCXhr-1kAfQz204x-009h6x; Sat, 19 Sep 2020 20:45:19 +0200 From: Laurent Vivier To: qemu-devel@nongnu.org Subject: [PULL 11/17] docs/: fix some comment spelling errors Date: Sat, 19 Sep 2020 20:44:45 +0200 Message-Id: <20200919184451.2129349-12-laurent@vivier.eu> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200919184451.2129349-1-laurent@vivier.eu> References: <20200919184451.2129349-1-laurent@vivier.eu> MIME-Version: 1.0 X-Provags-ID: V03:K1:ZYsjorq0LaKROTKoJerbXgBgfcWpvclKRL7wQG7Nw6gsuJl+W/E w37UA0opGze4NJ43HwTBjtFhG7KzZNt9mkxoztRuq8flFCi7+Se0xmfkxjQentRsxNyWC30 0F9C6zwY8tMKY4whEYMu9AwCi0ajQqFoul2jt5f2gqMhYwEEzpC3KByeuA1TjNznLmuZra6 Ys0jxxAxDZtY2QfUowxTA== X-UI-Out-Filterresults: notjunk:1;V03:K0:/CB8XFAxxng=:mv95wnM30OoXs01tKC8kgC t+8xlVP7Y1s6SscePxQHM7DR1xLPz7GZT9YVs+DDSKRRfLUAhAZ99jbJ4lgo+8/s0+ckv/wmV /nuMUYbPE5qRIyWJvZrid1N2c14Ve2zWQiCgWotrtfJldFJmLV7OnYtB35909km3wshslHHXF 0PQPr4sPBrJ2M0bhTZAAsDhuJv9CE3BH5EUhYhd8UamYorzTB45ogh+T39Alb/gU0xuRFb916 AYTAu5IdY8FVds182g1N6jYDwLh1KBatJgTaRn9bgGz1vJiLUCtmsG8fnLjBgqzzAWer4YRqG XbEFu9NK9828twD3J3xNPiXzUK04d0TBCAwKBFwfKxrZzXv6AKko8g+FagSUidB/lWy/0fvux VFZVNT3PnkHK2W5u2nZI+1wNgHB3B0Sf6L7ctxuz9qPtRwJQZ5E6CSIINo3TcvxTpGQqyUpDd 9ZIB5S/yx1psg7vRntuXcJ0Pk4eRSUtFMfJAp6MUvZyven2o5MfQCm8Tly7uk/C5dKXawS5jG r6pgwA0PljuNa+tOmAtZtEjfY/cms6ugD5NomlsE/mdbeDwQzxNdbAOYYORF6PMbDtJMMhh1l iDKWUs77P5FcivVCWT2Bw4YWHi5TQtfhsWHr1N06yv3rmkYUZhvoFKxq+fnuMBpywiJT3nWwT OMXWzL5HuhJCfz4d5FYAcegHjXlCNtiVxs3lMmtlnLgBG1lmmQ54z/texdULcfKDZE6xlckJu zjoKq26e2ahtExaHREypswgiDHskdy/BWA8p+D8ep0oyardjYD5zWDZkrvwF/NN4UlCFrPAyn H9kLgZbM1utDKY9DAT34k4vO9TIVgG7KxPXrZxni4019FB4l5x+H3oBciI6RR4YwkoXsQq/ Received-SPF: none client-ip=212.227.126.187; envelope-from=laurent@vivier.eu; helo=mout.kundenserver.de X-detected-operating-system: by eggs.gnu.org: First seen = 2020/09/19 14:45:13 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_NONE=0.001, T_PDS_OTHER_BAD_TLD=0.01 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, Peter Maydell , zhaolichang , Michael Tokarev , Laurent Vivier Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: zhaolichang I found that there are many spelling errors in the comments of qemu, so I used the spellcheck tool to check the spelling errors and finally found some spelling errors in the docs folder. Signed-off-by: zhaolichang Reviewed-by: Peter Maydell Message-Id: <20200917075029.313-4-zhaolichang@huawei.com> Signed-off-by: Laurent Vivier --- docs/COLO-FT.txt | 6 +++--- docs/devel/blkdebug.txt | 2 +- docs/devel/migration.rst | 2 +- docs/devel/testing.rst | 2 +- docs/devel/tracing.txt | 2 +- docs/interop/bitmaps.rst | 2 +- docs/interop/dbus.rst | 4 ++-- docs/interop/nbd.txt | 2 +- docs/interop/vhost-user-gpu.rst | 2 +- docs/interop/vhost-user.rst | 4 ++-- docs/rdma.txt | 2 +- docs/specs/ppc-spapr-hotplug.txt | 4 ++-- docs/specs/ppc-spapr-xive.rst | 4 ++-- docs/system/arm/aspeed.rst | 2 +- docs/system/deprecated.rst | 8 ++++---- docs/system/target-avr.rst | 4 ++-- docs/tools/virtiofsd.rst | 2 +- 17 files changed, 27 insertions(+), 27 deletions(-) diff --git a/docs/COLO-FT.txt b/docs/COLO-FT.txt index c8e174093566..bc5fb2a1bb5f 100644 --- a/docs/COLO-FT.txt +++ b/docs/COLO-FT.txt @@ -91,7 +91,7 @@ the heartbeat stops responding, the secondary node will trigger a failover as soon as it determines the absence. COLO disk Manager: -When primary VM writes data into image, the colo disk manger captures this data +When primary VM writes data into image, the colo disk manager captures this data and sends it to secondary VM's which makes sure the context of secondary VM's image is consistent with the context of primary VM 's image. For more details, please refer to docs/block-replication.txt. @@ -146,12 +146,12 @@ in test procedure. == Test procedure == Note: Here we are running both instances on the same host for testing, -change the IP Addresses if you want to run it on two hosts. Initally +change the IP Addresses if you want to run it on two hosts. Initially 127.0.0.1 is the Primary Host and 127.0.0.2 is the Secondary Host. == Startup qemu == 1. Primary: -Note: Initally, $imagefolder/primary.qcow2 needs to be copied to all hosts. +Note: Initially, $imagefolder/primary.qcow2 needs to be copied to all hosts. You don't need to change any IP's here, because 0.0.0.0 listens on any interface. The chardev's with 127.0.0.1 IP's loopback to the local qemu instance. diff --git a/docs/devel/blkdebug.txt b/docs/devel/blkdebug.txt index 43d8e8f9c63b..0b0c128d356b 100644 --- a/docs/devel/blkdebug.txt +++ b/docs/devel/blkdebug.txt @@ -62,7 +62,7 @@ Rules support the following attributes: errno - the numeric errno value to return when a request matches this rule. The errno values depend on the host since the numeric values are not - standarized in the POSIX specification. + standardized in the POSIX specification. sector - (optional) a sector number that the request must overlap in order to match this rule diff --git a/docs/devel/migration.rst b/docs/devel/migration.rst index 2eb08624fc36..49112bb27aab 100644 --- a/docs/devel/migration.rst +++ b/docs/devel/migration.rst @@ -625,7 +625,7 @@ It can be issued immediately after migration is started or any time later on. Issuing it after the end of a migration is harmless. Blocktime is a postcopy live migration metric, intended to show how -long the vCPU was in state of interruptable sleep due to pagefault. +long the vCPU was in state of interruptible sleep due to pagefault. That metric is calculated both for all vCPUs as overlapped value, and separately for each vCPU. These values are calculated on destination side. To enable postcopy blocktime calculation, enter following diff --git a/docs/devel/testing.rst b/docs/devel/testing.rst index 196e3bc35eb6..bd64c1bdcdd4 100644 --- a/docs/devel/testing.rst +++ b/docs/devel/testing.rst @@ -471,7 +471,7 @@ the warning. A few important files for suppressing warnings are: tests/tsan/suppressions.tsan - Has TSan warnings we wish to suppress at runtime. -The comment on each supression will typically indicate why we are +The comment on each suppression will typically indicate why we are suppressing it. More information on the file format can be found here: https://github.com/google/sanitizers/wiki/ThreadSanitizerSuppressions diff --git a/docs/devel/tracing.txt b/docs/devel/tracing.txt index 6144d9921bfd..d2160655b4e3 100644 --- a/docs/devel/tracing.txt +++ b/docs/devel/tracing.txt @@ -55,7 +55,7 @@ without any sub-directory path prefix. eg io/channel-buffer.c would do #include "trace.h" To access the 'io/trace.h' file. While it is possible to include a trace.h -file from outside a source files' own sub-directory, this is discouraged in +file from outside a source file's own sub-directory, this is discouraged in general. It is strongly preferred that all events be declared directly in the sub-directory that uses them. The only exception is where there are some shared trace events defined in the top level directory trace-events file. diff --git a/docs/interop/bitmaps.rst b/docs/interop/bitmaps.rst index c20bd37a7971..059ad6792940 100644 --- a/docs/interop/bitmaps.rst +++ b/docs/interop/bitmaps.rst @@ -484,7 +484,7 @@ Bitmaps can generally be modified at any time, but certain operations often only make sense when paired directly with other commands. When a VM is paused, it's easy to ensure that no guest writes occur between individual QMP commands. When a VM is running, this is difficult to accomplish with -individual QMP commands that may allow guest writes to occur inbetween each +individual QMP commands that may allow guest writes to occur between each command. For example, using only individual QMP commands, we could: diff --git a/docs/interop/dbus.rst b/docs/interop/dbus.rst index 76a5bde62534..be596d3f418c 100644 --- a/docs/interop/dbus.rst +++ b/docs/interop/dbus.rst @@ -57,7 +57,7 @@ Depending on the use case, you may choose different scenarios: - Everything the same UID - Convenient for developers - - Improved reliability - crash of one part doens't take + - Improved reliability - crash of one part doesn't take out entire VM - No security benefit over traditional QEMU, unless additional unless additional controls such as SELinux or AppArmor are @@ -87,7 +87,7 @@ For example, to allow only ``qemu`` user to talk to ``qemu-helper`` -dbus-daemon can also perfom SELinux checks based on the security +dbus-daemon can also perform SELinux checks based on the security context of the source and the target. For example, ``virtiofs_t`` could be allowed to send a message to ``svirt_t``, but ``virtiofs_t`` wouldn't be allowed to send a message to ``virtiofs_t``. diff --git a/docs/interop/nbd.txt b/docs/interop/nbd.txt index 45118809618e..f3b3cacc9621 100644 --- a/docs/interop/nbd.txt +++ b/docs/interop/nbd.txt @@ -53,5 +53,5 @@ the operation of that feature. * 2.12: NBD_CMD_BLOCK_STATUS for "base:allocation" * 3.0: NBD_OPT_STARTTLS with TLS Pre-Shared Keys (PSK), NBD_CMD_BLOCK_STATUS for "qemu:dirty-bitmap:", NBD_CMD_CACHE -* 4.2: NBD_FLAG_CAN_MULTI_CONN for sharable read-only exports, +* 4.2: NBD_FLAG_CAN_MULTI_CONN for shareable read-only exports, NBD_CMD_FLAG_FAST_ZERO diff --git a/docs/interop/vhost-user-gpu.rst b/docs/interop/vhost-user-gpu.rst index 688f8b425999..3268bf405ce3 100644 --- a/docs/interop/vhost-user-gpu.rst +++ b/docs/interop/vhost-user-gpu.rst @@ -66,7 +66,7 @@ VhostUserGpuCursorPos :scanout-id: ``u32``, the scanout where the cursor is located -:x/y: ``u32``, the cursor postion +:x/y: ``u32``, the cursor position VhostUserGpuCursorUpdate ^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/docs/interop/vhost-user.rst b/docs/interop/vhost-user.rst index 10e3e3475ed8..988f1541447d 100644 --- a/docs/interop/vhost-user.rst +++ b/docs/interop/vhost-user.rst @@ -464,7 +464,7 @@ the ``VHOST_USER_SET_MEM_TABLE`` request. For invalidation events, the (3), the I/O virtual address and the size. On success, the slave is expected to reply with a zero payload, non-zero otherwise. -The slave relies on the slave communcation channel (see :ref:`Slave +The slave relies on the slave communication channel (see :ref:`Slave communication ` section below) to send IOTLB miss and access failure events, by sending ``VHOST_USER_SLAVE_IOTLB_MSG`` requests to the master with a ``struct vhost_iotlb_msg`` as @@ -1450,7 +1450,7 @@ vhost-user backends can provide various devices & services and may need to be configured manually depending on the use case. However, it is a good idea to follow the conventions listed here when possible. Users, QEMU or libvirt, can then rely on some common -behaviour to avoid heterogenous configuration and management of the +behaviour to avoid heterogeneous configuration and management of the backend programs and facilitate interoperability. Each backend installed on a host system should come with at least one diff --git a/docs/rdma.txt b/docs/rdma.txt index a86e992c8453..49dc9f8bcab4 100644 --- a/docs/rdma.txt +++ b/docs/rdma.txt @@ -261,7 +261,7 @@ qemu_rdma_exchange_send(header, data, optional response header & data): of the connection (described below). All of the remaining command types (not including 'ready') -described above all use the aformentioned two functions to do the hard work: +described above all use the aforementioned two functions to do the hard work: 1. After connection setup, RAMBlock information is exchanged using this protocol before the actual migration begins. This information includes diff --git a/docs/specs/ppc-spapr-hotplug.txt b/docs/specs/ppc-spapr-hotplug.txt index 859d52cce6c8..d4fb2d46d950 100644 --- a/docs/specs/ppc-spapr-hotplug.txt +++ b/docs/specs/ppc-spapr-hotplug.txt @@ -371,7 +371,7 @@ ibm,dynamic-memory This property describes the dynamically reconfigurable memory. It is a property encoded array that has an integer N, the number of LMBs followed -by N LMB list entires. +by N LMB list entries. Each LMB list entry consists of the following elements: @@ -390,7 +390,7 @@ Each LMB list entry consists of the following elements: ibm,dynamic-memory-v2 This property describes the dynamically reconfigurable memory. This is -an alternate and newer way to describe dyanamically reconfigurable memory. +an alternate and newer way to describe dynamically reconfigurable memory. It is a property encoded array that has an integer N (the number of LMB set entries) followed by N LMB set entries. There is an LMB set entry for each sequential group of LMBs that share common attributes. diff --git a/docs/specs/ppc-spapr-xive.rst b/docs/specs/ppc-spapr-xive.rst index 7144347560f1..f47f739e0190 100644 --- a/docs/specs/ppc-spapr-xive.rst +++ b/docs/specs/ppc-spapr-xive.rst @@ -46,7 +46,7 @@ default mode. ``dual`` means that both modes XICS **and** XIVE are supported and if the guest OS supports XIVE, this mode will be selected. -The choosen interrupt mode is activated after a reconfiguration done +The chosen interrupt mode is activated after a reconfiguration done in a machine reset. KVM negotiation @@ -158,7 +158,7 @@ XIVE Device tree properties --------------------------- The properties for the PAPR interrupt controller node when the *XIVE -native exploitation mode* is selected shoud contain: +native exploitation mode* is selected should contain: - ``device_type`` diff --git a/docs/system/arm/aspeed.rst b/docs/system/arm/aspeed.rst index 45f891eb3cad..fe45840fbe15 100644 --- a/docs/system/arm/aspeed.rst +++ b/docs/system/arm/aspeed.rst @@ -72,7 +72,7 @@ Boot options ------------ The Aspeed machines can be started using the -kernel option to load a -Linux kernel or from a firmare image which can be downloaded from the +Linux kernel or from a firmware image which can be downloaded from the OpenPOWER jenkins : https://openpower.xyz/ diff --git a/docs/system/deprecated.rst b/docs/system/deprecated.rst index 0cb8b0142447..808c334fe74d 100644 --- a/docs/system/deprecated.rst +++ b/docs/system/deprecated.rst @@ -79,7 +79,7 @@ Creating sound card devices and vnc without ``audiodev=`` property (since 4.2) When not using the deprecated legacy audio config, each sound card should specify an ``audiodev=`` property. Additionally, when using -vnc, you should specify an ``audiodev=`` propery if you plan to +vnc, you should specify an ``audiodev=`` property if you plan to transmit audio through the VNC protocol. Creating sound card devices using ``-soundhw`` (since 5.1) @@ -111,7 +111,7 @@ Splitting RAM by default between NUMA nodes has the same issues as ``mem`` parameter described above with the difference that the role of the user plays QEMU using implicit generic or board specific splitting rule. Use ``memdev`` with *memory-backend-ram* backend or ``mem`` (if -it's supported by used machine type) to define mapping explictly instead. +it's supported by used machine type) to define mapping explicitly instead. ``-mem-path`` fallback to RAM (since 4.1) ''''''''''''''''''''''''''''''''''''''''' @@ -541,10 +541,10 @@ The ``[hub_id name]`` parameter tuple of the 'hostfwd_add' and Guest Emulator ISAs ------------------- -RISC-V ISA privledge specification version 1.09.1 (removed in 5.1) +RISC-V ISA privilege specification version 1.09.1 (removed in 5.1) '''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''' -The RISC-V ISA privledge specification version 1.09.1 has been removed. +The RISC-V ISA privilege specification version 1.09.1 has been removed. QEMU supports both the newer version 1.10.0 and the ratified version 1.11.0, these should be used instead of the 1.09.1 version. diff --git a/docs/system/target-avr.rst b/docs/system/target-avr.rst index eb5c513cce09..25ab46ef05cc 100644 --- a/docs/system/target-avr.rst +++ b/docs/system/target-avr.rst @@ -10,7 +10,7 @@ xmega6 and xmega7. As for now it supports few Arduino boards for educational and testing purposes. These boards use a ATmega controller, which model is limited to USART & 16-bit -timer devices, enought to run FreeRTOS based applications (like +timer devices, enough to run FreeRTOS based applications (like https://github.com/seharris/qemu-avr-tests/blob/master/free-rtos/Demo/AVR_ATMega2560_GCC/demo.elf ). @@ -30,7 +30,7 @@ AVR cpu telnet localhost 5678 -- Debugging wit GDB debugger:: +- Debugging with GDB debugger:: qemu-system-avr -machine mega2560 -bios demo.elf -s -S diff --git a/docs/tools/virtiofsd.rst b/docs/tools/virtiofsd.rst index e33c81ed41f1..7fe6a87291c2 100644 --- a/docs/tools/virtiofsd.rst +++ b/docs/tools/virtiofsd.rst @@ -76,7 +76,7 @@ Options I/O timeout in seconds. The default depends on cache= option. * writeback|no_writeback - - Enable/disable writeback cache. The cache alows the FUSE client to buffer + Enable/disable writeback cache. The cache allows the FUSE client to buffer and merge write requests. The default is ``no_writeback``. * xattr|no_xattr - From patchwork Sat Sep 19 18:44:46 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 1367696 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=vivier.eu Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4Bv0Hm2Rxcz9sSC for ; Sun, 20 Sep 2020 04:54:44 +1000 (AEST) Received: from localhost ([::1]:57200 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kJi0Q-00076q-8k for incoming@patchwork.ozlabs.org; Sat, 19 Sep 2020 14:54:42 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51960) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kJhrv-0006QV-Cj; Sat, 19 Sep 2020 14:45:56 -0400 Received: from mout.kundenserver.de ([212.227.126.187]:36865) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kJhri-0001Sa-9b; Sat, 19 Sep 2020 14:45:52 -0400 Received: from localhost.localdomain ([82.252.129.222]) by mrelayeu.kundenserver.de (mreue012 [212.227.15.167]) with ESMTPSA (Nemesis) id 1MVrXh-1jsS4z0XG1-00RmE9; Sat, 19 Sep 2020 20:45:20 +0200 From: Laurent Vivier To: qemu-devel@nongnu.org Subject: [PULL 12/17] scripts/: fix some comment spelling errors Date: Sat, 19 Sep 2020 20:44:46 +0200 Message-Id: <20200919184451.2129349-13-laurent@vivier.eu> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200919184451.2129349-1-laurent@vivier.eu> References: <20200919184451.2129349-1-laurent@vivier.eu> MIME-Version: 1.0 X-Provags-ID: V03:K1:ToRF9ijQbLwKLUOyNUID350EhQHEUJaEBCR5GZRbDaA4yqRPpwO +3nZ5HNFcERP19jm/r+HzyJnPqechdUX16e6mh8EqaYu8AhisSuWIkeAAjA1CRINQ0NuEto pQLIul7JnU4+5LXzBUI/YlvC1eJkSG3q1agAsrFQfaJZDgoJikdNrq6HLcqu2IgkLG1A/2O 1VDyQv4pf4gOsvcVtKF8Q== X-UI-Out-Filterresults: notjunk:1;V03:K0:gkVeuz2F/kQ=:wAj3wbq3wtVHME79IbxU8K 2Q3+/WoOtXsvTg5g1P32rwYJguWh6JQ8YY0feKmt3E1s1gUhhjMUaAjh4vex9jzJiv56CC839 y76kv8gBqvMOiHtDP3fgrczW4r6EWUVUppAssZq+gW4lYk7lwGu8jah+YH44ArUatG512vFSb nPwDA604QDsCAYiADazN26M61tWWHnluf1gQvOAdMat8NGkj+zFhMnKDH9h3qiPUls9nstI2J LheGOay3OIdPCq6ZtYOvvbB1qIEyqRSI0dEBeMlb3w4lKU756VWdMC3fjCOu/87t2J8WF5NQr b3fTc3IgiK5Ce49P0JdWHns+8QLFE1uRSAsmAgmhlATKiOh4vNFOqZG2ZZrYjf7iLCwvfFxeW KAZEg/X9/WKQehKH7B1vUMZ4yFgTKHCNZCCNiN8SzwnfxHOIEmxWUurmY42D9vktfBkWSCuse L714LdPxRSkXixHfTSJ36W3d9xfaq2wP61Cl9RZQQCYfVZbmTrWxrUyb9ZgVaFvdcIZ12NIOH L2LrPWJJxd4EuS4QsNumQysIdlKWsdOea/lNyV9KEQwocU3eHa3vfIvknlXbR9tAsHAoUu0zU MFShzWcuSpuWIR/VSae8/rnHZjmmM9XGOG1sgyM4IyLfzMiZr7c0JKSHMys+IYdI8pKNWlFxn VI6axrtdATgkcP2O91ME9WvIwByJ1BcSSvwkX+uYNkBAvIvsprca+RssvKhfU2s0zEgbHXDD2 nCXoTrDBidcufmj2krixTlRTYNbI7AU/tn+07F8+6jvLX6AIbG6OGf4vHOBOirRqoSz/jvy1q gN4tLuw9Mp3GN8skaTL7dyhoJZ136EdlFK5URv8VNuZUyvbr2US8SduuU63URIM60FyGpn8 Received-SPF: none client-ip=212.227.126.187; envelope-from=laurent@vivier.eu; helo=mout.kundenserver.de X-detected-operating-system: by eggs.gnu.org: First seen = 2020/09/19 14:45:13 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, 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, Peter Maydell , zhaolichang , Michael Tokarev , Laurent Vivier Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: zhaolichang I found that there are many spelling errors in the comments of qemu, so I used the spellcheck tool to check the spelling errors and finally found some spelling errors in the scripts folder. Signed-off-by: zhaolichang Reviewed-by: Peter Maydell Message-Id: <20200917075029.313-5-zhaolichang@huawei.com> Signed-off-by: Laurent Vivier --- scripts/checkpatch.pl | 2 +- scripts/clean-header-guards.pl | 2 +- scripts/decodetree.py | 6 +++--- scripts/oss-fuzz/build.sh | 2 +- scripts/tracetool/__init__.py | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl index bd3faa154c36..50910899f2ee 100755 --- a/scripts/checkpatch.pl +++ b/scripts/checkpatch.pl @@ -1870,7 +1870,7 @@ sub process { substr($s, 0, length($c), ''); # Make sure we remove the line prefixes as we have - # none on the first line, and are going to readd them + # none on the first line, and are going to re-add them # where necessary. $s =~ s/\n./\n/gs; diff --git a/scripts/clean-header-guards.pl b/scripts/clean-header-guards.pl index f47d673ad5c5..a6680253b1fa 100755 --- a/scripts/clean-header-guards.pl +++ b/scripts/clean-header-guards.pl @@ -19,7 +19,7 @@ # Does the following: # - Header files without a recognizable header guard are skipped. # - Clean up any untidy header guards in-place. Warn if the cleanup -# renames guard symbols, and explain how to find occurences of these +# renames guard symbols, and explain how to find occurrences of these # symbols that may have to be updated manually. # - Warn about duplicate header guard symbols. To make full use of # this warning, you should clean up *all* headers in one run. diff --git a/scripts/decodetree.py b/scripts/decodetree.py index c02de9865b27..60fd3b5e5f66 100644 --- a/scripts/decodetree.py +++ b/scripts/decodetree.py @@ -94,7 +94,7 @@ def str_indent(c): def str_fields(fields): - """Return a string uniquely identifing FIELDS""" + """Return a string uniquely identifying FIELDS""" r = '' for n in sorted(fields.keys()): r += '_' + n @@ -814,7 +814,7 @@ def parse_generic(lineno, parent_pat, name, toks): arg = None fmt = None for t in toks: - # '&Foo' gives a format an explcit argument set. + # '&Foo' gives a format an explicit argument set. if re.fullmatch(re_arg_ident, t): tt = t[1:] if arg: @@ -903,7 +903,7 @@ def parse_generic(lineno, parent_pat, name, toks): elif not (is_format and width == 0) and width != insnwidth: error(lineno, 'definition has {0} bits'.format(width)) - # Do not check for fields overlaping fields; one valid usage + # Do not check for fields overlapping fields; one valid usage # is to be able to duplicate fields via import. fieldmask = 0 for f in flds.values(): diff --git a/scripts/oss-fuzz/build.sh b/scripts/oss-fuzz/build.sh index d16207eb6726..0c3ca9e06f02 100755 --- a/scripts/oss-fuzz/build.sh +++ b/scripts/oss-fuzz/build.sh @@ -69,7 +69,7 @@ mkdir -p "$DEST_DIR/lib/" # Copy the shared libraries here if ! make "-j$(nproc)" qemu-fuzz-i386; then fatal "Build failed. Please specify a compiler with fuzzing support"\ - "using the \$CC and \$CXX environemnt variables"\ + "using the \$CC and \$CXX environment variables"\ "\nFor example: CC=clang CXX=clang++ $0" fi diff --git a/scripts/tracetool/__init__.py b/scripts/tracetool/__init__.py index 3ccfa1e1163d..3ee54be223c6 100644 --- a/scripts/tracetool/__init__.py +++ b/scripts/tracetool/__init__.py @@ -34,7 +34,7 @@ def error(*lines): def out(*lines, **kwargs): """Write a set of output lines. - You can use kwargs as a shorthand for mapping variables when formating all + You can use kwargs as a shorthand for mapping variables when formatting all the strings in lines. """ lines = [ l % kwargs for l in lines ] From patchwork Sat Sep 19 18:44:47 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 1367693 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=vivier.eu Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4Bv0Fx3MnQz9sSC for ; Sun, 20 Sep 2020 04:53:09 +1000 (AEST) Received: from localhost ([::1]:50970 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kJhyt-0004TB-4G for incoming@patchwork.ozlabs.org; Sat, 19 Sep 2020 14:53:07 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51946) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kJhrs-0006Pq-RS; Sat, 19 Sep 2020 14:45:56 -0400 Received: from mout.kundenserver.de ([212.227.126.133]:51845) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kJhra-0001SW-BM; Sat, 19 Sep 2020 14:45:49 -0400 Received: from localhost.localdomain ([82.252.129.222]) by mrelayeu.kundenserver.de (mreue012 [212.227.15.167]) with ESMTPSA (Nemesis) id 1MidPj-1kw3QF3cff-00fmoJ; Sat, 19 Sep 2020 20:45:21 +0200 From: Laurent Vivier To: qemu-devel@nongnu.org Subject: [PULL 13/17] util/: fix some comment spelling errors Date: Sat, 19 Sep 2020 20:44:47 +0200 Message-Id: <20200919184451.2129349-14-laurent@vivier.eu> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200919184451.2129349-1-laurent@vivier.eu> References: <20200919184451.2129349-1-laurent@vivier.eu> MIME-Version: 1.0 X-Provags-ID: V03:K1:Ehfi+oTY16DeI5q/etW01GO+5fC510ZRrlSNTH42fayL5cZjRix lKScQ9KKLVWiWK7CGPuUxZu6/4KbPcvPt68tkQUc9nzCrKMGTGV/ZaTZqBUaWgsRuwXDteT 3qo1NVyumoxp/cnlIT9ko090ERgkEGg1oIHEYHQv56FwhwaRybXIU/im5QaSMptvFZhjJST zww4f7hNt8utIfYfGIKUw== X-UI-Out-Filterresults: notjunk:1;V03:K0:WXcGPbfjAeA=:F/jG5bojOVhXBhSx3gewrX ViTQUC5MwKQxe4QF6vCvm/WlllY8Wn8BudpKV3/g4oiCCTTL2eOCd+C+j1G1pHXxQY+80njka fTXOPWFvn1xP4n+uqdGgVNCOAfmff0va29VOEdp7mw6F4MqOX0mhDWE+yjKfC5q4URSbiT99b h+VsvJ7DOgIShTMo5pWvWhNKBEAdU60jojdFglxrpmHiIelCbIjMJ2lxEjJZfItCO97M2yblb AVLrmanB/rCtYuzS9XHDA1y+JOFBWCPNH1G1e6Yt5P6ZV+34hxx69dbNSQk00Tf+qGBKmYNPs lsdDU/MYiGR/1vY9snbkS3wp1L2wMkqJuVhogjSkrrXIvEVNRexyeAiHE7x3fR7sfRbm436Gm Ajjf0tfBV38UQYDcX0jeTUY+we1hoF4XchpzjZMGACIy55OURwxFt7XLQjtfeufS4sJ4oAbgR d8+u9UeD9qkFxbB3BsPb/Q1oM3XXH8anHeQmmKqqbxSJoKymB2AjC5vy+llk4KIbOSm5EgNb9 pAf0QR4mSFgrS3ozkLAS8vDq43qoGbPHk9e+k01kjDr07TczZjOazfG+frlseSlbrpe8s+tM0 b9GVvdyqPjHSUz6NTY6iQT/W4iJMbnlAFzUPxH+JmxvRtcqo7obsXp3+o2d+m9Joydu8iSWyP Elfjp/GzhhPQbZxUVqnVgSzG/Y3dDZdGPVyT3vzI5KsLfX34lhhjqoS1djlDd00Xft9IPw+63 QdA3HbKgMPl8NQeUNdCvULcaKXvx1pXUsOA0mbzi3xZ3BLScjcVk1RgxxSVIl3lgp7El4WWPF XU7OslDrfv+8CM/mPy1zqNUZyqOiqHy8E5Jt7f1lOjQQR3SPdL5Vjq4VmV2ag7f9shWCtrT Received-SPF: none client-ip=212.227.126.133; envelope-from=laurent@vivier.eu; helo=mout.kundenserver.de X-detected-operating-system: by eggs.gnu.org: First seen = 2020/09/19 14:45:28 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, 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, Alex Bennee , zhaolichang , Michael Tokarev , Laurent Vivier Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: zhaolichang I found that there are many spelling errors in the comments of qemu, so I used the spellcheck tool to check the spelling errors and finally found some spelling errors in the util folder. Signed-off-by: zhaolichang Reviewed-by: Alex Bennee Message-Id: <20200917075029.313-6-zhaolichang@huawei.com> Signed-off-by: Laurent Vivier --- util/osdep.c | 2 +- util/qemu-progress.c | 2 +- util/qemu-sockets.c | 2 +- util/qemu-thread-win32.c | 2 +- util/qht.c | 2 +- util/trace-events | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/util/osdep.c b/util/osdep.c index 4829c07ff6ed..e50dc2214e36 100644 --- a/util/osdep.c +++ b/util/osdep.c @@ -392,7 +392,7 @@ int qemu_unlink(const char *name) * Set errno if fewer than `count' bytes are written. * * This function don't work with non-blocking fd's. - * Any of the possibilities with non-bloking fd's is bad: + * Any of the possibilities with non-blocking fd's is bad: * - return a short write (then name is wrong) * - busy wait adding (errno == EAGAIN) to the loop */ diff --git a/util/qemu-progress.c b/util/qemu-progress.c index 3c2223c1a21c..20d51f8c128b 100644 --- a/util/qemu-progress.c +++ b/util/qemu-progress.c @@ -131,7 +131,7 @@ void qemu_progress_end(void) /* * Report progress. * @delta is how much progress we made. - * If @max is zero, @delta is an absolut value of the total job done. + * If @max is zero, @delta is an absolute value of the total job done. * Else, @delta is a progress delta since the last call, as a fraction * of @max. I.e. the delta is @delta * @max / 100. This allows * relative accounting of functions which may be a different fraction of diff --git a/util/qemu-sockets.c b/util/qemu-sockets.c index b37d288866c5..99ce2fd5e61e 100644 --- a/util/qemu-sockets.c +++ b/util/qemu-sockets.c @@ -416,7 +416,7 @@ static struct addrinfo *inet_parse_connect_saddr(InetSocketAddress *saddr, /* At least FreeBSD and OS-X 10.6 declare AI_V4MAPPED but * then don't implement it in their getaddrinfo(). Detect - * this and retry without the flag since that's preferrable + * this and retry without the flag since that's preferable * to a fatal error */ if (rc == EAI_BADFLAGS && diff --git a/util/qemu-thread-win32.c b/util/qemu-thread-win32.c index 56a83333da6d..d207b0cb5885 100644 --- a/util/qemu-thread-win32.c +++ b/util/qemu-thread-win32.c @@ -289,7 +289,7 @@ void qemu_event_wait(QemuEvent *ev) ResetEvent(ev->event); /* Tell qemu_event_set that there are waiters. No need to retry - * because there cannot be a concurent busy->free transition. + * because there cannot be a concurrent busy->free transition. * After the CAS, the event will be either set or busy. */ if (atomic_cmpxchg(&ev->value, EV_FREE, EV_BUSY) == EV_SET) { diff --git a/util/qht.c b/util/qht.c index 67e5d5b9163f..b2e020c398d0 100644 --- a/util/qht.c +++ b/util/qht.c @@ -49,7 +49,7 @@ * it anymore. * * Writers check for concurrent resizes by comparing ht->map before and after - * acquiring their bucket lock. If they don't match, a resize has occured + * acquiring their bucket lock. If they don't match, a resize has occurred * while the bucket spinlock was being acquired. * * Related Work: diff --git a/util/trace-events b/util/trace-events index 4e894aa9c38b..24c31803b014 100644 --- a/util/trace-events +++ b/util/trace-events @@ -28,7 +28,7 @@ qemu_file_monitor_add_watch(void *mon, const char *dirpath, const char *filename qemu_file_monitor_remove_watch(void *mon, const char *dirpath, int64_t id) "File monitor %p remove watch dir='%s' id=%" PRId64 qemu_file_monitor_new(void *mon, int fd) "File monitor %p created fd=%d" qemu_file_monitor_enable_watch(void *mon, const char *dirpath, int id) "File monitor %p enable watch dir='%s' id=%u" -qemu_file_monitor_disable_watch(void *mon, const char *dirpath, int id) "Fle monitor %p disable watch dir='%s' id=%u" +qemu_file_monitor_disable_watch(void *mon, const char *dirpath, int id) "File monitor %p disable watch dir='%s' id=%u" qemu_file_monitor_event(void *mon, const char *dirpath, const char *filename, int mask, unsigned int id) "File monitor %p event dir='%s' file='%s' mask=0x%x id=%u" qemu_file_monitor_dispatch(void *mon, const char *dirpath, const char *filename, int ev, void *cb, void *opaque, int64_t id) "File monitor %p dispatch dir='%s' file='%s' ev=%d cb=%p opaque=%p id=%" PRId64 From patchwork Sat Sep 19 18:44:48 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 1367700 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=vivier.eu Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4Bv0Nj3ySSz9sSC for ; Sun, 20 Sep 2020 04:59:01 +1000 (AEST) Received: from localhost ([::1]:39854 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kJi4Z-0003WN-GJ for incoming@patchwork.ozlabs.org; Sat, 19 Sep 2020 14:58:59 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:52046) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kJhs0-0006Yz-0N; Sat, 19 Sep 2020 14:46:00 -0400 Received: from mout.kundenserver.de ([212.227.126.134]:33847) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kJhrv-0001TJ-KI; Sat, 19 Sep 2020 14:45:59 -0400 Received: from localhost.localdomain ([82.252.129.222]) by mrelayeu.kundenserver.de (mreue012 [212.227.15.167]) with ESMTPSA (Nemesis) id 1N7xml-1kWiW10YIF-014yep; Sat, 19 Sep 2020 20:45:22 +0200 From: Laurent Vivier To: qemu-devel@nongnu.org Subject: [PULL 14/17] linux-user/: fix some comment spelling errors Date: Sat, 19 Sep 2020 20:44:48 +0200 Message-Id: <20200919184451.2129349-15-laurent@vivier.eu> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200919184451.2129349-1-laurent@vivier.eu> References: <20200919184451.2129349-1-laurent@vivier.eu> MIME-Version: 1.0 X-Provags-ID: V03:K1:FZMjZbzHZBvKrDOk3b2W0Bk6JJ0AoG5kSVUzhIQWlKSBPX/m28x KQGGoUvo8kEsH4BB8wcAwSxszN1HQUwgmEATqvlOJi9coQlmmyrIc5FBfGfd6WkPuy/+z11 vvYVmF7BYVhBCxJM8W5grcErcZIfAETGvr1s+rQ5rkZhfuu95m6XwF20Dd2+3yZHp8SCi1J lUwFW0hXtTM1m8gxxgSCQ== X-UI-Out-Filterresults: notjunk:1;V03:K0:nPYNp5kxVaY=:E0q+iVY3HiLohnbzOwaKmf m7M7iPF4zMs7BGNqMN5nCpo1mYTrdta4SOLSASZ4BJ17otk9A2Lrz2xQ+FLlBOYaoz3COLLfQ BoWvLRhBsZ6BiZ9xAg1luzed/oFqTzMdwmwQbtaSZuTvAxymodMsrbszdSAIiCR7EO1K8M3Ld Fgn6+QhFv4vHGvkyJryLI4Kt6VzI8OkbQJ2IJNZIeWl9taX/IpMx8SUzQYk9AxEmjDvcUM0D1 cZYjn/loKpAkiQybd6VMxQQJ+NzdtVRp502fev3LcxD1Hn4vmy1HhSBiteowXlDDNIjIqAAec JzSxW0TKmY5Tes7IBH46RRZP2CDGHoIhUyQFSKAFCT/AkjOnREzT3q2rw1yEo5UEEjIb7Tecl Yj2FwWUYmMFlvWJWPPVoSWCRQD+nyh2gtYhX+V4ElLedfAbUN3ESb72paF4OC4MNxsEw3W9Io qFGad+IIZIbh+jatmGWcRfh8bWJPqaW0lo+rBhzhKQmYW5RmMaBJv8T57C+WaoEDCyE+gP7r6 ALw5C+xtO6ZvJfyrQqLWPG/TloD7q3n2gkeI9i+UHOGHEqmyh2fb2ch8kRxY55q88CLlWHGnJ CfQuZQf1GgOO/XwiMI5bB1dSF4b+xkLi87jrpzgT15zZbxdYzt3yCV3mELcxCCycSHPXpY8g3 gZOFpU5XBnB0UqNJBNGwBmykl9Jl4cADA2vzxuFqHA0j26HE4oShvJ7FjCK7zVrXl6y+AmufS t23tsCLA2E+KvYaFTEboIZnr8bgLdAQLCz+B7SVLVtSPPM8eIkJiqNrNBBMBdwLWY51+n7zLJ lhvYBybBys6IZ9+x8slL7xhUaOPnz0VRJxz8ve55EJw6THhX2mtpVf0dAHDYCin+mzbfn1D Received-SPF: none client-ip=212.227.126.134; envelope-from=laurent@vivier.eu; helo=mout.kundenserver.de X-detected-operating-system: by eggs.gnu.org: First seen = 2020/09/19 14:45:08 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, 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, Alex Bennee , zhaolichang , Michael Tokarev , Laurent Vivier Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: zhaolichang I found that there are many spelling errors in the comments of qemu, so I used the spellcheck tool to check the spelling errors and finally found some spelling errors in the linux-user folder. Signed-off-by: zhaolichang Reviewed-by: Alex Bennee Message-Id: <20200917075029.313-7-zhaolichang@huawei.com> Signed-off-by: Laurent Vivier --- linux-user/aarch64/signal.c | 2 +- linux-user/cris/target_syscall.h | 4 ++-- linux-user/flat.h | 2 +- linux-user/flatload.c | 4 ++-- linux-user/host/ppc64/safe-syscall.inc.S | 2 +- linux-user/syscall.c | 4 ++-- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/linux-user/aarch64/signal.c b/linux-user/aarch64/signal.c index cd521ee42d17..d50c1ae58381 100644 --- a/linux-user/aarch64/signal.c +++ b/linux-user/aarch64/signal.c @@ -78,7 +78,7 @@ struct target_sve_context { struct target_aarch64_ctx head; uint16_t vl; uint16_t reserved[3]; - /* The actual SVE data immediately follows. It is layed out + /* The actual SVE data immediately follows. It is laid out * according to TARGET_SVE_SIG_{Z,P}REG_OFFSET, based off of * the original struct pointer. */ diff --git a/linux-user/cris/target_syscall.h b/linux-user/cris/target_syscall.h index d109a6b42a35..19e12814039c 100644 --- a/linux-user/cris/target_syscall.h +++ b/linux-user/cris/target_syscall.h @@ -4,7 +4,7 @@ #define UNAME_MACHINE "cris" #define UNAME_MINIMUM_RELEASE "2.6.32" -/* pt_regs not only specifices the format in the user-struct during +/* pt_regs not only specifies the format in the user-struct during * ptrace but is also the frame format used in the kernel prologue/epilogues * themselves */ @@ -32,7 +32,7 @@ struct target_pt_regs { unsigned long spc; unsigned long ccs; unsigned long srp; - unsigned long erp; /* This is actually the debugged process' PC */ + unsigned long erp; /* This is actually the debugged process's PC */ /* For debugging purposes; saved only when needed. */ unsigned long exs; unsigned long eda; diff --git a/linux-user/flat.h b/linux-user/flat.h index 1e44b3344320..ed518e2013b1 100644 --- a/linux-user/flat.h +++ b/linux-user/flat.h @@ -43,7 +43,7 @@ struct flat_hdr { abi_ulong reloc_count; /* Number of relocation records */ abi_ulong flags; abi_ulong build_date; /* When the program/library was built */ - abi_ulong filler[5]; /* Reservered, set to zero */ + abi_ulong filler[5]; /* Reserved, set to zero */ }; #define FLAT_FLAG_RAM 0x0001 /* load program entirely into RAM */ diff --git a/linux-user/flatload.c b/linux-user/flatload.c index 8fb448f0bf06..14d2999d1537 100644 --- a/linux-user/flatload.c +++ b/linux-user/flatload.c @@ -442,7 +442,7 @@ static int load_flat_file(struct linux_binprm * bprm, indx_len = (indx_len + 15) & ~(abi_ulong)15; /* - * Alloate the address space. + * Allocate the address space. */ probe_guest_base(bprm->filename, 0, text_len + data_len + extra + indx_len); @@ -794,7 +794,7 @@ int load_flt_binary(struct linux_binprm *bprm, struct image_info *info) #error here for (i = MAX_SHARED_LIBS-1; i>0; i--) { if (libinfo[i].loaded) { - /* Push previos first to call address */ + /* Push previous first to call address */ --sp; if (put_user_ual(start_addr, sp)) return -EFAULT; diff --git a/linux-user/host/ppc64/safe-syscall.inc.S b/linux-user/host/ppc64/safe-syscall.inc.S index 8ed73a5b8683..875133173bb6 100644 --- a/linux-user/host/ppc64/safe-syscall.inc.S +++ b/linux-user/host/ppc64/safe-syscall.inc.S @@ -84,7 +84,7 @@ safe_syscall_end: /* code path when we didn't execute the syscall */ 0: addi 3, 0, -TARGET_ERESTARTSYS - ld 14, 16(1) /* restore r14 to its orginal value */ + ld 14, 16(1) /* restore r14 to its original value */ blr .cfi_endproc diff --git a/linux-user/syscall.c b/linux-user/syscall.c index 55ac5c320825..897d20c076ce 100644 --- a/linux-user/syscall.c +++ b/linux-user/syscall.c @@ -481,7 +481,7 @@ _syscall4(int, sys_prlimit64, pid_t, pid, int, resource, #if defined(TARGET_NR_timer_create) -/* Maxiumum of 32 active POSIX timers allowed at any one time. */ +/* Maximum of 32 active POSIX timers allowed at any one time. */ static timer_t g_posix_timers[32] = { 0, } ; static inline int next_free_host_timer(void) @@ -8180,7 +8180,7 @@ static abi_long do_syscall1(void *cpu_env, int num, abi_long arg1, switch(num) { case TARGET_NR_exit: /* In old applications this may be used to implement _exit(2). - However in threaded applictions it is used for thread termination, + However in threaded applications it is used for thread termination, and _exit_group is used for application termination. Do thread termination if we have more then one thread. */ From patchwork Sat Sep 19 18:44:49 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 1367702 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=vivier.eu Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4Bv0Td26h5z9sSf for ; Sun, 20 Sep 2020 05:03:17 +1000 (AEST) Received: from localhost ([::1]:46754 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kJi8h-0006cw-65 for incoming@patchwork.ozlabs.org; Sat, 19 Sep 2020 15:03:15 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:52000) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kJhry-0006Uc-BQ; Sat, 19 Sep 2020 14:45:58 -0400 Received: from mout.kundenserver.de ([212.227.126.135]:47719) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kJhrv-0001T2-Me; Sat, 19 Sep 2020 14:45:57 -0400 Received: from localhost.localdomain ([82.252.129.222]) by mrelayeu.kundenserver.de (mreue012 [212.227.15.167]) with ESMTPSA (Nemesis) id 1MumVX-1kb6Dm2kjr-00rnO7; Sat, 19 Sep 2020 20:45:26 +0200 From: Laurent Vivier To: qemu-devel@nongnu.org Subject: [PULL 15/17] disas/: fix some comment spelling errors Date: Sat, 19 Sep 2020 20:44:49 +0200 Message-Id: <20200919184451.2129349-16-laurent@vivier.eu> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200919184451.2129349-1-laurent@vivier.eu> References: <20200919184451.2129349-1-laurent@vivier.eu> MIME-Version: 1.0 X-Provags-ID: V03:K1:BTJflAAr8RmxrOXvUIfLapFUTFo5ADqXvPsdDBbVMnaqADDkUZt Giz8/eOIhhqkpS9LPQ6HpJMjI8axYHwQzuflWIvnVbyPCjFL4lASAdCdju1cgOttFbQQ7Xx L1Ne5fbMBP88aQCmi257gkS5fVKxcAUcMjTj5w66IxckMrOWJ+6EQpzqKWx07Nc1qX89aPf 4f+VS/uvpQY4I+NZIzy2A== X-UI-Out-Filterresults: notjunk:1;V03:K0:GTZiQbERvRc=:VyDIi8XOob9YryTdpo506z gQyFqPQW91NLOBsk64CmKdjHo58n7eUQLOopbhQIGF6masMGvGg6BcCFbniUkj3cwCr/9LiiD tRiEbwWB/qNZ7jVtFKvknHmS48+kB0Szn5n9m7RiLTI0I/2uFrBCOpfGdP5pohFPbsXSDNga5 Xplt9eNzya+hU6Gi9shCh9hm2FVGbKgxidr9KVKKW5Od87dpP7/51DVFCfiaRgwLJzuhiCul4 lxx/PoGPIIO37YPgXa1vGWUyBooa2CXqZTodGMO5Ijcf7O5tFKVgya77f+vNkeOL+Ogvgc5K2 Swb8ze9zMgayr4sQj92yuOH1SO0HpDHsfJRyxLLBnNxW9k7RpMjB4/hx0aheuU5jNHE2Gh5mH oOcWsx+gt966t40fFYiXwRA6fFV6Rn07UIDatm0cP1QFjACLUzsZad73fI3f27prwjKBKwNP4 /L2cErwZLXsC9+/6Ymm1wfb3fgAo0yviKmZB/FAMtn/9H4WhCxIe6fBKfzHEc0D/mgyfXBHTf cctf170v8ZlbeTCxv9DlF9ONxasPM3pCo4yXIgZv2rUl6GRFwo/Ph5aXxmWQ2ucs7TaWSIu+u dA1R3CLOIh2kH1kbdTBRmH28LGkDT434/9feoqIhUm+bTqGWHIk2mHib3eVFjIBNEnZp0faae 3o8ZqgU5iYZ2YEeDEh+Og0yRQD6HgZiczcQW/s1jZuQzWRlCVV9iSISZ0cVRp27ypFfpAHq1Y zPmiLFIUlrGmGUkebmIit3njOZXdN9T3MsWnJoDXJMNjPrUgPH7M7L/5p5dWoWLMpif+vTd6l dMpfPv5u3lD5E6e3D/lKIFeLmyK0fsXkNrcwI56iQBVVExX2f8Nz8tenFSRRAv08WdMKw2G Received-SPF: none client-ip=212.227.126.135; envelope-from=laurent@vivier.eu; helo=mout.kundenserver.de X-detected-operating-system: by eggs.gnu.org: First seen = 2020/09/19 14:45:11 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, 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?Alex_Benn=C3=A9e?= , zhaolichang , Michael Tokarev , Laurent Vivier Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: zhaolichang I found that there are many spelling errors in the comments of qemu, so I used the spellcheck tool to check the spelling errors and finally found some spelling errors in the disas folder. Signed-off-by: zhaolichang Reviewed-by: Alex Bennée Message-Id: <20200917075029.313-9-zhaolichang@huawei.com> Signed-off-by: Laurent Vivier --- disas/hppa.c | 2 +- disas/m68k.c | 8 ++++---- disas/ppc.c | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/disas/hppa.c b/disas/hppa.c index 2dbd1fc4454e..dcf9a47f3489 100644 --- a/disas/hppa.c +++ b/disas/hppa.c @@ -2021,7 +2021,7 @@ print_insn_hppa (bfd_vma memaddr, disassemble_info *info) fput_fp_reg (GET_FIELD (insn, 6, 10), info); break; - /* 'fA' will not generate a space before the regsiter + /* 'fA' will not generate a space before the register name. Normally that is fine. Except that it causes problems with xmpyu which has no FP format completer. */ diff --git a/disas/m68k.c b/disas/m68k.c index 863409c67ccb..aefaecfbd6cb 100644 --- a/disas/m68k.c +++ b/disas/m68k.c @@ -70,7 +70,7 @@ struct floatformat unsigned int exp_start; unsigned int exp_len; /* Bias added to a "true" exponent to form the biased exponent. It - is intentionally signed as, otherwize, -exp_bias can turn into a + is intentionally signed as, otherwise, -exp_bias can turn into a very large number (e.g., given the exp_bias of 0x3fff and a 64 bit long, the equation (long)(1 - exp_bias) evaluates to 4294950914) instead of -16382). */ @@ -479,7 +479,7 @@ struct m68k_opcode_alias and remaining 3 bits of register shifted 9 bits in first word. Indicate upper/lower in 1 bit shifted 7 bits in second word. Use with `R' or `u' format. - n `m' withouth upper/lower indication. (For M[S]ACx; 4 bits split + n `m' without upper/lower indication. (For M[S]ACx; 4 bits split with MSB shifted 6 bits in first word and remaining 3 bits of register shifted 9 bits in first word. No upper/lower indication is done.) Use with `R' or `u' format. @@ -854,7 +854,7 @@ fetch_arg (unsigned char *buffer, /* Check if an EA is valid for a particular code. This is required for the EMAC instructions since the type of source address determines - if it is a EMAC-load instruciton if the EA is mode 2-5, otherwise it + if it is a EMAC-load instruction if the EA is mode 2-5, otherwise it is a non-load EMAC instruction and the bits mean register Ry. A similar case exists for the movem instructions where the register mask is interpreted differently for different EAs. */ @@ -1080,7 +1080,7 @@ print_indexed (int basereg, /* Returns number of bytes "eaten" by the operand, or return -1 if an invalid operand was found, or -2 if - an opcode tabe error was found. + an opcode table error was found. ADDR is the pc for this arg to be relative to. */ static int diff --git a/disas/ppc.c b/disas/ppc.c index 63e97cfe1da2..02be87819832 100644 --- a/disas/ppc.c +++ b/disas/ppc.c @@ -5226,7 +5226,7 @@ operand_value_powerpc (const struct powerpc_operand *operand, if ((operand->flags & PPC_OPERAND_SIGNED) != 0) { /* BITM is always some number of zeros followed by some - number of ones, followed by some numer of zeros. */ + number of ones, followed by some number of zeros. */ unsigned long top = operand->bitm; /* top & -top gives the rightmost 1 bit, so this fills in any trailing zeros. */ From patchwork Sat Sep 19 18:44:50 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 1367694 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=vivier.eu Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4Bv0GX1ykzz9sSC for ; Sun, 20 Sep 2020 04:53:40 +1000 (AEST) Received: from localhost ([::1]:53220 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kJhzO-0005Rn-6L for incoming@patchwork.ozlabs.org; Sat, 19 Sep 2020 14:53:38 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51964) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kJhrv-0006QX-Mx; Sat, 19 Sep 2020 14:45:56 -0400 Received: from mout.kundenserver.de ([212.227.126.131]:39161) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kJhrq-0001UJ-3z; Sat, 19 Sep 2020 14:45:55 -0400 Received: from localhost.localdomain ([82.252.129.222]) by mrelayeu.kundenserver.de (mreue012 [212.227.15.167]) with ESMTPSA (Nemesis) id 1MgzWP-1kyoJP3uO5-00hRVN; Sat, 19 Sep 2020 20:45:27 +0200 From: Laurent Vivier To: qemu-devel@nongnu.org Subject: [PULL 16/17] qapi/: fix some comment spelling errors Date: Sat, 19 Sep 2020 20:44:50 +0200 Message-Id: <20200919184451.2129349-17-laurent@vivier.eu> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200919184451.2129349-1-laurent@vivier.eu> References: <20200919184451.2129349-1-laurent@vivier.eu> MIME-Version: 1.0 X-Provags-ID: V03:K1:1A5PPQHe8J8WBrP0ysvdQGSXaCtVcCkbVyJEDYTNNjm6fLCf3fR 2rkQF/B/Qemwjmgn9o0h/Idm6aZqNOl5FIx4gnmuuK1VilykXW9m1/RP75cQ/e3KoTWmlk/ R5R0eBc/M0H9tdRgYVj1JSl8t+jHkZznKovwTdXURH//nMzc+I0mfVf5yEOzjWXirt7L5rU zERq0B3p1U1qfNU1JJGcg== X-UI-Out-Filterresults: notjunk:1;V03:K0:k6fzmJmeTQk=:JWfJ79hfOl9VDldrolIK8y n8A+h+VX/PphEIjkVw5orpd9PXMB/l8kMhY3ROrmY2WkkKbtKD5eHIYfnXhD6srZ4uIhCSQSR PHrp40lkyJQjZaUX8o4zk/GW8BX9SVyZA60ImVreQcPG8QUO1Kv5wu/QjNDEWdJjQVxWy0UzH Hqg2W/LEGCGeK4RyGAZNVeLispufSYGxWk59wVHrGf/FriDOQ0nu7grkSWXOLciJZgdhgs6b0 TxlKN51eDetSqLPm7PfIFrFrnzSB0boKAVXVn9rtArCZgq74W7TEQ/eqboxLSn7Ps728+jvcF E47QawrQpaHtWwow04n4vExj2rJ6pMSml5VBMXNb0n0CNNdu5DMS/7n+W32QvUh99wHmbcaJx gSioClSMFFDwCIAYbrn2rOr636pwg/xZqS43BbcTzVL49xhf3OTO8iTjYw/a3RkHFSYRXKb0v supX0TlL+EREGGbjlDl05o4HZ2x/V0RNmIftTVZaODbmK1RtqPfAzhds31f4e3QxcC57Wwo6h uHfr4Yh6VPJjTSdSeODdENcphVONZZHrfdBwjlVd4W14h2uyAfeA3AG/Cpa2Vsp0/RMZZbKGp Ot9M0MhvwE+Q0mlAF08B6DW53viQcmO2/6NiVGiIRcJxN8Qi1FZXH+k5Dqom7iO6hCgUYvR9q EFuUfncy14mdCb1KjJkeuq3ITGZ9/8mXn4RC4Ht1CGnMowwCIqNrkv+CevS+evHkT38pa4kO8 bdgEy04biBHKagzlVNyKPsUwSz+Ik0HcwaWkEsrsNX8/sA3Hl0zsVbSJkaG9/v3lU6l8MbnaR 9lKENm+EgA8+0FSvyS9ZAyCLFqjRbiqDF+bLzUJbwiulNcBR3SSRjzNSucVadCHJ6ulV821 Received-SPF: none client-ip=212.227.126.131; envelope-from=laurent@vivier.eu; helo=mout.kundenserver.de X-detected-operating-system: by eggs.gnu.org: First seen = 2020/09/19 14:45:05 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, 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, zhaolichang , Michael Tokarev , Markus Armbruster , Laurent Vivier Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: zhaolichang I found that there are many spelling errors in the comments of qemu, so I used the spellcheck tool to check the spelling errors and finally found some spelling errors in the qapi folder. Signed-off-by: zhaolichang Reviewed-by: Markus Armbruster Message-Id: <20200917075029.313-10-zhaolichang@huawei.com> Signed-off-by: Laurent Vivier --- qapi/block-core.json | 4 ++-- qapi/crypto.json | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/qapi/block-core.json b/qapi/block-core.json index 2d94873ca02c..3c16f1e11d6b 100644 --- a/qapi/block-core.json +++ b/qapi/block-core.json @@ -1795,7 +1795,7 @@ # # @block-backend: corresponds to BlockBackend # -# @block-job: corresonds to BlockJob +# @block-job: corresponds to BlockJob # # @block-driver: corresponds to BlockDriverState # @@ -2067,7 +2067,7 @@ # @target: name of the destination dirty bitmap # # @bitmaps: name(s) of the source dirty bitmap(s) at @node and/or fully -# specifed BlockDirtyBitmap elements. The latter are supported +# specified BlockDirtyBitmap elements. The latter are supported # since 4.1. # # Since: 4.0 diff --git a/qapi/crypto.json b/qapi/crypto.json index bb7930d33209..2aebe6fa20fd 100644 --- a/qapi/crypto.json +++ b/qapi/crypto.json @@ -336,7 +336,7 @@ # written into added active keyslots # # @old-secret: Optional (for deactivation only) -# If given will deactive all keyslots that +# If given will deactivate all keyslots that # match password located in QCryptoSecret with this ID # # @iter-time: Optional (for activation only) @@ -354,7 +354,7 @@ # keyslot to deactivate # # @secret: Optional. The ID of a QCryptoSecret object providing the -# password to use to retrive current master key. +# password to use to retrieve current master key. # Defaults to the same secret that was used to open the image # # From patchwork Sat Sep 19 18:44:51 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 1367697 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=vivier.eu Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4Bv0L62cXpz9sSC for ; Sun, 20 Sep 2020 04:56:46 +1000 (AEST) Received: from localhost ([::1]:32788 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kJi2O-0000GL-7b for incoming@patchwork.ozlabs.org; Sat, 19 Sep 2020 14:56:44 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:52018) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kJhrz-0006XH-8N; Sat, 19 Sep 2020 14:45:59 -0400 Received: from mout.kundenserver.de ([212.227.126.134]:55793) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kJhrv-0001TT-By; Sat, 19 Sep 2020 14:45:58 -0400 Received: from localhost.localdomain ([82.252.129.222]) by mrelayeu.kundenserver.de (mreue012 [212.227.15.167]) with ESMTPSA (Nemesis) id 1MGQ85-1kGi8Q2jhl-00Gs73; Sat, 19 Sep 2020 20:45:28 +0200 From: Laurent Vivier To: qemu-devel@nongnu.org Subject: [PULL 17/17] contrib/: fix some comment spelling errors Date: Sat, 19 Sep 2020 20:44:51 +0200 Message-Id: <20200919184451.2129349-18-laurent@vivier.eu> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200919184451.2129349-1-laurent@vivier.eu> References: <20200919184451.2129349-1-laurent@vivier.eu> MIME-Version: 1.0 X-Provags-ID: V03:K1:bOEy+G/IGMKE9gvFJ4cxzQSb4njmsnq6VEyLKdftrDeNY44YeP6 RCINZFhrsPR+Oc0jpUFo26QXWnMoML3Li5a/1WgWI7HNPm7INUEiUkLb8nASPXpAevbn4Uf yofJ5dlHtYVHGqeFDndCtnnoDa0OY2rnjm1yiK9qNRQRP/g7HHez7COMOCHCDb/eic9n2Jz +HeiUlSKV4tRDKo+jc/cg== X-UI-Out-Filterresults: notjunk:1;V03:K0:TsAm0Bzp3+0=:Tl7ATPSARqvcIsIkhOOW1C mP2BM2LqmAoDKy/N96Sg4IpWqPX26Hvb3FLmUlvJTS8O85Kci3v63UuKj/6ijrsy9Q/yEz5bd VBf6bgvyjnDl749v4yfr0Ao4gGZanM9TLsK2+Nhim5uL0TQR8kRik3MZX/zH0ZMFaFHh2YTUZ 4Gq5c6mDoHvNHy4ABqPklXkE+7DZqkFD3drpvxNvYyBhDPA4FAzmL9DrgPXvKap6DkPxXiWB4 bIgIFAPeLwd4wgRxtk/zDeRZIXK4gd3aBvkHGvO5kMJyFV0flD3l3QE944i8KY6tny+4G02hR LxOg8WzPv51a3Au/ji9U6FZe2xjrGtgKkv3cDoVJ7vm+l33YsmGIhkr8UrQAgOk59b1+Np3Jj JLwdoCkobB/OgO3x3kUG3Ik5/qYdiOKx3patlfDvPK+jSpB5nu9rfDKePiCHvVH49/dCcU4bK nkuVhhOP49sYh5kesY5VdEIVxDYwxkjIePLtzvf7iZ4W+1dxtRYA9cNUn39bHJXFFjB1AyKYw pivojfkhQKZdRXDOt/uEdK2JAdQ7x6tqVyrMvbW1RPRjO11l1BrRnQdygsxOjZLDHkIP5hD+j iKgm4m0xgQqpBeGGUZK4t/N9taBlEg7l92FCNwDMXm0KF9ihq78D6z4jIE9ABR89VlcAmKiGI 4wP9xNValzJmXQmGVWYs85f5YtfoCxQJk1aO8TpafCwOhBZx0I7x8EE4iZFqe+xOqEtrEYHnq eUgh+sgfyjgNAZTsvEC2qFo0J/EGn8GuErWe3pvZQhg0CK3g5FiZLOUfsRn8/iTweoUJXzO3m A5aY2eZdr2kPntUXoHOG1AqYHlE7lMxXphawAzSzJFd3/pvZhq/PAUCta92Sbw2n8gIr8Kw Received-SPF: none client-ip=212.227.126.134; envelope-from=laurent@vivier.eu; helo=mout.kundenserver.de X-detected-operating-system: by eggs.gnu.org: First seen = 2020/09/19 14:45:08 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, 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, Alex Bennee , zhaolichang , Michael Tokarev , Laurent Vivier Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: zhaolichang I found that there are many spelling errors in the comments of qemu, so I used the spellcheck tool to check the spelling errors and finally found some spelling errors in the contrib folder. Signed-off-by: zhaolichang Reviewed-by: Alex Bennee Message-Id: <20200917075029.313-11-zhaolichang@huawei.com> Signed-off-by: Laurent Vivier --- contrib/gitdm/filetypes.txt | 6 +++--- contrib/ivshmem-client/ivshmem-client.h | 2 +- contrib/libvhost-user/libvhost-user.c | 4 ++-- contrib/libvhost-user/libvhost-user.h | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/contrib/gitdm/filetypes.txt b/contrib/gitdm/filetypes.txt index 9e9c50520550..d2d6f6db8d5e 100644 --- a/contrib/gitdm/filetypes.txt +++ b/contrib/gitdm/filetypes.txt @@ -22,7 +22,7 @@ # in the gitdm sample-config directory. # # This file contains associations parameters regarding filetypes -# (documentation, develompent, multimedia, images...) +# (documentation, development, multimedia, images...) # # format: # filetype [] @@ -59,8 +59,8 @@ filetype code \.s$ # Assembly filetype code \.S$ # Assembly filetype code \.asm$ # Assembly filetype code \.awk$ # awk -filetype code ^common$ # script fragements -filetype code ^common.*$ # script fragements +filetype code ^common$ # script fragments +filetype code ^common.*$ # script fragments filetype code (qom|qmp)-\w+$ # python script fragments # diff --git a/contrib/ivshmem-client/ivshmem-client.h b/contrib/ivshmem-client/ivshmem-client.h index fe3cc4a03d33..fc45a38060f0 100644 --- a/contrib/ivshmem-client/ivshmem-client.h +++ b/contrib/ivshmem-client/ivshmem-client.h @@ -174,7 +174,7 @@ int ivshmem_client_notify_all_vects(const IvshmemClient *client, const IvshmemClientPeer *peer); /** - * Broadcat a notification to all vectors of all peers + * Broadcast a notification to all vectors of all peers * * @client: The ivshmem client * diff --git a/contrib/libvhost-user/libvhost-user.c b/contrib/libvhost-user/libvhost-user.c index 53f16bdf082c..9d30ff2283c4 100644 --- a/contrib/libvhost-user/libvhost-user.c +++ b/contrib/libvhost-user/libvhost-user.c @@ -684,7 +684,7 @@ vu_add_mem_reg(VuDev *dev, VhostUserMsg *vmsg) { /* * If we are in postcopy mode and we receive a u64 payload with a 0 value - * we know all the postcopy client bases have been recieved, and we + * we know all the postcopy client bases have been received, and we * should start generating faults. */ if (track_ramblocks && @@ -973,7 +973,7 @@ vu_set_mem_table_exec(VuDev *dev, VhostUserMsg *vmsg) for (i = 0; i < dev->max_queues; i++) { if (dev->vq[i].vring.desc) { if (map_ring(dev, &dev->vq[i])) { - vu_panic(dev, "remaping queue %d during setmemtable", i); + vu_panic(dev, "remapping queue %d during setmemtable", i); } } } diff --git a/contrib/libvhost-user/libvhost-user.h b/contrib/libvhost-user/libvhost-user.h index 844c37c64899..287ac5fec7f1 100644 --- a/contrib/libvhost-user/libvhost-user.h +++ b/contrib/libvhost-user/libvhost-user.h @@ -424,7 +424,7 @@ typedef struct VuVirtqElement { * @remove_watch: a remove_watch callback * @iface: a VuDevIface structure with vhost-user device callbacks * - * Intializes a VuDev vhost-user context. + * Initializes a VuDev vhost-user context. * * Returns: true on success, false on failure. **/