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

qemu_monitor: Fix tray-open attribute in query-block

Browse Source 
With our code, we fail to query for tray-open attribute currently.
That's because in HMP it is 'tray-open' and in QMP it's 'tray_open'.
It always has been. However, we got it exactly the opposite.
This commit is contained in:
Michal Privoznik 2013-01-25 12:56:48 +01:00
parent c29eafc890
commit 319ed26437
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/qemu/qemu_monitor_json.c
View File

@ -1585,10 +1585,10 @@ int qemuMonitorJSONGetBlockInfo(qemuMonitorPtr mon,
goto cleanup;
}
/* Don't check for success here, because 'tray-open' is presented iff
/* Don't check for success here, because 'tray_open' is presented iff
* medium is ejected.
*/
ignore_value(virJSONValueObjectGetBoolean(dev, "tray-open",
ignore_value(virJSONValueObjectGetBoolean(dev, "tray_open",
&info->tray_open));
/* Missing io-status indicates no error */

6
src/qemu/qemu_monitor_text.c
View File

@ -809,10 +809,10 @@ int qemuMonitorTextGetBlockInfo(qemuMonitorPtr mon,
VIR_DEBUG("error reading locked: %s", p);
else
info->locked = (tmp != 0);
} else if (STRPREFIX(p, "tray_open=")) {
p += strlen("tray_open=");
} else if (STRPREFIX(p, "tray-open=")) {
p += strlen("tray-open=");
if (virStrToLong_i(p, &dummy, 10, &tmp) == -1)
VIR_DEBUG("error reading tray_open: %s", p);
VIR_DEBUG("error reading tray-open: %s", p);
else
info->tray_open = (tmp != 0);
} else if (STRPREFIX(p, "io-status=")) {