X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=src%2Fguestfs.c;h=fea8107d18cdb486705b391d83b75aefd3e063d9;hb=80e15757879c4cf21e0511c62e57c19efb4aab63;hp=fb214c535de1a63b2042d22912d6cf2b53664d3d;hpb=d70248333edf8a5b5f509609cf2c8f7fd77d5e05;p=libguestfs.git

diff --git a/src/guestfs.c b/src/guestfs.c
index fb214c5..fea8107 100644
--- a/src/guestfs.c
+++ b/src/guestfs.c
@@ -418,7 +418,7 @@ void *
 guestfs_safe_malloc (guestfs_h *g, size_t nbytes)
 {
   void *ptr = malloc (nbytes);
-  if (!ptr) g->abort_cb ();
+  if (nbytes > 0 && !ptr) g->abort_cb ();
   return ptr;
 }
 
@@ -426,7 +426,7 @@ void *
 guestfs_safe_realloc (guestfs_h *g, void *ptr, int nbytes)
 {
   void *p = realloc (ptr, nbytes);
-  if (!p) g->abort_cb ();
+  if (nbytes > 0 && !p) g->abort_cb ();
   return p;
 }
 
@@ -670,6 +670,27 @@ guestfs_add_drive (guestfs_h *g, const char *filename)
 }
 
 int
+guestfs_add_drive_ro (guestfs_h *g, const char *filename)
+{
+  size_t len = strlen (filename) + 64;
+  char buf[len];
+
+  if (strchr (filename, ',') != NULL) {
+    error (g, _("filename cannot contain ',' (comma) character"));
+    return -1;
+  }
+
+  if (access (filename, F_OK) == -1) {
+    perrorf (g, "%s", filename);
+    return -1;
+  }
+
+  snprintf (buf, len, "file=%s,snapshot=on", filename);
+
+  return guestfs_config (g, "-drive", buf);
+}
+
+int
 guestfs_add_cdrom (guestfs_h *g, const char *filename)
 {
   if (strchr (filename, ',') != NULL) {