From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 29541ECE588 for ; Tue, 15 Oct 2019 16:29:43 +0000 (UTC) Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 0521A2086A for ; Tue, 15 Oct 2019 16:29:43 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 0521A2086A Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=xen-devel-bounces@lists.xenproject.org Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1iKPhV-0003gl-N6; Tue, 15 Oct 2019 16:29:33 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1iKPhU-0003g4-DT for xen-devel@lists.xenproject.org; Tue, 15 Oct 2019 16:29:32 +0000 X-Inumbo-ID: f735eed2-ef68-11e9-bbab-bc764e2007e4 Received: from mx1.redhat.com (unknown [209.132.183.28]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id f735eed2-ef68-11e9-bbab-bc764e2007e4; Tue, 15 Oct 2019 16:29:31 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 29DBC2102; Tue, 15 Oct 2019 16:29:31 +0000 (UTC) Received: from x1w.redhat.com (ovpn-204-35.brq.redhat.com [10.40.204.35]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 9CA0F19C58; Tue, 15 Oct 2019 16:29:24 +0000 (UTC) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Date: Tue, 15 Oct 2019 18:26:44 +0200 Message-Id: <20191015162705.28087-12-philmd@redhat.com> In-Reply-To: <20191015162705.28087-1-philmd@redhat.com> References: <20191015162705.28087-1-philmd@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.6.2 (mx1.redhat.com [10.5.110.71]); Tue, 15 Oct 2019 16:29:31 +0000 (UTC) Subject: [Xen-devel] [PATCH 11/32] Revert "irq: introduce qemu_irq_proxy()" X-BeenThere: xen-devel@lists.xenproject.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Cc: Laurent Vivier , Thomas Huth , Stefano Stabellini , Eduardo Habkost , kvm@vger.kernel.org, Paul Durrant , "Michael S. Tsirkin" , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Marcel Apfelbaum , Paolo Bonzini , =?UTF-8?q?Herv=C3=A9=20Poussineau?= , Aleksandar Markovic , xen-devel@lists.xenproject.org, Anthony Perard , Igor Mammedov , Aleksandar Rikalo , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Aurelien Jarno , Richard Henderson Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" RnJvbTogUGhpbGlwcGUgTWF0aGlldS1EYXVkw6kgPGY0YnVnQGFtc2F0Lm9yZz4KClRoaXMgZnVu Y3Rpb24gaXNuJ3QgdXNlZCBhbnltb3JlLgoKVGhpcyByZXZlcnRzIGNvbW1pdCAyMmVjMzI4M2Vm YmE5YmEwNzkyNzkwZGE3ODZkNjc3NmQ4M2YyYTkyLgoKU2lnbmVkLW9mZi1ieTogUGhpbGlwcGUg TWF0aGlldS1EYXVkw6kgPGY0YnVnQGFtc2F0Lm9yZz4KLS0tCiBody9jb3JlL2lycS5jICAgIHwg MTQgLS0tLS0tLS0tLS0tLS0KIGluY2x1ZGUvaHcvaXJxLmggfCAgNSAtLS0tLQogMiBmaWxlcyBj aGFuZ2VkLCAxOSBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9ody9jb3JlL2lycS5jIGIvaHcv Y29yZS9pcnEuYwppbmRleCA3Y2MwMjk1ZDBlLi5mYjMwNDViOTEyIDEwMDY0NAotLS0gYS9ody9j b3JlL2lycS5jCisrKyBiL2h3L2NvcmUvaXJxLmMKQEAgLTEyMCwyMCArMTIwLDYgQEAgcWVtdV9p cnEgcWVtdV9pcnFfc3BsaXQocWVtdV9pcnEgaXJxMSwgcWVtdV9pcnEgaXJxMikKICAgICByZXR1 cm4gcWVtdV9hbGxvY2F0ZV9pcnEocWVtdV9zcGxpdGlycSwgcywgMCk7CiB9CiAKLXN0YXRpYyB2 b2lkIHByb3h5X2lycV9oYW5kbGVyKHZvaWQgKm9wYXF1ZSwgaW50IG4sIGludCBsZXZlbCkKLXsK LSAgICBxZW11X2lycSAqKnRhcmdldCA9IG9wYXF1ZTsKLQotICAgIGlmICgqdGFyZ2V0KSB7Ci0g ICAgICAgIHFlbXVfc2V0X2lycSgoKnRhcmdldClbbl0sIGxldmVsKTsKLSAgICB9Ci19Ci0KLXFl bXVfaXJxICpxZW11X2lycV9wcm94eShxZW11X2lycSAqKnRhcmdldCwgaW50IG4pCi17Ci0gICAg cmV0dXJuIHFlbXVfYWxsb2NhdGVfaXJxcyhwcm94eV9pcnFfaGFuZGxlciwgdGFyZ2V0LCBuKTsK LX0KLQogdm9pZCBxZW11X2lycV9pbnRlcmNlcHRfaW4ocWVtdV9pcnEgKmdwaW9faW4sIHFlbXVf aXJxX2hhbmRsZXIgaGFuZGxlciwgaW50IG4pCiB7CiAgICAgaW50IGk7CmRpZmYgLS1naXQgYS9p bmNsdWRlL2h3L2lycS5oIGIvaW5jbHVkZS9ody9pcnEuaAppbmRleCBmZTUyN2Y2ZjUxLi4yNGJh MGVjZTExIDEwMDY0NAotLS0gYS9pbmNsdWRlL2h3L2lycS5oCisrKyBiL2luY2x1ZGUvaHcvaXJx LmgKQEAgLTUxLDExICs1MSw2IEBAIHFlbXVfaXJxIHFlbXVfaXJxX2ludmVydChxZW11X2lycSBp cnEpOwogICovCiBxZW11X2lycSBxZW11X2lycV9zcGxpdChxZW11X2lycSBpcnExLCBxZW11X2ly cSBpcnEyKTsKIAotLyogUmV0dXJucyBhIG5ldyBJUlEgc2V0IHdoaWNoIGNvbm5lY3RzIDE6MSB0 byBhbm90aGVyIElSUSBzZXQsIHdoaWNoCi0gKiBtYXkgYmUgc2V0IGxhdGVyLgotICovCi1xZW11 X2lycSAqcWVtdV9pcnFfcHJveHkocWVtdV9pcnEgKip0YXJnZXQsIGludCBuKTsKLQogLyogRm9y IGludGVybmFsIHVzZSBpbiBxdGVzdC4gIFNpbWlsYXIgdG8gcWVtdV9pcnFfc3BsaXQsIGJ1dCBv cGVyYXRpbmcKICAgIG9uIGFuIGV4aXN0aW5nIHZlY3RvciBvZiBxZW11X2lycS4gICovCiB2b2lk IHFlbXVfaXJxX2ludGVyY2VwdF9pbihxZW11X2lycSAqZ3Bpb19pbiwgcWVtdV9pcnFfaGFuZGxl ciBoYW5kbGVyLCBpbnQgbik7Ci0tIAoyLjIxLjAKCgpfX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fXwpYZW4tZGV2ZWwgbWFpbGluZyBsaXN0Clhlbi1kZXZlbEBs aXN0cy54ZW5wcm9qZWN0Lm9yZwpodHRwczovL2xpc3RzLnhlbnByb2plY3Qub3JnL21haWxtYW4v bGlzdGluZm8veGVuLWRldmVs From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id B68F0ECE588 for ; Tue, 15 Oct 2019 16:29:32 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 95AA220873 for ; Tue, 15 Oct 2019 16:29:32 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2387984AbfJOQ3b (ORCPT ); Tue, 15 Oct 2019 12:29:31 -0400 Received: from mx1.redhat.com ([209.132.183.28]:38130 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2387879AbfJOQ3b (ORCPT ); Tue, 15 Oct 2019 12:29:31 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 29DBC2102; Tue, 15 Oct 2019 16:29:31 +0000 (UTC) Received: from x1w.redhat.com (ovpn-204-35.brq.redhat.com [10.40.204.35]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 9CA0F19C58; Tue, 15 Oct 2019 16:29:24 +0000 (UTC) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Aleksandar Markovic , Aurelien Jarno , Eduardo Habkost , Thomas Huth , Igor Mammedov , Anthony Perard , Stefano Stabellini , Paul Durrant , =?UTF-8?q?Herv=C3=A9=20Poussineau?= , Aleksandar Rikalo , xen-devel@lists.xenproject.org, Laurent Vivier , "Michael S. Tsirkin" , Marcel Apfelbaum , Paolo Bonzini , Richard Henderson , kvm@vger.kernel.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH 11/32] Revert "irq: introduce qemu_irq_proxy()" Date: Tue, 15 Oct 2019 18:26:44 +0200 Message-Id: <20191015162705.28087-12-philmd@redhat.com> In-Reply-To: <20191015162705.28087-1-philmd@redhat.com> References: <20191015162705.28087-1-philmd@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.6.2 (mx1.redhat.com [10.5.110.71]); Tue, 15 Oct 2019 16:29:31 +0000 (UTC) Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org From: Philippe Mathieu-Daudé This function isn't used anymore. This reverts commit 22ec3283efba9ba0792790da786d6776d83f2a92. Signed-off-by: Philippe Mathieu-Daudé --- hw/core/irq.c | 14 -------------- include/hw/irq.h | 5 ----- 2 files changed, 19 deletions(-) diff --git a/hw/core/irq.c b/hw/core/irq.c index 7cc0295d0e..fb3045b912 100644 --- a/hw/core/irq.c +++ b/hw/core/irq.c @@ -120,20 +120,6 @@ qemu_irq qemu_irq_split(qemu_irq irq1, qemu_irq irq2) return qemu_allocate_irq(qemu_splitirq, s, 0); } -static void proxy_irq_handler(void *opaque, int n, int level) -{ - qemu_irq **target = opaque; - - if (*target) { - qemu_set_irq((*target)[n], level); - } -} - -qemu_irq *qemu_irq_proxy(qemu_irq **target, int n) -{ - return qemu_allocate_irqs(proxy_irq_handler, target, n); -} - void qemu_irq_intercept_in(qemu_irq *gpio_in, qemu_irq_handler handler, int n) { int i; diff --git a/include/hw/irq.h b/include/hw/irq.h index fe527f6f51..24ba0ece11 100644 --- a/include/hw/irq.h +++ b/include/hw/irq.h @@ -51,11 +51,6 @@ qemu_irq qemu_irq_invert(qemu_irq irq); */ qemu_irq qemu_irq_split(qemu_irq irq1, qemu_irq irq2); -/* Returns a new IRQ set which connects 1:1 to another IRQ set, which - * may be set later. - */ -qemu_irq *qemu_irq_proxy(qemu_irq **target, int n); - /* For internal use in qtest. Similar to qemu_irq_split, but operating on an existing vector of qemu_irq. */ void qemu_irq_intercept_in(qemu_irq *gpio_in, qemu_irq_handler handler, int n); -- 2.21.0 From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 58D4EECE588 for ; Tue, 15 Oct 2019 16:42:17 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 2AD3220650 for ; Tue, 15 Oct 2019 16:42:17 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 2AD3220650 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:52820 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iKPtn-0008V8-Tv for qemu-devel@archiver.kernel.org; Tue, 15 Oct 2019 12:42:15 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41310) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iKPhV-0001tD-AT for qemu-devel@nongnu.org; Tue, 15 Oct 2019 12:29:34 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iKPhU-00056j-7g for qemu-devel@nongnu.org; Tue, 15 Oct 2019 12:29:33 -0400 Received: from mx1.redhat.com ([209.132.183.28]:40616) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iKPhU-00055x-2I for qemu-devel@nongnu.org; Tue, 15 Oct 2019 12:29:32 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 29DBC2102; Tue, 15 Oct 2019 16:29:31 +0000 (UTC) Received: from x1w.redhat.com (ovpn-204-35.brq.redhat.com [10.40.204.35]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 9CA0F19C58; Tue, 15 Oct 2019 16:29:24 +0000 (UTC) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH 11/32] Revert "irq: introduce qemu_irq_proxy()" Date: Tue, 15 Oct 2019 18:26:44 +0200 Message-Id: <20191015162705.28087-12-philmd@redhat.com> In-Reply-To: <20191015162705.28087-1-philmd@redhat.com> References: <20191015162705.28087-1-philmd@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.6.2 (mx1.redhat.com [10.5.110.71]); Tue, 15 Oct 2019 16:29:31 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Laurent Vivier , Thomas Huth , Stefano Stabellini , Eduardo Habkost , kvm@vger.kernel.org, Paul Durrant , "Michael S. Tsirkin" , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Paolo Bonzini , =?UTF-8?q?Herv=C3=A9=20Poussineau?= , Aleksandar Markovic , xen-devel@lists.xenproject.org, Anthony Perard , Igor Mammedov , Aleksandar Rikalo , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Aurelien Jarno , Richard Henderson Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" From: Philippe Mathieu-Daud=C3=A9 This function isn't used anymore. This reverts commit 22ec3283efba9ba0792790da786d6776d83f2a92. Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/core/irq.c | 14 -------------- include/hw/irq.h | 5 ----- 2 files changed, 19 deletions(-) diff --git a/hw/core/irq.c b/hw/core/irq.c index 7cc0295d0e..fb3045b912 100644 --- a/hw/core/irq.c +++ b/hw/core/irq.c @@ -120,20 +120,6 @@ qemu_irq qemu_irq_split(qemu_irq irq1, qemu_irq irq2= ) return qemu_allocate_irq(qemu_splitirq, s, 0); } =20 -static void proxy_irq_handler(void *opaque, int n, int level) -{ - qemu_irq **target =3D opaque; - - if (*target) { - qemu_set_irq((*target)[n], level); - } -} - -qemu_irq *qemu_irq_proxy(qemu_irq **target, int n) -{ - return qemu_allocate_irqs(proxy_irq_handler, target, n); -} - void qemu_irq_intercept_in(qemu_irq *gpio_in, qemu_irq_handler handler, = int n) { int i; diff --git a/include/hw/irq.h b/include/hw/irq.h index fe527f6f51..24ba0ece11 100644 --- a/include/hw/irq.h +++ b/include/hw/irq.h @@ -51,11 +51,6 @@ qemu_irq qemu_irq_invert(qemu_irq irq); */ qemu_irq qemu_irq_split(qemu_irq irq1, qemu_irq irq2); =20 -/* Returns a new IRQ set which connects 1:1 to another IRQ set, which - * may be set later. - */ -qemu_irq *qemu_irq_proxy(qemu_irq **target, int n); - /* For internal use in qtest. Similar to qemu_irq_split, but operating on an existing vector of qemu_irq. */ void qemu_irq_intercept_in(qemu_irq *gpio_in, qemu_irq_handler handler, = int n); --=20 2.21.0