From patchwork Tue Nov 27 01:04:32 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Andreas_F=C3=A4rber?= X-Patchwork-Id: 202059 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 307ED2C008D for ; Tue, 27 Nov 2012 12:04:53 +1100 (EST) Received: from localhost ([::1]:38052 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Td9bX-00018P-B6 for incoming@patchwork.ozlabs.org; Mon, 26 Nov 2012 20:04:51 -0500 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 Received: from relay1.suse.de (unknown [195.135.220.254]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mx2.suse.de (Postfix) with ESMTP id 8B3A7A38EA; Tue, 27 Nov 2012 02:04:42 +0100 (CET) From: =?UTF-8?q?Andreas=20F=C3=A4rber?= To: qemu-devel@nongnu.org Date: Tue, 27 Nov 2012 02:04:32 +0100 Message-Id: <1353978272-12844-1-git-send-email-afaerber@suse.de> X-Mailer: git-send-email 1.7.10.4 MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4.x X-Received-From: 195.135.220.15 Cc: Paolo Bonzini , =?UTF-8?q?Andreas=20F=C3=A4rber?= , Anthony Liguori Subject: [Qemu-devel] [PATCH] qdev: Rename unparenting callback X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org 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ärber Cc: Paolo Bonzini Cc: Anthony Liguori --- hw/qdev.c | 4 ++-- 1 Datei geändert, 2 Zeilen hinzugefügt(+), 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 = NULL; } -static void qdev_remove_from_bus(Object *obj) +static void device_remove_from_bus(Object *obj) { DeviceState *dev = DEVICE(obj); @@ -718,7 +718,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)