summaryrefslogtreecommitdiffstats
path: root/replay
diff options
context:
space:
mode:
authorMarcel Apfelbaum <marcel@redhat.com>2016-02-12 17:02:24 -0200
committerMichael Roth <mdroth@linux.vnet.ibm.com>2016-03-17 18:21:32 -0500
commitbad094d524c2204164573d929f825850e612ad84 (patch)
tree21d4f1097f101304ea886e132e59884eec183817 /replay
parent4b0b1ec8e0f772f3dc9c475b3f4cebfdb578d836 (diff)
downloadhqemu-bad094d524c2204164573d929f825850e612ad84.zip
hqemu-bad094d524c2204164573d929f825850e612ad84.tar.gz
vl.c: Fix regression in machine error message
Commit e1ce0c3cb (vl.c: fix regression when reading machine type from config file) fixed the error message when the machine type was supplied inside the config file. However now the option name is not displayed correctly if the error happens when the machine is specified at command line. Running ./x86_64-softmmu/qemu-system-x86_64 -M q35-1.5 -redir tcp:8022::22 will result in the error message: qemu-system-x86_64: -redir tcp:8022::22: unsupported machine type Use -machine help to list supported machines Fixed it by restoring the error location and also extracted the code dealing with machine options into a separate function. Reported-by: Michael S. Tsirkin <mst@redhat.com> Reviewed-by: Laszlo Ersek <lersek@redhat.com> Signed-off-by: Marcel Apfelbaum <marcel@redhat.com> Reviewed-by: Eduardo Habkost <ehabkost@redhat.com> Signed-off-by: Eduardo Habkost <ehabkost@redhat.com> Message-Id: <1455303747-19776-2-git-send-email-ehabkost@redhat.com> Signed-off-by: Markus Armbruster <armbru@redhat.com> (cherry picked from commit 34f405ae6d5c4170b192a12b2e654a2aea0c3b50) Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
Diffstat (limited to 'replay')
0 files changed, 0 insertions, 0 deletions
OpenPOWER on IntegriCloud