On Mon, 2013-07-29 at 17:56 +0100, Daniel P. Berrange wrote:
> From: "Daniel P. Berrange" <berrange@xxxxxxxxxx>
>
> The VIR_DOMAIN_PAUSED_GUEST_PANICKED constant is badly named,
> leaking the QEMU event name. Elsewhere in the API we use
> 'CRASHED' rather than 'PANICKED', and the addition of 'GUEST'
> is redundant since all events are guest related.
>
> Thus rename it to VIR_DOMAIN_PAUSED_CRASHED, which matches
> with VIR_DOMAIN_RUNNING_CRASHED and VIR_DOMAIN_EVENT_CRASHED.
>
> It was added in commit 14e7e0ae8db9843aea80245a3d9e6cf5f2ef720d
> which post-dates v1.1.0, so is safe to rename before 1.1.1
>
> Signed-off-by: Daniel P. Berrange <berrange@xxxxxxxxxx>
ACK.
Thanks,
Chen
> ---
> include/libvirt/libvirt.h.in | 2 +-
> src/qemu/qemu_monitor.c | 2 +-
> src/qemu/qemu_process.c | 2 +-
> tools/virsh-domain-monitor.c | 4 ++--
> 4 files changed, 5 insertions(+), 5 deletions(-)
>
> diff --git a/include/libvirt/libvirt.h.in b/include/libvirt/libvirt.h.in
> index 4eae7bf..7bd3559 100644
> --- a/include/libvirt/libvirt.h.in
> +++ b/include/libvirt/libvirt.h.in
> @@ -181,7 +181,7 @@ typedef enum {
> VIR_DOMAIN_PAUSED_FROM_SNAPSHOT = 7, /* paused after restoring from snapshot */
> VIR_DOMAIN_PAUSED_SHUTTING_DOWN = 8, /* paused during shutdown process */
> VIR_DOMAIN_PAUSED_SNAPSHOT = 9, /* paused while creating a snapshot */
> - VIR_DOMAIN_PAUSED_GUEST_PANICKED = 10, /* paused due to a guest panicked event */
> + VIR_DOMAIN_PAUSED_CRASHED = 10, /* paused due to a guest crash */
>
> #ifdef VIR_ENUM_SENTINELS
> VIR_DOMAIN_PAUSED_LAST
> diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c
> index 0b73411..5b2fb04 100644
> --- a/src/qemu/qemu_monitor.c
> +++ b/src/qemu/qemu_monitor.c
> @@ -3335,7 +3335,7 @@ int qemuMonitorVMStatusToPausedReason(const char *status)
> return VIR_DOMAIN_PAUSED_WATCHDOG;
>
> case QEMU_MONITOR_VM_STATUS_GUEST_PANICKED:
> - return VIR_DOMAIN_PAUSED_GUEST_PANICKED;
> + return VIR_DOMAIN_PAUSED_CRASHED;
>
> /* unreachable from this point on */
> case QEMU_MONITOR_VM_STATUS_LAST:
> diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
> index e8e459e..d631a6f 100644
> --- a/src/qemu/qemu_process.c
> +++ b/src/qemu/qemu_process.c
> @@ -2724,7 +2724,7 @@ qemuProcessUpdateState(virQEMUDriverPtr driver, virDomainObjPtr vm)
> newState = VIR_DOMAIN_SHUTDOWN;
> newReason = VIR_DOMAIN_SHUTDOWN_UNKNOWN;
> ignore_value(VIR_STRDUP_QUIET(msg, "shutdown"));
> - } else if (reason == VIR_DOMAIN_PAUSED_GUEST_PANICKED) {
> + } else if (reason == VIR_DOMAIN_PAUSED_CRASHED) {
> newState = VIR_DOMAIN_CRASHED;
> newReason = VIR_DOMAIN_CRASHED_PANICKED;
> ignore_value(VIR_STRDUP_QUIET(msg, "crashed"));
> diff --git a/tools/virsh-domain-monitor.c b/tools/virsh-domain-monitor.c
> index 98fe7fe..b29b82a 100644
> --- a/tools/virsh-domain-monitor.c
> +++ b/tools/virsh-domain-monitor.c
> @@ -228,8 +228,8 @@ vshDomainStateReasonToString(int state, int reason)
> return N_("shutting down");
> case VIR_DOMAIN_PAUSED_SNAPSHOT:
> return N_("creating snapshot");
> - case VIR_DOMAIN_PAUSED_GUEST_PANICKED:
> - return N_("guest panicked");
> + case VIR_DOMAIN_PAUSED_CRASHED:
> + return N_("crashed");
> case VIR_DOMAIN_PAUSED_UNKNOWN:
> case VIR_DOMAIN_PAUSED_LAST:
> ;
--
libvir-list mailing list
libvir-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/libvir-list