From nobody Tue Apr 23 09:00:03 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1659694984; cv=none; d=zohomail.com; s=zohoarc; b=AE4izgWbm0pMZGt3Uimy1VkmWAZKFwXjT1luh3sWqOziiI3rs09J/0V3SQNW7GEDzI89j4XpdSLv8jSE10Mqkwym7Uw4xPTVtDMQucEF0i1lcfI347APaTgSxWB5SKBEt4dLkGZXhD+QQv5mAg5NnQNFVUI8W1ZW42ZopDMhFxo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1659694984; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=ISoLksDUePbFndvi/34uIim8xuuUc/NaEER9GufN9wM=; b=hDsH8I0CG7HoIS6twXR5cqJvJGL/tc5moO7SRMQDdkN7IQhGFsi1jFuh/Lv5uNPcevtIQS2PKm58yOaLY2upC+TNxm9jfHv17y/aFO4QMf37Vx/4gP0z5vMX1EcK5L3j5Gn3Vl3DOBFW7DXgh5t7UomNGJsPWChr7KDQjUQRGn4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1659694984680106.7928688639139; Fri, 5 Aug 2022 03:23:04 -0700 (PDT) Received: from localhost ([::1]:40324 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oJuTv-00045X-Dc for importer@patchew.org; Fri, 05 Aug 2022 06:23:03 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54264) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oJuE9-0005up-2r for qemu-devel@nongnu.org; Fri, 05 Aug 2022 06:06:56 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:41698) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oJuE6-0005td-1z for qemu-devel@nongnu.org; Fri, 05 Aug 2022 06:06:43 -0400 Received: from mail-ej1-f71.google.com (mail-ej1-f71.google.com [209.85.218.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-550-8HFHl9I8MVeNBWzwTP7xUw-1; Fri, 05 Aug 2022 06:06:40 -0400 Received: by mail-ej1-f71.google.com with SMTP id hp22-20020a1709073e1600b007309edc4089so1045941ejc.9 for ; Fri, 05 Aug 2022 03:06:39 -0700 (PDT) Received: from goa-sendmail ([93.56.169.144]) by smtp.gmail.com with ESMTPSA id b13-20020aa7c6cd000000b0043d3e06519fsm1809033eds.57.2022.08.05.03.06.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 05 Aug 2022 03:06:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1659694001; 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; bh=ISoLksDUePbFndvi/34uIim8xuuUc/NaEER9GufN9wM=; b=aPlHFBu0S+QXokp/OYRzWQdpC46jSRZ6W1tp1k5dCfmRQ8fBgFEprkAZlPI1DbeUXur0Jt 3ASJ/OGA0SUg/LsvlZIvV1tDQiOWXMSQbRb10QQwnlxVyIYmEVzVQYbPXSaxU5rvm7Chei lpAoqQHzXl19LDsZMa1I0sFUwqW3kHM= X-MC-Unique: 8HFHl9I8MVeNBWzwTP7xUw-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc; bh=ISoLksDUePbFndvi/34uIim8xuuUc/NaEER9GufN9wM=; b=x7HNbw1pgF8WnnDa400S2Hd3UXiOo7imIjyGD2+JV1ujfty0D9yt5l7mhaNunSffLj lC9m2kwZ85kDDL1ugPA9rfpKIVCo4rLvBe+FV4t4qPfalAcxe3E6kRA29MchntxxwrL+ uuDLR2ZUwmK+W/BvZZ7tqcRUXJ2kISOJwt9oV1YDODoyI2vfcu9RmgSQHvY6s7yx7IFB L3YUzSClLr5KhyxiT5kvY6fj/BQbBnNieZ7Og4IYho3WZUFbsvfdNIzfpPTqFb5ufdT9 J/8RuwqsLGYqdKXC3A9dBSlnp09tu7OEs3glC6flLdRfi3r7HNwFvfhp3NLP/R1XY28m xoGQ== X-Gm-Message-State: ACgBeo11qMOAkaj9/zllvcgFSdQm3VP2JrNaDG/NATaAP5uIObNB5LfC eWKEfWwuXokxuO+oJtps2G9D2blzTi7zBEI64vkVqZ8h5pr7l9FHNrDuKmuj/WRoB7mC5w4xcVv wZAl9DKFRVwzP+Lw2wxXanLG/RW/rAcz9ZpdBoyzhbVvRISfPmfVWNnOYXxxynu15hQc= X-Received: by 2002:a05:6402:280f:b0:43d:f946:a895 with SMTP id h15-20020a056402280f00b0043df946a895mr6013240ede.229.1659693998701; Fri, 05 Aug 2022 03:06:38 -0700 (PDT) X-Google-Smtp-Source: AA6agR7+u3Hn3Un1VthyjryAI/GrLfwDUsuf9fTJL7XzT1eVHrCSLYhedfWnnEIRdZel5NWCSV5uow== X-Received: by 2002:a05:6402:280f:b0:43d:f946:a895 with SMTP id h15-20020a056402280f00b0043df946a895mr6013166ede.229.1659693997368; Fri, 05 Aug 2022 03:06:37 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: Markus Armbruster Subject: [PATCH for-7.1] vl: fix [memory] section with -readconfig Date: Fri, 5 Aug 2022 12:06:35 +0200 Message-Id: <20220805100635.493961-1-pbonzini@redhat.com> X-Mailer: git-send-email 2.37.1 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -21 X-Spam_score: -2.2 X-Spam_bar: -- X-Spam_report: (-2.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.082, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1659694986131100003 Content-Type: text/plain; charset="utf-8" The -M memory.* options do not have magic applied to them than the -m option, namely no "M" (for mebibytes) is tacked at the end of a suffixless value for "-M memory.size". This magic is performed by parse_memory_options, and we have to do it for both "-m" and the [memory] section of a config file. Storing [memory] sections directly to machine_opts_dict changed the meaning of [memory] size =3D "1024" in a -readconfig file from 1024MiB to 8KiB (1024 Bytes rounded up to 8KiB silently). To avoid this, the [memory] section has to be changed back to QemuOpts (combining [memory] and "-m" will work fine thanks to .merge_lists being true). Change parse_memory_options() so that, similar to the older function set_memory_options(), it operates after command line parsing is done; and also call it where set_memory_options() used to be. Note, the parsing code uses exit(1) instead of exit(EXIT_FAILURE) to match neighboring code. Reported-by: Markus Armbruster Fixes: ce9d03fb3f ("machine: add mem compound property", 2022-05-12) Signed-off-by: Paolo Bonzini Reviewed-by: Daniel P. Berrang=C3=A9 Tested-by: Daniel P. Berrang=C3=A9 --- softmmu/vl.c | 25 ++++++++++++++++--------- 1 file changed, 16 insertions(+), 9 deletions(-) diff --git a/softmmu/vl.c b/softmmu/vl.c index aabd82e09a..3c23f266e9 100644 --- a/softmmu/vl.c +++ b/softmmu/vl.c @@ -1947,17 +1947,20 @@ static void qemu_resolve_machine_memdev(void) } } =20 -static void parse_memory_options(const char *arg) +static void parse_memory_options(void) { - QemuOpts *opts; + QemuOpts *opts =3D qemu_find_opts_singleton("memory"); QDict *dict, *prop; const char *mem_str; + Location loc; =20 - opts =3D qemu_opts_parse_noisily(qemu_find_opts("memory"), arg, true); if (!opts) { - exit(EXIT_FAILURE); + return; } =20 + loc_push_none(&loc); + qemu_opts_loc_restore(opts); + prop =3D qdict_new(); =20 if (qemu_opt_get_size(opts, "size", 0) !=3D 0) { @@ -1987,6 +1990,7 @@ static void parse_memory_options(const char *arg) qdict_put(dict, "memory", prop); keyval_merge(machine_opts_dict, dict, &error_fatal); qobject_unref(dict); + loc_pop(&loc); } =20 static void qemu_create_machine(QDict *qdict) @@ -2053,8 +2057,7 @@ static bool is_qemuopts_group(const char *group) if (g_str_equal(group, "object") || g_str_equal(group, "machine") || g_str_equal(group, "smp-opts") || - g_str_equal(group, "boot-opts") || - g_str_equal(group, "memory")) { + g_str_equal(group, "boot-opts")) { return false; } return true; @@ -2078,8 +2081,6 @@ static void qemu_record_config_group(const char *grou= p, QDict *dict, machine_merge_property("smp", dict, &error_fatal); } else if (g_str_equal(group, "boot-opts")) { machine_merge_property("boot", dict, &error_fatal); - } else if (g_str_equal(group, "memory")) { - machine_merge_property("memory", dict, &error_fatal); } else { abort(); } @@ -2882,7 +2883,10 @@ void qemu_init(int argc, char **argv, char **envp) exit(0); break; case QEMU_OPTION_m: - parse_memory_options(optarg); + opts =3D qemu_opts_parse_noisily(qemu_find_opts("memory"),= optarg, true); + if (opts =3D=3D NULL) { + exit(1); + } break; #ifdef CONFIG_TPM case QEMU_OPTION_tpmdev: @@ -3515,6 +3519,9 @@ void qemu_init(int argc, char **argv, char **envp) =20 configure_rtc(qemu_find_opts_singleton("rtc")); =20 + /* Transfer QemuOpts options into machine options */ + parse_memory_options(); + qemu_create_machine(machine_opts_dict); =20 suspend_mux_open(); --=20 2.37.1