External/libvirt
1
0
Fork 0
Code

vbox: Remove virConnectPtr from vboxError

Browse Source
This commit is contained in:
Matthias Bolte 2010-04-03 00:38:57 +02:00
parent 1c91a0b44e
commit a3884f8705
2 changed files with 146 additions and 149 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/vbox/vbox_driver.c
View File

@ -58,8 +58,8 @@ static virDriver vboxDriverDummy;
#define VIR_FROM_THIS VIR_FROM_VBOX #define VIR_FROM_THIS VIR_FROM_VBOX
#define vboxError(conn, code, ...) \ #define vboxError(code, ...) \
virReportErrorHelper(conn, VIR_FROM_VBOX, code, __FILE__, \ virReportErrorHelper(NULL, VIR_FROM_VBOX, code, __FILE__, \
__FUNCTION__, __LINE__, __VA_ARGS__) __FUNCTION__, __LINE__, __VA_ARGS__)
int vboxRegister(void) { int vboxRegister(void) {
@ -136,27 +136,27 @@ static virDrvOpenStatus vboxOpenDummy(virConnectPtr conn,
return VIR_DRV_OPEN_DECLINED; return VIR_DRV_OPEN_DECLINED;
if (conn->uri->path == NULL || STREQ(conn->uri->path, "")) { if (conn->uri->path == NULL || STREQ(conn->uri->path, "")) {
vboxError(conn, VIR_ERR_INTERNAL_ERROR, "%s", vboxError(VIR_ERR_INTERNAL_ERROR, "%s",
_("no VirtualBox driver path specified (try vbox:///session)")); _("no VirtualBox driver path specified (try vbox:///session)"));
return VIR_DRV_OPEN_ERROR; return VIR_DRV_OPEN_ERROR;
} }
if (uid != 0) { if (uid != 0) {
if (STRNEQ (conn->uri->path, "/session")) { if (STRNEQ (conn->uri->path, "/session")) {
vboxError(conn, VIR_ERR_INTERNAL_ERROR, vboxError(VIR_ERR_INTERNAL_ERROR,
_("unknown driver path '%s' specified (try vbox:///session)"), conn->uri->path); _("unknown driver path '%s' specified (try vbox:///session)"), conn->uri->path);
return VIR_DRV_OPEN_ERROR; return VIR_DRV_OPEN_ERROR;
} }
} else { /* root */ } else { /* root */
if (STRNEQ (conn->uri->path, "/system") && if (STRNEQ (conn->uri->path, "/system") &&
STRNEQ (conn->uri->path, "/session")) { STRNEQ (conn->uri->path, "/session")) {
vboxError(conn, VIR_ERR_INTERNAL_ERROR, vboxError(VIR_ERR_INTERNAL_ERROR,
_("unknown driver path '%s' specified (try vbox:///system)"), conn->uri->path); _("unknown driver path '%s' specified (try vbox:///system)"), conn->uri->path);
return VIR_DRV_OPEN_ERROR; return VIR_DRV_OPEN_ERROR;
} }
} }
vboxError(conn, VIR_ERR_INTERNAL_ERROR, "%s", vboxError(VIR_ERR_INTERNAL_ERROR, "%s",
_("unable to initialize VirtualBox driver API")); _("unable to initialize VirtualBox driver API"));
return VIR_DRV_OPEN_ERROR; return VIR_DRV_OPEN_ERROR;
} }

283
src/vbox/vbox_tmpl.c
View File

File diff suppressed because it is too large Load Diff