External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-07-31 14:07:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

qemuMonitorJSONEjectMedia: don't stringify the replay at all

Browse Source 
Commit 256496e1 introduced a detection if "is locked" in error replay
from qemu monitor. Commit c4073657 fixed a memory leak, but it was
pointed out by Peter, that this could be done cleaner without
stringifing the replay.

Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
This commit is contained in:
Pavel Hrdina 2015-12-15 11:04:49 +01:00
parent 90791fbf96
commit cbd3d06541
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/qemu/qemu_monitor_json.c
View File

@ -2223,11 +2223,12 @@ int qemuMonitorJSONEjectMedia(qemuMonitorPtr mon,
ret = qemuMonitorJSONCheckError(cmd, reply);
if (ret < 0) {
char *replyStr = virJSONValueToString(reply, false);
if (c_strcasestr(replyStr, "is locked"))
ret = -2;
VIR_FREE(replyStr);
virJSONValuePtr error = virJSONValueObjectGet(reply, "error");
if (error) {
const char *errorStr = virJSONValueObjectGetString(error, "desc");
if (errorStr && c_strcasestr(errorStr, "is locked"))
ret = -2;
}
}
virJSONValueFree(cmd);