]> git.ipfire.org Git - thirdparty/libvirt.git/commitdiff
vmware: reject unknown flags
authorEric Blake <eblake@redhat.com>
Wed, 6 Jul 2011 23:08:28 +0000 (17:08 -0600)
committerEric Blake <eblake@redhat.com>
Wed, 13 Jul 2011 22:54:24 +0000 (16:54 -0600)
* src/vmware/vmware_driver.c (vmwareOpen, vmwareDomainReboot)
(vmwareDomainCreateXML, vmwareDomainCreateWithFlags): Reject
unknown flags.

src/vmware/vmware_driver.c

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