From patchwork Fri Nov 19 09:16:59 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 12628533 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 11F6EC433EF for ; Fri, 19 Nov 2021 09:17:13 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id E334161A8C for ; Fri, 19 Nov 2021 09:17:12 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233938AbhKSJUN (ORCPT ); Fri, 19 Nov 2021 04:20:13 -0500 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:22887 "EHLO us-smtp-delivery-124.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232142AbhKSJUN (ORCPT ); Fri, 19 Nov 2021 04:20:13 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1637313431; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=oiIAv4nG/zKFIRhPsKBsR5CbFtnXIXNxqIa5ZKHRQAU=; b=aykWqGseUSKU4Qr9nMNNJeFl86KwL4q1QWgsH/oHavABrTgYpIJ6eAYN98WrFGu+Gg7J1s hoR6AnNDhPZxUiRnW0TrzWB+Jahz+/pKIiKfRwi16vsMeD755FDY3ZrpyO8g4Qy0FWvz5U 8BnreHSELC7SZNw4UR5tjNGYF7gLxro= Received: from mail-wr1-f72.google.com (mail-wr1-f72.google.com [209.85.221.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-523-BBOC79KCN7yCwtVJzq0GAA-1; Fri, 19 Nov 2021 04:17:09 -0500 X-MC-Unique: BBOC79KCN7yCwtVJzq0GAA-1 Received: by mail-wr1-f72.google.com with SMTP id q17-20020adfcd91000000b0017bcb12ad4fso1628892wrj.12 for ; Fri, 19 Nov 2021 01:17:09 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=oiIAv4nG/zKFIRhPsKBsR5CbFtnXIXNxqIa5ZKHRQAU=; b=RVxlEghT2MC2mqcNFxboaQrteHBNyLRmZWelkm+64V++nA0oGBi6SLxnxF1Vt7dPRS EbZhFhJIP8ETUS7SlY/SGNmhxn2/JSPrn17gO1SeYSsfgEwsf3Kn4XjxyHqBlnk0OxnN fmM3O1i5dTz0DcWxMqKzCGLs1z8R+As7+Uo4Uy8B/hTCGYJrGVgVqg0voDOgI+yv9fzd dTGiLUHqA8cOSVvshVLIiKv6ywv11iV6REDXtuN2Noye8Mz5kI2DDaeMDLAd9OhOOLnk 90C7MKtoftAu6x91bgrD0f5jy3OEBsK4KojInRUZPLKK8CtImLaU/ymkhCWkRmjQyhWG 4x4A== X-Gm-Message-State: AOAM53087fe/u61wg+85GoNOX4sGApdXzeTzshoM4uQMUHh6oqU74jep 1PQh3uCiBHc9bBLCxWGugb5JNejKPK9OkqmqFpYtQT3xlNc53Us0OSO0GHXF927pWfG4yljJ7Tl 2gIRhNs6s2qdb X-Received: by 2002:a5d:4846:: with SMTP id n6mr5279167wrs.249.1637313428285; Fri, 19 Nov 2021 01:17:08 -0800 (PST) X-Google-Smtp-Source: ABdhPJzhvvggI3Me1Ebzc0Hf4EkkNPsfM7EN2qI/s5tLwQlYFI7gprjoiohzSUTO7pIXXeuhY4d9vw== X-Received: by 2002:a5d:4846:: with SMTP id n6mr5279119wrs.249.1637313427954; Fri, 19 Nov 2021 01:17:07 -0800 (PST) Received: from x1w.. (62.red-83-57-168.dynamicip.rima-tde.net. [83.57.168.62]) by smtp.gmail.com with ESMTPSA id p12sm2398203wro.33.2021.11.19.01.17.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 19 Nov 2021 01:17:07 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Cleber Rosa , John Snow , Eric Blake , Markus Armbruster , Hanna Reitz , Michael Roth , qemu-block@nongnu.org, Marcelo Tosatti , Vladimir Sementsov-Ogievskiy , Eduardo Habkost , Taylor Simpson , kvm@vger.kernel.org, Paolo Bonzini , Kevin Wolf , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Darren Kenny Subject: [PATCH-for-6.2? v2 1/3] docs: Spell QEMU all caps Date: Fri, 19 Nov 2021 10:16:59 +0100 Message-Id: <20211119091701.277973-2-philmd@redhat.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20211119091701.277973-1-philmd@redhat.com> References: <20211119091701.277973-1-philmd@redhat.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org QEMU should be written all caps. Normally checkpatch.pl warns when it is not (see commit 9964d8f9422: "checkpatch: Add QEMU specific rule"). Replace Qemu -> QEMU. Reviewed-by: Darren Kenny Reviewed-by: Markus Armbruster Signed-off-by: Philippe Mathieu-Daudé --- docs/devel/modules.rst | 2 +- docs/devel/multi-thread-tcg.rst | 2 +- docs/devel/style.rst | 2 +- docs/devel/ui.rst | 4 ++-- docs/interop/nbd.txt | 6 +++--- docs/interop/qcow2.txt | 8 ++++---- docs/multiseat.txt | 2 +- docs/system/device-url-syntax.rst.inc | 2 +- docs/system/i386/sgx.rst | 26 +++++++++++++------------- docs/u2f.txt | 2 +- 10 files changed, 28 insertions(+), 28 deletions(-) diff --git a/docs/devel/modules.rst b/docs/devel/modules.rst index 066f347b89b..8e999c4fa48 100644 --- a/docs/devel/modules.rst +++ b/docs/devel/modules.rst @@ -1,5 +1,5 @@ ============ -Qemu modules +QEMU modules ============ .. kernel-doc:: include/qemu/module.h diff --git a/docs/devel/multi-thread-tcg.rst b/docs/devel/multi-thread-tcg.rst index 5b446ee08b6..c9541a7b20a 100644 --- a/docs/devel/multi-thread-tcg.rst +++ b/docs/devel/multi-thread-tcg.rst @@ -228,7 +228,7 @@ Emulated hardware state Currently thanks to KVM work any access to IO memory is automatically protected by the global iothread mutex, also known as the BQL (Big -Qemu Lock). Any IO region that doesn't use global mutex is expected to +QEMU Lock). Any IO region that doesn't use global mutex is expected to do its own locking. However IO memory isn't the only way emulated hardware state can be diff --git a/docs/devel/style.rst b/docs/devel/style.rst index 260e3263fa0..e00af62e763 100644 --- a/docs/devel/style.rst +++ b/docs/devel/style.rst @@ -686,7 +686,7 @@ Rationale: hex numbers are hard to read in logs when there is no 0x prefix, especially when (occasionally) the representation doesn't contain any letters and especially in one line with other decimal numbers. Number groups are allowed to not use '0x' because for some things notations like %x.%x.%x are used not -only in Qemu. Also dumping raw data bytes with '0x' is less readable. +only in QEMU. Also dumping raw data bytes with '0x' is less readable. '#' printf flag --------------- diff --git a/docs/devel/ui.rst b/docs/devel/ui.rst index 06c7d622ce7..17fb667dec4 100644 --- a/docs/devel/ui.rst +++ b/docs/devel/ui.rst @@ -1,8 +1,8 @@ ================= -Qemu UI subsystem +QEMU UI subsystem ================= -Qemu Clipboard +QEMU Clipboard -------------- .. kernel-doc:: include/ui/clipboard.h diff --git a/docs/interop/nbd.txt b/docs/interop/nbd.txt index 10ce098a29b..bdb0f2a41ac 100644 --- a/docs/interop/nbd.txt +++ b/docs/interop/nbd.txt @@ -1,4 +1,4 @@ -Qemu supports the NBD protocol, and has an internal NBD client (see +QEMU supports the NBD protocol, and has an internal NBD client (see block/nbd.c), an internal NBD server (see blockdev-nbd.c), and an external NBD server tool (see qemu-nbd.c). The common code is placed in nbd/*. @@ -7,11 +7,11 @@ The NBD protocol is specified here: https://github.com/NetworkBlockDevice/nbd/blob/master/doc/proto.md The following paragraphs describe some specific properties of NBD -protocol realization in Qemu. +protocol realization in QEMU. = Metadata namespaces = -Qemu supports the "base:allocation" metadata context as defined in the +QEMU supports the "base:allocation" metadata context as defined in the NBD protocol specification, and also defines an additional metadata namespace "qemu". diff --git a/docs/interop/qcow2.txt b/docs/interop/qcow2.txt index 0463f761efb..f7dc304ff69 100644 --- a/docs/interop/qcow2.txt +++ b/docs/interop/qcow2.txt @@ -313,7 +313,7 @@ The fields of the bitmaps extension are: The number of bitmaps contained in the image. Must be greater than or equal to 1. - Note: Qemu currently only supports up to 65535 bitmaps per + Note: QEMU currently only supports up to 65535 bitmaps per image. 4 - 7: Reserved, must be zero. @@ -775,7 +775,7 @@ Structure of a bitmap directory entry: 2: extra_data_compatible This flags is meaningful when the extra data is unknown to the software (currently any extra data is - unknown to Qemu). + unknown to QEMU). If it is set, the bitmap may be used as expected, extra data must be left as is. If it is not set, the bitmap must not be used, but @@ -793,7 +793,7 @@ Structure of a bitmap directory entry: 17: granularity_bits Granularity bits. Valid values: 0 - 63. - Note: Qemu currently supports only values 9 - 31. + Note: QEMU currently supports only values 9 - 31. Granularity is calculated as granularity = 1 << granularity_bits @@ -804,7 +804,7 @@ Structure of a bitmap directory entry: 18 - 19: name_size Size of the bitmap name. Must be non-zero. - Note: Qemu currently doesn't support values greater than + Note: QEMU currently doesn't support values greater than 1023. 20 - 23: extra_data_size diff --git a/docs/multiseat.txt b/docs/multiseat.txt index 11850c96ff8..2b297e979d6 100644 --- a/docs/multiseat.txt +++ b/docs/multiseat.txt @@ -123,7 +123,7 @@ Background info is here: guest side with pci-bridge-seat ------------------------------- -Qemu version 2.4 and newer has a new pci-bridge-seat device which +QEMU version 2.4 and newer has a new pci-bridge-seat device which can be used instead of pci-bridge. Just swap the device name in the qemu command line above. The only difference between the two devices is the pci id. We can match the pci id instead of the device path diff --git a/docs/system/device-url-syntax.rst.inc b/docs/system/device-url-syntax.rst.inc index d15a0215087..7dbc525fa80 100644 --- a/docs/system/device-url-syntax.rst.inc +++ b/docs/system/device-url-syntax.rst.inc @@ -15,7 +15,7 @@ These are specified using a special URL syntax. 'iqn.2008-11.org.linux-kvm[:]' but this can also be set from the command line or a configuration file. - Since version Qemu 2.4 it is possible to specify a iSCSI request + Since version QEMU 2.4 it is possible to specify a iSCSI request timeout to detect stalled requests and force a reestablishment of the session. The timeout is specified in seconds. The default is 0 which means no timeout. Libiscsi 1.15.0 or greater is required for this diff --git a/docs/system/i386/sgx.rst b/docs/system/i386/sgx.rst index 9aa161af1a1..f8fade5ac2d 100644 --- a/docs/system/i386/sgx.rst +++ b/docs/system/i386/sgx.rst @@ -20,13 +20,13 @@ report the same CPUID info to guest as on host for most of SGX CPUID. With reporting the same CPUID guest is able to use full capacity of SGX, and KVM doesn't need to emulate those info. -The guest's EPC base and size are determined by Qemu, and KVM needs Qemu to +The guest's EPC base and size are determined by QEMU, and KVM needs QEMU to notify such info to it before it can initialize SGX for guest. Virtual EPC ~~~~~~~~~~~ -By default, Qemu does not assign EPC to a VM, i.e. fully enabling SGX in a VM +By default, QEMU does not assign EPC to a VM, i.e. fully enabling SGX in a VM requires explicit allocation of EPC to the VM. Similar to other specialized memory types, e.g. hugetlbfs, EPC is exposed as a memory backend. @@ -35,12 +35,12 @@ prior to realizing the vCPUs themselves, which occurs long before generic devices are parsed and realized. This limitation means that EPC does not require -maxmem as EPC is not treated as {cold,hot}plugged memory. -Qemu does not artificially restrict the number of EPC sections exposed to a -guest, e.g. Qemu will happily allow you to create 64 1M EPC sections. Be aware +QEMU does not artificially restrict the number of EPC sections exposed to a +guest, e.g. QEMU will happily allow you to create 64 1M EPC sections. Be aware that some kernels may not recognize all EPC sections, e.g. the Linux SGX driver is hardwired to support only 8 EPC sections. -The following Qemu snippet creates two EPC sections, with 64M pre-allocated +The following QEMU snippet creates two EPC sections, with 64M pre-allocated to the VM and an additional 28M mapped but not allocated:: -object memory-backend-epc,id=mem1,size=64M,prealloc=on \ @@ -54,7 +54,7 @@ to physical EPC. Because physical EPC is protected via range registers, the size of the physical EPC must be a power of two (though software sees a subset of the full EPC, e.g. 92M or 128M) and the EPC must be naturally aligned. KVM SGX's virtual EPC is purely a software construct and only -requires the size and location to be page aligned. Qemu enforces the EPC +requires the size and location to be page aligned. QEMU enforces the EPC size is a multiple of 4k and will ensure the base of the EPC is 4k aligned. To simplify the implementation, EPC is always located above 4g in the guest physical address space. @@ -62,7 +62,7 @@ physical address space. Migration ~~~~~~~~~ -Qemu/KVM doesn't prevent live migrating SGX VMs, although from hardware's +QEMU/KVM doesn't prevent live migrating SGX VMs, although from hardware's perspective, SGX doesn't support live migration, since both EPC and the SGX key hierarchy are bound to the physical platform. However live migration can be supported in the sense if guest software stack can support recreating @@ -76,7 +76,7 @@ CPUID ~~~~~ Due to its myriad dependencies, SGX is currently not listed as supported -in any of Qemu's built-in CPU configuration. To expose SGX (and SGX Launch +in any of QEMU's built-in CPU configuration. To expose SGX (and SGX Launch Control) to a guest, you must either use ``-cpu host`` to pass-through the host CPU model, or explicitly enable SGX when using a built-in CPU model, e.g. via ``-cpu ,+sgx`` or ``-cpu ,+sgx,+sgxlc``. @@ -101,7 +101,7 @@ controlled via -cpu are prefixed with "sgx", e.g.:: sgx2 sgxlc -The following Qemu snippet passes through the host CPU but restricts access to +The following QEMU snippet passes through the host CPU but restricts access to the provision and EINIT token keys:: -cpu host,-sgx-provisionkey,-sgx-tokenkey @@ -112,11 +112,11 @@ in hardware cannot be forced on via '-cpu'. Virtualize SGX Launch Control ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -Qemu SGX support for Launch Control (LC) is passive, in the sense that it -does not actively change the LC configuration. Qemu SGX provides the user +QEMU SGX support for Launch Control (LC) is passive, in the sense that it +does not actively change the LC configuration. QEMU SGX provides the user the ability to set/clear the CPUID flag (and by extension the associated IA32_FEATURE_CONTROL MSR bit in fw_cfg) and saves/restores the LE Hash MSRs -when getting/putting guest state, but Qemu does not add new controls to +when getting/putting guest state, but QEMU does not add new controls to directly modify the LC configuration. Similar to hardware behavior, locking the LC configuration to a non-Intel value is left to guest firmware. Unlike host bios setting for SGX launch control(LC), there is no special bios setting @@ -126,7 +126,7 @@ creating VM with SGX. Feature Control ~~~~~~~~~~~~~~~ -Qemu SGX updates the ``etc/msr_feature_control`` fw_cfg entry to set the SGX +QEMU SGX updates the ``etc/msr_feature_control`` fw_cfg entry to set the SGX (bit 18) and SGX LC (bit 17) flags based on their respective CPUID support, i.e. existing guest firmware will automatically set SGX and SGX LC accordingly, assuming said firmware supports fw_cfg.msr_feature_control. diff --git a/docs/u2f.txt b/docs/u2f.txt index 8f44994818a..7f5813a0b72 100644 --- a/docs/u2f.txt +++ b/docs/u2f.txt @@ -21,7 +21,7 @@ The second factor is materialized by a device implementing the U2F protocol. In case of a USB U2F security key, it is a USB HID device that implements the U2F protocol. -In Qemu, the USB U2F key device offers a dedicated support of U2F, allowing +In QEMU, the USB U2F key device offers a dedicated support of U2F, allowing guest USB FIDO/U2F security keys operating in two possible modes: pass-through and emulated. From patchwork Fri Nov 19 09:17:00 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 12628535 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8F97DC433F5 for ; Fri, 19 Nov 2021 09:17:17 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 7AA7E61AFD for ; Fri, 19 Nov 2021 09:17:17 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233947AbhKSJUR (ORCPT ); Fri, 19 Nov 2021 04:20:17 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:23986 "EHLO us-smtp-delivery-124.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233891AbhKSJUR (ORCPT ); Fri, 19 Nov 2021 04:20:17 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1637313435; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=jlIlecnzhaAQeRZZJuozVjF80LuOMxu5Kmn9TZdjFTQ=; b=cj9F9k/AzxgsZxJJqtg8A5CRXlP+6HUf9EwZFcWIxSYxRx65ijC/0FRzeB+bxkryTIa/q7 BWyHDBgk67UD0cyBkT5/h7lvRNoktJa7M+SuEJOKGtmkbgKhKRUmB+Q8qQDJXYWByoOU8U DLGCz46zw597ANYAf6ppgHNEzfiaLXA= Received: from mail-wr1-f72.google.com (mail-wr1-f72.google.com [209.85.221.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-460-Oz84Wi1yOeqXIoXyS6w_zA-1; Fri, 19 Nov 2021 04:17:14 -0500 X-MC-Unique: Oz84Wi1yOeqXIoXyS6w_zA-1 Received: by mail-wr1-f72.google.com with SMTP id v18-20020a5d5912000000b001815910d2c0so1627113wrd.1 for ; Fri, 19 Nov 2021 01:17:13 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=jlIlecnzhaAQeRZZJuozVjF80LuOMxu5Kmn9TZdjFTQ=; b=BgACE1Sv8F7xWzmlWBsdyLYRWKgmsc2KZyDZbJvpIYNr3jALN5JeMNXoP3cWLX/RKb 74TE+0T/PKAG1IEArbMOI1WbktBHnLCHRBCSDjrJDpLmC1Smj1bneVNrmsLkZIMMJeI8 q/hSjk/0JmIHukY2sTte6Pxw62WuYZYgn3IzoUa5v0YNIuggC7hdktxiKlRzl6zlBiwY pCjw0PfGoVdR2ctGMaAVVal55+x9VgcVHy9MxyaY+zaMhXT05iJZ1ZZsjxuYx99/+GvE r7jByV9D2SOZgJUdQuHQkNXSyUi97jmnYGgYBrlKw6iWRBjq8zL4mp9G1pXvZJqO8m+f LTDw== X-Gm-Message-State: AOAM533V2dzY0aM/5WIjLG5r2hfrw2+fdeoZd+QxwfnksV0FhbM96WFz Q3Brlsx6OfgN9upr2vR0G0c67jYmy4GHAFJdc7AMq1v9/4Wh8QLuO4J3zm6z0jsN/xV14ZceJm5 KeCLygZ4xdwX/ X-Received: by 2002:a05:6000:18a7:: with SMTP id b7mr5442728wri.308.1637313432820; Fri, 19 Nov 2021 01:17:12 -0800 (PST) X-Google-Smtp-Source: ABdhPJzuuy5ZcKAtX3G+Y6lbyhVFc1uLMOQW6OLp6hdOWYScK9KF7wvUtEbMVxgqY5w7QfaBtY2WAw== X-Received: by 2002:a05:6000:18a7:: with SMTP id b7mr5442683wri.308.1637313432573; Fri, 19 Nov 2021 01:17:12 -0800 (PST) Received: from x1w.. (62.red-83-57-168.dynamicip.rima-tde.net. [83.57.168.62]) by smtp.gmail.com with ESMTPSA id g13sm3206808wrd.57.2021.11.19.01.17.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 19 Nov 2021 01:17:12 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Cleber Rosa , John Snow , Eric Blake , Markus Armbruster , Hanna Reitz , Michael Roth , qemu-block@nongnu.org, Marcelo Tosatti , Vladimir Sementsov-Ogievskiy , Eduardo Habkost , Taylor Simpson , kvm@vger.kernel.org, Paolo Bonzini , Kevin Wolf , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Subject: [PATCH-for-6.2? v2 2/3] misc: Spell QEMU all caps Date: Fri, 19 Nov 2021 10:17:00 +0100 Message-Id: <20211119091701.277973-3-philmd@redhat.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20211119091701.277973-1-philmd@redhat.com> References: <20211119091701.277973-1-philmd@redhat.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org QEMU should be written all caps. Normally checkpatch.pl warns when it is not (see commit 9964d8f9422: "checkpatch: Add QEMU specific rule"). Replace Qemu -> QEMU. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Taylor Simpson --- qapi/block-core.json | 2 +- python/qemu/machine/machine.py | 2 +- scripts/checkpatch.pl | 2 +- scripts/render_block_graph.py | 2 +- scripts/simplebench/bench-backup.py | 4 ++-- scripts/simplebench/bench_block_job.py | 2 +- target/hexagon/README | 2 +- tests/guest-debug/run-test.py | 4 ++-- tests/qemu-iotests/testenv.py | 2 +- 9 files changed, 11 insertions(+), 11 deletions(-) diff --git a/qapi/block-core.json b/qapi/block-core.json index 1d3dd9cb48e..1846a91873a 100644 --- a/qapi/block-core.json +++ b/qapi/block-core.json @@ -1839,7 +1839,7 @@ # # @id: Block graph node identifier. This @id is generated only for # x-debug-query-block-graph and does not relate to any other identifiers in -# Qemu. +# QEMU. # # @type: Type of graph node. Can be one of block-backend, block-job or # block-driver-state. diff --git a/python/qemu/machine/machine.py b/python/qemu/machine/machine.py index a487c397459..627c9013946 100644 --- a/python/qemu/machine/machine.py +++ b/python/qemu/machine/machine.py @@ -122,7 +122,7 @@ def __init__(self, @param console_log: (optional) path to console log file @param log_dir: where to create and keep log files @param qmp_timer: (optional) default QMP socket timeout - @note: Qemu process is not started until launch() is used. + @note: QEMU process is not started until launch() is used. ''' # pylint: disable=too-many-arguments diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl index cb8eff233e0..aedf9beaed0 100755 --- a/scripts/checkpatch.pl +++ b/scripts/checkpatch.pl @@ -2910,7 +2910,7 @@ sub process { ERROR("use QEMU instead of Qemu or QEmu\n" . $herecurr); } -# Qemu error function tests +# QEMU error function tests # Find newlines in error messages my $qemu_error_funcs = qr{error_setg| diff --git a/scripts/render_block_graph.py b/scripts/render_block_graph.py index da6acf050d1..3147b0b843b 100755 --- a/scripts/render_block_graph.py +++ b/scripts/render_block_graph.py @@ -1,6 +1,6 @@ #!/usr/bin/env python3 # -# Render Qemu Block Graph +# Render QEMU Block Graph # # Copyright (c) 2018 Virtuozzo International GmbH. All rights reserved. # diff --git a/scripts/simplebench/bench-backup.py b/scripts/simplebench/bench-backup.py index 5a0675c593c..ad37af3e719 100755 --- a/scripts/simplebench/bench-backup.py +++ b/scripts/simplebench/bench-backup.py @@ -183,7 +183,7 @@ def __call__(self, parser, namespace, values, option_string=None): mirror use mirror job instead of backup''', formatter_class=argparse.RawTextHelpFormatter) p.add_argument('--env', nargs='+', help='''\ -Qemu binaries with labels and options, see below +QEMU binaries with labels and options, see below "ENV format" section''', action=ExtendAction) p.add_argument('--dir', nargs='+', help='''\ @@ -209,7 +209,7 @@ def __call__(self, parser, namespace, values, option_string=None): p.add_argument('--target-cache', help='''\ Setup cache for target nodes. Options: direct: default, use O_DIRECT and aio=native - cached: use system cache (Qemu default) and aio=threads (Qemu default) + cached: use system cache (QEMU default) and aio=threads (QEMU default) both: generate two test cases for each src:dst pair''', default='direct', choices=('direct', 'cached', 'both')) diff --git a/scripts/simplebench/bench_block_job.py b/scripts/simplebench/bench_block_job.py index a403c35b08f..ecbcd535bcb 100755 --- a/scripts/simplebench/bench_block_job.py +++ b/scripts/simplebench/bench_block_job.py @@ -36,7 +36,7 @@ def bench_block_job(cmd, cmd_args, qemu_args): cmd -- qmp command to run block-job (like blockdev-backup) cmd_args -- dict of qmp command arguments - qemu_args -- list of Qemu command line arguments, including path to Qemu + qemu_args -- list of QEMU command line arguments, including path to QEMU binary Returns {'seconds': int} on success and {'error': str} on failure, dict may diff --git a/target/hexagon/README b/target/hexagon/README index 372e24747c9..b02dbbd1701 100644 --- a/target/hexagon/README +++ b/target/hexagon/README @@ -48,7 +48,7 @@ header files in /target/hexagon gen_tcg_func_table.py -> tcg_func_table_generated.c.inc gen_helper_funcs.py -> helper_funcs_generated.c.inc -Qemu helper functions have 3 parts +QEMU helper functions have 3 parts DEF_HELPER declaration indicates the signature of the helper gen_helper_ will generate a TCG call to the helper function The helper implementation diff --git a/tests/guest-debug/run-test.py b/tests/guest-debug/run-test.py index 2e58795a100..268a230ecc3 100755 --- a/tests/guest-debug/run-test.py +++ b/tests/guest-debug/run-test.py @@ -21,9 +21,9 @@ def get_args(): parser = argparse.ArgumentParser(description="A gdbstub test runner") - parser.add_argument("--qemu", help="Qemu binary for test", + parser.add_argument("--qemu", help="QEMU binary for test", required=True) - parser.add_argument("--qargs", help="Qemu arguments for test") + parser.add_argument("--qargs", help="QEMU arguments for test") parser.add_argument("--binary", help="Binary to debug", required=True) parser.add_argument("--test", help="GDB test script", diff --git a/tests/qemu-iotests/testenv.py b/tests/qemu-iotests/testenv.py index c33454fa685..b563b6d5e6d 100644 --- a/tests/qemu-iotests/testenv.py +++ b/tests/qemu-iotests/testenv.py @@ -157,7 +157,7 @@ def root(*names: str) -> str: progs = sorted(glob.iglob(pattern)) self.qemu_prog = next(p for p in progs if isxfile(p)) except StopIteration: - sys.exit("Not found any Qemu executable binary by pattern " + sys.exit("Not found any QEMU executable binary by pattern " f"'{pattern}'") self.qemu_img_prog = os.getenv('QEMU_IMG_PROG', root('qemu-img')) From patchwork Fri Nov 19 09:17:01 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 12628537 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7D047C433FE for ; Fri, 19 Nov 2021 09:17:24 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 5B7B661AFD for ; Fri, 19 Nov 2021 09:17:24 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234094AbhKSJUZ (ORCPT ); Fri, 19 Nov 2021 04:20:25 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:53813 "EHLO us-smtp-delivery-124.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234009AbhKSJUY (ORCPT ); Fri, 19 Nov 2021 04:20:24 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1637313442; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=gRoflLF2rC1zBazllCjukemH1mBXXWiz/W1zufMnXs0=; b=Sym+kHQozEile39ucYD1ItqEAIsGWmCmrJiP3RDo6DC8RA9aWyIGdFK11cMsi5/xC5kh4N 1k8RAzB25zaESssBA5rCn/IC+PS6NEeFQ61Q9ZuM49djw5hdFgklg/8yWAgtZFudXb0yZA cl61r6ilUII6qGNSV+VVVntuMFULeec= Received: from mail-wm1-f70.google.com (mail-wm1-f70.google.com [209.85.128.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-244-U3SIorzcPgG43oNeKq-8kQ-1; Fri, 19 Nov 2021 04:17:18 -0500 X-MC-Unique: U3SIorzcPgG43oNeKq-8kQ-1 Received: by mail-wm1-f70.google.com with SMTP id g11-20020a1c200b000000b003320d092d08so3770553wmg.9 for ; Fri, 19 Nov 2021 01:17:18 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=gRoflLF2rC1zBazllCjukemH1mBXXWiz/W1zufMnXs0=; b=qIAvK9w4c4piVWhLfSphpbzNAAUFOBIQ7LGWCLUCIrWsCxsI4yfZOhkPVeInuta3UD +wnTnnBrHpdR6r9JdSDBdwUvjpakyHrNIeSD7j+7G3VWJmt/JUjt2DaxI1WgsxeaMv/8 oDvtTULzb761FOpBPPURFp9ArTp4UHwE/iXtZmdDKOx3CGCglpvYYgDmBDo4bVHE7t66 NhVr7gWonqL7iGw1WmftHdrX+7CRUCrNTEaVGf2+LiEY2p+dyUBo5DIx+R7/29y6bo1Z 7dAs/s5+UqoG3z+D7nRKdZURkk2qgjOWVLllMSmtyfaQCy0ttMHRuwjJH2EnB0FVCnxX zT7A== X-Gm-Message-State: AOAM533LuAK8XuIe88J3G3jNWp4pGqHJpzWcy4wFHlttRcCWOk63YxCf Jz0+VJLdYzcsr2qeyNtiBXHBhs2pW8Kp08oX/f5hdO92J7qkkjYE2vWAyrtvc7kbP7zQr1R4eiJ MXvMBt+/iamX6 X-Received: by 2002:adf:f40b:: with SMTP id g11mr5714960wro.296.1637313437446; Fri, 19 Nov 2021 01:17:17 -0800 (PST) X-Google-Smtp-Source: ABdhPJzjtIV1auJ1KnpG4qWnuDniPJZ9WC7iv91EjYI8edvo1a8UkKpFC/6mc24Mh9Gkk00xmpLlIA== X-Received: by 2002:adf:f40b:: with SMTP id g11mr5714945wro.296.1637313437328; Fri, 19 Nov 2021 01:17:17 -0800 (PST) Received: from x1w.. (62.red-83-57-168.dynamicip.rima-tde.net. [83.57.168.62]) by smtp.gmail.com with ESMTPSA id j8sm2305880wrh.16.2021.11.19.01.17.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 19 Nov 2021 01:17:17 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Cleber Rosa , John Snow , Eric Blake , Markus Armbruster , Hanna Reitz , Michael Roth , qemu-block@nongnu.org, Marcelo Tosatti , Vladimir Sementsov-Ogievskiy , Eduardo Habkost , Taylor Simpson , kvm@vger.kernel.org, Paolo Bonzini , Kevin Wolf , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Subject: [PATCH-for-6.2? v2 3/3] qga: Spell QEMU all caps Date: Fri, 19 Nov 2021 10:17:01 +0100 Message-Id: <20211119091701.277973-4-philmd@redhat.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20211119091701.277973-1-philmd@redhat.com> References: <20211119091701.277973-1-philmd@redhat.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org QEMU should be written all caps. Normally checkpatch.pl warns when it is not (see commit 9964d8f9422: "checkpatch: Add QEMU specific rule"). Replace Qemu -> QEMU, update the error message to use the more descriptive "Guest Agent" name instead of "GA". Signed-off-by: Philippe Mathieu-Daudé --- qga/installer/qemu-ga.wxs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/qga/installer/qemu-ga.wxs b/qga/installer/qemu-ga.wxs index 0950e8c6bec..c02e47fc036 100644 --- a/qga/installer/qemu-ga.wxs +++ b/qga/installer/qemu-ga.wxs @@ -40,14 +40,14 @@ - NOT VersionNT64 + NOT VersionNT64 - +