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

Use K&R style for curly braces in src/openvz/

Browse Source 
Signed-off-by: Martin Kletzander <mkletzan@redhat.com>
This commit is contained in:
Martin Kletzander 2014-03-18 09:16:47 +01:00
parent b6d6635ead
commit f84e17997b
2 changed files with 40 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/openvz/openvz_conf.c
View File

@ -205,7 +205,8 @@ no_memory:
int int
openvzReadNetworkConf(virDomainDefPtr def, openvzReadNetworkConf(virDomainDefPtr def,
int veid) { int veid)
{
int ret; int ret;
virDomainNetDefPtr net = NULL; virDomainNetDefPtr net = NULL;
char *temp = NULL; char *temp = NULL;
@ -378,7 +379,8 @@ openvz_replace(const char* str,
static int static int
openvzReadFSConf(virDomainDefPtr def, openvzReadFSConf(virDomainDefPtr def,
int veid) { int veid)
{
int ret; int ret;
virDomainFSDefPtr fs = NULL; virDomainFSDefPtr fs = NULL;
char *veid_str = NULL; char *veid_str = NULL;
@ -545,7 +547,8 @@ openvzFreeDriver(struct openvz_driver *driver)
int openvzLoadDomains(struct openvz_driver *driver) { int openvzLoadDomains(struct openvz_driver *driver)
{
int veid, ret; int veid, ret;
char *status; char *status;
char uuidstr[VIR_UUID_STRING_BUFLEN]; char uuidstr[VIR_UUID_STRING_BUFLEN];
@ -1063,7 +1066,8 @@ cleanup:
} }
static int static int
openvzSetUUID(int vpsid){ openvzSetUUID(int vpsid)
{
unsigned char uuid[VIR_UUID_BUFLEN]; unsigned char uuid[VIR_UUID_BUFLEN];
if (virUUIDGenerate(uuid)) { if (virUUIDGenerate(uuid)) {
@ -1128,7 +1132,8 @@ static int openvzAssignUUIDs(void)
* *
*/ */
int openvzGetVEID(const char *name) { int openvzGetVEID(const char *name)
{
virCommandPtr cmd; virCommandPtr cmd;
char *outbuf; char *outbuf;
char *temp; char *temp;

45
src/openvz/openvz_driver.c
View File

@ -299,7 +299,8 @@ error:
static virDomainPtr openvzDomainLookupByID(virConnectPtr conn, static virDomainPtr openvzDomainLookupByID(virConnectPtr conn,
int id) { int id)
{
struct openvz_driver *driver = conn->privateData; struct openvz_driver *driver = conn->privateData;
virDomainObjPtr vm; virDomainObjPtr vm;
virDomainPtr dom = NULL; virDomainPtr dom = NULL;
@ -323,7 +324,8 @@ cleanup:
return dom; return dom;
} }
static int openvzConnectGetVersion(virConnectPtr conn, unsigned long *version) { static int openvzConnectGetVersion(virConnectPtr conn, unsigned long *version)
{
struct openvz_driver *driver = conn->privateData; struct openvz_driver *driver = conn->privateData;
openvzDriverLock(driver); openvzDriverLock(driver);
*version = driver->version; *version = driver->version;
@ -363,7 +365,8 @@ cleanup:
static virDomainPtr openvzDomainLookupByUUID(virConnectPtr conn, static virDomainPtr openvzDomainLookupByUUID(virConnectPtr conn,
const unsigned char *uuid) { const unsigned char *uuid)
{
struct openvz_driver *driver = conn->privateData; struct openvz_driver *driver = conn->privateData;
virDomainObjPtr vm; virDomainObjPtr vm;
virDomainPtr dom = NULL; virDomainPtr dom = NULL;
@ -388,7 +391,8 @@ cleanup:
} }
static virDomainPtr openvzDomainLookupByName(virConnectPtr conn, static virDomainPtr openvzDomainLookupByName(virConnectPtr conn,
const char *name) { const char *name)
{
struct openvz_driver *driver = conn->privateData; struct openvz_driver *driver = conn->privateData;
virDomainObjPtr vm; virDomainObjPtr vm;
virDomainPtr dom = NULL; virDomainPtr dom = NULL;
@ -413,7 +417,8 @@ cleanup:
} }
static int openvzDomainGetInfo(virDomainPtr dom, static int openvzDomainGetInfo(virDomainPtr dom,
virDomainInfoPtr info) { virDomainInfoPtr info)
{
struct openvz_driver *driver = dom->conn->privateData; struct openvz_driver *driver = dom->conn->privateData;
virDomainObjPtr vm; virDomainObjPtr vm;
int state; int state;
@ -579,7 +584,8 @@ static void openvzSetProgramSentinal(const char **prog, const char *key)
} }
} }
static int openvzDomainSuspend(virDomainPtr dom) { static int openvzDomainSuspend(virDomainPtr dom)
{
struct openvz_driver *driver = dom->conn->privateData; struct openvz_driver *driver = dom->conn->privateData;
virDomainObjPtr vm; virDomainObjPtr vm;
const char *prog[] = {VZCTL, "--quiet", "chkpnt", PROGRAM_SENTINEL, "--suspend", NULL}; const char *prog[] = {VZCTL, "--quiet", "chkpnt", PROGRAM_SENTINEL, "--suspend", NULL};
@ -617,7 +623,8 @@ cleanup:
return ret; return ret;
} }
static int openvzDomainResume(virDomainPtr dom) { static int openvzDomainResume(virDomainPtr dom)
{
struct openvz_driver *driver = dom->conn->privateData; struct openvz_driver *driver = dom->conn->privateData;
virDomainObjPtr vm; virDomainObjPtr vm;
const char *prog[] = {VZCTL, "--quiet", "chkpnt", PROGRAM_SENTINEL, "--resume", NULL}; const char *prog[] = {VZCTL, "--quiet", "chkpnt", PROGRAM_SENTINEL, "--resume", NULL};
@ -657,7 +664,8 @@ cleanup:
static int static int
openvzDomainShutdownFlags(virDomainPtr dom, openvzDomainShutdownFlags(virDomainPtr dom,
unsigned int flags) { unsigned int flags)
{
struct openvz_driver *driver = dom->conn->privateData; struct openvz_driver *driver = dom->conn->privateData;
virDomainObjPtr vm; virDomainObjPtr vm;
const char *prog[] = {VZCTL, "--quiet", "stop", PROGRAM_SENTINEL, NULL}; const char *prog[] = {VZCTL, "--quiet", "stop", PROGRAM_SENTINEL, NULL};
@ -1476,7 +1484,8 @@ cleanup:
return VIR_DRV_OPEN_ERROR; return VIR_DRV_OPEN_ERROR;
}; };
static int openvzConnectClose(virConnectPtr conn) { static int openvzConnectClose(virConnectPtr conn)
{
struct openvz_driver *driver = conn->privateData; struct openvz_driver *driver = conn->privateData;
openvzFreeDriver(driver); openvzFreeDriver(driver);
@ -1489,12 +1498,14 @@ static const char *openvzConnectGetType(virConnectPtr conn ATTRIBUTE_UNUSED) {
return "OpenVZ"; return "OpenVZ";
} }
static int openvzConnectIsEncrypted(virConnectPtr conn ATTRIBUTE_UNUSED) { static int openvzConnectIsEncrypted(virConnectPtr conn ATTRIBUTE_UNUSED)
{
/* Encryption is not relevant / applicable to way we talk to openvz */ /* Encryption is not relevant / applicable to way we talk to openvz */
return 0; return 0;
} }
static int openvzConnectIsSecure(virConnectPtr conn ATTRIBUTE_UNUSED) { static int openvzConnectIsSecure(virConnectPtr conn ATTRIBUTE_UNUSED)
{
/* We run CLI tools directly so this is secure */ /* We run CLI tools directly so this is secure */
return 1; return 1;
} }
@ -1517,7 +1528,8 @@ static char *openvzConnectGetCapabilities(virConnectPtr conn) {
} }
static int openvzConnectListDomains(virConnectPtr conn ATTRIBUTE_UNUSED, static int openvzConnectListDomains(virConnectPtr conn ATTRIBUTE_UNUSED,
int *ids, int nids) { int *ids, int nids)
{
int got = 0; int got = 0;
int veid; int veid;
int outfd = -1; int outfd = -1;
@ -1559,7 +1571,8 @@ cleanup:
return rc; return rc;
} }
static int openvzConnectNumOfDomains(virConnectPtr conn) { static int openvzConnectNumOfDomains(virConnectPtr conn)
{
struct openvz_driver *driver = conn->privateData; struct openvz_driver *driver = conn->privateData;
int n; int n;
@ -1671,7 +1684,8 @@ Version: 2.2
return 0; return 0;
} }
static int openvzConnectNumOfDefinedDomains(virConnectPtr conn) { static int openvzConnectNumOfDefinedDomains(virConnectPtr conn)
{
struct openvz_driver *driver = conn->privateData; struct openvz_driver *driver = conn->privateData;
int n; int n;
@ -2240,7 +2254,8 @@ static virDriver openvzDriver = {
.domainGetHostname = openvzDomainGetHostname, /* 0.10.0 */ .domainGetHostname = openvzDomainGetHostname, /* 0.10.0 */
}; };
int openvzRegister(void) { int openvzRegister(void)
{
if (virRegisterDriver(&openvzDriver) < 0) if (virRegisterDriver(&openvzDriver) < 0)
return -1; return -1;
return 0; return 0;