Received: by 2002:ac2:4c26:0:0:0:0:0 with SMTP id u6csp4351746lfq; Mon, 21 Sep 2020 15:16:41 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzxBvPHdQqDw2L6cc4WKIdVu9sUr035tvfTopj42MRxjkb+fZZP0LjgQlrqdfB/pjZ5bKRZ X-Received: by 2002:a25:ef4a:: with SMTP id w10mr2763457ybm.487.1600726601078; Mon, 21 Sep 2020 15:16:41 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1600726601; cv=none; d=google.com; s=arc-20160816; b=XHmmEClABE2UNjTR0VTU33d5eM4hUPUwrCfjhAtybiOvuizvI5ooSFcwfkEUC30qIz nWF1k8HkoQSA3Q4KngVIVpBnVRUgmyExoq87YT82tWjc81DwYFay0ShMGdYWPdVQexXk 2hza4vD9xxHswwL0ByZAt6LWSAIEvxQzBzQnEDRK5NoKD9S4Y3YjbijoG7ofE5fp1W7V 6xzJx6j/+P9qUaX1nGOgAJmeOLKGC+Rfvg0X6PCjB/1K5gjTZnD9umVF2c278qAxQaXG A8k/MKx9aioMIftOmCXryxxnE8DFKdkvuESpt37pqRTB6gkWrssaxFBNtqX+Vs7PUmL5 zIyw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=i4WApan/GZKTLeUW28LxUT+wI7HTy1waMMiyOA8pIHY=; b=iBRTcLnkNYJfly6Shz8l3trppzH9O8CdW9ieSBlNt26hWBydhHSlU/NDSUDTkQjCBK bRKcWxy9QdhhxBS2L9jtHSiQMEbob3R0uHFkZ2DVuO+rXVfIzwwdiHfKScneXyveLeHO K/og5XHAI2iDHydNB3FcrYwVfBqfoRt1dn8zQT6xinlO+NoMcLlomU1PjWjkz+rjaqnb 3/b7/CCDLxUc+0fVVtLtA9wgvErenbKs90mXqn5sRRdXzbrTxYRUWHkCrMDfMS14ZQ1y t+1ZYkg6SXdkf2w3BS/ww+Gqqi7lt8L0uIkf/idagmDJWO+MZ0WJEsO5UfZ5QygLv7GD +qNA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@redhat.com header.s=mimecast20190719 header.b=E1Dv92fj; spf=pass (google.com: domain of qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id v99si15307996ybi.151.2020.09.21.15.16.40 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 21 Sep 2020 15:16:41 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@redhat.com header.s=mimecast20190719 header.b=E1Dv92fj; spf=pass (google.com: domain of qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from localhost ([::1]:53204 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kKU6y-0006nt-Dt for alex.bennee@linaro.org; Mon, 21 Sep 2020 18:16:40 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59070) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kKU24-0000VF-TT for qemu-arm@nongnu.org; Mon, 21 Sep 2020 18:11:36 -0400 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:35598 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kKU21-0001fx-IH for qemu-arm@nongnu.org; Mon, 21 Sep 2020 18:11:36 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1600726291; 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=i4WApan/GZKTLeUW28LxUT+wI7HTy1waMMiyOA8pIHY=; b=E1Dv92fjkM+fExsLbN1pK7Z7q/TfeUpAAF8waHhaCT+Q+p9Fe4o7zueZtx7O+GLpCLTn4M a5597Wj33YQ0u4FsfF51/yhqG+iNZelGS4dEbUveJB0CEcGHGuC8agIzC7GTDzA0Hgx40N x1jm2uNHZ3nyXln8AEz/m7qJTPZO/18= 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-247-piy_bAwAM6O-cF3MAXLwEw-1; Mon, 21 Sep 2020 18:11:30 -0400 X-MC-Unique: piy_bAwAM6O-cF3MAXLwEw-1 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 93F72185FD70; Mon, 21 Sep 2020 22:11:28 +0000 (UTC) Received: from localhost (unknown [10.10.67.5]) by smtp.corp.redhat.com (Postfix) with ESMTP id 40C9616E20; Mon, 21 Sep 2020 22:11:28 +0000 (UTC) From: Eduardo Habkost To: qemu-devel@nongnu.org Subject: [PATCH 19/24] xlnx-zcu102: Register properties as class properties Date: Mon, 21 Sep 2020 18:10:40 -0400 Message-Id: <20200921221045.699690-20-ehabkost@redhat.com> In-Reply-To: <20200921221045.699690-1-ehabkost@redhat.com> References: <20200921221045.699690-1-ehabkost@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=ehabkost@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=207.211.31.120; envelope-from=ehabkost@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/09/21 18:11:08 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -35 X-Spam_score: -3.6 X-Spam_bar: --- X-Spam_report: (-3.6 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1.455, 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 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-arm@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Maydell , "Daniel P. Berrange" , Alistair Francis , qemu-arm@nongnu.org, Paolo Bonzini , John Snow Errors-To: qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org Sender: "Qemu-arm" X-TUID: Q9kxIFjXz0FF Class properties make QOM introspection simpler and easier, as they don't require an object to be instantiated. Signed-off-by: Eduardo Habkost --- Cc: Alistair Francis Cc: "Edgar E. Iglesias" Cc: Peter Maydell Cc: qemu-arm@nongnu.org Cc: qemu-devel@nongnu.org --- hw/arm/xlnx-zcu102.c | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/hw/arm/xlnx-zcu102.c b/hw/arm/xlnx-zcu102.c index 19d5a4d4e0e..4deb96bfcc1 100644 --- a/hw/arm/xlnx-zcu102.c +++ b/hw/arm/xlnx-zcu102.c @@ -208,20 +208,8 @@ static void xlnx_zcu102_machine_instance_init(Object *obj) /* Default to secure mode being disabled */ s->secure = false; - object_property_add_bool(obj, "secure", zcu102_get_secure, - zcu102_set_secure); - object_property_set_description(obj, "secure", - "Set on/off to enable/disable the ARM " - "Security Extensions (TrustZone)"); - /* Default to virt (EL2) being disabled */ s->virt = false; - object_property_add_bool(obj, "virtualization", zcu102_get_virt, - zcu102_set_virt); - object_property_set_description(obj, "virtualization", - "Set on/off to enable/disable emulating a " - "guest CPU which implements the ARM " - "Virtualization Extensions"); } static void xlnx_zcu102_machine_class_init(ObjectClass *oc, void *data) @@ -237,6 +225,19 @@ static void xlnx_zcu102_machine_class_init(ObjectClass *oc, void *data) mc->max_cpus = XLNX_ZYNQMP_NUM_APU_CPUS + XLNX_ZYNQMP_NUM_RPU_CPUS; mc->default_cpus = XLNX_ZYNQMP_NUM_APU_CPUS; mc->default_ram_id = "ddr-ram"; + + object_class_property_add_bool(oc, "secure", zcu102_get_secure, + zcu102_set_secure); + object_class_property_set_description(oc, "secure", + "Set on/off to enable/disable the ARM " + "Security Extensions (TrustZone)"); + + object_class_property_add_bool(oc, "virtualization", zcu102_get_virt, + zcu102_set_virt); + object_class_property_set_description(oc, "virtualization", + "Set on/off to enable/disable emulating a " + "guest CPU which implements the ARM " + "Virtualization Extensions"); } static const TypeInfo xlnx_zcu102_machine_init_typeinfo = { -- 2.26.2