External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-02-02 01:45:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Improve error reporting in Xen driver SEXPR generation

Browse Source
This commit is contained in:
Daniel P. Berrange 2009-04-01 10:01:23 +00:00
parent b2f5ba21b8
commit 3ad8a273b5
3 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,3 +1,10 @@
Wed Apr 1 10:58:22 BST 2009 Daniel P. Berrange <berrange@redhat.com>
Improve error reporting in SEXPR generation
* src/xm_internal.c, src/xend_internal.c: Avoid overwriting
previously set error message. Clarify message when network
lookup fails
Wed Apr 1 10:55:22 BST 2009 Daniel P. Berrange <berrange@redhat.com> Wed Apr 1 10:55:22 BST 2009 Daniel P. Berrange <berrange@redhat.com>
* src/node_device.c: Fix error message for missing node device * src/node_device.c: Fix error message for missing node device

7
src/xend_internal.c
View File

@ -3850,8 +3850,6 @@ xenDaemonCreateXML(virConnectPtr conn, const char *xmlDesc,
return (NULL); return (NULL);
if (!(sexpr = xenDaemonFormatSxpr(conn, def, priv->xendConfigVersion))) { if (!(sexpr = xenDaemonFormatSxpr(conn, def, priv->xendConfigVersion))) {
virXendError(conn, VIR_ERR_XML_ERROR,
"%s", _("failed to build sexpr"));
virDomainDefFree(def); virDomainDefFree(def);
return (NULL); return (NULL);
} }
@ -5214,7 +5212,7 @@ xenDaemonFormatSxprNet(virConnectPtr conn,
char *bridge; char *bridge;
if (!network) { if (!network) {
virXendError(conn, VIR_ERR_NO_SOURCE, "%s", virXendError(conn, VIR_ERR_NO_NETWORK, "%s",
def->data.network.name); def->data.network.name);
return -1; return -1;
} }
@ -5222,7 +5220,8 @@ xenDaemonFormatSxprNet(virConnectPtr conn,
bridge = virNetworkGetBridgeName(network); bridge = virNetworkGetBridgeName(network);
virNetworkFree(network); virNetworkFree(network);
if (!bridge) { if (!bridge) {
virXendError(conn, VIR_ERR_NO_SOURCE, "%s", virXendError(conn, VIR_ERR_INTERNAL_ERROR,
_("network %s is not active"),
def->data.network.name); def->data.network.name);
return -1; return -1;
} }

5
src/xm_internal.c
View File

@ -1734,11 +1734,8 @@ int xenXMDomainCreate(virDomainPtr domain) {
if (!(entry = virHashLookup(priv->configCache, filename))) if (!(entry = virHashLookup(priv->configCache, filename)))
goto error; goto error;
if (!(sexpr = xenDaemonFormatSxpr(domain->conn, entry->def, priv->xendConfigVersion))) { if (!(sexpr = xenDaemonFormatSxpr(domain->conn, entry->def, priv->xendConfigVersion)))
xenXMError(domain->conn, VIR_ERR_XML_ERROR,
"%s", _("failed to build sexpr"));
goto error; goto error;
}
ret = xenDaemonDomainCreateXML(domain->conn, sexpr); ret = xenDaemonDomainCreateXML(domain->conn, sexpr);
VIR_FREE(sexpr); VIR_FREE(sexpr);