X-Git-Url: http://git.annexia.org/?p=libguestfs.git;a=blobdiff_plain;f=java%2Fcom_redhat_et_libguestfs_GuestFS.c;h=ae6ff86311e158aab5ffb48121e7d90aa29ecd79;hp=d7f825da72a4e0d7ee034b058d114ea8bc59eefc;hb=9222136ac9b2e404dba128b1ac74dacaa8bf1038;hpb=7f818fa00c3d019146c7178f152408038d4a4d52

diff --git a/java/com_redhat_et_libguestfs_GuestFS.c b/java/com_redhat_et_libguestfs_GuestFS.c
index d7f825d..ae6ff86 100644
--- a/java/com_redhat_et_libguestfs_GuestFS.c
+++ b/java/com_redhat_et_libguestfs_GuestFS.c
@@ -50,22 +50,22 @@ Java_com_redhat_et_libguestfs_GuestFS__1create
     return 0;
   }
   guestfs_set_error_handler (g, NULL, NULL);
-  return (jlong) g;
+  return (jlong) (long) g;
 }
 
 JNIEXPORT void JNICALL
 Java_com_redhat_et_libguestfs_GuestFS__1close
   (JNIEnv *env, jobject obj, jlong jg)
 {
-  guestfs_h *g = (guestfs_h *) jg;
+  guestfs_h *g = (guestfs_h *) (long) jg;
   guestfs_close (g);
 }
 
 JNIEXPORT void JNICALL
-Java_com_redhat_et_libguestfs__1launch
+Java_com_redhat_et_libguestfs_GuestFS__1launch
   (JNIEnv *env, jobject obj, jlong jg)
 {
-  guestfs_h *g = (guestfs_h *) jg;
+  guestfs_h *g = (guestfs_h *) (long) jg;
   int r;
 
   r = guestfs_launch (g);
@@ -76,10 +76,10 @@ Java_com_redhat_et_libguestfs__1launch
 }
 
 JNIEXPORT void JNICALL
-Java_com_redhat_et_libguestfs__1wait_1ready
+Java_com_redhat_et_libguestfs_GuestFS__1wait_1ready
   (JNIEnv *env, jobject obj, jlong jg)
 {
-  guestfs_h *g = (guestfs_h *) jg;
+  guestfs_h *g = (guestfs_h *) (long) jg;
   int r;
 
   r = guestfs_wait_ready (g);
@@ -90,10 +90,10 @@ Java_com_redhat_et_libguestfs__1wait_1ready
 }
 
 JNIEXPORT void JNICALL
-Java_com_redhat_et_libguestfs__1kill_1subprocess
+Java_com_redhat_et_libguestfs_GuestFS__1kill_1subprocess
   (JNIEnv *env, jobject obj, jlong jg)
 {
-  guestfs_h *g = (guestfs_h *) jg;
+  guestfs_h *g = (guestfs_h *) (long) jg;
   int r;
 
   r = guestfs_kill_subprocess (g);
@@ -104,10 +104,10 @@ Java_com_redhat_et_libguestfs__1kill_1subprocess
 }
 
 JNIEXPORT void JNICALL
-Java_com_redhat_et_libguestfs__1add_1drive
+Java_com_redhat_et_libguestfs_GuestFS__1add_1drive
   (JNIEnv *env, jobject obj, jlong jg, jstring jfilename)
 {
-  guestfs_h *g = (guestfs_h *) jg;
+  guestfs_h *g = (guestfs_h *) (long) jg;
   int r;
   const char *filename;
 
@@ -121,10 +121,10 @@ Java_com_redhat_et_libguestfs__1add_1drive
 }
 
 JNIEXPORT void JNICALL
-Java_com_redhat_et_libguestfs__1add_1cdrom
+Java_com_redhat_et_libguestfs_GuestFS__1add_1cdrom
   (JNIEnv *env, jobject obj, jlong jg, jstring jfilename)
 {
-  guestfs_h *g = (guestfs_h *) jg;
+  guestfs_h *g = (guestfs_h *) (long) jg;
   int r;
   const char *filename;
 
@@ -138,10 +138,10 @@ Java_com_redhat_et_libguestfs__1add_1cdrom
 }
 
 JNIEXPORT void JNICALL
-Java_com_redhat_et_libguestfs__1config
+Java_com_redhat_et_libguestfs_GuestFS__1config
   (JNIEnv *env, jobject obj, jlong jg, jstring jqemuparam, jstring jqemuvalue)
 {
-  guestfs_h *g = (guestfs_h *) jg;
+  guestfs_h *g = (guestfs_h *) (long) jg;
   int r;
   const char *qemuparam;
   const char *qemuvalue;
@@ -158,10 +158,42 @@ Java_com_redhat_et_libguestfs__1config
 }
 
 JNIEXPORT void JNICALL
-Java_com_redhat_et_libguestfs__1set_1path
+Java_com_redhat_et_libguestfs_GuestFS__1set_1qemu
+  (JNIEnv *env, jobject obj, jlong jg, jstring jqemu)
+{
+  guestfs_h *g = (guestfs_h *) (long) jg;
+  int r;
+  const char *qemu;
+
+  qemu = (*env)->GetStringUTFChars (env, jqemu, NULL);
+  r = guestfs_set_qemu (g, qemu);
+  (*env)->ReleaseStringUTFChars (env, jqemu, qemu);
+  if (r == -1) {
+    throw_exception (env, guestfs_last_error (g));
+    return ;
+  }
+}
+
+JNIEXPORT jstring JNICALL
+Java_com_redhat_et_libguestfs_GuestFS__1get_1qemu
+  (JNIEnv *env, jobject obj, jlong jg)
+{
+  guestfs_h *g = (guestfs_h *) (long) jg;
+  const char *r;
+
+  r = guestfs_get_qemu (g);
+  if (r == NULL) {
+    throw_exception (env, guestfs_last_error (g));
+    return NULL;
+  }
+  return (*env)->NewStringUTF (env, r);
+}
+
+JNIEXPORT void JNICALL
+Java_com_redhat_et_libguestfs_GuestFS__1set_1path
   (JNIEnv *env, jobject obj, jlong jg, jstring jpath)
 {
-  guestfs_h *g = (guestfs_h *) jg;
+  guestfs_h *g = (guestfs_h *) (long) jg;
   int r;
   const char *path;
 
@@ -175,10 +207,10 @@ Java_com_redhat_et_libguestfs__1set_1path
 }
 
 JNIEXPORT jstring JNICALL
-Java_com_redhat_et_libguestfs__1get_1path
+Java_com_redhat_et_libguestfs_GuestFS__1get_1path
   (JNIEnv *env, jobject obj, jlong jg)
 {
-  guestfs_h *g = (guestfs_h *) jg;
+  guestfs_h *g = (guestfs_h *) (long) jg;
   const char *r;
 
   r = guestfs_get_path (g);
@@ -190,10 +222,10 @@ Java_com_redhat_et_libguestfs__1get_1path
 }
 
 JNIEXPORT void JNICALL
-Java_com_redhat_et_libguestfs__1set_1autosync
+Java_com_redhat_et_libguestfs_GuestFS__1set_1autosync
   (JNIEnv *env, jobject obj, jlong jg, jboolean jautosync)
 {
-  guestfs_h *g = (guestfs_h *) jg;
+  guestfs_h *g = (guestfs_h *) (long) jg;
   int r;
   int autosync;
 
@@ -206,10 +238,10 @@ Java_com_redhat_et_libguestfs__1set_1autosync
 }
 
 JNIEXPORT jboolean JNICALL
-Java_com_redhat_et_libguestfs__1get_1autosync
+Java_com_redhat_et_libguestfs_GuestFS__1get_1autosync
   (JNIEnv *env, jobject obj, jlong jg)
 {
-  guestfs_h *g = (guestfs_h *) jg;
+  guestfs_h *g = (guestfs_h *) (long) jg;
   int r;
 
   r = guestfs_get_autosync (g);
@@ -221,10 +253,10 @@ Java_com_redhat_et_libguestfs__1get_1autosync
 }
 
 JNIEXPORT void JNICALL
-Java_com_redhat_et_libguestfs__1set_1verbose
+Java_com_redhat_et_libguestfs_GuestFS__1set_1verbose
   (JNIEnv *env, jobject obj, jlong jg, jboolean jverbose)
 {
-  guestfs_h *g = (guestfs_h *) jg;
+  guestfs_h *g = (guestfs_h *) (long) jg;
   int r;
   int verbose;
 
@@ -237,10 +269,10 @@ Java_com_redhat_et_libguestfs__1set_1verbose
 }
 
 JNIEXPORT jboolean JNICALL
-Java_com_redhat_et_libguestfs__1get_1verbose
+Java_com_redhat_et_libguestfs_GuestFS__1get_1verbose
   (JNIEnv *env, jobject obj, jlong jg)
 {
-  guestfs_h *g = (guestfs_h *) jg;
+  guestfs_h *g = (guestfs_h *) (long) jg;
   int r;
 
   r = guestfs_get_verbose (g);
@@ -252,10 +284,10 @@ Java_com_redhat_et_libguestfs__1get_1verbose
 }
 
 JNIEXPORT jboolean JNICALL
