From d7dcea6f6015df40c20eefd167cc4151350c874a Mon Sep 17 00:00:00 2001 From: Philipp Hahn Date: Tue, 7 Mar 2017 18:09:58 +0100 Subject: [PATCH] doc: fix writing of QEMU QEMU should be written all upper or all lower case. --- docs/formatnwfilter.html.in | 6 +++--- docs/storage.html.in | 12 ++++++------ libvirt.spec.in | 2 +- src/cpu/cpu_s390.c | 2 +- src/qemu/MIGRATION.txt | 2 +- src/qemu/THREADS.txt | 2 +- src/qemu/qemu.conf | 4 ++-- src/qemu/qemu_command.c | 2 +- src/qemu/qemu_domain.h | 2 +- src/qemu/qemu_monitor.c | 6 +++--- src/qemu/qemu_parse_command.c | 2 +- 11 files changed, 21 insertions(+), 21 deletions(-) diff --git a/docs/formatnwfilter.html.in b/docs/formatnwfilter.html.in index 7ea69b556f..0d32893cb4 100644 --- a/docs/formatnwfilter.html.in +++ b/docs/formatnwfilter.html.in @@ -40,7 +40,7 @@ of all running virtual machines that reference this filter are updated.

Network filtering support is available since 0.8.1 - (Qemu, KVM) + (QEMU, KVM)

Concepts

@@ -2064,7 +2064,7 @@ echo 3 > /proc/sys/net/netfilter/nf_conntrack_icmp_timeout traffic you want to allow does pass.

The network filtering subsystem is currently only available on - Linux hosts and only works for Qemu and KVM type of virtual machines. + Linux hosts and only works for QEMU and KVM type of virtual machines. On Linux it builds upon the support for ebtables, iptables and ip6tables and makes use of their features. @@ -2265,7 +2265,7 @@ echo 3 > /proc/sys/net/netfilter/nf_conntrack_icmp_timeout to the incoming and outgoing direction. All this is related to the ftp data traffic originating from TCP port 20 of the VM. This then leads to the following solution - (since 0.8.5 (Qemu, KVM, UML)): + (since 0.8.5 (QEMU, KVM, UML)): 

 <filter name='test-eth0'>
diff --git a/docs/storage.html.in b/docs/storage.html.in
index 5ca13010a6..5e18f02c58 100644
--- a/docs/storage.html.in
+++ b/docs/storage.html.in
@@ -543,13 +543,13 @@
       This storage driver provides a pool which contains all RBD
       images in a RADOS pool.  RBD (RADOS Block Device) is part
       of the Ceph distributed storage project.

-      This backend only supports Qemu with RBD support. Kernel RBD
+      This backend only supports QEMU with RBD support. Kernel RBD
       which exposes RBD devices as block devices in /dev is not
       supported. RBD images created with this storage backend
       can be accessed through kernel RBD if configured manually, but
       this backend does not provide mapping for these images.

-      Images created with this backend can be attached to Qemu guests
-      when Qemu is build with RBD support (Since Qemu 0.14.0). The
+      Images created with this backend can be attached to QEMU guests
+      when QEMU is build with RBD support (Since QEMU 0.14.0). The
       backend supports cephx authentication for communication with the
       Ceph cluster. Storing the cephx authentication key is done with
       the libvirt secret mechanism. The UUID in the example pool input
@@ -595,7 +595,7 @@
 </volume>

Example disk attachment

-

RBD images can be attached to Qemu guests when Qemu is built +

RBD images can be attached to QEMU guests when QEMU is built with RBD support. Information about attaching a RBD image to a guest can be found at format domain @@ -654,7 +654,7 @@ </volume>

Example disk attachment

-

Sheepdog images can be attached to Qemu guests. +

Sheepdog images can be attached to QEMU guests. Information about attaching a Sheepdog image to a guest can be found at the format domain @@ -739,7 +739,7 @@ </volume>

Example disk attachment

-

Files within a gluster volume can be attached to Qemu guests. +

