Blame SOURCES/0016-Use-qemu-kvm-in-documentation-instead-of-qemu-system.patch

28f2e1
From 0d3fc0b4c5773c6cabb0a58c064475f76eb6ac1e Mon Sep 17 00:00:00 2001
febaa2
From: Miroslav Rezanina <mrezanin@redhat.com>
febaa2
Date: Wed, 8 Jul 2020 08:35:50 +0200
febaa2
Subject: Use qemu-kvm in documentation instead of qemu-system-<arch>
febaa2
febaa2
Patchwork-id: 62380
febaa2
O-Subject: [RHEV-7.1 qemu-kvm-rhev PATCHv4] Use qemu-kvm in documentation instead of qemu-system-i386
febaa2
Bugzilla: 1140620
febaa2
RH-Acked-by: Laszlo Ersek <lersek@redhat.com>
febaa2
RH-Acked-by: Markus Armbruster <armbru@redhat.com>
febaa2
RH-Acked-by: Stefan Hajnoczi <stefanha@redhat.com>
febaa2
febaa2
From: Miroslav Rezanina <mrezanin@redhat.com>
febaa2
febaa2
We change the name and location of qemu-kvm binaries. Update documentation
febaa2
to reflect this change. Only architectures available in RHEL are updated.
febaa2
febaa2
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
febaa2
febaa2
Rebase notes (5.1.0 rc0):
febaa2
 - qemu-block-drivers.texi converted to qemu-block-drivers.rst (upstream)
febaa2
febaa2
Rebase notes (5.2.0 rc0):
febaa2
 - rewrite patch to new docs structure
febaa2
---
febaa2
 docs/defs.rst.inc              |  4 ++--
febaa2
 docs/tools/qemu-trace-stap.rst | 14 +++++++-------
febaa2
 qemu-options.hx                | 10 +++++-----
febaa2
 3 files changed, 14 insertions(+), 14 deletions(-)
febaa2
febaa2
diff --git a/docs/defs.rst.inc b/docs/defs.rst.inc
febaa2
index 52d6454b93..d74dbdeca9 100644
febaa2
--- a/docs/defs.rst.inc
febaa2
+++ b/docs/defs.rst.inc
febaa2
@@ -9,7 +9,7 @@
febaa2
    but the manpages will end up misrendered with following normal text
febaa2
    incorrectly in boldface.
febaa2
 
febaa2
-.. |qemu_system| replace:: qemu-system-x86_64
febaa2
-.. |qemu_system_x86| replace:: qemu-system-x86_64
febaa2
+.. |qemu_system| replace:: qemu-kvm
febaa2
+.. |qemu_system_x86| replace:: qemu-kvm
febaa2
 .. |I2C| replace:: I\ :sup:`2`\ C
febaa2
 .. |I2S| replace:: I\ :sup:`2`\ S
febaa2
diff --git a/docs/tools/qemu-trace-stap.rst b/docs/tools/qemu-trace-stap.rst
28f2e1
index d53073b52b..9e93df084f 100644
febaa2
--- a/docs/tools/qemu-trace-stap.rst
febaa2
+++ b/docs/tools/qemu-trace-stap.rst
28f2e1
@@ -46,19 +46,19 @@ The following commands are valid:
febaa2
   any of the listed names. If no *PATTERN* is given, the all possible
febaa2
   probes will be listed.
febaa2
 
febaa2
-  For example, to list all probes available in the ``qemu-system-x86_64``
febaa2
+  For example, to list all probes available in the ``qemu-kvm``
febaa2
   binary:
febaa2
 
febaa2
   ::
febaa2
 
febaa2
-    $ qemu-trace-stap list qemu-system-x86_64
febaa2
+    $ qemu-trace-stap list qemu-kvm
febaa2
 
febaa2
   To filter the list to only cover probes related to QEMU's cryptographic
febaa2
   subsystem, in a binary outside ``$PATH``
febaa2
 
febaa2
   ::
febaa2
 
febaa2
-    $ qemu-trace-stap list /opt/qemu/4.0.0/bin/qemu-system-x86_64 'qcrypto*'
febaa2
+    $ qemu-trace-stap list /opt/qemu/4.0.0/bin/qemu-kvm 'qcrypto*'
febaa2
 
febaa2
 .. option:: run OPTIONS BINARY PATTERN...
febaa2
 
28f2e1
@@ -90,18 +90,18 @@ The following commands are valid:
febaa2
     Restrict the tracing session so that it only triggers for the process
febaa2
     identified by *PID*.
febaa2
 
febaa2
-  For example, to monitor all processes executing ``qemu-system-x86_64``
febaa2
+  For example, to monitor all processes executing ``qemu-kvm``
febaa2
   as found on ``$PATH``, displaying all I/O related probes:
febaa2
 
febaa2
   ::
febaa2
 
febaa2
-    $ qemu-trace-stap run qemu-system-x86_64 'qio*'
febaa2
+    $ qemu-trace-stap run qemu-kvm 'qio*'
febaa2
 
febaa2
   To monitor only the QEMU process with PID 1732
febaa2
 
febaa2
   ::
febaa2
 
febaa2
-    $ qemu-trace-stap run --pid=1732 qemu-system-x86_64 'qio*'
febaa2
+    $ qemu-trace-stap run --pid=1732 qemu-kvm 'qio*'
febaa2
 
febaa2
   To monitor QEMU processes running an alternative binary outside of
febaa2
   ``$PATH``, displaying verbose information about setup of the
28f2e1
@@ -109,7 +109,7 @@ The following commands are valid:
febaa2
 
febaa2
   ::
febaa2
 
febaa2
-    $ qemu-trace-stap -v run /opt/qemu/4.0.0/qemu-system-x86_64 'qio*'
febaa2
+    $ qemu-trace-stap -v run /opt/qemu/4.0.0/qemu-kvm 'qio*'
febaa2
 
febaa2
 See also
febaa2
 --------
febaa2
diff --git a/qemu-options.hx b/qemu-options.hx
28f2e1
index ae2c6dbbfc..94c4a8dbaf 100644
febaa2
--- a/qemu-options.hx
febaa2
+++ b/qemu-options.hx
28f2e1
@@ -3150,11 +3150,11 @@ SRST
febaa2
 
febaa2
     ::
febaa2
 
febaa2
-        qemu -m 512 -object memory-backend-file,id=mem,size=512M,mem-path=/hugetlbfs,share=on \
febaa2
-             -numa node,memdev=mem \
febaa2
-             -chardev socket,id=chr0,path=/path/to/socket \
febaa2
-             -netdev type=vhost-user,id=net0,chardev=chr0 \
febaa2
-             -device virtio-net-pci,netdev=net0
febaa2
+        qemu-kvm -m 512 -object memory-backend-file,id=mem,size=512M,mem-path=/hugetlbfs,share=on \
febaa2
+                 -numa node,memdev=mem \
febaa2
+                 -chardev socket,id=chr0,path=/path/to/socket \
febaa2
+                 -netdev type=vhost-user,id=net0,chardev=chr0 \
febaa2
+                 -device virtio-net-pci,netdev=net0
febaa2
 
febaa2
 ``-netdev vhost-vdpa,vhostdev=/path/to/dev``
febaa2
     Establish a vhost-vdpa netdev.
febaa2
-- 
28f2e1
2.27.0
febaa2