External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-03-20 07:59:00 +00:00
Code

Fix return type for Xen open subdriver method impl (John Levon)

Browse Source
This commit is contained in:
Daniel P. Berrange 2008-12-17 21:26:16 +00:00
parent 6add3883a6
commit e5fc0aad31
15 changed files with 34 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ChangeLog
View File

@ -1,3 +1,12 @@
Wed Dec 17 21:17:39 GMT 2008 Daniel P. Berrange <berrange@redhat.com>
Fix Xen sub-drivers' 'open' method return type (John Levon)
* src/proxy_internal.c, src/remote_internal.c, src/test.c,
src/xen_inotify.c, src/xen_inotify.h, src/xen_internal.c,
src/xen_internal.h, src/xen_unified.c, src/xend_internal.c,
src/xend_internal.h, src/xm_internal.c, src/xm_internal.h,
src/xs_internal.c, src/xs_internal.h: s/int/virDrvOpenStatus/
Wed Dec 17 21:10:39 GMT 2008 Daniel P. Berrange <berrange@redhat.com>
Mutex / crash fixes to openvz driver (Anton Protopopov)

4
src/proxy_internal.c
View File

@ -36,7 +36,7 @@
static int debug = 0;
static int xenProxyClose(virConnectPtr conn);
static int xenProxyOpen(virConnectPtr conn, virConnectAuthPtr auth, int flags);
static virDrvOpenStatus xenProxyOpen(virConnectPtr conn, virConnectAuthPtr auth, int flags);
static int xenProxyGetVersion(virConnectPtr conn, unsigned long *hvVer);
static int xenProxyNodeGetInfo(virConnectPtr conn, virNodeInfoPtr info);
static char *xenProxyGetCapabilities(virConnectPtr conn);
@ -477,7 +477,7 @@ retry:
*
* Returns 0 in case of success, and -1 in case of failure
*/
int
virDrvOpenStatus
xenProxyOpen(virConnectPtr conn,
virConnectAuthPtr auth ATTRIBUTE_UNUSED,
int flags)

6
src/remote_internal.c
View File

