From patchwork Thu May 26 09:52:46 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 97517 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 59D4BB6F59 for ; Thu, 26 May 2011 19:54:03 +1000 (EST) Received: from localhost ([::1]:42375 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QPXGS-0000Mm-Ki for incoming@patchwork.ozlabs.org; Thu, 26 May 2011 05:54:00 -0400 Received: from eggs.gnu.org ([140.186.70.92]:53350) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QPXFh-00077X-Hs for qemu-devel@nongnu.org; Thu, 26 May 2011 05:53:14 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QPXFg-0007y9-Jf for qemu-devel@nongnu.org; Thu, 26 May 2011 05:53:13 -0400 Received: from mail-pv0-f173.google.com ([74.125.83.173]:33157) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QPXFg-0007rr-Ea for qemu-devel@nongnu.org; Thu, 26 May 2011 05:53:12 -0400 Received: by pvg3 with SMTP id 3so248616pvg.4 for ; Thu, 26 May 2011 02:53:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:sender:from:to:cc:subject:date:message-id :x-mailer:in-reply-to:references; bh=BPRH5V50Fo51rlkF4VUmvvifnmaWeP4uURky5G4L7N0=; b=luOXgU0npzE4TbjKIQmRK0erQRBRe1d1gEZ/X84ZwBM/nAncs7ardFBxDcBqELiWJw GxATJCSSBgV/G9JLnvIK/wfgBWYZh2VqGcCU/DTg3ZtU9Wlw+oSCBpOVORJhF+RYHicW l91jCI1mrfem8/b9NyhCElbuXqgEPue30Y9nY= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=sender:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references; b=SwfyBfz0NxRbuuSvo64LFRU0Ruj3XT2Ji9RcoQvBbmOt0WzKoZgdCiL8xZbJ+F9Bgr EJJQYO/v34bZqsCWhy91ZdPEJmfGNzEVnTE8a+DISsgD03bCKQoz77sZunEY//0KEsE6 w1lmzvkiZGGXvz1760x1V44foR0dw4vJ/gGUE= Received: by 10.142.149.8 with SMTP id w8mr97225wfd.237.1306403591292; Thu, 26 May 2011 02:53:11 -0700 (PDT) Received: from localhost.localdomain (93-34-184-88.ip51.fastwebnet.it [93.34.184.88]) by mx.google.com with ESMTPS id h1sm988474pbi.42.2011.05.26.02.53.08 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 26 May 2011 02:53:10 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Thu, 26 May 2011 11:52:46 +0200 Message-Id: <1306403566-31597-4-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.7.4.4 In-Reply-To: <1306403566-31597-1-git-send-email-pbonzini@redhat.com> References: <1306403566-31597-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 74.125.83.173 Cc: agraf@suse.de, david@gibson.dropbear.id.au Subject: [Qemu-devel] [PATCH v2 3/3] spapr: make irq customizable via qdev 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 This also lets the user see the irq in "info qtree". Signed-off-by: Paolo Bonzini Cc: Alexander Graf Cc: David Gibson --- hw/spapr_vio.c | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/hw/spapr_vio.c b/hw/spapr_vio.c index 8b31bc6..877c4d6 100644 --- a/hw/spapr_vio.c +++ b/hw/spapr_vio.c @@ -52,6 +52,10 @@ static struct BusInfo spapr_vio_bus_info = { .name = "spapr-vio", .size = sizeof(VIOsPAPRBus), + .props = (Property[]) { + DEFINE_PROP_UINT32("irq", VIOsPAPRDevice, vio_irq_num, 0), \ + DEFINE_PROP_END_OF_LIST(), + }, }; VIOsPAPRDevice *spapr_vio_find_by_reg(VIOsPAPRBus *bus, uint32_t reg) @@ -604,7 +608,9 @@ static int spapr_vio_busdev_init(DeviceState *qdev, DeviceInfo *qinfo) } dev->qdev.id = id; - dev->vio_irq_num = bus->irq++; + if (!dev->vio_irq_num) { + dev->vio_irq_num = bus->irq++; + } dev->qirq = spapr_find_qirq(spapr, dev->vio_irq_num); rtce_init(dev);