@@ -1150,12 +1150,12 @@ static void device_finalize(Object *obj)
static void device_class_base_init(ObjectClass *class, void *data)
{
- DeviceClass *klass = DEVICE_CLASS(class);
+ DeviceClass *dc = DEVICE_CLASS(class);
/* We explicitly look up properties in the superclasses,
* so do not propagate them to the subclasses.
*/
- klass->props = NULL;
+ dc->props = NULL;
}
static void device_unparent(Object *obj)
@@ -1204,10 +1204,10 @@ static void device_class_init(ObjectClass *class, void *data)
void device_reset(DeviceState *dev)
{
- DeviceClass *klass = DEVICE_GET_CLASS(dev);
+ DeviceClass *dc = DEVICE_GET_CLASS(dev);
- if (klass->reset) {
- klass->reset(dev);
+ if (dc->reset) {
+ dc->reset(dev);
}
}
Use 'DeviceClass *dc' instead of 'klass'. Signed-off-by: Eduardo Habkost <ehabkost@redhat.com> --- hw/core/qdev.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)