Generated code to support previous 2 commits.

[libguestfs.git] / tests.c

diff --git a/tests.c b/tests.c
index 378f3af..3123513 100644 (file)
--- a/tests.c
+++ b/tests.c
@@ -31,6 +31,11 @@
 static guestfs_h *g;
 static int suppress_error = 0;
 
+/* This will be 's' or 'h' depending on whether the guest kernel
+ * names IDE devices /dev/sd* or /dev/hd*.
+ */
+static char devchar = 's';
+
 static void print_error (guestfs_h *g, void *data, const char *msg)
 {
   if (!suppress_error)
@@ -45,75 +50,2130 @@ static void print_strings (char * const * const argv)
     printf ("\t%s\n", argv[argc]);
 }
 
-/*
-static void print_table (char * const * const argv)
+/*
+static void print_table (char * const * const argv)
+{
+  int i;
+
+  for (i = 0; argv[i] != NULL; i += 2)
+    printf ("%s: %s\n", argv[i], argv[i+1]);
+}
+*/
+
+static void no_test_warnings (void)
+{
+  fprintf (stderr, "warning: \"guestfs_launch\" has no tests\n");
+  fprintf (stderr, "warning: \"guestfs_wait_ready\" has no tests\n");
+  fprintf (stderr, "warning: \"guestfs_kill_subprocess\" has no tests\n");
+  fprintf (stderr, "warning: \"guestfs_add_drive\" has no tests\n");
+  fprintf (stderr, "warning: \"guestfs_add_cdrom\" has no tests\n");
+  fprintf (stderr, "warning: \"guestfs_config\" has no tests\n");
+  fprintf (stderr, "warning: \"guestfs_set_qemu\" has no tests\n");
+  fprintf (stderr, "warning: \"guestfs_get_qemu\" has no tests\n");
+  fprintf (stderr, "warning: \"guestfs_set_path\" has no tests\n");
+  fprintf (stderr, "warning: \"guestfs_get_path\" has no tests\n");
+  fprintf (stderr, "warning: \"guestfs_set_autosync\" has no tests\n");
+  fprintf (stderr, "warning: \"guestfs_get_autosync\" has no tests\n");
+  fprintf (stderr, "warning: \"guestfs_set_verbose\" has no tests\n");
+  fprintf (stderr, "warning: \"guestfs_get_verbose\" has no tests\n");
+  fprintf (stderr, "warning: \"guestfs_is_ready\" has no tests\n");
+  fprintf (stderr, "warning: \"guestfs_is_config\" has no tests\n");
+  fprintf (stderr, "warning: \"guestfs_is_launching\" has no tests\n");
+  fprintf (stderr, "warning: \"guestfs_is_busy\" has no tests\n");
+  fprintf (stderr, "warning: \"guestfs_get_state\" has no tests\n");
+  fprintf (stderr, "warning: \"guestfs_set_busy\" has no tests\n");
+  fprintf (stderr, "warning: \"guestfs_set_ready\" has no tests\n");
+  fprintf (stderr, "warning: \"guestfs_ll\" has no tests\n");
+  fprintf (stderr, "warning: \"guestfs_pvs_full\" has no tests\n");
+  fprintf (stderr, "warning: \"guestfs_vgs_full\" has no tests\n");
+  fprintf (stderr, "warning: \"guestfs_lvs_full\" has no tests\n");
+  fprintf (stderr, "warning: \"guestfs_aug_init\" has no tests\n");
+  fprintf (stderr, "warning: \"guestfs_aug_close\" has no tests\n");
+  fprintf (stderr, "warning: \"guestfs_aug_defvar\" has no tests\n");
+  fprintf (stderr, "warning: \"guestfs_aug_defnode\" has no tests\n");
+  fprintf (stderr, "warning: \"guestfs_aug_get\" has no tests\n");
+  fprintf (stderr, "warning: \"guestfs_aug_set\" has no tests\n");
+  fprintf (stderr, "warning: \"guestfs_aug_insert\" has no tests\n");
+  fprintf (stderr, "warning: \"guestfs_aug_rm\" has no tests\n");
+  fprintf (stderr, "warning: \"guestfs_aug_mv\" has no tests\n");
+  fprintf (stderr, "warning: \"guestfs_aug_match\" has no tests\n");
+  fprintf (stderr, "warning: \"guestfs_aug_save\" has no tests\n");
+  fprintf (stderr, "warning: \"guestfs_aug_load\" has no tests\n");
+  fprintf (stderr, "warning: \"guestfs_aug_ls\" has no tests\n");
+  fprintf (stderr, "warning: \"guestfs_chmod\" has no tests\n");
+  fprintf (stderr, "warning: \"guestfs_chown\" has no tests\n");
+  fprintf (stderr, "warning: \"guestfs_sfdisk\" has no tests\n");
+  fprintf (stderr, "warning: \"guestfs_lvm_remove_all\" has no tests\n");
+  fprintf (stderr, "warning: \"guestfs_command\" has no tests\n");
+  fprintf (stderr, "warning: \"guestfs_command_lines\" has no tests\n");
+  fprintf (stderr, "warning: \"guestfs_tune2fs_l\" has no tests\n");
+  fprintf (stderr, "warning: \"guestfs_blockdev_setbsz\" has no tests\n");
+  fprintf (stderr, "warning: \"guestfs_tar_out\" has no tests\n");
+  fprintf (stderr, "warning: \"guestfs_tgz_out\" has no tests\n");
+  fprintf (stderr, "warning: \"guestfs_mount_options\" has no tests\n");
+  fprintf (stderr, "warning: \"guestfs_mount_vfs\" has no tests\n");
+  fprintf (stderr, "warning: \"guestfs_debug\" has no tests\n");
+  fprintf (stderr, "warning: \"guestfs_get_e2label\" has no tests\n");
+  fprintf (stderr, "warning: \"guestfs_get_e2uuid\" has no tests\n");
+}
+
+static int test_hexdump_0 (void)
+{
+  /* InitBasicFS for hexdump (0): create ext2 on /dev/sda1 */
+  {
+    char device[] = "/dev/sda";
+    device[5] = devchar;
+    int r;
+    suppress_error = 0;
+    r = guestfs_blockdev_setrw (g, device);
+    if (r == -1)
+      return -1;
+  }
+  {
+    int r;
+    suppress_error = 0;
+    r = guestfs_umount_all (g);
+    if (r == -1)
+      return -1;
+  }
+  {
+    int r;
+    suppress_error = 0;
+    r = guestfs_lvm_remove_all (g);
+    if (r == -1)
+      return -1;
+  }
+  {
+    char device[] = "/dev/sda";
+    device[5] = devchar;
+    char lines_0[] = ",";
+    char *lines[] = {
+      lines_0,
+      NULL
+    };
+    int r;
+    suppress_error = 0;
+    r = guestfs_sfdisk (g, device, 0, 0, 0, lines);
+    if (r == -1)
+      return -1;
+  }
+  {
+    char fstype[] = "ext2";
+    char device[] = "/dev/sda1";
+    device[5] = devchar;
+    int r;
+    suppress_error = 0;
+    r = guestfs_mkfs (g, fstype, device);
+    if (r == -1)
+      return -1;
+  }
+  {
+    char device[] = "/dev/sda1";
+    device[5] = devchar;
+    char mountpoint[] = "/";
+    int r;
+    suppress_error = 0;
+    r = guestfs_mount (g, device, mountpoint);
+    if (r == -1)
+      return -1;
+  }
+  /* TestOutput for hexdump (0) */
+  char expected[] = "00000000  68 65 6c 6c 6f 0a 77 6f  72 6c 64 0a              |hello.world.|\n0000000c\n";
+  {
+    char path[] = "/new";
+    char content[] = "hello\nworld\n";
+    int r;
+    suppress_error = 0;
+    r = guestfs_write_file (g, path, content, 12);
+    if (r == -1)
+      return -1;
+  }
+  {
+    char path[] = "/new";
+    char *r;
+    suppress_error = 0;
+    r = guestfs_hexdump (g, path);
+    if (r == NULL)
+      return -1;
+    if (strcmp (r, expected) != 0) {
+      fprintf (stderr, "test_hexdump_0: expected \"%s\" but got \"%s\"\n", expected, r);
+      return -1;
+    }
+    free (r);
+  }
+  return 0;
+}
+
+static int test_strings_e_0 (void)
+{
+  /* InitBasicFS for strings_e (0): create ext2 on /dev/sda1 */
+  {
+    char device[] = "/dev/sda";
+    device[5] = devchar;
+    int r;
+    suppress_error = 0;
+    r = guestfs_blockdev_setrw (g, device);
+    if (r == -1)
+      return -1;
+  }
+  {
+    int r;
+    suppress_error = 0;
+    r = guestfs_umount_all (g);
+    if (r == -1)
+      return -1;
+  }
+  {
+    int r;
+    suppress_error = 0;
+    r = guestfs_lvm_remove_all (g);
+    if (r == -1)
+      return -1;
+  }
+  {
+    char device[] = "/dev/sda";
+    device[5] = devchar;
+    char lines_0[] = ",";
+    char *lines[] = {
+      lines_0,
+      NULL
+    };
+    int r;
+    suppress_error = 0;
+    r = guestfs_sfdisk (g, device, 0, 0, 0, lines);
+    if (r == -1)
+      return -1;
+  }
+  {
+    char fstype[] = "ext2";
+    char device[] = "/dev/sda1";
+    device[5] = devchar;
+    int r;
+    suppress_error = 0;
+    r = guestfs_mkfs (g, fstype, device);
+    if (r == -1)
+      return -1;
+  }
+  {
+    char device[] = "/dev/sda1";
+    device[5] = devchar;
+    char mountpoint[] = "/";
+    int r;
+    suppress_error = 0;
+    r = guestfs_mount (g, device, mountpoint);
+    if (r == -1)
+      return -1;
+  }
+  /* TestOutputList for strings_e (0) */
+  {
+    char path[] = "/new";
+    char content[] = "hello\nworld\n";
+    int r;
+    suppress_error = 0;
+    r = guestfs_write_file (g, path, content, 0);
+    if (r == -1)
+      return -1;
+  }
+  {
+    char encoding[] = "b";
+    char path[] = "/new";
+    char **r;
+    int i;
+    suppress_error = 0;
+    r = guestfs_strings_e (g, encoding, path);
+    if (r == NULL)
+      return -1;
+    if (r[0] != NULL) {
+      fprintf (stderr, "test_strings_e_0: extra elements returned from command\n");
+      print_strings (r);
+      return -1;
+    }
+    for (i = 0; r[i] != NULL; ++i)
+      free (r[i]);
+    free (r);
+  }
+  return 0;
+}
+
+static int test_strings_0 (void)
+{
+  /* InitBasicFS for strings (0): create ext2 on /dev/sda1 */
+  {
+    char device[] = "/dev/sda";
+    device[5] = devchar;
+    int r;
+    suppress_error = 0;
+    r = guestfs_blockdev_setrw (g, device);
+    if (r == -1)
+      return -1;
+  }
+  {
+    int r;
+    suppress_error = 0;
+    r = guestfs_umount_all (g);
+    if (r == -1)
+      return -1;
+  }
+  {
+    int r;
+    suppress_error = 0;
+    r = guestfs_lvm_remove_all (g);
+    if (r == -1)
+      return -1;
+  }
+  {
+    char device[] = "/dev/sda";
+    device[5] = devchar;
+    char lines_0[] = ",";
+    char *lines[] = {
+      lines_0,
+      NULL
+    };
+    int r;
+    suppress_error = 0;
+    r = guestfs_sfdisk (g, device, 0, 0, 0, lines);
+    if (r == -1)
+      return -1;
+  }
+  {
+    char fstype[] = "ext2";
+    char device[] = "/dev/sda1";
+    device[5] = devchar;
+    int r;
+    suppress_error = 0;
+    r = guestfs_mkfs (g, fstype, device);
+    if (r == -1)
+      return -1;
+  }
+  {
+    char device[] = "/dev/sda1";
+    device[5] = devchar;
+    char mountpoint[] = "/";
+    int r;
+    suppress_error = 0;
+    r = guestfs_mount (g, device, mountpoint);
+    if (r == -1)
+      return -1;
+  }
+  /* TestOutputList for strings (0) */
+  {
+    char path[] = "/new";
+    char content[] = "hello\nworld\n";
+    int r;
+    suppress_error = 0;
+    r = guestfs_write_file (g, path, content, 0);
+    if (r == -1)
+      return -1;
+  }
+  {
+    char path[] = "/new";
+    char **r;
+    int i;
+    suppress_error = 0;
+    r = guestfs_strings (g, path);
+    if (r == NULL)
+      return -1;
+    if (!r[0]) {
+      fprintf (stderr, "test_strings_0: short list returned from command\n");
+      print_strings (r);
+      return -1;
+    }
+    {
+      char expected[] = "hello";
+      if (strcmp (r[0], expected) != 0) {
+        fprintf (stderr, "test_strings_0: expected \"%s\" but got \"%s\"\n", expected, r[0]);
+        return -1;
+      }
+    }
+    if (!r[1]) {
+      fprintf (stderr, "test_strings_0: short list returned from command\n");
+      print_strings (r);
+      return -1;
+    }
+    {
+      char expected[] = "world";
+      if (strcmp (r[1], expected) != 0) {
+        fprintf (stderr, "test_strings_0: expected \"%s\" but got \"%s\"\n", expected, r[1]);
+        return -1;
+      }
+    }
+    if (r[2] != NULL) {
+      fprintf (stderr, "test_strings_0: extra elements returned from command\n");
+      print_strings (r);
+      return -1;
+    }
+    for (i = 0; r[i] != NULL; ++i)
+      free (r[i]);
+    free (r);
+  }
+  return 0;
+}
+
+static int test_equal_0 (void)
+{
+  /* InitBasicFS for equal (0): create ext2 on /dev/sda1 */
+  {
+    char device[] = "/dev/sda";
+    device[5] = devchar;
+    int r;
+    suppress_error = 0;
+    r = guestfs_blockdev_setrw (g, device);
+    if (r == -1)
+      return -1;
+  }
+  {
+    int r;
+    suppress_error = 0;
+    r = guestfs_umount_all (g);
+    if (r == -1)
+      return -1;
+  }
+  {
+    int r;
+    suppress_error = 0;
+    r = guestfs_lvm_remove_all (g);
+    if (r == -1)
+      return -1;
+  }
+  {
+    char device[] = "/dev/sda";
+    device[5] = devchar;
+    char lines_0[] = ",";
+    char *lines[] = {
+      lines_0,
+      NULL
+    };
+    int r;
+    suppress_error = 0;
+    r = guestfs_sfdisk (g, device, 0, 0, 0, lines);
+    if (r == -1)
+      return -1;
+  }
+  {
+    char fstype[] = "ext2";
+    char device[] = "/dev/sda1";
+    device[5] = devchar;
+    int r;
+    suppress_error = 0;
+    r = guestfs_mkfs (g, fstype, device);
+    if (r == -1)
+      return -1;
+  }
+  {
+    char device[] = "/dev/sda1";
+    device[5] = devchar;
+    char mountpoint[] = "/";
+    int r;
+    suppress_error = 0;
+    r = guestfs_mount (g, device, mountpoint);
+    if (r == -1)
+      return -1;
+  }
+  /* TestOutputTrue for equal (0) */
+  {
+    char path[] = "/file1";
+    char content[] = "contents of a file";
+    int r;
+    suppress_error = 0;
+    r = guestfs_write_file (g, path, content, 0);
+    if (r == -1)
+      return -1;
+  }
+  {
+    char src[] = "/file1";
+    char dest[] = "/file2";
+    int r;
+    suppress_error = 0;
+    r = guestfs_cp (g, src, dest);
+    if (r == -1)
+      return -1;
+  }
+  {
+    char file1[] = "/file1";
+    char file2[] = "/file2";
+    int r;
+    suppress_error = 0;
+    r = guestfs_equal (g, file1, file2);
+    if (r == -1)
+      return -1;
+    if (!r) {
+      fprintf (stderr, "test_equal_0: expected true, got false\n");
+      return -1;
+    }
+  }
+  return 0;
+}
+
+static int test_equal_1 (void)
+{
+  /* InitBasicFS for equal (1): create ext2 on /dev/sda1 */
+  {
+    char device[] = "/dev/sda";
+    device[5] = devchar;
+    int r;
+    suppress_error = 0;
+    r = guestfs_blockdev_setrw (g, device);
+    if (r == -1)
+      return -1;
+  }
+  {
+    int r;
+    suppress_error = 0;
+    r = guestfs_umount_all (g);
+    if (r == -1)
+      return -1;
+  }
+  {
+    int r;
+    suppress_error = 0;
+    r = guestfs_lvm_remove_all (g);
+    if (r == -1)
+      return -1;
+  }
+  {
+    char device[] = "/dev/sda";
+    device[5] = devchar;
+    char lines_0[] = ",";
+    char *lines[] = {
+      lines_0,
+      NULL
+    };
+    int r;
+    suppress_error = 0;
+    r = guestfs_sfdisk (g, device, 0, 0, 0, lines);
+    if (r == -1)
+      return -1;
+  }
+  {
+    char fstype[] = "ext2";
+    char device[] = "/dev/sda1";
+    device[5] = devchar;
+    int r;
+    suppress_error = 0;
+    r = guestfs_mkfs (g, fstype, device);
+    if (r == -1)
+      return -1;
+  }
+  {
+    char device[] = "/dev/sda1";
+    device[5] = devchar;
+    char mountpoint[] = "/";
+    int r;
+    suppress_error = 0;
+    r = guestfs_mount (g, device, mountpoint);
+    if (r == -1)
+      return -1;
+  }
+  /* TestOutputFalse for equal (1) */
+  {
+    char path[] = "/file1";
+    char content[] = "contents of a file";
+    int r;
+    suppress_error = 0;
+    r = guestfs_write_file (g, path, content, 0);
+    if (r == -1)
+      return -1;
+  }
+  {
+    char path[] = "/file2";
+    char content[] = "contents of another file";
+    int r;
+    suppress_error = 0;
+    r = guestfs_write_file (g, path, content, 0);
+    if (r == -1)
+      return -1;
+  }
+  {
+    char file1[] = "/file1";
+    char file2[] = "/file2";
+    int r;
+    suppress_error = 0;
+    r = guestfs_equal (g, file1, file2);
+    if (r == -1)
+      return -1;
+    if (r) {
+      fprintf (stderr, "test_equal_1: expected false, got true\n");
+      return -1;
+    }
+  }
+  return 0;
+}
+
+static int test_equal_2 (void)
+{
+  /* InitBasicFS for equal (2): create ext2 on /dev/sda1 */
+  {
+    char device[] = "/dev/sda";
+    device[5] = devchar;
+    int r;
+    suppress_error = 0;
+    r = guestfs_blockdev_setrw (g, device);
+    if (r == -1)
+      return -1;
+  }
+  {
+    int r;
+    suppress_error = 0;
+    r = guestfs_umount_all (g);
+    if (r == -1)
+      return -1;
+  }
+  {
+    int r;
+    suppress_error = 0;
+    r = guestfs_lvm_remove_all (g);
+    if (r == -1)
+      return -1;
+  }
+  {
+    char device[] = "/dev/sda";
+    device[5] = devchar;
+    char lines_0[] = ",";
+    char *lines[] = {
+      lines_0,
+      NULL
+    };
+    int r;
+    suppress_error = 0;
+    r = guestfs_sfdisk (g, device, 0, 0, 0, lines);
+    if (r == -1)
+      return -1;
+  }
+  {
+    char fstype[] = "ext2";
+    char device[] = "/dev/sda1";
+    device[5] = devchar;
+    int r;
+    suppress_error = 0;
+    r = guestfs_mkfs (g, fstype, device);
+    if (r == -1)
+      return -1;
+  }
+  {
+    char device[] = "/dev/sda1";
+    device[5] = devchar;
+    char mountpoint[] = "/";
+    int r;
+    suppress_error = 0;
+    r = guestfs_mount (g, device, mountpoint);
+    if (r == -1)
+      return -1;
+  }
+  /* TestLastFail for equal (2) */
+  {
+    char file1[] = "/file1";
+    char file2[] = "/file2";
+    int r;
+    suppress_error = 1;
+    r = guestfs_equal (g, file1, file2);
+    if (r != -1)
+      return -1;
+  }
+  return 0;
+}
+
+static int test_ping_daemon_0 (void)
+{
+  /* InitEmpty for ping_daemon (0) */
+  {
+    char device[] = "/dev/sda";
+    device[5] = devchar;
+    int r;
+    suppress_error = 0;
+    r = guestfs_blockdev_setrw (g, device);
+    if (r == -1)
+      return -1;
+  }
+  {
+    int r;
+    suppress_error = 0;
+    r = guestfs_umount_all (g);
+    if (r == -1)
+      return -1;
+  }
+  {
+    int r;
+    suppress_error = 0;
+    r = guestfs_lvm_remove_all (g);
+    if (r == -1)
+      return -1;
+  }
+  /* TestRun for ping_daemon (0) */
+  {
+    int r;
+    suppress_error = 0;
+    r = guestfs_ping_daemon (g);
+    if (r == -1)
+      return -1;
+  }
+  return 0;
+}
+
+static int test_dmesg_0 (void)
+{
+  /* InitEmpty for dmesg (0) */
+  {
+    char device[] = "/dev/sda";
+    device[5] = devchar;
+    int r;
+    suppress_error = 0;
+    r = guestfs_blockdev_setrw (g, device);
+    if (r == -1)
+      return -1;
+  }
+  {
+    int r;
+    suppress_error = 0;
+    r = guestfs_umount_all (g);
+    if (r == -1)
+      return -1;
+  }
+  {
+    int r;
+    suppress_error = 0;
+    r = guestfs_lvm_remove_all (g);
+    if (r == -1)
+      return -1;
+  }
+  /* TestRun for dmesg (0) */
+  {
+    char *r;
+    suppress_error = 0;
+    r = guestfs_dmesg (g);
+    if (r == NULL)
+      return -1;
+    free (r);
+  }
+  return 0;
+}
+
+static int test_drop_caches_0 (void)
+{
+  /* InitEmpty for drop_caches (0) */
+  {
+    char device[] = "/dev/sda";
+    device[5] = devchar;
+    int r;
+    suppress_error = 0;
+    r = guestfs_blockdev_setrw (g, device);
+    if (r == -1)
+      return -1;
+  }
+  {
+    int r;
+    suppress_error = 0;
+    r = guestfs_umount_all (g);
+    if (r == -1)
+      return -1;
+  }
+  {
+    int r;
+    suppress_error = 0;
+    r = guestfs_lvm_remove_all (g);
+    if (r == -1)
+      return -1;
+  }
+  /* TestRun for drop_caches (0) */
+  {
+    int r;
+    suppress_error = 0;
+    r = guestfs_drop_caches (g, 3);
+    if (r == -1)
+      return -1;
+  }
+  return 0;
+}
+
+static int test_mv_0 (void)
+{
+  /* InitBasicFS for mv (0): create ext2 on /dev/sda1 */
+  {
+    char device[] = "/dev/sda";
+    device[5] = devchar;
+    int r;
+    suppress_error = 0;
+    r = guestfs_blockdev_setrw (g, device);
+    if (r == -1)
+      return -1;
+  }
+  {
+    int r;
+    suppress_error = 0;
+    r = guestfs_umount_all (g);
+    if (r == -1)
+      return -1;
+  }
+  {
+    int r;
+    suppress_error = 0;
+    r = guestfs_lvm_remove_all (g);
+    if (r == -1)
+      return -1;
+  }
+  {
+    char device[] = "/dev/sda";
+    device[5] = devchar;
+    char lines_0[] = ",";
+    char *lines[] = {
+      lines_0,
+      NULL
+    };
+    int r;
+    suppress_error = 0;
+    r = guestfs_sfdisk (g, device, 0, 0, 0, lines);
+    if (r == -1)
+      return -1;
+  }
+  {
+    char fstype[] = "ext2";
+    char device[] = "/dev/sda1";
+    device[5] = devchar;
+    int r;
+    suppress_error = 0;
+    r = guestfs_mkfs (g, fstype, device);
+    if (r == -1)
+      return -1;
+  }
+  {
+    char device[] = "/dev/sda1";
+    device[5] = devchar;
+    char mountpoint[] = "/";
+    int r;
+    suppress_error = 0;
+    r = guestfs_mount (g, device, mountpoint);
+    if (r == -1)
+      return -1;
+  }
+  /* TestOutput for mv (0) */
+  char expected[] = "file content";
+  {
+    char path[] = "/old";
+    char content[] = "file content";
+    int r;
+    suppress_error = 0;
+    r = guestfs_write_file (g, path, content, 0);
+    if (r == -1)
+      return -1;
+  }
+  {
+    char src[] = "/old";
+    char dest[] = "/new";
+    int r;
+    suppress_error = 0;
+    r = guestfs_mv (g, src, dest);
+    if (r == -1)
+      return -1;
+  }
+  {
+    char path[] = "/new";
+    char *r;
+    suppress_error = 0;
+    r = guestfs_cat (g, path);
+    if (r == NULL)
+      return -1;
+    if (strcmp (r, expected) != 0) {
+      fprintf (stderr, "test_mv_0: expected \"%s\" but got \"%s\"\n", expected, r);
+      return -1;
+    }
+    free (r);
+  }
+  return 0;
+}
+
+static int test_mv_1 (void)
+{
+  /* InitBasicFS for mv (1): create ext2 on /dev/sda1 */
+  {
+    char device[] = "/dev/sda";
+    device[5] = devchar;
+    int r;
+    suppress_error = 0;
+    r = guestfs_blockdev_setrw (g, device);
+    if (r == -1)
+      return -1;
+  }
+  {
+    int r;
+    suppress_error = 0;
+    r = guestfs_umount_all (g);
+    if (r == -1)
+      return -1;
+  }
+  {
+    int r;
+    suppress_error = 0;
+    r = guestfs_lvm_remove_all (g);
+    if (r == -1)
+      return -1;
+  }
+  {
+    char device[] = "/dev/sda";
+    device[5] = devchar;
+    char lines_0[] = ",";
+    char *lines[] = {
+      lines_0,
+      NULL
+    };
+    int r;
+    suppress_error = 0;
+    r = guestfs_sfdisk (g, device, 0, 0, 0, lines);
+    if (r == -1)
+      return -1;
+  }
+  {
+    char fstype[] = "ext2";
+    char device[] = "/dev/sda1";
+    device[5] = devchar;
+    int r;
+    suppress_error = 0;
+    r = guestfs_mkfs (g, fstype, device);
+    if (r == -1)
+      return -1;
+  }
+  {
+    char device[] = "/dev/sda1";
+    device[5] = devchar;
+    char mountpoint[] = "/";
+    int r;
+    suppress_error = 0;
+    r = guestfs_mount (g, device, mountpoint);
+    if (r == -1)
+      return -1;
+  }
+  /* TestOutputFalse for mv (1) */
+  {
+    char path[] = "/old";
+    char content[] = "file content";
+    int r;
+    suppress_error = 0;
+    r = guestfs_write_file (g, path, content, 0);
+    if (r == -1)
+      return -1;
+  }
+  {
+    char src[] = "/old";
+    char dest[] = "/new";
+    int r;
+    suppress_error = 0;
+    r = guestfs_mv (g, src, dest);
+    if (r == -1)
+      return -1;
+  }
+  {
+    char path[] = "/old";
+    int r;
+    suppress_error = 0;
+    r = guestfs_is_file (g, path);
+    if (r == -1)
+      return -1;
+    if (r) {
+      fprintf (stderr, "test_mv_1: expected false, got true\n");
+      return -1;
+    }
+  }
+  return 0;
+}
+
+static int test_cp_a_0 (void)
+{
+  /* InitBasicFS for cp_a (0): create ext2 on /dev/sda1 */
+  {
+    char device[] = "/dev/sda";
+    device[5] = devchar;
+    int r;
+    suppress_error = 0;
+    r = guestfs_blockdev_setrw (g, device);
+    if (r == -1)
+      return -1;
+  }
+  {
+    int r;
+    suppress_error = 0;
+    r = guestfs_umount_all (g);
+    if (r == -1)
+      return -1;
+  }
+  {
+    int r;
+    suppress_error = 0;
+    r = guestfs_lvm_remove_all (g);
+    if (r == -1)
+      return -1;
+  }
+  {
+    char device[] = "/dev/sda";
+    device[5] = devchar;
+    char lines_0[] = ",";
+    char *lines[] = {
+      lines_0,
+      NULL
+    };
+    int r;
+    suppress_error = 0;
+    r = guestfs_sfdisk (g, device, 0, 0, 0, lines);
+    if (r == -1)
+      return -1;
+  }
+  {
+    char fstype[] = "ext2";
+    char device[] = "/dev/sda1";
+    device[5] = devchar;
+    int r;
+    suppress_error = 0;
+    r = guestfs_mkfs (g, fstype, device);
+    if (r == -1)
+      return -1;
+  }
+  {
+    char device[] = "/dev/sda1";
+    device[5] = devchar;
+    char mountpoint[] = "/";
+    int r;
+    suppress_error = 0;
+    r = guestfs_mount (g, device, mountpoint);
+    if (r == -1)
+      return -1;
+  }
+  /* TestOutput for cp_a (0) */
+  char expected[] = "file content";
+  {
+    char path[] = "/olddir";
+    int r;
+    suppress_error = 0;
+    r = guestfs_mkdir (g, path);
+    if (r == -1)
+      return -1;
+  }
+  {
+    char path[] = "/newdir";
+    int r;
+    suppress_error = 0;
+    r = guestfs_mkdir (g, path);
+    if (r == -1)
+      return -1;
+  }
+  {
+    char path[] = "/olddir/file";
+    char content[] = "file content";
+    int r;
+    suppress_error = 0;
+    r = guestfs_write_file (g, path, content, 0);
+    if (r == -1)
+      return -1;
+  }
+  {
+    char src[] = "/olddir";
+    char dest[] = "/newdir";
+    int r;
+    suppress_error = 0;
+    r = guestfs_cp_a (g, src, dest);
+    if (r == -1)
+      return -1;
+  }
+  {
+    char path[] = "/newdir/olddir/file";
+    char *r;
+    suppress_error = 0;
+    r = guestfs_cat (g, path);
+    if (r == NULL)
+      return -1;
+    if (strcmp (r, expected) != 0) {
+      fprintf (stderr, "test_cp_a_0: expected \"%s\" but got \"%s\"\n", expected, r);
+      return -1;
+    }
+    free (r);
+  }
+  return 0;
+}
+
+static int test_cp_0 (void)
+{
+  /* InitBasicFS for cp (0): create ext2 on /dev/sda1 */
+  {
+    char device[] = "/dev/sda";
+    device[5] = devchar;
+    int r;
+    suppress_error = 0;
+    r = guestfs_blockdev_setrw (g, device);
+    if (r == -1)
+      return -1;
+  }
+  {
+    int r;
+    suppress_error = 0;
+    r = guestfs_umount_all (g);
+    if (r == -1)
+      return -1;
+  }
+  {
+    int r;
+    suppress_error = 0;
+    r = guestfs_lvm_remove_all (g);
+    if (r == -1)
+      return -1;
+  }
+  {
+    char device[] = "/dev/sda";
+    device[5] = devchar;
+    char lines_0[] = ",";
+    char *lines[] = {
+      lines_0,
+      NULL
+    };
+    int r;
+    suppress_error = 0;
+    r = guestfs_sfdisk (g, device, 0, 0, 0, lines);
+    if (r == -1)
+      return -1;
+  }
+  {
+    char fstype[] = "ext2";
+    char device[] = "/dev/sda1";
+    device[5] = devchar;
+    int r;
+    suppress_error = 0;
+    r = guestfs_mkfs (g, fstype, device);
+    if (r == -1)
+      return -1;
+  }
+  {
+    char device[] = "/dev/sda1";
+    device[5] = devchar;
+    char mountpoint[] = "/";
+    int r;
+    suppress_error = 0;
+    r = guestfs_mount (g, device, mountpoint);
+    if (r == -1)
+      return -1;
+  }
+  /* TestOutput for cp (0) */
+  char expected[] = "file content";
+  {
+    char path[] = "/old";
+    char content[] = "file content";
+    int r;
+    suppress_error = 0;
+    r = guestfs_write_file (g, path, content, 0);
+    if (r == -1)
+      return -1;
+  }
+  {
+    char src[] = "/old";
+    char dest[] = "/new";
+    int r;
+    suppress_error = 0;
+    r = guestfs_cp (g, src, dest);
+    if (r == -1)
+      return -1;
+  }
+  {
+    char path[] = "/new";
+    char *r;
+    suppress_error = 0;
+    r = guestfs_cat (g, path);
+    if (r == NULL)
+      return -1;
+    if (strcmp (r, expected) != 0) {
+      fprintf (stderr, "test_cp_0: expected \"%s\" but got \"%s\"\n", expected, r);
+      return -1;
+    }
+    free (r);
+  }
+  return 0;
+}
+
+static int test_cp_1 (void)
+{
+  /* InitBasicFS for cp (1): create ext2 on /dev/sda1 */
+  {
+    char device[] = "/dev/sda";
+    device[5] = devchar;
+    int r;
+    suppress_error = 0;
+    r = guestfs_blockdev_setrw (g, device);
+    if (r == -1)
+      return -1;
+  }
+  {
+    int r;
+    suppress_error = 0;
+    r = guestfs_umount_all (g);
+    if (r == -1)
+      return -1;
+  }
+  {
+    int r;
+    suppress_error = 0;
+    r = guestfs_lvm_remove_all (g);
+    if (r == -1)
+      return -1;
+  }
+  {
+    char device[] = "/dev/sda";
+    device[5] = devchar;
+    char lines_0[] = ",";
+    char *lines[] = {
+      lines_0,
+      NULL
+    };
+    int r;
+    suppress_error = 0;
+    r = guestfs_sfdisk (g, device, 0, 0, 0, lines);
+    if (r == -1)
+      return -1;
+  }
+  {
+    char fstype[] = "ext2";
+    char device[] = "/dev/sda1";
+    device[5] = devchar;
+    int r;
+    suppress_error = 0;
+    r = guestfs_mkfs (g, fstype, device);
+    if (r == -1)
+      return -1;
+  }
+  {
+    char device[] = "/dev/sda1";
+    device[5] = devchar;
+    char mountpoint[] = "/";
+    int r;
+    suppress_error = 0;
+    r = guestfs_mount (g, device, mountpoint);
+    if (r == -1)
+      return -1;
+  }
+  /* TestOutputTrue for cp (1) */
+  {
+    char path[] = "/old";
+    char content[] = "file content";
+    int r;
+    suppress_error = 0;
+    r = guestfs_write_file (g, path, content, 0);
+    if (r == -1)
+      return -1;
+  }
+  {
+    char src[] = "/old";
+    char dest[] = "/new";
+    int r;
+    suppress_error = 0;
+    r = guestfs_cp (g, src, dest);
+    if (r == -1)
+      return -1;
+  }
+  {
+    char path[] = "/old";
+    int r;
+    suppress_error = 0;
+    r = guestfs_is_file (g, path);
+    if (r == -1)
+      return -1;
+    if (!r) {
+      fprintf (stderr, "test_cp_1: expected true, got false\n");
+      return -1;
+    }
+  }
+  return 0;
+}
+
+static int test_cp_2 (void)
+{
+  /* InitBasicFS for cp (2): create ext2 on /dev/sda1 */
+  {
+    char device[] = "/dev/sda";
+    device[5] = devchar;
+    int r;
+    suppress_error = 0;
+    r = guestfs_blockdev_setrw (g, device);
+    if (r == -1)
+      return -1;
+  }
+  {
+    int r;
+    suppress_error = 0;
+    r = guestfs_umount_all (g);
+    if (r == -1)
+      return -1;
+  }
+  {
+    int r;
+    suppress_error = 0;
+    r = guestfs_lvm_remove_all (g);
+    if (r == -1)
+      return -1;
+  }
+  {
+    char device[] = "/dev/sda";
+    device[5] = devchar;
+    char lines_0[] = ",";
+    char *lines[] = {
+      lines_0,
+      NULL
+    };
+    int r;
+    suppress_error = 0;
+    r = guestfs_sfdisk (g, device, 0, 0, 0, lines);
+    if (r == -1)
+      return -1;
+  }
+  {
+    char fstype[] = "ext2";
+    char device[] = "/dev/sda1";
+    device[5] = devchar;
+    int r;
+    suppress_error = 0;
+    r = guestfs_mkfs (g, fstype, device);
+    if (r == -1)
+      return -1;
+  }
+  {
+    char device[] = "/dev/sda1";
+    device[5] = devchar;
+    char mountpoint[] = "/";
+    int r;
+    suppress_error = 0;
+    r = guestfs_mount (g, device, mountpoint);
+    if (r == -1)
+      return -1;
+  }
+  /* TestOutput for cp (2) */
+  char expected[] = "file content";
+  {
+    char path[] = "/old";
+    char content[] = "file content";
+    int r;
+    suppress_error = 0;
+    r = guestfs_write_file (g, path, content, 0);
+    if (r == -1)
+      return -1;
+  }
+  {
+    char path[] = "/dir";
+    int r;
+    suppress_error = 0;
+    r = guestfs_mkdir (g, path);
+    if (r == -1)
+      return -1;
+  }
+  {
+    char src[] = "/old";
+    char dest[] = "/dir/new";
+    int r;
+    suppress_error = 0;
+    r = guestfs_cp (g, src, dest);
+    if (r == -1)
+      return -1;
+  }
+  {
+    char path[] = "/dir/new";
+    char *r;
+    suppress_error = 0;
+    r = guestfs_cat (g, path);
+    if (r == NULL)
+      return -1;
+    if (strcmp (r, expected) != 0) {
+      fprintf (stderr, "test_cp_2: expected \"%s\" but got \"%s\"\n", expected, r);
+      return -1;
+    }
+    free (r);
+  }
+  return 0;
+}
+
+static int test_grub_install_0 (void)
+{
+  /* InitBasicFS for grub_install (0): create ext2 on /dev/sda1 */
+  {
+    char device[] = "/dev/sda";
+    device[5] = devchar;
+    int r;
+    suppress_error = 0;
+    r = guestfs_blockdev_setrw (g, device);
+    if (r == -1)
+      return -1;
+  }
+  {
+    int r;
+    suppress_error = 0;
+    r = guestfs_umount_all (g);
+    if (r == -1)
+      return -1;
+  }
+  {
+    int r;
+    suppress_error = 0;
+    r = guestfs_lvm_remove_all (g);
+    if (r == -1)
+      return -1;
+  }
+  {
+    char device[] = "/dev/sda";
+    device[5] = devchar;
+    char lines_0[] = ",";
+    char *lines[] = {
+      lines_0,
+      NULL
+    };
+    int r;
+    suppress_error = 0;
+    r = guestfs_sfdisk (g, device, 0, 0, 0, lines);
+    if (r == -1)
+      return -1;
+  }
+  {
+    char fstype[] = "ext2";
+    char device[] = "/dev/sda1";
+    device[5] = devchar;
+    int r;
+    suppress_error = 0;
+    r = guestfs_mkfs (g, fstype, device);
+    if (r == -1)
+      return -1;
+  }
+  {
+    char device[] = "/dev/sda1";
+    device[5] = devchar;
+    char mountpoint[] = "/";
+    int r;
+    suppress_error = 0;
+    r = guestfs_mount (g, device, mountpoint);
+    if (r == -1)
+      return -1;
+  }
+  /* TestOutputTrue for grub_install (0) */
+  {
+    char root[] = "/";
+    char device[] = "/dev/sda1";
+    device[5] = devchar;
+    int r;
+    suppress_error = 0;
+    r = guestfs_grub_install (g, root, device);
+    if (r == -1)
+      return -1;
+  }
+  {
+    char path[] = "/boot";
+    int r;
+    suppress_error = 0;
+    r = guestfs_is_dir (g, path);
+    if (r == -1)
+      return -1;
+    if (!r) {
+      fprintf (stderr, "test_grub_install_0: expected true, got false\n");
+      return -1;
+    }
+  }
+  return 0;
+}
+
+static int test_zero_0 (void)
+{
+  /* InitBasicFS for zero (0): create ext2 on /dev/sda1 */
+  {
+    char device[] = "/dev/sda";
+    device[5] = devchar;
+    int r;
+    suppress_error = 0;
+    r = guestfs_blockdev_setrw (g, device);
+    if (r == -1)
+      return -1;
+  }
+  {
+    int r;
+    suppress_error = 0;
+    r = guestfs_umount_all (g);
+    if (r == -1)
+      return -1;
+  }
+  {
+    int r;
+    suppress_error = 0;
+    r = guestfs_lvm_remove_all (g);
+    if (r == -1)
+      return -1;
+  }
+  {
+    char device[] = "/dev/sda";
+    device[5] = devchar;
+    char lines_0[] = ",";
+    char *lines[] = {
+      lines_0,
+      NULL
+    };
+    int r;
+    suppress_error = 0;
+    r = guestfs_sfdisk (g, device, 0, 0, 0, lines);
+    if (r == -1)
+      return -1;
+  }
+  {
+    char fstype[] = "ext2";
+    char device[] = "/dev/sda1";
+    device[5] = devchar;
+    int r;
+    suppress_error = 0;
+    r = guestfs_mkfs (g, fstype, device);
+    if (r == -1)
+      return -1;
+  }
+  {
+    char device[] = "/dev/sda1";
+    device[5] = devchar;
+    char mountpoint[] = "/";
+    int r;
+    suppress_error = 0;
+    r = guestfs_mount (g, device, mountpoint);
+    if (r == -1)
+      return -1;
+  }
+  /* TestOutput for zero (0) */
+  char expected[] = "data";
+  {
+    char pathordevice[] = "/dev/sda1";
+    pathordevice[5] = devchar;
+    int r;
+    suppress_error = 0;
+    r = guestfs_umount (g, pathordevice);
+    if (r == -1)
+      return -1;
+  }
+  {
+    char device[] = "/dev/sda1";
+    device[5] = devchar;
+    int r;
+    suppress_error = 0;
+    r = guestfs_zero (g, device);
+    if (r == -1)
+      return -1;
+  }
+  {
+    char path[] = "/dev/sda1";
+    path[5] = devchar;
+    char *r;
+    suppress_error = 0;
+    r = guestfs_file (g, path);
+    if (r == NULL)
+      return -1;
+    if (strcmp (r, expected) != 0) {
+      fprintf (stderr, "test_zero_0: expected \"%s\" but got \"%s\"\n", expected, r);
+      return -1;
+    }
+    free (r);
+  }
+  return 0;
+}
+
+static int test_fsck_0 (void)
+{
+  /* InitBasicFS for fsck (0): create ext2 on /dev/sda1 */
+  {
+    char device[] = "/dev/sda";
+    device[5] = devchar;
+    int r;
+    suppress_error = 0;
+    r = guestfs_blockdev_setrw (g, device);
+    if (r == -1)
+      return -1;
+  }
+  {
+    int r;
+    suppress_error = 0;
+    r = guestfs_umount_all (g);
+    if (r == -1)
+      return -1;
+  }
+  {
+    int r;
+    suppress_error = 0;
+    r = guestfs_lvm_remove_all (g);
+    if (r == -1)
+      return -1;
+  }
+  {
+    char device[] = "/dev/sda";
+    device[5] = devchar;
+    char lines_0[] = ",";
+    char *lines[] = {
+      lines_0,
+      NULL
+    };
+    int r;
+    suppress_error = 0;
+    r = guestfs_sfdisk (g, device, 0, 0, 0, lines);
+    if (r == -1)
+      return -1;
+  }
+  {
+    char fstype[] = "ext2";
+    char device[] = "/dev/sda1";
+    device[5] = devchar;
+    int r;
+    suppress_error = 0;
+    r = guestfs_mkfs (g, fstype, device);
+    if (r == -1)
+      return -1;
+  }
+  {
+    char device[] = "/dev/sda1";
+    device[5] = devchar;
+    char mountpoint[] = "/";
+    int r;
+    suppress_error = 0;
+    r = guestfs_mount (g, device, mountpoint);
+    if (r == -1)
+      return -1;
+  }
+  /* TestOutputInt for fsck (0) */
+  {
+    char pathordevice[] = "/dev/sda1";
+    pathordevice[5] = devchar;
+    int r;
+    suppress_error = 0;
+    r = guestfs_umount (g, pathordevice);
+    if (r == -1)
+      return -1;
+  }
+  {
+    char fstype[] = "ext2";
+    char device[] = "/dev/sda1";
+    device[5] = devchar;
+    int r;
+    suppress_error = 0;
+    r = guestfs_fsck (g, fstype, device);
+    if (r == -1)
+      return -1;
+    if (r != 0) {
+      fprintf (stderr, "test_fsck_0: expected 0 but got %d\n",               (int) r);
+      return -1;
+    }
+  }
+  return 0;
+}
+
+static int test_fsck_1 (void)
+{
+  /* InitBasicFS for fsck (1): create ext2 on /dev/sda1 */
+  {
+    char device[] = "/dev/sda";
+    device[5] = devchar;
+    int r;
+    suppress_error = 0;
+    r = guestfs_blockdev_setrw (g, device);
+    if (r == -1)
+      return -1;
+  }
+  {
+    int r;
+    suppress_error = 0;
+    r = guestfs_umount_all (g);
+    if (r == -1)
+      return -1;
+  }
+  {
+    int r;
+    suppress_error = 0;
+    r = guestfs_lvm_remove_all (g);
+    if (r == -1)
+      return -1;
+  }
+  {
+    char device[] = "/dev/sda";
+    device[5] = devchar;
+    char lines_0[] = ",";
+    char *lines[] = {
+      lines_0,
+      NULL
+    };
+    int r;
+    suppress_error = 0;
+    r = guestfs_sfdisk (g, device, 0, 0, 0, lines);
+    if (r == -1)
+      return -1;
+  }
+  {
+    char fstype[] = "ext2";
+    char device[] = "/dev/sda1";
+    device[5] = devchar;
+    int r;
+    suppress_error = 0;
+    r = guestfs_mkfs (g, fstype, device);
+    if (r == -1)
+      return -1;
+  }
+  {
+    char device[] = "/dev/sda1";
+    device[5] = devchar;
+    char mountpoint[] = "/";
+    int r;
+    suppress_error = 0;
+    r = guestfs_mount (g, device, mountpoint);
+    if (r == -1)
+      return -1;
+  }
+  /* TestOutputInt for fsck (1) */
+  {
+    char pathordevice[] = "/dev/sda1";
+    pathordevice[5] = devchar;
+    int r;
+    suppress_error = 0;
+    r = guestfs_umount (g, pathordevice);
+    if (r == -1)
+      return -1;
+  }
+  {
+    char device[] = "/dev/sda1";
+    device[5] = devchar;
+    int r;
+    suppress_error = 0;
+    r = guestfs_zero (g, device);
+    if (r == -1)
+      return -1;
+  }
+  {
+    char fstype[] = "ext2";
+    char device[] = "/dev/sda1";
+    device[5] = devchar;
+    int r;
+    suppress_error = 0;
+    r = guestfs_fsck (g, fstype, device);
+    if (r == -1)
+      return -1;
+    if (r != 8) {
+      fprintf (stderr, "test_fsck_1: expected 8 but got %d\n",               (int) r);
+      return -1;
+    }
+  }
+  return 0;
+}
+
+static int test_set_e2uuid_0 (void)
+{
+  /* InitBasicFS for set_e2uuid (0): create ext2 on /dev/sda1 */
+  {
+    char device[] = "/dev/sda";
+    device[5] = devchar;
+    int r;
+    suppress_error = 0;
+    r = guestfs_blockdev_setrw (g, device);
+    if (r == -1)
+      return -1;
+  }
+  {
+    int r;
+    suppress_error = 0;
+    r = guestfs_umount_all (g);
+    if (r == -1)
+      return -1;
+  }
+  {
+    int r;
+    suppress_error = 0;
+    r = guestfs_lvm_remove_all (g);
+    if (r == -1)
+      return -1;
+  }
+  {
+    char device[] = "/dev/sda";
+    device[5] = devchar;
+    char lines_0[] = ",";
+    char *lines[] = {
+      lines_0,
+      NULL
+    };
+    int r;
+    suppress_error = 0;
+    r = guestfs_sfdisk (g, device, 0, 0, 0, lines);
+    if (r == -1)
+      return -1;
+  }
+  {
+    char fstype[] = "ext2";
+    char device[] = "/dev/sda1";
+    device[5] = devchar;
+    int r;
+    suppress_error = 0;
+    r = guestfs_mkfs (g, fstype, device);
+    if (r == -1)
+      return -1;
+  }
+  {
+    char device[] = "/dev/sda1";
+    device[5] = devchar;
+    char mountpoint[] = "/";
+    int r;
+    suppress_error = 0;
+    r = guestfs_mount (g, device, mountpoint);
+    if (r == -1)
+      return -1;
+  }
+  /* TestOutput for set_e2uuid (0) */
+  char expected[] = "a3a61220-882b-4f61-89f4-cf24dcc7297d";
+  {
+    char device[] = "/dev/sda1";
+    device[5] = devchar;
+    char uuid[] = "a3a61220-882b-4f61-89f4-cf24dcc7297d";
+    int r;
+    suppress_error = 0;
+    r = guestfs_set_e2uuid (g, device, uuid);
+    if (r == -1)
+      return -1;
+  }
+  {
+    char device[] = "/dev/sda1";
+    device[5] = devchar;
+    char *r;
+    suppress_error = 0;
+    r = guestfs_get_e2uuid (g, device);
+    if (r == NULL)
+      return -1;
+    if (strcmp (r, expected) != 0) {
+      fprintf (stderr, "test_set_e2uuid_0: expected \"%s\" but got \"%s\"\n", expected, r);
+      return -1;
+    }
+    free (r);
+  }
+  return 0;
+}
+
+static int test_set_e2uuid_1 (void)
+{
+  /* InitBasicFS for set_e2uuid (1): create ext2 on /dev/sda1 */
+  {
+    char device[] = "/dev/sda";
+    device[5] = devchar;
+    int r;
+    suppress_error = 0;
+    r = guestfs_blockdev_setrw (g, device);
+    if (r == -1)
+      return -1;
+  }
+  {
+    int r;
+    suppress_error = 0;
+    r = guestfs_umount_all (g);
+    if (r == -1)
+      return -1;
+  }
+  {
+    int r;
+    suppress_error = 0;
+    r = guestfs_lvm_remove_all (g);
+    if (r == -1)
+      return -1;
+  }
+  {
+    char device[] = "/dev/sda";
+    device[5] = devchar;
+    char lines_0[] = ",";
+    char *lines[] = {
+      lines_0,
+      NULL
+    };
+    int r;
+    suppress_error = 0;
+    r = guestfs_sfdisk (g, device, 0, 0, 0, lines);
+    if (r == -1)
+      return -1;
+  }
+  {
+    char fstype[] = "ext2";
+    char device[] = "/dev/sda1";
+    device[5] = devchar;
+    int r;
+    suppress_error = 0;
+    r = guestfs_mkfs (g, fstype, device);
+    if (r == -1)
+      return -1;
+  }
+  {
+    char device[] = "/dev/sda1";
+    device[5] = devchar;
+    char mountpoint[] = "/";
+    int r;
+    suppress_error = 0;
+    r = guestfs_mount (g, device, mountpoint);
+    if (r == -1)
+      return -1;
+  }
+  /* TestOutput for set_e2uuid (1) */
+  char expected[] = "";
+  {
+    char device[] = "/dev/sda1";
+    device[5] = devchar;
+    char uuid[] = "clear";
+    int r;
+    suppress_error = 0;
+    r = guestfs_set_e2uuid (g, device, uuid);
+    if (r == -1)
+      return -1;
+  }
+  {
+    char device[] = "/dev/sda1";
+    device[5] = devchar;
+    char *r;
+    suppress_error = 0;
+    r = guestfs_get_e2uuid (g, device);
+    if (r == NULL)
+      return -1;
+    if (strcmp (r, expected) != 0) {
+      fprintf (stderr, "test_set_e2uuid_1: expected \"%s\" but got \"%s\"\n", expected, r);
+      return -1;
+    }
+    free (r);
+  }
+  return 0;
+}
+
+static int test_set_e2uuid_2 (void)
+{
+  /* InitBasicFS for set_e2uuid (2): create ext2 on /dev/sda1 */
+  {
+    char device[] = "/dev/sda";
+    device[5] = devchar;
+    int r;
+    suppress_error = 0;
+    r = guestfs_blockdev_setrw (g, device);
+    if (r == -1)
+      return -1;
+  }
+  {
+    int r;
+    suppress_error = 0;
+    r = guestfs_umount_all (g);
+    if (r == -1)
+      return -1;
+  }
+  {
+    int r;
+    suppress_error = 0;
+    r = guestfs_lvm_remove_all (g);
+    if (r == -1)
+      return -1;
+  }
+  {
+    char device[] = "/dev/sda";
+    device[5] = devchar;
+    char lines_0[] = ",";
+    char *lines[] = {
+      lines_0,
+      NULL
+    };
+    int r;
+    suppress_error = 0;
+    r = guestfs_sfdisk (g, device, 0, 0, 0, lines);
+    if (r == -1)
+      return -1;
+  }
+  {
+    char fstype[] = "ext2";
+    char device[] = "/dev/sda1";
+    device[5] = devchar;
+    int r;
+    suppress_error = 0;
+    r = guestfs_mkfs (g, fstype, device);
+    if (r == -1)
+      return -1;
+  }
+  {
+    char device[] = "/dev/sda1";
+    device[5] = devchar;
+    char mountpoint[] = "/";
+    int r;
+    suppress_error = 0;
+    r = guestfs_mount (g, device, mountpoint);
+    if (r == -1)
+      return -1;
+  }
+  /* TestRun for set_e2uuid (2) */
+  {
+    char device[] = "/dev/sda1";
+    device[5] = devchar;
+    char uuid[] = "random";
+    int r;
+    suppress_error = 0;
+    r = guestfs_set_e2uuid (g, device, uuid);
+    if (r == -1)
+      return -1;
+  }
+  return 0;
+}
+
+static int test_set_e2uuid_3 (void)
 {
-  int i;
-
-  for (i = 0; argv[i] != NULL; i += 2)
-    printf ("%s: %s\n", argv[i], argv[i+1]);
+  /* InitBasicFS for set_e2uuid (3): create ext2 on /dev/sda1 */
+  {
+    char device[] = "/dev/sda";
+    device[5] = devchar;
+    int r;
+    suppress_error = 0;
+    r = guestfs_blockdev_setrw (g, device);
+    if (r == -1)
+      return -1;
+  }
+  {
+    int r;
+    suppress_error = 0;
+    r = guestfs_umount_all (g);
+    if (r == -1)
+      return -1;
+  }
+  {
+    int r;
+    suppress_error = 0;
+    r = guestfs_lvm_remove_all (g);
+    if (r == -1)
+      return -1;
+  }
+  {
+    char device[] = "/dev/sda";
+    device[5] = devchar;
+    char lines_0[] = ",";
+    char *lines[] = {
+      lines_0,
+      NULL
+    };
+    int r;
+    suppress_error = 0;
+    r = guestfs_sfdisk (g, device, 0, 0, 0, lines);
+    if (r == -1)
+      return -1;
+  }
+  {
+    char fstype[] = "ext2";
+    char device[] = "/dev/sda1";
+    device[5] = devchar;
+    int r;
+    suppress_error = 0;
+    r = guestfs_mkfs (g, fstype, device);
+    if (r == -1)
+      return -1;
+  }
+  {
+    char device[] = "/dev/sda1";
+    device[5] = devchar;
+    char mountpoint[] = "/";
+    int r;
+    suppress_error = 0;
+    r = guestfs_mount (g, device, mountpoint);
+    if (r == -1)
+      return -1;
+  }
+  /* TestRun for set_e2uuid (3) */
+  {
+    char device[] = "/dev/sda1";
+    device[5] = devchar;
+    char uuid[] = "time";
+    int r;
+    suppress_error = 0;
+    r = guestfs_set_e2uuid (g, device, uuid);
+    if (r == -1)
+      return -1;
+  }
+  return 0;
 }
