NuKVM/libvirt
3
0
Fork 0
mirror of https://github.com/libvirt/libvirt.git synced 2025-02-11 07:55:58 -06:00
Code Issues Packages Projects Releases Wiki Activity

Mon Apr 30 18:33:00 BST 2007 Richard W.M. Jones <rjones@redhat.com>

Browse Source 
* src/libvirt.c, src/driver.h, src/proxy_internal.c,
	  src/qemu_internal.c, src/test.c, src/xen_internal.c,
	  src/xend_internal.c, src/xs_internal.c,
	  proxy/libvirt_proxy.c: Remove VIR_DRV_OPEN_QUIET.
This commit is contained in:
Richard W.M. Jones 2007-04-30 17:30:11 +00:00
parent 27151b3d10
commit 94033dd73f
10 changed files with 27 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,3 +1,10 @@
Mon Apr 30 18:33:00 BST 2007 Richard W.M. Jones <rjones@redhat.com>
* src/libvirt.c, src/driver.h, src/proxy_internal.c,
src/qemu_internal.c, src/test.c, src/xen_internal.c,
src/xend_internal.c, src/xs_internal.c,
proxy/libvirt_proxy.c: Remove VIR_DRV_OPEN_QUIET.
Mon Apr 30 18:02:00 BST 2007 Richard W.M. Jones <rjones@redhat.com>
* src/proxy_internal.c (xenProxyGetCapabilities): Add support

4
proxy/libvirt_proxy.c
View File

