[libvirt] [PATCH v2] doc: fix writing of QEMU

Philipp Hahn posted 1 patch 7 years ago
Patches applied successfully (tree, apply log)
git fetch https://github.com/patchew-project/libvirt tags/patchew/7cb2fb8f5815a27c6c84763a0f3edfe2eaf9f7c9.1488906488.git.hahn@univention.de
ChangeLog-old                 |  4 ++--
docs/formatnwfilter.html.in   |  6 +++---
docs/storage.html.in          | 12 ++++++------
libvirt.spec.in               |  2 +-
po/libvirt.pot                |  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 +-
13 files changed, 24 insertions(+), 24 deletions(-)
[libvirt] [PATCH v2] doc: fix writing of QEMU
Posted by Philipp Hahn 7 years ago
QEMU should be written all upper or all lower case.
---
v2: Drop docs/news-* as they are historic.
    Drop po/*.po files as they are from extern.

 ChangeLog-old                 |  4 ++--
 docs/formatnwfilter.html.in   |  6 +++---
 docs/storage.html.in          | 12 ++++++------
 libvirt.spec.in               |  2 +-
 po/libvirt.pot                |  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 +-
 13 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/ChangeLog-old b/ChangeLog-old
index e38a9bd..b903b54 100644
--- a/ChangeLog-old
+++ b/ChangeLog-old
@@ -576,7 +576,7 @@ Fri May 29 10:00:01 EDT 2009 Cole Robinson <crobinso@redhat.com>
 Fri May 29 15:29:32 CEST 2009 Daniel Veillard <veillard@redhat.com>
 
 	* src/qemu_conf.c docs/schemas/domain.rng
-	  tests/capabilityschemadata/caps-qemu-kvm.xml: PPC Qemu Machine Type
+	  tests/capabilityschemadata/caps-qemu-kvm.xml: PPC QEMU Machine Type
 	  changed from g3bw to g3beige some time ago, patch by Thomas Baker
 
 Fri May 29 14:26:30 BST 2009 Daniel P. Berrange <berrange@redhat.com>
@@ -8397,7 +8397,7 @@ Thu May 15 09:12:08 CEST 2008 Jim Meyering <meyering@redhat.com>
 Thu May 15 15:07:49 JST 2008 Atsushi SAKAI <sakaia@jp.fujitsu.com>
 
 	* qemud/libvirtd.init.in: change libvirtd description
-	which supports various guest not only Qemu
+	which supports various guest not only QEMU
 	* docs/*: typo fixes
 	* include/libvirt/libvirt.h, include/libvirt/libvirt.h.in,
 	qemud/event.c, qemud/qemud.c, qemud/remote.c,
diff --git a/docs/formatnwfilter.html.in b/docs/formatnwfilter.html.in
index 7ea69b5..0d32893 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.
       <br/><br/>
       Network filtering support is available <span class="since">since 0.8.1
-      (Qemu, KVM)</span>
+      (QEMU, KVM)</span>
     </p>
 
     <h2><a name="nwfconcepts">Concepts</a></h2>
@@ -2064,7 +2064,7 @@ echo 3 > /proc/sys/net/netfilter/nf_conntrack_icmp_timeout
      traffic you want to allow does pass.
      <br/><br/>
      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 <code>ebtables</code>, <code>iptables
      </code> and <code>ip6tables</code> 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
-     <span class="since">(since 0.8.5 (Qemu, KVM, UML))</span>:
+     <span class="since">(since 0.8.5 (QEMU, KVM, UML))</span>:
     </p>
 <pre>
 &lt;filter name='test-eth0'&gt;
diff --git a/docs/storage.html.in b/docs/storage.html.in
index 10b1f1f..6ff38a5 100644
--- a/docs/storage.html.in
+++ b/docs/storage.html.in
@@ -549,13 +549,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.<br/>
-      This backend <i>only</i> supports Qemu with RBD support. Kernel RBD
+      This backend <i>only</i> supports QEMU with RBD support. Kernel RBD
       which exposes RBD devices as block devices in /dev is <i>not</i>
       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.<br/>
-      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
@@ -601,7 +601,7 @@
 &lt;/volume&gt;</pre>
 
     <h3>Example disk attachment</h3>
-    <p>RBD images can be attached to Qemu guests when Qemu is built
+    <p>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 <a href="formatdomain.html#elementsDisks">format domain</a>
@@ -661,7 +661,7 @@
 &lt;/volume&gt;</pre>
 
     <h3>Example disk attachment</h3>
-    <p>Sheepdog images can be attached to Qemu guests.
+    <p>Sheepdog images can be attached to QEMU guests.
     Information about attaching a Sheepdog image to a
     guest can be found
     at the <a href="formatdomain.html#elementsDisks">format domain</a>
@@ -746,7 +746,7 @@
 &lt;/volume&gt;</pre>
 
     <h3>Example disk attachment</h3>
-    <p>Files within a gluster volume can be attached to Qemu guests.
+    <p>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 <a href="formatdomain.html#elementsDisks">format domain</a>
diff --git a/libvirt.spec.in b/libvirt.spec.in
index 7f3d18f..57ac88e 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/po/libvirt.pot b/po/libvirt.pot
index 5afca8b..463e30b 100644
--- a/po/libvirt.pot
+++ b/po/libvirt.pot
@@ -19818,7 +19818,7 @@ msgid "Error notify callback must be supplied"
 msgstr ""
 
 #: src/qemu/qemu_monitor.c:956
-msgid "Qemu monitor was closed"
+msgid "QEMU monitor was closed"
 msgstr ""
 
 #: src/qemu/qemu_monitor.c:1014
diff --git a/src/cpu/cpu_s390.c b/src/cpu/cpu_s390.c
index 9503e8e..247c03f 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 a26a0f3..e861fd0 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 22d590e..7243161 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 9f990c2..9925ac9 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 41eecfd..5e8757e 100644
--- a/src/qemu/qemu_command.c
+++ b/src/qemu/qemu_command.c
@@ -1298,7 +1298,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 72efa33..7fa7173 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 b15207a..aa67f35 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 a215027..c6b2203 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, ',');
-- 
2.1.4

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list
Re: [libvirt] [PATCH v2] doc: fix writing of QEMU
Posted by Martin Kletzander 7 years ago
On Tue, Mar 07, 2017 at 06:09:58PM +0100, Philipp Hahn wrote:
>QEMU should be written all upper or all lower case.
>---
>v2: Drop docs/news-* as they are historic.
>    Drop po/*.po files as they are from extern.
>
> ChangeLog-old                 |  4 ++--

I also dropped this as it's even marked 'old' :)

> docs/formatnwfilter.html.in   |  6 +++---
> docs/storage.html.in          | 12 ++++++------
> libvirt.spec.in               |  2 +-
> po/libvirt.pot                |  2 +-

This will be refreshed on release, so I dropped that as well.  Even
though I get why it would make sense, it would need a full refresh of
all .po files and it will be refreshed during release anyway.

Will push this in a while with those two changes dropped.
--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list