62 lines
2.2 KiB
Diff
62 lines
2.2 KiB
Diff
From d8ded821aa698b3b03bd9089fbd6c2b33da87b9e Mon Sep 17 00:00:00 2001
|
|
From: Miroslav Rezanina <mrezanin@redhat.com>
|
|
Date: Wed, 8 Jul 2020 08:35:50 +0200
|
|
Subject: Use qemu-kvm in documentation instead of qemu-system-<arch>
|
|
|
|
Patchwork-id: 62380
|
|
O-Subject: [RHEV-7.1 qemu-kvm-rhev PATCHv4] Use qemu-kvm in documentation instead of qemu-system-i386
|
|
Bugzilla: 1140620
|
|
RH-Acked-by: Laszlo Ersek <lersek@redhat.com>
|
|
RH-Acked-by: Markus Armbruster <armbru@redhat.com>
|
|
RH-Acked-by: Stefan Hajnoczi <stefanha@redhat.com>
|
|
|
|
From: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
|
We change the name and location of qemu-kvm binaries. Update documentation
|
|
to reflect this change. Only architectures available in RHEL are updated.
|
|
|
|
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
---
|
|
docs/defs.rst.inc | 4 ++--
|
|
qemu-options.hx | 10 +++++-----
|
|
2 files changed, 7 insertions(+), 7 deletions(-)
|
|
|
|
diff --git a/docs/defs.rst.inc b/docs/defs.rst.inc
|
|
index 52d6454b93..d74dbdeca9 100644
|
|
--- a/docs/defs.rst.inc
|
|
+++ b/docs/defs.rst.inc
|
|
@@ -9,7 +9,7 @@
|
|
but the manpages will end up misrendered with following normal text
|
|
incorrectly in boldface.
|
|
|
|
-.. |qemu_system| replace:: qemu-system-x86_64
|
|
-.. |qemu_system_x86| replace:: qemu-system-x86_64
|
|
+.. |qemu_system| replace:: qemu-kvm
|
|
+.. |qemu_system_x86| replace:: qemu-kvm
|
|
.. |I2C| replace:: I\ :sup:`2`\ C
|
|
.. |I2S| replace:: I\ :sup:`2`\ S
|
|
diff --git a/qemu-options.hx b/qemu-options.hx
|
|
index 7f99d15b23..ea02ca3a45 100644
|
|
--- a/qemu-options.hx
|
|
+++ b/qemu-options.hx
|
|
@@ -3300,11 +3300,11 @@ SRST
|
|
|
|
::
|
|
|
|
- qemu -m 512 -object memory-backend-file,id=mem,size=512M,mem-path=/hugetlbfs,share=on \
|
|
- -numa node,memdev=mem \
|
|
- -chardev socket,id=chr0,path=/path/to/socket \
|
|
- -netdev type=vhost-user,id=net0,chardev=chr0 \
|
|
- -device virtio-net-pci,netdev=net0
|
|
+ qemu-kvm -m 512 -object memory-backend-file,id=mem,size=512M,mem-path=/hugetlbfs,share=on \
|
|
+ -numa node,memdev=mem \
|
|
+ -chardev socket,id=chr0,path=/path/to/socket \
|
|
+ -netdev type=vhost-user,id=net0,chardev=chr0 \
|
|
+ -device virtio-net-pci,netdev=net0
|
|
|
|
``-netdev vhost-vdpa[,vhostdev=/path/to/dev][,vhostfd=h]``
|
|
Establish a vhost-vdpa netdev.
|
|
--
|
|
2.31.1
|
|
|