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

maint: fix typo for SENTINEL

Browse Source 
* src/openvz/openvz_driver.c: Use correct spelling.
* src/vmware/vmware_conf.c: Likewise.
* src/vmware/vmware_conf.h: Likewise.
* src/vmware/vmware_driver.c: Likewise.

Signed-off-by: Eric Blake <eblake@redhat.com>
This commit is contained in:
Eric Blake 2013-07-30 10:49:53 -06:00
parent 462863a3ee
commit 02033b633a
4 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/openvz/openvz_driver.c
View File

@ -564,12 +564,12 @@ cleanup:
* key value. This lets us declare the argv on the * key value. This lets us declare the argv on the
* stack and just splice in the domain name after * stack and just splice in the domain name after
*/ */
#define PROGRAM_SENTINAL ((char *)0x1) #define PROGRAM_SENTINEL ((char *)0x1)
static void openvzSetProgramSentinal(const char **prog, const char *key) static void openvzSetProgramSentinal(const char **prog, const char *key)
{ {
const char **tmp = prog; const char **tmp = prog;
while (tmp && *tmp) { while (tmp && *tmp) {
if (*tmp == PROGRAM_SENTINAL) { if (*tmp == PROGRAM_SENTINEL) {
*tmp = key; *tmp = key;
break; break;
} }
@ -580,7 +580,7 @@ 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_SENTINAL, "--suspend", NULL}; const char *prog[] = {VZCTL, "--quiet", "chkpnt", PROGRAM_SENTINEL, "--suspend", NULL};
int ret = -1; int ret = -1;
openvzDriverLock(driver); openvzDriverLock(driver);
@ -618,7 +618,7 @@ cleanup:
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_SENTINAL, "--resume", NULL}; const char *prog[] = {VZCTL, "--quiet", "chkpnt", PROGRAM_SENTINEL, "--resume", NULL};
int ret = -1; int ret = -1;
openvzDriverLock(driver); openvzDriverLock(driver);
@ -658,7 +658,7 @@ 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_SENTINAL, NULL}; const char *prog[] = {VZCTL, "--quiet", "stop", PROGRAM_SENTINEL, NULL};
int ret = -1; int ret = -1;
int status; int status;
@ -721,7 +721,7 @@ static int openvzDomainReboot(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", "restart", PROGRAM_SENTINAL, NULL}; const char *prog[] = {VZCTL, "--quiet", "restart", PROGRAM_SENTINEL, NULL};
int ret = -1; int ret = -1;
int status; int status;
@ -1041,7 +1041,7 @@ openvzDomainCreateXML(virConnectPtr conn, const char *xml,
virDomainDefPtr vmdef = NULL; virDomainDefPtr vmdef = NULL;
virDomainObjPtr vm = NULL; virDomainObjPtr vm = NULL;
virDomainPtr dom = NULL; virDomainPtr dom = NULL;
const char *progstart[] = {VZCTL, "--quiet", "start", PROGRAM_SENTINAL, NULL}; const char *progstart[] = {VZCTL, "--quiet", "start", PROGRAM_SENTINEL, NULL};
virCheckFlags(0, NULL); virCheckFlags(0, NULL);
@ -1126,7 +1126,7 @@ openvzDomainCreateWithFlags(virDomainPtr dom, 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", "start", PROGRAM_SENTINAL, NULL }; const char *prog[] = {VZCTL, "--quiet", "start", PROGRAM_SENTINEL, NULL };
int ret = -1; int ret = -1;
int status; int status;
@ -1180,7 +1180,7 @@ openvzDomainUndefineFlags(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", "destroy", PROGRAM_SENTINAL, NULL }; const char *prog[] = { VZCTL, "--quiet", "destroy", PROGRAM_SENTINEL, NULL };
int ret = -1; int ret = -1;
int status; int status;
@ -1228,7 +1228,7 @@ openvzDomainSetAutostart(virDomainPtr dom, int autostart)
{ {
struct openvz_driver *driver = dom->conn->privateData; struct openvz_driver *driver = dom->conn->privateData;
virDomainObjPtr vm; virDomainObjPtr vm;
const char *prog[] = { VZCTL, "--quiet", "set", PROGRAM_SENTINAL, const char *prog[] = { VZCTL, "--quiet", "set", PROGRAM_SENTINEL,
"--onboot", autostart ? "yes" : "no", "--onboot", autostart ? "yes" : "no",
"--save", NULL }; "--save", NULL };
int ret = -1; int ret = -1;
@ -1326,7 +1326,7 @@ static int openvzDomainSetVcpusInternal(virDomainObjPtr vm,
unsigned int nvcpus) unsigned int nvcpus)
{ {
char str_vcpus[32]; char str_vcpus[32];
const char *prog[] = { VZCTL, "--quiet", "set", PROGRAM_SENTINAL, const char *prog[] = { VZCTL, "--quiet", "set", PROGRAM_SENTINEL,
"--cpus", str_vcpus, "--save", NULL }; "--cpus", str_vcpus, "--save", NULL };
unsigned int pcpus; unsigned int pcpus;
pcpus = openvzGetNodeCPUs(); pcpus = openvzGetNodeCPUs();
@ -1685,7 +1685,7 @@ openvzDomainSetMemoryInternal(virDomainObjPtr vm,
unsigned long long mem) unsigned long long mem)
{ {
char str_mem[16]; char str_mem[16];
const char *prog[] = { VZCTL, "--quiet", "set", PROGRAM_SENTINAL, const char *prog[] = { VZCTL, "--quiet", "set", PROGRAM_SENTINEL,
"--kmemsize", str_mem, "--save", NULL "--kmemsize", str_mem, "--save", NULL
}; };

4
src/vmware/vmware_conf.c
View File

@ -205,7 +205,7 @@ vmwareSetSentinal(const char **prog, const char *key)
const char **tmp = prog; const char **tmp = prog;
while (tmp && *tmp) { while (tmp && *tmp) {
if (*tmp == PROGRAM_SENTINAL) { if (*tmp == PROGRAM_SENTINEL) {
*tmp = key; *tmp = key;
break; break;
} }
@ -392,7 +392,7 @@ int
vmwareMoveFile(char *srcFile, char *dstFile) vmwareMoveFile(char *srcFile, char *dstFile)
{ {
const char *cmdmv[] = const char *cmdmv[] =
{ "mv", PROGRAM_SENTINAL, PROGRAM_SENTINAL, NULL }; { "mv", PROGRAM_SENTINEL, PROGRAM_SENTINEL, NULL };
if (!virFileExists(srcFile)) { if (!virFileExists(srcFile)) {
virReportError(VIR_ERR_INTERNAL_ERROR, _("file %s does not exist"), virReportError(VIR_ERR_INTERNAL_ERROR, _("file %s does not exist"),

2
src/vmware/vmware_conf.h
View File

@ -28,7 +28,7 @@
# include "virthread.h" # include "virthread.h"
# define VIR_FROM_THIS VIR_FROM_VMWARE # define VIR_FROM_THIS VIR_FROM_VMWARE
# define PROGRAM_SENTINAL ((char *)0x1) # define PROGRAM_SENTINEL ((char *)0x1)
# define TYPE_PLAYER 0 # define TYPE_PLAYER 0
# define TYPE_WORKSTATION 1 # define TYPE_WORKSTATION 1

18
src/vmware/vmware_driver.c
View File

@ -252,8 +252,8 @@ vmwareStopVM(struct vmware_driver *driver,
virDomainShutoffReason reason) virDomainShutoffReason reason)
{ {
const char *cmd[] = { const char *cmd[] = {
VMRUN, "-T", PROGRAM_SENTINAL, "stop", VMRUN, "-T", PROGRAM_SENTINEL, "stop",
PROGRAM_SENTINAL, "soft", NULL PROGRAM_SENTINEL, "soft", NULL
}; };
vmwareSetSentinal(cmd, vmw_types[driver->type]); vmwareSetSentinal(cmd, vmw_types[driver->type]);
@ -273,8 +273,8 @@ static int
vmwareStartVM(struct vmware_driver *driver, virDomainObjPtr vm) vmwareStartVM(struct vmware_driver *driver, virDomainObjPtr vm)
{ {
const char *cmd[] = { const char *cmd[] = {
VMRUN, "-T", PROGRAM_SENTINAL, "start", VMRUN, "-T", PROGRAM_SENTINEL, "start",
PROGRAM_SENTINAL, PROGRAM_SENTINAL, NULL PROGRAM_SENTINEL, PROGRAM_SENTINEL, NULL
}; };
const char *vmxPath = ((vmwareDomainPtr) vm->privateData)->vmxPath; const char *vmxPath = ((vmwareDomainPtr) vm->privateData)->vmxPath;
@ -446,8 +446,8 @@ vmwareDomainSuspend(virDomainPtr dom)
virDomainObjPtr vm; virDomainObjPtr vm;
const char *cmd[] = { const char *cmd[] = {
VMRUN, "-T", PROGRAM_SENTINAL, "pause", VMRUN, "-T", PROGRAM_SENTINEL, "pause",
PROGRAM_SENTINAL, NULL PROGRAM_SENTINEL, NULL
}; };
int ret = -1; int ret = -1;
@ -495,7 +495,7 @@ vmwareDomainResume(virDomainPtr dom)
virDomainObjPtr vm; virDomainObjPtr vm;
const char *cmd[] = { const char *cmd[] = {
VMRUN, "-T", PROGRAM_SENTINAL, "unpause", PROGRAM_SENTINAL, VMRUN, "-T", PROGRAM_SENTINEL, "unpause", PROGRAM_SENTINEL,
NULL NULL
}; };
int ret = -1; int ret = -1;
@ -544,8 +544,8 @@ vmwareDomainReboot(virDomainPtr dom, unsigned int flags)
const char * vmxPath = NULL; const char * vmxPath = NULL;
virDomainObjPtr vm; virDomainObjPtr vm;
const char *cmd[] = { const char *cmd[] = {
VMRUN, "-T", PROGRAM_SENTINAL, VMRUN, "-T", PROGRAM_SENTINEL,
"reset", PROGRAM_SENTINAL, "soft", NULL "reset", PROGRAM_SENTINEL, "soft", NULL
}; };
int ret = -1; int ret = -1;