Xen devel - Mar 2013 - Re: [Xen-staging] [xen staging] libxl: use qemu-xen (upstream QEMU) as device model by default

>      if (!b_info->device_model_version) {
> -        if (b_info->type == LIBXL_DOMAIN_TYPE_HVM) {
> -            b_info->device_model_version > -               
LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN_TRADITIONAL;
> +        if (b_info->type == LIBXL_DOMAIN_TYPE_HVM)
> +            if (libxl_defbool_val(info->device_model_stubdomain)) {
This broke the build.

8<--------------------------------------------------------

From 30c09da84ce5b89edee26a6a62aee933fc0ea298 Mon Sep 17 00:00:00 2001
From: Ian Campbell <ian.campbell@citrix.com>
Date: Thu, 14 Mar 2013 09:38:02 +0000
Subject: [PATCH] tools: libxl: unbreak build after ec41430ef6a7
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

libxl_create.c: In function ‘libxl__domain_build_info_setdefault’:
libxl_create.c:109: error: ‘info’ undeclared (first use in this function)
libxl_create.c:109: error: (Each undeclared identifier is reported only once
libxl_create.c:109: error: for each function it appears in.)
cc1: warnings being treated as errors
libxl_create.c:108: error: suggest explicit braces to avoid ambiguous ‘else’
libxl_create.c: At top level:
libxl_create.c:141: error: expected identifier or ‘(’ before ‘if’
...

Fix is to insert the missing opening brace and s/info/b_info/ in one spot.

Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
---
 tools/libxl/libxl_create.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/tools/libxl/libxl_create.c b/tools/libxl/libxl_create.c
index 7ec8c2b..2ea628a 100644
--- a/tools/libxl/libxl_create.c
+++ b/tools/libxl/libxl_create.c
@@ -105,8 +105,8 @@ int libxl__domain_build_info_setdefault(libxl__gc *gc,
     libxl_defbool_setdefault(&b_info->device_model_stubdomain, false);
 
     if (!b_info->device_model_version) {
-        if (b_info->type == LIBXL_DOMAIN_TYPE_HVM)
-            if (libxl_defbool_val(info->device_model_stubdomain)) {
+        if (b_info->type == LIBXL_DOMAIN_TYPE_HVM) {
+            if (libxl_defbool_val(b_info->device_model_stubdomain)) {
                 b_info->device_model_version                     
LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN_TRADITIONAL;
             } else {
-- 
1.7.2.5




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

Ian Campbell writes ("Re: [Xen-devel] [Xen-staging] [xen staging] libxl:
use qemu-xen (upstream QEMU) as device model by
default"):
> >      if (!b_info->device_model_version) {
> > -        if (b_info->type == LIBXL_DOMAIN_TYPE_HVM) {
> > -            b_info->device_model_version > > -              
LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN_TRADITIONAL;
> > +        if (b_info->type == LIBXL_DOMAIN_TYPE_HVM)
> > +            if (libxl_defbool_val(info->device_model_stubdomain))
{
> 
> This broke the build.
Sorry about that.  I must not even have build-tested this "final"
version :-/.
> libxl_create.c: In function ‘libxl__domain_build_info_setdefault’:
> libxl_create.c:109: error: ‘info’ undeclared (first use in this function)
> libxl_create.c:109: error: (Each undeclared identifier is reported only
once
> libxl_create.c:109: error: for each function it appears in.)
> cc1: warnings being treated as errors
> libxl_create.c:108: error: suggest explicit braces to avoid ambiguous
‘else’
> libxl_create.c: At top level:
> libxl_create.c:141: error: expected identifier or ‘(’ before ‘if’
> ...
> 
> Fix is to insert the missing opening brace and s/info/b_info/ in one spot.
Applied, thanks.

Ian.

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