ddf19c
From 97ed62562b883c384346bfef3e1c7e379f03ccab Mon Sep 17 00:00:00 2001
ddf19c
From: Miroslav Rezanina <mrezanin@redhat.com>
ddf19c
Date: Fri, 30 Nov 2018 09:11:03 +0100
ddf19c
Subject: Use qemu-kvm in documentation instead of qemu-system-<arch>
ddf19c
ddf19c
Patchwork-id: 62380
ddf19c
O-Subject: [RHEV-7.1 qemu-kvm-rhev PATCHv4] Use qemu-kvm in documentation instead of qemu-system-i386
ddf19c
Bugzilla: 1140620
ddf19c
RH-Acked-by: Laszlo Ersek <lersek@redhat.com>
ddf19c
RH-Acked-by: Markus Armbruster <armbru@redhat.com>
ddf19c
RH-Acked-by: Stefan Hajnoczi <stefanha@redhat.com>
ddf19c
ddf19c
From: Miroslav Rezanina <mrezanin@redhat.com>
ddf19c
ddf19c
We change the name and location of qemu-kvm binaries. Update documentation
ddf19c
to reflect this change. Only architectures available in RHEL are updated.
ddf19c
ddf19c
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
ddf19c
Signed-off-by: Danilo C. L. de Paula <ddepaula@redhat.com>
ddf19c
---
ddf19c
 docs/qemu-block-drivers.texi |  2 +-
ddf19c
 docs/qemu-cpu-models.texi    |  2 +-
ddf19c
 qemu-doc.texi                |  6 +++---
ddf19c
 qemu-options.hx              | 16 ++++++++--------
ddf19c
 4 files changed, 13 insertions(+), 13 deletions(-)
ddf19c
ddf19c
diff --git a/docs/qemu-block-drivers.texi b/docs/qemu-block-drivers.texi
ddf19c
index 2c7ea49c32..5d0afb3dee 100644
ddf19c
--- a/docs/qemu-block-drivers.texi
ddf19c
+++ b/docs/qemu-block-drivers.texi
ddf19c
@@ -2,7 +2,7 @@
ddf19c
 QEMU block driver reference manual
ddf19c
 @c man end
ddf19c
 
ddf19c
-@set qemu_system qemu-system-x86_64
ddf19c
+@set qemu_system qemu-kvm
ddf19c
 
ddf19c
 @c man begin DESCRIPTION
ddf19c
 
ddf19c
diff --git a/docs/qemu-cpu-models.texi b/docs/qemu-cpu-models.texi
ddf19c
index f88a1def0d..c82cf8fab7 100644
ddf19c
--- a/docs/qemu-cpu-models.texi
ddf19c
+++ b/docs/qemu-cpu-models.texi
ddf19c
@@ -2,7 +2,7 @@
ddf19c
 QEMU / KVM CPU model configuration
ddf19c
 @c man end
ddf19c
 
ddf19c
-@set qemu_system_x86 qemu-system-x86_64
ddf19c
+@set qemu_system_x86 qemu-kvm
ddf19c
 
ddf19c
 @c man begin DESCRIPTION
ddf19c
 
ddf19c
diff --git a/qemu-doc.texi b/qemu-doc.texi
ddf19c
index 3ddf5c0a68..d460f8d2c0 100644
ddf19c
--- a/qemu-doc.texi
ddf19c
+++ b/qemu-doc.texi
ddf19c
@@ -11,8 +11,8 @@
ddf19c
 @paragraphindent 0
ddf19c
 @c %**end of header
ddf19c
 
ddf19c
-@set qemu_system qemu-system-x86_64
ddf19c
-@set qemu_system_x86 qemu-system-x86_64
ddf19c
+@set qemu_system qemu-kvm
ddf19c
+@set qemu_system_x86 qemu-kvm
ddf19c
 
ddf19c
 @ifinfo
ddf19c
 @direntry
ddf19c
@@ -1827,7 +1827,7 @@ Set the initial VGA graphic mode. The default is 800x600x32.
ddf19c
 Set OpenBIOS variables in NVRAM, for example:
ddf19c
 
ddf19c
 @example
ddf19c
-qemu-system-ppc -prom-env 'auto-boot?=false' \
ddf19c
+qemu-kvm -prom-env 'auto-boot?=false' \
ddf19c
  -prom-env 'boot-device=hd:2,\yaboot' \
ddf19c
  -prom-env 'boot-args=conf=hd:2,\yaboot.conf'
ddf19c
 @end example
ddf19c
diff --git a/qemu-options.hx b/qemu-options.hx
ddf19c
index fc17aca631..df1d27b6f2 100644
ddf19c
--- a/qemu-options.hx
ddf19c
+++ b/qemu-options.hx
ddf19c
@@ -2737,11 +2737,11 @@ be created for multiqueue vhost-user.
ddf19c
 
ddf19c
 Example:
ddf19c
 @example
ddf19c
-qemu -m 512 -object memory-backend-file,id=mem,size=512M,mem-path=/hugetlbfs,share=on \
ddf19c
-     -numa node,memdev=mem \
ddf19c
-     -chardev socket,id=chr0,path=/path/to/socket \
ddf19c
-     -netdev type=vhost-user,id=net0,chardev=chr0 \
ddf19c
-     -device virtio-net-pci,netdev=net0
ddf19c
+qemu-kvm -m 512 -object memory-backend-file,id=mem,size=512M,mem-path=/hugetlbfs,share=on \
ddf19c
+         -numa node,memdev=mem \
ddf19c
+         -chardev socket,id=chr0,path=/path/to/socket \
ddf19c
+         -netdev type=vhost-user,id=net0,chardev=chr0 \
ddf19c
+         -device virtio-net-pci,netdev=net0
ddf19c
 @end example
ddf19c
 
ddf19c
 @item -netdev hubport,id=@var{id},hubid=@var{hubid}[,netdev=@var{nd}]
ddf19c
@@ -3631,14 +3631,14 @@ ETEXI
ddf19c
 
ddf19c
 DEF("realtime", HAS_ARG, QEMU_OPTION_realtime,
ddf19c
     "-realtime [mlock=on|off]\n"
ddf19c
-    "                run qemu with realtime features\n"
ddf19c
+    "                run qemu-kvm with realtime features\n"
ddf19c
     "                mlock=on|off controls mlock support (default: on)\n",
ddf19c
     QEMU_ARCH_ALL)
ddf19c
 STEXI
ddf19c
 @item -realtime mlock=on|off
ddf19c
 @findex -realtime
ddf19c
-Run qemu with realtime features.
ddf19c
-mlocking qemu and guest memory can be enabled via @option{mlock=on}
ddf19c
+Run qemu-kvm with realtime features.
ddf19c
+mlocking qemu-kvm and guest memory can be enabled via @option{mlock=on}
ddf19c
 (enabled by default).
ddf19c
 ETEXI
ddf19c
 
ddf19c
-- 
ddf19c
2.21.0
ddf19c