@ -77,7 +77,7 @@ proxyInitXen(void) {
priv->xshandle = NULL;
priv->proxy = -1;
ret = xenHypervisorOpen(conn, NULL, VIR_DRV_OPEN_QUIET);
ret = xenHypervisorOpen(conn, NULL, 0);
if (ret < 0) {
fprintf(stderr, "Failed to open Xen hypervisor\n");
return(-1);
@ -93,7 +93,7 @@ proxyInitXen(void) {
fprintf(stderr, "Failed to connect to Xen daemon\n");
return(-1);
}
ret = xenStoreOpen(conn, NULL, VIR_DRV_OPEN_QUIET | VIR_DRV_OPEN_RO);
ret = xenStoreOpen(conn, NULL, VIR_DRV_OPEN_RO);
if (ret < 0) {
fprintf(stderr, "Failed to open XenStore connection");
return (-1);

2
src/driver.h
View File

@ -24,7 +24,7 @@ typedef enum {
typedef enum {
VIR_DRV_OPEN_QUIET = 1,
/* VIR_DRV_OPEN_QUIET = 1 - removed by RWMJ */
VIR_DRV_OPEN_RO = 2
} virDrvOpenFlag;

4
src/libvirt.c
View File

@ -326,7 +326,7 @@ failed:
virConnectPtr
virConnectOpen (const char *name)
{
return do_open (name, VIR_DRV_OPEN_QUIET);
return do_open (name, 0);
}
/**
@ -342,7 +342,7 @@ virConnectOpen (const char *name)
virConnectPtr
virConnectOpenReadOnly(const char *name)
{
return do_open (name, VIR_DRV_OPEN_QUIET | VIR_DRV_OPEN_RO);
return do_open (name, VIR_DRV_OPEN_RO);
}
/**

2
src/proxy_internal.c
View File

@ -544,7 +544,6 @@ xenProxyOpen(virConnectPtr conn, const char *name ATTRIBUTE_UNUSED, int flags)
fd = virProxyOpenClientSocket(PROXY_SOCKET_PATH);
if (fd < 0) {
if (!(flags & VIR_DRV_OPEN_QUIET))
virProxyError(conn, VIR_ERR_NO_XEN, PROXY_SOCKET_PATH);
return(-1);
}
@ -555,7 +554,6 @@ xenProxyOpen(virConnectPtr conn, const char *name ATTRIBUTE_UNUSED, int flags)
req.len = sizeof(req);
ret = xenProxyCommand(conn, &req, NULL, 1);
if ((ret < 0) || (req.command != VIR_PROXY_NONE)) {
if (!(flags & VIR_DRV_OPEN_QUIET))
virProxyError(conn, VIR_ERR_OPERATION_FAILED, __FUNCTION__);
xenProxyClose(conn);
return(-1);

3
src/qemu_internal.c
View File

@ -395,8 +395,7 @@ static int qemuOpen(virConnectPtr conn,
uri = xmlParseURI(name);
if (uri == NULL) {
if (!(flags & VIR_DRV_OPEN_QUIET))
qemuError(conn, NULL, VIR_ERR_NO_SUPPORT, name);
qemuError(conn, NULL, VIR_ERR_NO_SUPPORT, name);
return VIR_DRV_OPEN_DECLINED;
}

5
src/test.c
View File

@ -706,7 +706,7 @@ static int getDomainIndex(virDomainPtr domain) {
int testOpen(virConnectPtr conn,
const char *name,
int flags)
int flags ATTRIBUTE_UNUSED)
{
xmlURIPtr uri;
int ret, connid;
@ -717,8 +717,7 @@ int testOpen(virConnectPtr conn,
uri = xmlParseURI(name);
if (uri == NULL) {
if (!(flags & VIR_DRV_OPEN_QUIET))
testError(conn, NULL, VIR_ERR_NO_SUPPORT, name);
testError(conn, NULL, VIR_ERR_NO_SUPPORT, name);
return VIR_DRV_OPEN_DECLINED;
}

8
src/xen_internal.c
View File

@ -1516,8 +1516,9 @@ xenHypervisorInit(void)
* Returns 0 or -1 in case of error.
*/
int
xenHypervisorOpen(virConnectPtr conn ATTRIBUTE_UNUSED,
const char *name ATTRIBUTE_UNUSED, int flags)
xenHypervisorOpen(virConnectPtr conn,
const char *name ATTRIBUTE_UNUSED,
int flags ATTRIBUTE_UNUSED)
{
int ret;
xenUnifiedPrivatePtr priv = (xenUnifiedPrivatePtr) conn->privateData;
@ -1530,8 +1531,7 @@ xenHypervisorOpen(virConnectPtr conn ATTRIBUTE_UNUSED,
ret = open(XEN_HYPERVISOR_SOCKET, O_RDWR);
if (ret < 0) {
if (!(flags & VIR_DRV_OPEN_QUIET))
virXenError(VIR_ERR_NO_XEN, XEN_HYPERVISOR_SOCKET, 0);
virXenError(VIR_ERR_NO_XEN, XEN_HYPERVISOR_SOCKET, 0);
return (-1);
}

12
src/xend_internal.c
View File

@ -1923,7 +1923,8 @@ error:
* Returns 0 in case of success, -1 in case of error.
*/
int
xenDaemonOpen(virConnectPtr conn, const char *name, int flags)
xenDaemonOpen(virConnectPtr conn, const char *name,
int flags ATTRIBUTE_UNUSED)
{
xmlURIPtr uri = NULL;
int ret;
@ -1959,16 +1960,14 @@ xenDaemonOpen(virConnectPtr conn, const char *name, int flags)
*/
uri = xmlParseURI(name);
if (uri == NULL) {
if (!(flags & VIR_DRV_OPEN_QUIET))
virXendError(conn, VIR_ERR_NO_SUPPORT, name);
virXendError(conn, VIR_ERR_NO_SUPPORT, name);
goto failed;
}
if (uri->scheme == NULL) {
/* It should be a file access */
if (uri->path == NULL) {
if (!(flags & VIR_DRV_OPEN_QUIET))
virXendError(conn, VIR_ERR_NO_SUPPORT, name);
virXendError(conn, VIR_ERR_NO_SUPPORT, name);
goto failed;
}
ret = xenDaemonOpen_unix(conn, uri->path);
@ -1986,8 +1985,7 @@ xenDaemonOpen(virConnectPtr conn, const char *name, int flags)
if (ret == -1)
goto failed;
} else {
if (!(flags & VIR_DRV_OPEN_QUIET))
virXendError(conn, VIR_ERR_NO_SUPPORT, name);
virXendError(conn, VIR_ERR_NO_SUPPORT, name);
goto failed;
}
}

6
src/xs_internal.c
View File

@ -325,7 +325,8 @@ virConnectCheckStoreID(virConnectPtr conn, int id)
*/
int
xenStoreOpen(virConnectPtr conn,
const char *name ATTRIBUTE_UNUSED, int flags)
const char *name ATTRIBUTE_UNUSED,
int flags ATTRIBUTE_UNUSED)
{
xenUnifiedPrivatePtr priv = (xenUnifiedPrivatePtr) conn->privateData;
@ -339,8 +340,7 @@ xenStoreOpen(virConnectPtr conn,
#endif /* ! PROXY */
if (priv->xshandle == NULL) {
if (!(flags & VIR_DRV_OPEN_QUIET))
virXenStoreError(conn, VIR_ERR_NO_XEN,
virXenStoreError(conn, VIR_ERR_NO_XEN,
_("failed to connect to Xen Store"));
return (-1);
}