-*/
 
-static void no_test_warnings (void)
+static int test_set_e2label_0 (void)
 {
-  fprintf (stderr, "warning: \"guestfs_launch\" has no tests\n");
-  fprintf (stderr, "warning: \"guestfs_wait_ready\" has no tests\n");
-  fprintf (stderr, "warning: \"guestfs_kill_subprocess\" has no tests\n");
-  fprintf (stderr, "warning: \"guestfs_add_drive\" has no tests\n");
-  fprintf (stderr, "warning: \"guestfs_add_cdrom\" has no tests\n");
-  fprintf (stderr, "warning: \"guestfs_config\" has no tests\n");
-  fprintf (stderr, "warning: \"guestfs_set_qemu\" has no tests\n");
-  fprintf (stderr, "warning: \"guestfs_get_qemu\" has no tests\n");
-  fprintf (stderr, "warning: \"guestfs_set_path\" has no tests\n");
-  fprintf (stderr, "warning: \"guestfs_get_path\" has no tests\n");
-  fprintf (stderr, "warning: \"guestfs_set_autosync\" has no tests\n");
-  fprintf (stderr, "warning: \"guestfs_get_autosync\" has no tests\n");
-  fprintf (stderr, "warning: \"guestfs_set_verbose\" has no tests\n");
-  fprintf (stderr, "warning: \"guestfs_get_verbose\" has no tests\n");
-  fprintf (stderr, "warning: \"guestfs_is_ready\" has no tests\n");
-  fprintf (stderr, "warning: \"guestfs_is_config\" has no tests\n");
-  fprintf (stderr, "warning: \"guestfs_is_launching\" has no tests\n");
-  fprintf (stderr, "warning: \"guestfs_is_busy\" has no tests\n");
-  fprintf (stderr, "warning: \"guestfs_get_state\" has no tests\n");
-  fprintf (stderr, "warning: \"guestfs_set_busy\" has no tests\n");
-  fprintf (stderr, "warning: \"guestfs_set_ready\" has no tests\n");
-  fprintf (stderr, "warning: \"guestfs_ll\" has no tests\n");
-  fprintf (stderr, "warning: \"guestfs_pvs_full\" has no tests\n");
-  fprintf (stderr, "warning: \"guestfs_vgs_full\" has no tests\n");
-  fprintf (stderr, "warning: \"guestfs_lvs_full\" has no tests\n");
-  fprintf (stderr, "warning: \"guestfs_aug_init\" has no tests\n");
-  fprintf (stderr, "warning: \"guestfs_aug_close\" has no tests\n");
-  fprintf (stderr, "warning: \"guestfs_aug_defvar\" has no tests\n");
-  fprintf (stderr, "warning: \"guestfs_aug_defnode\" has no tests\n");
-  fprintf (stderr, "warning: \"guestfs_aug_get\" has no tests\n");
-  fprintf (stderr, "warning: \"guestfs_aug_set\" has no tests\n");
-  fprintf (stderr, "warning: \"guestfs_aug_insert\" has no tests\n");
-  fprintf (stderr, "warning: \"guestfs_aug_rm\" has no tests\n");
-  fprintf (stderr, "warning: \"guestfs_aug_mv\" has no tests\n");
-  fprintf (stderr, "warning: \"guestfs_aug_match\" has no tests\n");
-  fprintf (stderr, "warning: \"guestfs_aug_save\" has no tests\n");
-  fprintf (stderr, "warning: \"guestfs_aug_load\" has no tests\n");
-  fprintf (stderr, "warning: \"guestfs_aug_ls\" has no tests\n");
-  fprintf (stderr, "warning: \"guestfs_chmod\" has no tests\n");
-  fprintf (stderr, "warning: \"guestfs_chown\" has no tests\n");
-  fprintf (stderr, "warning: \"guestfs_sfdisk\" has no tests\n");
-  fprintf (stderr, "warning: \"guestfs_lvm_remove_all\" has no tests\n");
-  fprintf (stderr, "warning: \"guestfs_command\" has no tests\n");
-  fprintf (stderr, "warning: \"guestfs_command_lines\" has no tests\n");
-  fprintf (stderr, "warning: \"guestfs_tune2fs_l\" has no tests\n");
-  fprintf (stderr, "warning: \"guestfs_blockdev_setbsz\" has no tests\n");
-  fprintf (stderr, "warning: \"guestfs_tar_out\" has no tests\n");
-  fprintf (stderr, "warning: \"guestfs_tgz_out\" has no tests\n");
-  fprintf (stderr, "warning: \"guestfs_mount_options\" has no tests\n");
-  fprintf (stderr, "warning: \"guestfs_mount_vfs\" has no tests\n");
-  fprintf (stderr, "warning: \"guestfs_debug\" has no tests\n");
+  /* InitBasicFS for set_e2label (0): create ext2 on /dev/sda1 */
+  {
+    char device[] = "/dev/sda";
+    device[5] = devchar;
+    int r;
+    suppress_error = 0;
+    r = guestfs_blockdev_setrw (g, device);
+    if (r == -1)
+      return -1;
+  }
+  {
+    int r;
+    suppress_error = 0;
+    r = guestfs_umount_all (g);
+    if (r == -1)
+      return -1;
+  }
+  {
+    int r;
+    suppress_error = 0;
+    r = guestfs_lvm_remove_all (g);
+    if (r == -1)
+      return -1;
+  }
+  {
+    char device[] = "/dev/sda";
+    device[5] = devchar;
+    char lines_0[] = ",";
+    char *lines[] = {
+      lines_0,
+      NULL
+    };
+    int r;
+    suppress_error = 0;
+    r = guestfs_sfdisk (g, device, 0, 0, 0, lines);
+    if (r == -1)
+      return -1;
+  }
+  {
+    char fstype[] = "ext2";
+    char device[] = "/dev/sda1";
+    device[5] = devchar;
+    int r;
+    suppress_error = 0;
+    r = guestfs_mkfs (g, fstype, device);
+    if (r == -1)
+      return -1;
+  }
+  {
+    char device[] = "/dev/sda1";
+    device[5] = devchar;
+    char mountpoint[] = "/";
+    int r;
+    suppress_error = 0;
+    r = guestfs_mount (g, device, mountpoint);
+    if (r == -1)
+      return -1;
+  }
+  /* TestOutput for set_e2label (0) */
+  char expected[] = "testlabel";
+  {
+    char device[] = "/dev/sda1";
+    device[5] = devchar;
+    char label[] = "testlabel";
+    int r;
+    suppress_error = 0;
+    r = guestfs_set_e2label (g, device, label);
+    if (r == -1)
+      return -1;
+  }
+  {
+    char device[] = "/dev/sda1";
+    device[5] = devchar;
+    char *r;
+    suppress_error = 0;
+    r = guestfs_get_e2label (g, device);
+    if (r == NULL)
+      return -1;
+    if (strcmp (r, expected) != 0) {
+      fprintf (stderr, "test_set_e2label_0: expected \"%s\" but got \"%s\"\n", expected, r);
+      return -1;
+    }
+    free (r);
+  }
+  return 0;
 }
 
 static int test_pvremove_0 (void)
 {
   /* InitEmpty for pvremove (0) */
   {
+    char device[] = "/dev/sda";
+    device[5] = devchar;
+    int r;
+    suppress_error = 0;
+    r = guestfs_blockdev_setrw (g, device);
+    if (r == -1)
+      return -1;
+  }
+  {
     int r;
     suppress_error = 0;
     r = guestfs_umount_all (g);
@@ -129,48 +2189,60 @@ static int test_pvremove_0 (void)
   }
   /* TestOutputList for pvremove (0) */
   {
+    char device[] = "/dev/sda";
+    device[5] = devchar;
     int r;
     suppress_error = 0;
-    r = guestfs_pvcreate (g, "/dev/sda");
+    r = guestfs_pvcreate (g, device);
     if (r == -1)
       return -1;
   }
   {
+    char volgroup[] = "VG";
+    char physvols_0[] = "/dev/sda";
+    physvols_0[5] = devchar;
     char *physvols[] = {
-      "/dev/sda",
+      physvols_0,
       NULL
     };
     int r;
     suppress_error = 0;
-    r = guestfs_vgcreate (g, "VG", physvols);
+    r = guestfs_vgcreate (g, volgroup, physvols);
     if (r == -1)
       return -1;
   }
   {
+    char logvol[] = "LV1";
+    char volgroup[] = "VG";
     int r;
     suppress_error = 0;
-    r = guestfs_lvcreate (g, "LV1", "VG", 50);
+    r = guestfs_lvcreate (g, logvol, volgroup, 50);
     if (r == -1)
       return -1;
   }
   {
+    char logvol[] = "LV2";
+    char volgroup[] = "VG";
     int r;
     suppress_error = 0;
-    r = guestfs_lvcreate (g, "LV2", "VG", 50);
+    r = guestfs_lvcreate (g, logvol, volgroup, 50);
     if (r == -1)
       return -1;
   }
   {
+    char vgname[] = "VG";
     int r;
     suppress_error = 0;
-    r = guestfs_vgremove (g, "VG");
+    r = guestfs_vgremove (g, vgname);
     if (r == -1)
       return -1;
   }
   {
+    char device[] = "/dev/sda";
+    device[5] = devchar;
     int r;
     suppress_error = 0;
-    r = guestfs_pvremove (g, "/dev/sda");
+    r = guestfs_pvremove (g, device);
     if (r == -1)
       return -1;
   }
@@ -197,6 +2269,15 @@ static int test_pvremove_1 (void)
 {
   /* InitEmpty for pvremove (1) */
   {
+    char device[] = "/dev/sda";
+    device[5] = devchar;
+    int r;
+    suppress_error = 0;
+    r = guestfs_blockdev_setrw (g, device);
+    if (r == -1)
+      return -1;
+  }
+  {
     int r;
     suppress_error = 0;
     r = guestfs_umount_all (g);
@@ -212,48 +2293,60 @@ static int test_pvremove_1 (void)
   }
   /* TestOutputList for pvremove (1) */
   {
+    char device[] = "/dev/sda";
+    device[5] = devchar;
     int r;
     suppress_error = 0;
-    r = guestfs_pvcreate (g, "/dev/sda");
+    r = guestfs_pvcreate (g, device);
     if (r == -1)
       return -1;
   }
   {
+    char volgroup[] = "VG";
+    char physvols_0[] = "/dev/sda";
+    physvols_0[5] = devchar;
     char *physvols[] = {
-      "/dev/sda",
+      physvols_0,
       NULL
     };
     int r;
     suppress_error = 0;
-    r = guestfs_vgcreate (g, "VG", physvols);
+    r = guestfs_vgcreate (g, volgroup, physvols);
     if (r == -1)
       return -1;
   }
   {
+    char logvol[] = "LV1";
+    char volgroup[] = "VG";
     int r;
     suppress_error = 0;
-    r = guestfs_lvcreate (g, "LV1", "VG", 50);
+    r = guestfs_lvcreate (g, logvol, volgroup, 50);
     if (r == -1)
       return -1;
   }
   {
+    char logvol[] = "LV2";
+    char volgroup[] = "VG";
     int r;
     suppress_error = 0;
-    r = guestfs_lvcreate (g, "LV2", "VG", 50);
+    r = guestfs_lvcreate (g, logvol, volgroup, 50);
     if (r == -1)
       return -1;
   }
   {
+    char vgname[] = "VG";
     int r;
     suppress_error = 0;
-    r = guestfs_vgremove (g, "VG");
+    r = guestfs_vgremove (g, vgname);
     if (r == -1)
       return -1;
   }
   {
+    char device[] = "/dev/sda";
+    device[5] = devchar;
     int r;
     suppress_error = 0;
-    r = guestfs_pvremove (g, "/dev/sda");
+    r = guestfs_pvremove (g, device);
     if (r == -1)
       return -1;
   }
@@ -280,6 +2373,15 @@ static int test_pvremove_2 (void)
 {
   /* InitEmpty for pvremove (2) */
   {
+    char device[] = "/dev/sda";
+    device[5] = devchar;
+    int r;
+    suppress_error = 0;
+    r = guestfs_blockdev_setrw (g, device);
+    if (r == -1)
+      return -1;
+  }
+  {
     int r;
     suppress_error = 0;
     r = guestfs_umount_all (g);
@@ -295,48 +2397,60 @@ static int test_pvremove_2 (void)
   }
   /* TestOutputList for pvremove (2) */
   {
+    char device[] = "/dev/sda";
+    device[5] = devchar;
     int r;
     suppress_error = 0;
-    r = guestfs_pvcreate (g, "/dev/sda");
+    r = guestfs_pvcreate (g, device);
     if (r == -1)
       return -1;
   }
   {
+    char volgroup[] = "VG";
+    char physvols_0[] = "/dev/sda";
+    physvols_0[5] = devchar;
     char *physvols[] = {
-      "/dev/sda",
+      physvols_0,
       NULL
     };
     int r;
     suppress_error = 0;
-    r = guestfs_vgcreate (g, "VG", physvols);
+    r = guestfs_vgcreate (g, volgroup, physvols);
     if (r == -1)
       return -1;
   }
   {
+    char logvol[] = "LV1";
+    char volgroup[] = "VG";
     int r;
     suppress_error = 0;
-    r = guestfs_lvcreate (g, "LV1", "VG", 50);
+    r = guestfs_lvcreate (g, logvol, volgroup, 50);
     if (r == -1)
       return -1;
   }
   {
+    char logvol[] = "LV2";
+    char volgroup[] = "VG";
     int r;
     suppress_error = 0;
-    r = guestfs_lvcreate (g, "LV2", "VG", 50);
+    r = guestfs_lvcreate (g, logvol, volgroup, 50);
     if (r == -1)
       return -1;
   }
   {
+    char vgname[] = "VG";
     int r;
     suppress_error = 0;
-    r = guestfs_vgremove (g, "VG");
+    r = guestfs_vgremove (g, vgname);
     if (r == -1)
       return -1;
   }
   {
+    char device[] = "/dev/sda";
+    device[5] = devchar;
     int r;
     suppress_error = 0;
-    r = guestfs_pvremove (g, "/dev/sda");
+    r = guestfs_pvremove (g, device);
     if (r == -1)
       return -1;
   }
@@ -363,6 +2477,15 @@ static int test_vgremove_0 (void)
 {
   /* InitEmpty for vgremove (0) */
   {
+    char device[] = "/dev/sda";
+    device[5] = devchar;
+    int r;
+    suppress_error = 0;
+    r = guestfs_blockdev_setrw (g, device);
+    if (r == -1)
+      return -1;
+  }
+  {
     int r;
     suppress_error = 0;
     r = guestfs_umount_all (g);
@@ -378,41 +2501,51 @@ static int test_vgremove_0 (void)
   }
   /* TestOutputList for vgremove (0) */
   {
+    char device[] = "/dev/sda";
+    device[5] = devchar;
     int r;
     suppress_error = 0;
-    r = guestfs_pvcreate (g, "/dev/sda");
+    r = guestfs_pvcreate (g, device);
     if (r == -1)
       return -1;
   }
   {
+    char volgroup[] = "VG";
+    char physvols_0[] = "/dev/sda";
+    physvols_0[5] = devchar;
     char *physvols[] = {
-      "/dev/sda",
+      physvols_0,
       NULL
     };
     int r;
     suppress_error = 0;
-    r = guestfs_vgcreate (g, "VG", physvols);
+    r = guestfs_vgcreate (g, volgroup, physvols);
     if (r == -1)
       return -1;
   }
   {
+    char logvol[] = "LV1";
+    char volgroup[] = "VG";
     int r;
     suppress_error = 0;
-    r = guestfs_lvcreate (g, "LV1", "VG", 50);
+    r = guestfs_lvcreate (g, logvol, volgroup, 50);
     if (r == -1)
       return -1;
   }
   {
+    char logvol[] = "LV2";
+    char volgroup[] = "VG";
     int r;
     suppress_error = 0;
-    r = guestfs_lvcreate (g, "LV2", "VG", 50);
+    r = guestfs_lvcreate (g, logvol, volgroup, 50);
     if (r == -1)
       return -1;
   }
   {
+    char vgname[] = "VG";
     int r;
     suppress_error = 0;
-    r = guestfs_vgremove (g, "VG");
+    r = guestfs_vgremove (g, vgname);
     if (r == -1)
       return -1;
   }
@@ -439,6 +2572,15 @@ static int test_vgremove_1 (void)
 {
   /* InitEmpty for vgremove (1) */
   {
+    char device[] = "/dev/sda";
+    device[5] = devchar;
+    int r;
+    suppress_error = 0;
+    r = guestfs_blockdev_setrw (g, device);
+    if (r == -1)
+      return -1;
+  }
+  {
     int r;
     suppress_error = 0;
     r = guestfs_umount_all (g);
@@ -454,41 +2596,51 @@ static int test_vgremove_1 (void)
   }
   /* TestOutputList for vgremove (1) */
   {
+    char device[] = "/dev/sda";
+    device[5] = devchar;
     int r;
     suppress_error = 0;
-    r = guestfs_pvcreate (g, "/dev/sda");
+    r = guestfs_pvcreate (g, device);
     if (r == -1)
       return -1;
   }
   {
+    char volgroup[] = "VG";
+    char physvols_0[] = "/dev/sda";
+    physvols_0[5] = devchar;
     char *physvols[] = {
-      "/dev/sda",
+      physvols_0,
       NULL
     };
     int r;
     suppress_error = 0;
-    r = guestfs_vgcreate (g, "VG", physvols);
+    r = guestfs_vgcreate (g, volgroup, physvols);
     if (r == -1)
       return -1;
   }
   {
+    char logvol[] = "LV1";
+    char volgroup[] = "VG";
     int r;
     suppress_error = 0;
-    r = guestfs_lvcreate (g, "LV1", "VG", 50);
+    r = guestfs_lvcreate (g, logvol, volgroup, 50);
     if (r == -1)
       return -1;
   }
   {
+    char logvol[] = "LV2";
+    char volgroup[] = "VG";
     int r;
     suppress_error = 0;
-    r = guestfs_lvcreate (g, "LV2", "VG", 50);
+    r = guestfs_lvcreate (g, logvol, volgroup, 50);
     if (r == -1)
       return -1;
   }
   {
+    char vgname[] = "VG";
     int r;
     suppress_error = 0;
-    r = guestfs_vgremove (g, "VG");
+    r = guestfs_vgremove (g, vgname);
     if (r == -1)
       return -1;
   }
@@ -515,6 +2667,15 @@ static int test_lvremove_0 (void)
 {
   /* InitEmpty for lvremove (0) */
   {
+    char device[] = "/dev/sda";
+    device[5] = devchar;
+    int r;
+    suppress_error = 0;
+    r = guestfs_blockdev_setrw (g, device);
+    if (r == -1)
+      return -1;
+  }
+  {
     int r;
     suppress_error = 0;
     r = guestfs_umount_all (g);
@@ -530,41 +2691,51 @@ static int test_lvremove_0 (void)
   }
   /* TestOutputList for lvremove (0) */
   {
+    char device[] = "/dev/sda";
+    device[5] = devchar;
     int r;
     suppress_error = 0;
-    r = guestfs_pvcreate (g, "/dev/sda");
+    r = guestfs_pvcreate (g, device);
     if (r == -1)
       return -1;
   }
   {
+    char volgroup[] = "VG";
+    char physvols_0[] = "/dev/sda";
+    physvols_0[5] = devchar;
     char *physvols[] = {
-      "/dev/sda",
+      physvols_0,
       NULL
     };
     int r;
     suppress_error = 0;
-    r = guestfs_vgcreate (g, "VG", physvols);
+    r = guestfs_vgcreate (g, volgroup, physvols);
     if (r == -1)
       return -1;
   }
   {
+    char logvol[] = "LV1";
+    char volgroup[] = "VG";
     int r;
     suppress_error = 0;
-    r = guestfs_lvcreate (g, "LV1", "VG", 50);
+    r = guestfs_lvcreate (g, logvol, volgroup, 50);
     if (r == -1)
       return -1;
   }
   {
+    char logvol[] = "LV2";
+    char volgroup[] = "VG";
     int r;
     suppress_error = 0;
-    r = guestfs_lvcreate (g, "LV2", "VG", 50);
+    r = guestfs_lvcreate (g, logvol, volgroup, 50);
     if (r == -1)
       return -1;
   }
   {
+    char device[] = "/dev/VG/LV1";
     int r;
     suppress_error = 0;
-    r = guestfs_lvremove (g, "/dev/VG/LV1");
+    r = guestfs_lvremove (g, device);
     if (r == -1)
       return -1;
   }
@@ -580,9 +2751,12 @@ static int test_lvremove_0 (void)
       print_strings (r);
       return -1;
     }
-    if (strcmp (r[0], "/dev/VG/LV2") != 0) {
-      fprintf (stderr, "test_lvremove_0: expected \"/dev/VG/LV2\" but got \"%s\"\n", r[0]);
-      return -1;
+    {
+      char expected[] = "/dev/VG/LV2";
+      if (strcmp (r[0], expected) != 0) {
+        fprintf (stderr, "test_lvremove_0: expected \"%s\" but got \"%s\"\n", expected, r[0]);
+        return -1;
+      }
     }
     if (r[1] != NULL) {
       fprintf (stderr, "test_lvremove_0: extra elements returned from command\n");
@@ -600,6 +2774,15 @@ static int test_lvremove_1 (void)
 {
   /* InitEmpty for lvremove (1) */
   {
+    char device[] = "/dev/sda";
+    device[5] = devchar;
+    int r;
+    suppress_error = 0;
+    r = guestfs_blockdev_setrw (g, device);
+    if (r == -1)
+      return -1;
+  }
+  {
     int r;
     suppress_error = 0;
     r = guestfs_umount_all (g);
@@ -615,41 +2798,51 @@ static int test_lvremove_1 (void)
   }
   /* TestOutputList for lvremove (1) */
   {
+    char device[] = "/dev/sda";
+    device[5] = devchar;
     int r;
     suppress_error = 0;
-    r = guestfs_pvcreate (g, "/dev/sda");
+    r = guestfs_pvcreate (g, device);
     if (r == -1)
       return -1;
   }
   {
+    char volgroup[] = "VG";
+    char physvols_0[] = "/dev/sda";
+    physvols_0[5] = devchar;
     char *physvols[] = {
-      "/dev/sda",
+      physvols_0,
       NULL
     };
     int r;
     suppress_error = 0;
-    r = guestfs_vgcreate (g, "VG", physvols);
+    r = guestfs_vgcreate (g, volgroup, physvols);
     if (r == -1)
       return -1;
   }
   {
+    char logvol[] = "LV1";
+    char volgroup[] = "VG";
     int r;
     suppress_error = 0;
-    r = guestfs_lvcreate (g, "LV1", "VG", 50);
+    r = guestfs_lvcreate (g, logvol, volgroup, 50);
     if (r == -1)
       return -1;
   }
   {
+    char logvol[] = "LV2";
+    char volgroup[] = "VG";
     int r;
     suppress_error = 0;
-    r = guestfs_lvcreate (g, "LV2", "VG", 50);
+    r = guestfs_lvcreate (g, logvol, volgroup, 50);
     if (r == -1)
       return -1;
   }
   {
+    char device[] = "/dev/VG";
     int r;
     suppress_error = 0;
-    r = guestfs_lvremove (g, "/dev/VG");
+    r = guestfs_lvremove (g, device);
     if (r == -1)
       return -1;
   }
@@ -676,6 +2869,15 @@ static int test_lvremove_2 (void)
 {
   /* InitEmpty for lvremove (2) */
   {
+    char device[] = "/dev/sda";
+    device[5] = devchar;
+    int r;
+    suppress_error = 0;
+    r = guestfs_blockdev_setrw (g, device);
+    if (r == -1)
+      return -1;
+  }
+  {
     int r;
     suppress_error = 0;
     r = guestfs_umount_all (g);
@@ -691,41 +2893,51 @@ static int test_lvremove_2 (void)
   }
   /* TestOutputList for lvremove (2) */
   {
+    char device[] = "/dev/sda";
+    device[5] = devchar;
     int r;
     suppress_error = 0;
-    r = guestfs_pvcreate (g, "/dev/sda");
+    r = guestfs_pvcreate (g, device);
     if (r == -1)
       return -1;
   }
   {
+    char volgroup[] = "VG";
+    char physvols_0[] = "/dev/sda";
+    physvols_0[5] = devchar;
     char *physvols[] = {
-      "/dev/sda",
+      physvols_0,
       NULL
     };
     int r;
     suppress_error = 0;
-    r = guestfs_vgcreate (g, "VG", physvols);
+    r = guestfs_vgcreate (g, volgroup, physvols);
     if (r == -1)
       return -1;
   }
   {
+    char logvol[] = "LV1";
+    char volgroup[] = "VG";
     int r;
     suppress_error = 0;
-    r = guestfs_lvcreate (g, "LV1", "VG", 50);
+    r = guestfs_lvcreate (g, logvol, volgroup, 50);
     if (r == -1)
       return -1;
   }
   {
+    char logvol[] = "LV2";
+    char volgroup[] = "VG";
     int r;
     suppress_error = 0;
-    r = guestfs_lvcreate (g, "LV2", "VG", 50);
+    r = guestfs_lvcreate (g, logvol, volgroup, 50);
     if (r == -1)
       return -1;
   }
   {
+    char device[] = "/dev/VG";
     int r;
     suppress_error = 0;
-    r = guestfs_lvremove (g, "/dev/VG");
+    r = guestfs_lvremove (g, device);
     if (r == -1)
       return -1;
   }
@@ -741,9 +2953,12 @@ static int test_lvremove_2 (void)
       print_strings (r);
       return -1;
     }
-    if (strcmp (r[0], "VG") != 0) {
-      fprintf (stderr, "test_lvremove_2: expected \"VG\" but got \"%s\"\n", r[0]);
-      return -1;
+    {
+      char expected[] = "VG";
+      if (strcmp (r[0], expected) != 0) {
+        fprintf (stderr, "test_lvremove_2: expected \"%s\" but got \"%s\"\n", expected, r[0]);
+        return -1;
+      }
     }
     if (r[1] != NULL) {
       fprintf (stderr, "test_lvremove_2: extra elements returned from command\n");
@@ -761,6 +2976,15 @@ static int test_mount_ro_0 (void)
 {
   /* InitBasicFS for mount_ro (0): create ext2 on /dev/sda1 */
   {
+    char device[] = "/dev/sda";
+    device[5] = devchar;
+    int r;
+    suppress_error = 0;
+    r = guestfs_blockdev_setrw (g, device);
+    if (r == -1)
+      return -1;
+  }
+  {
     int r;
     suppress_error = 0;
     r = guestfs_umount_all (g);
@@ -775,49 +2999,63 @@ static int test_mount_ro_0 (void)
       return -1;
   }
   {
+    char device[] = "/dev/sda";
+    device[5] = devchar;
+    char lines_0[] = ",";
     char *lines[] = {
-      ",",
+      lines_0,
       NULL
     };
     int r;
     suppress_error = 0;
-    r = guestfs_sfdisk (g, "/dev/sda", 0, 0, 0, lines);
+    r = guestfs_sfdisk (g, device, 0, 0, 0, lines);
     if (r == -1)
       return -1;
   }
   {
+    char fstype[] = "ext2";
+    char device[] = "/dev/sda1";
+    device[5] = devchar;
     int r;
     suppress_error = 0;
-    r = guestfs_mkfs (g, "ext2", "/dev/sda1");
+    r = guestfs_mkfs (g, fstype, device);
     if (r == -1)
       return -1;
   }
   {
+    char device[] = "/dev/sda1";
+    device[5] = devchar;
+    char mountpoint[] = "/";
     int r;
     suppress_error = 0;
-    r = guestfs_mount (g, "/dev/sda1", "/");
+    r = guestfs_mount (g, device, mountpoint);
     if (r == -1)
       return -1;
   }
   /* TestLastFail for mount_ro (0) */
   {
+    char pathordevice[] = "/";
     int r;
     suppress_error = 0;
-    r = guestfs_umount (g, "/");
+    r = guestfs_umount (g, pathordevice);
     if (r == -1)
       return -1;
   }
   {
+    char device[] = "/dev/sda1";
+    device[5] = devchar;
+    char mountpoint[] = "/";
     int r;
     suppress_error = 0;
-    r = guestfs_mount_ro (g, "/dev/sda1", "/");
+    r = guestfs_mount_ro (g, device, mountpoint);
     if (r == -1)
       return -1;
   }
   {
+    char path[] = "/new";
     int r;
     suppress_error = 1;
-    r = guestfs_touch (g, "/new");
+    r = guestfs_touch (g, path);
     if (r != -1)
       return -1;
   }
@@ -828,6 +3066,15 @@ static int test_mount_ro_1 (void)
 {
   /* InitBasicFS for mount_ro (1): create ext2 on /dev/sda1 */
   {
+    char device[] = "/dev/sda";
+    device[5] = devchar;
+    int r;
+    suppress_error = 0;
+    r = guestfs_blockdev_setrw (g, device);
+    if (r == -1)
+      return -1;
+  }
+  {
     int r;
     suppress_error = 0;
     r = guestfs_umount_all (g);
@@ -842,60 +3089,77 @@ static int test_mount_ro_1 (void)
       return -1;
   }
   {
+    char device[] = "/dev/sda";
+    device[5] = devchar;
+    char lines_0[] = ",";
     char *lines[] = {
-      ",",
+      lines_0,
       NULL
     };
     int r;
     suppress_error = 0;
-    r = guestfs_sfdisk (g, "/dev/sda", 0, 0, 0, lines);
+    r = guestfs_sfdisk (g, device, 0, 0, 0, lines);
     if (r == -1)
       return -1;
   }
   {
+    char fstype[] = "ext2";
+    char device[] = "/dev/sda1";
+    device[5] = devchar;
     int r;
     suppress_error = 0;
-    r = guestfs_mkfs (g, "ext2", "/dev/sda1");
+    r = guestfs_mkfs (g, fstype, device);
     if (r == -1)
       return -1;
   }
   {
+    char device[] = "/dev/sda1";
+    device[5] = devchar;
+    char mountpoint[] = "/";
     int r;
     suppress_error = 0;
-    r = guestfs_mount (g, "/dev/sda1", "/");
+    r = guestfs_mount (g, device, mountpoint);
     if (r == -1)
       return -1;
   }
   /* TestOutput for mount_ro (1) */
+  char expected[] = "data";
   {
+    char path[] = "/new";
+    char content[] = "data";
     int r;
     suppress_error = 0;
-    r = guestfs_write_file (g, "/new", "data", 0);
+    r = guestfs_write_file (g, path, content, 0);
     if (r == -1)
       return -1;
   }
   {
+    char pathordevice[] = "/";
     int r;
     suppress_error = 0;
-    r = guestfs_umount (g, "/");
+    r = guestfs_umount (g, pathordevice);
     if (r == -1)
       return -1;
   }
   {
+    char device[] = "/dev/sda1";
+    device[5] = devchar;
+    char mountpoint[] = "/";
     int r;
     suppress_error = 0;
-    r = guestfs_mount_ro (g, "/dev/sda1", "/");
+    r = guestfs_mount_ro (g, device, mountpoint);
     if (r == -1)
       return -1;
   }
   {
+    char path[] = "/new";
     char *r;
     suppress_error = 0;
-    r = guestfs_cat (g, "/new");
+    r = guestfs_cat (g, path);
     if (r == NULL)
       return -1;
-    if (strcmp (r, "data") != 0) {
-      fprintf (stderr, "test_mount_ro_1: expected \"data\" but got \"%s\"\n", r);
+    if (strcmp (r, expected) != 0) {
+      fprintf (stderr, "test_mount_ro_1: expected \"%s\" but got \"%s\"\n", expected, r);
       return -1;
     }
     free (r);
@@ -907,6 +3171,15 @@ static int test_tgz_in_0 (void)
 {
   /* InitBasicFS for tgz_in (0): create ext2 on /dev/sda1 */
   {
+    char device[] = "/dev/sda";
+    device[5] = devchar;
+    int r;
+    suppress_error = 0;
+    r = guestfs_blockdev_setrw (g, device);
+    if (r == -1)
+      return -1;
+  }
+  {
     int r;
     suppress_error = 0;
     r = guestfs_umount_all (g);
@@ -921,46 +3194,58 @@ static int test_tgz_in_0 (void)
       return -1;
   }
   {
+    char device[] = "/dev/sda";
+    device[5] = devchar;
+    char lines_0[] = ",";
     char *lines[] = {
-      ",",
+      lines_0,
       NULL
     };
     int r;
     suppress_error = 0;
-    r = guestfs_sfdisk (g, "/dev/sda", 0, 0, 0, lines);
+    r = guestfs_sfdisk (g, device, 0, 0, 0, lines);
     if (r == -1)
       return -1;
   }
   {
+    char fstype[] = "ext2";
+    char device[] = "/dev/sda1";
+    device[5] = devchar;
     int r;
     suppress_error = 0;
-    r = guestfs_mkfs (g, "ext2", "/dev/sda1");
+    r = guestfs_mkfs (g, fstype, device);
     if (r == -1)
       return -1;
   }
   {
+    char device[] = "/dev/sda1";
+    device[5] = devchar;
+    char mountpoint[] = "/";
     int r;
     suppress_error = 0;
-    r = guestfs_mount (g, "/dev/sda1", "/");
+    r = guestfs_mount (g, device, mountpoint);
     if (r == -1)
       return -1;
   }
   /* TestOutput for tgz_in (0) */
+  char expected[] = "hello\n";
   {
+    char directory[] = "/";
     int r;
     suppress_error = 0;
-    r = guestfs_tgz_in (g, "images/helloworld.tar.gz", "/");
+    r = guestfs_tgz_in (g, "images/helloworld.tar.gz", directory);
     if (r == -1)
       return -1;
   }
   {
+    char path[] = "/hello";
     char *r;
     suppress_error = 0;
-    r = guestfs_cat (g, "/hello");
+    r = guestfs_cat (g, path);
     if (r == NULL)
       return -1;
-    if (strcmp (r, "hello\n") != 0) {
-      fprintf (stderr, "test_tgz_in_0: expected \"hello\n\" but got \"%s\"\n", r);
+    if (strcmp (r, expected) != 0) {
+      fprintf (stderr, "test_tgz_in_0: expected \"%s\" but got \"%s\"\n", expected, r);
       return -1;
     }
     free (r);
@@ -972,6 +3257,15 @@ static int test_tar_in_0 (void)
 {
   /* InitBasicFS for tar_in (0): create ext2 on /dev/sda1 */
   {
+    char device[] = "/dev/sda";
+    device[5] = devchar;
+    int r;
+    suppress_error = 0;
+    r = guestfs_blockdev_setrw (g, device);
+    if (r == -1)
+      return -1;
+  }
+  {
     int r;
     suppress_error = 0;
     r = guestfs_umount_all (g);
@@ -986,46 +3280,58 @@ static int test_tar_in_0 (void)
       return -1;
   }
   {
+    char device[] = "/dev/sda";
+    device[5] = devchar;
+    char lines_0[] = ",";
     char *lines[] = {
-      ",",
+      lines_0,
       NULL
     };
     int r;
     suppress_error = 0;
-    r = guestfs_sfdisk (g, "/dev/sda", 0, 0, 0, lines);
+    r = guestfs_sfdisk (g, device, 0, 0, 0, lines);
     if (r == -1)
       return -1;
   }
   {
+    char fstype[] = "ext2";
+    char device[] = "/dev/sda1";
+    device[5] = devchar;
     int r;
     suppress_error = 0;
-    r = guestfs_mkfs (g, "ext2", "/dev/sda1");
+    r = guestfs_mkfs (g, fstype, device);
     if (r == -1)
       return -1;
   }
   {
+    char device[] = "/dev/sda1";
+    device[5] = devchar;
+    char mountpoint[] = "/";
     int r;
     suppress_error = 0;
-    r = guestfs_mount (g, "/dev/sda1", "/");
+    r = guestfs_mount (g, device, mountpoint);
     if (r == -1)
       return -1;
   }
   /* TestOutput for tar_in (0) */
+  char expected[] = "hello\n";
   {
+    char directory[] = "/";
     int r;
     suppress_error = 0;
-    r = guestfs_tar_in (g, "images/helloworld.tar", "/");
+    r = guestfs_tar_in (g, "images/helloworld.tar", directory);
     if (r == -1)
       return -1;
   }
   {
+    char path[] = "/hello";
     char *r;
     suppress_error = 0;
-    r = guestfs_cat (g, "/hello");
+    r = guestfs_cat (g, path);
     if (r == NULL)
       return -1;
-    if (strcmp (r, "hello\n") != 0) {
-      fprintf (stderr, "test_tar_in_0: expected \"hello\n\" but got \"%s\"\n", r);
+    if (strcmp (r, expected) != 0) {
+      fprintf (stderr, "test_tar_in_0: expected \"%s\" but got \"%s\"\n", expected, r);
       return -1;
     }
     free (r);
@@ -1037,6 +3343,15 @@ static int test_checksum_0 (void)
 {
   /* InitBasicFS for checksum (0): create ext2 on /dev/sda1 */
   {
+    char device[] = "/dev/sda";
+    device[5] = devchar;
+    int r;
+    suppress_error = 0;
+    r = guestfs_blockdev_setrw (g, device);
+    if (r == -1)
+      return -1;
+  }
+  {
     int r;
     suppress_error = 0;
     r = guestfs_umount_all (g);
@@ -1051,46 +3366,60 @@ static int test_checksum_0 (void)
       return -1;
   }
   {
+    char device[] = "/dev/sda";
+    device[5] = devchar;
+    char lines_0[] = ",";
     char *lines[] = {
-      ",",
+      lines_0,
       NULL
     };
     int r;
     suppress_error = 0;
-    r = guestfs_sfdisk (g, "/dev/sda", 0, 0, 0, lines);
+    r = guestfs_sfdisk (g, device, 0, 0, 0, lines);
     if (r == -1)
       return -1;
   }
   {
+    char fstype[] = "ext2";
+    char device[] = "/dev/sda1";
+    device[5] = devchar;
     int r;
     suppress_error = 0;
-    r = guestfs_mkfs (g, "ext2", "/dev/sda1");
+    r = guestfs_mkfs (g, fstype, device);
     if (r == -1)
       return -1;
   }
   {
+    char device[] = "/dev/sda1";
+    device[5] = devchar;
+    char mountpoint[] = "/";
     int r;
     suppress_error = 0;
-    r = guestfs_mount (g, "/dev/sda1", "/");
+    r = guestfs_mount (g, device, mountpoint);
     if (r == -1)
       return -1;
   }
   /* TestOutput for checksum (0) */
+  char expected[] = "935282863";
   {
+    char path[] = "/new";
+    char content[] = "test\n";
     int r;
     suppress_error = 0;
-    r = guestfs_write_file (g, "/new", "test\n", 0);
+    r = guestfs_write_file (g, path, content, 0);
     if (r == -1)
       return -1;
   }
   {
+    char csumtype[] = "crc";
+    char path[] = "/new";
     char *r;
     suppress_error = 0;
-    r = guestfs_checksum (g, "crc", "/new");
+    r = guestfs_checksum (g, csumtype, path);
     if (r == NULL)
       return -1;
-    if (strcmp (r, "935282863") != 0) {
-      fprintf (stderr, "test_checksum_0: expected \"935282863\" but got \"%s\"\n", r);
+    if (strcmp (r, expected) != 0) {
+      fprintf (stderr, "test_checksum_0: expected \"%s\" but got \"%s\"\n", expected, r);
       return -1;
     }
     free (r);
@@ -1102,6 +3431,15 @@ static int test_checksum_1 (void)
 {
   /* InitBasicFS for checksum (1): create ext2 on /dev/sda1 */
   {
+    char device[] = "/dev/sda";
+    device[5] = devchar;
+    int r;
+    suppress_error = 0;
+    r = guestfs_blockdev_setrw (g, device);
+    if (r == -1)
+      return -1;
+  }
+  {
     int r;
     suppress_error = 0;
     r = guestfs_umount_all (g);
@@ -1116,35 +3454,46 @@ static int test_checksum_1 (void)
       return -1;
   }
   {
+    char device[] = "/dev/sda";
+    device[5] = devchar;
+    char lines_0[] = ",";
     char *lines[] = {
-      ",",
+      lines_0,
       NULL
     };
     int r;
     suppress_error = 0;
-    r = guestfs_sfdisk (g, "/dev/sda", 0, 0, 0, lines);
+    r = guestfs_sfdisk (g, device, 0, 0, 0, lines);
     if (r == -1)
       return -1;
   }
   {
+    char fstype[] = "ext2";
+    char device[] = "/dev/sda1";
+    device[5] = devchar;
     int r;
     suppress_error = 0;
-    r = guestfs_mkfs (g, "ext2", "/dev/sda1");
+    r = guestfs_mkfs (g, fstype, device);
     if (r == -1)
       return -1;
   }
   {
+    char device[] = "/dev/sda1";
+    device[5] = devchar;
+    char mountpoint[] = "/";
     int r;
     suppress_error = 0;
-    r = guestfs_mount (g, "/dev/sda1", "/");
+    r = guestfs_mount (g, device, mountpoint);
     if (r == -1)
       return -1;
   }
   /* TestLastFail for checksum (1) */
   {
+    char csumtype[] = "crc";
+    char path[] = "/new";
     char *r;
     suppress_error = 1;
-    r = guestfs_checksum (g, "crc", "/new");
+    r = guestfs_checksum (g, csumtype, path);
     if (r != NULL)
       return -1;
     free (r);
@@ -1156,6 +3505,15 @@ static int test_checksum_2 (void)
 {
   /* InitBasicFS for checksum (2): create ext2 on /dev/sda1 */
   {
+    char device[] = "/dev/sda";
+    device[5] = devchar;
+    int r;
+    suppress_error = 0;
+    r = guestfs_blockdev_setrw (g, device);
+    if (r == -1)
+      return -1;
+  }
+  {
     int r;
     suppress_error = 0;
     r = guestfs_umount_all (g);
@@ -1170,46 +3528,60 @@ static int test_checksum_2 (void)
       return -1;
   }
   {
+    char device[] = "/dev/sda";
+    device[5] = devchar;
+    char lines_0[] = ",";
     char *lines[] = {
-      ",",
+      lines_0,
       NULL
     };
     int r;
     suppress_error = 0;
-    r = guestfs_sfdisk (g, "/dev/sda", 0, 0, 0, lines);
+    r = guestfs_sfdisk (g, device, 0, 0, 0, lines);
     if (r == -1)
       return -1;
   }
   {
+    char fstype[] = "ext2";
+    char device[] = "/dev/sda1";
+    device[5] = devchar;
     int r;
     suppress_error = 0;
-    r = guestfs_mkfs (g, "ext2", "/dev/sda1");
+    r = guestfs_mkfs (g, fstype, device);
     if (r == -1)
       return -1;
   }
   {
+    char device[] = "/dev/sda1";
+    device[5] = devchar;
+    char mountpoint[] = "/";
     int r;
     suppress_error = 0;
-    r = guestfs_mount (g, "/dev/sda1", "/");
+    r = guestfs_mount (g, device, mountpoint);
     if (r == -1)
       return -1;
   }
   /* TestOutput for checksum (2) */
+  char expected[] = "d8e8fca2dc0f896fd7cb4cb0031ba249";
   {
+    char path[] = "/new";
+    char content[] = "test\n";
     int r;
     suppress_error = 0;
-    r = guestfs_write_file (g, "/new", "test\n", 0);
+    r = guestfs_write_file (g, path, content, 0);
     if (r == -1)
       return -1;
   }
   {
+    char csumtype[] = "md5";
+    char path[] = "/new";
     char *r;
     suppress_error = 0;
-    r = guestfs_checksum (g, "md5", "/new");
+    r = guestfs_checksum (g, csumtype, path);
     if (r == NULL)
       return -1;
-    if (strcmp (r, "d8e8fca2dc0f896fd7cb4cb0031ba249") != 0) {
-      fprintf (stderr, "test_checksum_2: expected \"d8e8fca2dc0f896fd7cb4cb0031ba249\" but got \"%s\"\n", r);
+    if (strcmp (r, expected) != 0) {
+      fprintf (stderr, "test_checksum_2: expected \"%s\" but got \"%s\"\n", expected, r);
       return -1;
     }
     free (r);
@@ -1221,6 +3593,15 @@ static int test_checksum_3 (void)
 {
   /* InitBasicFS for checksum (3): create ext2 on /dev/sda1 */
   {
+    char device[] = "/dev/sda";
+    device[5] = devchar;
+    int r;
+    suppress_error = 0;
+    r = guestfs_blockdev_setrw (g, device);
+    if (r == -1)
+      return -1;
+  }
+  {
     int r;
     suppress_error = 0;
     r = guestfs_umount_all (g);
@@ -1235,46 +3616,60 @@ static int test_checksum_3 (void)
       return -1;
   }
   {
+    char device[] = "/dev/sda";
+    device[5] = devchar;
+    char lines_0[] = ",";
     char *lines[] = {
-      ",",
+      lines_0,
       NULL
     };
     int r;
     suppress_error = 0;
-    r = guestfs_sfdisk (g, "/dev/sda", 0, 0, 0, lines);
+    r = guestfs_sfdisk (g, device, 0, 0, 0, lines);
     if (r == -1)
       return -1;
   }
   {
+    char fstype[] = "ext2";
+    char device[] = "/dev/sda1";
+    device[5] = devchar;
     int r;
     suppress_error = 0;
-    r = guestfs_mkfs (g, "ext2", "/dev/sda1");
+    r = guestfs_mkfs (g, fstype, device);
     if (r == -1)
       return -1;
   }
   {
+    char device[] = "/dev/sda1";
+    device[5] = devchar;
+    char mountpoint[] = "/";
     int r;
     suppress_error = 0;
-    r = guestfs_mount (g, "/dev/sda1", "/");
+    r = guestfs_mount (g, device, mountpoint);
     if (r == -1)
       return -1;
   }
   /* TestOutput for checksum (3) */
+  char expected[] = "4e1243bd22c66e76c2ba9eddc1f91394e57f9f83";
   {
+    char path[] = "/new";
+    char content[] = "test\n";
     int r;
     suppress_error = 0;
-    r = guestfs_write_file (g, "/new", "test\n", 0);
+    r = guestfs_write_file (g, path, content, 0);
     if (r == -1)
       return -1;
   }
   {
+    char csumtype[] = "sha1";
+    char path[] = "/new";
     char *r;
     suppress_error = 0;
-    r = guestfs_checksum (g, "sha1", "/new");
+    r = guestfs_checksum (g, csumtype, path);
     if (r == NULL)
       return -1;
-    if (strcmp (r, "4e1243bd22c66e76c2ba9eddc1f91394e57f9f83") != 0) {
-      fprintf (stderr, "test_checksum_3: expected \"4e1243bd22c66e76c2ba9eddc1f91394e57f9f83\" but got \"%s\"\n", r);
+    if (strcmp (r, expected) != 0) {
+      fprintf (stderr, "test_checksum_3: expected \"%s\" but got \"%s\"\n", expected, r);
       return -1;
     }
     free (r);
@@ -1286,6 +3681,15 @@ static int test_checksum_4 (void)
 {
   /* InitBasicFS for checksum (4): create ext2 on /dev/sda1 */
   {
+    char device[] = "/dev/sda";
+    device[5] = devchar;
+    int r;
+    suppress_error = 0;
+    r = guestfs_blockdev_setrw (g, device);
+    if (r == -1)
+      return -1;
+  }
+  {
     int r;
     suppress_error = 0;
     r = guestfs_umount_all (g);
@@ -1300,46 +3704,60 @@ static int test_checksum_4 (void)
       return -1;
   }
   {
+    char device[] = "/dev/sda";
+    device[5] = devchar;
+    char lines_0[] = ",";
     char *lines[] = {
-      ",",
+      lines_0,
       NULL
     };
     int r;
     suppress_error = 0;
-    r = guestfs_sfdisk (g, "/dev/sda", 0, 0, 0, lines);
+    r = guestfs_sfdisk (g, device, 0, 0, 0, lines);
     if (r == -1)
       return -1;
   }
   {
+    char fstype[] = "ext2";
+    char device[] = "/dev/sda1";
+    device[5] = devchar;
     int r;
     suppress_error = 0;
-    r = guestfs_mkfs (g, "ext2", "/dev/sda1");
+    r = guestfs_mkfs (g, fstype, device);
     if (r == -1)
       return -1;
   }
   {
+    char device[] = "/dev/sda1";
+    device[5] = devchar;
+    char mountpoint[] = "/";
     int r;
     suppress_error = 0;
-    r = guestfs_mount (g, "/dev/sda1", "/");
+    r = guestfs_mount (g, device, mountpoint);
     if (r == -1)
       return -1;
   }
   /* TestOutput for checksum (4) */
+  char expected[] = "52f1bf093f4b7588726035c176c0cdb4376cfea53819f1395ac9e6ec";
   {
+    char path[] = "/new";
+    char content[] = "test\n";
     int r;
     suppress_error = 0;
-    r = guestfs_write_file (g, "/new", "test\n", 0);
+    r = guestfs_write_file (g, path, content, 0);
     if (r == -1)
       return -1;
   }
   {
+    char csumtype[] = "sha224";
+    char path[] = "/new";
     char *r;
     suppress_error = 0;
-    r = guestfs_checksum (g, "sha224", "/new");
+    r = guestfs_checksum (g, csumtype, path);
     if (r == NULL)
       return -1;
-    if (strcmp (r, "52f1bf093f4b7588726035c176c0cdb4376cfea53819f1395ac9e6ec") != 0) {
-      fprintf (stderr, "test_checksum_4: expected \"52f1bf093f4b7588726035c176c0cdb4376cfea53819f1395ac9e6ec\" but got \"%s\"\n", r);
+    if (strcmp (r, expected) != 0) {
+      fprintf (stderr, "test_checksum_4: expected \"%s\" but got \"%s\"\n", expected, r);
       return -1;
     }
     free (r);
@@ -1351,6 +3769,15 @@ static int test_checksum_5 (void)
 {
   /* InitBasicFS for checksum (5): create ext2 on /dev/sda1 */
   {
+    char device[] = "/dev/sda";
+    device[5] = devchar;
+    int r;
+    suppress_error = 0;
+    r = guestfs_blockdev_setrw (g, device);
+    if (r == -1)
+      return -1;
+  }
+  {
     int r;
     suppress_error = 0;
     r = guestfs_umount_all (g);
@@ -1365,46 +3792,60 @@ static int test_checksum_5 (void)
       return -1;
   }
   {
+    char device[] = "/dev/sda";
+    device[5] = devchar;
+    char lines_0[] = ",";
     char *lines[] = {
-      ",",
+      lines_0,
       NULL
     };
     int r;
     suppress_error = 0;
-    r = guestfs_sfdisk (g, "/dev/sda", 0, 0, 0, lines);
+    r = guestfs_sfdisk (g, device, 0, 0, 0, lines);
     if (r == -1)
       return -1;
   }
   {
+    char fstype[] = "ext2";
+    char device[] = "/dev/sda1";
+    device[5] = devchar;
     int r;
     suppress_error = 0;
-    r = guestfs_mkfs (g, "ext2", "/dev/sda1");
+    r = guestfs_mkfs (g, fstype, device);
     if (r == -1)
       return -1;
   }
   {
+    char device[] = "/dev/sda1";
+    device[5] = devchar;
+    char mountpoint[] = "/";
     int r;
     suppress_error = 0;
-    r = guestfs_mount (g, "/dev/sda1", "/");
+    r = guestfs_mount (g, device, mountpoint);
     if (r == -1)
       return -1;
   }
   /* TestOutput for checksum (5) */
+  char expected[] = "f2ca1bb6c7e907d06dafe4687e579fce76b37e4e93b7605022da52e6ccc26fd2";
   {
+    char path[] = "/new";
+    char content[] = "test\n";
     int r;
     suppress_error = 0;
-    r = guestfs_write_file (g, "/new", "test\n", 0);
+    r = guestfs_write_file (g, path, content, 0);
     if (r == -1)
       return -1;
   }
   {
+    char csumtype[] = "sha256";
+    char path[] = "/new";
     char *r;
     suppress_error = 0;
-    r = guestfs_checksum (g, "sha256", "/new");
+    r = guestfs_checksum (g, csumtype, path);
     if (r == NULL)
       return -1;
-    if (strcmp (r, "f2ca1bb6c7e907d06dafe4687e579fce76b37e4e93b7605022da52e6ccc26fd2") != 0) {
-      fprintf (stderr, "test_checksum_5: expected \"f2ca1bb6c7e907d06dafe4687e579fce76b37e4e93b7605022da52e6ccc26fd2\" but got \"%s\"\n", r);
+    if (strcmp (r, expected) != 0) {
+      fprintf (stderr, "test_checksum_5: expected \"%s\" but got \"%s\"\n", expected, r);
       return -1;
     }
     free (r);
@@ -1416,6 +3857,15 @@ static int test_checksum_6 (void)
 {
   /* InitBasicFS for checksum (6): create ext2 on /dev/sda1 */
   {
+    char device[] = "/dev/sda";
+    device[5] = devchar;
+    int r;
+    suppress_error = 0;
+    r = guestfs_blockdev_setrw (g, device);
+    if (r == -1)
+      return -1;
+  }
+  {
     int r;
     suppress_error = 0;
     r = guestfs_umount_all (g);
@@ -1430,46 +3880,60 @@ static int test_checksum_6 (void)
       return -1;
   }
   {
+    char device[] = "/dev/sda";
+    device[5] = devchar;
+    char lines_0[] = ",";
     char *lines[] = {
-      ",",
+      lines_0,
       NULL
     };
     int r;
     suppress_error = 0;
-    r = guestfs_sfdisk (g, "/dev/sda", 0, 0, 0, lines);
+    r = guestfs_sfdisk (g, device, 0, 0, 0, lines);
     if (r == -1)
       return -1;
   }
   {
+    char fstype[] = "ext2";
+    char device[] = "/dev/sda1";
+    device[5] = devchar;
     int r;
     suppress_error = 0;
-    r = guestfs_mkfs (g, "ext2", "/dev/sda1");
+    r = guestfs_mkfs (g, fstype, device);
     if (r == -1)
       return -1;
   }
   {
+    char device[] = "/dev/sda1";
+    device[5] = devchar;
+    char mountpoint[] = "/";
     int r;
     suppress_error = 0;
-    r = guestfs_mount (g, "/dev/sda1", "/");
+    r = guestfs_mount (g, device, mountpoint);
     if (r == -1)
       return -1;
   }
   /* TestOutput for checksum (6) */
+  char expected[] = "109bb6b5b6d5547c1ce03c7a8bd7d8f80c1cb0957f50c4f7fda04692079917e4f9cad52b878f3d8234e1a170b154b72d";
   {
+    char path[] = "/new";
+    char content[] = "test\n";
     int r;
     suppress_error = 0;
-    r = guestfs_write_file (g, "/new", "test\n", 0);
+    r = guestfs_write_file (g, path, content, 0);
     if (r == -1)
       return -1;
   }
   {
+    char csumtype[] = "sha384";
+    char path[] = "/new";
     char *r;
     suppress_error = 0;
-    r = guestfs_checksum (g, "sha384", "/new");
+    r = guestfs_checksum (g, csumtype, path);
     if (r == NULL)
       return -1;
-    if (strcmp (r, "109bb6b5b6d5547c1ce03c7a8bd7d8f80c1cb0957f50c4f7fda04692079917e4f9cad52b878f3d8234e1a170b154b72d") != 0) {
-      fprintf (stderr, "test_checksum_6: expected \"109bb6b5b6d5547c1ce03c7a8bd7d8f80c1cb0957f50c4f7fda04692079917e4f9cad52b878f3d8234e1a170b154b72d\" but got \"%s\"\n", r);
+    if (strcmp (r, expected) != 0) {
+      fprintf (stderr, "test_checksum_6: expected \"%s\" but got \"%s\"\n", expected, r);
       return -1;
     }
     free (r);
@@ -1481,6 +3945,15 @@ static int test_checksum_7 (void)
 {
   /* InitBasicFS for checksum (7): create ext2 on /dev/sda1 */
   {
+    char device[] = "/dev/sda";
+    device[5] = devchar;
+    int r;
+    suppress_error = 0;
+    r = guestfs_blockdev_setrw (g, device);
+    if (r == -1)
+      return -1;
+  }
+  {
     int r;
     suppress_error = 0;
     r = guestfs_umount_all (g);
@@ -1495,46 +3968,60 @@ static int test_checksum_7 (void)
       return -1;
   }
   {
+    char device[] = "/dev/sda";
+    device[5] = devchar;
+    char lines_0[] = ",";
     char *lines[] = {
-      ",",
+      lines_0,
       NULL
     };
     int r;
     suppress_error = 0;
-    r = guestfs_sfdisk (g, "/dev/sda", 0, 0, 0, lines);
+    r = guestfs_sfdisk (g, device, 0, 0, 0, lines);
     if (r == -1)
       return -1;
   }
   {
+    char fstype[] = "ext2";
+    char device[] = "/dev/sda1";
+    device[5] = devchar;
     int r;
     suppress_error = 0;
-    r = guestfs_mkfs (g, "ext2", "/dev/sda1");
+    r = guestfs_mkfs (g, fstype, device);
     if (r == -1)
       return -1;
   }
   {
+    char device[] = "/dev/sda1";
+    device[5] = devchar;
+    char mountpoint[] = "/";
     int r;
     suppress_error = 0;
-    r = guestfs_mount (g, "/dev/sda1", "/");
+    r = guestfs_mount (g, device, mountpoint);
     if (r == -1)
       return -1;
   }
   /* TestOutput for checksum (7) */
+  char expected[] = "0e3e75234abc68f4378a86b3f4b32a198ba301845b0cd6e50106e874345700cc6663a86c1ea125dc5e92be17c98f9a0f85ca9d5f595db2012f7cc3571945c123";
   {
+    char path[] = "/new";
+    char content[] = "test\n";
     int r;
     suppress_error = 0;
-    r = guestfs_write_file (g, "/new", "test\n", 0);
+    r = guestfs_write_file (g, path, content, 0);
     if (r == -1)
       return -1;
   }
   {
+    char csumtype[] = "sha512";
+    char path[] = "/new";
     char *r;
     suppress_error = 0;
-    r = guestfs_checksum (g, "sha512", "/new");
+    r = guestfs_checksum (g, csumtype, path);
     if (r == NULL)
       return -1;
-    if (strcmp (r, "0e3e75234abc68f4378a86b3f4b32a198ba301845b0cd6e50106e874345700cc6663a86c1ea125dc5e92be17c98f9a0f85ca9d5f595db2012f7cc3571945c123") != 0) {
-      fprintf (stderr, "test_checksum_7: expected \"0e3e75234abc68f4378a86b3f4b32a198ba301845b0cd6e50106e874345700cc6663a86c1ea125dc5e92be17c98f9a0f85ca9d5f595db2012f7cc3571945c123\" but got \"%s\"\n", r);
+    if (strcmp (r, expected) != 0) {
+      fprintf (stderr, "test_checksum_7: expected \"%s\" but got \"%s\"\n", expected, r);
       return -1;
     }
     free (r);
@@ -1546,6 +4033,15 @@ static int test_download_0 (void)
 {
   /* InitBasicFS for download (0): create ext2 on /dev/sda1 */
   {
+    char device[] = "/dev/sda";
+    device[5] = devchar;
+    int r;
+    suppress_error = 0;
+    r = guestfs_blockdev_setrw (g, device);
+    if (r == -1)
+      return -1;
+  }
+  {
     int r;
     suppress_error = 0;
     r = guestfs_umount_all (g);
@@ -1560,60 +4056,75 @@ static int test_download_0 (void)
       return -1;
   }
   {
+    char device[] = "/dev/sda";
+    device[5] = devchar;
+    char lines_0[] = ",";
     char *lines[] = {
-      ",",
+      lines_0,
       NULL
     };
     int r;
     suppress_error = 0;
-    r = guestfs_sfdisk (g, "/dev/sda", 0, 0, 0, lines);
+    r = guestfs_sfdisk (g, device, 0, 0, 0, lines);
     if (r == -1)
       return -1;
   }
   {
+    char fstype[] = "ext2";
+    char device[] = "/dev/sda1";
+    device[5] = devchar;
     int r;
     suppress_error = 0;
-    r = guestfs_mkfs (g, "ext2", "/dev/sda1");
+    r = guestfs_mkfs (g, fstype, device);
     if (r == -1)
       return -1;
   }
   {
+    char device[] = "/dev/sda1";
+    device[5] = devchar;
+    char mountpoint[] = "/";
     int r;
     suppress_error = 0;
-    r = guestfs_mount (g, "/dev/sda1", "/");
+    r = guestfs_mount (g, device, mountpoint);
     if (r == -1)
       return -1;
   }
   /* TestOutput for download (0) */
+  char expected[] = "e3eda01d9815f8d24aae2dbd89b68b06";
   {
+    char remotefilename[] = "/COPYING.LIB";
     int r;
     suppress_error = 0;
-    r = guestfs_upload (g, "COPYING.LIB", "/COPYING.LIB");
+    r = guestfs_upload (g, "COPYING.LIB", remotefilename);
     if (r == -1)
       return -1;
   }
   {
+    char remotefilename[] = "/COPYING.LIB";
     int r;
     suppress_error = 0;
-    r = guestfs_download (g, "/COPYING.LIB", "testdownload.tmp");
+    r = guestfs_download (g, remotefilename, "testdownload.tmp");
     if (r == -1)
       return -1;
   }
   {
+    char remotefilename[] = "/upload";
     int r;
     suppress_error = 0;
-    r = guestfs_upload (g, "testdownload.tmp", "/upload");
+    r = guestfs_upload (g, "testdownload.tmp", remotefilename);
     if (r == -1)
       return -1;
   }
   {
+    char csumtype[] = "md5";
+    char path[] = "/upload";
     char *r;
     suppress_error = 0;
-    r = guestfs_checksum (g, "md5", "/upload");
+    r = guestfs_checksum (g, csumtype, path);
     if (r == NULL)
       return -1;
-    if (strcmp (r, "e3eda01d9815f8d24aae2dbd89b68b06") != 0) {
-      fprintf (stderr, "test_download_0: expected \"e3eda01d9815f8d24aae2dbd89b68b06\" but got \"%s\"\n", r);
+    if (strcmp (r, expected) != 0) {
+      fprintf (stderr, "test_download_0: expected \"%s\" but got \"%s\"\n", expected, r);
       return -1;
     }
     free (r);
@@ -1625,6 +4136,15 @@ static int test_upload_0 (void)
 {
   /* InitBasicFS for upload (0): create ext2 on /dev/sda1 */
   {
+    char device[] = "/dev/sda";
+    device[5] = devchar;
+    int r;
+    suppress_error = 0;
+    r = guestfs_blockdev_setrw (g, device);
+    if (r == -1)
+      return -1;
+  }
+  {
     int r;
     suppress_error = 0;
     r = guestfs_umount_all (g);
@@ -1639,46 +4159,59 @@ static int test_upload_0 (void)
       return -1;
   }
   {
+    char device[] = "/dev/sda";
+    device[5] = devchar;
+    char lines_0[] = ",";
     char *lines[] = {
-      ",",
+      lines_0,
       NULL
     };
     int r;
     suppress_error = 0;
-    r = guestfs_sfdisk (g, "/dev/sda", 0, 0, 0, lines);
+    r = guestfs_sfdisk (g, device, 0, 0, 0, lines);
     if (r == -1)
       return -1;
   }
   {
+    char fstype[] = "ext2";
+    char device[] = "/dev/sda1";
+    device[5] = devchar;
     int r;
     suppress_error = 0;
-    r = guestfs_mkfs (g, "ext2", "/dev/sda1");
+    r = guestfs_mkfs (g, fstype, device);
     if (r == -1)
       return -1;
   }
   {
+    char device[] = "/dev/sda1";
+    device[5] = devchar;
+    char mountpoint[] = "/";
     int r;
     suppress_error = 0;
-    r = guestfs_mount (g, "/dev/sda1", "/");
+    r = guestfs_mount (g, device, mountpoint);
     if (r == -1)
       return -1;
   }
   /* TestOutput for upload (0) */
+  char expected[] = "e3eda01d9815f8d24aae2dbd89b68b06";
   {
+    char remotefilename[] = "/COPYING.LIB";
     int r;
     suppress_error = 0;
-    r = guestfs_upload (g, "COPYING.LIB", "/COPYING.LIB");
+    r = guestfs_upload (g, "COPYING.LIB", remotefilename);
     if (r == -1)
       return -1;
   }
   {
+    char csumtype[] = "md5";
+    char path[] = "/COPYING.LIB";
     char *r;
     suppress_error = 0;
-    r = guestfs_checksum (g, "md5", "/COPYING.LIB");
+    r = guestfs_checksum (g, csumtype, path);
     if (r == NULL)
       return -1;
-    if (strcmp (r, "e3eda01d9815f8d24aae2dbd89b68b06") != 0) {
-      fprintf (stderr, "test_upload_0: expected \"e3eda01d9815f8d24aae2dbd89b68b06\" but got \"%s\"\n", r);
+    if (strcmp (r, expected) != 0) {
+      fprintf (stderr, "test_upload_0: expected \"%s\" but got \"%s\"\n", expected, r);
       return -1;
     }
     free (r);
@@ -1690,6 +4223,15 @@ static int test_blockdev_rereadpt_0 (void)
 {
   /* InitEmpty for blockdev_rereadpt (0) */
   {
+    char device[] = "/dev/sda";
+    device[5] = devchar;
+    int r;
+    suppress_error = 0;
+    r = guestfs_blockdev_setrw (g, device);
+    if (r == -1)
+      return -1;
+  }
+  {
     int r;
     suppress_error = 0;
     r = guestfs_umount_all (g);
@@ -1705,9 +4247,11 @@ static int test_blockdev_rereadpt_0 (void)
   }
   /* TestRun for blockdev_rereadpt (0) */
   {
+    char device[] = "/dev/sda";
+    device[5] = devchar;
     int r;
     suppress_error = 0;
-    r = guestfs_blockdev_rereadpt (g, "/dev/sda");
+    r = guestfs_blockdev_rereadpt (g, device);
     if (r == -1)
       return -1;
   }
@@ -1718,6 +4262,15 @@ static int test_blockdev_flushbufs_0 (void)
 {
   /* InitEmpty for blockdev_flushbufs (0) */
   {
+    char device[] = "/dev/sda";
+    device[5] = devchar;
+    int r;
+    suppress_error = 0;
+    r = guestfs_blockdev_setrw (g, device);
+    if (r == -1)
+      return -1;
+  }
+  {
     int r;
     suppress_error = 0;
     r = guestfs_umount_all (g);
@@ -1733,9 +4286,11 @@ static int test_blockdev_flushbufs_0 (void)
   }
   /* TestRun for blockdev_flushbufs (0) */
   {
+    char device[] = "/dev/sda";
+    device[5] = devchar;
     int r;
     suppress_error = 0;
-    r = guestfs_blockdev_flushbufs (g, "/dev/sda");
+    r = guestfs_blockdev_flushbufs (g, device);
     if (r == -1)
       return -1;
   }
@@ -1746,6 +4301,15 @@ static int test_blockdev_getsize64_0 (void)
 {
   /* InitEmpty for blockdev_getsize64 (0) */
   {
+    char device[] = "/dev/sda";
+    device[5] = devchar;
+    int r;
+    suppress_error = 0;
+    r = guestfs_blockdev_setrw (g, device);
+    if (r == -1)
+      return -1;
+  }
+  {
     int r;
     suppress_error = 0;
     r = guestfs_umount_all (g);
@@ -1761,9 +4325,11 @@ static int test_blockdev_getsize64_0 (void)
   }
   /* TestOutputInt for blockdev_getsize64 (0) */
   {
+    char device[] = "/dev/sda";
+    device[5] = devchar;
     int64_t r;
     suppress_error = 0;
-    r = guestfs_blockdev_getsize64 (g, "/dev/sda");
+    r = guestfs_blockdev_getsize64 (g, device);
     if (r == -1)
       return -1;
     if (r != 524288000) {
@@ -1778,6 +4344,15 @@ static int test_blockdev_getsz_0 (void)
 {
   /* InitEmpty for blockdev_getsz (0) */
   {
+    char device[] = "/dev/sda";
+    device[5] = devchar;
+    int r;
+    suppress_error = 0;
+    r = guestfs_blockdev_setrw (g, device);
+    if (r == -1)
+      return -1;
+  }
+  {
     int r;
     suppress_error = 0;
     r = guestfs_umount_all (g);
@@ -1793,9 +4368,11 @@ static int test_blockdev_getsz_0 (void)
   }
   /* TestOutputInt for blockdev_getsz (0) */
   {
+    char device[] = "/dev/sda";
+    device[5] = devchar;
     int64_t r;
     suppress_error = 0;
-    r = guestfs_blockdev_getsz (g, "/dev/sda");
+    r = guestfs_blockdev_getsz (g, device);
     if (r == -1)
       return -1;
     if (r != 1024000) {
@@ -1810,6 +4387,15 @@ static int test_blockdev_getbsz_0 (void)
 {
   /* InitEmpty for blockdev_getbsz (0) */
   {
+    char device[] = "/dev/sda";
+    device[5] = devchar;
+    int r;
+    suppress_error = 0;
+    r = guestfs_blockdev_setrw (g, device);
+    if (r == -1)
+      return -1;
+  }
+  {
     int r;
     suppress_error = 0;
     r = guestfs_umount_all (g);
@@ -1825,9 +4411,11 @@ static int test_blockdev_getbsz_0 (void)
   }
   /* TestOutputInt for blockdev_getbsz (0) */
   {
+    char device[] = "/dev/sda";
+    device[5] = devchar;
     int r;
     suppress_error = 0;
-    r = guestfs_blockdev_getbsz (g, "/dev/sda");
+    r = guestfs_blockdev_getbsz (g, device);
     if (r == -1)
       return -1;
     if (r != 4096) {
@@ -1842,6 +4430,15 @@ static int test_blockdev_getss_0 (void)
 {
   /* InitEmpty for blockdev_getss (0) */
   {
+    char device[] = "/dev/sda";
+    device[5] = devchar;
+    int r;
+    suppress_error = 0;
+    r = guestfs_blockdev_setrw (g, device);
+    if (r == -1)
+      return -1;
+  }
+  {
     int r;
     suppress_error = 0;
     r = guestfs_umount_all (g);
@@ -1857,9 +4454,11 @@ static int test_blockdev_getss_0 (void)
   }
   /* TestOutputInt for blockdev_getss (0) */
   {
+    char device[] = "/dev/sda";
+    device[5] = devchar;
     int r;
     suppress_error = 0;
-    r = guestfs_blockdev_getss (g, "/dev/sda");
+    r = guestfs_blockdev_getss (g, device);
     if (r == -1)
       return -1;
     if (r != 512) {
@@ -1874,6 +4473,15 @@ static int test_blockdev_getro_0 (void)
 {
   /* InitEmpty for blockdev_getro (0) */
   {
+    char device[] = "/dev/sda";
+    device[5] = devchar;
+    int r;
+    suppress_error = 0;
+    r = guestfs_blockdev_setrw (g, device);
+    if (r == -1)
+      return -1;
+  }
+  {
     int r;
     suppress_error = 0;
     r = guestfs_umount_all (g);
@@ -1889,16 +4497,20 @@ static int test_blockdev_getro_0 (void)
   }
   /* TestOutputTrue for blockdev_getro (0) */
   {
+    char device[] = "/dev/sda";
+    device[5] = devchar;
     int r;
     suppress_error = 0;
-    r = guestfs_blockdev_setro (g, "/dev/sda");
+    r = guestfs_blockdev_setro (g, device);
     if (r == -1)
       return -1;
   }
   {
+    char device[] = "/dev/sda";
+    device[5] = devchar;
     int r;
     suppress_error = 0;
-    r = guestfs_blockdev_getro (g, "/dev/sda");
+    r = guestfs_blockdev_getro (g, device);
     if (r == -1)
       return -1;
     if (!r) {
@@ -1913,6 +4525,15 @@ static int test_blockdev_setrw_0 (void)
 {
   /* InitEmpty for blockdev_setrw (0) */
   {
+    char device[] = "/dev/sda";
+    device[5] = devchar;
+    int r;
+    suppress_error = 0;
+    r = guestfs_blockdev_setrw (g, device);
+    if (r == -1)
+      return -1;
+  }
+  {
     int r;
     suppress_error = 0;
     r = guestfs_umount_all (g);
@@ -1928,16 +4549,20 @@ static int test_blockdev_setrw_0 (void)
   }
   /* TestOutputFalse for blockdev_setrw (0) */
   {
+    char device[] = "/dev/sda";
+    device[5] = devchar;
     int r;
     suppress_error = 0;
-    r = guestfs_blockdev_setrw (g, "/dev/sda");
+    r = guestfs_blockdev_setrw (g, device);
     if (r == -1)
       return -1;
   }
   {
+    char device[] = "/dev/sda";
+    device[5] = devchar;
     int r;
     suppress_error = 0;
-    r = guestfs_blockdev_getro (g, "/dev/sda");
+    r = guestfs_blockdev_getro (g, device);
     if (r == -1)
       return -1;
     if (r) {
@@ -1952,6 +4577,15 @@ static int test_blockdev_setro_0 (void)
 {
   /* InitEmpty for blockdev_setro (0) */
   {
+    char device[] = "/dev/sda";
+    device[5] = devchar;
+    int r;
+    suppress_error = 0;
+    r = guestfs_blockdev_setrw (g, device);
+    if (r == -1)
+      return -1;
+  }
+  {
     int r;
     suppress_error = 0;
     r = guestfs_umount_all (g);
@@ -1967,16 +4601,20 @@ static int test_blockdev_setro_0 (void)
   }
   /* TestOutputTrue for blockdev_setro (0) */
   {
+    char device[] = "/dev/sda";
+    device[5] = devchar;
     int r;
     suppress_error = 0;
-    r = guestfs_blockdev_setro (g, "/dev/sda");
+    r = guestfs_blockdev_setro (g, device);
     if (r == -1)
       return -1;
   }
   {
+    char device[] = "/dev/sda";
+    device[5] = devchar;
     int r;
     suppress_error = 0;
-    r = guestfs_blockdev_getro (g, "/dev/sda");
+    r = guestfs_blockdev_getro (g, device);
     if (r == -1)
       return -1;
     if (!r) {
@@ -1991,6 +4629,15 @@ static int test_statvfs_0 (void)
 {
   /* InitBasicFS for statvfs (0): create ext2 on /dev/sda1 */
   {
+    char device[] = "/dev/sda";
+    device[5] = devchar;
+    int r;
+    suppress_error = 0;
+    r = guestfs_blockdev_setrw (g, device);
+    if (r == -1)
+      return -1;
+  }
+  {
     int r;
     suppress_error = 0;
     r = guestfs_umount_all (g);
@@ -2005,35 +4652,45 @@ static int test_statvfs_0 (void)
       return -1;
   }
   {
+    char device[] = "/dev/sda";
+    device[5] = devchar;
+    char lines_0[] = ",";
     char *lines[] = {
-      ",",
+      lines_0,
       NULL
     };
     int r;
     suppress_error = 0;
-    r = guestfs_sfdisk (g, "/dev/sda", 0, 0, 0, lines);
+    r = guestfs_sfdisk (g, device, 0, 0, 0, lines);
     if (r == -1)
       return -1;
   }
   {
+    char fstype[] = "ext2";
+    char device[] = "/dev/sda1";
+    device[5] = devchar;
     int r;
     suppress_error = 0;
-    r = guestfs_mkfs (g, "ext2", "/dev/sda1");
+    r = guestfs_mkfs (g, fstype, device);
     if (r == -1)
       return -1;
   }
   {
+    char device[] = "/dev/sda1";
+    device[5] = devchar;
+    char mountpoint[] = "/";
     int r;
     suppress_error = 0;
-    r = guestfs_mount (g, "/dev/sda1", "/");
+    r = guestfs_mount (g, device, mountpoint);
     if (r == -1)
       return -1;
   }
   /* TestOutputStruct for statvfs (0) */
   {
+    char path[] = "/";
     struct guestfs_statvfs *r;
     suppress_error = 0;
-    r = guestfs_statvfs (g, "/");
+    r = guestfs_statvfs (g, path);
     if (r == NULL)
       return -1;
     if (r->bfree != 487702) {
@@ -2056,9 +4713,190 @@ static int test_statvfs_0 (void)
   return 0;
 }
 
-static int test_lstat_0 (void)
+static int test_lstat_0 (void)
+{
+  /* InitBasicFS for lstat (0): create ext2 on /dev/sda1 */
+  {
+    char device[] = "/dev/sda";
+    device[5] = devchar;
+    int r;
+    suppress_error = 0;
+    r = guestfs_blockdev_setrw (g, device);
+    if (r == -1)
+      return -1;
+  }
+  {
+    int r;
+    suppress_error = 0;
+    r = guestfs_umount_all (g);
+    if (r == -1)
+      return -1;
+  }
+  {
+    int r;
+    suppress_error = 0;
+    r = guestfs_lvm_remove_all (g);
+    if (r == -1)
+      return -1;
+  }
+  {
+    char device[] = "/dev/sda";
+    device[5] = devchar;
+    char lines_0[] = ",";
+    char *lines[] = {
+      lines_0,
+      NULL
+    };
+    int r;
+    suppress_error = 0;
+    r = guestfs_sfdisk (g, device, 0, 0, 0, lines);
+    if (r == -1)
+      return -1;
+  }
+  {
+    char fstype[] = "ext2";
+    char device[] = "/dev/sda1";
+    device[5] = devchar;
+    int r;
+    suppress_error = 0;
+    r = guestfs_mkfs (g, fstype, device);
+    if (r == -1)
+      return -1;
+  }
+  {
+    char device[] = "/dev/sda1";
+    device[5] = devchar;
+    char mountpoint[] = "/";
+    int r;
+    suppress_error = 0;
+    r = guestfs_mount (g, device, mountpoint);
+    if (r == -1)
+      return -1;
+  }
+  /* TestOutputStruct for lstat (0) */
+  {
+    char path[] = "/new";
+    int r;
+    suppress_error = 0;
+    r = guestfs_touch (g, path);
+    if (r == -1)
+      return -1;
+  }
+  {
+    char path[] = "/new";
+    struct guestfs_stat *r;
+    suppress_error = 0;
+    r = guestfs_lstat (g, path);
+    if (r == NULL)
+      return -1;
+    if (r->size != 0) {
+      fprintf (stderr, "test_lstat_0: size was %d, expected 0\n",
+               (int) r->size);
+      return -1;
+    }
+    free (r);
+  }
+  return 0;
+}
+
+static int test_stat_0 (void)
+{
+  /* InitBasicFS for stat (0): create ext2 on /dev/sda1 */
+  {
+    char device[] = "/dev/sda";
+    device[5] = devchar;
+    int r;
+    suppress_error = 0;
+    r = guestfs_blockdev_setrw (g, device);
+    if (r == -1)
+      return -1;
+  }
+  {
+    int r;
+    suppress_error = 0;
+    r = guestfs_umount_all (g);
+    if (r == -1)
+      return -1;
+  }
+  {
+    int r;
+    suppress_error = 0;
+    r = guestfs_lvm_remove_all (g);
+    if (r == -1)
+      return -1;
+  }
+  {
+    char device[] = "/dev/sda";
+    device[5] = devchar;
+    char lines_0[] = ",";
+    char *lines[] = {
+      lines_0,
+      NULL
+    };
+    int r;
+    suppress_error = 0;
+    r = guestfs_sfdisk (g, device, 0, 0, 0, lines);
+    if (r == -1)
+      return -1;
+  }
+  {
+    char fstype[] = "ext2";
+    char device[] = "/dev/sda1";
+    device[5] = devchar;
+    int r;
+    suppress_error = 0;
+    r = guestfs_mkfs (g, fstype, device);
+    if (r == -1)
+      return -1;
+  }
+  {
+    char device[] = "/dev/sda1";
+    device[5] = devchar;
+    char mountpoint[] = "/";
+    int r;
+    suppress_error = 0;
+    r = guestfs_mount (g, device, mountpoint);
+    if (r == -1)
+      return -1;
+  }
+  /* TestOutputStruct for stat (0) */
+  {
+    char path[] = "/new";
+    int r;
+    suppress_error = 0;
+    r = guestfs_touch (g, path);
+    if (r == -1)
+      return -1;
+  }
+  {
+    char path[] = "/new";
+    struct guestfs_stat *r;
+    suppress_error = 0;
+    r = guestfs_stat (g, path);
+    if (r == NULL)
+      return -1;
+    if (r->size != 0) {
+      fprintf (stderr, "test_stat_0: size was %d, expected 0\n",
+               (int) r->size);
+      return -1;
+    }
+    free (r);
+  }
+  return 0;
+}
+
+static int test_file_0 (void)
 {
-  /* InitBasicFS for lstat (0): create ext2 on /dev/sda1 */
+  /* InitBasicFS for file (0): create ext2 on /dev/sda1 */
+  {
+    char device[] = "/dev/sda";
+    device[5] = devchar;
+    int r;
+    suppress_error = 0;
+    r = guestfs_blockdev_setrw (g, device);
+    if (r == -1)
+      return -1;
+  }
   {
     int r;
     suppress_error = 0;
@@ -2074,47 +4912,58 @@ static int test_lstat_0 (void)
       return -1;
   }
   {
+    char device[] = "/dev/sda";
+    device[5] = devchar;
+    char lines_0[] = ",";
     char *lines[] = {
-      ",",
+      lines_0,
       NULL
     };
     int r;
     suppress_error = 0;
-    r = guestfs_sfdisk (g, "/dev/sda", 0, 0, 0, lines);
+    r = guestfs_sfdisk (g, device, 0, 0, 0, lines);
     if (r == -1)
       return -1;
   }
   {
+    char fstype[] = "ext2";
+    char device[] = "/dev/sda1";
+    device[5] = devchar;
     int r;
     suppress_error = 0;
-    r = guestfs_mkfs (g, "ext2", "/dev/sda1");
+    r = guestfs_mkfs (g, fstype, device);
     if (r == -1)
       return -1;
   }
   {
+    char device[] = "/dev/sda1";
+    device[5] = devchar;
+    char mountpoint[] = "/";
     int r;
     suppress_error = 0;
-    r = guestfs_mount (g, "/dev/sda1", "/");
+    r = guestfs_mount (g, device, mountpoint);
     if (r == -1)
       return -1;
   }
-  /* TestOutputStruct for lstat (0) */
+  /* TestOutput for file (0) */
+  char expected[] = "empty";
   {
+    char path[] = "/new";
     int r;
     suppress_error = 0;
-    r = guestfs_touch (g, "/new");
+    r = guestfs_touch (g, path);
     if (r == -1)
       return -1;
   }
   {
-    struct guestfs_stat *r;
+    char path[] = "/new";
+    char *r;
     suppress_error = 0;
-    r = guestfs_lstat (g, "/new");
+    r = guestfs_file (g, path);
     if (r == NULL)
       return -1;
-    if (r->size != 0) {
-      fprintf (stderr, "test_lstat_0: size was %d, expected 0\n",
-               (int) r->size);
+    if (strcmp (r, expected) != 0) {
+      fprintf (stderr, "test_file_0: expected \"%s\" but got \"%s\"\n", expected, r);
       return -1;
     }
     free (r);
@@ -2122,9 +4971,18 @@ static int test_lstat_0 (void)
   return 0;
 }
 
-static int test_stat_0 (void)
+static int test_file_1 (void)
 {
-  /* InitBasicFS for stat (0): create ext2 on /dev/sda1 */
+  /* InitBasicFS for file (1): create ext2 on /dev/sda1 */
+  {
+    char device[] = "/dev/sda";
+    device[5] = devchar;
+    int r;
+    suppress_error = 0;
+    r = guestfs_blockdev_setrw (g, device);
+    if (r == -1)
+      return -1;
+  }
   {
     int r;
     suppress_error = 0;
@@ -2140,47 +4998,59 @@ static int test_stat_0 (void)
       return -1;
   }
   {
+    char device[] = "/dev/sda";
+    device[5] = devchar;
+    char lines_0[] = ",";
     char *lines[] = {
-      ",",
+      lines_0,
       NULL
     };
     int r;
     suppress_error = 0;
-    r = guestfs_sfdisk (g, "/dev/sda", 0, 0, 0, lines);
+    r = guestfs_sfdisk (g, device, 0, 0, 0, lines);
     if (r == -1)
       return -1;
   }
   {
+    char fstype[] = "ext2";
+    char device[] = "/dev/sda1";
+    device[5] = devchar;
     int r;
     suppress_error = 0;
-    r = guestfs_mkfs (g, "ext2", "/dev/sda1");
+    r = guestfs_mkfs (g, fstype, device);
     if (r == -1)
       return -1;
   }
   {
+    char device[] = "/dev/sda1";
+    device[5] = devchar;
+    char mountpoint[] = "/";
     int r;
     suppress_error = 0;
-    r = guestfs_mount (g, "/dev/sda1", "/");
+    r = guestfs_mount (g, device, mountpoint);
     if (r == -1)
       return -1;
   }
-  /* TestOutputStruct for stat (0) */
+  /* TestOutput for file (1) */
+  char expected[] = "ASCII text";
   {
+    char path[] = "/new";
+    char content[] = "some content\n";
     int r;
     suppress_error = 0;
-    r = guestfs_touch (g, "/new");
+    r = guestfs_write_file (g, path, content, 0);
     if (r == -1)
       return -1;
   }
   {
-    struct guestfs_stat *r;
+    char path[] = "/new";
+    char *r;
     suppress_error = 0;
-    r = guestfs_stat (g, "/new");
+    r = guestfs_file (g, path);
     if (r == NULL)
       return -1;
-    if (r->size != 0) {
-      fprintf (stderr, "test_stat_0: size was %d, expected 0\n",
-               (int) r->size);
+    if (strcmp (r, expected) != 0) {
+      fprintf (stderr, "test_file_1: expected \"%s\" but got \"%s\"\n", expected, r);
       return -1;
     }
     free (r);
@@ -2188,74 +5058,91 @@ static int test_stat_0 (void)
   return 0;
 }
 
-static int test_file_0 (void)
+static int test_file_2 (void)
 {
-  /* InitBasicFS for file (0): create ext2 on /dev/sda1 */
+  /* InitBasicFS for file (2): create ext2 on /dev/sda1 */
   {
+    char device[] = "/dev/sda";
+    device[5] = devchar;
     int r;
     suppress_error = 0;
-    r = guestfs_umount_all (g);
+    r = guestfs_blockdev_setrw (g, device);
     if (r == -1)
       return -1;
   }
   {
     int r;
     suppress_error = 0;
-    r = guestfs_lvm_remove_all (g);
+    r = guestfs_umount_all (g);
     if (r == -1)
       return -1;
   }
   {
-    char *lines[] = {
-      ",",
-      NULL
-    };
     int r;
     suppress_error = 0;
-    r = guestfs_sfdisk (g, "/dev/sda", 0, 0, 0, lines);
+    r = guestfs_lvm_remove_all (g);
     if (r == -1)
       return -1;
   }
   {
+    char device[] = "/dev/sda";
+    device[5] = devchar;
+    char lines_0[] = ",";
+    char *lines[] = {
+      lines_0,
+      NULL
+    };
     int r;
     suppress_error = 0;
-    r = guestfs_mkfs (g, "ext2", "/dev/sda1");
+    r = guestfs_sfdisk (g, device, 0, 0, 0, lines);
     if (r == -1)
       return -1;
   }
   {
+    char fstype[] = "ext2";
+    char device[] = "/dev/sda1";
+    device[5] = devchar;
     int r;
     suppress_error = 0;
-    r = guestfs_mount (g, "/dev/sda1", "/");
+    r = guestfs_mkfs (g, fstype, device);
     if (r == -1)
       return -1;
   }
-  /* TestOutput for file (0) */
   {
+    char device[] = "/dev/sda1";
+    device[5] = devchar;
+    char mountpoint[] = "/";
     int r;
     suppress_error = 0;
-    r = guestfs_touch (g, "/new");
+    r = guestfs_mount (g, device, mountpoint);
     if (r == -1)
       return -1;
   }
+  /* TestLastFail for file (2) */
   {
+    char path[] = "/nofile";
     char *r;
-    suppress_error = 0;
-    r = guestfs_file (g, "/new");
-    if (r == NULL)
-      return -1;
-    if (strcmp (r, "empty") != 0) {
-      fprintf (stderr, "test_file_0: expected \"empty\" but got \"%s\"\n", r);
+    suppress_error = 1;
+    r = guestfs_file (g, path);
+    if (r != NULL)
       return -1;
-    }
     free (r);
   }
   return 0;
 }
 
-static int test_file_1 (void)
+static int test_umount_all_0 (void)
 {
-  /* InitBasicFS for file (1): create ext2 on /dev/sda1 */
+  /* InitBasicFS for umount_all (0): create ext2 on /dev/sda1 */
+  {
+    char device[] = "/dev/sda";
+    device[5] = devchar;
+    int r;
+    suppress_error = 0;
+    r = guestfs_blockdev_setrw (g, device);
+    if (r == -1)
+      return -1;
+  }
   {
     int r;
     suppress_error = 0;
@@ -2271,56 +5158,78 @@ static int test_file_1 (void)
       return -1;
   }
   {
+    char device[] = "/dev/sda";
+    device[5] = devchar;
+    char lines_0[] = ",";
     char *lines[] = {
-      ",",
+      lines_0,
       NULL
     };
     int r;
     suppress_error = 0;
-    r = guestfs_sfdisk (g, "/dev/sda", 0, 0, 0, lines);
+    r = guestfs_sfdisk (g, device, 0, 0, 0, lines);
     if (r == -1)
       return -1;
   }
   {
+    char fstype[] = "ext2";
+    char device[] = "/dev/sda1";
+    device[5] = devchar;
     int r;
     suppress_error = 0;
-    r = guestfs_mkfs (g, "ext2", "/dev/sda1");
+    r = guestfs_mkfs (g, fstype, device);
     if (r == -1)
       return -1;
   }
   {
+    char device[] = "/dev/sda1";
+    device[5] = devchar;
+    char mountpoint[] = "/";
     int r;
     suppress_error = 0;
-    r = guestfs_mount (g, "/dev/sda1", "/");
+    r = guestfs_mount (g, device, mountpoint);
     if (r == -1)
       return -1;
   }
-  /* TestOutput for file (1) */
+  /* TestOutputList for umount_all (0) */
   {
     int r;
     suppress_error = 0;
-    r = guestfs_write_file (g, "/new", "some content\n", 0);
+    r = guestfs_umount_all (g);
     if (r == -1)
       return -1;
   }
   {
-    char *r;
+    char **r;
+    int i;
     suppress_error = 0;
-    r = guestfs_file (g, "/new");
+    r = guestfs_mounts (g);
     if (r == NULL)
       return -1;
-    if (strcmp (r, "ASCII text") != 0) {
-      fprintf (stderr, "test_file_1: expected \"ASCII text\" but got \"%s\"\n", r);
+    if (r[0] != NULL) {
+      fprintf (stderr, "test_umount_all_0: extra elements returned from command\n");
+      print_strings (r);
       return -1;
     }
+    for (i = 0; r[i] != NULL; ++i)
+      free (r[i]);
     free (r);
   }
   return 0;
 }
 
-static int test_file_2 (void)
+static int test_umount_all_1 (void)
 {
-  /* InitBasicFS for file (2): create ext2 on /dev/sda1 */
+  /* InitEmpty for umount_all (1) */
+  {
+    char device[] = "/dev/sda";
+    device[5] = devchar;
+    int r;
+    suppress_error = 0;
+    r = guestfs_blockdev_setrw (g, device);
+    if (r == -1)
+      return -1;
+  }
   {
     int r;
     suppress_error = 0;
@@ -2335,86 +5244,109 @@ static int test_file_2 (void)
     if (r == -1)
       return -1;
   }
+  /* TestOutputList for umount_all (1) */
   {
+    char device[] = "/dev/sda";
+    device[5] = devchar;
+    char lines_0[] = ",10";
+    char lines_1[] = ",20";
+    char lines_2[] = ",";
     char *lines[] = {
-      ",",
+      lines_0,
+      lines_1,
+      lines_2,
       NULL
     };
     int r;
     suppress_error = 0;
-    r = guestfs_sfdisk (g, "/dev/sda", 0, 0, 0, lines);
+    r = guestfs_sfdisk (g, device, 0, 0, 0, lines);
     if (r == -1)
       return -1;
   }
   {
+    char fstype[] = "ext2";
+    char device[] = "/dev/sda1";
+    device[5] = devchar;
     int r;
     suppress_error = 0;
-    r = guestfs_mkfs (g, "ext2", "/dev/sda1");
+    r = guestfs_mkfs (g, fstype, device);
     if (r == -1)
       return -1;
   }
   {
+    char fstype[] = "ext2";
+    char device[] = "/dev/sda2";
+    device[5] = devchar;
     int r;
     suppress_error = 0;
-    r = guestfs_mount (g, "/dev/sda1", "/");
+    r = guestfs_mkfs (g, fstype, device);
     if (r == -1)
       return -1;
   }
-  /* TestLastFail for file (2) */
   {
-    char *r;
-    suppress_error = 1;
-    r = guestfs_file (g, "/nofile");
-    if (r != NULL)
+    char fstype[] = "ext2";
+    char device[] = "/dev/sda3";
+    device[5] = devchar;
+    int r;
+    suppress_error = 0;
+    r = guestfs_mkfs (g, fstype, device);
+    if (r == -1)
       return -1;
-    free (r);
   }
-  return 0;
-}
-
-static int test_umount_all_0 (void)
-{
-  /* InitBasicFS for umount_all (0): create ext2 on /dev/sda1 */
   {
+    char device[] = "/dev/sda1";
+    device[5] = devchar;
+    char mountpoint[] = "/";
     int r;
     suppress_error = 0;
-    r = guestfs_umount_all (g);
+    r = guestfs_mount (g, device, mountpoint);
     if (r == -1)
       return -1;
   }
   {
+    char path[] = "/mp1";
     int r;
     suppress_error = 0;
-    r = guestfs_lvm_remove_all (g);
+    r = guestfs_mkdir (g, path);
     if (r == -1)
       return -1;
   }
   {
-    char *lines[] = {
-      ",",
-      NULL
-    };
+    char device[] = "/dev/sda2";
+    device[5] = devchar;
+    char mountpoint[] = "/mp1";
     int r;
     suppress_error = 0;
-    r = guestfs_sfdisk (g, "/dev/sda", 0, 0, 0, lines);
+    r = guestfs_mount (g, device, mountpoint);
     if (r == -1)
       return -1;
   }
   {
+    char path[] = "/mp1/mp2";
     int r;
     suppress_error = 0;
-    r = guestfs_mkfs (g, "ext2", "/dev/sda1");
+    r = guestfs_mkdir (g, path);
     if (r == -1)
       return -1;
   }
   {
+    char device[] = "/dev/sda3";
+    device[5] = devchar;
+    char mountpoint[] = "/mp1/mp2";
     int r;
     suppress_error = 0;
-    r = guestfs_mount (g, "/dev/sda1", "/");
+    r = guestfs_mount (g, device, mountpoint);
+    if (r == -1)
+      return -1;
+  }
+  {
+    char path[] = "/mp1/mp2/mp3";
+    int r;
+    suppress_error = 0;
+    r = guestfs_mkdir (g, path);
     if (r == -1)
       return -1;
   }
-  /* TestOutputList for umount_all (0) */
   {
     int r;
     suppress_error = 0;
@@ -2430,7 +5362,7 @@ static int test_umount_all_0 (void)
     if (r == NULL)
       return -1;
     if (r[0] != NULL) {
-      fprintf (stderr, "test_umount_all_0: extra elements returned from command\n");
+      fprintf (stderr, "test_umount_all_1: extra elements returned from command\n");
       print_strings (r);
       return -1;
     }
@@ -2445,6 +5377,15 @@ static int test_mounts_0 (void)
 {
   /* InitBasicFS for mounts (0): create ext2 on /dev/sda1 */
   {
+    char device[] = "/dev/sda";
+    device[5] = devchar;
+    int r;
+    suppress_error = 0;
+    r = guestfs_blockdev_setrw (g, device);
+    if (r == -1)
+      return -1;
+  }
+  {
     int r;
     suppress_error = 0;
     r = guestfs_umount_all (g);
@@ -2459,27 +5400,36 @@ static int test_mounts_0 (void)
       return -1;
   }
   {
+    char device[] = "/dev/sda";
+    device[5] = devchar;
+    char lines_0[] = ",";
     char *lines[] = {
-      ",",
+      lines_0,
       NULL
     };
     int r;
     suppress_error = 0;
-    r = guestfs_sfdisk (g, "/dev/sda", 0, 0, 0, lines);
+    r = guestfs_sfdisk (g, device, 0, 0, 0, lines);
     if (r == -1)
       return -1;
   }
   {
+    char fstype[] = "ext2";
+    char device[] = "/dev/sda1";
+    device[5] = devchar;
     int r;
     suppress_error = 0;
-    r = guestfs_mkfs (g, "ext2", "/dev/sda1");
+    r = guestfs_mkfs (g, fstype, device);
     if (r == -1)
       return -1;
   }
   {
+    char device[] = "/dev/sda1";
+    device[5] = devchar;
+    char mountpoint[] = "/";
     int r;
     suppress_error = 0;
-    r = guestfs_mount (g, "/dev/sda1", "/");
+    r = guestfs_mount (g, device, mountpoint);
     if (r == -1)
       return -1;
   }
@@ -2496,9 +5446,13 @@ static int test_mounts_0 (void)
       print_strings (r);
       return -1;
     }
-    if (strcmp (r[0], "/dev/sda1") != 0) {
-      fprintf (stderr, "test_mounts_0: expected \"/dev/sda1\" but got \"%s\"\n", r[0]);
-      return -1;
+    {
+      char expected[] = "/dev/sda1";
+      expected[5] = devchar;
+      if (strcmp (r[0], expected) != 0) {
+        fprintf (stderr, "test_mounts_0: expected \"%s\" but got \"%s\"\n", expected, r[0]);
+        return -1;
+      }
     }
     if (r[1] != NULL) {
       fprintf (stderr, "test_mounts_0: extra elements returned from command\n");
@@ -2516,6 +5470,15 @@ static int test_umount_0 (void)
 {
   /* InitEmpty for umount (0) */
   {
+    char device[] = "/dev/sda";
+    device[5] = devchar;
+    int r;
+    suppress_error = 0;
+    r = guestfs_blockdev_setrw (g, device);
+    if (r == -1)
+      return -1;
+  }
+  {
     int r;
     suppress_error = 0;
     r = guestfs_umount_all (g);
@@ -2531,27 +5494,36 @@ static int test_umount_0 (void)
   }
   /* TestOutputList for umount (0) */
   {
+    char device[] = "/dev/sda";
+    device[5] = devchar;
+    char lines_0[] = ",";
     char *lines[] = {
-      ",",
+      lines_0,
       NULL
     };
     int r;
     suppress_error = 0;
-    r = guestfs_sfdisk (g, "/dev/sda", 0, 0, 0, lines);
+    r = guestfs_sfdisk (g, device, 0, 0, 0, lines);
     if (r == -1)
       return -1;
   }
   {
+    char fstype[] = "ext2";
+    char device[] = "/dev/sda1";
+    device[5] = devchar;
     int r;
     suppress_error = 0;
-    r = guestfs_mkfs (g, "ext2", "/dev/sda1");
+    r = guestfs_mkfs (g, fstype, device);
     if (r == -1)
       return -1;
   }
   {
+    char device[] = "/dev/sda1";
+    device[5] = devchar;
+    char mountpoint[] = "/";
     int r;
     suppress_error = 0;
-    r = guestfs_mount (g, "/dev/sda1", "/");
+    r = guestfs_mount (g, device, mountpoint);
     if (r == -1)
       return -1;
   }
@@ -2567,9 +5539,13 @@ static int test_umount_0 (void)
       print_strings (r);
       return -1;
     }
-    if (strcmp (r[0], "/dev/sda1") != 0) {
-      fprintf (stderr, "test_umount_0: expected \"/dev/sda1\" but got \"%s\"\n", r[0]);
-      return -1;
+    {
+      char expected[] = "/dev/sda1";
+      expected[5] = devchar;
+      if (strcmp (r[0], expected) != 0) {
+        fprintf (stderr, "test_umount_0: expected \"%s\" but got \"%s\"\n", expected, r[0]);
+        return -1;
+      }
     }
     if (r[1] != NULL) {
       fprintf (stderr, "test_umount_0: extra elements returned from command\n");
@@ -2587,6 +5563,15 @@ static int test_umount_1 (void)
 {
   /* InitEmpty for umount (1) */
   {
+    char device[] = "/dev/sda";
+    device[5] = devchar;
+    int r;
+    suppress_error = 0;
+    r = guestfs_blockdev_setrw (g, device);
+    if (r == -1)
+      return -1;
+  }
+  {
     int r;
     suppress_error = 0;
     r = guestfs_umount_all (g);
@@ -2602,34 +5587,44 @@ static int test_umount_1 (void)
   }
   /* TestOutputList for umount (1) */
   {
+    char device[] = "/dev/sda";
+    device[5] = devchar;
+    char lines_0[] = ",";
     char *lines[] = {
-      ",",
+      lines_0,
       NULL
     };
     int r;
     suppress_error = 0;
-    r = guestfs_sfdisk (g, "/dev/sda", 0, 0, 0, lines);
+    r = guestfs_sfdisk (g, device, 0, 0, 0, lines);
     if (r == -1)
       return -1;
   }
   {
+    char fstype[] = "ext2";
+    char device[] = "/dev/sda1";
+    device[5] = devchar;
     int r;
     suppress_error = 0;
-    r = guestfs_mkfs (g, "ext2", "/dev/sda1");
+    r = guestfs_mkfs (g, fstype, device);
     if (r == -1)
       return -1;
   }
   {
+    char device[] = "/dev/sda1";
+    device[5] = devchar;
+    char mountpoint[] = "/";
     int r;
     suppress_error = 0;
-    r = guestfs_mount (g, "/dev/sda1", "/");
+    r = guestfs_mount (g, device, mountpoint);
     if (r == -1)
       return -1;
   }
   {
+    char pathordevice[] = "/";
     int r;
     suppress_error = 0;
-    r = guestfs_umount (g, "/");
+    r = guestfs_umount (g, pathordevice);
     if (r == -1)
       return -1;
   }
@@ -2656,6 +5651,15 @@ static int test_write_file_0 (void)
 {
   /* InitBasicFS for write_file (0): create ext2 on /dev/sda1 */
   {
+    char device[] = "/dev/sda";
+    device[5] = devchar;
+    int r;
+    suppress_error = 0;
+    r = guestfs_blockdev_setrw (g, device);
+    if (r == -1)
+      return -1;
+  }
+  {
     int r;
     suppress_error = 0;
     r = guestfs_umount_all (g);
@@ -2670,46 +5674,59 @@ static int test_write_file_0 (void)
       return -1;
   }
   {
+    char device[] = "/dev/sda";
+    device[5] = devchar;
+    char lines_0[] = ",";
     char *lines[] = {
-      ",",
+      lines_0,
       NULL
     };
     int r;
     suppress_error = 0;
-    r = guestfs_sfdisk (g, "/dev/sda", 0, 0, 0, lines);
+    r = guestfs_sfdisk (g, device, 0, 0, 0, lines);
     if (r == -1)
       return -1;
   }
   {
+    char fstype[] = "ext2";
+    char device[] = "/dev/sda1";
+    device[5] = devchar;
     int r;
     suppress_error = 0;
-    r = guestfs_mkfs (g, "ext2", "/dev/sda1");
+    r = guestfs_mkfs (g, fstype, device);
     if (r == -1)
       return -1;
   }
   {
+    char device[] = "/dev/sda1";
+    device[5] = devchar;
+    char mountpoint[] = "/";
     int r;
     suppress_error = 0;
-    r = guestfs_mount (g, "/dev/sda1", "/");
+    r = guestfs_mount (g, device, mountpoint);
     if (r == -1)
       return -1;
   }
   /* TestOutput for write_file (0) */
+  char expected[] = "new file contents";
   {
+    char path[] = "/new";
+    char content[] = "new file contents";
     int r;
     suppress_error = 0;
-    r = guestfs_write_file (g, "/new", "new file contents", 0);
+    r = guestfs_write_file (g, path, content, 0);
     if (r == -1)
       return -1;
   }
   {
+    char path[] = "/new";
     char *r;
     suppress_error = 0;
-    r = guestfs_cat (g, "/new");
+    r = guestfs_cat (g, path);
     if (r == NULL)
       return -1;
-    if (strcmp (r, "new file contents") != 0) {
-      fprintf (stderr, "test_write_file_0: expected \"new file contents\" but got \"%s\"\n", r);
+    if (strcmp (r, expected) != 0) {
+      fprintf (stderr, "test_write_file_0: expected \"%s\" but got \"%s\"\n", expected, r);
       return -1;
     }
     free (r);
@@ -2721,6 +5738,15 @@ static int test_write_file_1 (void)
 {
   /* InitBasicFS for write_file (1): create ext2 on /dev/sda1 */
   {
+    char device[] = "/dev/sda";
+    device[5] = devchar;
+    int r;
+    suppress_error = 0;
+    r = guestfs_blockdev_setrw (g, device);
+    if (r == -1)
+      return -1;
+  }
+  {
     int r;
     suppress_error = 0;
     r = guestfs_umount_all (g);
@@ -2735,46 +5761,59 @@ static int test_write_file_1 (void)
       return -1;
   }
   {
+    char device[] = "/dev/sda";
+    device[5] = devchar;
+    char lines_0[] = ",";
     char *lines[] = {
-      ",",
+      lines_0,
       NULL
     };
     int r;
     suppress_error = 0;
-    r = guestfs_sfdisk (g, "/dev/sda", 0, 0, 0, lines);
+    r = guestfs_sfdisk (g, device, 0, 0, 0, lines);
     if (r == -1)
       return -1;
   }
   {
+    char fstype[] = "ext2";
+    char device[] = "/dev/sda1";
+    device[5] = devchar;
     int r;
     suppress_error = 0;
-    r = guestfs_mkfs (g, "ext2", "/dev/sda1");
+    r = guestfs_mkfs (g, fstype, device);
     if (r == -1)
       return -1;
   }
   {
+    char device[] = "/dev/sda1";
+    device[5] = devchar;
+    char mountpoint[] = "/";
     int r;
     suppress_error = 0;
-    r = guestfs_mount (g, "/dev/sda1", "/");
+    r = guestfs_mount (g, device, mountpoint);
     if (r == -1)
       return -1;
   }
   /* TestOutput for write_file (1) */
+  char expected[] = "\nnew file contents\n";
   {
+    char path[] = "/new";
+    char content[] = "\nnew file contents\n";
     int r;
     suppress_error = 0;
-    r = guestfs_write_file (g, "/new", "\nnew file contents\n", 0);
+    r = guestfs_write_file (g, path, content, 0);
     if (r == -1)
       return -1;
   }
   {
+    char path[] = "/new";
     char *r;
     suppress_error = 0;
-    r = guestfs_cat (g, "/new");
+    r = guestfs_cat (g, path);
     if (r == NULL)
       return -1;
-    if (strcmp (r, "\nnew file contents\n") != 0) {
-      fprintf (stderr, "test_write_file_1: expected \"\nnew file contents\n\" but got \"%s\"\n", r);
+    if (strcmp (r, expected) != 0) {
+      fprintf (stderr, "test_write_file_1: expected \"%s\" but got \"%s\"\n", expected, r);
       return -1;
     }
     free (r);
@@ -2786,6 +5825,15 @@ static int test_write_file_2 (void)
 {
   /* InitBasicFS for write_file (2): create ext2 on /dev/sda1 */
   {
+    char device[] = "/dev/sda";
+    device[5] = devchar;
+    int r;
+    suppress_error = 0;
+    r = guestfs_blockdev_setrw (g, device);
+    if (r == -1)
+      return -1;
+  }
+  {
     int r;
     suppress_error = 0;
     r = guestfs_umount_all (g);
@@ -2800,46 +5848,59 @@ static int test_write_file_2 (void)
       return -1;
   }
   {
+    char device[] = "/dev/sda";
+    device[5] = devchar;
+    char lines_0[] = ",";
     char *lines[] = {
-      ",",
+      lines_0,
       NULL
     };
     int r;
     suppress_error = 0;
-    r = guestfs_sfdisk (g, "/dev/sda", 0, 0, 0, lines);
+    r = guestfs_sfdisk (g, device, 0, 0, 0, lines);
     if (r == -1)
       return -1;
   }
   {
+    char fstype[] = "ext2";
+    char device[] = "/dev/sda1";
+    device[5] = devchar;
     int r;
     suppress_error = 0;
-    r = guestfs_mkfs (g, "ext2", "/dev/sda1");
+    r = guestfs_mkfs (g, fstype, device);
     if (r == -1)
       return -1;
   }
   {
+    char device[] = "/dev/sda1";
+    device[5] = devchar;
+    char mountpoint[] = "/";
     int r;
     suppress_error = 0;
-    r = guestfs_mount (g, "/dev/sda1", "/");
+    r = guestfs_mount (g, device, mountpoint);
     if (r == -1)
       return -1;
   }
   /* TestOutput for write_file (2) */
+  char expected[] = "\n\n";
   {
+    char path[] = "/new";
+    char content[] = "\n\n";
     int r;
     suppress_error = 0;
-    r = guestfs_write_file (g, "/new", "\n\n", 0);
+    r = guestfs_write_file (g, path, content, 0);
     if (r == -1)
       return -1;
   }
   {
+    char path[] = "/new";
     char *r;
     suppress_error = 0;
-    r = guestfs_cat (g, "/new");
+    r = guestfs_cat (g, path);
     if (r == NULL)
       return -1;
-    if (strcmp (r, "\n\n") != 0) {
-      fprintf (stderr, "test_write_file_2: expected \"\n\n\" but got \"%s\"\n", r);
+    if (strcmp (r, expected) != 0) {
+      fprintf (stderr, "test_write_file_2: expected \"%s\" but got \"%s\"\n", expected, r);
       return -1;
     }
     free (r);
@@ -2851,6 +5912,15 @@ static int test_write_file_3 (void)
 {
   /* InitBasicFS for write_file (3): create ext2 on /dev/sda1 */
   {
+    char device[] = "/dev/sda";
+    device[5] = devchar;
+    int r;
+    suppress_error = 0;
+    r = guestfs_blockdev_setrw (g, device);
+    if (r == -1)
+      return -1;
+  }
+  {
     int r;
     suppress_error = 0;
     r = guestfs_umount_all (g);
@@ -2865,46 +5935,59 @@ static int test_write_file_3 (void)
       return -1;
   }
   {
+    char device[] = "/dev/sda";
+    device[5] = devchar;
+    char lines_0[] = ",";
     char *lines[] = {
-      ",",
+      lines_0,
       NULL
     };
     int r;
     suppress_error = 0;
-    r = guestfs_sfdisk (g, "/dev/sda", 0, 0, 0, lines);
+    r = guestfs_sfdisk (g, device, 0, 0, 0, lines);
     if (r == -1)
       return -1;
   }
   {
+    char fstype[] = "ext2";
+    char device[] = "/dev/sda1";
+    device[5] = devchar;
     int r;
     suppress_error = 0;
-    r = guestfs_mkfs (g, "ext2", "/dev/sda1");
+    r = guestfs_mkfs (g, fstype, device);
     if (r == -1)
       return -1;
   }
   {
+    char device[] = "/dev/sda1";
+    device[5] = devchar;
+    char mountpoint[] = "/";
     int r;
     suppress_error = 0;
-    r = guestfs_mount (g, "/dev/sda1", "/");
+    r = guestfs_mount (g, device, mountpoint);
     if (r == -1)
       return -1;
   }
   /* TestOutput for write_file (3) */
+  char expected[] = "";
   {
+    char path[] = "/new";
+    char content[] = "";
     int r;
     suppress_error = 0;
-    r = guestfs_write_file (g, "/new", "", 0);
+    r = guestfs_write_file (g, path, content, 0);
     if (r == -1)
       return -1;
   }
   {
+    char path[] = "/new";
     char *r;
     suppress_error = 0;
-    r = guestfs_cat (g, "/new");
+    r = guestfs_cat (g, path);
     if (r == NULL)
       return -1;
-    if (strcmp (r, "") != 0) {
-      fprintf (stderr, "test_write_file_3: expected \"\" but got \"%s\"\n", r);
+    if (strcmp (r, expected) != 0) {
+      fprintf (stderr, "test_write_file_3: expected \"%s\" but got \"%s\"\n", expected, r);
       return -1;
     }
     free (r);
@@ -2916,6 +5999,15 @@ static int test_write_file_4 (void)
 {
   /* InitBasicFS for write_file (4): create ext2 on /dev/sda1 */
   {
+    char device[] = "/dev/sda";
+    device[5] = devchar;
+    int r;
+    suppress_error = 0;
+    r = guestfs_blockdev_setrw (g, device);
+    if (r == -1)
+      return -1;
+  }
+  {
     int r;
     suppress_error = 0;
     r = guestfs_umount_all (g);
@@ -2930,46 +6022,59 @@ static int test_write_file_4 (void)
       return -1;
   }
   {
+    char device[] = "/dev/sda";
+    device[5] = devchar;
+    char lines_0[] = ",";
     char *lines[] = {
-      ",",
+      lines_0,
       NULL
     };
     int r;
     suppress_error = 0;
-    r = guestfs_sfdisk (g, "/dev/sda", 0, 0, 0, lines);
+    r = guestfs_sfdisk (g, device, 0, 0, 0, lines);
     if (r == -1)
       return -1;
   }
   {
+    char fstype[] = "ext2";
+    char device[] = "/dev/sda1";
+    device[5] = devchar;
     int r;
     suppress_error = 0;
-    r = guestfs_mkfs (g, "ext2", "/dev/sda1");
+    r = guestfs_mkfs (g, fstype, device);
     if (r == -1)
       return -1;
   }
   {
+    char device[] = "/dev/sda1";
+    device[5] = devchar;
+    char mountpoint[] = "/";
     int r;
     suppress_error = 0;
-    r = guestfs_mount (g, "/dev/sda1", "/");
+    r = guestfs_mount (g, device, mountpoint);
     if (r == -1)
       return -1;
   }
   /* TestOutput for write_file (4) */
+  char expected[] = "\n\n\n";
   {
+    char path[] = "/new";
+    char content[] = "\n\n\n";
     int r;
     suppress_error = 0;
-    r = guestfs_write_file (g, "/new", "\n\n\n", 0);
+    r = guestfs_write_file (g, path, content, 0);
     if (r == -1)
       return -1;
   }
   {
+    char path[] = "/new";
     char *r;
     suppress_error = 0;
-    r = guestfs_cat (g, "/new");
+    r = guestfs_cat (g, path);
     if (r == NULL)
       return -1;
-    if (strcmp (r, "\n\n\n") != 0) {
-      fprintf (stderr, "test_write_file_4: expected \"\n\n\n\" but got \"%s\"\n", r);
+    if (strcmp (r, expected) != 0) {
+      fprintf (stderr, "test_write_file_4: expected \"%s\" but got \"%s\"\n", expected, r);
       return -1;
     }
     free (r);
@@ -2981,6 +6086,15 @@ static int test_write_file_5 (void)
 {
   /* InitBasicFS for write_file (5): create ext2 on /dev/sda1 */
   {
+    char device[] = "/dev/sda";
+    device[5] = devchar;
+    int r;
+    suppress_error = 0;
+    r = guestfs_blockdev_setrw (g, device);
+    if (r == -1)
+      return -1;
+  }
+  {
     int r;
     suppress_error = 0;
     r = guestfs_umount_all (g);
@@ -2995,46 +6109,59 @@ static int test_write_file_5 (void)
       return -1;
   }
   {
+    char device[] = "/dev/sda";
+    device[5] = devchar;
+    char lines_0[] = ",";
     char *lines[] = {
-      ",",
+      lines_0,
       NULL
     };
     int r;
     suppress_error = 0;
-    r = guestfs_sfdisk (g, "/dev/sda", 0, 0, 0, lines);
+    r = guestfs_sfdisk (g, device, 0, 0, 0, lines);
     if (r == -1)
       return -1;
   }
   {
+    char fstype[] = "ext2";
+    char device[] = "/dev/sda1";
+    device[5] = devchar;
     int r;
     suppress_error = 0;
-    r = guestfs_mkfs (g, "ext2", "/dev/sda1");
+    r = guestfs_mkfs (g, fstype, device);
     if (r == -1)
       return -1;
   }
   {
+    char device[] = "/dev/sda1";
+    device[5] = devchar;
+    char mountpoint[] = "/";
     int r;
     suppress_error = 0;
-    r = guestfs_mount (g, "/dev/sda1", "/");
+    r = guestfs_mount (g, device, mountpoint);
     if (r == -1)
       return -1;
   }
   /* TestOutput for write_file (5) */
+  char expected[] = "\n";
   {
+    char path[] = "/new";
+    char content[] = "\n";
     int r;
     suppress_error = 0;
-    r = guestfs_write_file (g, "/new", "\n", 0);
+    r = guestfs_write_file (g, path, content, 0);
     if (r == -1)
       return -1;
   }
   {
+    char path[] = "/new";
     char *r;
     suppress_error = 0;
-    r = guestfs_cat (g, "/new");
+    r = guestfs_cat (g, path);
     if (r == NULL)
       return -1;
-    if (strcmp (r, "\n") != 0) {
-      fprintf (stderr, "test_write_file_5: expected \"\n\" but got \"%s\"\n", r);
+    if (strcmp (r, expected) != 0) {
+      fprintf (stderr, "test_write_file_5: expected \"%s\" but got \"%s\"\n", expected, r);
       return -1;
     }
     free (r);
@@ -3046,6 +6173,15 @@ static int test_mkfs_0 (void)
 {
   /* InitEmpty for mkfs (0) */
   {
+    char device[] = "/dev/sda";
+    device[5] = devchar;
+    int r;
+    suppress_error = 0;
+    r = guestfs_blockdev_setrw (g, device);
+    if (r == -1)
+      return -1;
+  }
+  {
     int r;
     suppress_error = 0;
     r = guestfs_umount_all (g);
@@ -3060,46 +6196,59 @@ static int test_mkfs_0 (void)
       return -1;
   }
   /* TestOutput for mkfs (0) */
+  char expected[] = "new file contents";
   {
+    char device[] = "/dev/sda";
+    device[5] = devchar;
+    char lines_0[] = ",";
     char *lines[] = {
-      ",",
+      lines_0,
       NULL
     };
     int r;
     suppress_error = 0;
-    r = guestfs_sfdisk (g, "/dev/sda", 0, 0, 0, lines);
+    r = guestfs_sfdisk (g, device, 0, 0, 0, lines);
     if (r == -1)
       return -1;
   }
   {
+    char fstype[] = "ext2";
+    char device[] = "/dev/sda1";
+    device[5] = devchar;
     int r;
     suppress_error = 0;
-    r = guestfs_mkfs (g, "ext2", "/dev/sda1");
+    r = guestfs_mkfs (g, fstype, device);
     if (r == -1)
       return -1;
   }
   {
+    char device[] = "/dev/sda1";
+    device[5] = devchar;
+    char mountpoint[] = "/";
     int r;
     suppress_error = 0;
-    r = guestfs_mount (g, "/dev/sda1", "/");
+    r = guestfs_mount (g, device, mountpoint);
     if (r == -1)
       return -1;
   }
   {
+    char path[] = "/new";
+    char content[] = "new file contents";
     int r;
     suppress_error = 0;
-    r = guestfs_write_file (g, "/new", "new file contents", 0);
+    r = guestfs_write_file (g, path, content, 0);
     if (r == -1)
       return -1;
   }
   {
+    char path[] = "/new";
     char *r;
     suppress_error = 0;
-    r = guestfs_cat (g, "/new");
+    r = guestfs_cat (g, path);
     if (r == NULL)
       return -1;
-    if (strcmp (r, "new file contents") != 0) {
-      fprintf (stderr, "test_mkfs_0: expected \"new file contents\" but got \"%s\"\n", r);
+    if (strcmp (r, expected) != 0) {
+      fprintf (stderr, "test_mkfs_0: expected \"%s\" but got \"%s\"\n", expected, r);
       return -1;
     }
     free (r);
@@ -3111,6 +6260,15 @@ static int test_lvcreate_0 (void)
 {
   /* InitEmpty for lvcreate (0) */
   {
+    char device[] = "/dev/sda";
+    device[5] = devchar;
+    int r;
+    suppress_error = 0;
+    r = guestfs_blockdev_setrw (g, device);
+    if (r == -1)
+      return -1;
+  }
+  {
     int r;
     suppress_error = 0;
     r = guestfs_umount_all (g);
@@ -3126,94 +6284,123 @@ static int test_lvcreate_0 (void)
   }
   /* TestOutputList for lvcreate (0) */
   {
+    char device[] = "/dev/sda";
+    device[5] = devchar;
+    char lines_0[] = ",10";
+    char lines_1[] = ",20";
+    char lines_2[] = ",";
     char *lines[] = {
-      ",10",
-      ",20",
-      ",",
+      lines_0,
+      lines_1,
+      lines_2,
       NULL
     };
     int r;
     suppress_error = 0;
-    r = guestfs_sfdisk (g, "/dev/sda", 0, 0, 0, lines);
+    r = guestfs_sfdisk (g, device, 0, 0, 0, lines);
     if (r == -1)
       return -1;
   }
   {
+    char device[] = "/dev/sda1";
+    device[5] = devchar;
     int r;
     suppress_error = 0;
-    r = guestfs_pvcreate (g, "/dev/sda1");
+    r = guestfs_pvcreate (g, device);
     if (r == -1)
       return -1;
   }
   {
+    char device[] = "/dev/sda2";
+    device[5] = devchar;
     int r;
     suppress_error = 0;
-    r = guestfs_pvcreate (g, "/dev/sda2");
+    r = guestfs_pvcreate (g, device);
     if (r == -1)
       return -1;
   }
   {
+    char device[] = "/dev/sda3";
+    device[5] = devchar;
     int r;
     suppress_error = 0;
-    r = guestfs_pvcreate (g, "/dev/sda3");
+    r = guestfs_pvcreate (g, device);
     if (r == -1)
       return -1;
   }
   {
+    char volgroup[] = "VG1";
+    char physvols_0[] = "/dev/sda1";
+    physvols_0[5] = devchar;
+    char physvols_1[] = "/dev/sda2";
+    physvols_1[5] = devchar;
     char *physvols[] = {
-      "/dev/sda1",
-      "/dev/sda2",
+      physvols_0,
+      physvols_1,
       NULL
     };
     int r;
     suppress_error = 0;
-    r = guestfs_vgcreate (g, "VG1", physvols);
+    r = guestfs_vgcreate (g, volgroup, physvols);
     if (r == -1)
       return -1;
   }
   {
+    char volgroup[] = "VG2";
+    char physvols_0[] = "/dev/sda3";
+    physvols_0[5] = devchar;
     char *physvols[] = {
-      "/dev/sda3",
+      physvols_0,
       NULL
     };
     int r;
     suppress_error = 0;
-    r = guestfs_vgcreate (g, "VG2", physvols);
+    r = guestfs_vgcreate (g, volgroup, physvols);
     if (r == -1)
       return -1;
   }
   {
+    char logvol[] = "LV1";
+    char volgroup[] = "VG1";
     int r;
     suppress_error = 0;
-    r = guestfs_lvcreate (g, "LV1", "VG1", 50);
+    r = guestfs_lvcreate (g, logvol, volgroup, 50);
     if (r == -1)
       return -1;
   }
   {
+    char logvol[] = "LV2";
+    char volgroup[] = "VG1";
     int r;
     suppress_error = 0;
-    r = guestfs_lvcreate (g, "LV2", "VG1", 50);
+    r = guestfs_lvcreate (g, logvol, volgroup, 50);
     if (r == -1)
       return -1;
   }
   {
+    char logvol[] = "LV3";
+    char volgroup[] = "VG2";
     int r;
     suppress_error = 0;
-    r = guestfs_lvcreate (g, "LV3", "VG2", 50);
+    r = guestfs_lvcreate (g, logvol, volgroup, 50);
     if (r == -1)
       return -1;
   }
   {
+    char logvol[] = "LV4";
+    char volgroup[] = "VG2";
     int r;
     suppress_error = 0;
-    r = guestfs_lvcreate (g, "LV4", "VG2", 50);
+    r = guestfs_lvcreate (g, logvol, volgroup, 50);
     if (r == -1)
       return -1;
   }
   {
+    char logvol[] = "LV5";
+    char volgroup[] = "VG2";
     int r;
     suppress_error = 0;
-    r = guestfs_lvcreate (g, "LV5", "VG2", 50);
+    r = guestfs_lvcreate (g, logvol, volgroup, 50);
     if (r == -1)
       return -1;
   }
@@ -3229,45 +6416,60 @@ static int test_lvcreate_0 (void)
       print_strings (r);
       return -1;
     }
-    if (strcmp (r[0], "/dev/VG1/LV1") != 0) {
-      fprintf (stderr, "test_lvcreate_0: expected \"/dev/VG1/LV1\" but got \"%s\"\n", r[0]);
-      return -1;
+    {
+      char expected[] = "/dev/VG1/LV1";
+      if (strcmp (r[0], expected) != 0) {
+        fprintf (stderr, "test_lvcreate_0: expected \"%s\" but got \"%s\"\n", expected, r[0]);
+        return -1;
+      }
     }
     if (!r[1]) {
       fprintf (stderr, "test_lvcreate_0: short list returned from command\n");
       print_strings (r);
       return -1;
     }
-    if (strcmp (r[1], "/dev/VG1/LV2") != 0) {
-      fprintf (stderr, "test_lvcreate_0: expected \"/dev/VG1/LV2\" but got \"%s\"\n", r[1]);
-      return -1;
+    {
+      char expected[] = "/dev/VG1/LV2";
+      if (strcmp (r[1], expected) != 0) {
+        fprintf (stderr, "test_lvcreate_0: expected \"%s\" but got \"%s\"\n", expected, r[1]);
+        return -1;
+      }
     }
     if (!r[2]) {
       fprintf (stderr, "test_lvcreate_0: short list returned from command\n");
       print_strings (r);
       return -1;
     }
-    if (strcmp (r[2], "/dev/VG2/LV3") != 0) {
-      fprintf (stderr, "test_lvcreate_0: expected \"/dev/VG2/LV3\" but got \"%s\"\n", r[2]);
-      return -1;
+    {
+      char expected[] = "/dev/VG2/LV3";
+      if (strcmp (r[2], expected) != 0) {
+        fprintf (stderr, "test_lvcreate_0: expected \"%s\" but got \"%s\"\n", expected, r[2]);
+        return -1;
+      }
     }
     if (!r[3]) {
       fprintf (stderr, "test_lvcreate_0: short list returned from command\n");
       print_strings (r);
       return -1;
     }
-    if (strcmp (r[3], "/dev/VG2/LV4") != 0) {
-      fprintf (stderr, "test_lvcreate_0: expected \"/dev/VG2/LV4\" but got \"%s\"\n", r[3]);
-      return -1;
+    {
+      char expected[] = "/dev/VG2/LV4";
+      if (strcmp (r[3], expected) != 0) {
+        fprintf (stderr, "test_lvcreate_0: expected \"%s\" but got \"%s\"\n", expected, r[3]);
+        return -1;
+      }
     }
     if (!r[4]) {
       fprintf (stderr, "test_lvcreate_0: short list returned from command\n");
       print_strings (r);
       return -1;
     }
-    if (strcmp (r[4], "/dev/VG2/LV5") != 0) {
-      fprintf (stderr, "test_lvcreate_0: expected \"/dev/VG2/LV5\" but got \"%s\"\n", r[4]);
-      return -1;
+    {
+      char expected[] = "/dev/VG2/LV5";
+      if (strcmp (r[4], expected) != 0) {
+        fprintf (stderr, "test_lvcreate_0: expected \"%s\" but got \"%s\"\n", expected, r[4]);
+        return -1;
+      }
     }
     if (r[5] != NULL) {
       fprintf (stderr, "test_lvcreate_0: extra elements returned from command\n");
@@ -3285,6 +6487,15 @@ static int test_vgcreate_0 (void)
 {
   /* InitEmpty for vgcreate (0) */
   {
+    char device[] = "/dev/sda";
+    device[5] = devchar;
+    int r;
+    suppress_error = 0;
+    r = guestfs_blockdev_setrw (g, device);
+    if (r == -1)
+      return -1;
+  }
+  {
     int r;
     suppress_error = 0;
     r = guestfs_umount_all (g);
@@ -3300,59 +6511,78 @@ static int test_vgcreate_0 (void)
   }
   /* TestOutputList for vgcreate (0) */
   {
+    char device[] = "/dev/sda";
+    device[5] = devchar;
+    char lines_0[] = ",10";
+    char lines_1[] = ",20";
+    char lines_2[] = ",";
     char *lines[] = {
-      ",10",
-      ",20",
-      ",",
+      lines_0,
+      lines_1,
+      lines_2,
       NULL
     };
     int r;
     suppress_error = 0;
-    r = guestfs_sfdisk (g, "/dev/sda", 0, 0, 0, lines);
+    r = guestfs_sfdisk (g, device, 0, 0, 0, lines);
     if (r == -1)
       return -1;
   }
   {
+    char device[] = "/dev/sda1";
+    device[5] = devchar;
     int r;
     suppress_error = 0;
-    r = guestfs_pvcreate (g, "/dev/sda1");
+    r = guestfs_pvcreate (g, device);
     if (r == -1)
       return -1;
   }
   {
+    char device[] = "/dev/sda2";
+    device[5] = devchar;
     int r;
     suppress_error = 0;
-    r = guestfs_pvcreate (g, "/dev/sda2");
+    r = guestfs_pvcreate (g, device);
     if (r == -1)
       return -1;
   }
   {
+    char device[] = "/dev/sda3";
+    device[5] = devchar;
     int r;
     suppress_error = 0;
-    r = guestfs_pvcreate (g, "/dev/sda3");
+    r = guestfs_pvcreate (g, device);
     if (r == -1)
       return -1;
   }
   {
+    char volgroup[] = "VG1";
+    char physvols_0[] = "/dev/sda1";
+    physvols_0[5] = devchar;
+    char physvols_1[] = "/dev/sda2";
+    physvols_1[5] = devchar;
     char *physvols[] = {
-      "/dev/sda1",
-      "/dev/sda2",
+      physvols_0,
+      physvols_1,
       NULL
     };
     int r;
     suppress_error = 0;
-    r = guestfs_vgcreate (g, "VG1", physvols);
+    r = guestfs_vgcreate (g, volgroup, physvols);
     if (r == -1)
       return -1;
   }
   {
+    char volgroup[] = "VG2";
+    char physvols_0[] = "/dev/sda3";
+    physvols_0[5] = devchar;
     char *physvols[] = {
-      "/dev/sda3",
+      physvols_0,
       NULL
     };
     int r;
     suppress_error = 0;
-    r = guestfs_vgcreate (g, "VG2", physvols);
+    r = guestfs_vgcreate (g, volgroup, physvols);
     if (r == -1)
       return -1;
   }
@@ -3368,18 +6598,24 @@ static int test_vgcreate_0 (void)
       print_strings (r);
       return -1;
     }
-    if (strcmp (r[0], "VG1") != 0) {
-      fprintf (stderr, "test_vgcreate_0: expected \"VG1\" but got \"%s\"\n", r[0]);
-      return -1;
+    {
+      char expected[] = "VG1";
+      if (strcmp (r[0], expected) != 0) {
+        fprintf (stderr, "test_vgcreate_0: expected \"%s\" but got \"%s\"\n", expected, r[0]);
+        return -1;
+      }
     }
     if (!r[1]) {
       fprintf (stderr, "test_vgcreate_0: short list returned from command\n");
       print_strings (r);
       return -1;
     }
-    if (strcmp (r[1], "VG2") != 0) {
-      fprintf (stderr, "test_vgcreate_0: expected \"VG2\" but got \"%s\"\n", r[1]);
-      return -1;
+    {
+      char expected[] = "VG2";
+      if (strcmp (r[1], expected) != 0) {
+        fprintf (stderr, "test_vgcreate_0: expected \"%s\" but got \"%s\"\n", expected, r[1]);
+        return -1;
+      }
     }
     if (r[2] != NULL) {
       fprintf (stderr, "test_vgcreate_0: extra elements returned from command\n");
@@ -3397,6 +6633,15 @@ static int test_pvcreate_0 (void)
 {
   /* InitEmpty for pvcreate (0) */
   {
+    char device[] = "/dev/sda";
+    device[5] = devchar;
+    int r;
+    suppress_error = 0;
+    r = guestfs_blockdev_setrw (g, device);
+    if (r == -1)
+      return -1;
+  }
+  {
     int r;
     suppress_error = 0;
     r = guestfs_umount_all (g);
@@ -3412,36 +6657,47 @@ static int test_pvcreate_0 (void)
   }
   /* TestOutputList for pvcreate (0) */
   {
+    char device[] = "/dev/sda";
+    device[5] = devchar;
+    char lines_0[] = ",10";
+    char lines_1[] = ",20";
+    char lines_2[] = ",";
     char *lines[] = {
-      ",10",
-      ",20",
-      ",",
+      lines_0,
+      lines_1,
+      lines_2,
       NULL
     };
     int r;
     suppress_error = 0;
-    r = guestfs_sfdisk (g, "/dev/sda", 0, 0, 0, lines);
+    r = guestfs_sfdisk (g, device, 0, 0, 0, lines);
     if (r == -1)
       return -1;
   }
   {
+    char device[] = "/dev/sda1";
+    device[5] = devchar;
     int r;
     suppress_error = 0;
-    r = guestfs_pvcreate (g, "/dev/sda1");
+    r = guestfs_pvcreate (g, device);
     if (r == -1)
       return -1;
   }
   {
+    char device[] = "/dev/sda2";
+    device[5] = devchar;
     int r;
     suppress_error = 0;
-    r = guestfs_pvcreate (g, "/dev/sda2");
+    r = guestfs_pvcreate (g, device);
     if (r == -1)
       return -1;
   }
   {
+    char device[] = "/dev/sda3";
+    device[5] = devchar;
     int r;
     suppress_error = 0;
-    r = guestfs_pvcreate (g, "/dev/sda3");
+    r = guestfs_pvcreate (g, device);
     if (r == -1)
       return -1;
   }
@@ -3457,27 +6713,39 @@ static int test_pvcreate_0 (void)
       print_strings (r);
       return -1;
     }
-    if (strcmp (r[0], "/dev/sda1") != 0) {
-      fprintf (stderr, "test_pvcreate_0: expected \"/dev/sda1\" but got \"%s\"\n", r[0]);
-      return -1;
+    {
+      char expected[] = "/dev/sda1";
+      expected[5] = devchar;
+      if (strcmp (r[0], expected) != 0) {
+        fprintf (stderr, "test_pvcreate_0: expected \"%s\" but got \"%s\"\n", expected, r[0]);
+        return -1;
+      }
     }
     if (!r[1]) {
       fprintf (stderr, "test_pvcreate_0: short list returned from command\n");
       print_strings (r);
       return -1;
     }
-    if (strcmp (r[1], "/dev/sda2") != 0) {
-      fprintf (stderr, "test_pvcreate_0: expected \"/dev/sda2\" but got \"%s\"\n", r[1]);
-      return -1;
+    {
+      char expected[] = "/dev/sda2";
+      expected[5] = devchar;
+      if (strcmp (r[1], expected) != 0) {
+        fprintf (stderr, "test_pvcreate_0: expected \"%s\" but got \"%s\"\n", expected, r[1]);
+        return -1;
+      }
     }
     if (!r[2]) {
       fprintf (stderr, "test_pvcreate_0: short list returned from command\n");
       print_strings (r);
       return -1;
     }
-    if (strcmp (r[2], "/dev/sda3") != 0) {
-      fprintf (stderr, "test_pvcreate_0: expected \"/dev/sda3\" but got \"%s\"\n", r[2]);
-      return -1;
+    {
+      char expected[] = "/dev/sda3";
+      expected[5] = devchar;
+      if (strcmp (r[2], expected) != 0) {
+        fprintf (stderr, "test_pvcreate_0: expected \"%s\" but got \"%s\"\n", expected, r[2]);
+        return -1;
+      }
     }
     if (r[3] != NULL) {
       fprintf (stderr, "test_pvcreate_0: extra elements returned from command\n");
@@ -3495,6 +6763,15 @@ static int test_is_dir_0 (void)
 {
   /* InitBasicFS for is_dir (0): create ext2 on /dev/sda1 */
   {
+    char device[] = "/dev/sda";
+    device[5] = devchar;
+    int r;
+    suppress_error = 0;
+    r = guestfs_blockdev_setrw (g, device);
+    if (r == -1)
+      return -1;
+  }
+  {
     int r;
     suppress_error = 0;
     r = guestfs_umount_all (g);
@@ -3509,42 +6786,53 @@ static int test_is_dir_0 (void)
       return -1;
   }
   {
+    char device[] = "/dev/sda";
+    device[5] = devchar;
+    char lines_0[] = ",";
     char *lines[] = {
-      ",",
+      lines_0,
       NULL
     };
     int r;
     suppress_error = 0;
-    r = guestfs_sfdisk (g, "/dev/sda", 0, 0, 0, lines);
+    r = guestfs_sfdisk (g, device, 0, 0, 0, lines);
     if (r == -1)
       return -1;
   }
   {
+    char fstype[] = "ext2";
+    char device[] = "/dev/sda1";
+    device[5] = devchar;
     int r;
     suppress_error = 0;
-    r = guestfs_mkfs (g, "ext2", "/dev/sda1");
+    r = guestfs_mkfs (g, fstype, device);
     if (r == -1)
       return -1;
   }
   {
+    char device[] = "/dev/sda1";
+    device[5] = devchar;
+    char mountpoint[] = "/";
     int r;
     suppress_error = 0;
-    r = guestfs_mount (g, "/dev/sda1", "/");
+    r = guestfs_mount (g, device, mountpoint);
     if (r == -1)
       return -1;
   }
   /* TestOutputFalse for is_dir (0) */
   {
+    char path[] = "/new";
     int r;
     suppress_error = 0;
-    r = guestfs_touch (g, "/new");
+    r = guestfs_touch (g, path);
     if (r == -1)
       return -1;
   }
   {
+    char path[] = "/new";
     int r;
     suppress_error = 0;
-    r = guestfs_is_dir (g, "/new");
+    r = guestfs_is_dir (g, path);
     if (r == -1)
       return -1;
     if (r) {
@@ -3559,6 +6847,15 @@ static int test_is_dir_1 (void)
 {
   /* InitBasicFS for is_dir (1): create ext2 on /dev/sda1 */
   {
+    char device[] = "/dev/sda";
+    device[5] = devchar;
+    int r;
+    suppress_error = 0;
+    r = guestfs_blockdev_setrw (g, device);
+    if (r == -1)
+      return -1;
+  }
+  {
     int r;
     suppress_error = 0;
     r = guestfs_umount_all (g);
@@ -3573,42 +6870,53 @@ static int test_is_dir_1 (void)
       return -1;
   }
   {
+    char device[] = "/dev/sda";
+    device[5] = devchar;
+    char lines_0[] = ",";
     char *lines[] = {
-      ",",
+      lines_0,
       NULL
     };
     int r;
     suppress_error = 0;
-    r = guestfs_sfdisk (g, "/dev/sda", 0, 0, 0, lines);
+    r = guestfs_sfdisk (g, device, 0, 0, 0, lines);
     if (r == -1)
       return -1;
   }
   {
+    char fstype[] = "ext2";
+    char device[] = "/dev/sda1";
+    device[5] = devchar;
     int r;
     suppress_error = 0;
-    r = guestfs_mkfs (g, "ext2", "/dev/sda1");
+    r = guestfs_mkfs (g, fstype, device);
     if (r == -1)
       return -1;
   }
   {
+    char device[] = "/dev/sda1";
+    device[5] = devchar;
+    char mountpoint[] = "/";
     int r;
     suppress_error = 0;
-    r = guestfs_mount (g, "/dev/sda1", "/");
+    r = guestfs_mount (g, device, mountpoint);
     if (r == -1)
       return -1;
   }
   /* TestOutputTrue for is_dir (1) */
   {
+    char path[] = "/new";
     int r;
     suppress_error = 0;
-    r = guestfs_mkdir (g, "/new");
+    r = guestfs_mkdir (g, path);
     if (r == -1)
       return -1;
   }
   {
+    char path[] = "/new";
     int r;
     suppress_error = 0;
-    r = guestfs_is_dir (g, "/new");
+    r = guestfs_is_dir (g, path);
     if (r == -1)
       return -1;
     if (!r) {
@@ -3623,6 +6931,15 @@ static int test_is_file_0 (void)
 {
   /* InitBasicFS for is_file (0): create ext2 on /dev/sda1 */
   {
+    char device[] = "/dev/sda";
+    device[5] = devchar;
+    int r;
+    suppress_error = 0;
+    r = guestfs_blockdev_setrw (g, device);
+    if (r == -1)
+      return -1;
+  }
+  {
     int r;
     suppress_error = 0;
     r = guestfs_umount_all (g);
@@ -3637,42 +6954,53 @@ static int test_is_file_0 (void)
       return -1;
   }
   {
+    char device[] = "/dev/sda";
+    device[5] = devchar;
+    char lines_0[] = ",";
     char *lines[] = {
-      ",",
+      lines_0,
       NULL
     };
     int r;
     suppress_error = 0;
-    r = guestfs_sfdisk (g, "/dev/sda", 0, 0, 0, lines);
+    r = guestfs_sfdisk (g, device, 0, 0, 0, lines);
     if (r == -1)
       return -1;
   }
   {
+    char fstype[] = "ext2";
+    char device[] = "/dev/sda1";
+    device[5] = devchar;
     int r;
     suppress_error = 0;
-    r = guestfs_mkfs (g, "ext2", "/dev/sda1");
+    r = guestfs_mkfs (g, fstype, device);
     if (r == -1)
       return -1;
   }
   {
+    char device[] = "/dev/sda1";
+    device[5] = devchar;
+    char mountpoint[] = "/";
     int r;
     suppress_error = 0;
-    r = guestfs_mount (g, "/dev/sda1", "/");
+    r = guestfs_mount (g, device, mountpoint);
     if (r == -1)
       return -1;
   }
   /* TestOutputTrue for is_file (0) */
   {
+    char path[] = "/new";
     int r;
     suppress_error = 0;
-    r = guestfs_touch (g, "/new");
+    r = guestfs_touch (g, path);
     if (r == -1)
       return -1;
   }
   {
+    char path[] = "/new";
     int r;
     suppress_error = 0;
-    r = guestfs_is_file (g, "/new");
+    r = guestfs_is_file (g, path);
     if (r == -1)
       return -1;
     if (!r) {
@@ -3687,6 +7015,15 @@ static int test_is_file_1 (void)
 {
   /* InitBasicFS for is_file (1): create ext2 on /dev/sda1 */
   {
+    char device[] = "/dev/sda";
+    device[5] = devchar;
+    int r;
+    suppress_error = 0;
+    r = guestfs_blockdev_setrw (g, device);
+    if (r == -1)
+      return -1;
+  }
+  {
     int r;
     suppress_error = 0;
     r = guestfs_umount_all (g);
@@ -3701,42 +7038,53 @@ static int test_is_file_1 (void)
       return -1;
   }
   {
+    char device[] = "/dev/sda";
+    device[5] = devchar;
+    char lines_0[] = ",";
     char *lines[] = {
-      ",",
+      lines_0,
       NULL
     };
     int r;
     suppress_error = 0;
-    r = guestfs_sfdisk (g, "/dev/sda", 0, 0, 0, lines);
+    r = guestfs_sfdisk (g, device, 0, 0, 0, lines);
     if (r == -1)
       return -1;
   }
   {
+    char fstype[] = "ext2";
+    char device[] = "/dev/sda1";
+    device[5] = devchar;
     int r;
     suppress_error = 0;
-    r = guestfs_mkfs (g, "ext2", "/dev/sda1");
+    r = guestfs_mkfs (g, fstype, device);
     if (r == -1)
       return -1;
   }
   {
+    char device[] = "/dev/sda1";
+    device[5] = devchar;
+    char mountpoint[] = "/";
     int r;
     suppress_error = 0;
-    r = guestfs_mount (g, "/dev/sda1", "/");
+    r = guestfs_mount (g, device, mountpoint);
     if (r == -1)
       return -1;
   }
   /* TestOutputFalse for is_file (1) */
   {
+    char path[] = "/new";
     int r;
     suppress_error = 0;
-    r = guestfs_mkdir (g, "/new");
+    r = guestfs_mkdir (g, path);
     if (r == -1)
       return -1;
   }
   {
+    char path[] = "/new";
     int r;
     suppress_error = 0;
-    r = guestfs_is_file (g, "/new");
+    r = guestfs_is_file (g, path);
     if (r == -1)
       return -1;
     if (r) {
@@ -3751,6 +7099,15 @@ static int test_exists_0 (void)
 {
   /* InitBasicFS for exists (0): create ext2 on /dev/sda1 */
   {
+    char device[] = "/dev/sda";
+    device[5] = devchar;
+    int r;
+    suppress_error = 0;
+    r = guestfs_blockdev_setrw (g, device);
+    if (r == -1)
+      return -1;
+  }
+  {
     int r;
     suppress_error = 0;
     r = guestfs_umount_all (g);
@@ -3765,42 +7122,53 @@ static int test_exists_0 (void)
       return -1;
   }
   {
+    char device[] = "/dev/sda";
+    device[5] = devchar;
+    char lines_0[] = ",";
     char *lines[] = {
-      ",",
+      lines_0,
       NULL
     };
     int r;
     suppress_error = 0;
-    r = guestfs_sfdisk (g, "/dev/sda", 0, 0, 0, lines);
+    r = guestfs_sfdisk (g, device, 0, 0, 0, lines);
     if (r == -1)
       return -1;
   }
   {
+    char fstype[] = "ext2";
+    char device[] = "/dev/sda1";
+    device[5] = devchar;
     int r;
     suppress_error = 0;
-    r = guestfs_mkfs (g, "ext2", "/dev/sda1");
+    r = guestfs_mkfs (g, fstype, device);
     if (r == -1)
       return -1;
   }
   {
+    char device[] = "/dev/sda1";
+    device[5] = devchar;
+    char mountpoint[] = "/";
     int r;
     suppress_error = 0;
-    r = guestfs_mount (g, "/dev/sda1", "/");
+    r = guestfs_mount (g, device, mountpoint);
     if (r == -1)
       return -1;
   }
   /* TestOutputTrue for exists (0) */
   {
+    char path[] = "/new";
     int r;
     suppress_error = 0;
-    r = guestfs_touch (g, "/new");
+    r = guestfs_touch (g, path);
     if (r == -1)
       return -1;
   }
   {
+    char path[] = "/new";
     int r;
     suppress_error = 0;
-    r = guestfs_exists (g, "/new");
+    r = guestfs_exists (g, path);
     if (r == -1)
       return -1;
     if (!r) {
@@ -3815,6 +7183,15 @@ static int test_exists_1 (void)
 {
   /* InitBasicFS for exists (1): create ext2 on /dev/sda1 */
   {
+    char device[] = "/dev/sda";
+    device[5] = devchar;
+    int r;
+    suppress_error = 0;
+    r = guestfs_blockdev_setrw (g, device);
+    if (r == -1)
+      return -1;
+  }
+  {
     int r;
     suppress_error = 0;
     r = guestfs_umount_all (g);
@@ -3829,42 +7206,53 @@ static int test_exists_1 (void)
       return -1;
   }
   {
+    char device[] = "/dev/sda";
+    device[5] = devchar;
+    char lines_0[] = ",";
     char *lines[] = {
-      ",",
+      lines_0,
       NULL
     };
     int r;
     suppress_error = 0;
-    r = guestfs_sfdisk (g, "/dev/sda", 0, 0, 0, lines);
+    r = guestfs_sfdisk (g, device, 0, 0, 0, lines);
     if (r == -1)
       return -1;
   }
   {
+    char fstype[] = "ext2";
+    char device[] = "/dev/sda1";
+    device[5] = devchar;
     int r;
     suppress_error = 0;
-    r = guestfs_mkfs (g, "ext2", "/dev/sda1");
+    r = guestfs_mkfs (g, fstype, device);
     if (r == -1)
       return -1;
   }
   {
+    char device[] = "/dev/sda1";
+    device[5] = devchar;
+    char mountpoint[] = "/";
     int r;
     suppress_error = 0;
-    r = guestfs_mount (g, "/dev/sda1", "/");
+    r = guestfs_mount (g, device, mountpoint);
     if (r == -1)
       return -1;
   }
   /* TestOutputTrue for exists (1) */
   {
+    char path[] = "/new";
     int r;
     suppress_error = 0;
-    r = guestfs_mkdir (g, "/new");
+    r = guestfs_mkdir (g, path);
     if (r == -1)
       return -1;
   }
   {
+    char path[] = "/new";
     int r;
     suppress_error = 0;
-    r = guestfs_exists (g, "/new");
+    r = guestfs_exists (g, path);
     if (r == -1)
       return -1;
     if (!r) {
@@ -3879,6 +7267,15 @@ static int test_mkdir_p_0 (void)
 {
   /* InitBasicFS for mkdir_p (0): create ext2 on /dev/sda1 */
   {
+    char device[] = "/dev/sda";
+    device[5] = devchar;
+    int r;
+    suppress_error = 0;
+    r = guestfs_blockdev_setrw (g, device);
+    if (r == -1)
+      return -1;
+  }
+  {
     int r;
     suppress_error = 0;
     r = guestfs_umount_all (g);
@@ -3893,42 +7290,53 @@ static int test_mkdir_p_0 (void)
       return -1;
   }
   {
+    char device[] = "/dev/sda";
+    device[5] = devchar;
+    char lines_0[] = ",";
     char *lines[] = {
-      ",",
+      lines_0,
       NULL
     };
     int r;
     suppress_error = 0;
-    r = guestfs_sfdisk (g, "/dev/sda", 0, 0, 0, lines);
+    r = guestfs_sfdisk (g, device, 0, 0, 0, lines);
     if (r == -1)
       return -1;
   }
   {
+    char fstype[] = "ext2";
+    char device[] = "/dev/sda1";
+    device[5] = devchar;
     int r;
     suppress_error = 0;
-    r = guestfs_mkfs (g, "ext2", "/dev/sda1");
+    r = guestfs_mkfs (g, fstype, device);
     if (r == -1)
       return -1;
   }
   {
+    char device[] = "/dev/sda1";
+    device[5] = devchar;
+    char mountpoint[] = "/";
     int r;
     suppress_error = 0;
-    r = guestfs_mount (g, "/dev/sda1", "/");
+    r = guestfs_mount (g, device, mountpoint);
     if (r == -1)
       return -1;
   }
   /* TestOutputTrue for mkdir_p (0) */
   {
+    char path[] = "/new/foo/bar";
     int r;
     suppress_error = 0;
-    r = guestfs_mkdir_p (g, "/new/foo/bar");
+    r = guestfs_mkdir_p (g, path);
     if (r == -1)
       return -1;
   }
   {
+    char path[] = "/new/foo/bar";
     int r;
     suppress_error = 0;
-    r = guestfs_is_dir (g, "/new/foo/bar");
+    r = guestfs_is_dir (g, path);
     if (r == -1)
       return -1;
     if (!r) {
@@ -3943,6 +7351,15 @@ static int test_mkdir_p_1 (void)
 {
   /* InitBasicFS for mkdir_p (1): create ext2 on /dev/sda1 */
   {
+    char device[] = "/dev/sda";
+    device[5] = devchar;
+    int r;
+    suppress_error = 0;
+    r = guestfs_blockdev_setrw (g, device);
+    if (r == -1)
+      return -1;
+  }
+  {
     int r;
     suppress_error = 0;
     r = guestfs_umount_all (g);
@@ -3957,42 +7374,53 @@ static int test_mkdir_p_1 (void)
       return -1;
   }
   {
+    char device[] = "/dev/sda";
+    device[5] = devchar;
+    char lines_0[] = ",";
     char *lines[] = {
-      ",",
+      lines_0,
       NULL
     };
     int r;
     suppress_error = 0;
-    r = guestfs_sfdisk (g, "/dev/sda", 0, 0, 0, lines);
+    r = guestfs_sfdisk (g, device, 0, 0, 0, lines);
     if (r == -1)
       return -1;
   }
   {
+    char fstype[] = "ext2";
+    char device[] = "/dev/sda1";
+    device[5] = devchar;
     int r;
     suppress_error = 0;
-    r = guestfs_mkfs (g, "ext2", "/dev/sda1");
+    r = guestfs_mkfs (g, fstype, device);
     if (r == -1)
       return -1;
   }
   {
+    char device[] = "/dev/sda1";
+    device[5] = devchar;
+    char mountpoint[] = "/";
     int r;
     suppress_error = 0;
-    r = guestfs_mount (g, "/dev/sda1", "/");
+    r = guestfs_mount (g, device, mountpoint);
     if (r == -1)
       return -1;
   }
   /* TestOutputTrue for mkdir_p (1) */
   {
+    char path[] = "/new/foo/bar";
     int r;
     suppress_error = 0;
-    r = guestfs_mkdir_p (g, "/new/foo/bar");
+    r = guestfs_mkdir_p (g, path);
     if (r == -1)
       return -1;
   }
   {
+    char path[] = "/new/foo";
     int r;
     suppress_error = 0;
-    r = guestfs_is_dir (g, "/new/foo");
+    r = guestfs_is_dir (g, path);
     if (r == -1)
       return -1;
     if (!r) {
@@ -4007,6 +7435,15 @@ static int test_mkdir_p_2 (void)
 {
   /* InitBasicFS for mkdir_p (2): create ext2 on /dev/sda1 */
   {
+    char device[] = "/dev/sda";
+    device[5] = devchar;
+    int r;
+    suppress_error = 0;
+    r = guestfs_blockdev_setrw (g, device);
+    if (r == -1)
+      return -1;
+  }
+  {
     int r;
     suppress_error = 0;
     r = guestfs_umount_all (g);
@@ -4021,42 +7458,53 @@ static int test_mkdir_p_2 (void)
       return -1;
   }
   {
+    char device[] = "/dev/sda";
+    device[5] = devchar;
+    char lines_0[] = ",";
     char *lines[] = {
-      ",",
+      lines_0,
       NULL
     };
     int r;
     suppress_error = 0;
-    r = guestfs_sfdisk (g, "/dev/sda", 0, 0, 0, lines);
+    r = guestfs_sfdisk (g, device, 0, 0, 0, lines);
     if (r == -1)
       return -1;
   }
   {
+    char fstype[] = "ext2";
+    char device[] = "/dev/sda1";
+    device[5] = devchar;
     int r;
     suppress_error = 0;
-    r = guestfs_mkfs (g, "ext2", "/dev/sda1");
+    r = guestfs_mkfs (g, fstype, device);
     if (r == -1)
       return -1;
   }
   {
+    char device[] = "/dev/sda1";
+    device[5] = devchar;
+    char mountpoint[] = "/";
     int r;
     suppress_error = 0;
-    r = guestfs_mount (g, "/dev/sda1", "/");
+    r = guestfs_mount (g, device, mountpoint);
     if (r == -1)
       return -1;
   }
   /* TestOutputTrue for mkdir_p (2) */
   {
+    char path[] = "/new/foo/bar";
     int r;
     suppress_error = 0;
-    r = guestfs_mkdir_p (g, "/new/foo/bar");
+    r = guestfs_mkdir_p (g, path);
     if (r == -1)
       return -1;
   }
   {
+    char path[] = "/new";
     int r;
     suppress_error = 0;
-    r = guestfs_is_dir (g, "/new");
+    r = guestfs_is_dir (g, path);
     if (r == -1)
       return -1;
     if (!r) {
@@ -4071,6 +7519,15 @@ static int test_mkdir_0 (void)
 {
   /* InitBasicFS for mkdir (0): create ext2 on /dev/sda1 */
   {
+    char device[] = "/dev/sda";
+    device[5] = devchar;
+    int r;
+    suppress_error = 0;
+    r = guestfs_blockdev_setrw (g, device);
+    if (r == -1)
+      return -1;
+  }
+  {
     int r;
     suppress_error = 0;
     r = guestfs_umount_all (g);
@@ -4085,42 +7542,53 @@ static int test_mkdir_0 (void)
       return -1;
   }
   {
+    char device[] = "/dev/sda";
+    device[5] = devchar;
+    char lines_0[] = ",";
     char *lines[] = {
-      ",",
+      lines_0,
       NULL
     };
     int r;
     suppress_error = 0;
-    r = guestfs_sfdisk (g, "/dev/sda", 0, 0, 0, lines);
+    r = guestfs_sfdisk (g, device, 0, 0, 0, lines);
     if (r == -1)
       return -1;
   }
   {
+    char fstype[] = "ext2";
+    char device[] = "/dev/sda1";
+    device[5] = devchar;
     int r;
     suppress_error = 0;
-    r = guestfs_mkfs (g, "ext2", "/dev/sda1");
+    r = guestfs_mkfs (g, fstype, device);
     if (r == -1)
       return -1;
   }
   {
+    char device[] = "/dev/sda1";
+    device[5] = devchar;
+    char mountpoint[] = "/";
     int r;
     suppress_error = 0;
-    r = guestfs_mount (g, "/dev/sda1", "/");
+    r = guestfs_mount (g, device, mountpoint);
     if (r == -1)
       return -1;
   }
   /* TestOutputTrue for mkdir (0) */
   {
+    char path[] = "/new";
     int r;
     suppress_error = 0;
-    r = guestfs_mkdir (g, "/new");
+    r = guestfs_mkdir (g, path);
     if (r == -1)
       return -1;
   }
   {
+    char path[] = "/new";
     int r;
     suppress_error = 0;
-    r = guestfs_is_dir (g, "/new");
+    r = guestfs_is_dir (g, path);
     if (r == -1)
       return -1;
     if (!r) {
@@ -4135,6 +7603,15 @@ static int test_mkdir_1 (void)
 {
   /* InitBasicFS for mkdir (1): create ext2 on /dev/sda1 */
   {
+    char device[] = "/dev/sda";
+    device[5] = devchar;
+    int r;
+    suppress_error = 0;
+    r = guestfs_blockdev_setrw (g, device);
+    if (r == -1)
+      return -1;
+  }
+  {
     int r;
     suppress_error = 0;
     r = guestfs_umount_all (g);
@@ -4149,35 +7626,45 @@ static int test_mkdir_1 (void)
       return -1;
   }
   {
+    char device[] = "/dev/sda";
+    device[5] = devchar;
+    char lines_0[] = ",";
     char *lines[] = {
-      ",",
+      lines_0,
       NULL
     };
     int r;
     suppress_error = 0;
-    r = guestfs_sfdisk (g, "/dev/sda", 0, 0, 0, lines);
+    r = guestfs_sfdisk (g, device, 0, 0, 0, lines);
     if (r == -1)
       return -1;
   }
   {
+    char fstype[] = "ext2";
+    char device[] = "/dev/sda1";
+    device[5] = devchar;
     int r;
     suppress_error = 0;
-    r = guestfs_mkfs (g, "ext2", "/dev/sda1");
+    r = guestfs_mkfs (g, fstype, device);
     if (r == -1)
       return -1;
   }
   {
+    char device[] = "/dev/sda1";
+    device[5] = devchar;
+    char mountpoint[] = "/";
     int r;
     suppress_error = 0;
-    r = guestfs_mount (g, "/dev/sda1", "/");
+    r = guestfs_mount (g, device, mountpoint);
     if (r == -1)
       return -1;
   }
   /* TestLastFail for mkdir (1) */
   {
+    char path[] = "/new/foo/bar";
     int r;
     suppress_error = 1;
-    r = guestfs_mkdir (g, "/new/foo/bar");
+    r = guestfs_mkdir (g, path);
     if (r != -1)
       return -1;
   }
@@ -4188,6 +7675,15 @@ static int test_rm_rf_0 (void)
 {
   /* InitBasicFS for rm_rf (0): create ext2 on /dev/sda1 */
   {
+    char device[] = "/dev/sda";
+    device[5] = devchar;
+    int r;
+    suppress_error = 0;
+    r = guestfs_blockdev_setrw (g, device);
+    if (r == -1)
+      return -1;
+  }
+  {
     int r;
     suppress_error = 0;
     r = guestfs_umount_all (g);
@@ -4202,63 +7698,77 @@ static int test_rm_rf_0 (void)
       return -1;
   }
   {
+    char device[] = "/dev/sda";
+    device[5] = devchar;
+    char lines_0[] = ",";
     char *lines[] = {
-      ",",
+      lines_0,
       NULL
     };
     int r;
     suppress_error = 0;
-    r = guestfs_sfdisk (g, "/dev/sda", 0, 0, 0, lines);
+    r = guestfs_sfdisk (g, device, 0, 0, 0, lines);
     if (r == -1)
       return -1;
   }
   {
+    char fstype[] = "ext2";
+    char device[] = "/dev/sda1";
+    device[5] = devchar;
     int r;
     suppress_error = 0;
-    r = guestfs_mkfs (g, "ext2", "/dev/sda1");
+    r = guestfs_mkfs (g, fstype, device);
     if (r == -1)
       return -1;
   }
   {
+    char device[] = "/dev/sda1";
+    device[5] = devchar;
+    char mountpoint[] = "/";
     int r;
     suppress_error = 0;
-    r = guestfs_mount (g, "/dev/sda1", "/");
+    r = guestfs_mount (g, device, mountpoint);
     if (r == -1)
       return -1;
   }
   /* TestOutputFalse for rm_rf (0) */
   {
+    char path[] = "/new";
     int r;
     suppress_error = 0;
-    r = guestfs_mkdir (g, "/new");
+    r = guestfs_mkdir (g, path);
     if (r == -1)
       return -1;
   }
   {
+    char path[] = "/new/foo";
     int r;
     suppress_error = 0;
-    r = guestfs_mkdir (g, "/new/foo");
+    r = guestfs_mkdir (g, path);
     if (r == -1)
       return -1;
   }
   {
+    char path[] = "/new/foo/bar";
     int r;
     suppress_error = 0;
-    r = guestfs_touch (g, "/new/foo/bar");
+    r = guestfs_touch (g, path);
     if (r == -1)
       return -1;
   }
   {
+    char path[] = "/new";
     int r;
     suppress_error = 0;
-    r = guestfs_rm_rf (g, "/new");
+    r = guestfs_rm_rf (g, path);
     if (r == -1)
       return -1;
   }
   {
+    char path[] = "/new";
     int r;
     suppress_error = 0;
-    r = guestfs_exists (g, "/new");
+    r = guestfs_exists (g, path);
     if (r == -1)
       return -1;
     if (r) {
@@ -4273,6 +7783,15 @@ static int test_rmdir_0 (void)
 {
   /* InitBasicFS for rmdir (0): create ext2 on /dev/sda1 */
   {
+    char device[] = "/dev/sda";
+    device[5] = devchar;
+    int r;
+    suppress_error = 0;
+    r = guestfs_blockdev_setrw (g, device);
+    if (r == -1)
+      return -1;
+  }
+  {
     int r;
     suppress_error = 0;
     r = guestfs_umount_all (g);
@@ -4287,42 +7806,53 @@ static int test_rmdir_0 (void)
       return -1;
   }
   {
+    char device[] = "/dev/sda";
+    device[5] = devchar;
+    char lines_0[] = ",";
     char *lines[] = {
-      ",",
+      lines_0,
       NULL
     };
     int r;
     suppress_error = 0;
-    r = guestfs_sfdisk (g, "/dev/sda", 0, 0, 0, lines);
+    r = guestfs_sfdisk (g, device, 0, 0, 0, lines);
     if (r == -1)
       return -1;
   }
   {
+    char fstype[] = "ext2";
+    char device[] = "/dev/sda1";
+    device[5] = devchar;
     int r;
     suppress_error = 0;
-    r = guestfs_mkfs (g, "ext2", "/dev/sda1");
+    r = guestfs_mkfs (g, fstype, device);
     if (r == -1)
       return -1;
   }
   {
+    char device[] = "/dev/sda1";
+    device[5] = devchar;
+    char mountpoint[] = "/";
     int r;
     suppress_error = 0;
-    r = guestfs_mount (g, "/dev/sda1", "/");
+    r = guestfs_mount (g, device, mountpoint);
     if (r == -1)
       return -1;
   }
   /* TestRun for rmdir (0) */
   {
+    char path[] = "/new";
     int r;
     suppress_error = 0;
-    r = guestfs_mkdir (g, "/new");
+    r = guestfs_mkdir (g, path);
     if (r == -1)
       return -1;
   }
   {
+    char path[] = "/new";
     int r;
     suppress_error = 0;
-    r = guestfs_rmdir (g, "/new");
+    r = guestfs_rmdir (g, path);
     if (r == -1)
       return -1;
   }
@@ -4333,6 +7863,15 @@ static int test_rmdir_1 (void)
 {
   /* InitBasicFS for rmdir (1): create ext2 on /dev/sda1 */
   {
+    char device[] = "/dev/sda";
+    device[5] = devchar;
+    int r;
+    suppress_error = 0;
+    r = guestfs_blockdev_setrw (g, device);
+    if (r == -1)
+      return -1;
+  }
+  {
     int r;
     suppress_error = 0;
     r = guestfs_umount_all (g);
@@ -4347,35 +7886,45 @@ static int test_rmdir_1 (void)
       return -1;
   }
   {
+    char device[] = "/dev/sda";
+    device[5] = devchar;
+    char lines_0[] = ",";
     char *lines[] = {
-      ",",
+      lines_0,
       NULL
     };
     int r;
     suppress_error = 0;
-    r = guestfs_sfdisk (g, "/dev/sda", 0, 0, 0, lines);
+    r = guestfs_sfdisk (g, device, 0, 0, 0, lines);
     if (r == -1)
       return -1;
   }
   {
+    char fstype[] = "ext2";
+    char device[] = "/dev/sda1";
+    device[5] = devchar;
     int r;
     suppress_error = 0;
-    r = guestfs_mkfs (g, "ext2", "/dev/sda1");
+    r = guestfs_mkfs (g, fstype, device);
     if (r == -1)
       return -1;
   }
   {
+    char device[] = "/dev/sda1";
+    device[5] = devchar;
+    char mountpoint[] = "/";
     int r;
     suppress_error = 0;
-    r = guestfs_mount (g, "/dev/sda1", "/");
+    r = guestfs_mount (g, device, mountpoint);
     if (r == -1)
       return -1;
   }
   /* TestLastFail for rmdir (1) */
   {
+    char path[] = "/new";
     int r;
     suppress_error = 1;
-    r = guestfs_rmdir (g, "/new");
+    r = guestfs_rmdir (g, path);
     if (r != -1)
       return -1;
   }
@@ -4386,6 +7935,15 @@ static int test_rmdir_2 (void)
 {
   /* InitBasicFS for rmdir (2): create ext2 on /dev/sda1 */
   {
+    char device[] = "/dev/sda";
+    device[5] = devchar;
+    int r;
+    suppress_error = 0;
+    r = guestfs_blockdev_setrw (g, device);
+    if (r == -1)
+      return -1;
+  }
+  {
     int r;
     suppress_error = 0;
     r = guestfs_umount_all (g);
@@ -4400,42 +7958,53 @@ static int test_rmdir_2 (void)
       return -1;
   }
   {
+    char device[] = "/dev/sda";
+    device[5] = devchar;
+    char lines_0[] = ",";
     char *lines[] = {
-      ",",
+      lines_0,
       NULL
     };
     int r;
     suppress_error = 0;
-    r = guestfs_sfdisk (g, "/dev/sda", 0, 0, 0, lines);
+    r = guestfs_sfdisk (g, device, 0, 0, 0, lines);
     if (r == -1)
       return -1;
   }
   {
+    char fstype[] = "ext2";
+    char device[] = "/dev/sda1";
+    device[5] = devchar;
     int r;
     suppress_error = 0;
-    r = guestfs_mkfs (g, "ext2", "/dev/sda1");
+    r = guestfs_mkfs (g, fstype, device);
     if (r == -1)
       return -1;
   }
   {
+    char device[] = "/dev/sda1";
+    device[5] = devchar;
+    char mountpoint[] = "/";
     int r;
     suppress_error = 0;
-    r = guestfs_mount (g, "/dev/sda1", "/");
+    r = guestfs_mount (g, device, mountpoint);
     if (r == -1)
       return -1;
   }
   /* TestLastFail for rmdir (2) */
   {
+    char path[] = "/new";
     int r;
     suppress_error = 0;
-    r = guestfs_touch (g, "/new");
+    r = guestfs_touch (g, path);
     if (r == -1)
       return -1;
   }
   {
+    char path[] = "/new";
     int r;
     suppress_error = 1;
-    r = guestfs_rmdir (g, "/new");
+    r = guestfs_rmdir (g, path);
     if (r != -1)
       return -1;
   }
@@ -4446,6 +8015,15 @@ static int test_rm_0 (void)
 {
   /* InitBasicFS for rm (0): create ext2 on /dev/sda1 */
   {
+    char device[] = "/dev/sda";
+    device[5] = devchar;
+    int r;
+    suppress_error = 0;
+    r = guestfs_blockdev_setrw (g, device);
+    if (r == -1)
+      return -1;
+  }
+  {
     int r;
     suppress_error = 0;
     r = guestfs_umount_all (g);
@@ -4460,42 +8038,53 @@ static int test_rm_0 (void)
       return -1;
   }
   {
+    char device[] = "/dev/sda";
+    device[5] = devchar;
+    char lines_0[] = ",";
     char *lines[] = {
-      ",",
+      lines_0,
       NULL
     };
     int r;
     suppress_error = 0;
-    r = guestfs_sfdisk (g, "/dev/sda", 0, 0, 0, lines);
+    r = guestfs_sfdisk (g, device, 0, 0, 0, lines);
     if (r == -1)
       return -1;
   }
   {
+    char fstype[] = "ext2";
+    char device[] = "/dev/sda1";
+    device[5] = devchar;
     int r;
     suppress_error = 0;
-    r = guestfs_mkfs (g, "ext2", "/dev/sda1");
+    r = guestfs_mkfs (g, fstype, device);
     if (r == -1)
       return -1;
   }
   {
+    char device[] = "/dev/sda1";
+    device[5] = devchar;
+    char mountpoint[] = "/";
     int r;
     suppress_error = 0;
-    r = guestfs_mount (g, "/dev/sda1", "/");
+    r = guestfs_mount (g, device, mountpoint);
     if (r == -1)
       return -1;
   }
   /* TestRun for rm (0) */
   {
+    char path[] = "/new";
     int r;
     suppress_error = 0;
-    r = guestfs_touch (g, "/new");
+    r = guestfs_touch (g, path);
     if (r == -1)
       return -1;
   }
   {
+    char path[] = "/new";
     int r;
     suppress_error = 0;
-    r = guestfs_rm (g, "/new");
+    r = guestfs_rm (g, path);
     if (r == -1)
       return -1;
   }
@@ -4506,6 +8095,15 @@ static int test_rm_1 (void)
 {
   /* InitBasicFS for rm (1): create ext2 on /dev/sda1 */
   {
+    char device[] = "/dev/sda";
+    device[5] = devchar;
+    int r;
+    suppress_error = 0;
+    r = guestfs_blockdev_setrw (g, device);
+    if (r == -1)
+      return -1;
+  }
+  {
     int r;
     suppress_error = 0;
     r = guestfs_umount_all (g);
@@ -4520,35 +8118,45 @@ static int test_rm_1 (void)
       return -1;
   }
   {
+    char device[] = "/dev/sda";
+    device[5] = devchar;
+    char lines_0[] = ",";
     char *lines[] = {
-      ",",
+      lines_0,
       NULL
     };
     int r;
     suppress_error = 0;
-    r = guestfs_sfdisk (g, "/dev/sda", 0, 0, 0, lines);
+    r = guestfs_sfdisk (g, device, 0, 0, 0, lines);
     if (r == -1)
       return -1;
   }
   {
+    char fstype[] = "ext2";
+    char device[] = "/dev/sda1";
+    device[5] = devchar;
     int r;
     suppress_error = 0;
-    r = guestfs_mkfs (g, "ext2", "/dev/sda1");
+    r = guestfs_mkfs (g, fstype, device);
     if (r == -1)
       return -1;
   }
   {
+    char device[] = "/dev/sda1";
+    device[5] = devchar;
+    char mountpoint[] = "/";
     int r;
     suppress_error = 0;
-    r = guestfs_mount (g, "/dev/sda1", "/");
+    r = guestfs_mount (g, device, mountpoint);
     if (r == -1)
       return -1;
   }
   /* TestLastFail for rm (1) */
   {
+    char path[] = "/new";
     int r;
     suppress_error = 1;
-    r = guestfs_rm (g, "/new");
+    r = guestfs_rm (g, path);
     if (r != -1)
       return -1;
   }
@@ -4559,6 +8167,15 @@ static int test_rm_2 (void)
 {
   /* InitBasicFS for rm (2): create ext2 on /dev/sda1 */
   {
+    char device[] = "/dev/sda";
+    device[5] = devchar;
+    int r;
+    suppress_error = 0;
+    r = guestfs_blockdev_setrw (g, device);
+    if (r == -1)
+      return -1;
+  }
+  {
     int r;
     suppress_error = 0;
     r = guestfs_umount_all (g);
@@ -4573,42 +8190,53 @@ static int test_rm_2 (void)
       return -1;
   }
   {
+    char device[] = "/dev/sda";
+    device[5] = devchar;
+    char lines_0[] = ",";
     char *lines[] = {
-      ",",
+      lines_0,
       NULL
     };
     int r;
     suppress_error = 0;
-    r = guestfs_sfdisk (g, "/dev/sda", 0, 0, 0, lines);
+    r = guestfs_sfdisk (g, device, 0, 0, 0, lines);
     if (r == -1)
       return -1;
   }
   {
+    char fstype[] = "ext2";
+    char device[] = "/dev/sda1";
+    device[5] = devchar;
     int r;
     suppress_error = 0;
-    r = guestfs_mkfs (g, "ext2", "/dev/sda1");
+    r = guestfs_mkfs (g, fstype, device);
     if (r == -1)
       return -1;
   }
   {
+    char device[] = "/dev/sda1";
+    device[5] = devchar;
+    char mountpoint[] = "/";
     int r;
     suppress_error = 0;
-    r = guestfs_mount (g, "/dev/sda1", "/");
+    r = guestfs_mount (g, device, mountpoint);
     if (r == -1)
       return -1;
   }
   /* TestLastFail for rm (2) */
   {
+    char path[] = "/new";
     int r;
     suppress_error = 0;
-    r = guestfs_mkdir (g, "/new");
+    r = guestfs_mkdir (g, path);
     if (r == -1)
       return -1;
   }
   {
+    char path[] = "/new";
     int r;
     suppress_error = 1;
-    r = guestfs_rm (g, "/new");
+    r = guestfs_rm (g, path);
     if (r != -1)
       return -1;
   }
@@ -4619,6 +8247,15 @@ static int test_read_lines_0 (void)
 {
   /* InitBasicFS for read_lines (0): create ext2 on /dev/sda1 */
   {
+    char device[] = "/dev/sda";
+    device[5] = devchar;
+    int r;
+    suppress_error = 0;
+    r = guestfs_blockdev_setrw (g, device);
+    if (r == -1)
+      return -1;
+  }
+  {
     int r;
     suppress_error = 0;
     r = guestfs_umount_all (g);
@@ -4633,43 +8270,55 @@ static int test_read_lines_0 (void)
       return -1;
   }
   {
+    char device[] = "/dev/sda";
+    device[5] = devchar;
+    char lines_0[] = ",";
     char *lines[] = {
-      ",",
+      lines_0,
       NULL
     };
     int r;
     suppress_error = 0;
-    r = guestfs_sfdisk (g, "/dev/sda", 0, 0, 0, lines);
+    r = guestfs_sfdisk (g, device, 0, 0, 0, lines);
     if (r == -1)
       return -1;
   }
   {
+    char fstype[] = "ext2";
+    char device[] = "/dev/sda1";
+    device[5] = devchar;
     int r;
     suppress_error = 0;
-    r = guestfs_mkfs (g, "ext2", "/dev/sda1");
+    r = guestfs_mkfs (g, fstype, device);
     if (r == -1)
       return -1;
   }
   {
+    char device[] = "/dev/sda1";
+    device[5] = devchar;
+    char mountpoint[] = "/";
     int r;
     suppress_error = 0;
-    r = guestfs_mount (g, "/dev/sda1", "/");
+    r = guestfs_mount (g, device, mountpoint);
     if (r == -1)
       return -1;
   }
   /* TestOutputList for read_lines (0) */
   {
+    char path[] = "/new";
+    char content[] = "line1\r\nline2\nline3";
     int r;
     suppress_error = 0;
-    r = guestfs_write_file (g, "/new", "line1\r\nline2\nline3", 0);
+    r = guestfs_write_file (g, path, content, 0);
     if (r == -1)
       return -1;
   }
   {
+    char path[] = "/new";
     char **r;
     int i;
     suppress_error = 0;
-    r = guestfs_read_lines (g, "/new");
+    r = guestfs_read_lines (g, path);
     if (r == NULL)
       return -1;
     if (!r[0]) {
@@ -4677,27 +8326,36 @@ static int test_read_lines_0 (void)
       print_strings (r);
       return -1;
     }
-    if (strcmp (r[0], "line1") != 0) {
-      fprintf (stderr, "test_read_lines_0: expected \"line1\" but got \"%s\"\n", r[0]);
-      return -1;
+    {
+      char expected[] = "line1";
+      if (strcmp (r[0], expected) != 0) {
+        fprintf (stderr, "test_read_lines_0: expected \"%s\" but got \"%s\"\n", expected, r[0]);
+        return -1;
+      }
     }
     if (!r[1]) {
       fprintf (stderr, "test_read_lines_0: short list returned from command\n");
       print_strings (r);
       return -1;
     }
-    if (strcmp (r[1], "line2") != 0) {
-      fprintf (stderr, "test_read_lines_0: expected \"line2\" but got \"%s\"\n", r[1]);
-      return -1;
+    {
+      char expected[] = "line2";
+      if (strcmp (r[1], expected) != 0) {
+        fprintf (stderr, "test_read_lines_0: expected \"%s\" but got \"%s\"\n", expected, r[1]);
+        return -1;
+      }
     }
     if (!r[2]) {
       fprintf (stderr, "test_read_lines_0: short list returned from command\n");
       print_strings (r);
       return -1;
     }
-    if (strcmp (r[2], "line3") != 0) {
-      fprintf (stderr, "test_read_lines_0: expected \"line3\" but got \"%s\"\n", r[2]);
-      return -1;
+    {
+      char expected[] = "line3";
+      if (strcmp (r[2], expected) != 0) {
+        fprintf (stderr, "test_read_lines_0: expected \"%s\" but got \"%s\"\n", expected, r[2]);
+        return -1;
+      }
     }
     if (r[3] != NULL) {
       fprintf (stderr, "test_read_lines_0: extra elements returned from command\n");
@@ -4715,6 +8373,15 @@ static int test_read_lines_1 (void)
 {
   /* InitBasicFS for read_lines (1): create ext2 on /dev/sda1 */
   {
+    char device[] = "/dev/sda";
+    device[5] = devchar;
+    int r;
+    suppress_error = 0;
+    r = guestfs_blockdev_setrw (g, device);
+    if (r == -1)
+      return -1;
+  }
+  {
     int r;
     suppress_error = 0;
     r = guestfs_umount_all (g);
@@ -4729,43 +8396,55 @@ static int test_read_lines_1 (void)
       return -1;
   }
   {
+    char device[] = "/dev/sda";
+    device[5] = devchar;
+    char lines_0[] = ",";
     char *lines[] = {
-      ",",
+      lines_0,
       NULL
     };
     int r;
     suppress_error = 0;
-    r = guestfs_sfdisk (g, "/dev/sda", 0, 0, 0, lines);
+    r = guestfs_sfdisk (g, device, 0, 0, 0, lines);
     if (r == -1)
       return -1;
   }
   {
+    char fstype[] = "ext2";
+    char device[] = "/dev/sda1";
+    device[5] = devchar;
     int r;
     suppress_error = 0;
-    r = guestfs_mkfs (g, "ext2", "/dev/sda1");
+    r = guestfs_mkfs (g, fstype, device);
     if (r == -1)
       return -1;
   }
   {
+    char device[] = "/dev/sda1";
+    device[5] = devchar;
+    char mountpoint[] = "/";
     int r;
     suppress_error = 0;
-    r = guestfs_mount (g, "/dev/sda1", "/");
+    r = guestfs_mount (g, device, mountpoint);
     if (r == -1)
       return -1;
   }
   /* TestOutputList for read_lines (1) */
   {
+    char path[] = "/new";
+    char content[] = "";
     int r;
     suppress_error = 0;
-    r = guestfs_write_file (g, "/new", "", 0);
+    r = guestfs_write_file (g, path, content, 0);
     if (r == -1)
       return -1;
   }
   {
+    char path[] = "/new";
     char **r;
     int i;
     suppress_error = 0;
-    r = guestfs_read_lines (g, "/new");
+    r = guestfs_read_lines (g, path);
     if (r == NULL)
       return -1;
     if (r[0] != NULL) {
@@ -4784,6 +8463,15 @@ static int test_lvs_0 (void)
 {
   /* InitBasicFSonLVM for lvs (0): create ext2 on /dev/VG/LV */
   {
+    char device[] = "/dev/sda";
+    device[5] = devchar;
+    int r;
+    suppress_error = 0;
+    r = guestfs_blockdev_setrw (g, device);
+    if (r == -1)
+      return -1;
+  }
+  {
     int r;
     suppress_error = 0;
     r = guestfs_umount_all (g);
@@ -4798,52 +8486,66 @@ static int test_lvs_0 (void)
       return -1;
   }
   {
+    char device[] = "/dev/sda";
+    device[5] = devchar;
+    char lines_0[] = ",";
     char *lines[] = {
-      ",",
+      lines_0,
       NULL
     };
     int r;
     suppress_error = 0;
-    r = guestfs_sfdisk (g, "/dev/sda", 0, 0, 0, lines);
+    r = guestfs_sfdisk (g, device, 0, 0, 0, lines);
     if (r == -1)
       return -1;
   }
   {
+    char device[] = "/dev/sda1";
+    device[5] = devchar;
     int r;
     suppress_error = 0;
-    r = guestfs_pvcreate (g, "/dev/sda1");
+    r = guestfs_pvcreate (g, device);
     if (r == -1)
       return -1;
   }
   {
+    char volgroup[] = "VG";
+    char physvols_0[] = "/dev/sda1";
+    physvols_0[5] = devchar;
     char *physvols[] = {
-      "/dev/sda1",
+      physvols_0,
       NULL
     };
     int r;
     suppress_error = 0;
-    r = guestfs_vgcreate (g, "VG", physvols);
+    r = guestfs_vgcreate (g, volgroup, physvols);
     if (r == -1)
       return -1;
   }
   {
+    char logvol[] = "LV";
+    char volgroup[] = "VG";
     int r;
     suppress_error = 0;
-    r = guestfs_lvcreate (g, "LV", "VG", 8);
+    r = guestfs_lvcreate (g, logvol, volgroup, 8);
     if (r == -1)
       return -1;
   }
   {
+    char fstype[] = "ext2";
+    char device[] = "/dev/VG/LV";
     int r;
     suppress_error = 0;
-    r = guestfs_mkfs (g, "ext2", "/dev/VG/LV");
+    r = guestfs_mkfs (g, fstype, device);
     if (r == -1)
       return -1;
   }
   {
+    char device[] = "/dev/VG/LV";
+    char mountpoint[] = "/";
     int r;
     suppress_error = 0;
-    r = guestfs_mount (g, "/dev/VG/LV", "/");
+    r = guestfs_mount (g, device, mountpoint);
     if (r == -1)
       return -1;
   }
@@ -4860,9 +8562,12 @@ static int test_lvs_0 (void)
       print_strings (r);
       return -1;
     }
-    if (strcmp (r[0], "/dev/VG/LV") != 0) {
-      fprintf (stderr, "test_lvs_0: expected \"/dev/VG/LV\" but got \"%s\"\n", r[0]);
-      return -1;
+    {
+      char expected[] = "/dev/VG/LV";
+      if (strcmp (r[0], expected) != 0) {
+        fprintf (stderr, "test_lvs_0: expected \"%s\" but got \"%s\"\n", expected, r[0]);
+        return -1;
+      }
     }
     if (r[1] != NULL) {
       fprintf (stderr, "test_lvs_0: extra elements returned from command\n");
@@ -4880,6 +8585,15 @@ static int test_lvs_1 (void)
 {
   /* InitEmpty for lvs (1) */
   {
+    char device[] = "/dev/sda";
+    device[5] = devchar;
+    int r;
+    suppress_error = 0;
+    r = guestfs_blockdev_setrw (g, device);
+    if (r == -1)
+      return -1;
+  }
+  {
     int r;
     suppress_error = 0;
     r = guestfs_umount_all (g);
@@ -4895,80 +8609,105 @@ static int test_lvs_1 (void)
   }
   /* TestOutputList for lvs (1) */
   {
+    char device[] = "/dev/sda";
+    device[5] = devchar;
+    char lines_0[] = ",10";
+    char lines_1[] = ",20";
+    char lines_2[] = ",";
     char *lines[] = {
-      ",10",
-      ",20",
-      ",",
+      lines_0,
+      lines_1,
+      lines_2,
       NULL
     };
     int r;
     suppress_error = 0;
-    r = guestfs_sfdisk (g, "/dev/sda", 0, 0, 0, lines);
+    r = guestfs_sfdisk (g, device, 0, 0, 0, lines);
     if (r == -1)
       return -1;
   }
   {
+    char device[] = "/dev/sda1";
+    device[5] = devchar;
     int r;
     suppress_error = 0;
-    r = guestfs_pvcreate (g, "/dev/sda1");
+    r = guestfs_pvcreate (g, device);
     if (r == -1)
       return -1;
   }
   {
+    char device[] = "/dev/sda2";
+    device[5] = devchar;
     int r;
     suppress_error = 0;
-    r = guestfs_pvcreate (g, "/dev/sda2");
+    r = guestfs_pvcreate (g, device);
     if (r == -1)
       return -1;
   }
   {
+    char device[] = "/dev/sda3";
+    device[5] = devchar;
     int r;
     suppress_error = 0;
-    r = guestfs_pvcreate (g, "/dev/sda3");
+    r = guestfs_pvcreate (g, device);
     if (r == -1)
       return -1;
   }
   {
+    char volgroup[] = "VG1";
+    char physvols_0[] = "/dev/sda1";
+    physvols_0[5] = devchar;
+    char physvols_1[] = "/dev/sda2";
+    physvols_1[5] = devchar;
     char *physvols[] = {
-      "/dev/sda1",
-      "/dev/sda2",
+      physvols_0,
+      physvols_1,
       NULL
     };
     int r;
     suppress_error = 0;
-    r = guestfs_vgcreate (g, "VG1", physvols);
+    r = guestfs_vgcreate (g, volgroup, physvols);
     if (r == -1)
       return -1;
   }
   {
+    char volgroup[] = "VG2";
+    char physvols_0[] = "/dev/sda3";
+    physvols_0[5] = devchar;
     char *physvols[] = {
-      "/dev/sda3",
+      physvols_0,
       NULL
     };
     int r;
     suppress_error = 0;
-    r = guestfs_vgcreate (g, "VG2", physvols);
+    r = guestfs_vgcreate (g, volgroup, physvols);
     if (r == -1)
       return -1;
   }
   {
+    char logvol[] = "LV1";
+    char volgroup[] = "VG1";
     int r;
     suppress_error = 0;
-    r = guestfs_lvcreate (g, "LV1", "VG1", 50);
+    r = guestfs_lvcreate (g, logvol, volgroup, 50);
     if (r == -1)
       return -1;
   }
   {
+    char logvol[] = "LV2";
+    char volgroup[] = "VG1";
     int r;
     suppress_error = 0;
-    r = guestfs_lvcreate (g, "LV2", "VG1", 50);
+    r = guestfs_lvcreate (g, logvol, volgroup, 50);
     if (r == -1)
       return -1;
   }
   {
+    char logvol[] = "LV3";
+    char volgroup[] = "VG2";
     int r;
     suppress_error = 0;
-    r = guestfs_lvcreate (g, "LV3", "VG2", 50);
+    r = guestfs_lvcreate (g, logvol, volgroup, 50);
     if (r == -1)
       return -1;
   }
@@ -4984,27 +8723,36 @@ static int test_lvs_1 (void)
       print_strings (r);
       return -1;
     }
-    if (strcmp (r[0], "/dev/VG1/LV1") != 0) {
-      fprintf (stderr, "test_lvs_1: expected \"/dev/VG1/LV1\" but got \"%s\"\n", r[0]);
-      return -1;
+    {
+      char expected[] = "/dev/VG1/LV1";
+      if (strcmp (r[0], expected) != 0) {
+        fprintf (stderr, "test_lvs_1: expected \"%s\" but got \"%s\"\n", expected, r[0]);
+        return -1;
+      }
     }
     if (!r[1]) {
       fprintf (stderr, "test_lvs_1: short list returned from command\n");
       print_strings (r);
       return -1;
     }
-    if (strcmp (r[1], "/dev/VG1/LV2") != 0) {
-      fprintf (stderr, "test_lvs_1: expected \"/dev/VG1/LV2\" but got \"%s\"\n", r[1]);
-      return -1;
+    {
+      char expected[] = "/dev/VG1/LV2";
+      if (strcmp (r[1], expected) != 0) {
+        fprintf (stderr, "test_lvs_1: expected \"%s\" but got \"%s\"\n", expected, r[1]);
+        return -1;
+      }
     }
     if (!r[2]) {
       fprintf (stderr, "test_lvs_1: short list returned from command\n");
       print_strings (r);
       return -1;
     }
-    if (strcmp (r[2], "/dev/VG2/LV3") != 0) {
-      fprintf (stderr, "test_lvs_1: expected \"/dev/VG2/LV3\" but got \"%s\"\n", r[2]);
-      return -1;
+    {
+      char expected[] = "/dev/VG2/LV3";
+      if (strcmp (r[2], expected) != 0) {
+        fprintf (stderr, "test_lvs_1: expected \"%s\" but got \"%s\"\n", expected, r[2]);
+        return -1;
+      }
     }
     if (r[3] != NULL) {
       fprintf (stderr, "test_lvs_1: extra elements returned from command\n");
@@ -5022,6 +8770,15 @@ static int test_vgs_0 (void)
 {
   /* InitBasicFSonLVM for vgs (0): create ext2 on /dev/VG/LV */
   {
+    char device[] = "/dev/sda";
+    device[5] = devchar;
+    int r;
+    suppress_error = 0;
+    r = guestfs_blockdev_setrw (g, device);
+    if (r == -1)
+      return -1;
+  }
+  {
     int r;
     suppress_error = 0;
     r = guestfs_umount_all (g);
@@ -5036,52 +8793,66 @@ static int test_vgs_0 (void)
       return -1;
   }
   {
+    char device[] = "/dev/sda";
+    device[5] = devchar;
+    char lines_0[] = ",";
     char *lines[] = {
-      ",",
+      lines_0,
       NULL
     };
     int r;
     suppress_error = 0;
-    r = guestfs_sfdisk (g, "/dev/sda", 0, 0, 0, lines);
+    r = guestfs_sfdisk (g, device, 0, 0, 0, lines);
     if (r == -1)
       return -1;
   }
   {
+    char device[] = "/dev/sda1";
+    device[5] = devchar;
     int r;
     suppress_error = 0;
-    r = guestfs_pvcreate (g, "/dev/sda1");
+    r = guestfs_pvcreate (g, device);
     if (r == -1)
       return -1;
   }
   {
+    char volgroup[] = "VG";
+    char physvols_0[] = "/dev/sda1";
+    physvols_0[5] = devchar;
     char *physvols[] = {
-      "/dev/sda1",
+      physvols_0,
       NULL
     };
     int r;
     suppress_error = 0;
-    r = guestfs_vgcreate (g, "VG", physvols);
+    r = guestfs_vgcreate (g, volgroup, physvols);
     if (r == -1)
       return -1;
   }
   {
+    char logvol[] = "LV";
+    char volgroup[] = "VG";
     int r;
     suppress_error = 0;
-    r = guestfs_lvcreate (g, "LV", "VG", 8);
+    r = guestfs_lvcreate (g, logvol, volgroup, 8);
     if (r == -1)
       return -1;
   }
   {
+    char fstype[] = "ext2";
+    char device[] = "/dev/VG/LV";
     int r;
     suppress_error = 0;
-    r = guestfs_mkfs (g, "ext2", "/dev/VG/LV");
+    r = guestfs_mkfs (g, fstype, device);
     if (r == -1)
       return -1;
   }
   {
+    char device[] = "/dev/VG/LV";
+    char mountpoint[] = "/";
     int r;
     suppress_error = 0;
-    r = guestfs_mount (g, "/dev/VG/LV", "/");
+    r = guestfs_mount (g, device, mountpoint);
     if (r == -1)
       return -1;
   }
@@ -5098,9 +8869,12 @@ static int test_vgs_0 (void)
       print_strings (r);
       return -1;
     }
-    if (strcmp (r[0], "VG") != 0) {
-      fprintf (stderr, "test_vgs_0: expected \"VG\" but got \"%s\"\n", r[0]);
-      return -1;
+    {
+      char expected[] = "VG";
+      if (strcmp (r[0], expected) != 0) {
+        fprintf (stderr, "test_vgs_0: expected \"%s\" but got \"%s\"\n", expected, r[0]);
+        return -1;
+      }
     }
     if (r[1] != NULL) {
       fprintf (stderr, "test_vgs_0: extra elements returned from command\n");
@@ -5118,6 +8892,15 @@ static int test_vgs_1 (void)
 {
   /* InitEmpty for vgs (1) */
   {
+    char device[] = "/dev/sda";
+    device[5] = devchar;
+    int r;
+    suppress_error = 0;
+    r = guestfs_blockdev_setrw (g, device);
+    if (r == -1)
+      return -1;
+  }
+  {
     int r;
     suppress_error = 0;
     r = guestfs_umount_all (g);
@@ -5133,59 +8916,78 @@ static int test_vgs_1 (void)
   }
   /* TestOutputList for vgs (1) */
   {
+    char device[] = "/dev/sda";
+    device[5] = devchar;
+    char lines_0[] = ",10";
+    char lines_1[] = ",20";
+    char lines_2[] = ",";
     char *lines[] = {
-      ",10",
-      ",20",
-      ",",
+      lines_0,
+      lines_1,
+      lines_2,
       NULL
     };
     int r;
     suppress_error = 0;
-    r = guestfs_sfdisk (g, "/dev/sda", 0, 0, 0, lines);
+    r = guestfs_sfdisk (g, device, 0, 0, 0, lines);
     if (r == -1)
       return -1;
   }
   {
+    char device[] = "/dev/sda1";
+    device[5] = devchar;
     int r;
     suppress_error = 0;
-    r = guestfs_pvcreate (g, "/dev/sda1");
+    r = guestfs_pvcreate (g, device);
     if (r == -1)
       return -1;
   }
   {
+    char device[] = "/dev/sda2";
+    device[5] = devchar;
     int r;
     suppress_error = 0;
-    r = guestfs_pvcreate (g, "/dev/sda2");
+    r = guestfs_pvcreate (g, device);
     if (r == -1)
       return -1;
   }
   {
+    char device[] = "/dev/sda3";
+    device[5] = devchar;
     int r;
     suppress_error = 0;
-    r = guestfs_pvcreate (g, "/dev/sda3");
+    r = guestfs_pvcreate (g, device);
     if (r == -1)
       return -1;
   }
   {
+    char volgroup[] = "VG1";
+    char physvols_0[] = "/dev/sda1";
+    physvols_0[5] = devchar;
+    char physvols_1[] = "/dev/sda2";
+    physvols_1[5] = devchar;
     char *physvols[] = {
-      "/dev/sda1",
-      "/dev/sda2",
+      physvols_0,
+      physvols_1,
       NULL
     };
     int r;
     suppress_error = 0;
-    r = guestfs_vgcreate (g, "VG1", physvols);
+    r = guestfs_vgcreate (g, volgroup, physvols);
     if (r == -1)
       return -1;
   }
   {
+    char volgroup[] = "VG2";
+    char physvols_0[] = "/dev/sda3";
+    physvols_0[5] = devchar;
     char *physvols[] = {
-      "/dev/sda3",
+      physvols_0,
       NULL
     };
     int r;
     suppress_error = 0;
-    r = guestfs_vgcreate (g, "VG2", physvols);
+    r = guestfs_vgcreate (g, volgroup, physvols);
     if (r == -1)
       return -1;
   }
@@ -5201,18 +9003,24 @@ static int test_vgs_1 (void)
       print_strings (r);
       return -1;
     }
-    if (strcmp (r[0], "VG1") != 0) {
-      fprintf (stderr, "test_vgs_1: expected \"VG1\" but got \"%s\"\n", r[0]);
-      return -1;
+    {
+      char expected[] = "VG1";
+      if (strcmp (r[0], expected) != 0) {
+        fprintf (stderr, "test_vgs_1: expected \"%s\" but got \"%s\"\n", expected, r[0]);
+        return -1;
+      }
     }
     if (!r[1]) {
       fprintf (stderr, "test_vgs_1: short list returned from command\n");
       print_strings (r);
       return -1;
     }
-    if (strcmp (r[1], "VG2") != 0) {
-      fprintf (stderr, "test_vgs_1: expected \"VG2\" but got \"%s\"\n", r[1]);
-      return -1;
+    {
+      char expected[] = "VG2";
+      if (strcmp (r[1], expected) != 0) {
+        fprintf (stderr, "test_vgs_1: expected \"%s\" but got \"%s\"\n", expected, r[1]);
+        return -1;
+      }
     }
     if (r[2] != NULL) {
       fprintf (stderr, "test_vgs_1: extra elements returned from command\n");
@@ -5230,6 +9038,15 @@ static int test_pvs_0 (void)
 {
   /* InitBasicFSonLVM for pvs (0): create ext2 on /dev/VG/LV */
   {
+    char device[] = "/dev/sda";
+    device[5] = devchar;
+    int r;
+    suppress_error = 0;
+    r = guestfs_blockdev_setrw (g, device);
+    if (r == -1)
+      return -1;
+  }
+  {
     int r;
     suppress_error = 0;
     r = guestfs_umount_all (g);
@@ -5244,52 +9061,66 @@ static int test_pvs_0 (void)
       return -1;
   }
   {
+    char device[] = "/dev/sda";
+    device[5] = devchar;
+    char lines_0[] = ",";
     char *lines[] = {
-      ",",
+      lines_0,
       NULL
     };
     int r;
     suppress_error = 0;
-    r = guestfs_sfdisk (g, "/dev/sda", 0, 0, 0, lines);
+    r = guestfs_sfdisk (g, device, 0, 0, 0, lines);
     if (r == -1)
       return -1;
   }
   {
+    char device[] = "/dev/sda1";
+    device[5] = devchar;
     int r;
     suppress_error = 0;
-    r = guestfs_pvcreate (g, "/dev/sda1");
+    r = guestfs_pvcreate (g, device);
     if (r == -1)
       return -1;
   }
   {
+    char volgroup[] = "VG";
+    char physvols_0[] = "/dev/sda1";
+    physvols_0[5] = devchar;
     char *physvols[] = {
-      "/dev/sda1",
+      physvols_0,
       NULL
     };
     int r;
     suppress_error = 0;
-    r = guestfs_vgcreate (g, "VG", physvols);
+    r = guestfs_vgcreate (g, volgroup, physvols);
     if (r == -1)
       return -1;
   }
   {
+    char logvol[] = "LV";
+    char volgroup[] = "VG";
     int r;
     suppress_error = 0;
-    r = guestfs_lvcreate (g, "LV", "VG", 8);
+    r = guestfs_lvcreate (g, logvol, volgroup, 8);
     if (r == -1)
       return -1;
   }
   {
+    char fstype[] = "ext2";
+    char device[] = "/dev/VG/LV";
     int r;
     suppress_error = 0;
-    r = guestfs_mkfs (g, "ext2", "/dev/VG/LV");
+    r = guestfs_mkfs (g, fstype, device);
     if (r == -1)
       return -1;
   }
   {
+    char device[] = "/dev/VG/LV";
+    char mountpoint[] = "/";
     int r;
     suppress_error = 0;
-    r = guestfs_mount (g, "/dev/VG/LV", "/");
+    r = guestfs_mount (g, device, mountpoint);
     if (r == -1)
       return -1;
   }
@@ -5306,9 +9137,13 @@ static int test_pvs_0 (void)
       print_strings (r);
       return -1;
     }
-    if (strcmp (r[0], "/dev/sda1") != 0) {
-      fprintf (stderr, "test_pvs_0: expected \"/dev/sda1\" but got \"%s\"\n", r[0]);
-      return -1;
+    {
+      char expected[] = "/dev/sda1";
+      expected[5] = devchar;
+      if (strcmp (r[0], expected) != 0) {
+        fprintf (stderr, "test_pvs_0: expected \"%s\" but got \"%s\"\n", expected, r[0]);
+        return -1;
+      }
     }
     if (r[1] != NULL) {
       fprintf (stderr, "test_pvs_0: extra elements returned from command\n");
@@ -5326,6 +9161,15 @@ static int test_pvs_1 (void)
 {
   /* InitEmpty for pvs (1) */
   {
+    char device[] = "/dev/sda";
+    device[5] = devchar;
+    int r;
+    suppress_error = 0;
+    r = guestfs_blockdev_setrw (g, device);
+    if (r == -1)
+      return -1;
+  }
+  {
     int r;
     suppress_error = 0;
     r = guestfs_umount_all (g);
@@ -5341,36 +9185,47 @@ static int test_pvs_1 (void)
   }
   /* TestOutputList for pvs (1) */
   {
+    char device[] = "/dev/sda";
+    device[5] = devchar;
+    char lines_0[] = ",10";
+    char lines_1[] = ",20";
+    char lines_2[] = ",";
     char *lines[] = {
-      ",10",
-      ",20",
-      ",",
+      lines_0,
+      lines_1,
+      lines_2,
       NULL
     };
     int r;
     suppress_error = 0;
-    r = guestfs_sfdisk (g, "/dev/sda", 0, 0, 0, lines);
+    r = guestfs_sfdisk (g, device, 0, 0, 0, lines);
     if (r == -1)
       return -1;
   }
   {
+    char device[] = "/dev/sda1";
+    device[5] = devchar;
     int r;
     suppress_error = 0;
-    r = guestfs_pvcreate (g, "/dev/sda1");
+    r = guestfs_pvcreate (g, device);
     if (r == -1)
       return -1;
   }
   {
+    char device[] = "/dev/sda2";
+    device[5] = devchar;
     int r;
     suppress_error = 0;
-    r = guestfs_pvcreate (g, "/dev/sda2");
+    r = guestfs_pvcreate (g, device);
     if (r == -1)
       return -1;
   }
   {
+    char device[] = "/dev/sda3";
+    device[5] = devchar;
     int r;
     suppress_error = 0;
-    r = guestfs_pvcreate (g, "/dev/sda3");
+    r = guestfs_pvcreate (g, device);
     if (r == -1)
       return -1;
   }
@@ -5386,27 +9241,39 @@ static int test_pvs_1 (void)
       print_strings (r);
       return -1;
     }
-    if (strcmp (r[0], "/dev/sda1") != 0) {
-      fprintf (stderr, "test_pvs_1: expected \"/dev/sda1\" but got \"%s\"\n", r[0]);
-      return -1;
+    {
+      char expected[] = "/dev/sda1";
+      expected[5] = devchar;
+      if (strcmp (r[0], expected) != 0) {
+        fprintf (stderr, "test_pvs_1: expected \"%s\" but got \"%s\"\n", expected, r[0]);
+        return -1;
+      }
     }
     if (!r[1]) {
       fprintf (stderr, "test_pvs_1: short list returned from command\n");
       print_strings (r);
       return -1;
     }
-    if (strcmp (r[1], "/dev/sda2") != 0) {
-      fprintf (stderr, "test_pvs_1: expected \"/dev/sda2\" but got \"%s\"\n", r[1]);
-      return -1;
+    {
+      char expected[] = "/dev/sda2";
+      expected[5] = devchar;
+      if (strcmp (r[1], expected) != 0) {
+        fprintf (stderr, "test_pvs_1: expected \"%s\" but got \"%s\"\n", expected, r[1]);
+        return -1;
+      }
     }
     if (!r[2]) {
       fprintf (stderr, "test_pvs_1: short list returned from command\n");
       print_strings (r);
       return -1;
     }
-    if (strcmp (r[2], "/dev/sda3") != 0) {
-      fprintf (stderr, "test_pvs_1: expected \"/dev/sda3\" but got \"%s\"\n", r[2]);
-      return -1;
+    {
+      char expected[] = "/dev/sda3";
+      expected[5] = devchar;
+      if (strcmp (r[2], expected) != 0) {
+        fprintf (stderr, "test_pvs_1: expected \"%s\" but got \"%s\"\n", expected, r[2]);
+        return -1;
+      }
     }
     if (r[3] != NULL) {
       fprintf (stderr, "test_pvs_1: extra elements returned from command\n");
@@ -5424,6 +9291,15 @@ static int test_list_partitions_0 (void)
 {
   /* InitBasicFS for list_partitions (0): create ext2 on /dev/sda1 */
   {
+    char device[] = "/dev/sda";
+    device[5] = devchar;
+    int r;
+    suppress_error = 0;
+    r = guestfs_blockdev_setrw (g, device);
+    if (r == -1)
+      return -1;
+  }
+  {
     int r;
     suppress_error = 0;
     r = guestfs_umount_all (g);
@@ -5438,27 +9314,36 @@ static int test_list_partitions_0 (void)
       return -1;
   }
   {
+    char device[] = "/dev/sda";
+    device[5] = devchar;
+    char lines_0[] = ",";
     char *lines[] = {
-      ",",
+      lines_0,
       NULL
     };
     int r;
     suppress_error = 0;
-    r = guestfs_sfdisk (g, "/dev/sda", 0, 0, 0, lines);
+    r = guestfs_sfdisk (g, device, 0, 0, 0, lines);
     if (r == -1)
       return -1;
   }
   {
+    char fstype[] = "ext2";
+    char device[] = "/dev/sda1";
+    device[5] = devchar;
     int r;
     suppress_error = 0;
-    r = guestfs_mkfs (g, "ext2", "/dev/sda1");
+    r = guestfs_mkfs (g, fstype, device);
     if (r == -1)
       return -1;
   }
   {
+    char device[] = "/dev/sda1";
+    device[5] = devchar;
+    char mountpoint[] = "/";
     int r;
     suppress_error = 0;
-    r = guestfs_mount (g, "/dev/sda1", "/");
+    r = guestfs_mount (g, device, mountpoint);
     if (r == -1)
       return -1;
   }
@@ -5475,9 +9360,13 @@ static int test_list_partitions_0 (void)
       print_strings (r);
       return -1;
     }
-    if (strcmp (r[0], "/dev/sda1") != 0) {
-      fprintf (stderr, "test_list_partitions_0: expected \"/dev/sda1\" but got \"%s\"\n", r[0]);
-      return -1;
+    {
+      char expected[] = "/dev/sda1";
+      expected[5] = devchar;
+      if (strcmp (r[0], expected) != 0) {
+        fprintf (stderr, "test_list_partitions_0: expected \"%s\" but got \"%s\"\n", expected, r[0]);
+        return -1;
+      }
     }
     if (r[1] != NULL) {
       fprintf (stderr, "test_list_partitions_0: extra elements returned from command\n");
@@ -5495,6 +9384,15 @@ static int test_list_partitions_1 (void)
 {
   /* InitEmpty for list_partitions (1) */
   {
+    char device[] = "/dev/sda";
+    device[5] = devchar;
+    int r;
+    suppress_error = 0;
+    r = guestfs_blockdev_setrw (g, device);
+    if (r == -1)
+      return -1;
+  }
+  {
     int r;
     suppress_error = 0;
     r = guestfs_umount_all (g);
@@ -5510,15 +9408,20 @@ static int test_list_partitions_1 (void)
   }
   /* TestOutputList for list_partitions (1) */
   {
+    char device[] = "/dev/sda";
+    device[5] = devchar;
+    char lines_0[] = ",10";
+    char lines_1[] = ",20";
+    char lines_2[] = ",";
     char *lines[] = {
-      ",10",
-      ",20",
-      ",",
+      lines_0,
+      lines_1,
+      lines_2,
       NULL
     };
     int r;
     suppress_error = 0;
-    r = guestfs_sfdisk (g, "/dev/sda", 0, 0, 0, lines);
+    r = guestfs_sfdisk (g, device, 0, 0, 0, lines);
     if (r == -1)
       return -1;
   }
@@ -5534,27 +9437,39 @@ static int test_list_partitions_1 (void)
       print_strings (r);
       return -1;
     }
-    if (strcmp (r[0], "/dev/sda1") != 0) {
-      fprintf (stderr, "test_list_partitions_1: expected \"/dev/sda1\" but got \"%s\"\n", r[0]);
-      return -1;
+    {
+      char expected[] = "/dev/sda1";
+      expected[5] = devchar;
+      if (strcmp (r[0], expected) != 0) {
+        fprintf (stderr, "test_list_partitions_1: expected \"%s\" but got \"%s\"\n", expected, r[0]);
+        return -1;
+      }
     }
     if (!r[1]) {
       fprintf (stderr, "test_list_partitions_1: short list returned from command\n");
       print_strings (r);
       return -1;
     }
-    if (strcmp (r[1], "/dev/sda2") != 0) {
-      fprintf (stderr, "test_list_partitions_1: expected \"/dev/sda2\" but got \"%s\"\n", r[1]);
-      return -1;
+    {
+      char expected[] = "/dev/sda2";
+      expected[5] = devchar;
+      if (strcmp (r[1], expected) != 0) {
+        fprintf (stderr, "test_list_partitions_1: expected \"%s\" but got \"%s\"\n", expected, r[1]);
+        return -1;
+      }
     }
     if (!r[2]) {
       fprintf (stderr, "test_list_partitions_1: short list returned from command\n");
       print_strings (r);
       return -1;
     }
-    if (strcmp (r[2], "/dev/sda3") != 0) {
-      fprintf (stderr, "test_list_partitions_1: expected \"/dev/sda3\" but got \"%s\"\n", r[2]);
-      return -1;
+    {
+      char expected[] = "/dev/sda3";
+      expected[5] = devchar;
+      if (strcmp (r[2], expected) != 0) {
+        fprintf (stderr, "test_list_partitions_1: expected \"%s\" but got \"%s\"\n", expected, r[2]);
+        return -1;
+      }
     }
     if (r[3] != NULL) {
       fprintf (stderr, "test_list_partitions_1: extra elements returned from command\n");
@@ -5572,6 +9487,15 @@ static int test_list_devices_0 (void)
 {
   /* InitEmpty for list_devices (0) */
   {
+    char device[] = "/dev/sda";
+    device[5] = devchar;
+    int r;
+    suppress_error = 0;
+    r = guestfs_blockdev_setrw (g, device);
+    if (r == -1)
+      return -1;
+  }
+  {
     int r;
     suppress_error = 0;
     r = guestfs_umount_all (g);
@@ -5598,27 +9522,39 @@ static int test_list_devices_0 (void)
       print_strings (r);
       return -1;
     }
-    if (strcmp (r[0], "/dev/sda") != 0) {
-      fprintf (stderr, "test_list_devices_0: expected \"/dev/sda\" but got \"%s\"\n", r[0]);
-      return -1;
+    {
+      char expected[] = "/dev/sda";
+      expected[5] = devchar;
+      if (strcmp (r[0], expected) != 0) {
+        fprintf (stderr, "test_list_devices_0: expected \"%s\" but got \"%s\"\n", expected, r[0]);
+        return -1;
+      }
     }
     if (!r[1]) {
       fprintf (stderr, "test_list_devices_0: short list returned from command\n");
       print_strings (r);
       return -1;
     }
-    if (strcmp (r[1], "/dev/sdb") != 0) {
-      fprintf (stderr, "test_list_devices_0: expected \"/dev/sdb\" but got \"%s\"\n", r[1]);
-      return -1;
+    {
+      char expected[] = "/dev/sdb";
+      expected[5] = devchar;
+      if (strcmp (r[1], expected) != 0) {
+        fprintf (stderr, "test_list_devices_0: expected \"%s\" but got \"%s\"\n", expected, r[1]);
+        return -1;
+      }
     }
     if (!r[2]) {
       fprintf (stderr, "test_list_devices_0: short list returned from command\n");
       print_strings (r);
       return -1;
     }
-    if (strcmp (r[2], "/dev/sdc") != 0) {
-      fprintf (stderr, "test_list_devices_0: expected \"/dev/sdc\" but got \"%s\"\n", r[2]);
-      return -1;
+    {
+      char expected[] = "/dev/sdc";
+      expected[5] = devchar;
+      if (strcmp (r[2], expected) != 0) {
+        fprintf (stderr, "test_list_devices_0: expected \"%s\" but got \"%s\"\n", expected, r[2]);
+        return -1;
+      }
     }
     if (r[3] != NULL) {
       fprintf (stderr, "test_list_devices_0: extra elements returned from command\n");
@@ -5636,6 +9572,15 @@ static int test_ls_0 (void)
 {
   /* InitBasicFS for ls (0): create ext2 on /dev/sda1 */
   {
+    char device[] = "/dev/sda";
+    device[5] = devchar;
+    int r;
+    suppress_error = 0;
+    r = guestfs_blockdev_setrw (g, device);
+    if (r == -1)
+      return -1;
+  }
+  {
     int r;
     suppress_error = 0;
     r = guestfs_umount_all (g);
@@ -5650,57 +9595,70 @@ static int test_ls_0 (void)
       return -1;
   }
   {
+    char device[] = "/dev/sda";
+    device[5] = devchar;
+    char lines_0[] = ",";
     char *lines[] = {
-      ",",
+      lines_0,
       NULL
     };
     int r;
     suppress_error = 0;
-    r = guestfs_sfdisk (g, "/dev/sda", 0, 0, 0, lines);
+    r = guestfs_sfdisk (g, device, 0, 0, 0, lines);
     if (r == -1)
       return -1;
   }
   {
+    char fstype[] = "ext2";
+    char device[] = "/dev/sda1";
+    device[5] = devchar;
     int r;
     suppress_error = 0;
-    r = guestfs_mkfs (g, "ext2", "/dev/sda1");
+    r = guestfs_mkfs (g, fstype, device);
     if (r == -1)
       return -1;
   }
   {
+    char device[] = "/dev/sda1";
+    device[5] = devchar;
+    char mountpoint[] = "/";
     int r;
     suppress_error = 0;
-    r = guestfs_mount (g, "/dev/sda1", "/");
+    r = guestfs_mount (g, device, mountpoint);
     if (r == -1)
       return -1;
   }
   /* TestOutputList for ls (0) */
   {
+    char path[] = "/new";
     int r;
     suppress_error = 0;
-    r = guestfs_touch (g, "/new");
+    r = guestfs_touch (g, path);
     if (r == -1)
       return -1;
   }
   {
+    char path[] = "/newer";
     int r;
     suppress_error = 0;
-    r = guestfs_touch (g, "/newer");
+    r = guestfs_touch (g, path);
     if (r == -1)
       return -1;
   }
   {
+    char path[] = "/newest";
     int r;
     suppress_error = 0;
-    r = guestfs_touch (g, "/newest");
+    r = guestfs_touch (g, path);
     if (r == -1)
       return -1;
   }
   {
+    char directory[] = "/";
     char **r;
     int i;
     suppress_error = 0;
-    r = guestfs_ls (g, "/");
+    r = guestfs_ls (g, directory);
     if (r == NULL)
       return -1;
     if (!r[0]) {
@@ -5708,36 +9666,48 @@ static int test_ls_0 (void)
       print_strings (r);
       return -1;
     }
-    if (strcmp (r[0], "lost+found") != 0) {
-      fprintf (stderr, "test_ls_0: expected \"lost+found\" but got \"%s\"\n", r[0]);
-      return -1;
+    {
+      char expected[] = "lost+found";
+      if (strcmp (r[0], expected) != 0) {
+        fprintf (stderr, "test_ls_0: expected \"%s\" but got \"%s\"\n", expected, r[0]);
+        return -1;
+      }
     }
     if (!r[1]) {
       fprintf (stderr, "test_ls_0: short list returned from command\n");
       print_strings (r);
       return -1;
     }
-    if (strcmp (r[1], "new") != 0) {
-      fprintf (stderr, "test_ls_0: expected \"new\" but got \"%s\"\n", r[1]);
-      return -1;
+    {
+      char expected[] = "new";
+      if (strcmp (r[1], expected) != 0) {
+        fprintf (stderr, "test_ls_0: expected \"%s\" but got \"%s\"\n", expected, r[1]);
+        return -1;
+      }
     }
     if (!r[2]) {
       fprintf (stderr, "test_ls_0: short list returned from command\n");
       print_strings (r);
       return -1;
     }
-    if (strcmp (r[2], "newer") != 0) {
-      fprintf (stderr, "test_ls_0: expected \"newer\" but got \"%s\"\n", r[2]);
-      return -1;
+    {
+      char expected[] = "newer";
+      if (strcmp (r[2], expected) != 0) {
+        fprintf (stderr, "test_ls_0: expected \"%s\" but got \"%s\"\n", expected, r[2]);
+        return -1;
+      }
     }
     if (!r[3]) {
       fprintf (stderr, "test_ls_0: short list returned from command\n");
       print_strings (r);
       return -1;
     }
-    if (strcmp (r[3], "newest") != 0) {
-      fprintf (stderr, "test_ls_0: expected \"newest\" but got \"%s\"\n", r[3]);
-      return -1;
+    {
+      char expected[] = "newest";
+      if (strcmp (r[3], expected) != 0) {
+        fprintf (stderr, "test_ls_0: expected \"%s\" but got \"%s\"\n", expected, r[3]);
+        return -1;
+      }
     }
     if (r[4] != NULL) {
       fprintf (stderr, "test_ls_0: extra elements returned from command\n");
@@ -5755,6 +9725,15 @@ static int test_cat_0 (void)
 {
   /* InitBasicFS for cat (0): create ext2 on /dev/sda1 */
   {
+    char device[] = "/dev/sda";
+    device[5] = devchar;
+    int r;
+    suppress_error = 0;
+    r = guestfs_blockdev_setrw (g, device);
+    if (r == -1)
+      return -1;
+  }
+  {
     int r;
     suppress_error = 0;
     r = guestfs_umount_all (g);
@@ -5769,46 +9748,59 @@ static int test_cat_0 (void)
       return -1;
   }
   {
+    char device[] = "/dev/sda";
+    device[5] = devchar;
+    char lines_0[] = ",";
     char *lines[] = {
-      ",",
+      lines_0,
       NULL
     };
     int r;
     suppress_error = 0;
-    r = guestfs_sfdisk (g, "/dev/sda", 0, 0, 0, lines);
+    r = guestfs_sfdisk (g, device, 0, 0, 0, lines);
     if (r == -1)
       return -1;
   }
   {
+    char fstype[] = "ext2";
+    char device[] = "/dev/sda1";
+    device[5] = devchar;
     int r;
     suppress_error = 0;
-    r = guestfs_mkfs (g, "ext2", "/dev/sda1");
+    r = guestfs_mkfs (g, fstype, device);
     if (r == -1)
       return -1;
   }
   {
+    char device[] = "/dev/sda1";
+    device[5] = devchar;
+    char mountpoint[] = "/";
     int r;
     suppress_error = 0;
-    r = guestfs_mount (g, "/dev/sda1", "/");
+    r = guestfs_mount (g, device, mountpoint);
     if (r == -1)
       return -1;
   }
   /* TestOutput for cat (0) */
+  char expected[] = "new file contents";
   {
+    char path[] = "/new";
+    char content[] = "new file contents";
     int r;
     suppress_error = 0;
-    r = guestfs_write_file (g, "/new", "new file contents", 0);
+    r = guestfs_write_file (g, path, content, 0);
     if (r == -1)
       return -1;
   }
   {
+    char path[] = "/new";
     char *r;
     suppress_error = 0;
-    r = guestfs_cat (g, "/new");
+    r = guestfs_cat (g, path);
     if (r == NULL)
       return -1;
-    if (strcmp (r, "new file contents") != 0) {
-      fprintf (stderr, "test_cat_0: expected \"new file contents\" but got \"%s\"\n", r);
+    if (strcmp (r, expected) != 0) {
+      fprintf (stderr, "test_cat_0: expected \"%s\" but got \"%s\"\n", expected, r);
       return -1;
     }
     free (r);
@@ -5820,6 +9812,15 @@ static int test_touch_0 (void)
 {
   /* InitBasicFS for touch (0): create ext2 on /dev/sda1 */
   {
+    char device[] = "/dev/sda";
+    device[5] = devchar;
+    int r;
+    suppress_error = 0;
+    r = guestfs_blockdev_setrw (g, device);
+    if (r == -1)
+      return -1;
+  }
+  {
     int r;
     suppress_error = 0;
     r = guestfs_umount_all (g);
@@ -5834,42 +9835,53 @@ static int test_touch_0 (void)
       return -1;
   }
   {
+    char device[] = "/dev/sda";
+    device[5] = devchar;
+    char lines_0[] = ",";
     char *lines[] = {
-      ",",
+      lines_0,
       NULL
     };
     int r;
     suppress_error = 0;
-    r = guestfs_sfdisk (g, "/dev/sda", 0, 0, 0, lines);
+    r = guestfs_sfdisk (g, device, 0, 0, 0, lines);
     if (r == -1)
       return -1;
   }
   {
+    char fstype[] = "ext2";
+    char device[] = "/dev/sda1";
+    device[5] = devchar;
     int r;
     suppress_error = 0;
-    r = guestfs_mkfs (g, "ext2", "/dev/sda1");
+    r = guestfs_mkfs (g, fstype, device);
     if (r == -1)
       return -1;
   }
   {
+    char device[] = "/dev/sda1";
+    device[5] = devchar;
+    char mountpoint[] = "/";
     int r;
     suppress_error = 0;
-    r = guestfs_mount (g, "/dev/sda1", "/");
+    r = guestfs_mount (g, device, mountpoint);
     if (r == -1)
       return -1;
   }
   /* TestOutputTrue for touch (0) */
   {
+    char path[] = "/new";
     int r;
     suppress_error = 0;
-    r = guestfs_touch (g, "/new");
+    r = guestfs_touch (g, path);
     if (r == -1)
       return -1;
   }
   {
+    char path[] = "/new";
     int r;
     suppress_error = 0;
-    r = guestfs_exists (g, "/new");
+    r = guestfs_exists (g, path);
     if (r == -1)
       return -1;
     if (!r) {
@@ -5884,6 +9896,15 @@ static int test_sync_0 (void)
 {
   /* InitEmpty for sync (0) */
   {
+    char device[] = "/dev/sda";
+    device[5] = devchar;
+    int r;
+    suppress_error = 0;
+    r = guestfs_blockdev_setrw (g, device);
+    if (r == -1)
+      return -1;
+  }
+  {
     int r;
     suppress_error = 0;
     r = guestfs_umount_all (g);
@@ -5912,6 +9933,15 @@ static int test_mount_0 (void)
 {
   /* InitEmpty for mount (0) */
   {
+    char device[] = "/dev/sda";
+    device[5] = devchar;
+    int r;
+    suppress_error = 0;
+    r = guestfs_blockdev_setrw (g, device);
+    if (r == -1)
+      return -1;
+  }
+  {
     int r;
     suppress_error = 0;
     r = guestfs_umount_all (g);
@@ -5926,46 +9956,59 @@ static int test_mount_0 (void)
       return -1;
   }
   /* TestOutput for mount (0) */
+  char expected[] = "new file contents";
   {
+    char device[] = "/dev/sda";
+    device[5] = devchar;
+    char lines_0[] = ",";
     char *lines[] = {
-      ",",
+      lines_0,
       NULL
     };
     int r;
     suppress_error = 0;
-    r = guestfs_sfdisk (g, "/dev/sda", 0, 0, 0, lines);
+    r = guestfs_sfdisk (g, device, 0, 0, 0, lines);
     if (r == -1)
       return -1;
   }
   {
+    char fstype[] = "ext2";
+    char device[] = "/dev/sda1";
+    device[5] = devchar;
     int r;
     suppress_error = 0;
-    r = guestfs_mkfs (g, "ext2", "/dev/sda1");
+    r = guestfs_mkfs (g, fstype, device);
     if (r == -1)
       return -1;
   }
   {
+    char device[] = "/dev/sda1";
+    device[5] = devchar;
+    char mountpoint[] = "/";
     int r;
     suppress_error = 0;
-    r = guestfs_mount (g, "/dev/sda1", "/");
+    r = guestfs_mount (g, device, mountpoint);
     if (r == -1)
       return -1;
   }
   {
+    char path[] = "/new";
+    char content[] = "new file contents";
     int r;
     suppress_error = 0;
-    r = guestfs_write_file (g, "/new", "new file contents", 0);
+    r = guestfs_write_file (g, path, content, 0);
     if (r == -1)
       return -1;
   }
   {
+    char path[] = "/new";
     char *r;
     suppress_error = 0;
-    r = guestfs_cat (g, "/new");
+    r = guestfs_cat (g, path);
     if (r == NULL)
       return -1;
-    if (strcmp (r, "new file contents") != 0) {
-      fprintf (stderr, "test_mount_0: expected \"new file contents\" but got \"%s\"\n", r);
+    if (strcmp (r, expected) != 0) {
+      fprintf (stderr, "test_mount_0: expected \"%s\" but got \"%s\"\n", expected, r);
       return -1;
     }
     free (r);
@@ -5979,8 +10022,9 @@ int main (int argc, char *argv[])
   int failed = 0;
   const char *srcdir;
   const char *filename;
-  int fd;
+  int fd, i;
   int nr_tests, test_num = 0;
+  char **devs;
 
   no_test_warnings ();
 
@@ -6090,8 +10134,174 @@ int main (int argc, char *argv[])
     exit (1);
   }
 
-  nr_tests = 85;
+  /* Detect if the appliance uses /dev/sd* or /dev/hd* in device
+   * names.  This changed between RHEL 5 and RHEL 6 so we have to
+   * support both.
+   */
+  devs = guestfs_list_devices (g);
+  if (devs == NULL || devs[0] == NULL) {
+    printf ("guestfs_list_devices FAILED\n");
+    exit (1);
+  }
+  if (strncmp (devs[0], "/dev/sd", 7) == 0)
+    devchar = 's';
+  else if (strncmp (devs[0], "/dev/hd", 7) == 0)
+    devchar = 'h';
+  else {
+    printf ("guestfs_list_devices returned unexpected string '%s'\n",
+            devs[0]);
+    exit (1);
+  }
+  for (i = 0; devs[i] != NULL; ++i)
+    free (devs[i]);
+  free (devs);
 
+  nr_tests = 110;
+
+  test_num++;
+  printf ("%3d/%3d test_hexdump_0\n", test_num, nr_tests);
+  if (test_hexdump_0 () == -1) {
+    printf ("test_hexdump_0 FAILED\n");
+    failed++;
+  }
+  test_num++;
+  printf ("%3d/%3d test_strings_e_0\n", test_num, nr_tests);
+  if (test_strings_e_0 () == -1) {
+    printf ("test_strings_e_0 FAILED\n");
+    failed++;
+  }
+  test_num++;
+  printf ("%3d/%3d test_strings_0\n", test_num, nr_tests);
+  if (test_strings_0 () == -1) {
+    printf ("test_strings_0 FAILED\n");
+    failed++;
+  }
+  test_num++;
+  printf ("%3d/%3d test_equal_0\n", test_num, nr_tests);
+  if (test_equal_0 () == -1) {
+    printf ("test_equal_0 FAILED\n");
+    failed++;
+  }
+  test_num++;
+  printf ("%3d/%3d test_equal_1\n", test_num, nr_tests);
+  if (test_equal_1 () == -1) {
+    printf ("test_equal_1 FAILED\n");
+    failed++;
+  }
+  test_num++;
+  printf ("%3d/%3d test_equal_2\n", test_num, nr_tests);
+  if (test_equal_2 () == -1) {
+    printf ("test_equal_2 FAILED\n");
+    failed++;
+  }
+  test_num++;
+  printf ("%3d/%3d test_ping_daemon_0\n", test_num, nr_tests);
+  if (test_ping_daemon_0 () == -1) {
+    printf ("test_ping_daemon_0 FAILED\n");
+    failed++;
+  }
+  test_num++;
+  printf ("%3d/%3d test_dmesg_0\n", test_num, nr_tests);
+  if (test_dmesg_0 () == -1) {
+    printf ("test_dmesg_0 FAILED\n");
+    failed++;
+  }
+  test_num++;
+  printf ("%3d/%3d test_drop_caches_0\n", test_num, nr_tests);
+  if (test_drop_caches_0 () == -1) {
+    printf ("test_drop_caches_0 FAILED\n");
+    failed++;
+  }
+  test_num++;
+  printf ("%3d/%3d test_mv_0\n", test_num, nr_tests);
+  if (test_mv_0 () == -1) {
+    printf ("test_mv_0 FAILED\n");
+    failed++;
+  }
+  test_num++;
+  printf ("%3d/%3d test_mv_1\n", test_num, nr_tests);
+  if (test_mv_1 () == -1) {
+    printf ("test_mv_1 FAILED\n");
+    failed++;
+  }
+  test_num++;
+  printf ("%3d/%3d test_cp_a_0\n", test_num, nr_tests);
+  if (test_cp_a_0 () == -1) {
+    printf ("test_cp_a_0 FAILED\n");
+    failed++;
+  }
+  test_num++;
+  printf ("%3d/%3d test_cp_0\n", test_num, nr_tests);
+  if (test_cp_0 () == -1) {
+    printf ("test_cp_0 FAILED\n");
+    failed++;
+  }
+  test_num++;
+  printf ("%3d/%3d test_cp_1\n", test_num, nr_tests);
+  if (test_cp_1 () == -1) {
+    printf ("test_cp_1 FAILED\n");
+    failed++;
+  }
+  test_num++;
+  printf ("%3d/%3d test_cp_2\n", test_num, nr_tests);
+  if (test_cp_2 () == -1) {
+    printf ("test_cp_2 FAILED\n");
+    failed++;
+  }
+  test_num++;
+  printf ("%3d/%3d test_grub_install_0\n", test_num, nr_tests);
+  if (test_grub_install_0 () == -1) {
+    printf ("test_grub_install_0 FAILED\n");
+    failed++;
+  }
+  test_num++;
+  printf ("%3d/%3d test_zero_0\n", test_num, nr_tests);
+  if (test_zero_0 () == -1) {
+    printf ("test_zero_0 FAILED\n");
+    failed++;
+  }
+  test_num++;
+  printf ("%3d/%3d test_fsck_0\n", test_num, nr_tests);
+  if (test_fsck_0 () == -1) {
+    printf ("test_fsck_0 FAILED\n");
+    failed++;
+  }
+  test_num++;
+  printf ("%3d/%3d test_fsck_1\n", test_num, nr_tests);
+  if (test_fsck_1 () == -1) {
+    printf ("test_fsck_1 FAILED\n");
+    failed++;
+  }
+  test_num++;
+  printf ("%3d/%3d test_set_e2uuid_0\n", test_num, nr_tests);
+  if (test_set_e2uuid_0 () == -1) {
+    printf ("test_set_e2uuid_0 FAILED\n");
+    failed++;
+  }
+  test_num++;
+  printf ("%3d/%3d test_set_e2uuid_1\n", test_num, nr_tests);
+  if (test_set_e2uuid_1 () == -1) {
+    printf ("test_set_e2uuid_1 FAILED\n");
+    failed++;
+  }
+  test_num++;
+  printf ("%3d/%3d test_set_e2uuid_2\n", test_num, nr_tests);
+  if (test_set_e2uuid_2 () == -1) {
+    printf ("test_set_e2uuid_2 FAILED\n");
+    failed++;
+  }
+  test_num++;
+  printf ("%3d/%3d test_set_e2uuid_3\n", test_num, nr_tests);
+  if (test_set_e2uuid_3 () == -1) {
+    printf ("test_set_e2uuid_3 FAILED\n");
+    failed++;
+  }
+  test_num++;
+  printf ("%3d/%3d test_set_e2label_0\n", test_num, nr_tests);
+  if (test_set_e2label_0 () == -1) {
+    printf ("test_set_e2label_0 FAILED\n");
+    failed++;
+  }
   test_num++;
   printf ("%3d/%3d test_pvremove_0\n", test_num, nr_tests);
   if (test_pvremove_0 () == -1) {
@@ -6321,6 +10531,12 @@ int main (int argc, char *argv[])
     failed++;
   }
   test_num++;
+  printf ("%3d/%3d test_umount_all_1\n", test_num, nr_tests);
+  if (test_umount_all_1 () == -1) {
+    printf ("test_umount_all_1 FAILED\n");
+    failed++;
+  }
+  test_num++;
   printf ("%3d/%3d test_mounts_0\n", test_num, nr_tests);
   if (test_mounts_0 () == -1) {
     printf ("test_mounts_0 FAILED\n");