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

vmware: reject unknown flags

Browse Source 
* src/vmware/vmware_driver.c (vmwareOpen, vmwareDomainReboot)
(vmwareDomainCreateXML, vmwareDomainCreateWithFlags): Reject
unknown flags.
This commit is contained in:
Eric Blake 2011-07-06 17:08:28 -06:00
parent 8d173c47b7
commit 8cf1b7fc86
1 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/vmware/vmware_driver.c
View File

@ -74,11 +74,13 @@ vmwareDataFreeFunc(void *data)
static virDrvOpenStatus static virDrvOpenStatus
vmwareOpen(virConnectPtr conn, vmwareOpen(virConnectPtr conn,
virConnectAuthPtr auth ATTRIBUTE_UNUSED, virConnectAuthPtr auth ATTRIBUTE_UNUSED,
unsigned int flags ATTRIBUTE_UNUSED) unsigned int flags)
{ {
struct vmware_driver *driver; struct vmware_driver *driver;
char * vmrun = NULL; char * vmrun = NULL;
virCheckFlags(VIR_CONNECT_RO, VIR_DRV_OPEN_ERROR);
if (conn->uri == NULL) { if (conn->uri == NULL) {
/* @TODO accept */ /* @TODO accept */
return VIR_DRV_OPEN_DECLINED; return VIR_DRV_OPEN_DECLINED;
@ -447,11 +449,10 @@ vmwareDomainResume(virDomainPtr dom)
} }
static int static int
vmwareDomainReboot(virDomainPtr dom, unsigned int flags ATTRIBUTE_UNUSED) vmwareDomainReboot(virDomainPtr dom, unsigned int flags)
{ {
struct vmware_driver *driver = dom->conn->privateData; struct vmware_driver *driver = dom->conn->privateData;
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_SENTINAL,
@ -459,6 +460,8 @@ vmwareDomainReboot(virDomainPtr dom, unsigned int flags ATTRIBUTE_UNUSED)
}; };
int ret = -1; int ret = -1;
virCheckFlags(0, -1);
vmwareDriverLock(driver); vmwareDriverLock(driver);
vm = virDomainFindByUUID(&driver->domains, dom->uuid); vm = virDomainFindByUUID(&driver->domains, dom->uuid);
vmwareDriverUnlock(driver); vmwareDriverUnlock(driver);
@ -493,7 +496,7 @@ vmwareDomainReboot(virDomainPtr dom, unsigned int flags ATTRIBUTE_UNUSED)
static virDomainPtr static virDomainPtr
vmwareDomainCreateXML(virConnectPtr conn, const char *xml, vmwareDomainCreateXML(virConnectPtr conn, const char *xml,
unsigned int flags ATTRIBUTE_UNUSED) unsigned int flags)
{ {
struct vmware_driver *driver = conn->privateData; struct vmware_driver *driver = conn->privateData;
virDomainDefPtr vmdef = NULL; virDomainDefPtr vmdef = NULL;
@ -504,6 +507,8 @@ vmwareDomainCreateXML(virConnectPtr conn, const char *xml,
vmwareDomainPtr pDomain = NULL; vmwareDomainPtr pDomain = NULL;
virVMXContext ctx; virVMXContext ctx;
virCheckFlags(0, NULL);
ctx.formatFileName = vmwareCopyVMXFileName; ctx.formatFileName = vmwareCopyVMXFileName;
vmwareDriverLock(driver); vmwareDriverLock(driver);
@ -564,12 +569,14 @@ cleanup:
static int static int
vmwareDomainCreateWithFlags(virDomainPtr dom, vmwareDomainCreateWithFlags(virDomainPtr dom,
unsigned int flags ATTRIBUTE_UNUSED) unsigned int flags)
{ {
struct vmware_driver *driver = dom->conn->privateData; struct vmware_driver *driver = dom->conn->privateData;
virDomainObjPtr vm; virDomainObjPtr vm;
int ret = -1; int ret = -1;
virCheckFlags(0, -1);
vmwareDriverLock(driver); vmwareDriverLock(driver);
vm = virDomainFindByUUID(&driver->domains, dom->uuid); vm = virDomainFindByUUID(&driver->domains, dom->uuid);
if (!vm) { if (!vm) {