On Fri, Jul 24, 2015 at 05:26:36PM +0800, Cao jin wrote:

Signed-off-by: Cao jin <caoj.fnst@cn.fujitsu.com> --- src/qemu/qemu_monitor.c | 2 +- src/qemu/qemu_monitor.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c index 15ba39b..beaf585 100644 --- a/src/qemu/qemu_monitor.c +++ b/src/qemu/qemu_monitor.c @@ -3345,7 +3345,7 @@ qemuMonitorVMStatusToPausedReason(const char *status) case QEMU_MONITOR_VM_STATUS_WATCHDOG: return VIR_DOMAIN_PAUSED_WATCHDOG;

- case QEMU_MONITOR_VM_STATUS_GUEST_PANICKED: + case QEMU_MONITOR_VM_STATUS_GUEST_PANICED:

Actually, the original is correct -- it is "PANICKED" (notice the 'K').

return VIR_DOMAIN_PAUSED_CRASHED;

/* unreachable from this point on */ diff --git a/src/qemu/qemu_monitor.h b/src/qemu/qemu_monitor.h index 1e7b6bb..f12aa99 100644 --- a/src/qemu/qemu_monitor.h +++ b/src/qemu/qemu_monitor.h @@ -259,7 +259,7 @@ void qemuMonitorSetOptions(qemuMonitorPtr mon, virJSONValuePtr options) ATTRIBUTE_NONNULL(1); int qemuMonitorUpdateVideoMemorySize(qemuMonitorPtr mon, virDomainVideoDefPtr video, - const char *videName) + const char *videoName)

This seems correct, though. Given: $ git grep videoName src/qemu/qemu_monitor.c: const char *videoName) src/qemu/qemu_monitor.c: ret = qemuMonitorJSONFindLinkPath(mon, videoName, &path); src/qemu/qemu_monitor.c: "device '%s'"), videoName);

ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(3); int qemuMonitorHMPCommandWithFd(qemuMonitorPtr mon, const char *cmd, @@ -342,7 +342,7 @@ typedef enum { QEMU_MONITOR_VM_STATUS_SAVE_VM, QEMU_MONITOR_VM_STATUS_SHUTDOWN, QEMU_MONITOR_VM_STATUS_WATCHDOG, - QEMU_MONITOR_VM_STATUS_GUEST_PANICKED, + QEMU_MONITOR_VM_STATUS_GUEST_PANICED,

Here too, the original is correct.

QEMU_MONITOR_VM_STATUS_LAST } qemuMonitorVMStatus; -- 2.1.0

-- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list

-- /kashyap