-Java_com_redhat_et_libguestfs__1is_1ready
+Java_com_redhat_et_libguestfs_GuestFS__1is_1ready
   (JNIEnv *env, jobject obj, jlong jg)
 {
-  guestfs_h *g = (guestfs_h *) jg;
+  guestfs_h *g = (guestfs_h *) (long) jg;
   int r;
 
   r = guestfs_is_ready (g);
@@ -267,10 +299,10 @@ Java_com_redhat_et_libguestfs__1is_1ready
 }
 
 JNIEXPORT jboolean JNICALL
-Java_com_redhat_et_libguestfs__1is_1config
+Java_com_redhat_et_libguestfs_GuestFS__1is_1config
   (JNIEnv *env, jobject obj, jlong jg)
 {
-  guestfs_h *g = (guestfs_h *) jg;
+  guestfs_h *g = (guestfs_h *) (long) jg;
   int r;
 
   r = guestfs_is_config (g);
@@ -282,10 +314,10 @@ Java_com_redhat_et_libguestfs__1is_1config
 }
 
 JNIEXPORT jboolean JNICALL
-Java_com_redhat_et_libguestfs__1is_1launching
+Java_com_redhat_et_libguestfs_GuestFS__1is_1launching
   (JNIEnv *env, jobject obj, jlong jg)
 {
-  guestfs_h *g = (guestfs_h *) jg;
+  guestfs_h *g = (guestfs_h *) (long) jg;
   int r;
 
   r = guestfs_is_launching (g);
@@ -297,10 +329,10 @@ Java_com_redhat_et_libguestfs__1is_1launching
 }
 
 JNIEXPORT jboolean JNICALL
-Java_com_redhat_et_libguestfs__1is_1busy
+Java_com_redhat_et_libguestfs_GuestFS__1is_1busy
   (JNIEnv *env, jobject obj, jlong jg)
 {
-  guestfs_h *g = (guestfs_h *) jg;
+  guestfs_h *g = (guestfs_h *) (long) jg;
   int r;
 
   r = guestfs_is_busy (g);
@@ -312,10 +344,10 @@ Java_com_redhat_et_libguestfs__1is_1busy
 }
 
 JNIEXPORT jint JNICALL
-Java_com_redhat_et_libguestfs__1get_1state
+Java_com_redhat_et_libguestfs_GuestFS__1get_1state
   (JNIEnv *env, jobject obj, jlong jg)
 {
-  guestfs_h *g = (guestfs_h *) jg;
+  guestfs_h *g = (guestfs_h *) (long) jg;
   int r;
 
   r = guestfs_get_state (g);
@@ -327,10 +359,10 @@ Java_com_redhat_et_libguestfs__1get_1state
 }
 
 JNIEXPORT void JNICALL
-Java_com_redhat_et_libguestfs__1set_1busy
+Java_com_redhat_et_libguestfs_GuestFS__1set_1busy
   (JNIEnv *env, jobject obj, jlong jg)
 {
-  guestfs_h *g = (guestfs_h *) jg;
+  guestfs_h *g = (guestfs_h *) (long) jg;
   int r;
 
   r = guestfs_set_busy (g);
@@ -341,10 +373,10 @@ Java_com_redhat_et_libguestfs__1set_1busy
 }
 
 JNIEXPORT void JNICALL
-Java_com_redhat_et_libguestfs__1set_1ready
+Java_com_redhat_et_libguestfs_GuestFS__1set_1ready
   (JNIEnv *env, jobject obj, jlong jg)
 {
-  guestfs_h *g = (guestfs_h *) jg;
+  guestfs_h *g = (guestfs_h *) (long) jg;
   int r;
 
   r = guestfs_set_ready (g);
@@ -355,10 +387,10 @@ Java_com_redhat_et_libguestfs__1set_1ready
 }
 
 JNIEXPORT void JNICALL
-Java_com_redhat_et_libguestfs__1mount
+Java_com_redhat_et_libguestfs_GuestFS__1mount
   (JNIEnv *env, jobject obj, jlong jg, jstring jdevice, jstring jmountpoint)
 {
-  guestfs_h *g = (guestfs_h *) jg;
+  guestfs_h *g = (guestfs_h *) (long) jg;
   int r;
   const char *device;
   const char *mountpoint;
@@ -375,10 +407,10 @@ Java_com_redhat_et_libguestfs__1mount
 }
 
 JNIEXPORT void JNICALL
-Java_com_redhat_et_libguestfs__1sync
+Java_com_redhat_et_libguestfs_GuestFS__1sync
   (JNIEnv *env, jobject obj, jlong jg)
 {
-  guestfs_h *g = (guestfs_h *) jg;
+  guestfs_h *g = (guestfs_h *) (long) jg;
   int r;
 
   r = guestfs_sync (g);
@@ -389,10 +421,10 @@ Java_com_redhat_et_libguestfs__1sync
 }
 
 JNIEXPORT void JNICALL
-Java_com_redhat_et_libguestfs__1touch
+Java_com_redhat_et_libguestfs_GuestFS__1touch
   (JNIEnv *env, jobject obj, jlong jg, jstring jpath)
 {
-  guestfs_h *g = (guestfs_h *) jg;
+  guestfs_h *g = (guestfs_h *) (long) jg;
   int r;
   const char *path;
 
@@ -406,10 +438,10 @@ Java_com_redhat_et_libguestfs__1touch
 }
 
 JNIEXPORT jstring JNICALL
-Java_com_redhat_et_libguestfs__1cat
+Java_com_redhat_et_libguestfs_GuestFS__1cat
   (JNIEnv *env, jobject obj, jlong jg, jstring jpath)
 {
-  guestfs_h *g = (guestfs_h *) jg;
+  guestfs_h *g = (guestfs_h *) (long) jg;
   jstring jr;
   char *r;
   const char *path;
@@ -427,10 +459,10 @@ Java_com_redhat_et_libguestfs__1cat
 }
 
 JNIEXPORT jstring JNICALL
-Java_com_redhat_et_libguestfs__1ll
+Java_com_redhat_et_libguestfs_GuestFS__1ll
   (JNIEnv *env, jobject obj, jlong jg, jstring jdirectory)
 {
-  guestfs_h *g = (guestfs_h *) jg;
+  guestfs_h *g = (guestfs_h *) (long) jg;
   jstring jr;
   char *r;
   const char *directory;
@@ -448,10 +480,10 @@ Java_com_redhat_et_libguestfs__1ll
 }
 
 JNIEXPORT jobjectArray JNICALL
-Java_com_redhat_et_libguestfs__1ls
+Java_com_redhat_et_libguestfs_GuestFS__1ls
   (JNIEnv *env, jobject obj, jlong jg, jstring jdirectory)
 {
-  guestfs_h *g = (guestfs_h *) jg;
+  guestfs_h *g = (guestfs_h *) (long) jg;
   jobjectArray jr;
   int r_len;
   jclass cl;
@@ -481,10 +513,10 @@ Java_com_redhat_et_libguestfs__1ls
 }
 
 JNIEXPORT jobjectArray JNICALL
-Java_com_redhat_et_libguestfs__1list_1devices
+Java_com_redhat_et_libguestfs_GuestFS__1list_1devices
   (JNIEnv *env, jobject obj, jlong jg)
 {
-  guestfs_h *g = (guestfs_h *) jg;
+  guestfs_h *g = (guestfs_h *) (long) jg;
   jobjectArray jr;
   int r_len;
   jclass cl;
@@ -511,10 +543,10 @@ Java_com_redhat_et_libguestfs__1list_1devices
 }
 
 JNIEXPORT jobjectArray JNICALL
-Java_com_redhat_et_libguestfs__1list_1partitions
+Java_com_redhat_et_libguestfs_GuestFS__1list_1partitions
   (JNIEnv *env, jobject obj, jlong jg)
 {
-  guestfs_h *g = (guestfs_h *) jg;
+  guestfs_h *g = (guestfs_h *) (long) jg;
   jobjectArray jr;
   int r_len;
   jclass cl;
@@ -541,10 +573,10 @@ Java_com_redhat_et_libguestfs__1list_1partitions
 }
 
 JNIEXPORT jobjectArray JNICALL
-Java_com_redhat_et_libguestfs__1pvs
+Java_com_redhat_et_libguestfs_GuestFS__1pvs
   (JNIEnv *env, jobject obj, jlong jg)
 {
-  guestfs_h *g = (guestfs_h *) jg;
+  guestfs_h *g = (guestfs_h *) (long) jg;
   jobjectArray jr;
   int r_len;
   jclass cl;
@@ -571,10 +603,10 @@ Java_com_redhat_et_libguestfs__1pvs
 }
 
 JNIEXPORT jobjectArray JNICALL
