From bd235cd873f406efac0d5b79c968caa384b8e438 Mon Sep 17 00:00:00 2001 From: Jim Fehlig Date: Wed, 18 Mar 2015 14:53:45 -0600 Subject: [PATCH] libxl: Don't overwrite errors from xenconfig When converting domXML from native, the libxl driver was overwriting useful errors from the xenconfig parsing code with a useless, generic error. E.g. "internal error: parsing xm config failed" vs "internal error: config value usbdevice was malformed". Remove the redundant (and useless) error reporting in the libxl driver. Signed-off-by: Jim Fehlig --- src/libxl/libxl_driver.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c index e555ca4f5a..1c1af79ee0 100644 --- a/src/libxl/libxl_driver.c +++ b/src/libxl/libxl_driver.c @@ -2222,22 +2222,16 @@ libxlConnectDomainXMLFromNative(virConnectPtr conn, goto cleanup; if (!(def = xenParseXL(conf, cfg->caps, - cfg->verInfo->xen_version_major))) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("parsing xl config failed")); + cfg->verInfo->xen_version_major))) goto cleanup; - } } else if (STREQ(nativeFormat, LIBXL_CONFIG_FORMAT_XM)) { if (!(conf = virConfReadMem(nativeConfig, strlen(nativeConfig), 0))) goto cleanup; if (!(def = xenParseXM(conf, cfg->verInfo->xen_version_major, - cfg->caps))) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("parsing xm config failed")); + cfg->caps))) goto cleanup; - } } else if (STREQ(nativeFormat, LIBXL_CONFIG_FORMAT_SEXPR)) { /* only support latest xend config format */ if (!(def = xenParseSxprString(nativeConfig,