From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:59069) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Td9bQ-000179-Gv for qemu-devel@nongnu.org; Mon, 26 Nov 2012 20:04:45 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Td9bP-0001Tf-8U for qemu-devel@nongnu.org; Mon, 26 Nov 2012 20:04:44 -0500 Received: from cantor2.suse.de ([195.135.220.15]:51379 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Td9bP-0001TR-1b for qemu-devel@nongnu.org; Mon, 26 Nov 2012 20:04:43 -0500 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Tue, 27 Nov 2012 02:04:32 +0100 Message-Id: <1353978272-12844-1-git-send-email-afaerber@suse.de> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PATCH] qdev: Rename unparenting callback List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Paolo Bonzini , =?UTF-8?q?Andreas=20F=C3=A4rber?= , Anthony Liguori In commit 667d22d1ae59da46b4c1fbd094ca61145f19b8c3 (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=C3=A4rber Cc: Paolo Bonzini Cc: Anthony Liguori --- hw/qdev.c | 4 ++-- 1 Datei ge=C3=A4ndert, 2 Zeilen hinzugef=C3=BCgt(+), 2 Zeilen entfernt(-= ) diff --git a/hw/qdev.c b/hw/qdev.c index 788b4da..c17b6b2 100644 --- a/hw/qdev.c +++ b/hw/qdev.c @@ -709,7 +709,7 @@ static void device_class_base_init(ObjectClass *class= , void *data) klass->props =3D NULL; } =20 -static void qdev_remove_from_bus(Object *obj) +static void device_remove_from_bus(Object *obj) { DeviceState *dev =3D DEVICE(obj); =20 @@ -718,7 +718,7 @@ static void qdev_remove_from_bus(Object *obj) =20 static void device_class_init(ObjectClass *class, void *data) { - class->unparent =3D qdev_remove_from_bus; + class->unparent =3D device_remove_from_bus; } =20 void device_reset(DeviceState *dev) --=20 1.7.10.4