|
 |
26ba25 |
From b1b31310c45e28770c779969e2a3692daa3eb28c Mon Sep 17 00:00:00 2001
|
|
|
26ba25 |
From: Eduardo Habkost <ehabkost@redhat.com>
|
|
|
26ba25 |
Date: Tue, 3 Jul 2018 13:27:24 +0200
|
|
|
26ba25 |
Subject: [PATCH 185/268] qemu-options: Add missing newline to -accel help text
|
|
|
26ba25 |
|
|
|
26ba25 |
RH-Author: Eduardo Habkost <ehabkost@redhat.com>
|
|
|
26ba25 |
Message-id: <20180703132724.21964-2-ehabkost@redhat.com>
|
|
|
26ba25 |
Patchwork-id: 81208
|
|
|
26ba25 |
O-Subject: [RHEL-7.6 qemu-kvm-rhev PATCH 1/1] qemu-options: Add missing newline to -accel help text
|
|
|
26ba25 |
Bugzilla: 1586313
|
|
|
26ba25 |
RH-Acked-by: Paolo Bonzini <pbonzini@redhat.com>
|
|
|
26ba25 |
RH-Acked-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
|
|
|
26ba25 |
RH-Acked-by: Igor Mammedov <imammedo@redhat.com>
|
|
|
26ba25 |
|
|
|
26ba25 |
The newline was removed by commit c97d6d2c, and broke -help output:
|
|
|
26ba25 |
|
|
|
26ba25 |
Before this patch:
|
|
|
26ba25 |
|
|
|
26ba25 |
$ qemu-system-x86_64 -help | grep smp
|
|
|
26ba25 |
thread=single|multi (enable multi-threaded TCG)-smp [...]
|
|
|
26ba25 |
|
|
|
26ba25 |
After this patch:
|
|
|
26ba25 |
|
|
|
26ba25 |
$ qemu-system-x86_64 -help | grep smp
|
|
|
26ba25 |
-smp [cpus=]n[,maxcpus=cpus][,cores=cores][,threads=threads][,sockets=sockets]
|
|
|
26ba25 |
|
|
|
26ba25 |
Fixes: c97d6d2cdf97edb4aebe832fdba65d701ad7bcb6
|
|
|
26ba25 |
Cc: Sergio Andres Gomez Del Real <sergio.g.delreal@gmail.com>
|
|
|
26ba25 |
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
|
|
|
26ba25 |
Message-Id: <20180611195607.3015-1-ehabkost@redhat.com>
|
|
|
26ba25 |
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
|
|
|
26ba25 |
(cherry picked from commit 0b3c5c81bf0a9e32fd08c532acde3caa446b3712)
|
|
|
26ba25 |
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
|
|
|
26ba25 |
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
26ba25 |
---
|
|
|
26ba25 |
qemu-options.hx | 2 +-
|
|
|
26ba25 |
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
26ba25 |
|
|
|
26ba25 |
diff --git a/qemu-options.hx b/qemu-options.hx
|
|
|
26ba25 |
index 43f10b1..4271cd3 100644
|
|
|
26ba25 |
--- a/qemu-options.hx
|
|
|
26ba25 |
+++ b/qemu-options.hx
|
|
|
26ba25 |
@@ -130,7 +130,7 @@ ETEXI
|
|
|
26ba25 |
DEF("accel", HAS_ARG, QEMU_OPTION_accel,
|
|
|
26ba25 |
"-accel [accel=]accelerator[,thread=single|multi]\n"
|
|
|
26ba25 |
" select accelerator (kvm, xen, hax, hvf, whpx or tcg; use 'help' for a list)\n"
|
|
|
26ba25 |
- " thread=single|multi (enable multi-threaded TCG)", QEMU_ARCH_ALL)
|
|
|
26ba25 |
+ " thread=single|multi (enable multi-threaded TCG)\n", QEMU_ARCH_ALL)
|
|
|
26ba25 |
STEXI
|
|
|
26ba25 |
@item -accel @var{name}[,prop=@var{value}[,...]]
|
|
|
26ba25 |
@findex -accel
|
|
|
26ba25 |
--
|
|
|
26ba25 |
1.8.3.1
|
|
|
26ba25 |
|