[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH] accel: cleanup error output
From: |
Laurent Vivier |
Subject: |
[Qemu-devel] [PATCH] accel: cleanup error output |
Date: |
Mon, 17 Jul 2017 15:21:10 +0200 |
Only emit "XXX accelerator not found", if there are not
further accelerators listed. eg
accel=kvm:tcg
doesn't print a "KVM accelerator not found" warning
when it falls back to tcg, but a
accel=kvm
prints a warning, since no fallback is given.
Suggested-by: Daniel P. Berrange <address@hidden>
Suggested-by: Paolo Bonzini <address@hidden>
Signed-off-by: Laurent Vivier <address@hidden>
---
accel/accel.c | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
diff --git a/accel/accel.c b/accel/accel.c
index fa85844..ababeb8 100644
--- a/accel/accel.c
+++ b/accel/accel.c
@@ -69,19 +69,20 @@ static int accel_init_machine(AccelClass *acc, MachineState
*ms)
void configure_accelerator(MachineState *ms)
{
- const char *p;
+ const char *accel, *p;
char buf[10];
int ret;
bool accel_initialised = false;
bool init_failed = false;
AccelClass *acc = NULL;
- p = qemu_opt_get(qemu_get_machine_opts(), "accel");
- if (p == NULL) {
+ accel = qemu_opt_get(qemu_get_machine_opts(), "accel");
+ if (accel == NULL) {
/* Use the default "accelerator", tcg */
- p = "tcg";
+ accel = "tcg";
}
+ p = accel;
while (!accel_initialised && *p != '\0') {
if (*p == ':') {
p++;
@@ -89,7 +90,6 @@ void configure_accelerator(MachineState *ms)
p = get_opt_name(buf, sizeof(buf), p, ':');
acc = accel_find(buf);
if (!acc) {
- fprintf(stderr, "\"%s\" accelerator not found.\n", buf);
continue;
}
if (acc->available && !acc->available()) {
@@ -110,7 +110,8 @@ void configure_accelerator(MachineState *ms)
if (!accel_initialised) {
if (!init_failed) {
- fprintf(stderr, "No accelerator found!\n");
+ fprintf(stderr, "-machine accel=%s: No accelerator found!\n",
+ accel);
}
exit(1);
}
--
2.9.4
- [Qemu-devel] [PATCH] accel: cleanup error output,
Laurent Vivier <=