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=-16.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT 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 C13DFC4320A for ; Mon, 2 Aug 2021 16:19:29 +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 854CC61029 for ; Mon, 2 Aug 2021 16:19:29 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 854CC61029 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=nongnu.org Received: from localhost ([::1]:48046 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mAaf2-000148-LS for qemu-devel@archiver.kernel.org; Mon, 02 Aug 2021 12:19:28 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:50876) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mAabV-0000xP-4K for qemu-devel@nongnu.org; Mon, 02 Aug 2021 12:15:52 -0400 Received: from mail-ed1-x52a.google.com ([2a00:1450:4864:20::52a]:40705) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mAabS-0006pR-TL for qemu-devel@nongnu.org; Mon, 02 Aug 2021 12:15:48 -0400 Received: by mail-ed1-x52a.google.com with SMTP id d6so17602030edt.7 for ; Mon, 02 Aug 2021 09:15:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=uKkyh3OYQ0mfw6Y9gyrWs6boJPfL3KQaIy+v+IFJpNM=; b=VuJjfKvsI8/T0P7XW2BhCywq/76rNm2HssiGQh9JdQr/km6lPqzrvm8/4/Id9/KbXe mV1NTHv7BSHQtjSOpOet2sWKfccgZU8ZCdmohFA9Rp0tQ+GKHOnZWT/Z1ZaI6+EmLZL/ QR2qkVeIR/9At4p72S0AscOW6gft5di1FrsAFMJJRZkkSLQ14tuHBkjv6HCpx7SuvblM 8OSLgQI67KTjUD5uy+l2i3BDHZwC3x405LC4az/1xQRtbYOabQoR+iTGdkobkk4KQnnq XhGV7QqduMzmpV/bP24TL0g/VVXVmXPuz3gBMMQLxNzYxwPFsQTAo8/cG+cSlfmbOiOZ 4+Gg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=uKkyh3OYQ0mfw6Y9gyrWs6boJPfL3KQaIy+v+IFJpNM=; b=dYjLEx9RqI4TdT2P/tBAe5Mnj5uY40Kdh9YCGyDnOnXs19fqQrMJYOauGGBDLcEANK AJ59pgCCOD5eIciVlKD3WERqW0IsqnapZAN8kyzDJz1EgHKF83vlbuqSoAkCWVT5sJZ8 aYdkVZ+IXc8/msOX9VmzfwzF9l3QnY9O6wgdLwmwkGy/i1c/GRorg34944IGzYMkSjws 3PJPIPIsgrityBJzzDm+eNisLzjWrddHWsrU63tNmbN7bRbg9TRQklmn6l991g17x81L nKe6gV21XrNlvnfPUoYBm5vnZg4t6V9QxT7y6U/XgFbXDHz+Xn/WE9TC2SV7w6B95IrY FaVg== X-Gm-Message-State: AOAM5337LYe3ydKB18tW2Oe6yGbe0l8kYezb9K+BTb3kJxh0ycomJ2q2 LX1Im09/ZMWMwAZ0Dlex4hfZ/VrQPPZymA== X-Google-Smtp-Source: ABdhPJyJ+tiU0SuY2TaJepC34/Iw2HFFqaX1m++MHe/YjOXV6w58kHb5rSdg8UxEfacqROIWGSQJ3Q== X-Received: by 2002:a50:d71e:: with SMTP id t30mr19977187edi.72.1627920944036; Mon, 02 Aug 2021 09:15:44 -0700 (PDT) Received: from avogadro.lan ([2001:b07:6468:f312:c8dd:75d4:99ab:290a]) by smtp.gmail.com with ESMTPSA id f15sm4835144ejb.125.2021.08.02.09.15.43 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 Aug 2021 09:15:43 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 1/8] vl: introduce machine_merge_property Date: Mon, 2 Aug 2021 18:15:35 +0200 Message-Id: <20210802161542.381976-2-pbonzini@redhat.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210802161542.381976-1-pbonzini@redhat.com> References: <20210802161542.381976-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=2a00:1450:4864:20::52a; envelope-from=paolo.bonzini@gmail.com; helo=mail-ed1-x52a.google.com X-Spam_score_int: 4 X-Spam_score: 0.4 X-Spam_bar: / X-Spam_report: (0.4 / 5.0 requ) DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.25, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.25, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no 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: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" It will be used to parse smp-opts config groups from configuration files. The point to note is that it does not steal a reference from the caller. This is better because this function will be called from qemu_config_foreach's callback; qemu_config_foreach does not cede its reference to the qdict to the callback, and wants to free it. To balance that extra reference, machine_parse_property_opt now needs a qobject_unref. Signed-off-by: Paolo Bonzini --- softmmu/vl.c | 25 +++++++++++++++++++------ 1 file changed, 19 insertions(+), 6 deletions(-) diff --git a/softmmu/vl.c b/softmmu/vl.c index 4dee472c79..93aef8e747 100644 --- a/softmmu/vl.c +++ b/softmmu/vl.c @@ -1534,23 +1534,36 @@ static void machine_help_func(const QDict *qdict) } } +static void +machine_merge_property(const char *propname, QDict *prop, Error **errp) +{ + QDict *opts; + + opts = qdict_new(); + /* Preserve the caller's reference to prop. */ + qobject_ref(prop); + qdict_put(opts, propname, prop); + keyval_merge(machine_opts_dict, opts, errp); + qobject_unref(opts); +} + static void machine_parse_property_opt(QemuOptsList *opts_list, const char *propname, const char *arg, Error **errp) { - QDict *opts, *prop; + QDict *prop = NULL; bool help = false; - ERRP_GUARD(); prop = keyval_parse(arg, opts_list->implied_opt_name, &help, errp); if (help) { qemu_opts_print_help(opts_list, true); exit(0); } - opts = qdict_new(); - qdict_put(opts, propname, prop); - keyval_merge(machine_opts_dict, opts, errp); - qobject_unref(opts); + if (!prop) { + return; + } + machine_merge_property(propname, prop, errp); + qobject_unref(prop); } static const char *pid_file; -- 2.31.1