From patchwork Wed Jun 3 13:08:36 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Tokarev X-Patchwork-Id: 49472 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-la0-f72.google.com (mail-la0-f72.google.com [209.85.215.72]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 240E620BE7 for ; Wed, 3 Jun 2015 14:27:45 +0000 (UTC) Received: by lani11 with SMTP id i11sf3589909lan.3 for ; Wed, 03 Jun 2015 07:27:44 -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=uzHUyKKblvpWhU47DajlAbPAOlJqCzt28YRHFj/Ch4E=; b=DgEBfaF1a3mBhG+eAqM17TSito6uKXSvAUPjZSA3Mqivqn1GDtA5/h8eQDQJSWZ1K7 DbzH8XzPWhvz+Dq13hQIOLHuB/OsF4ZBCwnTiPDdJ/tdUccAsp/Etvlp6+mygPV9vkxM oY6Hbcy8U5Bm+JS5mKiioknNKVSj+dKIdn2x3XaE9MRsnhllsoXJAFREJtcEnl3ZFi72 CenjnNUOhdSmseQ5aUL5mdflflUkdzHeJ3vS1/ZZcxKZOLFowEiOlGFQ7ciFYp/3acQ8 v5cgPUiNpUZIdc4VmUA7gi9LMxEgoP77FWf6OrULg7cqQq+Lyl/QXbST1icmGrBpYWz6 IsWg== X-Gm-Message-State: ALoCoQmapfL39sJsNFVtz6MnDF5xKUIzo2uf0QykTP9u2ol4XFJZtXzihM/43DI9crdGM1tIzOI5 X-Received: by 10.180.105.67 with SMTP id gk3mr21546958wib.4.1433341664072; Wed, 03 Jun 2015 07:27:44 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.36.169 with SMTP id r9ls62641laj.86.gmail; Wed, 03 Jun 2015 07:27:43 -0700 (PDT) X-Received: by 10.112.147.201 with SMTP id tm9mr32431267lbb.40.1433341663902; Wed, 03 Jun 2015 07:27:43 -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 p5si18162866lal.90.2015.06.03.07.27.43 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 03 Jun 2015 07:27:43 -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 py14so9584352lab.0 for ; Wed, 03 Jun 2015 07:27:43 -0700 (PDT) X-Received: by 10.152.6.69 with SMTP id y5mr31789316lay.72.1433341663483; Wed, 03 Jun 2015 07:27:43 -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 hn6csp3908672lbb; Wed, 3 Jun 2015 07:27:42 -0700 (PDT) X-Received: by 10.140.35.230 with SMTP id n93mr35207003qgn.7.1433341660927; 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 z92si756054qkg.2.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]:35875 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z09dr-0004qT-QT for patch@linaro.org; Wed, 03 Jun 2015 10:27:39 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59679) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z09cu-0003jx-VN 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-0006wE-O1 for qemu-devel@nongnu.org; Wed, 03 Jun 2015 10:26:40 -0400 Received: from isrv.corpit.ru ([86.62.121.231]:43598) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z09cq-0006vS-Gq; 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 E384B407C6; 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 4F2FAA60; Wed, 3 Jun 2015 16:08:54 +0300 (MSK) Received: (nullmailer pid 27445 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:36 +0300 Message-Id: <5105505e65ba6bc3e1dc549bcd0d1d33f3546e60.1433336870.git.mjt@msgid.tls.msk.ru> 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 16/30] hw/isa/i82378.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/isa/i82378.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/hw/isa/i82378.c b/hw/isa/i82378.c index 9da9dfc..fcf97d8 100644 --- a/hw/isa/i82378.c +++ b/hw/isa/i82378.c @@ -65,7 +65,6 @@ static void i82378_realize(PCIDevice *pci, Error **errp) uint8_t *pci_conf; ISABus *isabus; ISADevice *isa; - qemu_irq *out0_irq; pci_conf = pci->config; pci_set_word(pci_conf + PCI_COMMAND, @@ -88,11 +87,9 @@ static void i82378_realize(PCIDevice *pci, Error **errp) All devices accept byte access only, except timer */ - /* Workaround the fact that i8259 is not qdev'ified... */ - out0_irq = qemu_allocate_irqs(i82378_request_out0_irq, s, 1); - /* 2 82C59 (irq) */ - s->i8259 = i8259_init(isabus, *out0_irq); + s->i8259 = i8259_init(isabus, + qemu_allocate_irq(i82378_request_out0_irq, s, 0)); isa_bus_irqs(isabus, s->i8259); /* 1 82C54 (pit) */