-Java_com_redhat_et_libguestfs__1vgs
+Java_com_redhat_et_libguestfs_GuestFS__1vgs
   (JNIEnv *env, jobject obj, jlong jg)
 {
-  guestfs_h *g = (guestfs_h *) jg;
+  guestfs_h *g = (guestfs_h *) (long) jg;
   jobjectArray jr;
   int r_len;
   jclass cl;
@@ -601,10 +633,10 @@ Java_com_redhat_et_libguestfs__1vgs
 }
 
 JNIEXPORT jobjectArray JNICALL
-Java_com_redhat_et_libguestfs__1lvs
+Java_com_redhat_et_libguestfs_GuestFS__1lvs
   (JNIEnv *env, jobject obj, jlong jg)
 {
-  guestfs_h *g = (guestfs_h *) jg;
+  guestfs_h *g = (guestfs_h *) (long) jg;
   jobjectArray jr;
   int r_len;
   jclass cl;
@@ -631,10 +663,10 @@ Java_com_redhat_et_libguestfs__1lvs
 }
 
 JNIEXPORT jobjectArray JNICALL
-Java_com_redhat_et_libguestfs__1pvs_1full
+Java_com_redhat_et_libguestfs_GuestFS__1pvs_1full
   (JNIEnv *env, jobject obj, jlong jg)
 {
-  guestfs_h *g = (guestfs_h *) jg;
+  guestfs_h *g = (guestfs_h *) (long) jg;
   jobjectArray jr;
   jclass cl;
   jfieldID fl;
@@ -691,10 +723,10 @@ Java_com_redhat_et_libguestfs__1pvs_1full
 }
 
 JNIEXPORT jobjectArray JNICALL
-Java_com_redhat_et_libguestfs__1vgs_1full
+Java_com_redhat_et_libguestfs_GuestFS__1vgs_1full
   (JNIEnv *env, jobject obj, jlong jg)
 {
-  guestfs_h *g = (guestfs_h *) jg;
+  guestfs_h *g = (guestfs_h *) (long) jg;
   jobjectArray jr;
   jclass cl;
   jfieldID fl;
@@ -761,10 +793,10 @@ Java_com_redhat_et_libguestfs__1vgs_1full
 }
 
 JNIEXPORT jobjectArray JNICALL
-Java_com_redhat_et_libguestfs__1lvs_1full
+Java_com_redhat_et_libguestfs_GuestFS__1lvs_1full
   (JNIEnv *env, jobject obj, jlong jg)
 {
-  guestfs_h *g = (guestfs_h *) jg;
+  guestfs_h *g = (guestfs_h *) (long) jg;
   jobjectArray jr;
   jclass cl;
   jfieldID fl;
@@ -825,10 +857,10 @@ Java_com_redhat_et_libguestfs__1lvs_1full
 }
 
 JNIEXPORT jobjectArray JNICALL
-Java_com_redhat_et_libguestfs__1read_1lines
+Java_com_redhat_et_libguestfs_GuestFS__1read_1lines
   (JNIEnv *env, jobject obj, jlong jg, jstring jpath)
 {
-  guestfs_h *g = (guestfs_h *) jg;
+  guestfs_h *g = (guestfs_h *) (long) jg;
   jobjectArray jr;
   int r_len;
   jclass cl;
@@ -858,10 +890,10 @@ Java_com_redhat_et_libguestfs__1read_1lines
 }
 
 JNIEXPORT void JNICALL
-Java_com_redhat_et_libguestfs__1aug_1init
+Java_com_redhat_et_libguestfs_GuestFS__1aug_1init
   (JNIEnv *env, jobject obj, jlong jg, jstring jroot, jint jflags)
 {
-  guestfs_h *g = (guestfs_h *) jg;
+  guestfs_h *g = (guestfs_h *) (long) jg;
   int r;
   const char *root;
   int flags;
@@ -877,10 +909,10 @@ Java_com_redhat_et_libguestfs__1aug_1init
 }
 
 JNIEXPORT void JNICALL
-Java_com_redhat_et_libguestfs__1aug_1close
+Java_com_redhat_et_libguestfs_GuestFS__1aug_1close
   (JNIEnv *env, jobject obj, jlong jg)
 {
-  guestfs_h *g = (guestfs_h *) jg;
+  guestfs_h *g = (guestfs_h *) (long) jg;
   int r;
 
   r = guestfs_aug_close (g);
@@ -891,10 +923,10 @@ Java_com_redhat_et_libguestfs__1aug_1close
 }
 
 JNIEXPORT jint JNICALL
-Java_com_redhat_et_libguestfs__1aug_1defvar
+Java_com_redhat_et_libguestfs_GuestFS__1aug_1defvar
   (JNIEnv *env, jobject obj, jlong jg, jstring jname, jstring jexpr)
 {
-  guestfs_h *g = (guestfs_h *) jg;
+  guestfs_h *g = (guestfs_h *) (long) jg;
   int r;
   const char *name;
   const char *expr;
@@ -912,10 +944,10 @@ Java_com_redhat_et_libguestfs__1aug_1defvar
 }
 
 JNIEXPORT jobject JNICALL
-Java_com_redhat_et_libguestfs__1aug_1defnode
+Java_com_redhat_et_libguestfs_GuestFS__1aug_1defnode
   (JNIEnv *env, jobject obj, jlong jg, jstring jname, jstring jexpr, jstring jval)
 {
-  guestfs_h *g = (guestfs_h *) jg;
+  guestfs_h *g = (guestfs_h *) (long) jg;
   jobject jr;
   jclass cl;
   jfieldID fl;
@@ -946,10 +978,10 @@ Java_com_redhat_et_libguestfs__1aug_1defnode
 }
 
 JNIEXPORT jstring JNICALL
-Java_com_redhat_et_libguestfs__1aug_1get
+Java_com_redhat_et_libguestfs_GuestFS__1aug_1get
   (JNIEnv *env, jobject obj, jlong jg, jstring jpath)
 {
-  guestfs_h *g = (guestfs_h *) jg;
+  guestfs_h *g = (guestfs_h *) (long) jg;
   jstring jr;
   char *r;
   const char *path;
@@ -967,10 +999,10 @@ Java_com_redhat_et_libguestfs__1aug_1get
 }
 
 JNIEXPORT void JNICALL
-Java_com_redhat_et_libguestfs__1aug_1set
+Java_com_redhat_et_libguestfs_GuestFS__1aug_1set
   (JNIEnv *env, jobject obj, jlong jg, jstring jpath, jstring jval)
 {
-  guestfs_h *g = (guestfs_h *) jg;
+  guestfs_h *g = (guestfs_h *) (long) jg;
   int r;
   const char *path;
   const char *val;
@@ -987,10 +1019,10 @@ Java_com_redhat_et_libguestfs__1aug_1set
 }
 
 JNIEXPORT void JNICALL
-Java_com_redhat_et_libguestfs__1aug_1insert
+Java_com_redhat_et_libguestfs_GuestFS__1aug_1insert
   (JNIEnv *env, jobject obj, jlong jg, jstring jpath, jstring jlabel, jboolean jbefore)
 {
-  guestfs_h *g = (guestfs_h *) jg;
+  guestfs_h *g = (guestfs_h *) (long) jg;
   int r;
   const char *path;
   const char *label;
@@ -1009,10 +1041,10 @@ Java_com_redhat_et_libguestfs__1aug_1insert
 }
 
 JNIEXPORT jint JNICALL
-Java_com_redhat_et_libguestfs__1aug_1rm
+Java_com_redhat_et_libguestfs_GuestFS__1aug_1rm
   (JNIEnv *env, jobject obj, jlong jg, jstring jpath)
 {
-  guestfs_h *g = (guestfs_h *) jg;
+  guestfs_h *g = (guestfs_h *) (long) jg;
   int r;
   const char *path;
 
@@ -1027,10 +1059,10 @@ Java_com_redhat_et_libguestfs__1aug_1rm
 }
 
 JNIEXPORT void JNICALL
-Java_com_redhat_et_libguestfs__1aug_1mv
+Java_com_redhat_et_libguestfs_GuestFS__1aug_1mv
   (JNIEnv *env, jobject obj, jlong jg, jstring jsrc, jstring jdest)
 {
-  guestfs_h *g = (guestfs_h *) jg;
+  guestfs_h *g = (guestfs_h *) (long) jg;
   int r;
   const char *src;
   const char *dest;
@@ -1047,10 +1079,10 @@ Java_com_redhat_et_libguestfs__1aug_1mv
 }
 
 JNIEXPORT jobjectArray JNICALL
-Java_com_redhat_et_libguestfs__1aug_1match
+Java_com_redhat_et_libguestfs_GuestFS__1aug_1match
   (JNIEnv *env, jobject obj, jlong jg, jstring jpath)
 {
-  guestfs_h *g = (guestfs_h *) jg;
+  guestfs_h *g = (guestfs_h *) (long) jg;
   jobjectArray jr;
   int r_len;
   jclass cl;
@@ -1080,10 +1112,10 @@ Java_com_redhat_et_libguestfs__1aug_1match
 }
 
 JNIEXPORT void JNICALL
