diff mbox series

[10/29] vl: preconfig and loadvm are mutually exclusive

Message ID 20201027182144.3315885-11-pbonzini@redhat.com
State Accepted
Commit 90285ec8bb1c47d4ef8349a765ba7c9a672212c8
Headers show
Series cleanup qemu_init and make sense of command line processing | expand

Commit Message

Paolo Bonzini Oct. 27, 2020, 6:21 p.m. UTC 
Just like -incoming.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
 softmmu/vl.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

Comments

Igor Mammedov Nov. 11, 2020, 7:58 p.m. UTC | #1 
On Tue, 27 Oct 2020 14:21:25 -0400
Paolo Bonzini <pbonzini@redhat.com> wrote:

> Just like -incoming.

> 

> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>


Reviewed-by: Igor Mammedov <imammedo@redhat.com>


> ---

>  softmmu/vl.c | 7 ++++++-

>  1 file changed, 6 insertions(+), 1 deletion(-)

> 

> diff --git a/softmmu/vl.c b/softmmu/vl.c

> index 3316c5534c..c2a5ee61f9 100644

> --- a/softmmu/vl.c

> +++ b/softmmu/vl.c

> @@ -124,6 +124,7 @@ static const char *mem_path;

>  static const char *boot_order;

>  static const char *boot_once;

>  static const char *incoming;

> +static const char *loadvm;

>  enum vga_retrace_method vga_retrace_method = VGA_RETRACE_DUMB;

>  int display_opengl;

>  const char* keyboard_layout = NULL;

> @@ -2890,6 +2891,11 @@ static void qemu_validate_options(void)

>            }

>      }

>  

> +    if (loadvm && !preconfig_exit_requested) {

> +        error_report("'preconfig' and 'loadvm' options are "

> +                     "mutually exclusive");

> +        exit(EXIT_FAILURE);

> +    }

>      if (incoming && !preconfig_exit_requested) {

>          error_report("'preconfig' and 'incoming' options are "

>                       "mutually exclusive");

> @@ -3175,7 +3181,6 @@ void qemu_init(int argc, char **argv, char **envp)

>      QemuOptsList *olist;

>      int optind;

>      const char *optarg;

> -    const char *loadvm = NULL;

>      MachineClass *machine_class;

>      const char *vga_model = NULL;

>      bool userconfig = true;
diff mbox series

Patch

diff --git a/softmmu/vl.c b/softmmu/vl.c
index 3316c5534c..c2a5ee61f9 100644
--- a/softmmu/vl.c
+++ b/softmmu/vl.c
@@ -124,6 +124,7 @@  static const char *mem_path;
 static const char *boot_order;
 static const char *boot_once;
 static const char *incoming;
+static const char *loadvm;
 enum vga_retrace_method vga_retrace_method = VGA_RETRACE_DUMB;
 int display_opengl;
 const char* keyboard_layout = NULL;
@@ -2890,6 +2891,11 @@  static void qemu_validate_options(void)
           }
     }
 
+    if (loadvm && !preconfig_exit_requested) {
+        error_report("'preconfig' and 'loadvm' options are "
+                     "mutually exclusive");
+        exit(EXIT_FAILURE);
+    }
     if (incoming && !preconfig_exit_requested) {
         error_report("'preconfig' and 'incoming' options are "
                      "mutually exclusive");
@@ -3175,7 +3181,6 @@  void qemu_init(int argc, char **argv, char **envp)
     QemuOptsList *olist;
     int optind;
     const char *optarg;
-    const char *loadvm = NULL;
     MachineClass *machine_class;
     const char *vga_model = NULL;
     bool userconfig = true;