From patchwork Sat Jul 21 12:27:04 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Hajnoczi X-Patchwork-Id: 172427 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 083F92C0328 for ; Sat, 21 Jul 2012 22:27:42 +1000 (EST) Received: from localhost ([::1]:54255 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SsYmZ-0008OQ-WF for incoming@patchwork.ozlabs.org; Sat, 21 Jul 2012 08:27:40 -0400 Received: from eggs.gnu.org ([208.118.235.92]:58498) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SsYmH-0008Bv-7r for qemu-devel@nongnu.org; Sat, 21 Jul 2012 08:27:22 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SsYmF-0004s7-K5 for qemu-devel@nongnu.org; Sat, 21 Jul 2012 08:27:21 -0400 Received: from e06smtp10.uk.ibm.com ([195.75.94.106]:58695) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SsYmF-0004rt-C9 for qemu-devel@nongnu.org; Sat, 21 Jul 2012 08:27:19 -0400 Received: from /spool/local by e06smtp10.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Sat, 21 Jul 2012 13:27:18 +0100 Received: from d06nrmr1507.portsmouth.uk.ibm.com (9.149.38.233) by e06smtp10.uk.ibm.com (192.168.101.140) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Sat, 21 Jul 2012 13:27:16 +0100 Received: from d06av05.portsmouth.uk.ibm.com (d06av05.portsmouth.uk.ibm.com [9.149.37.229]) by d06nrmr1507.portsmouth.uk.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id q6LCRF6v2109602 for ; Sat, 21 Jul 2012 13:27:15 +0100 Received: from d06av05.portsmouth.uk.ibm.com (loopback [127.0.0.1]) by d06av05.portsmouth.uk.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id q6LCRF9g009920 for ; Sat, 21 Jul 2012 06:27:15 -0600 Received: from localhost (sig-9-146-168-221.uk.ibm.com [9.146.168.221]) by d06av05.portsmouth.uk.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with ESMTP id q6LCRE9k009914; Sat, 21 Jul 2012 06:27:15 -0600 From: Stefan Hajnoczi To: Anthony Liguori Date: Sat, 21 Jul 2012 13:27:04 +0100 Message-Id: <1342873625-7979-6-git-send-email-stefanha@linux.vnet.ibm.com> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1342873625-7979-1-git-send-email-stefanha@linux.vnet.ibm.com> References: <1342873625-7979-1-git-send-email-stefanha@linux.vnet.ibm.com> x-cbid: 12072112-4966-0000-0000-000003019E92 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 195.75.94.106 Cc: Stefan Weil , qemu-devel@nongnu.org, Stefan Hajnoczi Subject: [Qemu-devel] [PATCH 5/6] qdev: Fix Open Firmware comment 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 From: Stefan Weil Commit 0d936928ef87ca1bb7b41b5b89c400c699a7691c removed code, but left the related comment at a location where it no longer belongs to. The patch moves the comment to the correct callback and improves the text. Signed-off-by: Stefan Weil Signed-off-by: Stefan Hajnoczi --- hw/qdev.h | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/hw/qdev.h b/hw/qdev.h index 247dd1e..a2cbd9d 100644 --- a/hw/qdev.h +++ b/hw/qdev.h @@ -78,12 +78,6 @@ struct DeviceState { int alias_required_for_version; }; -/* - * This callback is used to create Open Firmware device path in accordance with - * OF spec http://forthworks.com/standards/of1275.pdf. Indicidual bus bindings - * can be found here http://playground.sun.com/1275/bindings/. - */ - #define TYPE_BUS "bus" #define BUS(obj) OBJECT_CHECK(BusState, (obj), TYPE_BUS) #define BUS_CLASS(klass) OBJECT_CLASS_CHECK(BusClass, (klass), TYPE_BUS) @@ -95,6 +89,11 @@ struct BusClass { /* FIXME first arg should be BusState */ void (*print_dev)(Monitor *mon, DeviceState *dev, int indent); char *(*get_dev_path)(DeviceState *dev); + /* + * This callback is used to create Open Firmware device path in accordance + * with OF spec http://forthworks.com/standards/of1275.pdf. Individual bus + * bindings can be found at http://playground.sun.com/1275/bindings/. + */ char *(*get_fw_dev_path)(DeviceState *dev); int (*reset)(BusState *bus); };