Re: [Xen-devel] [PATCH v6] libxl: introduce LIBXL_DOMAIN_TYPE_INVALID

[Ian Campbell <Ian.Campbell@xxxxxxxxxx>]

On Wed, 2012-06-06 at 14:42 +0100, Dario Faggioli wrote:
> @@ -1259,8 +1264,7 @@ int libxl_primary_console_exec(libxl_ctx
>          case LIBXL_DOMAIN_TYPE_PV:
>              rc = libxl_console_exec(ctx, domid_vm, 0, LIBXL_CONSOLE_TYPE_PV);
>              break;
> -        case -1:
> -            LOG(ERROR,"unable to get domain type for 
> domid=%"PRIu32,domid_vm);
> +        case LIBXL_DOMAIN_TYPE_INVALID:
>              rc = ERROR_FAIL;
>              break;
>          default:

This hunk no longer applies due to 25454:123628d31cf2 from Bamvor.
However the same code effectively exists in libxl__primary_console_find
so I resolved it by applying the same there instead, which resulted in:

--- a/tools/libxl/libxl.c
+++ b/tools/libxl/libxl.c
@@ -1313,11 +1313,9 @@ static int libxl__primary_console_find(libxl_ctx *ctx, 
uint32_t domid_vm,
             *cons_num = 0;
             *type = LIBXL_CONSOLE_TYPE_PV;
             break;
-        case -1:
-            LOG(ERROR,"unable to get domain type for domid=%"PRIu32, domid_vm);
+        case LIBXL_DOMAIN_TYPE_INVALID:
             rc = ERROR_INVAL;
             goto out;
-            break;
         default:
             abort();
         }

I'll commit this, assuming I can compile it etc.

Ian.



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