[libvirt] [PATCH] Replace QEmu with QEMU

Ján Tomko jtomko at redhat.com
Sat Mar 31 15:03:48 UTC 2018


QEMU is the preferred spelling used on QEMU website.

Signed-off-by: Ján Tomko <jtomko at redhat.com>
---
 docs/architecture.html.in      | 18 +++++++++---------
 docs/drvqemu.html.in           |  4 ++--
 docs/logging.html.in           |  4 ++--
 docs/schemas/domaincommon.rng  |  2 +-
 src/network/bridge_driver.c    |  6 +++---
 src/nwfilter/nwfilter_driver.c |  2 +-
 src/qemu/qemu.conf             |  2 +-
 src/qemu/qemu_command.c        |  2 +-
 src/qemu/qemu_driver.c         |  8 ++++----
 src/util/virhook.h             |  2 +-
 10 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/docs/architecture.html.in b/docs/architecture.html.in
index f1461ba88..5e5671661 100644
--- a/docs/architecture.html.in
+++ b/docs/architecture.html.in
@@ -46,18 +46,18 @@ connect to initialize the library. It will then fork a libvirt_proxy
 program running as root and providing read_only access to the API, this is
 then only useful for reporting and monitoring.</p>
 
-    <h2><a id="QEmu">QEmu and KVM support</a></h2>
+    <h2><a id="QEMU">QEMU and KVM support</a></h2>
 
-    <p>The model for QEmu and KVM is completely similar, basically KVM is based
-on QEmu for the process controlling a new domain, only small details differs
+    <p>The model for QEMU and KVM is completely similar, basically KVM is based
+on QEMU for the process controlling a new domain, only small details differs
 between the two. In both case the libvirt API is provided by a controlling
 process forked by libvirt in the background and which launch and control the
-QEmu or KVM process. That program called libvirt_qemud talks though a specific
-protocol to the library, and connects to the console of the QEmu process in
+QEMU or KVM process. That program called libvirt_qemud talks though a specific
+protocol to the library, and connects to the console of the QEMU process in
 order to control and report on its status. Libvirt tries to expose all the
-emulations models of QEmu, the selection is done when creating the new
+emulations models of QEMU, the selection is done when creating the new
 domain, by specifying the architecture and machine type targeted.</p>
-    <p>The code controlling the QEmu process is available in the
+    <p>The code controlling the QEMU process is available in the
 <code>qemud/</code> directory.</p>
 
     <h2><a id="drivers">Driver based architecture</a></h2>
@@ -83,9 +83,9 @@ drivers present in driver.h:</p>
     is in the <code>proxy/</code> directory.</li>
       <li>xm_internal: provide support for Xen defined but not running
     domains.</li>
-      <li>qemu_internal: implement the driver functions for QEmu and
+      <li>qemu_internal: implement the driver functions for QEMU and
     KVM virtualization engines. It also uses a qemud/ specific daemon
-    which interacts with the QEmu process to implement libvirt API.</li>
+    which interacts with the QEMU process to implement libvirt API.</li>
       <li>test: this is a test driver useful for regression tests of the
     front-end part of libvirt.</li>
     </ul>
diff --git a/docs/drvqemu.html.in b/docs/drvqemu.html.in
index cb41b505d..cbd159da3 100644
--- a/docs/drvqemu.html.in
+++ b/docs/drvqemu.html.in
@@ -567,7 +567,7 @@ $ virsh domxml-to-native qemu-argv demo.xml
       </dl>
       <p>Example:</p><pre>
 <domain type='qemu' xmlns:qemu='http://libvirt.org/schemas/domain/qemu/1.0'>
-  <name>QEmu-fedora-i686</name>
+  <name>QEMU-fedora-i686</name>
   <memory>219200</memory>
   <os>
     <type arch='i686' machine='pc'>hvm</type>
@@ -587,7 +587,7 @@ $ virsh domxml-to-native qemu-argv demo.xml
     <h3>QEMU emulated guest on x86_64</h3>
 
         <pre><domain type='qemu'>
-  <name>QEmu-fedora-i686</name>
+  <name>QEMU-fedora-i686</name>
   <uuid>c7a5fdbd-cdaf-9455-926a-d65c16db1809</uuid>
   <memory>219200</memory>
   <currentMemory>219200</currentMemory>
diff --git a/docs/logging.html.in b/docs/logging.html.in
index abedc1784..be2fd4ab5 100644
--- a/docs/logging.html.in
+++ b/docs/logging.html.in
@@ -30,7 +30,7 @@
           the message is discarded, if higher the message is output. If
           no filter matches, then a general priority level is applied to
           all remaining messages. This allows, for example, capturing all
-          debug messages for the QEmu driver, but otherwise only allowing
+          debug messages for the QEMU driver, but otherwise only allowing
           errors to show up from other parts.</li>
       <li><b>log outputs</b>: once a message has gone through filtering a set of
           output defines where to send the message, they can also filter
@@ -236,7 +236,7 @@ export LIBVIRT_LOG_OUTPUTS="1:file:virsh.log"</pre>
     what is happening and where things are going wrong, allowing to then
     put the correct breakpoints when running under a debugger.</p>
     <p>To activate full debug of the libvirt entry points, utility
-    functions and the QEmu/KVM driver, set:</p>
+    functions and the QEMU/KVM driver, set:</p>
     <pre>log_filters="1:libvirt 1:util 1:qemu"
 log_outputs="1:file:/var/log/libvirt/libvirtd.log"</pre>
     <p>in libvirtd.conf and restart the daemon will allow to
diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng
index 8165e699d..a72c9190d 100644
--- a/docs/schemas/domaincommon.rng
+++ b/docs/schemas/domaincommon.rng
@@ -5821,7 +5821,7 @@
 
   <!--
        Optional hypervisor extensions in their own namespace:
-         QEmu
+         QEMU
     -->
   <define name="qemucmdline">
     <element name="commandline" ns="http://libvirt.org/schemas/domain/qemu/1.0">
diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c
index 898c94610..d326923d8 100644
--- a/src/network/bridge_driver.c
+++ b/src/network/bridge_driver.c
@@ -649,7 +649,7 @@ networkMigrateStateFiles(virNetworkDriverStatePtr driver)
 /**
  * networkStateInitialize:
  *
- * Initialization function for the QEmu daemon
+ * Initialization function for the QEMU daemon
  */
 static int
 networkStateInitialize(bool privileged,
@@ -814,7 +814,7 @@ networkStateAutoStart(void)
 /**
  * networkStateReload:
  *
- * Function to restart the QEmu daemon, it will recheck the configuration
+ * Function to restart the QEMU daemon, it will recheck the configuration
  * files and update its state and the networking
  */
 static int
@@ -840,7 +840,7 @@ networkStateReload(void)
 /**
  * networkStateCleanup:
  *
- * Shutdown the QEmu daemon, it will stop all active domains and networks
+ * Shutdown the QEMU daemon, it will stop all active domains and networks
  */
 static int
 networkStateCleanup(void)
diff --git a/src/nwfilter/nwfilter_driver.c b/src/nwfilter/nwfilter_driver.c
index 717bce269..6cc7ca699 100644
--- a/src/nwfilter/nwfilter_driver.c
+++ b/src/nwfilter/nwfilter_driver.c
@@ -166,7 +166,7 @@ nwfilterDriverInstallDBusMatches(DBusConnection *sysbus ATTRIBUTE_UNUSED)
 /**
  * nwfilterStateInitialize:
  *
- * Initialization function for the QEmu daemon
+ * Initialization function for the QEMU daemon
  */
 static int
 nwfilterStateInitialize(bool privileged,
diff --git a/src/qemu/qemu.conf b/src/qemu/qemu.conf
index 43dd561cc..07eab7eff 100644
--- a/src/qemu/qemu.conf
+++ b/src/qemu/qemu.conf
@@ -541,7 +541,7 @@
 
 
 # If clear_emulator_capabilities is enabled, libvirt will drop all
-# privileged capabilities of the QEmu/KVM emulator. This is enabled by
+# privileged capabilities of the QEMU/KVM emulator. This is enabled by
 # default.
 #
 # Warning: Disabling this option means that a compromised guest can
diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
index 89fd08b64..682d71441 100644
--- a/src/qemu/qemu_command.c
+++ b/src/qemu/qemu_command.c
@@ -10009,7 +10009,7 @@ qemuBuildCommandLine(virQEMUDriverPtr driver,
 
     /*
      * do not use boot=on for drives when not using KVM since this
-     * is not supported at all in upstream QEmu.
+     * is not supported at all in upstream QEMU.
      */
     if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_KVM) &&
         (def->virtType == VIR_DOMAIN_VIRT_QEMU))
diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index 7bcc4936d..072eb54b4 100644
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -600,7 +600,7 @@ qemuDomainFindMaxID(virDomainObjPtr vm,
 /**
  * qemuStateInitialize:
  *
- * Initialization function for the QEmu daemon
+ * Initialization function for the QEMU daemon
  */
 static int
 qemuStateInitialize(bool privileged,
@@ -951,7 +951,7 @@ qemuStateInitialize(bool privileged,
 /**
  * qemuStateAutoStart:
  *
- * Function to auto start the QEmu daemons
+ * Function to auto start the QEMU daemons
  */
 static void
 qemuStateAutoStart(void)
@@ -978,7 +978,7 @@ static void qemuNotifyLoadDomain(virDomainObjPtr vm, int newVM, void *opaque)
 /**
  * qemuStateReload:
  *
- * Function to restart the QEmu daemon, it will recheck the configuration
+ * Function to restart the QEMU daemon, it will recheck the configuration
  * files and update its state and the networking
  */
 static int
@@ -1069,7 +1069,7 @@ qemuStateStop(void)
 /**
  * qemuStateCleanup:
  *
- * Shutdown the QEmu daemon, it will stop all active domains and networks
+ * Shutdown the QEMU daemon, it will stop all active domains and networks
  */
 static int
 qemuStateCleanup(void)
diff --git a/src/util/virhook.h b/src/util/virhook.h
index 205249c55..00544c96f 100644
--- a/src/util/virhook.h
+++ b/src/util/virhook.h
@@ -28,7 +28,7 @@
 
 typedef enum {
     VIR_HOOK_DRIVER_DAEMON = 0,        /* Daemon related events */
-    VIR_HOOK_DRIVER_QEMU,              /* QEmu domains related events */
+    VIR_HOOK_DRIVER_QEMU,              /* QEMU domains related events */
     VIR_HOOK_DRIVER_LXC,               /* LXC domains related events */
     VIR_HOOK_DRIVER_NETWORK,           /* network related events */
     VIR_HOOK_DRIVER_LIBXL,             /* Xen libxl domains related events */
-- 
2.13.6




More information about the libvir-list mailing list