[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 61/63] tests: Rename TYPE_DUMMY to TYPE_DUMMY_OBJECT
From: |
Eduardo Habkost |
Subject: |
[PATCH 61/63] tests: Rename TYPE_DUMMY to TYPE_DUMMY_OBJECT |
Date: |
Wed, 2 Sep 2020 18:43:09 -0400 |
This will make the type name constant consistent with the name of
the type checking macro.
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
---
Cc: Paolo Bonzini <pbonzini@redhat.com>
Cc: "Daniel P. Berrangé" <berrange@redhat.com>
Cc: Eduardo Habkost <ehabkost@redhat.com>
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"
-#define TYPE_DUMMY "qemu-dummy"
+#define TYPE_DUMMY_OBJECT "qemu-dummy"
typedef struct DummyObject DummyObject;
typedef struct DummyObjectClass DummyObjectClass;
DECLARE_INSTANCE_CHECKER(DummyObject, DUMMY_OBJECT,
- TYPE_DUMMY)
+ TYPE_DUMMY_OBJECT)
typedef enum DummyAnimal DummyAnimal;
@@ -153,7 +153,7 @@ static void dummy_finalize(Object *obj)
static const TypeInfo dummy_info = {
- .name = TYPE_DUMMY,
+ .name = TYPE_DUMMY_OBJECT,
.parent = TYPE_OBJECT,
.instance_size = sizeof(DummyObject),
.instance_init = dummy_init,
@@ -337,7 +337,7 @@ static void test_dummy_createv(void)
Error *err = NULL;
Object *parent = object_get_objects_root();
DummyObject *dobj = 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;
va_start(vargs, parent);
- obj = object_new_with_propv(TYPE_DUMMY,
+ obj = 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 = NULL;
- const char *params = TYPE_DUMMY \
+ const char *params = TYPE_DUMMY_OBJECT \
",id=dev0," \
"bv=yes,sv=Hiss hiss hiss,av=platypus";
@@ -443,7 +443,7 @@ static void test_dummy_badenum(void)
Error *err = NULL;
Object *parent = object_get_objects_root();
Object *dobj =
- 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 = object_get_objects_root();
DummyObject *dobj = 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 = object_get_objects_root();
DummyObject *dobj = 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[] = { "type", "av", "sv" };
ObjectPropertyIterator iter;
- ObjectClass *klass = object_class_by_name(TYPE_DUMMY);
+ ObjectClass *klass = object_class_by_name(TYPE_DUMMY_OBJECT);
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 = object_get_objects_root();
Object *cont1 = container_get(root, "/cont1");
- Object *obj1 = object_new(TYPE_DUMMY);
- Object *obj2a = object_new(TYPE_DUMMY);
- Object *obj2b = object_new(TYPE_DUMMY);
+ Object *obj1 = object_new(TYPE_DUMMY_OBJECT);
+ Object *obj2a = object_new(TYPE_DUMMY_OBJECT);
+ Object *obj2b = object_new(TYPE_DUMMY_OBJECT);
bool ambiguous;
/* Objects created:
@@ -594,9 +594,9 @@ static void test_qom_partial_path(void)
object_unref(obj2b);
ambiguous = 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));
ambiguous = 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"
-#define TYPE_DUMMY "qemu:dummy"
+#define TYPE_DUMMY_OBJECT "qemu:dummy"
typedef struct DummyObject DummyObject;
typedef struct DummyObjectClass DummyObjectClass;
@@ -40,7 +40,7 @@ struct DummyObjectClass {
static const TypeInfo dummy_info = {
.parent = TYPE_OBJECT,
- .name = TYPE_DUMMY,
+ .name = TYPE_DUMMY_OBJECT,
.instance_size = sizeof(DummyObject),
.class_size = sizeof(DummyObjectClass),
};
@@ -65,7 +65,7 @@ static void task_callback(QIOTask *task,
static void test_task_complete(void)
{
QIOTask *task;
- Object *obj = object_new(TYPE_DUMMY);
+ Object *obj = object_new(TYPE_DUMMY_OBJECT);
Object *src;
struct TestTaskData data = { NULL, NULL, false };
@@ -95,7 +95,7 @@ static void task_data_free(gpointer opaque)
static void test_task_data_free(void)
{
QIOTask *task;
- Object *obj = object_new(TYPE_DUMMY);
+ Object *obj = object_new(TYPE_DUMMY_OBJECT);
struct TestTaskData data = { NULL, NULL, false };
task = 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 = object_new(TYPE_DUMMY);
+ Object *obj = object_new(TYPE_DUMMY_OBJECT);
struct TestTaskData data = { NULL, NULL, false };
Error *err = NULL;
@@ -174,7 +174,7 @@ static void test_task_thread_callback(QIOTask *task,
static void test_task_thread_complete(void)
{
QIOTask *task;
- Object *obj = object_new(TYPE_DUMMY);
+ Object *obj = object_new(TYPE_DUMMY_OBJECT);
struct TestThreadWorkerData data = { 0 };
GThread *self;
@@ -215,7 +215,7 @@ static void test_task_thread_complete(void)
static void test_task_thread_failure(void)
{
QIOTask *task;
- Object *obj = object_new(TYPE_DUMMY);
+ Object *obj = object_new(TYPE_DUMMY_OBJECT);
struct TestThreadWorkerData data = { 0 };
GThread *self;
--
2.26.2
- [PATCH 53/63] usb: Rename USB_SERIAL_DEV to USB_SERIAL, (continued)
- [PATCH 53/63] usb: Rename USB_SERIAL_DEV to USB_SERIAL, Eduardo Habkost, 2020/09/02
- [PATCH 54/63] usb: Rename USB_STORAGE_DEV to USB_STORAGE, Eduardo Habkost, 2020/09/02
- [PATCH 56/63] vmxnet3: Rename VMXNET3_DEVICE* to VMXNET3*, Eduardo Habkost, 2020/09/02
- [PATCH 55/63] vfio: Rename PCI_VFIO to VFIO_PCI, Eduardo Habkost, 2020/09/02
- [PATCH 58/63] hvf: Rename HVF_STATE to HVF_ACCEL, Eduardo Habkost, 2020/09/02
- [PATCH 57/63] xen: Rename XENBACKEND_DEVICE to XENBACKEND, Eduardo Habkost, 2020/09/02
- [PATCH 60/63] tcg: Rename TCG_STATE to TCG_ACCEL, Eduardo Habkost, 2020/09/02
- [PATCH 61/63] tests: Rename TYPE_DUMMY to TYPE_DUMMY_OBJECT,
Eduardo Habkost <=
- [PATCH 62/63] tests: Rename DYNAMIC_TYPE to DYNAMIC_PROPS, Eduardo Habkost, 2020/09/02
- [PATCH 63/63] tests: Rename STATIC_TYPE to STATIC_PROPS, Eduardo Habkost, 2020/09/02
- [PATCH 59/63] kvm: Rename KVM_STATE to KVM_ACCEL, Eduardo Habkost, 2020/09/02
- Re: [PATCH 00/63] qom: Rename macros for consistency, Eduardo Habkost, 2020/09/03