Skip to content

Commit

Permalink
Remove remnants of libguestfs live support
Browse files Browse the repository at this point in the history
None of the tools actually ever supported it nor had a working --live
option.  They simply asserted that live == 0.  This commit removes the
appendix.
  • Loading branch information
rwmjones committed Mar 9, 2022
1 parent 1d7486a commit 1596cf0
Show file tree
Hide file tree
Showing 13 changed files with 1 addition and 24 deletions.
2 changes: 0 additions & 2 deletions align/scan.c
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,6 @@ static int scan_work (guestfs_h *g, size_t i, FILE *fp);
guestfs_h *g;

int read_only = 1;
int live = 0;
int verbose = 0;
int keys_from_stdin = 0;
int echo_keys = 0;
Expand Down Expand Up @@ -216,7 +215,6 @@ main (int argc, char *argv[])
*/
assert (read_only == 1);
assert (inspector == 0);
assert (live == 0);

/* Must be no extra arguments on the command line. */
if (optind != argc)
Expand Down
2 changes: 0 additions & 2 deletions cat/cat.c
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,6 @@
guestfs_h *g;

int read_only = 1;
int live = 0;
int verbose = 0;
int keys_from_stdin = 0;
int echo_keys = 0;
Expand Down Expand Up @@ -233,7 +232,6 @@ main (int argc, char *argv[])
*/
assert (read_only == 1);
assert (inspector == 1 || mps != NULL);
assert (live == 0);

/* User must specify at least one filename on the command line. */
if (optind >= argc || argc - optind < 1)
Expand Down
2 changes: 0 additions & 2 deletions cat/filesystems.c
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,6 @@
guestfs_h *g;

int read_only = 1;
int live = 0;
int verbose = 0;
int keys_from_stdin = 0;
int echo_keys = 0;
Expand Down Expand Up @@ -300,7 +299,6 @@ main (int argc, char *argv[])
*/
assert (read_only == 1);
assert (inspector == 0);
assert (live == 0);

/* Must be no extra arguments on the command line. */
if (optind != argc) {
Expand Down
2 changes: 0 additions & 2 deletions cat/log.c
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,6 @@
guestfs_h *g;

int read_only = 1;
int live = 0;
int verbose = 0;
int keys_from_stdin = 0;
int echo_keys = 0;
Expand Down Expand Up @@ -200,7 +199,6 @@ main (int argc, char *argv[])
*/
assert (read_only == 1);
assert (inspector == 1);
assert (live == 0);

/* User must not specify more arguments on the command line. */
if (optind != argc) {
Expand Down
2 changes: 0 additions & 2 deletions cat/ls.c
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,6 @@
guestfs_h *g;

int read_only = 1;
int live = 0;
int verbose = 0;
int keys_from_stdin = 0;
int echo_keys = 0;
Expand Down Expand Up @@ -343,7 +342,6 @@ main (int argc, char *argv[])
*/
assert (read_only == 1);
assert (inspector == 1 || mps != NULL);
assert (live == 0);

CHECK_OPTION_format_consumed;
CHECK_OPTION_blocksize_consumed;
Expand Down
2 changes: 0 additions & 2 deletions cat/tail.c
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,6 @@
guestfs_h *g;

int read_only = 1;
int live = 0;
int verbose = 0;
int keys_from_stdin = 0;
int echo_keys = 0;
Expand Down Expand Up @@ -215,7 +214,6 @@ main (int argc, char *argv[])
*/
assert (read_only == 1);
assert (inspector == 1 || mps != NULL);
assert (live == 0);

/* User must specify at least one filename on the command line. */
if (optind >= argc || argc - optind < 1) {
Expand Down
2 changes: 1 addition & 1 deletion common
2 changes: 0 additions & 2 deletions df/main.c
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,6 @@
guestfs_h *g;

int read_only = 1;
int live = 0;
int verbose = 0;
int keys_from_stdin = 0;
int echo_keys = 0;
Expand Down Expand Up @@ -252,7 +251,6 @@ main (int argc, char *argv[])
*/
assert (read_only == 1);
assert (inspector == 0);
assert (live == 0);

/* Must be no extra arguments on the command line. */
if (optind != argc)
Expand Down
2 changes: 0 additions & 2 deletions diff/diff.c
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,6 @@ static void free_tree (struct tree *);
guestfs_h *g, *g2;

int read_only = 1;
int live = 0;
int verbose = 0;
int keys_from_stdin = 0;
int echo_keys = 0;
Expand Down Expand Up @@ -370,7 +369,6 @@ main (int argc, char *argv[])
*/
assert (read_only == 1);
assert (inspector == 1);
assert (live == 0);

CHECK_OPTION_format_consumed;
CHECK_OPTION_blocksize_consumed;
Expand Down
2 changes: 0 additions & 2 deletions edit/edit.c
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,6 @@
guestfs_h *g;

int read_only = 0;
int live = 0;
int verbose = 0;
int keys_from_stdin = 0;
int echo_keys = 0;
Expand Down Expand Up @@ -257,7 +256,6 @@ main (int argc, char *argv[])
*/
assert (read_only == 0);
assert (inspector == 1 || mps != NULL);
assert (live == 0);

/* User must specify at least one filename on the command line. */
if (optind >= argc || argc - optind < 1)
Expand Down
2 changes: 0 additions & 2 deletions format/format.c
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,6 @@
guestfs_h *g;

int read_only = 0;
int live = 0;
int verbose = 0;
int keys_from_stdin = 0;
int echo_keys = 0;
Expand Down Expand Up @@ -229,7 +228,6 @@ main (int argc, char *argv[])
*/
assert (read_only == 0);
assert (inspector == 0);
assert (live == 0);

/* Must be no extra arguments on the command line. */
if (optind != argc) {
Expand Down
2 changes: 0 additions & 2 deletions inspector/inspector.c
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,6 @@
guestfs_h *g;

int read_only = 1;
int live = 0;
int verbose = 0;
int keys_from_stdin = 0;
int echo_keys = 0;
Expand Down Expand Up @@ -257,7 +256,6 @@ main (int argc, char *argv[])
*/
assert (read_only == 1);
assert (inspector == 1);
assert (live == 0);

/* Must be no extra arguments on the command line. */
if (optind != argc) {
Expand Down
1 change: 0 additions & 1 deletion make-fs/make-fs.c
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,6 @@

guestfs_h *g;
const char *libvirt_uri;
int live;
int read_only;
int verbose;
int in_guestfish = 0;
Expand Down

0 comments on commit 1596cf0

Please sign in to comment.