From 8f829a71b7b35c4c498ae11b655d12adef806296 Mon Sep 17 00:00:00 2001 From: Peter Krempa Date: Tue, 22 May 2018 13:13:03 +0200 Subject: [PATCH] qemu: monitor: Drop fallback to text monitor for 'inject-nmi' command MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The QMP version was added in qemu commit ab49ab5c488237f3656689 which is included in v1.1. Signed-off-by: Peter Krempa Reviewed-by: Ján Tomko --- src/qemu/qemu_monitor_json.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c index 2a7abf538e..8769cc5fad 100644 --- a/src/qemu/qemu_monitor_json.c +++ b/src/qemu/qemu_monitor_json.c @@ -4463,14 +4463,8 @@ int qemuMonitorJSONInjectNMI(qemuMonitorPtr mon) if (qemuMonitorJSONCommand(mon, cmd, &reply) < 0) goto cleanup; - if (qemuMonitorJSONHasError(reply, "CommandNotFound")) { - VIR_DEBUG("inject-nmi command not found, trying HMP"); - if (qemuMonitorTextInjectNMI(mon) < 0) - goto cleanup; - } else { - if (qemuMonitorJSONCheckError(cmd, reply) < 0) - goto cleanup; - } + if (qemuMonitorJSONCheckError(cmd, reply) < 0) + goto cleanup; ret = 0; cleanup: