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=-15.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,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 5BC23C6369E for ; Wed, 18 Nov 2020 16:47:14 +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 6EBEB20780 for ; Wed, 18 Nov 2020 16:47:13 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="TY2aMxOb" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 6EBEB20780 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]:52956 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kfQbw-0008E0-1N for qemu-devel@archiver.kernel.org; Wed, 18 Nov 2020 11:47:12 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:56836) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kfQaj-0007fQ-Av for qemu-devel@nongnu.org; Wed, 18 Nov 2020 11:45:57 -0500 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:51974) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kfQag-0005g2-EQ for qemu-devel@nongnu.org; Wed, 18 Nov 2020 11:45:56 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1605717953; 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=Yjx1MXZ8UU4IYy70FjZTg9iARFJDhuu+tRix2YUkQxc=; b=TY2aMxObe6O5Ay2xgySNAaSHBufSyspk3MWbCovgRRcaywQMcjRhcosIO/JXW5ZcpGorsF j7sRO4T0hojXljcVDEcGVngURU1qgtKH847oG/Jkrzn25LhmXSBrRAjL1UCGQqlhxMnHdG e1Zav9HQHp7s6s++0ONZvh/+fnSuqLE= 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-249-06ssc9VEMqqqpH1aIlhYDQ-1; Wed, 18 Nov 2020 11:45:51 -0500 X-MC-Unique: 06ssc9VEMqqqpH1aIlhYDQ-1 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 87A261034AF1 for ; Wed, 18 Nov 2020 16:45:43 +0000 (UTC) Received: from localhost (unknown [10.40.208.12]) by smtp.corp.redhat.com (Postfix) with ESMTP id C1A4360BE2; Wed, 18 Nov 2020 16:45:42 +0000 (UTC) Date: Wed, 18 Nov 2020 17:45:40 +0100 From: Igor Mammedov To: Paolo Bonzini Subject: Re: [PATCH 19/29] vl: separate qemu_create_machine Message-ID: <20201118174540.6e31e063@redhat.com> In-Reply-To: <20201027182144.3315885-20-pbonzini@redhat.com> References: <20201027182144.3315885-1-pbonzini@redhat.com> <20201027182144.3315885-20-pbonzini@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 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/18 00:38:29 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_H3=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:34 -0400 Paolo Bonzini wrote: > Signed-off-by: Paolo Bonzini Reviewed-by: Igor Mammedov > --- > softmmu/vl.c | 111 +++++++++++++++++++++++++++------------------------ > 1 file changed, 59 insertions(+), 52 deletions(-) > > diff --git a/softmmu/vl.c b/softmmu/vl.c > index 0c390b979e..38ad3cc895 100644 > --- a/softmmu/vl.c > +++ b/softmmu/vl.c > @@ -133,6 +133,8 @@ static const char *boot_order; > static const char *boot_once; > static const char *incoming; > static const char *loadvm; > +static ram_addr_t maxram_size; > +static uint64_t ram_slots; > static int display_remote; > static int snapshot; > static QemuPluginList plugin_list = QTAILQ_HEAD_INITIALIZER(plugin_list); > @@ -2791,8 +2793,13 @@ static void qemu_create_late_backends(void) > qemu_semihosting_console_init(); > } > > -static bool set_memory_options(uint64_t *ram_slots, ram_addr_t *maxram_size, > - MachineClass *mc) > +static bool have_custom_ram_size(void) > +{ > + QemuOpts *opts = qemu_find_opts_singleton("memory"); > + return !!qemu_opt_get(opts, "size"); > +} > + > +static void set_memory_options(MachineClass *mc) > { > uint64_t sz; > const char *mem_str; > @@ -2842,7 +2849,7 @@ static bool set_memory_options(uint64_t *ram_slots, ram_addr_t *maxram_size, > > /* store value for the future use */ > qemu_opt_set_number(opts, "size", ram_size, &error_abort); > - *maxram_size = ram_size; > + maxram_size = ram_size; > > if (qemu_opt_get(opts, "maxmem")) { > uint64_t slots; > @@ -2863,15 +2870,58 @@ static bool set_memory_options(uint64_t *ram_slots, ram_addr_t *maxram_size, > exit(EXIT_FAILURE); > } > > - *maxram_size = sz; > - *ram_slots = slots; > + maxram_size = sz; > + ram_slots = slots; > } else if (qemu_opt_get(opts, "slots")) { > error_report("invalid -m option value: missing 'maxmem' option"); > exit(EXIT_FAILURE); > } > > loc_pop(&loc); > - return !!mem_str; > +} > + > +static void qemu_create_machine(MachineClass *machine_class) > +{ > + object_set_machine_compat_props(machine_class->compat_props); > + > + set_memory_options(machine_class); > + > + current_machine = MACHINE(object_new_with_class(OBJECT_CLASS(machine_class))); > + if (machine_help_func(qemu_get_machine_opts(), current_machine)) { > + exit(0); > + } > + object_property_add_child(object_get_root(), "machine", > + OBJECT(current_machine)); > + object_property_add_child(container_get(OBJECT(current_machine), > + "/unattached"), > + "sysbus", OBJECT(sysbus_get_default())); > + > + if (machine_class->minimum_page_bits) { > + if (!set_preferred_target_page_bits(machine_class->minimum_page_bits)) { > + /* This would be a board error: specifying a minimum smaller than > + * a target's compile-time fixed setting. > + */ > + g_assert_not_reached(); > + } > + } > + > + cpu_exec_init_all(); > + > + if (machine_class->hw_version) { > + qemu_set_hw_version(machine_class->hw_version); > + } > + > + machine_smp_parse(current_machine, > + qemu_opts_find(qemu_find_opts("smp-opts"), NULL), &error_fatal); > + > + /* > + * Get the default machine options from the machine if it is not already > + * specified either by the configuration file or by the command line. > + */ > + if (machine_class->default_machine_opts) { > + qemu_opts_set_defaults(qemu_find_opts("machine"), > + machine_class->default_machine_opts, 0); > + } > } > > static int global_init_func(void *opaque, QemuOpts *opts, Error **errp) > @@ -3412,10 +3462,7 @@ void qemu_init(int argc, char **argv, char **envp) > const char *optarg; > MachineClass *machine_class; > bool userconfig = true; > - ram_addr_t maxram_size; > - uint64_t ram_slots = 0; > FILE *vmstate_dump_file = NULL; > - bool have_custom_ram_size; > > qemu_add_opts(&qemu_drive_opts); > qemu_add_drive_opts(&qemu_legacy_drive_opts); > @@ -4344,48 +4391,7 @@ void qemu_init(int argc, char **argv, char **envp) > > configure_rtc(qemu_find_opts_singleton("rtc")); > > - machine_class = select_machine(); > - object_set_machine_compat_props(machine_class->compat_props); > - > - have_custom_ram_size = set_memory_options(&ram_slots, &maxram_size, > - machine_class); > - > - current_machine = MACHINE(object_new_with_class(OBJECT_CLASS(machine_class))); > - if (machine_help_func(qemu_get_machine_opts(), current_machine)) { > - exit(0); > - } > - object_property_add_child(object_get_root(), "machine", > - OBJECT(current_machine)); > - object_property_add_child(container_get(OBJECT(current_machine), > - "/unattached"), > - "sysbus", OBJECT(sysbus_get_default())); > - > - if (machine_class->minimum_page_bits) { > - if (!set_preferred_target_page_bits(machine_class->minimum_page_bits)) { > - /* This would be a board error: specifying a minimum smaller than > - * a target's compile-time fixed setting. > - */ > - g_assert_not_reached(); > - } > - } > - > - cpu_exec_init_all(); > - > - if (machine_class->hw_version) { > - qemu_set_hw_version(machine_class->hw_version); > - } > - > - machine_smp_parse(current_machine, > - qemu_opts_find(qemu_find_opts("smp-opts"), NULL), &error_fatal); > - > - /* > - * Get the default machine options from the machine if it is not already > - * specified either by the configuration file or by the command line. > - */ > - if (machine_class->default_machine_opts) { > - qemu_opts_set_defaults(qemu_find_opts("machine"), > - machine_class->default_machine_opts, 0); > - } > + qemu_create_machine(select_machine()); > > qemu_disable_default_devices(); > qemu_create_default_devices(); > @@ -4420,6 +4426,7 @@ void qemu_init(int argc, char **argv, char **envp) > * called from configure_accelerator(). > */ > > + machine_class = MACHINE_GET_CLASS(current_machine); > if (!qtest_enabled() && machine_class->deprecation_reason) { > error_report("Machine type '%s' is deprecated: %s", > machine_class->name, machine_class->deprecation_reason); > @@ -4473,7 +4480,7 @@ void qemu_init(int argc, char **argv, char **envp) > exit(EXIT_FAILURE); > } > backend_size = object_property_get_uint(backend, "size", &error_abort); > - if (have_custom_ram_size && backend_size != ram_size) { > + if (have_custom_ram_size() && backend_size != ram_size) { > error_report("Size specified by -m option must match size of " > "explicitly specified 'memory-backend' property"); > exit(EXIT_FAILURE);