From patchwork Wed Jun 3 13:08:39 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Tokarev X-Patchwork-Id: 49471 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-wg0-f71.google.com (mail-wg0-f71.google.com [74.125.82.71]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 5CB1D20BE7 for ; Wed, 3 Jun 2015 14:27:43 +0000 (UTC) Received: by wgla2 with SMTP id a2sf3134426wgl.1 for ; Wed, 03 Jun 2015 07:27:42 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:date :message-id:in-reply-to:references:cc:subject:precedence:list-id :list-unsubscribe:list-archive:list-post:list-help:list-subscribe :errors-to:sender:x-original-sender :x-original-authentication-results:mailing-list; bh=gICRuW3JKsRkQB1Fj+kHHw4Pz2QT1oFAtckzUWncGR8=; b=QQD1gFaX11EAqHhdRmd61SZPOd4kxCbJ2Jyh+nvJ+KR+8kGiuCZ1P1/QrotgaUmq0S Tl9qXozltQj3aMLjym3IBjoeXB+rczIwt2uhXp7UCCAPJgeHtYc1kJlRlgiBnXifxKp9 jaR3Y2UylUnbGseFnbuEzqdEXqKNfjumO+G3D8+6zi5I+RBZyij6eG5GOZnxOnC3uQFe vOg62Wxj7aSDhXx9DnrbhgrVTo5lTgxAgBES3DxFXam+AxoKyhvF0Z7oWo5p8FKFHtY0 43yvaAhpolu3gClbuNMsQFjGqRhGAg3D4BLRHbBr8neWYSdOn2cmhqJZVxoVo0ig9uuX +M9w== X-Gm-Message-State: ALoCoQlCtjSAWr+8Bf796LPhg7jzKqqmWGApYnpvrUNJN8VeM9nJlWBXv/WUetp0sYu8CuZoGEox X-Received: by 10.152.88.37 with SMTP id bd5mr7799288lab.0.1433341662597; Wed, 03 Jun 2015 07:27:42 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.6.74 with SMTP id y10ls70167lay.41.gmail; Wed, 03 Jun 2015 07:27:42 -0700 (PDT) X-Received: by 10.152.4.137 with SMTP id k9mr31899404lak.29.1433341662449; Wed, 03 Jun 2015 07:27:42 -0700 (PDT) Received: from mail-la0-f48.google.com (mail-la0-f48.google.com. [209.85.215.48]) by mx.google.com with ESMTPS id o5si18184646lae.1.2015.06.03.07.27.42 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 03 Jun 2015 07:27:42 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.48 as permitted sender) client-ip=209.85.215.48; Received: by labpy14 with SMTP id py14so9583905lab.0 for ; Wed, 03 Jun 2015 07:27:42 -0700 (PDT) X-Received: by 10.152.37.228 with SMTP id b4mr9851776lak.117.1433341662368; Wed, 03 Jun 2015 07:27:42 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.112.108.230 with SMTP id hn6csp3908659lbb; Wed, 3 Jun 2015 07:27:41 -0700 (PDT) X-Received: by 10.140.194.199 with SMTP id p190mr38104003qha.76.1433341660730; Wed, 03 Jun 2015 07:27:40 -0700 (PDT) Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id p65si756400qkh.5.2015.06.03.07.27.40 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Wed, 03 Jun 2015 07:27:40 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Received: from localhost ([::1]:35874 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z09dr-0004oq-Kk for patch@linaro.org; Wed, 03 Jun 2015 10:27:39 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59682) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z09cv-0003k0-0e for qemu-devel@nongnu.org; Wed, 03 Jun 2015 10:26:41 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Z09cq-0006wC-O6 for qemu-devel@nongnu.org; Wed, 03 Jun 2015 10:26:40 -0400 Received: from isrv.corpit.ru ([86.62.121.231]:50567) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z09cq-0006vU-Gl; Wed, 03 Jun 2015 10:26:36 -0400 Received: from tsrv.tls.msk.ru (tsrv.tls.msk.ru [192.168.177.2]) by isrv.corpit.ru (Postfix) with ESMTP id EF4C0407C7; Wed, 3 Jun 2015 17:26:33 +0300 (MSK) Received: from tls.msk.ru (mjt.vpn.tls.msk.ru [192.168.177.99]) by tsrv.tls.msk.ru (Postfix) with SMTP id C31D7A5B; Wed, 3 Jun 2015 16:08:53 +0300 (MSK) Received: (nullmailer pid 27451 invoked by uid 1000); Wed, 03 Jun 2015 13:08:52 -0000 From: Michael Tokarev To: qemu-devel@nongnu.org Date: Wed, 3 Jun 2015 16:08:39 +0300 Message-Id: X-Mailer: git-send-email 2.1.4 In-Reply-To: References: X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 86.62.121.231 Cc: qemu-trivial@nongnu.org, Michael Tokarev , Shannon Zhao , Shannon Zhao Subject: [Qemu-devel] [PULL 19/30] hw/ppc/prep.c: Fix misusing qemu_allocate_irqs for single irq 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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: mjt@tls.msk.ru X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.48 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 From: Shannon Zhao Signed-off-by: Shannon Zhao Signed-off-by: Shannon Zhao Signed-off-by: Michael Tokarev --- hw/ppc/prep.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/hw/ppc/prep.c b/hw/ppc/prep.c index 7f52662..998ee2d 100644 --- a/hw/ppc/prep.c +++ b/hw/ppc/prep.c @@ -528,7 +528,6 @@ static void ppc_prep_init(MachineState *machine) PCIDevice *pci; ISABus *isa_bus; ISADevice *isa; - qemu_irq *cpu_exit_irq; int ppc_boot_device; DriveInfo *hd[MAX_IDE_BUS * MAX_IDE_DEVS]; @@ -625,11 +624,11 @@ static void ppc_prep_init(MachineState *machine) /* PCI -> ISA bridge */ pci = pci_create_simple(pci_bus, PCI_DEVFN(1, 0), "i82378"); - cpu_exit_irq = qemu_allocate_irqs(cpu_request_exit, NULL, 1); cpu = POWERPC_CPU(first_cpu); qdev_connect_gpio_out(&pci->qdev, 0, cpu->env.irq_inputs[PPC6xx_INPUT_INT]); - qdev_connect_gpio_out(&pci->qdev, 1, *cpu_exit_irq); + qdev_connect_gpio_out(&pci->qdev, 1, + qemu_allocate_irq(cpu_request_exit, NULL, 0)); sysbus_connect_irq(&pcihost->busdev, 0, qdev_get_gpio_in(&pci->qdev, 9)); sysbus_connect_irq(&pcihost->busdev, 1, qdev_get_gpio_in(&pci->qdev, 11)); sysbus_connect_irq(&pcihost->busdev, 2, qdev_get_gpio_in(&pci->qdev, 9));