Re: [Xen-devel] [PATCH 09/35] libxl: Change some log messages to say `abandoning' rather than `aborting'

[Wei Liu <wei.liu2@xxxxxxxxxx>]

On Thu, Jun 25, 2015 at 06:44:09PM +0100, Ian Jackson wrote:
> We are going to introduce application-requested aborts of (ao)
> operations, but these suspend failures are something different.
> Reword to avoid confusion.
> 
> Signed-off-by: Ian Jackson <Ian.Jackson@xxxxxxxxxxxxx>

Acked-by: Wei Liu <wei.liu2@xxxxxxxxxx>

> ---
>  tools/libxl/libxl_dom.c |    6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/tools/libxl/libxl_dom.c b/tools/libxl/libxl_dom.c
> index 54908fb..ccbcb6e 100644
> --- a/tools/libxl/libxl_dom.c
> +++ b/tools/libxl/libxl_dom.c
> @@ -1242,7 +1242,7 @@ static void 
> domain_suspend_switch_qemu_xen_traditional_logdirty
>      return;
>  
>   out:
> -    LOG(ERROR,"logdirty switch failed (rc=%d), aborting suspend",rc);
> +    LOG(ERROR,"logdirty switch failed (rc=%d), abandoning suspend",rc);
>      libxl__xs_transaction_abort(gc, &t);
>      switch_logdirty_done(egc,dss,rc);
>  }
> @@ -1260,7 +1260,7 @@ static void domain_suspend_switch_qemu_xen_logdirty
>      if (!rc) {
>          libxl__xc_domain_saverestore_async_callback_done(egc, shs, 0);
>      } else {
> -        LOG(ERROR,"logdirty switch failed (rc=%d), aborting suspend",rc);
> +        LOG(ERROR,"logdirty switch failed (rc=%d), abandoning suspend",rc);
>          dss->rc = rc;
>          libxl__xc_domain_saverestore_async_callback_done(egc, shs, -1);
>      }
> @@ -1283,7 +1283,7 @@ void libxl__domain_suspend_common_switch_qemu_logdirty
>          break;
>      default:
>          LOG(ERROR,"logdirty switch failed"
> -            ", no valid device model version found, aborting suspend");
> +            ", no valid device model version found, abandoning suspend");
>          dss->rc = ERROR_FAIL;
>          libxl__xc_domain_saverestore_async_callback_done(egc, shs, -1);
>      }
> -- 
> 1.7.10.4

_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxx
http://lists.xen.org/xen-devel