-Java_com_redhat_et_libguestfs__1aug_1save
+Java_com_redhat_et_libguestfs_GuestFS__1aug_1save
   (JNIEnv *env, jobject obj, jlong jg)
 {
-  guestfs_h *g = (guestfs_h *) jg;
+  guestfs_h *g = (guestfs_h *) (long) jg;
   int r;
 
   r = guestfs_aug_save (g);
@@ -1094,10 +1126,10 @@ Java_com_redhat_et_libguestfs__1aug_1save
 }
 
 JNIEXPORT void JNICALL
-Java_com_redhat_et_libguestfs__1aug_1load
+Java_com_redhat_et_libguestfs_GuestFS__1aug_1load
   (JNIEnv *env, jobject obj, jlong jg)
 {
-  guestfs_h *g = (guestfs_h *) jg;
+  guestfs_h *g = (guestfs_h *) (long) jg;
   int r;
 
   r = guestfs_aug_load (g);
@@ -1108,10 +1140,10 @@ Java_com_redhat_et_libguestfs__1aug_1load
 }
 
 JNIEXPORT jobjectArray JNICALL
-Java_com_redhat_et_libguestfs__1aug_1ls
+Java_com_redhat_et_libguestfs_GuestFS__1aug_1ls
   (JNIEnv *env, jobject obj, jlong jg, jstring jpath)
 {
-  guestfs_h *g = (guestfs_h *) jg;
+  guestfs_h *g = (guestfs_h *) (long) jg;
   jobjectArray jr;
   int r_len;
   jclass cl;
@@ -1141,10 +1173,10 @@ Java_com_redhat_et_libguestfs__1aug_1ls
 }
 
 JNIEXPORT void JNICALL
-Java_com_redhat_et_libguestfs__1rm
+Java_com_redhat_et_libguestfs_GuestFS__1rm
   (JNIEnv *env, jobject obj, jlong jg, jstring jpath)
 {
-  guestfs_h *g = (guestfs_h *) jg;
+  guestfs_h *g = (guestfs_h *) (long) jg;
   int r;
   const char *path;
 
@@ -1158,10 +1190,10 @@ Java_com_redhat_et_libguestfs__1rm
 }
 
 JNIEXPORT void JNICALL
-Java_com_redhat_et_libguestfs__1rmdir
+Java_com_redhat_et_libguestfs_GuestFS__1rmdir
   (JNIEnv *env, jobject obj, jlong jg, jstring jpath)
 {
-  guestfs_h *g = (guestfs_h *) jg;
+  guestfs_h *g = (guestfs_h *) (long) jg;
   int r;
   const char *path;
 
@@ -1175,10 +1207,10 @@ Java_com_redhat_et_libguestfs__1rmdir
 }
 
 JNIEXPORT void JNICALL
-Java_com_redhat_et_libguestfs__1rm_1rf
+Java_com_redhat_et_libguestfs_GuestFS__1rm_1rf
   (JNIEnv *env, jobject obj, jlong jg, jstring jpath)
 {
-  guestfs_h *g = (guestfs_h *) jg;
+  guestfs_h *g = (guestfs_h *) (long) jg;
   int r;
   const char *path;
 
@@ -1192,10 +1224,10 @@ Java_com_redhat_et_libguestfs__1rm_1rf
 }
 
 JNIEXPORT void JNICALL
-Java_com_redhat_et_libguestfs__1mkdir
+Java_com_redhat_et_libguestfs_GuestFS__1mkdir
   (JNIEnv *env, jobject obj, jlong jg, jstring jpath)
 {
-  guestfs_h *g = (guestfs_h *) jg;
+  guestfs_h *g = (guestfs_h *) (long) jg;
   int r;
   const char *path;
 
@@ -1209,10 +1241,10 @@ Java_com_redhat_et_libguestfs__1mkdir
 }
 
 JNIEXPORT void JNICALL
-Java_com_redhat_et_libguestfs__1mkdir_1p
+Java_com_redhat_et_libguestfs_GuestFS__1mkdir_1p
   (JNIEnv *env, jobject obj, jlong jg, jstring jpath)
 {
-  guestfs_h *g = (guestfs_h *) jg;
+  guestfs_h *g = (guestfs_h *) (long) jg;
   int r;
   const char *path;
 
@@ -1226,10 +1258,10 @@ Java_com_redhat_et_libguestfs__1mkdir_1p
 }
 
 JNIEXPORT void JNICALL
-Java_com_redhat_et_libguestfs__1chmod
+Java_com_redhat_et_libguestfs_GuestFS__1chmod
   (JNIEnv *env, jobject obj, jlong jg, jint jmode, jstring jpath)
 {
-  guestfs_h *g = (guestfs_h *) jg;
+  guestfs_h *g = (guestfs_h *) (long) jg;
   int r;
   int mode;
   const char *path;
@@ -1245,10 +1277,10 @@ Java_com_redhat_et_libguestfs__1chmod
 }
 
 JNIEXPORT void JNICALL
-Java_com_redhat_et_libguestfs__1chown
+Java_com_redhat_et_libguestfs_GuestFS__1chown
   (JNIEnv *env, jobject obj, jlong jg, jint jowner, jint jgroup, jstring jpath)
 {
-  guestfs_h *g = (guestfs_h *) jg;
+  guestfs_h *g = (guestfs_h *) (long) jg;
   int r;
   int owner;
   int group;
@@ -1266,10 +1298,10 @@ Java_com_redhat_et_libguestfs__1chown
 }
 
 JNIEXPORT jboolean JNICALL
-Java_com_redhat_et_libguestfs__1exists
+Java_com_redhat_et_libguestfs_GuestFS__1exists
   (JNIEnv *env, jobject obj, jlong jg, jstring jpath)
 {
-  guestfs_h *g = (guestfs_h *) jg;
+  guestfs_h *g = (guestfs_h *) (long) jg;
   int r;
   const char *path;
 
@@ -1284,10 +1316,10 @@ Java_com_redhat_et_libguestfs__1exists
 }
 
 JNIEXPORT jboolean JNICALL
-Java_com_redhat_et_libguestfs__1is_1file
+Java_com_redhat_et_libguestfs_GuestFS__1is_1file
   (JNIEnv *env, jobject obj, jlong jg, jstring jpath)
 {
-  guestfs_h *g = (guestfs_h *) jg;
+  guestfs_h *g = (guestfs_h *) (long) jg;
   int r;
   const char *path;
 
@@ -1302,10 +1334,10 @@ Java_com_redhat_et_libguestfs__1is_1file
 }
 
 JNIEXPORT jboolean JNICALL
-Java_com_redhat_et_libguestfs__1is_1dir
+Java_com_redhat_et_libguestfs_GuestFS__1is_1dir
   (JNIEnv *env, jobject obj, jlong jg, jstring jpath)
 {
-  guestfs_h *g = (guestfs_h *) jg;
+  guestfs_h *g = (guestfs_h *) (long) jg;
   int r;
   const char *path;
 
@@ -1320,10 +1352,10 @@ Java_com_redhat_et_libguestfs__1is_1dir
 }
 
 JNIEXPORT void JNICALL
-Java_com_redhat_et_libguestfs__1pvcreate
+Java_com_redhat_et_libguestfs_GuestFS__1pvcreate
   (JNIEnv *env, jobject obj, jlong jg, jstring jdevice)
 {
-  guestfs_h *g = (guestfs_h *) jg;
+  guestfs_h *g = (guestfs_h *) (long) jg;
   int r;
   const char *device;
 
@@ -1337,10 +1369,10 @@ Java_com_redhat_et_libguestfs__1pvcreate
 }
 
 JNIEXPORT void JNICALL
