From nobody Sun Nov 16 07:44:22 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; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1599088121; cv=none; d=zohomail.com; s=zohoarc; b=mX4/8Fg/ng0eHow5WlvC84C03z0ZXVqQAMzaQdL29BF61lWUPzg7hAozh0TZoP4YcPvgHbcL9wjGbB2uSMuEjSiBBwfE7NPuY4y7mi+Ksu8d9eqy0K3EvDyheS5+NRiS8IQ0hEu1Gl/dkH/WRNzkNWE+zASOOTOAQPWT0ceT1Vk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1599088121; 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=z8Pk5jOk8CB1YWjYJvidnNSb3NDcbzxHzKV0QpjlF2A=; b=QbMjpCIC27sVFlfiVCXS6afaOWuag5xfy3Xwm8Eu4+UZpCyT6KVi7Gd6d4+zXIbFdcAbvLh6x5fch+0UlC3jIQxiaepEHpdtEfWhZfACHNmaQFgE/+8qwoAWqPDVQsS2llAdWG3wCqS07yOwkeGeeQq7p2yqZm4gu++NpuQavI4= 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; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1599088121959959.6835667180108; Wed, 2 Sep 2020 16:08:41 -0700 (PDT) Received: from localhost ([::1]:46442 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kDbrt-0000WJ-86 for importer@patchew.org; Wed, 02 Sep 2020 19:08:41 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:35922) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kDbVn-00065T-Th for qemu-devel@nongnu.org; Wed, 02 Sep 2020 18:45:51 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:27928) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kDbVl-0000Hd-PA for qemu-devel@nongnu.org; Wed, 02 Sep 2020 18:45:51 -0400 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-309-yA__gHZPPmm4v4RazN5LUg-1; Wed, 02 Sep 2020 18:45:47 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 8B3858064BF for ; Wed, 2 Sep 2020 22:45:46 +0000 (UTC) Received: from localhost (ovpn-66-226.rdu2.redhat.com [10.10.66.226]) by smtp.corp.redhat.com (Postfix) with ESMTP id 574BF7EEA7; Wed, 2 Sep 2020 22:45:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1599086749; 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=z8Pk5jOk8CB1YWjYJvidnNSb3NDcbzxHzKV0QpjlF2A=; b=Yiz6l8o7z4iE7Ma8+O5wDDWJUA/1g2yjEZPpq5g4BPqEosB0VWymF97/bak9AyfVCp4yWL 7m86H32BGQx7X6IKEIYUtkcw60hJr1GgNiTS40+bEOPas21KwACXg/xkzfj6potOTNZtCK 2e9NlK5hFwKM2VKwq7DEs2+FlLMdTkg= X-MC-Unique: yA__gHZPPmm4v4RazN5LUg-1 From: Eduardo Habkost To: qemu-devel@nongnu.org Subject: [PATCH 61/63] tests: Rename TYPE_DUMMY to TYPE_DUMMY_OBJECT Date: Wed, 2 Sep 2020 18:43:09 -0400 Message-Id: <20200902224311.1321159-62-ehabkost@redhat.com> In-Reply-To: <20200902224311.1321159-1-ehabkost@redhat.com> References: <20200902224311.1321159-1-ehabkost@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=ehabkost@redhat.com X-Mimecast-Spam-Score: 0.002 X-Mimecast-Originator: redhat.com 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=216.205.24.124; envelope-from=ehabkost@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/09/02 17:54:06 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_H5=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: Paolo Bonzini , berrange@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) This will make the type name constant consistent with the name of the type checking macro. Signed-off-by: Eduardo Habkost --- Cc: Paolo Bonzini Cc: "Daniel P. Berrang=C3=A9" Cc: Eduardo Habkost Cc: qemu-devel@nongnu.org --- tests/check-qom-proplist.c | 30 +++++++++++++++--------------- tests/test-io-task.c | 14 +++++++------- 2 files changed, 22 insertions(+), 22 deletions(-) diff --git a/tests/check-qom-proplist.c b/tests/check-qom-proplist.c index 1571606c1c..b4b31c57d3 100644 --- a/tests/check-qom-proplist.c +++ b/tests/check-qom-proplist.c @@ -28,13 +28,13 @@ #include "qom/object_interfaces.h" =20 =20 -#define TYPE_DUMMY "qemu-dummy" +#define TYPE_DUMMY_OBJECT "qemu-dummy" =20 typedef struct DummyObject DummyObject; typedef struct DummyObjectClass DummyObjectClass; =20 DECLARE_INSTANCE_CHECKER(DummyObject, DUMMY_OBJECT, - TYPE_DUMMY) + TYPE_DUMMY_OBJECT) =20 typedef enum DummyAnimal DummyAnimal; =20 @@ -153,7 +153,7 @@ static void dummy_finalize(Object *obj) =20 =20 static const TypeInfo dummy_info =3D { - .name =3D TYPE_DUMMY, + .name =3D TYPE_DUMMY_OBJECT, .parent =3D TYPE_OBJECT, .instance_size =3D sizeof(DummyObject), .instance_init =3D dummy_init, @@ -337,7 +337,7 @@ static void test_dummy_createv(void) Error *err =3D NULL; Object *parent =3D object_get_objects_root(); DummyObject *dobj =3D DUMMY_OBJECT( - object_new_with_props(TYPE_DUMMY, + object_new_with_props(TYPE_DUMMY_OBJECT, parent, "dummy0", &err, @@ -366,7 +366,7 @@ static Object *new_helper(Error **errp, Object *obj; =20 va_start(vargs, parent); - obj =3D object_new_with_propv(TYPE_DUMMY, + obj =3D object_new_with_propv(TYPE_DUMMY_OBJECT, parent, "dummy0", errp, @@ -403,7 +403,7 @@ static void test_dummy_createcmdl(void) QemuOpts *opts; DummyObject *dobj; Error *err =3D NULL; - const char *params =3D TYPE_DUMMY \ + const char *params =3D TYPE_DUMMY_OBJECT \ ",id=3Ddev0," \ "bv=3Dyes,sv=3DHiss hiss hiss,av=3Dplatypus"; =20 @@ -443,7 +443,7 @@ static void test_dummy_badenum(void) Error *err =3D NULL; Object *parent =3D object_get_objects_root(); Object *dobj =3D - object_new_with_props(TYPE_DUMMY, + object_new_with_props(TYPE_DUMMY_OBJECT, parent, "dummy0", &err, @@ -470,7 +470,7 @@ static void test_dummy_getenum(void) int val; Object *parent =3D object_get_objects_root(); DummyObject *dobj =3D DUMMY_OBJECT( - object_new_with_props(TYPE_DUMMY, + object_new_with_props(TYPE_DUMMY_OBJECT, parent, "dummy0", &err, @@ -533,7 +533,7 @@ static void test_dummy_iterator(void) "bv"}; /* instance property */ Object *parent =3D object_get_objects_root(); DummyObject *dobj =3D DUMMY_OBJECT( - object_new_with_props(TYPE_DUMMY, + object_new_with_props(TYPE_DUMMY_OBJECT, parent, "dummy0", &error_abort, @@ -552,7 +552,7 @@ static void test_dummy_class_iterator(void) { const char *expected[] =3D { "type", "av", "sv" }; ObjectPropertyIterator iter; - ObjectClass *klass =3D object_class_by_name(TYPE_DUMMY); + ObjectClass *klass =3D object_class_by_name(TYPE_DUMMY_OBJECT); =20 object_class_property_iter_init(&iter, klass); test_dummy_prop_iterator(&iter, expected, ARRAY_SIZE(expected)); @@ -575,9 +575,9 @@ static void test_qom_partial_path(void) { Object *root =3D object_get_objects_root(); Object *cont1 =3D container_get(root, "/cont1"); - Object *obj1 =3D object_new(TYPE_DUMMY); - Object *obj2a =3D object_new(TYPE_DUMMY); - Object *obj2b =3D object_new(TYPE_DUMMY); + Object *obj1 =3D object_new(TYPE_DUMMY_OBJECT); + Object *obj2a =3D object_new(TYPE_DUMMY_OBJECT); + Object *obj2b =3D object_new(TYPE_DUMMY_OBJECT); bool ambiguous; =20 /* Objects created: @@ -594,9 +594,9 @@ static void test_qom_partial_path(void) object_unref(obj2b); =20 ambiguous =3D false; - g_assert(!object_resolve_path_type("", TYPE_DUMMY, &ambiguous)); + g_assert(!object_resolve_path_type("", TYPE_DUMMY_OBJECT, &ambiguous)); g_assert(ambiguous); - g_assert(!object_resolve_path_type("", TYPE_DUMMY, NULL)); + g_assert(!object_resolve_path_type("", TYPE_DUMMY_OBJECT, NULL)); =20 ambiguous =3D false; g_assert(!object_resolve_path("obj2", &ambiguous)); diff --git a/tests/test-io-task.c b/tests/test-io-task.c index 85e7a98da5..74b60f951a 100644 --- a/tests/test-io-task.c +++ b/tests/test-io-task.c @@ -25,7 +25,7 @@ #include "qapi/error.h" #include "qemu/module.h" =20 -#define TYPE_DUMMY "qemu:dummy" +#define TYPE_DUMMY_OBJECT "qemu:dummy" =20 typedef struct DummyObject DummyObject; typedef struct DummyObjectClass DummyObjectClass; @@ -40,7 +40,7 @@ struct DummyObjectClass { =20 static const TypeInfo dummy_info =3D { .parent =3D TYPE_OBJECT, - .name =3D TYPE_DUMMY, + .name =3D TYPE_DUMMY_OBJECT, .instance_size =3D sizeof(DummyObject), .class_size =3D sizeof(DummyObjectClass), }; @@ -65,7 +65,7 @@ static void task_callback(QIOTask *task, static void test_task_complete(void) { QIOTask *task; - Object *obj =3D object_new(TYPE_DUMMY); + Object *obj =3D object_new(TYPE_DUMMY_OBJECT); Object *src; struct TestTaskData data =3D { NULL, NULL, false }; =20 @@ -95,7 +95,7 @@ static void task_data_free(gpointer opaque) static void test_task_data_free(void) { QIOTask *task; - Object *obj =3D object_new(TYPE_DUMMY); + Object *obj =3D object_new(TYPE_DUMMY_OBJECT); struct TestTaskData data =3D { NULL, NULL, false }; =20 task =3D qio_task_new(obj, task_callback, &data, task_data_free); @@ -113,7 +113,7 @@ static void test_task_data_free(void) static void test_task_failure(void) { QIOTask *task; - Object *obj =3D object_new(TYPE_DUMMY); + Object *obj =3D object_new(TYPE_DUMMY_OBJECT); struct TestTaskData data =3D { NULL, NULL, false }; Error *err =3D NULL; =20 @@ -174,7 +174,7 @@ static void test_task_thread_callback(QIOTask *task, static void test_task_thread_complete(void) { QIOTask *task; - Object *obj =3D object_new(TYPE_DUMMY); + Object *obj =3D object_new(TYPE_DUMMY_OBJECT); struct TestThreadWorkerData data =3D { 0 }; GThread *self; =20 @@ -215,7 +215,7 @@ static void test_task_thread_complete(void) static void test_task_thread_failure(void) { QIOTask *task; - Object *obj =3D object_new(TYPE_DUMMY); + Object *obj =3D object_new(TYPE_DUMMY_OBJECT); struct TestThreadWorkerData data =3D { 0 }; GThread *self; =20 --=20 2.26.2