From patchwork Sun Oct 2 16:10:23 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Herv=C3=A9_Poussineau?= X-Patchwork-Id: 117345 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [140.186.70.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id F40A21007D6 for ; Mon, 3 Oct 2011 04:14:50 +1100 (EST) Received: from localhost ([::1]:49492 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RAPcm-00048a-5m for incoming@patchwork.ozlabs.org; Sun, 02 Oct 2011 13:14:48 -0400 Received: from eggs.gnu.org ([140.186.70.92]:38709) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RAOdG-0006e9-IF for qemu-devel@nongnu.org; Sun, 02 Oct 2011 12:11:15 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RAOdE-0008E9-9F for qemu-devel@nongnu.org; Sun, 02 Oct 2011 12:11:14 -0400 Received: from smtp5-g21.free.fr ([212.27.42.5]:33985) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RAOdD-0008Di-J6 for qemu-devel@nongnu.org; Sun, 02 Oct 2011 12:11:12 -0400 Received: from localhost.localdomain (unknown [88.171.126.33]) by smtp5-g21.free.fr (Postfix) with ESMTP id 6C419D482AC; Sun, 2 Oct 2011 18:11:06 +0200 (CEST) From: =?UTF-8?q?Herv=C3=A9=20Poussineau?= To: qemu-devel@nongnu.org Date: Sun, 2 Oct 2011 18:10:23 +0200 Message-Id: <1317571828-9059-12-git-send-email-hpoussin@reactos.org> X-Mailer: git-send-email 1.7.6.3 In-Reply-To: <1317571828-9059-1-git-send-email-hpoussin@reactos.org> References: <1317571828-9059-1-git-send-email-hpoussin@reactos.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3) X-Received-From: 212.27.42.5 Cc: =?UTF-8?q?Herv=C3=A9=20Poussineau?= Subject: [Qemu-devel] [PATCH v3 11/16] isa: use bus given in parameter to create device on specified ISA bus 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 Signed-off-by: Hervé Poussineau --- hw/isa-bus.c | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) diff --git a/hw/isa-bus.c b/hw/isa-bus.c index ecc5375..cdfed29 100644 --- a/hw/isa-bus.c +++ b/hw/isa-bus.c @@ -151,11 +151,12 @@ ISADevice *isa_create(ISABus *bus, const char *name) { DeviceState *dev; - if (!isabus) { + if (!bus) { hw_error("Tried to create isa device %s with no isa bus present.", name); } - dev = qdev_create(&isabus->qbus, name); + assert(bus == isabus); + dev = qdev_create(&bus->qbus, name); return DO_UPCAST(ISADevice, qdev, dev); } @@ -163,11 +164,12 @@ ISADevice *isa_try_create(ISABus *bus, const char *name) { DeviceState *dev; - if (!isabus) { + if (!bus) { hw_error("Tried to create isa device %s with no isa bus present.", name); } - dev = qdev_try_create(&isabus->qbus, name); + assert(bus == isabus); + dev = qdev_try_create(&bus->qbus, name); return DO_UPCAST(ISADevice, qdev, dev); }