External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-12-25 07:05:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

phyp: reduce scope of driver functions

Browse Source 
Several phyp functions are not namespace clean, and had no reason
to be exported since no one outside the phyp driver needed to use
them.  Rather than do lots of forward declarations, I was able
to topologically sort the file.  So, this patch looks huge, but
is really just a matter of marking things static and dealing with
the compiler fallout.

* src/phyp/phyp_driver.h (PHYP_DRIVER_H): Add include guard.
(phypCheckSPFreeSapce): Delete unused declaration.
(phypGetSystemType, phypGetVIOSPartitionID, phypCapsInit)
(phypBuildLpar, phypUUIDTable_WriteFile, phypUUIDTable_ReadFile)
(phypUUIDTable_AddLpar, phypUUIDTable_RemLpar, phypUUIDTable_Pull)
(phypUUIDTable_Push, phypUUIDTable_Init, phypUUIDTable_Free)
(escape_specialcharacters, waitsocket, phypGetLparUUID)
(phypGetLparMem, phypGetLparCPU, phypGetLparCPUGeneric)
(phypGetRemoteSlot, phypGetBackingDevice, phypDiskType)
(openSSHSession): Move declarations to phyp_driver.c and make static.
* src/phyp/phyp_driver.c: Rearrange file contents to provide
topological sorting of newly-static funtions (no semantic changes
other than reduced scope).
(phypGetBackingDevice, phypDiskType): Mark unused, for now.
This commit is contained in:
Eric Blake 2010-06-24 15:05:16 -06:00
parent f9a9214629
commit 89144534eb
2 changed files with 1075 additions and 1122 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2122
src/phyp/phyp_driver.c
View File

File diff suppressed because it is too large Load Diff

75
src/phyp/phyp_driver.h
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (C) 2010 Red Hat, Inc.
* Copyright IBM Corp. 2009 * Copyright IBM Corp. 2009
* *
* phyp_driver.c: ssh layer to access Power Hypervisors * phyp_driver.c: ssh layer to access Power Hypervisors
@ -22,14 +22,17 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/ */
#include "conf/capabilities.h" #ifndef PHYP_DRIVER_H
#include "conf/domain_conf.h" # define PHYP_DRIVER_H
#include <config.h>
#include <libssh2.h>
#define LPAR_EXEC_ERR -1 # include "conf/capabilities.h"
#define SSH_CONN_ERR -2 /* error while trying to connect to remote host */ # include "conf/domain_conf.h"
#define SSH_CMD_ERR -3 /* error while trying to execute the remote cmd */ # include <config.h>
# include <libssh2.h>
# define LPAR_EXEC_ERR -1
# define SSH_CONN_ERR -2 /* error while trying to connect to remote host */
# define SSH_CMD_ERR -3 /* error while trying to execute the remote cmd */
typedef struct _ConnectionData ConnectionData; typedef struct _ConnectionData ConnectionData;
typedef ConnectionData *ConnectionDataPtr; typedef ConnectionData *ConnectionDataPtr;
@ -75,60 +78,6 @@ struct _phyp_driver {
char *managed_system; char *managed_system;
}; };
int phypCheckSPFreeSapce(virConnectPtr conn, int required_size, char *sp);
int phypGetSystemType(virConnectPtr conn);
int phypGetVIOSPartitionID(virConnectPtr conn);
virCapsPtr phypCapsInit(void);
int phypBuildLpar(virConnectPtr conn, virDomainDefPtr def);
int phypUUIDTable_WriteFile(virConnectPtr conn);
int phypUUIDTable_ReadFile(virConnectPtr conn);
int phypUUIDTable_AddLpar(virConnectPtr conn, unsigned char *uuid, int id);
int phypUUIDTable_RemLpar(virConnectPtr conn, int id);
int phypUUIDTable_Pull(virConnectPtr conn);
int phypUUIDTable_Push(virConnectPtr conn);
int phypUUIDTable_Init(virConnectPtr conn);
void phypUUIDTable_Free(uuid_tablePtr uuid_table);
int escape_specialcharacters(char *src, char *dst, size_t dstlen);
int waitsocket(int socket_fd, LIBSSH2_SESSION * session);
int phypGetLparUUID(unsigned char *uuid, int lpar_id, virConnectPtr conn);
int phypRegister(void); int phypRegister(void);
int phypGetLparState(virConnectPtr conn, unsigned int lpar_id); #endif /* PHYP_DRIVER_H */
unsigned long phypGetLparMem(virConnectPtr conn,
const char *managed_system, int lpar_id,
int type);
unsigned long phypGetLparCPU(virConnectPtr conn,
const char *managed_system, int lpar_id);
unsigned long phypGetLparCPUGeneric(virConnectPtr conn,
const char *managed_system,
int lpar_id, int type);
int phypGetRemoteSlot(virConnectPtr conn, const char *managed_system,
const char *lpar_name);
char *phypGetBackingDevice(virConnectPtr conn, const char *managed_system,
char *lpar_name);
int phypDiskType(virConnectPtr conn, char *backing_device);
LIBSSH2_SESSION *openSSHSession(virConnectPtr conn, virConnectAuthPtr auth,
int *internal_socket);