bughz
/
sigar
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

VMware server CreateSnapshot takes less arguments than ESX 3's

This commit is contained in:
Doug MacEachern 2007-06-14 04:43:37 +00:00
parent 37d9c1af0c
commit e710e27948
2 changed files with 35 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
bindings/java/src/jni/vmware/javavmware.c
View File

@ -612,7 +612,7 @@ JNIEXPORT void VMWARE_JNI(VM_suspend)
} }
} }
JNIEXPORT void VMWARE_JNI(VM_createSnapshot) JNIEXPORT void VMWARE_JNI(VM_createNamedSnapshot)
(JNIEnv *env, jclass obj, (JNIEnv *env, jclass obj,
jstring jname, jstring jdescr, jstring jname, jstring jdescr,
jboolean quiesce, jboolean memory) jboolean quiesce, jboolean memory)
@ -631,6 +631,21 @@ JNIEXPORT void VMWARE_JNI(VM_createSnapshot)
JENV->ReleaseStringUTFChars(env, jdescr, descr); JENV->ReleaseStringUTFChars(env, jdescr, descr);
} }
/* VMware server version has no args */
typedef Bool (*VMControl_VMmakeSnapshot)(VMControlVM *);
JNIEXPORT void VMWARE_JNI(VM_createDefaultSnapshot)
(JNIEnv *env, jclass obj)
{
dVM(obj);
VMControl_VMmakeSnapshot makeSnapshot =
(VMControl_VMmakeSnapshot)VMControl_VMCreateSnapshot;
if (!makeSnapshot(vm)) {
vmware_throw_last_vm_error();
}
}
JNIEXPORT void VMWARE_JNI(VM_revertToSnapshot) JNIEXPORT void VMWARE_JNI(VM_revertToSnapshot)
(JNIEnv *env, jclass obj) (JNIEnv *env, jclass obj)
{ {

23
bindings/java/src/org/hyperic/sigar/vmware/VM.java
View File

@ -305,10 +305,25 @@ public class VM extends VMwareObject {
resume(POWEROP_MODE_DEFAULT); resume(POWEROP_MODE_DEFAULT);
} }
public native void createSnapshot(String name, private native void createNamedSnapshot(String name,
String description, String description,
boolean quiesce, boolean quiesce,
boolean memory) throws VMwareException; boolean memory) throws VMwareException;
private native void createDefaultSnapshot() throws VMwareException;
public void createSnapshot(String name,
String description,
boolean quiesce,
boolean memory) throws VMwareException {
if (isESX()) {
createNamedSnapshot(name, description, quiesce, memory);
}
else {
createDefaultSnapshot();
}
}
public native void revertToSnapshot() throws VMwareException; public native void revertToSnapshot() throws VMwareException;