From patchwork Thu Mar 4 15:56:44 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Markus Armbruster X-Patchwork-Id: 46927 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 83DEEB7CE8 for ; Fri, 5 Mar 2010 03:21:14 +1100 (EST) Received: from localhost ([127.0.0.1]:34037 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NnDnT-0007fS-CV for incoming@patchwork.ozlabs.org; Thu, 04 Mar 2010 11:21:11 -0500 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NnDQl-0000dx-NY for qemu-devel@nongnu.org; Thu, 04 Mar 2010 10:57:43 -0500 Received: from [199.232.76.173] (port=35962 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NnDQk-0000cY-6M for qemu-devel@nongnu.org; Thu, 04 Mar 2010 10:57:42 -0500 Received: from Debian-exim by monty-python.gnu.org with spam-scanned (Exim 4.60) (envelope-from ) id 1NnDQa-0000Le-Tf for qemu-devel@nongnu.org; Thu, 04 Mar 2010 10:57:41 -0500 Received: from oxygen.pond.sub.org ([213.239.205.148]:39635) by monty-python.gnu.org with esmtps (TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1NnDQV-0000Jy-OB for qemu-devel@nongnu.org; Thu, 04 Mar 2010 10:57:28 -0500 Received: from blackfin.pond.sub.org (pD9E38041.dip.t-dialin.net [217.227.128.65]) by oxygen.pond.sub.org (Postfix) with ESMTPA id C1A31276DBB for ; Thu, 4 Mar 2010 16:57:14 +0100 (CET) Received: by blackfin.pond.sub.org (Postfix, from userid 500) id 153A0113; Thu, 4 Mar 2010 16:57:13 +0100 (CET) From: Markus Armbruster To: qemu-devel@nongnu.org Date: Thu, 4 Mar 2010 16:56:44 +0100 Message-Id: <1267718231-13303-24-git-send-email-armbru@redhat.com> X-Mailer: git-send-email 1.6.6.1 In-Reply-To: <1267718231-13303-1-git-send-email-armbru@redhat.com> References: <1267718231-13303-1-git-send-email-armbru@redhat.com> X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 3) Cc: Luiz Capitulino Subject: [Qemu-devel] [PATCH 23/50] qdev: Fix -device and device_add to handle unsuitable bus gracefully X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org "device_add isa-serial,bus=pci.0" kills QEMU. Not good. Signed-off-by: Markus Armbruster --- hw/qdev.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/hw/qdev.c b/hw/qdev.c index 25e1703..80e5c36 100644 --- a/hw/qdev.c +++ b/hw/qdev.c @@ -204,6 +204,11 @@ DeviceState *qdev_device_add(QemuOpts *opts) path = qemu_opt_get(opts, "bus"); if (path != NULL) { bus = qbus_find(path); + if (bus && bus->info != info->bus_info) { + error_report("Device '%s' can't go on a %s bus", + driver, bus->info->name); + return NULL; + } } else { bus = qbus_find_recursive(main_system_bus, NULL, info->bus_info); }