From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.9 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0EDDFC388F9 for ; Wed, 11 Nov 2020 19:40:02 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 1E62520825 for ; Wed, 11 Nov 2020 19:40:00 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="HSzNoTZi" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 1E62520825 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:46938 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kcvyJ-00024O-S0 for qemu-devel@archiver.kernel.org; Wed, 11 Nov 2020 14:39:59 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:33726) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kcvxa-0001dH-E3 for qemu-devel@nongnu.org; Wed, 11 Nov 2020 14:39:14 -0500 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:28262) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kcvxX-0004Ve-O7 for qemu-devel@nongnu.org; Wed, 11 Nov 2020 14:39:13 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1605123551; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=OsnXB15FAd8IYCJmNXlOd04Q8ftbsME7oeyUIAOEmkE=; b=HSzNoTZi9k7MZSdIZtKukhOGAzIjsRDbFv5oF2H98Qn04qGE3LZz9u12mtiuiyxaEt4Kui c5Z296Ar4R7f4jncKWMdcRW3zykXeuf6dIV5m8Wme/KQqlCdzqi6pY/ToysTRH9sow4fgJ 1aH+V9cP7WQBSNpR3Ynb5rl1wXpX5gg= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-395-A8RcUdDYOqeTzU_xFKfdAw-1; Wed, 11 Nov 2020 14:39:09 -0500 X-MC-Unique: A8RcUdDYOqeTzU_xFKfdAw-1 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 85C4B100746C for ; Wed, 11 Nov 2020 19:39:08 +0000 (UTC) Received: from localhost (unknown [10.40.208.29]) by smtp.corp.redhat.com (Postfix) with ESMTP id 9B8E47366A; Wed, 11 Nov 2020 19:39:07 +0000 (UTC) Date: Wed, 11 Nov 2020 20:39:06 +0100 From: Igor Mammedov To: Paolo Bonzini Subject: Re: [PATCH 09/29] vl: extract various command line validation snippets to a new function Message-ID: <20201111203906.47904860@redhat.com> In-Reply-To: <20201027182144.3315885-10-pbonzini@redhat.com> References: <20201027182144.3315885-1-pbonzini@redhat.com> <20201027182144.3315885-10-pbonzini@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=imammedo@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Received-SPF: pass client-ip=216.205.24.124; envelope-from=imammedo@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/11/11 01:49:01 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" On Tue, 27 Oct 2020 14:21:24 -0400 Paolo Bonzini wrote: > Signed-off-by: Paolo Bonzini Reviewed-by: Igor Mammedov > --- > hw/core/machine.c | 1 + > softmmu/vl.c | 78 +++++++++++++++++++++++------------------------ > 2 files changed, 40 insertions(+), 39 deletions(-) > > diff --git a/hw/core/machine.c b/hw/core/machine.c > index d84b84463c..f5e559c493 100644 > --- a/hw/core/machine.c > +++ b/hw/core/machine.c > @@ -878,6 +878,7 @@ static void machine_initfn(Object *obj) > ms->dump_guest_core = true; > ms->mem_merge = true; > ms->enable_graphics = true; > + ms->kernel_cmdline = g_strdup(""); > > if (mc->nvdimm_supported) { > Object *obj = OBJECT(ms); > diff --git a/softmmu/vl.c b/softmmu/vl.c > index f9bae50c27..3316c5534c 100644 > --- a/softmmu/vl.c > +++ b/softmmu/vl.c > @@ -123,6 +123,7 @@ static int data_dir_idx; > static const char *mem_path; > static const char *boot_order; > static const char *boot_once; > +static const char *incoming; > enum vga_retrace_method vga_retrace_method = VGA_RETRACE_DUMB; > int display_opengl; > const char* keyboard_layout = NULL; > @@ -2870,6 +2871,39 @@ static char *find_datadir(void) > return get_relocated_path(CONFIG_QEMU_DATADIR); > } > > +static void qemu_validate_options(void) > +{ > + QemuOpts *machine_opts = qemu_get_machine_opts(); > + const char *kernel_filename = qemu_opt_get(machine_opts, "kernel"); > + const char *initrd_filename = qemu_opt_get(machine_opts, "initrd"); > + const char *kernel_cmdline = qemu_opt_get(machine_opts, "append"); > + > + if (kernel_filename == NULL) { > + if (kernel_cmdline != NULL) { > + error_report("-append only allowed with -kernel option"); > + exit(1); > + } > + > + if (initrd_filename != NULL) { > + error_report("-initrd only allowed with -kernel option"); > + exit(1); > + } > + } > + > + if (incoming && !preconfig_exit_requested) { > + error_report("'preconfig' and 'incoming' options are " > + "mutually exclusive"); > + exit(EXIT_FAILURE); > + } > + > +#ifdef CONFIG_CURSES > + if (is_daemonized() && dpy.type == DISPLAY_TYPE_CURSES) { > + error_report("curses display cannot be used with -daemonize"); > + exit(1); > + } > +#endif > +} > + > static void qemu_process_early_options(void) > { > char **dirs; > @@ -3136,9 +3170,6 @@ void qemu_init(int argc, char **argv, char **envp) > { > int i; > int snapshot = 0; > - int linux_boot; > - const char *initrd_filename; > - const char *kernel_filename, *kernel_cmdline; > QemuOpts *opts, *machine_opts; > QemuOpts *icount_opts = NULL, *accel_opts = NULL; > QemuOptsList *olist; > @@ -3147,7 +3178,6 @@ void qemu_init(int argc, char **argv, char **envp) > const char *loadvm = NULL; > MachineClass *machine_class; > const char *vga_model = NULL; > - const char *incoming = NULL; > bool userconfig = true; > bool nographic = false; > int display_remote = 0; > @@ -4068,6 +4098,8 @@ void qemu_init(int argc, char **argv, char **envp) > */ > loc_set_none(); > > + qemu_validate_options(); > + > /* These options affect everything else and should be processed > * before daemonizing. > */ > @@ -4082,12 +4114,6 @@ void qemu_init(int argc, char **argv, char **envp) > user_register_global_props(); > replay_configure(icount_opts); > > - if (incoming && !preconfig_exit_requested) { > - error_report("'preconfig' and 'incoming' options are " > - "mutually exclusive"); > - exit(EXIT_FAILURE); > - } > - > configure_rtc(qemu_find_opts_singleton("rtc")); > > machine_class = select_machine(); > @@ -4191,12 +4217,6 @@ void qemu_init(int argc, char **argv, char **envp) > error_report("-nographic cannot be used with -daemonize"); > exit(1); > } > -#ifdef CONFIG_CURSES > - if (dpy.type == DISPLAY_TYPE_CURSES) { > - error_report("curses display cannot be used with -daemonize"); > - exit(1); > - } > -#endif > } > > if (nographic) { > @@ -4327,11 +4347,6 @@ void qemu_init(int argc, char **argv, char **envp) > qtest_server_init(qtest_chrdev, qtest_log, &error_fatal); > } > > - machine_opts = qemu_get_machine_opts(); > - kernel_filename = qemu_opt_get(machine_opts, "kernel"); > - initrd_filename = qemu_opt_get(machine_opts, "initrd"); > - kernel_cmdline = qemu_opt_get(machine_opts, "append"); > - > opts = qemu_opts_find(qemu_find_opts("boot-opts"), NULL); > if (opts) { > boot_order = qemu_opt_get(opts, "order"); > @@ -4352,24 +4367,9 @@ void qemu_init(int argc, char **argv, char **envp) > boot_order = machine_class->default_boot_order; > } > > - if (!kernel_cmdline) { > - kernel_cmdline = ""; > - current_machine->kernel_cmdline = (char *)kernel_cmdline; > - } > - > - linux_boot = (kernel_filename != NULL); > - > - if (!linux_boot && *kernel_cmdline != '\0') { > - error_report("-append only allowed with -kernel option"); > - exit(1); > - } > - > - if (!linux_boot && initrd_filename != NULL) { > - error_report("-initrd only allowed with -kernel option"); > - exit(1); > - } > - > - if (semihosting_enabled() && !semihosting_get_argc() && kernel_filename) { > + if (semihosting_enabled() && !semihosting_get_argc()) { > + const char *kernel_filename = qemu_opt_get(machine_opts, "kernel"); > + const char *kernel_cmdline = qemu_opt_get(machine_opts, "append"); > /* fall back to the -kernel/-append */ > semihosting_arg_fallback(kernel_filename, kernel_cmdline); > }