From nobody Tue Nov 18 11:48:52 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; 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 ARC-Seal: i=1; a=rsa-sha256; t=1610426912; cv=none; d=zohomail.com; s=zohoarc; b=G/ZBcDW5hsj2CUClLBLWx7Xv+vmPi7HDiXUGVfQtaSsUzJ/ZTfWBJ806Ash7hspZZQh8FCQ4JGF3m3ZuFSdd7XLc5QOY9UGgPxJBadO+5YnzOeC6huxy6Hfy62uVvgRwNS659wZTfTUsqOKPwkIajTivkMJrQzIT8ecreS8Z220= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1610426912; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=GRbDh45YYLhKhbeoY1uMw6ZYOhP8a8klGK+ZuUo2u+s=; b=frLc0Px1hsF/E35qB5UhsI8A8S+JKiiWb6ZQj9NWcEjqKTkaovRxPE/YnueWWWCtK0JQDZrhBwcIdyQdQMHLuQkTz56UgHoRbolUfG+LABN2JwPPPs02TgvUR+koihE2BRcDwnjhB506PPMFTL0CojrLFPpIrmiIngwArDY/yHI= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 16104269127151008.2704550821962; Mon, 11 Jan 2021 20:48:32 -0800 (PST) Received: from localhost ([::1]:44542 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kzBbb-0004zF-JD for importer@patchew.org; Mon, 11 Jan 2021 23:48:31 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:50378) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kzBYY-0002GJ-Cs; Mon, 11 Jan 2021 23:45:22 -0500 Received: from bilbo.ozlabs.org ([2401:3900:2:1::2]:38509 helo=ozlabs.org) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kzBYV-0007s9-4M; Mon, 11 Jan 2021 23:45:22 -0500 Received: by ozlabs.org (Postfix, from userid 1007) id 4DFJ0R0ngvz9sVt; Tue, 12 Jan 2021 15:45:11 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gibson.dropbear.id.au; s=201602; t=1610426711; bh=PMr7j5j8OSe0AP5kUuFMOJLePX4fph0iQtNNjr88kFA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=IyO4CMvILkilCi0JWCARsw9pWVnpQQHUiZQFsB2oGz2nfa8rsaoBYdcfFilGtKEiS eYDM5xU7NaUQIOBuGqKAGFkxqtIBYGEf7gxhi+Yme2qQ8lm/hl8fEhmklp5VN2NVOb jyGaQxNdDWqaE2qR6z/WB1l/4/qRbYdZ5mpjdBS0= From: David Gibson To: pasic@linux.ibm.com, brijesh.singh@amd.com, pair@us.ibm.com, dgilbert@redhat.com, qemu-devel@nongnu.org Subject: [PATCH v6 01/13] qom: Allow optional sugar props Date: Tue, 12 Jan 2021 15:44:56 +1100 Message-Id: <20210112044508.427338-2-david@gibson.dropbear.id.au> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210112044508.427338-1-david@gibson.dropbear.id.au> References: <20210112044508.427338-1-david@gibson.dropbear.id.au> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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=2401:3900:2:1::2; envelope-from=dgibson@ozlabs.org; helo=ozlabs.org X-Spam_score_int: -17 X-Spam_score: -1.8 X-Spam_bar: - X-Spam_report: (-1.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, HEADER_FROM_DIFFERENT_DOMAINS=0.249, SPF_HELO_PASS=-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: , Cc: Marcelo Tosatti , kvm@vger.kernel.org, david@redhat.com, frankja@linux.ibm.com, pragyansri.pathi@intel.com, mst@redhat.com, mdroth@linux.vnet.ibm.com, Christian Borntraeger , andi.kleen@intel.com, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , thuth@redhat.com, Eduardo Habkost , richard.henderson@linaro.org, Greg Kurz , qemu-s390x@nongnu.org, jun.nakajima@intel.com, David Gibson , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Cornelia Huck , qemu-ppc@nongnu.org, Paolo Bonzini Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) From: Greg Kurz Global properties have an @optional field, which allows to apply a given property to a given type even if one of its subclasses doesn't support it. This is especially used in the compat code when dealing with the "disable-modern" and "disable-legacy" properties and the "virtio-pci" type. Allow object_register_sugar_prop() to set this field as well. Signed-off-by: Greg Kurz Message-Id: <159738953558.377274.16617742952571083440.stgit@bahia.lan> Signed-off-by: David Gibson Reviewed-by: Eduardo Habkost Reviewed-by: Cornelia Huck Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- include/qom/object.h | 3 ++- qom/object.c | 4 +++- softmmu/rtc.c | 3 ++- softmmu/vl.c | 17 +++++++++++------ 4 files changed, 18 insertions(+), 9 deletions(-) diff --git a/include/qom/object.h b/include/qom/object.h index d378f13a11..6721cd312e 100644 --- a/include/qom/object.h +++ b/include/qom/object.h @@ -638,7 +638,8 @@ bool object_apply_global_props(Object *obj, const GPtrA= rray *props, Error **errp); void object_set_machine_compat_props(GPtrArray *compat_props); void object_set_accelerator_compat_props(GPtrArray *compat_props); -void object_register_sugar_prop(const char *driver, const char *prop, cons= t char *value); +void object_register_sugar_prop(const char *driver, const char *prop, + const char *value, bool optional); void object_apply_compat_props(Object *obj); =20 /** diff --git a/qom/object.c b/qom/object.c index 2fa0119647..491823db4a 100644 --- a/qom/object.c +++ b/qom/object.c @@ -442,7 +442,8 @@ static GPtrArray *object_compat_props[3]; * other than "-global". These are generally used for syntactic * sugar and legacy command line options. */ -void object_register_sugar_prop(const char *driver, const char *prop, cons= t char *value) +void object_register_sugar_prop(const char *driver, const char *prop, + const char *value, bool optional) { GlobalProperty *g; if (!object_compat_props[2]) { @@ -452,6 +453,7 @@ void object_register_sugar_prop(const char *driver, con= st char *prop, const char g->driver =3D g_strdup(driver); g->property =3D g_strdup(prop); g->value =3D g_strdup(value); + g->optional =3D optional; g_ptr_array_add(object_compat_props[2], g); } =20 diff --git a/softmmu/rtc.c b/softmmu/rtc.c index e1e15ef613..5632684fc9 100644 --- a/softmmu/rtc.c +++ b/softmmu/rtc.c @@ -179,7 +179,8 @@ void configure_rtc(QemuOpts *opts) if (!strcmp(value, "slew")) { object_register_sugar_prop("mc146818rtc", "lost_tick_policy", - "slew"); + "slew", + false); } else if (!strcmp(value, "none")) { /* discard is default */ } else { diff --git a/softmmu/vl.c b/softmmu/vl.c index 7ddf405d76..3f7721b83e 100644 --- a/softmmu/vl.c +++ b/softmmu/vl.c @@ -1663,16 +1663,20 @@ static int machine_set_property(void *opaque, return 0; } if (g_str_equal(qom_name, "igd-passthru")) { - object_register_sugar_prop(ACCEL_CLASS_NAME("xen"), qom_name, valu= e); + object_register_sugar_prop(ACCEL_CLASS_NAME("xen"), qom_name, valu= e, + false); return 0; } if (g_str_equal(qom_name, "kvm-shadow-mem")) { - object_register_sugar_prop(ACCEL_CLASS_NAME("kvm"), qom_name, valu= e); + object_register_sugar_prop(ACCEL_CLASS_NAME("kvm"), qom_name, valu= e, + false); return 0; } if (g_str_equal(qom_name, "kernel-irqchip")) { - object_register_sugar_prop(ACCEL_CLASS_NAME("kvm"), qom_name, valu= e); - object_register_sugar_prop(ACCEL_CLASS_NAME("whpx"), qom_name, val= ue); + object_register_sugar_prop(ACCEL_CLASS_NAME("kvm"), qom_name, valu= e, + false); + object_register_sugar_prop(ACCEL_CLASS_NAME("whpx"), qom_name, val= ue, + false); return 0; } =20 @@ -2297,9 +2301,10 @@ static void qemu_process_sugar_options(void) =20 val =3D g_strdup_printf("%d", (uint32_t) qemu_opt_get_number(qemu_find_opts_singleton("= smp-opts"), "cpus", 1)); - object_register_sugar_prop("memory-backend", "prealloc-threads", v= al); + object_register_sugar_prop("memory-backend", "prealloc-threads", v= al, + false); g_free(val); - object_register_sugar_prop("memory-backend", "prealloc", "on"); + object_register_sugar_prop("memory-backend", "prealloc", "on", fal= se); } =20 if (watchdog) { --=20 2.29.2