Skip to content

Commit

Permalink
qdev: Rename unparenting callback
Browse files Browse the repository at this point in the history
In commit 667d22d (qdev: move bus
removal to object_unparent) a certain reviewer missed that a private
qdev_remove_from_bus() function was introduced in midst new-style
device_*() functions... Fix this.

Signed-off-by: Andreas Färber <afaerber@suse.de>
Cc: Paolo Bonzini <pbonzini@redhat.com>
Cc: Anthony Liguori <anthony@codemonkey.ws>
  • Loading branch information
afaerber committed Jan 1, 2013
1 parent 5928023 commit 9774b31
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions hw/qdev.c
Original file line number Diff line number Diff line change
Expand Up @@ -698,7 +698,7 @@ static void device_class_base_init(ObjectClass *class, void *data)
klass->props = NULL;
}

static void qdev_remove_from_bus(Object *obj)
static void device_remove_from_bus(Object *obj)
{
DeviceState *dev = DEVICE(obj);

Expand All @@ -707,7 +707,7 @@ static void qdev_remove_from_bus(Object *obj)

static void device_class_init(ObjectClass *class, void *data)
{
class->unparent = qdev_remove_from_bus;
class->unparent = device_remove_from_bus;
}

void device_reset(DeviceState *dev)
Expand Down

0 comments on commit 9774b31

Please sign in to comment.