git.annexia.org
/
libguestfs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git+ssh://192.168.122.1/home/rjones/d/libguestfs
[libguestfs.git]
/
src
/
guestfs.c
diff --git
a/src/guestfs.c
b/src/guestfs.c
index
87b0d86
..
c3bce0b
100644
(file)
--- a/
src/guestfs.c
+++ b/
src/guestfs.c
@@
-708,7
+708,7
@@
guestfs_add_drive (guestfs_h *g, const char *filename)
}
/* cache=off improves reliability in the event of a host crash. */
}
/* cache=off improves reliability in the event of a host crash. */
- snprintf (buf, len, "file=%s,cache=off
", filename
);
+ snprintf (buf, len, "file=%s,cache=off
,if=%s", filename, DRIVE_IF
);
return guestfs_config (g, "-drive", buf);
}
return guestfs_config (g, "-drive", buf);
}
@@
-729,7
+729,7
@@
guestfs_add_drive_ro (guestfs_h *g, const char *filename)
return -1;
}
return -1;
}
- snprintf (buf, len, "file=%s,snapshot=on
", filename
);
+ snprintf (buf, len, "file=%s,snapshot=on
,if=%s", filename, DRIVE_IF
);
return guestfs_config (g, "-drive", buf);
}
return guestfs_config (g, "-drive", buf);
}
@@
-1473,6
+1473,13
@@
guestfs_free_lvm_lv_list (struct guestfs_lvm_lv_list *x)
free (x);
}
free (x);
}
+void
+guestfs_free_dirent_list (struct guestfs_dirent_list *x)
+{
+ xdr_free ((xdrproc_t) xdr_guestfs_int_dirent_list, (char *) x);
+ free (x);
+}
+
/* We don't know if stdout_event or sock_read_event will be the
* first to receive EOF if the qemu process dies. This function
* has the common cleanup code for both.
/* We don't know if stdout_event or sock_read_event will be the
* first to receive EOF if the qemu process dies. This function
* has the common cleanup code for both.