@ -851,7 +851,7 @@ doRemoteOpen (virConnectPtr conn,
goto cleanup;
}
static int
static virDrvOpenStatus
remoteOpen (virConnectPtr conn,
virConnectAuthPtr auth,
int flags)
@ -2633,7 +2633,7 @@ remoteDomainMemoryPeek (virDomainPtr domain,
/*----------------------------------------------------------------------*/
static int
static virDrvOpenStatus
remoteNetworkOpen (virConnectPtr conn,
virConnectAuthPtr auth,
int flags)
@ -3033,7 +3033,7 @@ remoteNetworkSetAutostart (virNetworkPtr network, int autostart)
/*----------------------------------------------------------------------*/
static int
static virDrvOpenStatus
remoteStorageOpen (virConnectPtr conn,
virConnectAuthPtr auth,
int flags)

2
src/test.c
View File

@ -590,7 +590,7 @@ static int testOpenFromFile(virConnectPtr conn,
}
static int testOpen(virConnectPtr conn,
static virDrvOpenStatus testOpen(virConnectPtr conn,
virConnectAuthPtr auth ATTRIBUTE_UNUSED,
int flags ATTRIBUTE_UNUSED)
{

2
src/xen_inotify.c
View File

@ -364,7 +364,7 @@ reread:
*
* Returns 0 or -1 in case of error.
*/
int
virDrvOpenStatus
xenInotifyOpen(virConnectPtr conn ATTRIBUTE_UNUSED,
virConnectAuthPtr auth ATTRIBUTE_UNUSED,
int flags ATTRIBUTE_UNUSED)

5
src/xen_inotify.h
View File

@ -21,10 +21,13 @@
*/
#ifndef __VIR_XEN_INOTIFY_H__
#define __VIR_XEN_INOTIFY_H__
#include "internal.h"
#include "driver.h"
extern struct xenUnifiedDriver xenInotifyDriver;
int xenInotifyOpen (virConnectPtr conn,
virDrvOpenStatus xenInotifyOpen (virConnectPtr conn,
virConnectAuthPtr auth,
int flags);
int xenInotifyClose (virConnectPtr conn);

2
src/xen_internal.c
View File

@ -2031,7 +2031,7 @@ xenHypervisorInit(void)
*
* Returns 0 or -1 in case of error.
*/
int
virDrvOpenStatus
xenHypervisorOpen(virConnectPtr conn,
virConnectAuthPtr auth ATTRIBUTE_UNUSED,
int flags ATTRIBUTE_UNUSED)

4
src/xen_internal.h
View File

@ -15,6 +15,7 @@
#include "internal.h"
#include "capabilities.h"
#include "driver.h"
extern struct xenUnifiedDriver xenHypervisorDriver;
int xenHypervisorInit (void);
@ -32,7 +33,8 @@ xenHypervisorLookupDomainByUUID(virConnectPtr conn,
char *
xenHypervisorDomainGetOSType (virDomainPtr dom);
int xenHypervisorOpen (virConnectPtr conn,
virDrvOpenStatus
xenHypervisorOpen (virConnectPtr conn,
virConnectAuthPtr auth,
int flags);
int xenHypervisorClose (virConnectPtr conn);

2
src/xen_unified.c
View File

@ -224,7 +224,7 @@ xenUnifiedProbe (void)
return 0;
}
static int
static virDrvOpenStatus
xenUnifiedOpen (virConnectPtr conn, virConnectAuthPtr auth, int flags)
{
int i, ret = VIR_DRV_OPEN_DECLINED;

2
src/xend_internal.c
View File

@ -2704,7 +2704,7 @@ error:
*
* Returns 0 in case of success, -1 in case of error.
*/
int
virDrvOpenStatus
xenDaemonOpen(virConnectPtr conn,
virConnectAuthPtr auth ATTRIBUTE_UNUSED,
int flags ATTRIBUTE_UNUSED)

3
src/xend_internal.h
View File

@ -24,6 +24,7 @@
#include "internal.h"
#include "capabilities.h"
#include "domain_conf.h"
#include "driver.h"
#include "buf.h"
int
@ -129,7 +130,7 @@ xenDaemonFormatSxpr(virConnectPtr conn,
/* refactored ones */
int xenDaemonOpen(virConnectPtr conn, virConnectAuthPtr auth, int flags);
virDrvOpenStatus xenDaemonOpen(virConnectPtr conn, virConnectAuthPtr auth, int flags);
int xenDaemonClose(virConnectPtr conn);
int xenDaemonGetVersion(virConnectPtr conn, unsigned long *hvVer);
int xenDaemonNodeGetInfo(virConnectPtr conn, virNodeInfoPtr info);

2
src/xm_internal.c
View File

@ -581,7 +581,7 @@ int xenXMConfigCacheRefresh (virConnectPtr conn) {
* We only support a single directory, so repeated calls
* to open all end up using the same cache of files
*/
int
virDrvOpenStatus
xenXMOpen (virConnectPtr conn ATTRIBUTE_UNUSED,
virConnectAuthPtr auth ATTRIBUTE_UNUSED,
int flags ATTRIBUTE_UNUSED)

3
src/xm_internal.h
View File

@ -26,6 +26,7 @@
#define _LIBVIRT_XM_INTERNAL_H_
#include "internal.h"
#include "driver.h"
#include "conf.h"
#include "domain_conf.h"
@ -38,7 +39,7 @@ int xenXMConfigCacheRefresh (virConnectPtr conn);
int xenXMConfigCacheAddFile(virConnectPtr conn, const char *filename);
int xenXMConfigCacheRemoveFile(virConnectPtr conn, const char *filename);
int xenXMOpen(virConnectPtr conn, virConnectAuthPtr auth, int flags);
virDrvOpenStatus xenXMOpen(virConnectPtr conn, virConnectAuthPtr auth, int flags);
int xenXMClose(virConnectPtr conn);
const char *xenXMGetType(virConnectPtr conn);
int xenXMDomainGetInfo(virDomainPtr domain, virDomainInfoPtr info);

2
src/xs_internal.c
View File

@ -281,7 +281,7 @@ virDomainGetVMInfo(virDomainPtr domain, const char *vm, const char *name)
*
* Returns 0 or -1 in case of error.
*/
int
virDrvOpenStatus
xenStoreOpen(virConnectPtr conn,
virConnectAuthPtr auth ATTRIBUTE_UNUSED,
int flags ATTRIBUTE_UNUSED)

3
src/xs_internal.h
View File

@ -12,11 +12,12 @@
#define __VIR_XS_INTERNAL_H__
#include "internal.h"
#include "driver.h"
extern struct xenUnifiedDriver xenStoreDriver;
int xenStoreInit (void);
int xenStoreOpen (virConnectPtr conn,
virDrvOpenStatus xenStoreOpen (virConnectPtr conn,
virConnectAuthPtr auth,
int flags);
int xenStoreClose (virConnectPtr conn);