From patchwork Mon Nov 26 00:12:14 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: 201610 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 CD5CF2C007D for ; Mon, 26 Nov 2012 12:35:34 +1100 (EST) Received: from localhost ([::1]:44268 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TcmM7-0001m0-RZ for incoming@patchwork.ozlabs.org; Sun, 25 Nov 2012 19:15:23 -0500 Received: from eggs.gnu.org ([208.118.235.92]:33411) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TcmKT-0007MB-AI for qemu-devel@nongnu.org; Sun, 25 Nov 2012 19:13:49 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TcmKS-0000Ft-8p for qemu-devel@nongnu.org; Sun, 25 Nov 2012 19:13:41 -0500 Received: from cantor2.suse.de ([195.135.220.15]:46155 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TcmKS-00007G-31 for qemu-devel@nongnu.org; Sun, 25 Nov 2012 19:13:40 -0500 Received: from relay2.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 224D0A2111; Mon, 26 Nov 2012 01:12:59 +0100 (CET) From: =?UTF-8?q?Andreas=20F=C3=A4rber?= To: qemu-devel@nongnu.org Date: Mon, 26 Nov 2012 01:12:14 +0100 Message-Id: <1353888766-6951-3-git-send-email-afaerber@suse.de> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1353888766-6951-1-git-send-email-afaerber@suse.de> References: <1353888766-6951-1-git-send-email-afaerber@suse.de> 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: =?UTF-8?q?Andreas=20F=C3=A4rber?= , anthony@codemonkey.ws Subject: [Qemu-devel] [RFC 02/34] qbus: QOM'ify qbus_realize() 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 Add the designated Error-reporting argument, even if currently unused. Signed-off-by: Andreas Färber --- hw/qdev.c | 6 +++--- 1 Datei geändert, 3 Zeilen hinzugefügt(+), 3 Zeilen entfernt(-) diff --git a/hw/qdev.c b/hw/qdev.c index c2d9b48..e7c9493 100644 --- a/hw/qdev.c +++ b/hw/qdev.c @@ -397,7 +397,7 @@ DeviceState *qdev_find_recursive(BusState *bus, const char *id) return NULL; } -static void qbus_realize(BusState *bus) +static void qbus_realize(BusState *bus, Error **err) { const char *typename = object_get_typename(OBJECT(bus)); char *buf; @@ -440,7 +440,7 @@ void qbus_create_inplace(BusState *bus, const char *typename, bus->parent = parent; bus->name = name ? g_strdup(name) : NULL; - qbus_realize(bus); + qbus_realize(bus, NULL); } BusState *qbus_create(const char *typename, DeviceState *parent, const char *name) @@ -452,7 +452,7 @@ BusState *qbus_create(const char *typename, DeviceState *parent, const char *nam bus->parent = parent; bus->name = name ? g_strdup(name) : NULL; - qbus_realize(bus); + qbus_realize(bus, NULL); return bus; }