[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [RFC v2 5/9] Make class parameter const at some functions
From: |
Eduardo Habkost |
Subject: |
[Qemu-devel] [RFC v2 5/9] Make class parameter const at some functions |
Date: |
Wed, 29 Mar 2017 16:41:44 -0300 |
There are many functions that don't need a non-const class
pointer argument. Change them to accept a const argument. This
will allow us to change class pointer variables to const in most
of the code.
Signed-off-by: Eduardo Habkost <address@hidden>
---
include/qom/object.h | 7 ++++---
gdbstub.c | 2 +-
qdev-monitor.c | 4 ++--
qom/object.c | 10 +++++-----
target/i386/cpu.c | 2 +-
target/ppc/translate_init.c | 2 +-
6 files changed, 14 insertions(+), 13 deletions(-)
diff --git a/include/qom/object.h b/include/qom/object.h
index 674a45862d..bb0be22ac7 100644
--- a/include/qom/object.h
+++ b/include/qom/object.h
@@ -885,7 +885,7 @@ const ObjectClass *object_class_get_parent_const(const
ObjectClass *klass);
*
* Returns: The QOM typename for @klass.
*/
-const char *object_class_get_name(ObjectClass *klass);
+const char *object_class_get_name(const ObjectClass *klass);
/**
* object_class_is_abstract:
@@ -893,7 +893,7 @@ const char *object_class_get_name(ObjectClass *klass);
*
* Returns: %true if @klass is abstract, %false otherwise.
*/
-bool object_class_is_abstract(ObjectClass *klass);
+bool object_class_is_abstract(const ObjectClass *klass);
/**
* object_class_by_name:
@@ -984,7 +984,8 @@ ObjectProperty *object_class_property_add(ObjectClass
*klass, const char *name,
*/
ObjectProperty *object_property_find(Object *obj, const char *name,
Error **errp);
-ObjectProperty *object_class_property_find(ObjectClass *klass, const char
*name,
+ObjectProperty *object_class_property_find(const ObjectClass *klass,
+ const char *name,
Error **errp);
typedef struct ObjectPropertyIterator {
diff --git a/gdbstub.c b/gdbstub.c
index 991115361e..3c7e5f3a96 100644
--- a/gdbstub.c
+++ b/gdbstub.c
@@ -573,7 +573,7 @@ static int memtox(char *buf, const char *mem, int len)
}
static const char *get_feature_xml(const char *p, const char **newp,
- CPUClass *cc)
+ const CPUClass *cc)
{
size_t len;
int i;
diff --git a/qdev-monitor.c b/qdev-monitor.c
index 5f2fcdfc45..339775e49d 100644
--- a/qdev-monitor.c
+++ b/qdev-monitor.c
@@ -77,7 +77,7 @@ static const QDevAlias qdev_alias_table[] = {
{ }
};
-static const char *qdev_class_get_alias(DeviceClass *dc)
+static const char *qdev_class_get_alias(const DeviceClass *dc)
{
const char *typename = object_class_get_name(OBJECT_CLASS(dc));
int i;
@@ -96,7 +96,7 @@ static const char *qdev_class_get_alias(DeviceClass *dc)
return NULL;
}
-static bool qdev_class_has_alias(DeviceClass *dc)
+static bool qdev_class_has_alias(const DeviceClass *dc)
{
return (qdev_class_get_alias(dc) != NULL);
}
diff --git a/qom/object.c b/qom/object.c
index 8f60ad9b8e..a25b1fffad 100644
--- a/qom/object.c
+++ b/qom/object.c
@@ -751,12 +751,12 @@ ObjectClass *object_get_class(Object *obj)
return obj->class;
}
-bool object_class_is_abstract(ObjectClass *klass)
+bool object_class_is_abstract(const ObjectClass *klass)
{
return klass->type->abstract;
}
-const char *object_class_get_name(ObjectClass *klass)
+const char *object_class_get_name(const ObjectClass *klass)
{
return klass->type->name;
}
@@ -1029,11 +1029,11 @@ ObjectProperty
*object_property_iter_next(ObjectPropertyIterator *iter)
return val;
}
-ObjectProperty *object_class_property_find(ObjectClass *klass, const char
*name,
- Error **errp)
+ObjectProperty *object_class_property_find(const ObjectClass *klass,
+ const char *name, Error **errp)
{
ObjectProperty *prop;
- ObjectClass *parent_klass;
+ const ObjectClass *parent_klass;
parent_klass = object_class_get_parent(klass);
if (parent_klass) {
diff --git a/target/i386/cpu.c b/target/i386/cpu.c
index 7aa762245a..b1d6252ae0 100644
--- a/target/i386/cpu.c
+++ b/target/i386/cpu.c
@@ -735,7 +735,7 @@ static ObjectClass *x86_cpu_class_by_name(const char
*cpu_model)
return oc;
}
-static char *x86_cpu_class_get_model_name(X86CPUClass *cc)
+static char *x86_cpu_class_get_model_name(const X86CPUClass *cc)
{
const char *class_name = object_class_get_name(OBJECT_CLASS(cc));
assert(g_str_has_suffix(class_name, X86_CPU_TYPE_SUFFIX));
diff --git a/target/ppc/translate_init.c b/target/ppc/translate_init.c
index c1a901455c..ee8ff04fd2 100644
--- a/target/ppc/translate_init.c
+++ b/target/ppc/translate_init.c
@@ -9773,7 +9773,7 @@ static int ppc_fixup_cpu(PowerPCCPU *cpu)
return 0;
}
-static inline bool ppc_cpu_is_valid(PowerPCCPUClass *pcc)
+static inline bool ppc_cpu_is_valid(const PowerPCCPUClass *pcc)
{
#ifdef TARGET_PPCEMB
return pcc->mmu_model == POWERPC_MMU_BOOKE ||
--
2.11.0.259.g40922b1
- [Qemu-devel] [RFC v2 0/9] qom: Make object_get_class()/*_GET_CLASS return const pointers, Eduardo Habkost, 2017/03/29
- [Qemu-devel] [RFC v2 2/9] Simplify code using *MACHINE_GET_CLASS, Eduardo Habkost, 2017/03/29
- [Qemu-devel] [RFC v2 1/9] configure: test if _Generic works as expected, Eduardo Habkost, 2017/03/29
- [Qemu-devel] [RFC v2 3/9] qom: QUALIFIED_CAST helper macro, Eduardo Habkost, 2017/03/29
- [Qemu-devel] [RFC v2 4/9] qom: Make object_class_get_parent() const-aware, Eduardo Habkost, 2017/03/29
- [Qemu-devel] [RFC v2 5/9] Make class parameter const at some functions,
Eduardo Habkost <=
- [Qemu-devel] [RFC v2 6/9] Explicitly cast the *_GET_CLASS() value when we break the rules, Eduardo Habkost, 2017/03/29
- [Qemu-devel] [RFC v2 8/9] qom: Make class cast macros/functions const-aware, Eduardo Habkost, 2017/03/29
- [Qemu-devel] [RFC v2 9/9] qom: Make object_get_class() return const pointer, Eduardo Habkost, 2017/03/29
- Re: [Qemu-devel] [RFC v2 0/9] qom: Make object_get_class()/*_GET_CLASS return const pointers, Laszlo Ersek, 2017/03/29
- Re: [Qemu-devel] [RFC v2 0/9] qom: Make object_get_class()/*_GET_CLASS return const pointers, Eduardo Habkost, 2017/03/29
- [Qemu-devel] [RFC v2 7/9] Use const variables for *_GET_CLASS values, Eduardo Habkost, 2017/03/29
- Re: [Qemu-devel] [RFC v2 0/9] qom: Make object_get_class()/*_GET_CLASS return const pointers, Paolo Bonzini, 2017/03/30