-Java_com_redhat_et_libguestfs__1vgcreate
+Java_com_redhat_et_libguestfs_GuestFS__1vgcreate
   (JNIEnv *env, jobject obj, jlong jg, jstring jvolgroup, jobjectArray jphysvols)
 {
-  guestfs_h *g = (guestfs_h *) jg;
+  guestfs_h *g = (guestfs_h *) (long) jg;
   int r;
   const char *volgroup;
   int physvols_len;
@@ -1349,7 +1381,7 @@ Java_com_redhat_et_libguestfs__1vgcreate
 
   volgroup = (*env)->GetStringUTFChars (env, jvolgroup, NULL);
   physvols_len = (*env)->GetArrayLength (env, jphysvols);
-  physvols = malloc (sizeof (char *) * (physvols_len+1));
+  physvols = guestfs_safe_malloc (g, sizeof (char *) * (physvols_len+1));
   for (i = 0; i < physvols_len; ++i) {
     jobject o = (*env)->GetObjectArrayElement (env, jphysvols, i);
     physvols[i] = (*env)->GetStringUTFChars (env, o, NULL);
@@ -1369,10 +1401,10 @@ Java_com_redhat_et_libguestfs__1vgcreate
 }
 
 JNIEXPORT void JNICALL
-Java_com_redhat_et_libguestfs__1lvcreate
+Java_com_redhat_et_libguestfs_GuestFS__1lvcreate
   (JNIEnv *env, jobject obj, jlong jg, jstring jlogvol, jstring jvolgroup, jint jmbytes)
 {
-  guestfs_h *g = (guestfs_h *) jg;
+  guestfs_h *g = (guestfs_h *) (long) jg;
   int r;
   const char *logvol;
   const char *volgroup;
@@ -1391,10 +1423,10 @@ Java_com_redhat_et_libguestfs__1lvcreate
 }
 
 JNIEXPORT void JNICALL
-Java_com_redhat_et_libguestfs__1mkfs
+Java_com_redhat_et_libguestfs_GuestFS__1mkfs
   (JNIEnv *env, jobject obj, jlong jg, jstring jfstype, jstring jdevice)
 {
-  guestfs_h *g = (guestfs_h *) jg;
+  guestfs_h *g = (guestfs_h *) (long) jg;
   int r;
   const char *fstype;
   const char *device;
@@ -1411,10 +1443,10 @@ Java_com_redhat_et_libguestfs__1mkfs
 }
 
 JNIEXPORT void JNICALL
-Java_com_redhat_et_libguestfs__1sfdisk
+Java_com_redhat_et_libguestfs_GuestFS__1sfdisk
   (JNIEnv *env, jobject obj, jlong jg, jstring jdevice, jint jcyls, jint jheads, jint jsectors, jobjectArray jlines)
 {
-  guestfs_h *g = (guestfs_h *) jg;
+  guestfs_h *g = (guestfs_h *) (long) jg;
   int r;
   const char *device;
   int cyls;
@@ -1429,7 +1461,7 @@ Java_com_redhat_et_libguestfs__1sfdisk
   heads = jheads;
   sectors = jsectors;
   lines_len = (*env)->GetArrayLength (env, jlines);
-  lines = malloc (sizeof (char *) * (lines_len+1));
+  lines = guestfs_safe_malloc (g, sizeof (char *) * (lines_len+1));
   for (i = 0; i < lines_len; ++i) {
     jobject o = (*env)->GetObjectArrayElement (env, jlines, i);
     lines[i] = (*env)->GetStringUTFChars (env, o, NULL);
@@ -1449,10 +1481,10 @@ Java_com_redhat_et_libguestfs__1sfdisk
 }
 
 JNIEXPORT void JNICALL
-Java_com_redhat_et_libguestfs__1write_1file
+Java_com_redhat_et_libguestfs_GuestFS__1write_1file
   (JNIEnv *env, jobject obj, jlong jg, jstring jpath, jstring jcontent, jint jsize)
 {
-  guestfs_h *g = (guestfs_h *) jg;
+  guestfs_h *g = (guestfs_h *) (long) jg;
   int r;
   const char *path;
   const char *content;
@@ -1471,10 +1503,10 @@ Java_com_redhat_et_libguestfs__1write_1file
 }
 
 JNIEXPORT void JNICALL
-Java_com_redhat_et_libguestfs__1umount
+Java_com_redhat_et_libguestfs_GuestFS__1umount
   (JNIEnv *env, jobject obj, jlong jg, jstring jpathordevice)
 {
-  guestfs_h *g = (guestfs_h *) jg;
+  guestfs_h *g = (guestfs_h *) (long) jg;
   int r;
   const char *pathordevice;
 
@@ -1488,10 +1520,10 @@ Java_com_redhat_et_libguestfs__1umount
 }
 
 JNIEXPORT jobjectArray JNICALL
-Java_com_redhat_et_libguestfs__1mounts
+Java_com_redhat_et_libguestfs_GuestFS__1mounts
   (JNIEnv *env, jobject obj, jlong jg)
 {
-  guestfs_h *g = (guestfs_h *) jg;
+  guestfs_h *g = (guestfs_h *) (long) jg;
   jobjectArray jr;
   int r_len;
   jclass cl;
@@ -1518,10 +1550,10 @@ Java_com_redhat_et_libguestfs__1mounts
 }
 
 JNIEXPORT void JNICALL
-Java_com_redhat_et_libguestfs__1umount_1all
+Java_com_redhat_et_libguestfs_GuestFS__1umount_1all
   (JNIEnv *env, jobject obj, jlong jg)
 {
-  guestfs_h *g = (guestfs_h *) jg;
+  guestfs_h *g = (guestfs_h *) (long) jg;
   int r;
 
   r = guestfs_umount_all (g);
@@ -1532,10 +1564,10 @@ Java_com_redhat_et_libguestfs__1umount_1all
 }
 
 JNIEXPORT void JNICALL
-Java_com_redhat_et_libguestfs__1lvm_1remove_1all
+Java_com_redhat_et_libguestfs_GuestFS__1lvm_1remove_1all
   (JNIEnv *env, jobject obj, jlong jg)
 {
-  guestfs_h *g = (guestfs_h *) jg;
+  guestfs_h *g = (guestfs_h *) (long) jg;
   int r;
 
   r = guestfs_lvm_remove_all (g);
@@ -1546,10 +1578,10 @@ Java_com_redhat_et_libguestfs__1lvm_1remove_1all
 }
 
 JNIEXPORT jstring JNICALL
-Java_com_redhat_et_libguestfs__1file
+Java_com_redhat_et_libguestfs_GuestFS__1file
   (JNIEnv *env, jobject obj, jlong jg, jstring jpath)
 {
-  guestfs_h *g = (guestfs_h *) jg;
+  guestfs_h *g = (guestfs_h *) (long) jg;
   jstring jr;
   char *r;
   const char *path;
@@ -1567,10 +1599,10 @@ Java_com_redhat_et_libguestfs__1file
 }
 
 JNIEXPORT jstring JNICALL
-Java_com_redhat_et_libguestfs__1command
+Java_com_redhat_et_libguestfs_GuestFS__1command
   (JNIEnv *env, jobject obj, jlong jg, jobjectArray jarguments)
 {
-  guestfs_h *g = (guestfs_h *) jg;
+  guestfs_h *g = (guestfs_h *) (long) jg;
   jstring jr;
   char *r;
   int arguments_len;
@@ -1578,7 +1610,7 @@ Java_com_redhat_et_libguestfs__1command
   int i;
 
   arguments_len = (*env)->GetArrayLength (env, jarguments);
-  arguments = malloc (sizeof (char *) * (arguments_len+1));
+  arguments = guestfs_safe_malloc (g, sizeof (char *) * (arguments_len+1));
   for (i = 0; i < arguments_len; ++i) {
     jobject o = (*env)->GetObjectArrayElement (env, jarguments, i);
     arguments[i] = (*env)->GetStringUTFChars (env, o, NULL);
@@ -1600,10 +1632,10 @@ Java_com_redhat_et_libguestfs__1command
 }
 
 JNIEXPORT jobjectArray JNICALL
-Java_com_redhat_et_libguestfs__1command_1lines
+Java_com_redhat_et_libguestfs_GuestFS__1command_1lines
   (JNIEnv *env, jobject obj, jlong jg, jobjectArray jarguments)
 {
-  guestfs_h *g = (guestfs_h *) jg;
+  guestfs_h *g = (guestfs_h *) (long) jg;
   jobjectArray jr;
   int r_len;
   jclass cl;
@@ -1614,7 +1646,7 @@ Java_com_redhat_et_libguestfs__1command_1lines
   int i;
 
   arguments_len = (*env)->GetArrayLength (env, jarguments);
-  arguments = malloc (sizeof (char *) * (arguments_len+1));
+  arguments = guestfs_safe_malloc (g, sizeof (char *) * (arguments_len+1));
   for (i = 0; i < arguments_len; ++i) {
     jobject o = (*env)->GetObjectArrayElement (env, jarguments, i);
     arguments[i] = (*env)->GetStringUTFChars (env, o, NULL);
@@ -1644,10 +1676,10 @@ Java_com_redhat_et_libguestfs__1command_1lines
 }
 
 JNIEXPORT jobject JNICALL
-Java_com_redhat_et_libguestfs__1stat
+Java_com_redhat_et_libguestfs_GuestFS__1stat
   (JNIEnv *env, jobject obj, jlong jg, jstring jpath)
 {
-  guestfs_h *g = (guestfs_h *) jg;
+  guestfs_h *g = (guestfs_h *) (long) jg;
   jobject jr;
   jclass cl;
   jfieldID fl;
@@ -1694,10 +1726,10 @@ Java_com_redhat_et_libguestfs__1stat
 }
 
 JNIEXPORT jobject JNICALL
-Java_com_redhat_et_libguestfs__1lstat
+Java_com_redhat_et_libguestfs_GuestFS__1lstat
   (JNIEnv *env, jobject obj, jlong jg, jstring jpath)
 {
-  guestfs_h *g = (guestfs_h *) jg;
+  guestfs_h *g = (guestfs_h *) (long) jg;
   jobject jr;
   jclass cl;
   jfieldID fl;
@@ -1744,10 +1776,10 @@ Java_com_redhat_et_libguestfs__1lstat
 }
 
 JNIEXPORT jobject JNICALL
-Java_com_redhat_et_libguestfs__1statvfs
+Java_com_redhat_et_libguestfs_GuestFS__1statvfs
   (JNIEnv *env, jobject obj, jlong jg, jstring jpath)
 {
-  guestfs_h *g = (guestfs_h *) jg;
+  guestfs_h *g = (guestfs_h *) (long) jg;
   jobject jr;
   jclass cl;
   jfieldID fl;
@@ -1790,10 +1822,10 @@ Java_com_redhat_et_libguestfs__1statvfs
 }
 
 JNIEXPORT jobject JNICALL
-Java_com_redhat_et_libguestfs__1tune2fs_1l
+Java_com_redhat_et_libguestfs_GuestFS__1tune2fs_1l
   (JNIEnv *env, jobject obj, jlong jg, jstring jdevice)
 {
-  guestfs_h *g = (guestfs_h *) jg;
+  guestfs_h *g = (guestfs_h *) (long) jg;
   char **r;
   const char *device;
 
@@ -1809,10 +1841,10 @@ Java_com_redhat_et_libguestfs__1tune2fs_1l
 }
 
 JNIEXPORT void JNICALL
-Java_com_redhat_et_libguestfs__1blockdev_1setro
+Java_com_redhat_et_libguestfs_GuestFS__1blockdev_1setro
   (JNIEnv *env, jobject obj, jlong jg, jstring jdevice)
 {
-  guestfs_h *g = (guestfs_h *) jg;
+  guestfs_h *g = (guestfs_h *) (long) jg;
   int r;
   const char *device;
 
@@ -1826,10 +1858,10 @@ Java_com_redhat_et_libguestfs__1blockdev_1setro
 }
 
 JNIEXPORT void JNICALL
-Java_com_redhat_et_libguestfs__1blockdev_1setrw
+Java_com_redhat_et_libguestfs_GuestFS__1blockdev_1setrw
   (JNIEnv *env, jobject obj, jlong jg, jstring jdevice)
 {
-  guestfs_h *g = (guestfs_h *) jg;
+  guestfs_h *g = (guestfs_h *) (long) jg;
   int r;
   const char *device;
 
@@ -1843,10 +1875,10 @@ Java_com_redhat_et_libguestfs__1blockdev_1setrw
 }
 
 JNIEXPORT jboolean JNICALL
-Java_com_redhat_et_libguestfs__1blockdev_1getro
+Java_com_redhat_et_libguestfs_GuestFS__1blockdev_1getro
   (JNIEnv *env, jobject obj, jlong jg, jstring jdevice)
 {
-  guestfs_h *g = (guestfs_h *) jg;
+  guestfs_h *g = (guestfs_h *) (long) jg;
   int r;
   const char *device;
 
@@ -1861,10 +1893,10 @@ Java_com_redhat_et_libguestfs__1blockdev_1getro
 }
 
 JNIEXPORT jint JNICALL
-Java_com_redhat_et_libguestfs__1blockdev_1getss
+Java_com_redhat_et_libguestfs_GuestFS__1blockdev_1getss
   (JNIEnv *env, jobject obj, jlong jg, jstring jdevice)
 {
-  guestfs_h *g = (guestfs_h *) jg;
+  guestfs_h *g = (guestfs_h *) (long) jg;
   int r;
   const char *device;
 
@@ -1879,10 +1911,10 @@ Java_com_redhat_et_libguestfs__1blockdev_1getss
 }
 
 JNIEXPORT jint JNICALL
-Java_com_redhat_et_libguestfs__1blockdev_1getbsz
+Java_com_redhat_et_libguestfs_GuestFS__1blockdev_1getbsz
   (JNIEnv *env, jobject obj, jlong jg, jstring jdevice)
 {
-  guestfs_h *g = (guestfs_h *) jg;
+  guestfs_h *g = (guestfs_h *) (long) jg;
   int r;
   const char *device;
 
@@ -1897,10 +1929,10 @@ Java_com_redhat_et_libguestfs__1blockdev_1getbsz
 }
 
 JNIEXPORT void JNICALL
-Java_com_redhat_et_libguestfs__1blockdev_1setbsz
+Java_com_redhat_et_libguestfs_GuestFS__1blockdev_1setbsz
   (JNIEnv *env, jobject obj, jlong jg, jstring jdevice, jint jblocksize)
 {
-  guestfs_h *g = (guestfs_h *) jg;
+  guestfs_h *g = (guestfs_h *) (long) jg;
   int r;
   const char *device;
   int blocksize;
@@ -1916,10 +1948,10 @@ Java_com_redhat_et_libguestfs__1blockdev_1setbsz
 }
 
 JNIEXPORT jlong JNICALL
-Java_com_redhat_et_libguestfs__1blockdev_1getsz
+Java_com_redhat_et_libguestfs_GuestFS__1blockdev_1getsz
   (JNIEnv *env, jobject obj, jlong jg, jstring jdevice)
 {
-  guestfs_h *g = (guestfs_h *) jg;
+  guestfs_h *g = (guestfs_h *) (long) jg;
   int64_t r;
   const char *device;
 
@@ -1934,10 +1966,10 @@ Java_com_redhat_et_libguestfs__1blockdev_1getsz
 }
 
 JNIEXPORT jlong JNICALL
-Java_com_redhat_et_libguestfs__1blockdev_1getsize64
+Java_com_redhat_et_libguestfs_GuestFS__1blockdev_1getsize64
   (JNIEnv *env, jobject obj, jlong jg, jstring jdevice)
 {
-  guestfs_h *g = (guestfs_h *) jg;
+  guestfs_h *g = (guestfs_h *) (long) jg;
   int64_t r;
   const char *device;
 
@@ -1952,10 +1984,10 @@ Java_com_redhat_et_libguestfs__1blockdev_1getsize64
 }
 
 JNIEXPORT void JNICALL
-Java_com_redhat_et_libguestfs__1blockdev_1flushbufs
+Java_com_redhat_et_libguestfs_GuestFS__1blockdev_1flushbufs
   (JNIEnv *env, jobject obj, jlong jg, jstring jdevice)
 {
-  guestfs_h *g = (guestfs_h *) jg;
+  guestfs_h *g = (guestfs_h *) (long) jg;
   int r;
   const char *device;
 
@@ -1969,10 +2001,10 @@ Java_com_redhat_et_libguestfs__1blockdev_1flushbufs
 }
 
 JNIEXPORT void JNICALL
-Java_com_redhat_et_libguestfs__1blockdev_1rereadpt
+Java_com_redhat_et_libguestfs_GuestFS__1blockdev_1rereadpt
   (JNIEnv *env, jobject obj, jlong jg, jstring jdevice)
 {
-  guestfs_h *g = (guestfs_h *) jg;
+  guestfs_h *g = (guestfs_h *) (long) jg;
   int r;
   const char *device;
 
@@ -1986,10 +2018,10 @@ Java_com_redhat_et_libguestfs__1blockdev_1rereadpt
 }
 
 JNIEXPORT void JNICALL
-Java_com_redhat_et_libguestfs__1upload
+Java_com_redhat_et_libguestfs_GuestFS__1upload
   (JNIEnv *env, jobject obj, jlong jg, jstring jfilename, jstring jremotefilename)
 {
-  guestfs_h *g = (guestfs_h *) jg;
+  guestfs_h *g = (guestfs_h *) (long) jg;
   int r;
   const char *filename;
   const char *remotefilename;
@@ -2006,10 +2038,10 @@ Java_com_redhat_et_libguestfs__1upload
 }
 
 JNIEXPORT void JNICALL
-Java_com_redhat_et_libguestfs__1download
+Java_com_redhat_et_libguestfs_GuestFS__1download
   (JNIEnv *env, jobject obj, jlong jg, jstring jremotefilename, jstring jfilename)
 {
-  guestfs_h *g = (guestfs_h *) jg;
+  guestfs_h *g = (guestfs_h *) (long) jg;
   int r;
   const char *remotefilename;
   const char *filename;
@@ -2026,10 +2058,10 @@ Java_com_redhat_et_libguestfs__1download
 }
 
 JNIEXPORT jstring JNICALL
-Java_com_redhat_et_libguestfs__1checksum
+Java_com_redhat_et_libguestfs_GuestFS__1checksum
   (JNIEnv *env, jobject obj, jlong jg, jstring jcsumtype, jstring jpath)
 {
-  guestfs_h *g = (guestfs_h *) jg;
+  guestfs_h *g = (guestfs_h *) (long) jg;
   jstring jr;
   char *r;
   const char *csumtype;
@@ -2050,10 +2082,10 @@ Java_com_redhat_et_libguestfs__1checksum
 }
 
 JNIEXPORT void JNICALL
-Java_com_redhat_et_libguestfs__1tar_1in
+Java_com_redhat_et_libguestfs_GuestFS__1tar_1in
   (JNIEnv *env, jobject obj, jlong jg, jstring jtarfile, jstring jdirectory)
 {
-  guestfs_h *g = (guestfs_h *) jg;
+  guestfs_h *g = (guestfs_h *) (long) jg;
   int r;
   const char *tarfile;
   const char *directory;
@@ -2070,10 +2102,10 @@ Java_com_redhat_et_libguestfs__1tar_1in
 }
 
 JNIEXPORT void JNICALL
-Java_com_redhat_et_libguestfs__1tar_1out
+Java_com_redhat_et_libguestfs_GuestFS__1tar_1out
   (JNIEnv *env, jobject obj, jlong jg, jstring jdirectory, jstring jtarfile)
 {
-  guestfs_h *g = (guestfs_h *) jg;
+  guestfs_h *g = (guestfs_h *) (long) jg;
   int r;
   const char *directory;
   const char *tarfile;
@@ -2090,10 +2122,10 @@ Java_com_redhat_et_libguestfs__1tar_1out
 }
 
 JNIEXPORT void JNICALL
-Java_com_redhat_et_libguestfs__1tgz_1in
+Java_com_redhat_et_libguestfs_GuestFS__1tgz_1in
   (JNIEnv *env, jobject obj, jlong jg, jstring jtarball, jstring jdirectory)
 {
-  guestfs_h *g = (guestfs_h *) jg;
+  guestfs_h *g = (guestfs_h *) (long) jg;
   int r;
   const char *tarball;
   const char *directory;
@@ -2110,10 +2142,10 @@ Java_com_redhat_et_libguestfs__1tgz_1in
 }
 
 JNIEXPORT void JNICALL
-Java_com_redhat_et_libguestfs__1tgz_1out
+Java_com_redhat_et_libguestfs_GuestFS__1tgz_1out
   (JNIEnv *env, jobject obj, jlong jg, jstring jdirectory, jstring jtarball)
 {
-  guestfs_h *g = (guestfs_h *) jg;
+  guestfs_h *g = (guestfs_h *) (long) jg;
   int r;
   const char *directory;
   const char *tarball;
@@ -2129,3 +2161,375 @@ Java_com_redhat_et_libguestfs__1tgz_1out
   }
 }
 
+JNIEXPORT void JNICALL
+Java_com_redhat_et_libguestfs_GuestFS__1mount_1ro
+  (JNIEnv *env, jobject obj, jlong jg, jstring jdevice, jstring jmountpoint)
+{
+  guestfs_h *g = (guestfs_h *) (long) jg;
+  int r;
+  const char *device;
+  const char *mountpoint;
+
+  device = (*env)->GetStringUTFChars (env, jdevice, NULL);
+  mountpoint = (*env)->GetStringUTFChars (env, jmountpoint, NULL);
+  r = guestfs_mount_ro (g, device, mountpoint);
+  (*env)->ReleaseStringUTFChars (env, jdevice, device);
+  (*env)->ReleaseStringUTFChars (env, jmountpoint, mountpoint);
+  if (r == -1) {
+    throw_exception (env, guestfs_last_error (g));
+    return ;
+  }
+}
+
+JNIEXPORT void JNICALL
+Java_com_redhat_et_libguestfs_GuestFS__1mount_1options
+  (JNIEnv *env, jobject obj, jlong jg, jstring joptions, jstring jdevice, jstring jmountpoint)
+{
+  guestfs_h *g = (guestfs_h *) (long) jg;
+  int r;
+  const char *options;
+  const char *device;
+  const char *mountpoint;
+
+  options = (*env)->GetStringUTFChars (env, joptions, NULL);
+  device = (*env)->GetStringUTFChars (env, jdevice, NULL);
+  mountpoint = (*env)->GetStringUTFChars (env, jmountpoint, NULL);
+  r = guestfs_mount_options (g, options, device, mountpoint);
+  (*env)->ReleaseStringUTFChars (env, joptions, options);
+  (*env)->ReleaseStringUTFChars (env, jdevice, device);
+  (*env)->ReleaseStringUTFChars (env, jmountpoint, mountpoint);
+  if (r == -1) {
+    throw_exception (env, guestfs_last_error (g));
+    return ;
+  }
+}
+
+JNIEXPORT void JNICALL
+Java_com_redhat_et_libguestfs_GuestFS__1mount_1vfs
+  (JNIEnv *env, jobject obj, jlong jg, jstring joptions, jstring jvfstype, jstring jdevice, jstring jmountpoint)
+{
+  guestfs_h *g = (guestfs_h *) (long) jg;
+  int r;
+  const char *options;
+  const char *vfstype;
+  const char *device;
+  const char *mountpoint;
+
+  options = (*env)->GetStringUTFChars (env, joptions, NULL);
+  vfstype = (*env)->GetStringUTFChars (env, jvfstype, NULL);
+  device = (*env)->GetStringUTFChars (env, jdevice, NULL);
+  mountpoint = (*env)->GetStringUTFChars (env, jmountpoint, NULL);
+  r = guestfs_mount_vfs (g, options, vfstype, device, mountpoint);
+  (*env)->ReleaseStringUTFChars (env, joptions, options);
+  (*env)->ReleaseStringUTFChars (env, jvfstype, vfstype);
+  (*env)->ReleaseStringUTFChars (env, jdevice, device);
+  (*env)->ReleaseStringUTFChars (env, jmountpoint, mountpoint);
+  if (r == -1) {
+    throw_exception (env, guestfs_last_error (g));
+    return ;
+  }
+}
+
+JNIEXPORT jstring JNICALL
+Java_com_redhat_et_libguestfs_GuestFS__1debug
+  (JNIEnv *env, jobject obj, jlong jg, jstring jsubcmd, jobjectArray jextraargs)
+{
+  guestfs_h *g = (guestfs_h *) (long) jg;
+  jstring jr;
+  char *r;
+  const char *subcmd;
+  int extraargs_len;
+  const char **extraargs;
+  int i;
+
+  subcmd = (*env)->GetStringUTFChars (env, jsubcmd, NULL);
+  extraargs_len = (*env)->GetArrayLength (env, jextraargs);
+  extraargs = guestfs_safe_malloc (g, sizeof (char *) * (extraargs_len+1));
+  for (i = 0; i < extraargs_len; ++i) {
+    jobject o = (*env)->GetObjectArrayElement (env, jextraargs, i);
+    extraargs[i] = (*env)->GetStringUTFChars (env, o, NULL);
+  }
+  extraargs[extraargs_len] = NULL;
+  r = guestfs_debug (g, subcmd, extraargs);
+  (*env)->ReleaseStringUTFChars (env, jsubcmd, subcmd);
+  for (i = 0; i < extraargs_len; ++i) {
+    jobject o = (*env)->GetObjectArrayElement (env, jextraargs, i);
+    (*env)->ReleaseStringUTFChars (env, o, extraargs[i]);
+  }
+  free (extraargs);
+  if (r == NULL) {
+    throw_exception (env, guestfs_last_error (g));
+    return NULL;
+  }
+  jr = (*env)->NewStringUTF (env, r);
+  free (r);
+  return jr;
+}
+
+JNIEXPORT void JNICALL
+Java_com_redhat_et_libguestfs_GuestFS__1lvremove
+  (JNIEnv *env, jobject obj, jlong jg, jstring jdevice)
+{
+  guestfs_h *g = (guestfs_h *) (long) jg;
+  int r;
+  const char *device;
+
+  device = (*env)->GetStringUTFChars (env, jdevice, NULL);
+  r = guestfs_lvremove (g, device);
+  (*env)->ReleaseStringUTFChars (env, jdevice, device);
+  if (r == -1) {
+    throw_exception (env, guestfs_last_error (g));
+    return ;
+  }
+}
+
+JNIEXPORT void JNICALL
+Java_com_redhat_et_libguestfs_GuestFS__1vgremove
+  (JNIEnv *env, jobject obj, jlong jg, jstring jvgname)
+{
+  guestfs_h *g = (guestfs_h *) (long) jg;
+  int r;
+  const char *vgname;
+
+  vgname = (*env)->GetStringUTFChars (env, jvgname, NULL);
+  r = guestfs_vgremove (g, vgname);
+  (*env)->ReleaseStringUTFChars (env, jvgname, vgname);
+  if (r == -1) {
+    throw_exception (env, guestfs_last_error (g));
+    return ;
+  }
+}
+
+JNIEXPORT void JNICALL
+Java_com_redhat_et_libguestfs_GuestFS__1pvremove
+  (JNIEnv *env, jobject obj, jlong jg, jstring jdevice)
+{
+  guestfs_h *g = (guestfs_h *) (long) jg;
+  int r;
+  const char *device;
+
+  device = (*env)->GetStringUTFChars (env, jdevice, NULL);
+  r = guestfs_pvremove (g, device);
+  (*env)->ReleaseStringUTFChars (env, jdevice, device);
+  if (r == -1) {
+    throw_exception (env, guestfs_last_error (g));
+    return ;
+  }
+}
+
+JNIEXPORT void JNICALL
+Java_com_redhat_et_libguestfs_GuestFS__1set_1e2label
+  (JNIEnv *env, jobject obj, jlong jg, jstring jdevice, jstring jlabel)
+{
+  guestfs_h *g = (guestfs_h *) (long) jg;
+  int r;
+  const char *device;
+  const char *label;
+
+  device = (*env)->GetStringUTFChars (env, jdevice, NULL);
+  label = (*env)->GetStringUTFChars (env, jlabel, NULL);
+  r = guestfs_set_e2label (g, device, label);
+  (*env)->ReleaseStringUTFChars (env, jdevice, device);
+  (*env)->ReleaseStringUTFChars (env, jlabel, label);
+  if (r == -1) {
+    throw_exception (env, guestfs_last_error (g));
+    return ;
+  }
+}
+
+JNIEXPORT jstring JNICALL
+Java_com_redhat_et_libguestfs_GuestFS__1get_1e2label
+  (JNIEnv *env, jobject obj, jlong jg, jstring jdevice)
+{
+  guestfs_h *g = (guestfs_h *) (long) jg;
+  jstring jr;
+  char *r;
+  const char *device;
+
+  device = (*env)->GetStringUTFChars (env, jdevice, NULL);
+  r = guestfs_get_e2label (g, device);
+  (*env)->ReleaseStringUTFChars (env, jdevice, device);
+  if (r == NULL) {
+    throw_exception (env, guestfs_last_error (g));
+    return NULL;
+  }
+  jr = (*env)->NewStringUTF (env, r);
+  free (r);
+  return jr;
+}
+
+JNIEXPORT void JNICALL
+Java_com_redhat_et_libguestfs_GuestFS__1set_1e2uuid
+  (JNIEnv *env, jobject obj, jlong jg, jstring jdevice, jstring juuid)
+{
+  guestfs_h *g = (guestfs_h *) (long) jg;
+  int r;
+  const char *device;
+  const char *uuid;
+
+  device = (*env)->GetStringUTFChars (env, jdevice, NULL);
+  uuid = (*env)->GetStringUTFChars (env, juuid, NULL);
+  r = guestfs_set_e2uuid (g, device, uuid);
+  (*env)->ReleaseStringUTFChars (env, jdevice, device);
+  (*env)->ReleaseStringUTFChars (env, juuid, uuid);
+  if (r == -1) {
+    throw_exception (env, guestfs_last_error (g));
+    return ;
+  }
+}
+
+JNIEXPORT jstring JNICALL
+Java_com_redhat_et_libguestfs_GuestFS__1get_1e2uuid
+  (JNIEnv *env, jobject obj, jlong jg, jstring jdevice)
+{
+  guestfs_h *g = (guestfs_h *) (long) jg;
+  jstring jr;
+  char *r;
+  const char *device;
+
+  device = (*env)->GetStringUTFChars (env, jdevice, NULL);
+  r = guestfs_get_e2uuid (g, device);
+  (*env)->ReleaseStringUTFChars (env, jdevice, device);
+  if (r == NULL) {
+    throw_exception (env, guestfs_last_error (g));
+    return NULL;
+  }
+  jr = (*env)->NewStringUTF (env, r);
+  free (r);
+  return jr;
+}
+
+JNIEXPORT jint JNICALL
+Java_com_redhat_et_libguestfs_GuestFS__1fsck
+  (JNIEnv *env, jobject obj, jlong jg, jstring jfstype, jstring jdevice)
+{
+  guestfs_h *g = (guestfs_h *) (long) jg;
+  int r;
+  const char *fstype;
+  const char *device;
+
+  fstype = (*env)->GetStringUTFChars (env, jfstype, NULL);
+  device = (*env)->GetStringUTFChars (env, jdevice, NULL);
+  r = guestfs_fsck (g, fstype, device);
+  (*env)->ReleaseStringUTFChars (env, jfstype, fstype);
+  (*env)->ReleaseStringUTFChars (env, jdevice, device);
+  if (r == -1) {
+    throw_exception (env, guestfs_last_error (g));
+    return 0;
+  }
+  return (jint) r;
+}
+
+JNIEXPORT void JNICALL
+Java_com_redhat_et_libguestfs_GuestFS__1zero
+  (JNIEnv *env, jobject obj, jlong jg, jstring jdevice)
+{
+  guestfs_h *g = (guestfs_h *) (long) jg;
+  int r;
+  const char *device;
+
+  device = (*env)->GetStringUTFChars (env, jdevice, NULL);
+  r = guestfs_zero (g, device);
+  (*env)->ReleaseStringUTFChars (env, jdevice, device);
+  if (r == -1) {
+    throw_exception (env, guestfs_last_error (g));
+    return ;
+  }
+}
+
+JNIEXPORT void JNICALL
+Java_com_redhat_et_libguestfs_GuestFS__1grub_1install
+  (JNIEnv *env, jobject obj, jlong jg, jstring jroot, jstring jdevice)
+{
+  guestfs_h *g = (guestfs_h *) (long) jg;
+  int r;
+  const char *root;
+  const char *device;
+
+  root = (*env)->GetStringUTFChars (env, jroot, NULL);
+  device = (*env)->GetStringUTFChars (env, jdevice, NULL);
+  r = guestfs_grub_install (g, root, device);
+  (*env)->ReleaseStringUTFChars (env, jroot, root);
+  (*env)->ReleaseStringUTFChars (env, jdevice, device);
+  if (r == -1) {
+    throw_exception (env, guestfs_last_error (g));
+    return ;
+  }
+}
+
+JNIEXPORT void JNICALL
+Java_com_redhat_et_libguestfs_GuestFS__1cp
+  (JNIEnv *env, jobject obj, jlong jg, jstring jsrc, jstring jdest)
+{
+  guestfs_h *g = (guestfs_h *) (long) jg;
+  int r;
+  const char *src;
+  const char *dest;
+
+  src = (*env)->GetStringUTFChars (env, jsrc, NULL);
+  dest = (*env)->GetStringUTFChars (env, jdest, NULL);
+  r = guestfs_cp (g, src, dest);
+  (*env)->ReleaseStringUTFChars (env, jsrc, src);
+  (*env)->ReleaseStringUTFChars (env, jdest, dest);
+  if (r == -1) {
+    throw_exception (env, guestfs_last_error (g));
+    return ;
+  }
+}
+
+JNIEXPORT void JNICALL
+Java_com_redhat_et_libguestfs_GuestFS__1cp_1a
+  (JNIEnv *env, jobject obj, jlong jg, jstring jsrc, jstring jdest)
+{
+  guestfs_h *g = (guestfs_h *) (long) jg;
+  int r;
+  const char *src;
+  const char *dest;
+
+  src = (*env)->GetStringUTFChars (env, jsrc, NULL);
+  dest = (*env)->GetStringUTFChars (env, jdest, NULL);
+  r = guestfs_cp_a (g, src, dest);
+  (*env)->ReleaseStringUTFChars (env, jsrc, src);
+  (*env)->ReleaseStringUTFChars (env, jdest, dest);
+  if (r == -1) {
+    throw_exception (env, guestfs_last_error (g));
+    return ;
+  }
+}
+
+JNIEXPORT void JNICALL
+Java_com_redhat_et_libguestfs_GuestFS__1mv
+  (JNIEnv *env, jobject obj, jlong jg, jstring jsrc, jstring jdest)
+{
+  guestfs_h *g = (guestfs_h *) (long) jg;
+  int r;
+  const char *src;
+  const char *dest;
+
+  src = (*env)->GetStringUTFChars (env, jsrc, NULL);
+  dest = (*env)->GetStringUTFChars (env, jdest, NULL);
+  r = guestfs_mv (g, src, dest);
+  (*env)->ReleaseStringUTFChars (env, jsrc, src);
+  (*env)->ReleaseStringUTFChars (env, jdest, dest);
+  if (r == -1) {
+    throw_exception (env, guestfs_last_error (g));
+    return ;
+  }
+}
+
+JNIEXPORT void JNICALL
+Java_com_redhat_et_libguestfs_GuestFS__1drop_1caches
+  (JNIEnv *env, jobject obj, jlong jg, jint jwhattodrop)
+{
+  guestfs_h *g = (guestfs_h *) (long) jg;
+  int r;
+  int whattodrop;
+
+  whattodrop = jwhattodrop;
+  r = guestfs_drop_caches (g, whattodrop);
+  if (r == -1) {
+    throw_exception (env, guestfs_last_error (g));
+    return ;
+  }
+}
+