From 319ed26437b731bdf5d568c2c5605550a4487be3 Mon Sep 17 00:00:00 2001 From: Michal Privoznik Date: Fri, 25 Jan 2013 12:56:48 +0100 Subject: [PATCH] qemu_monitor: Fix tray-open attribute in query-block 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. --- src/qemu/qemu_monitor_json.c | 4 ++-- src/qemu/qemu_monitor_text.c | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c index de5f1155e8..2d2a5d0450 100644 --- a/src/qemu/qemu_monitor_json.c +++ b/src/qemu/qemu_monitor_json.c @@ -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 */ diff --git a/src/qemu/qemu_monitor_text.c b/src/qemu/qemu_monitor_text.c index 6506f9da1b..bc0a11dc4d 100644 --- a/src/qemu/qemu_monitor_text.c +++ b/src/qemu/qemu_monitor_text.c @@ -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=")) {