From nobody Tue Nov 28 13:38:33 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Sfk7G29Y3z52GVq; Tue, 28 Nov 2023 13:38:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Sfk7G0k6bz4Tpj; Tue, 28 Nov 2023 13:38:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701178714; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=38dkqInRWuZYDomBIXzGLdqzRg+AvTDUosjl7Uf3nd8=; b=cs1zwQyNJ+WWlR7MjFVmd0IYC59UTC8JjYeC/HxgX+gpMszXuMj5GBRzOxV8wIvtWvGO0/ oT4DkGjAXuHFF8qa/HFFXz4lSc4wOwSEhP7Ng6Nalt739HOiPtKZemXVW1SAqrzp5vctTT q5QJVusNFOOePMT91/2OZIa1vaRjpe9vfz2yId0gd9y29zy8RmYdKkTeCzFGhWG1nzv8Vr Z8K8YAcp9OafTZYPu9F0AE/NL15ht4vkbCSo0pLyaqeb/R5D1ikJR/KcYBk69mRpWqF+Xc TavEwt5izawGRn4U/w4lFaQgWtbIHIDv/2Z+4khfTY0NlA1OeJDrDFhQHygROQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701178714; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=38dkqInRWuZYDomBIXzGLdqzRg+AvTDUosjl7Uf3nd8=; b=jf12HeoNv9AxFmE/Iyd0xflmujO997hOSC3ANRR/qPLBefcH6UxwL1Lt8xgkz2A4aGrtF5 8gthcpfT4XFv2oR8bXqMEEhY0NEGzUA+2kl2r7VAgBnpyl9ZeoZIpWKabrB15JidNmhYUE ivRZv6nOjlVxDVhRDfQhJ9gJWBG48bHHm/QvDo67mwU/obOz1eIbGYOGlGViQtz8NF1BmN oigSqZywmXaBH4AOP1/ZTdFzpiJQsdK8uAllUVD3TCnf8dEJhOY0OerFGCMnGidz4/OTXa YB2fTUGV9809Xn7Hw67JZShcJna1mpyhrvk0MH+B3Zr4iEqkW2EfDOTLCkCCVg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701178714; a=rsa-sha256; cv=none; b=NODjQ0sxEnUif9H74zaJ1elYrGsh/2JZtvAfs/1Srzpn7CRc1nnmFEivkTW+E/qV+mVnJM hQ4bJkVJv9ZOnZL5gZ2ALKpJBsp4sgo3VrnelgOzLImr0lqo9BRLz0YUTLW6QDTAGm4uya mY/rqE4LLGC4CitA2W4xljAWm9H5HclyUz2H+PfWag+Aaa7TAjoZ3Ys6mriedjFzM50PSi LzwbYL9BiWRswMTwsEWEVjNFmUNmNyXx3UlpTJk1Cb9mj/ts/3KemoQYj0gmccf7ZWlzRx e1NHAV9JN9vtg6DigwrURuBUHzVFpryE/VtchOWjiUoKQ0+Um/FNrxQel/7/qg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Sfk7F6W79z8BX; Tue, 28 Nov 2023 13:38:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3ASDcXoO025267; Tue, 28 Nov 2023 13:38:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3ASDcXDw025264; Tue, 28 Nov 2023 13:38:33 GMT (envelope-from git) Date: Tue, 28 Nov 2023 13:38:33 GMT Message-Id: <202311281338.3ASDcXDw025264@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Roger Pau =?utf-8?Q?Monn=C3=A9?= Subject: git: c880f12f5ac6 - main - xen/intr: correct misuses of Xen handle pointer type List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: royger X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c880f12f5ac6b1fe8b188e08862e8da829533fdb Auto-Submitted: auto-generated The branch main has been updated by royger: URL: https://cgit.FreeBSD.org/src/commit/?id=c880f12f5ac6b1fe8b188e08862e8da829533fdb commit c880f12f5ac6b1fe8b188e08862e8da829533fdb Author: Elliott Mitchell AuthorDate: 2022-07-23 22:30:45 +0000 Commit: Roger Pau Monné CommitDate: 2023-11-28 11:51:19 +0000 xen/intr: correct misuses of Xen handle pointer type Fix a few spots where handle pointers were incorrectly used. Luckily these appear rarely triggered given how long they've been lurking. Fixes: 76acc41fb7c7 ("Implement vector callback for PVHVM and unify event channel implementations") Fixes: 9f40021f288c ("Introduce a new, HVM compatible, paravirtualized timer driver for Xen.") MFC after: 2 weeks Reviewed by: royger --- sys/dev/xen/bus/xen_intr.c | 4 ++-- sys/dev/xen/timer/xen_timer.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/sys/dev/xen/bus/xen_intr.c b/sys/dev/xen/bus/xen_intr.c index db166a625610..b70b0fa835b6 100644 --- a/sys/dev/xen/bus/xen_intr.c +++ b/sys/dev/xen/bus/xen_intr.c @@ -866,7 +866,7 @@ xen_intr_bind_virq(device_t dev, u_int virq, u_int cpu, if (error != 0) { evtchn_close_t close = { .port = bind_virq.port }; - xen_intr_unbind(*port_handlep); + xen_intr_unbind(port_handlep); if (HYPERVISOR_event_channel_op(EVTCHNOP_close, &close)) panic("EVTCHNOP_close failed"); return (error); @@ -923,7 +923,7 @@ xen_intr_alloc_and_bind_ipi(u_int cpu, driver_filter_t filter, if (error != 0) { evtchn_close_t close = { .port = bind_ipi.port }; - xen_intr_unbind(*port_handlep); + xen_intr_unbind(port_handlep); if (HYPERVISOR_event_channel_op(EVTCHNOP_close, &close)) panic("EVTCHNOP_close failed"); return (error); diff --git a/sys/dev/xen/timer/xen_timer.c b/sys/dev/xen/timer/xen_timer.c index 93cab090c596..f42ed5fd2525 100644 --- a/sys/dev/xen/timer/xen_timer.c +++ b/sys/dev/xen/timer/xen_timer.c @@ -84,7 +84,7 @@ struct xentimer_pcpu_data { uint64_t timer; uint64_t last_processed; - void *irq_handle; + xen_intr_handle_t irq_handle; }; DPCPU_DEFINE(struct xentimer_pcpu_data, xentimer_pcpu);