From mboxrd@z Thu Jan 1 00:00:00 1970 From: Christoph Egger Subject: [PATCH] libxl: Introduce LIBXL_DOMAIN_TYPE_INVALID to make gcc happy Date: Fri, 18 May 2012 14:21:10 +0200 Message-ID: <4FB63EB6.10803@amd.com> References: <4FB63171.3020102@amd.com> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="------------070007020508030807000108" Return-path: In-Reply-To: <4FB63171.3020102@amd.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org To: "xen-devel@lists.xen.org" List-Id: xen-devel@lists.xenproject.org --------------070007020508030807000108 Content-Type: text/plain; charset="ISO-8859-1" Content-Transfer-Encoding: 7bit Introduce LIBXL_DOMAIN_TYPE_INVALID. Change libxl__domain_type() to return LIBXL_DOMAIN_TYPE_INVALID rather hardcoding -1. Adjust code pieces where gcc 4.5.3 claims that LIBXL_DOMAIN_TYPE_INVALID is not handled. This fixes the build error with gcc 4.5.3 reported here: http://lists.xen.org/archives/html/xen-devel/2012-05/msg01269.html Signed-off-by: Christoph Egger -- ---to satisfy European Law for business letters: Advanced Micro Devices GmbH Einsteinring 24, 85689 Dornach b. Muenchen Geschaeftsfuehrer: Alberto Bozzo, Andrew Bowd Sitz: Dornach, Gemeinde Aschheim, Landkreis Muenchen Registergericht Muenchen, HRB Nr. 43632 --------------070007020508030807000108 Content-Type: text/plain; charset="us-ascii"; name="xen_libxl.diff" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="xen_libxl.diff" Content-Description: xen_libxl.diff diff -r 99263132665b tools/libxl/libxl.c --- a/tools/libxl/libxl.c Fri May 18 12:38:55 2012 +0200 +++ b/tools/libxl/libxl.c Fri May 18 14:10:47 2012 +0200 @@ -1230,7 +1230,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: + case LIBXL_DOMAIN_TYPE_INVALID: LOG(ERROR,"unable to get domain type for domid=%"PRIu32,domid_vm); rc = ERROR_FAIL; break; diff -r 99263132665b tools/libxl/libxl_dm.c --- a/tools/libxl/libxl_dm.c Fri May 18 12:38:55 2012 +0200 +++ b/tools/libxl/libxl_dm.c Fri May 18 14:10:47 2012 +0200 @@ -257,6 +257,8 @@ static char ** libxl__build_device_model for (i = 0; b_info->extra_hvm && b_info->extra_hvm[i] != NULL; i++) flexarray_append(dm_args, b_info->extra_hvm[i]); break; + case LIBXL_DOMAIN_TYPE_INVALID: + break; } flexarray_append(dm_args, NULL); return (char **) flexarray_contents(dm_args); @@ -505,6 +507,8 @@ static char ** libxl__build_device_model for (i = 0; b_info->extra_hvm && b_info->extra_hvm[i] != NULL; i++) flexarray_append(dm_args, b_info->extra_hvm[i]); break; + case LIBXL_DOMAIN_TYPE_INVALID: + break; } ram_size = libxl__sizekb_to_mb(b_info->max_memkb - b_info->video_memkb); diff -r 99263132665b tools/libxl/libxl_dom.c --- a/tools/libxl/libxl_dom.c Fri May 18 12:38:55 2012 +0200 +++ b/tools/libxl/libxl_dom.c Fri May 18 14:10:47 2012 +0200 @@ -33,9 +33,9 @@ libxl_domain_type libxl__domain_type(lib ret = xc_domain_getinfolist(ctx->xch, domid, 1, &info); if (ret != 1) - return -1; + return LIBXL_DOMAIN_TYPE_INVALID; if (info.domain != domid) - return -1; + return LIBXL_DOMAIN_TYPE_INVALID; if (info.flags & XEN_DOMINF_hvm_guest) return LIBXL_DOMAIN_TYPE_HVM; else --------------070007020508030807000108 Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel --------------070007020508030807000108--