Files within a gluster volume can be attached to QEMU guests. Information about attaching a Gluster image to a guest can be found at the format domain diff --git a/libvirt.spec.in b/libvirt.spec.in index 7f3d18f72b..57ac88ef8f 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -732,7 +732,7 @@ parted and more. %if %{with_qemu} %package daemon-driver-qemu -Summary: Qemu driver plugin for the libvirtd daemon +Summary: QEMU driver plugin for the libvirtd daemon Group: Development/Libraries Requires: libvirt-daemon = %{version}-%{release} # There really is a hard cross-driver dependency here diff --git a/src/cpu/cpu_s390.c b/src/cpu/cpu_s390.c index 9503e8e2bf..247c03f22c 100644 --- a/src/cpu/cpu_s390.c +++ b/src/cpu/cpu_s390.c @@ -38,7 +38,7 @@ virCPUs390Compare(virCPUDefPtr host ATTRIBUTE_UNUSED, virCPUDefPtr cpu ATTRIBUTE_UNUSED, bool failMessages ATTRIBUTE_UNUSED) { - /* s390 relies on Qemu to perform all runability checking. Return + /* s390 relies on QEMU to perform all runability checking. Return * VIR_CPU_COMPARE_IDENTICAL to bypass Libvirt checking. */ return VIR_CPU_COMPARE_IDENTICAL; diff --git a/src/qemu/MIGRATION.txt b/src/qemu/MIGRATION.txt index a26a0f3c48..e861fd001e 100644 --- a/src/qemu/MIGRATION.txt +++ b/src/qemu/MIGRATION.txt @@ -1,7 +1,7 @@ QEMU Migration Phases ===================== -Qemu supports only migration protocols 2 and 3 (1 was lacking too many +QEMU supports only migration protocols 2 and 3 (1 was lacking too many steps). Repeating the protocol sequences from libvirt.c: Sequence v2: diff --git a/src/qemu/THREADS.txt b/src/qemu/THREADS.txt index 22d590effe..7243161fe3 100644 --- a/src/qemu/THREADS.txt +++ b/src/qemu/THREADS.txt @@ -51,7 +51,7 @@ There are a number of locks on various objects Since virDomainObjPtr lock must not be held during sleeps, the job conditions provide additional protection for code making updates. - Qemu driver uses two kinds of job conditions: asynchronous and + QEMU driver uses two kinds of job conditions: asynchronous and normal. Asynchronous job condition is used for long running jobs (such as diff --git a/src/qemu/qemu.conf b/src/qemu/qemu.conf index 9f990c20db..9925ac92d0 100644 --- a/src/qemu/qemu.conf +++ b/src/qemu/qemu.conf @@ -366,7 +366,7 @@ # "/dev/infiniband/uverbs0" -# The default format for Qemu/KVM guest save images is raw; that is, the +# The default format for QEMU/KVM guest save images is raw; that is, the # memory from the domain is dumped out directly to a file. If you have # guests with a large amount of memory, however, this can take up quite # a bit of space. If you would like to compress the images while they @@ -646,7 +646,7 @@ # #stdio_handler = "logd" -# Qemu gluster libgfapi log level, debug levels are 0-9, with 9 being the +# QEMU gluster libgfapi log level, debug levels are 0-9, with 9 being the # most verbose, and 0 representing no debugging output. # # The current logging levels defined in the gluster GFAPI are: diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index d51bab8d4a..6545a93259 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -1299,7 +1299,7 @@ qemuCheckCCWS390AddressSupport(const virDomainDef *def, } -/* Qemu 1.2 and later have a binary flag -enable-fips that must be +/* QEMU 1.2 and later have a binary flag -enable-fips that must be * used for VNC auth to obey FIPS settings; but the flag only * exists on Linux, and with no way to probe for it via QMP. Our * solution: if FIPS mode is required, then unconditionally use diff --git a/src/qemu/qemu_domain.h b/src/qemu/qemu_domain.h index 72efa3336b..7fa7173909 100644 --- a/src/qemu/qemu_domain.h +++ b/src/qemu/qemu_domain.h @@ -43,7 +43,7 @@ VIR_DOMAIN_XML_UPDATE_CPU) # if ULONG_MAX == 4294967295 -/* Qemu has a 64-bit limit, but we are limited by our historical choice of +/* QEMU has a 64-bit limit, but we are limited by our historical choice of * representing bandwidth in a long instead of a 64-bit int. */ # define QEMU_DOMAIN_MIG_BANDWIDTH_MAX ULONG_MAX # else diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c index c33b0e8473..d71f84c800 100644 --- a/src/qemu/qemu_monitor.c +++ b/src/qemu/qemu_monitor.c @@ -953,7 +953,7 @@ qemuMonitorClose(qemuMonitorPtr mon) virErrorPtr err = virSaveLastError(); virReportError(VIR_ERR_OPERATION_FAILED, "%s", - _("Qemu monitor was closed")); + _("QEMU monitor was closed")); virCopyLastError(&mon->lastError); if (err) { virSetError(err); @@ -3493,7 +3493,7 @@ qemuMonitorVMStatusToPausedReason(const char *status) return VIR_DOMAIN_PAUSED_UNKNOWN; if ((st = qemuMonitorVMStatusTypeFromString(status)) < 0) { - VIR_WARN("Qemu reported unknown VM status: '%s'", status); + VIR_WARN("QEMU reported unknown VM status: '%s'", status); return VIR_DOMAIN_PAUSED_UNKNOWN; } @@ -3516,7 +3516,7 @@ qemuMonitorVMStatusToPausedReason(const char *status) return VIR_DOMAIN_PAUSED_USER; case QEMU_MONITOR_VM_STATUS_RUNNING: - VIR_WARN("Qemu reports the guest is paused but status is 'running'"); + VIR_WARN("QEMU reports the guest is paused but status is 'running'"); return VIR_DOMAIN_PAUSED_UNKNOWN; case QEMU_MONITOR_VM_STATUS_SAVE_VM: diff --git a/src/qemu/qemu_parse_command.c b/src/qemu/qemu_parse_command.c index 89c76599ae..fc176c1681 100644 --- a/src/qemu/qemu_parse_command.c +++ b/src/qemu/qemu_parse_command.c @@ -417,7 +417,7 @@ qemuParseKeywords(const char *str, endmark = start; do { - /* Qemu accepts ',,' as an escape for a literal comma; + /* QEMU accepts ',,' as an escape for a literal comma; * skip past those here while searching for the end of the * value, then strip them down below */ endmark = strchr(endmark, ',');