New patch 0012-penVZ-Fix-some-overwritten-error-codes.patch
OpenVZ: Fix some overwritten error codes
Guido Günther
13 years ago
| 0 | From: =?UTF-8?q?Guido=20G=C3=BCnther?= <agx@sigxcpu.org> | |
| 1 | Date: Wed, 1 Dec 2010 15:06:18 +0100 | |
| 2 | Subject: [PATCH] OpenVZ: Fix some overwritten error codes | |
| 3 | ||
| 4 | Don't overwrite errors during domain creation/definition to ease | |
| 5 | tracking down problems. | |
| 6 | ||
| 7 | Origin: upstream, http://libvirt.org/git/?p=libvirt.git;a=commit;h=2d626c7d08b0b815155b93065d466ba89dfb82f7 | |
| 8 | --- | |
| 9 | src/openvz/openvz_driver.c | 10 ++++------ | |
| 10 | 1 files changed, 4 insertions(+), 6 deletions(-) | |
| 11 | ||
| 12 | diff --git a/src/openvz/openvz_driver.c b/src/openvz/openvz_driver.c | |
| 13 | index 556df52..698d0e6 100644 | |
| 14 | --- a/src/openvz/openvz_driver.c | |
| 15 | +++ b/src/openvz/openvz_driver.c | |
| 16 | @@ -57,6 +57,7 @@ | |
| 17 | #include "nodeinfo.h" | |
| 18 | #include "memory.h" | |
| 19 | #include "bridge.h" | |
| 20 | +#include "logging.h" | |
| 21 | ||
| 22 | #define VIR_FROM_THIS VIR_FROM_OPENVZ | |
| 23 | ||
| 24 | @@ -209,8 +210,7 @@ static int openvzSetInitialConfig(virDomainDefPtr vmdef) | |
| 25 | else | |
| 26 | { | |
| 27 | if (openvzDomainDefineCmd(prog, OPENVZ_MAX_ARG, vmdef) < 0) { | |
| 28 | - openvzError(VIR_ERR_INTERNAL_ERROR, "%s", | |
| 29 | - _("Error creating command for container")); | |
| 30 | + VIR_ERROR0(_("Error creating command for container")); | |
| 31 | goto cleanup; | |
| 32 | } | |
| 33 | ||
| 34 | @@ -870,8 +870,7 @@ openvzDomainDefineXML(virConnectPtr conn, const char *xml) | |
| 35 | vm->persistent = 1; | |
| 36 | ||
| 37 | if (openvzSetInitialConfig(vm->def) < 0) { | |
| 38 | - openvzError(VIR_ERR_INTERNAL_ERROR, "%s", | |
| 39 | - _("Error creating initial configuration")); | |
| 40 | + VIR_ERROR0(_("Error creating initial configuration")); | |
| 41 | goto cleanup; | |
| 42 | } | |
| 43 | ||
| 44 | @@ -954,8 +953,7 @@ openvzDomainCreateXML(virConnectPtr conn, const char *xml, | |
| 45 | vm->persistent = 1; | |
| 46 | ||
| 47 | if (openvzSetInitialConfig(vm->def) < 0) { | |
| 48 | - openvzError(VIR_ERR_INTERNAL_ERROR, "%s", | |
| 49 | - _("Error creating initial configuration")); | |
| 50 | + VIR_ERROR0(_("Error creating initial configuration")); | |
| 51 | goto cleanup; | |
| 52 | } | |
| 53 | ||
| 54 | -- |