git.annexia.org
/
libguestfs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
df: Missing direct dependency on libvirt.
[libguestfs.git]
/
fish
/
fish.c
diff --git
a/fish/fish.c
b/fish/fish.c
index
5d7aac6
..
c1dbfb4
100644
(file)
--- a/
fish/fish.c
+++ b/
fish/fish.c
@@
-339,6
+339,8
@@
main (int argc, char *argv[])
exit (EXIT_FAILURE);
}
drv->type = drv_N;
exit (EXIT_FAILURE);
}
drv->type = drv_N;
+ drv->device = NULL;
+ drv->nr_drives = -1;
if (asprintf (&drv->N.filename, "test%d.img",
next_prepared_drive++) == -1) {
perror ("asprintf");
if (asprintf (&drv->N.filename, "test%d.img",
next_prepared_drive++) == -1) {
perror ("asprintf");
@@
-346,7
+348,6
@@
main (int argc, char *argv[])
}
drv->N.data = create_prepared_file (optarg, drv->N.filename);
drv->N.data_free = free_prep_data;
}
drv->N.data = create_prepared_file (optarg, drv->N.filename);
drv->N.data_free = free_prep_data;
- drv->N.device = NULL; /* filled in by add_drives */
drv->next = drvs;
drvs = drv;
break;
drv->next = drvs;
drvs = drv;
break;
@@
-554,7
+555,7
@@
prepare_drives (struct drv *drv)
if (drv) {
prepare_drives (drv->next);
if (drv->type == drv_N)
if (drv) {
prepare_drives (drv->next);
if (drv->type == drv_N)
- prepare_drive (drv->N.filename, drv->N.data, drv->
N.
device);
+ prepare_drive (drv->N.filename, drv->N.data, drv->device);
}
}
}
}