diff --git a/lib/drives.c b/lib/drives.c
index bb721f212..6a62623d5 100644
--- a/lib/drives.c
+++ b/lib/drives.c
@@ -656,17 +656,14 @@ parse_servers (guestfs_h *g, char *const *strs,
 }
 
 int
-guestfs_impl_add_drive_opts (guestfs_h *g, const char *filename,
-			     const struct guestfs_add_drive_opts_argv *optargs)
+guestfs_impl_add_drive_opts (guestfs_h *g,
+                             const char *filename,
+                             const struct guestfs_add_drive_opts_argv *optargs)
 {
-  struct drive_create_data data;
+  struct drive_create_data data = { .nr_servers = 0, .exportname = filename };
   const char *protocol;
   struct drive *drv;
 
-  data.nr_servers = 0;
-  data.servers = NULL;
-  data.exportname = filename;
-
   data.readonly = optargs->bitmask & GUESTFS_ADD_DRIVE_OPTS_READONLY_BITMASK
     ? optargs->readonly : false;
   data.format = optargs->bitmask & GUESTFS_ADD_DRIVE_OPTS_FORMAT_BITMASK
@@ -839,14 +836,14 @@ guestfs_impl_add_drive_ro (guestfs_h *g, const char *filename)
 
 int
 guestfs_impl_add_drive_with_if (guestfs_h *g, const char *filename,
-				const char *iface ATTRIBUTE_UNUSED)
+                                const char *iface ATTRIBUTE_UNUSED)
 {
   return guestfs_add_drive_opts_argv (g, filename, NULL);
 }
 
 int
 guestfs_impl_add_drive_ro_with_if (guestfs_h *g, const char *filename,
-                               const char *iface ATTRIBUTE_UNUSED)
+                                   const char *iface ATTRIBUTE_UNUSED)
 {
   const struct guestfs_add_drive_opts_argv optargs = {
     .bitmask = GUESTFS_ADD_DRIVE_OPTS_READONLY_BITMASK,
@@ -858,7 +855,7 @@ guestfs_impl_add_drive_ro_with_if (guestfs_h *g, const char *filename,
 
 int
 guestfs_impl_add_drive_scratch (guestfs_h *g, int64_t size,
-				const struct guestfs_add_drive_scratch_argv *optargs)
+                                const struct guestfs_add_drive_scratch_argv *optargs)
 {
   struct guestfs_add_drive_opts_argv add_drive_optargs = { .bitmask = 0 };
   CLEANUP_FREE char *filename = NULL;