From: Juergen Gross Date: Wed, 30 Mar 2016 15:33:29 +0000 (+0200) Subject: libxl: handle error from libxl__need_xenpv_qemu() correctly X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~1376 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=1a7ac00fa69de7431349d9583a2b8ed724711360;p=xen.git libxl: handle error from libxl__need_xenpv_qemu() correctly In case libxl__need_xenpv_qemu() returns an error let domain creation fail. Signed-off-by: Juergen Gross Acked-by: Wei Liu --- diff --git a/tools/libxl/libxl_create.c b/tools/libxl/libxl_create.c index 4b02de9f09..af68fd8d58 100644 --- a/tools/libxl/libxl_create.c +++ b/tools/libxl/libxl_create.c @@ -1362,7 +1362,6 @@ static void domcreate_launch_dm(libxl__egc *egc, libxl__multidev *multidev, } case LIBXL_DOMAIN_TYPE_PV: { - int need_qemu = 0; libxl__device_console console; libxl__device device; @@ -1373,16 +1372,18 @@ static void domcreate_launch_dm(libxl__egc *egc, libxl__multidev *multidev, init_console_info(gc, &console, 0); - need_qemu = libxl__need_xenpv_qemu(gc, 1, &console, + ret = libxl__need_xenpv_qemu(gc, 1, &console, d_config->num_vfbs, d_config->vfbs, d_config->num_disks, &d_config->disks[0], d_config->num_channels, &d_config->channels[0]); + if (ret < 0) + goto error_out; console.backend_domid = state->console_domid; libxl__device_console_add(gc, domid, &console, state, &device); libxl__device_console_dispose(&console); - if (need_qemu) { + if (ret) { dcs->dmss.dm.guest_domid = domid; libxl__spawn_local_dm(egc, &dcs->dmss.dm); return; diff --git a/tools/libxl/libxl_dm.c b/tools/libxl/libxl_dm.c index 3026476936..320673c885 100644 --- a/tools/libxl/libxl_dm.c +++ b/tools/libxl/libxl_dm.c @@ -2311,6 +2311,7 @@ int libxl__destroy_device_model(libxl__gc *gc, uint32_t domid) GCSPRINTF("/local/domain/%d/image/device-model-pid", domid)); } +/* Return 0 if no dm needed, 1 if needed and <0 if error. */ int libxl__need_xenpv_qemu(libxl__gc *gc, int nr_consoles, libxl__device_console *consoles, int nr_vfbs, libxl_device_vfb *vfbs,