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 2A9F0CA9EA0 for ; Fri, 18 Oct 2019 13:49:45 +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 09291222BD for ; Fri, 18 Oct 2019 13:49:45 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 09291222BD 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 1iLSce-0004n3-2N; Fri, 18 Oct 2019 13:48:52 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1iLScc-0004mk-Lr for xen-devel@lists.xenproject.org; Fri, 18 Oct 2019 13:48:50 +0000 X-Inumbo-ID: 0394d1d8-f1ae-11e9-beca-bc764e2007e4 Received: from mx1.redhat.com (unknown [209.132.183.28]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id 0394d1d8-f1ae-11e9-beca-bc764e2007e4; Fri, 18 Oct 2019 13:48:50 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 8DF1F4ACDF; Fri, 18 Oct 2019 13:48:49 +0000 (UTC) Received: from x1w.redhat.com (unknown [10.40.205.74]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 3E50A60BF1; Fri, 18 Oct 2019 13:48:37 +0000 (UTC) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Date: Fri, 18 Oct 2019 15:47:38 +0200 Message-Id: <20191018134754.16362-5-philmd@redhat.com> In-Reply-To: <20191018134754.16362-1-philmd@redhat.com> References: <20191018134754.16362-1-philmd@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.38]); Fri, 18 Oct 2019 13:48:49 +0000 (UTC) Subject: [Xen-devel] [PATCH v2 04/20] 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: Thomas Huth , Stefano Stabellini , Marcel Apfelbaum , "Michael S. Tsirkin" , Paul Durrant , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Paolo Bonzini , =?UTF-8?q?Herv=C3=A9=20Poussineau?= , Aleksandar Markovic , Igor Mammedov , Anthony Perard , xen-devel@lists.xenproject.org, Aleksandar Rikalo , Richard Henderson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Aurelien Jarno , Eduardo Habkost Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" RnJvbTogUGhpbGlwcGUgTWF0aGlldS1EYXVkw6kgPGY0YnVnQGFtc2F0Lm9yZz4KClRoaXMgZnVu Y3Rpb24gaXNuJ3QgdXNlZCBhbnltb3JlLgoKVGhpcyByZXZlcnRzIGNvbW1pdCAyMmVjMzI4M2Vm YmE5YmEwNzkyNzkwZGE3ODZkNjc3NmQ4M2YyYTkyLgoKUmV2aWV3ZWQtYnk6IFRob21hcyBIdXRo IDx0aHV0aEByZWRoYXQuY29tPgpTaWduZWQtb2ZmLWJ5OiBQaGlsaXBwZSBNYXRoaWV1LURhdWTD qSA8ZjRidWdAYW1zYXQub3JnPgotLS0KIGh3L2NvcmUvaXJxLmMgICAgfCAxNCAtLS0tLS0tLS0t LS0tLQogaW5jbHVkZS9ody9pcnEuaCB8ICA1IC0tLS0tCiAyIGZpbGVzIGNoYW5nZWQsIDE5IGRl bGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2h3L2NvcmUvaXJxLmMgYi9ody9jb3JlL2lycS5jCmlu ZGV4IDdjYzAyOTVkMGUuLmZiMzA0NWI5MTIgMTAwNjQ0Ci0tLSBhL2h3L2NvcmUvaXJxLmMKKysr IGIvaHcvY29yZS9pcnEuYwpAQCAtMTIwLDIwICsxMjAsNiBAQCBxZW11X2lycSBxZW11X2lycV9z cGxpdChxZW11X2lycSBpcnExLCBxZW11X2lycSBpcnEyKQogICAgIHJldHVybiBxZW11X2FsbG9j YXRlX2lycShxZW11X3NwbGl0aXJxLCBzLCAwKTsKIH0KIAotc3RhdGljIHZvaWQgcHJveHlfaXJx X2hhbmRsZXIodm9pZCAqb3BhcXVlLCBpbnQgbiwgaW50IGxldmVsKQotewotICAgIHFlbXVfaXJx ICoqdGFyZ2V0ID0gb3BhcXVlOwotCi0gICAgaWYgKCp0YXJnZXQpIHsKLSAgICAgICAgcWVtdV9z ZXRfaXJxKCgqdGFyZ2V0KVtuXSwgbGV2ZWwpOwotICAgIH0KLX0KLQotcWVtdV9pcnEgKnFlbXVf aXJxX3Byb3h5KHFlbXVfaXJxICoqdGFyZ2V0LCBpbnQgbikKLXsKLSAgICByZXR1cm4gcWVtdV9h bGxvY2F0ZV9pcnFzKHByb3h5X2lycV9oYW5kbGVyLCB0YXJnZXQsIG4pOwotfQotCiB2b2lkIHFl bXVfaXJxX2ludGVyY2VwdF9pbihxZW11X2lycSAqZ3Bpb19pbiwgcWVtdV9pcnFfaGFuZGxlciBo YW5kbGVyLCBpbnQgbikKIHsKICAgICBpbnQgaTsKZGlmZiAtLWdpdCBhL2luY2x1ZGUvaHcvaXJx LmggYi9pbmNsdWRlL2h3L2lycS5oCmluZGV4IGZlNTI3ZjZmNTEuLjI0YmEwZWNlMTEgMTAwNjQ0 Ci0tLSBhL2luY2x1ZGUvaHcvaXJxLmgKKysrIGIvaW5jbHVkZS9ody9pcnEuaApAQCAtNTEsMTEg KzUxLDYgQEAgcWVtdV9pcnEgcWVtdV9pcnFfaW52ZXJ0KHFlbXVfaXJxIGlycSk7CiAgKi8KIHFl bXVfaXJxIHFlbXVfaXJxX3NwbGl0KHFlbXVfaXJxIGlycTEsIHFlbXVfaXJxIGlycTIpOwogCi0v KiBSZXR1cm5zIGEgbmV3IElSUSBzZXQgd2hpY2ggY29ubmVjdHMgMToxIHRvIGFub3RoZXIgSVJR IHNldCwgd2hpY2gKLSAqIG1heSBiZSBzZXQgbGF0ZXIuCi0gKi8KLXFlbXVfaXJxICpxZW11X2ly cV9wcm94eShxZW11X2lycSAqKnRhcmdldCwgaW50IG4pOwotCiAvKiBGb3IgaW50ZXJuYWwgdXNl IGluIHF0ZXN0LiAgU2ltaWxhciB0byBxZW11X2lycV9zcGxpdCwgYnV0IG9wZXJhdGluZwogICAg b24gYW4gZXhpc3RpbmcgdmVjdG9yIG9mIHFlbXVfaXJxLiAgKi8KIHZvaWQgcWVtdV9pcnFfaW50 ZXJjZXB0X2luKHFlbXVfaXJxICpncGlvX2luLCBxZW11X2lycV9oYW5kbGVyIGhhbmRsZXIsIGlu dCBuKTsKLS0gCjIuMjEuMAoKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fClhlbi1kZXZlbCBtYWlsaW5nIGxpc3QKWGVuLWRldmVsQGxpc3RzLnhlbnByb2pl Y3Qub3JnCmh0dHBzOi8vbGlzdHMueGVucHJvamVjdC5vcmcvbWFpbG1hbi9saXN0aW5mby94ZW4t ZGV2ZWw= 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 F16A3CA9EA0 for ; Fri, 18 Oct 2019 13:50:46 +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 C6C86222BD for ; Fri, 18 Oct 2019 13:50:46 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org C6C86222BD 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]:40356 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iLSeT-0005Oh-Ab for qemu-devel@archiver.kernel.org; Fri, 18 Oct 2019 09:50:45 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54806) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iLScd-0003gN-Uz for qemu-devel@nongnu.org; Fri, 18 Oct 2019 09:48:52 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iLScc-0005mx-Re for qemu-devel@nongnu.org; Fri, 18 Oct 2019 09:48:51 -0400 Received: from mx1.redhat.com ([209.132.183.28]:32828) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iLScc-0005md-EZ for qemu-devel@nongnu.org; Fri, 18 Oct 2019 09:48:50 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 8DF1F4ACDF; Fri, 18 Oct 2019 13:48:49 +0000 (UTC) Received: from x1w.redhat.com (unknown [10.40.205.74]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 3E50A60BF1; Fri, 18 Oct 2019 13:48:37 +0000 (UTC) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH v2 04/20] Revert "irq: introduce qemu_irq_proxy()" Date: Fri, 18 Oct 2019 15:47:38 +0200 Message-Id: <20191018134754.16362-5-philmd@redhat.com> In-Reply-To: <20191018134754.16362-1-philmd@redhat.com> References: <20191018134754.16362-1-philmd@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.38]); Fri, 18 Oct 2019 13:48:49 +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: Thomas Huth , Stefano Stabellini , "Michael S. Tsirkin" , Paul Durrant , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Paolo Bonzini , =?UTF-8?q?Herv=C3=A9=20Poussineau?= , Aleksandar Markovic , Igor Mammedov , Anthony Perard , xen-devel@lists.xenproject.org, Aleksandar Rikalo , Richard Henderson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Aurelien Jarno , Eduardo Habkost 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. Reviewed-by: Thomas Huth 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