From nobody Fri Apr 14 14:00:53 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 4PydQF5hw6z45JBh; Fri, 14 Apr 2023 14:00:53 +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 4PydQF31lyz3K47; Fri, 14 Apr 2023 14:00:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681480853; 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=r20T/MVO6zDKgPBK6SR1fvAug7ywjkEEnUJbDg16mzI=; b=tSQq4SPci59Z68NU5AlQPTueWFAh/wQ4UAL4POql3t7/63ewzSBN+CysZSSOBPjHg9E/n+ Quw2z4EqiibO+NviAcP8B+JKSOJRzSWCHkU25M+uuXnY2QxSvRxS26MEoHErQgLdQnO1kz 73CV7VA00uaMfj56NqhLG9bY0VV0K78HFfodIHEX5IH44/gHnp40wSkoyITztiNwMTDbpm O9jcpaLGQmD+hjABnxGW9K9vRd/MouS3zAmHPrsEZWGvQ47H9VOl+6kEMb5gyvEy2izxQn D8SXAS6HWXjyeRNhYLHFtLnMfi+UpO8VhfogFcbvcESTX9RaGPXU+EXQ4yihKw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681480853; 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=r20T/MVO6zDKgPBK6SR1fvAug7ywjkEEnUJbDg16mzI=; b=FCA4ZiTZe9UlNGlGcAQoYhAk/8ceKX7eg12IolfOkETXHxFS04PJoh5+5zHtTbYnHPl3+W oBr26VmlAj+kW2JBZQy/qkPG+CTSJzKmbY6/r2Nn7GmMVZp5EyyrUSfvNYxsogpUVqUeIx hcjw+8fFxj0C4BviknhHnnPX5TSZNfrVP2WEx1m/dt1nQkSkvP5ZoOciAbVvKN3fWjd3nw pl84Q7rnrKyGg2LedF0P3m39BiaULs6yb8zMuQi0EbCoIZtRMjDNtl5x1i1uS2A89abMF1 7zM8ElNQz8ZPCJtIEGOkWnXsmGBZLO7rffi6ZfdH0FroJ3T4Z7KO+vTBbHpHFA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681480853; a=rsa-sha256; cv=none; b=sIE2k7YzG3dXFeB1qYWS79VsLjJ9xP5M/TrIhW+mk9VCQl8iIeH+JuozUuUrpKD25UDC/s TVhZcWDoSlNPN4608e5i5asqG18kXFYUW5i0JJ6txzb+9t1uwVL7P1bevpID5iG2+mMRfP 2u0rzvJlI4mN2N44se0ZarhlandVAF6DTLKlBalgwUkUbPGIePSNRyqac/vXYsN01WoGsE x92Jy6USyYCYtttsFDOow3wvTKz+vfMvhb9xIzFMhmACPifr+uOZvGLfNjrjef1/r6tWBq O+ah4YR+NRQVuzCWXmFmF1ElusccXZm1VdIcXptBNaiajIpPqSTjB3xN8DOq7Q== 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 4PydQF1NP6zRj6; Fri, 14 Apr 2023 14:00:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33EE0rSQ083698; Fri, 14 Apr 2023 14:00:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33EE0rMf083697; Fri, 14 Apr 2023 14:00:53 GMT (envelope-from git) Date: Fri, 14 Apr 2023 14:00:53 GMT Message-Id: <202304141400.33EE0rMf083697@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: =?utf-8?Q?Roger=20Pau=20Monn=C3=A9?= Subject: git: 149c58101811 - main - xen/intr: adjust xenisrc types, adjust format strings to match 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: 149c58101811ac703e98e0ea257cba65821134cb Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by royger: URL: https://cgit.FreeBSD.org/src/commit/?id=149c58101811ac703e98e0ea257cba65821134cb commit 149c58101811ac703e98e0ea257cba65821134cb Author: Elliott Mitchell AuthorDate: 2021-11-01 01:12:51 +0000 Commit: Roger Pau Monné CommitDate: 2023-04-14 13:58:49 +0000 xen/intr: adjust xenisrc types, adjust format strings to match As "CPUs", IRQs (vector) and virtual IRQs are always positive integers, adjust the Xen code to use unsigned integers. Several format strings need adjustment to match. Additionally single-bit bitfields are boolean. No functional change expected. Reviewed by: royger --- sys/x86/xen/xen_intr.c | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/sys/x86/xen/xen_intr.c b/sys/x86/xen/xen_intr.c index 15001bb537cc..c1ca984bf6ef 100644 --- a/sys/x86/xen/xen_intr.c +++ b/sys/x86/xen/xen_intr.c @@ -119,13 +119,13 @@ DPCPU_DECLARE(struct vcpu_info *, vcpu_info); struct xenisrc { struct intsrc xi_intsrc; enum evtchn_type xi_type; - int xi_cpu; /* VCPU for delivery. */ - int xi_vector; /* Global isrc vector number. */ + u_int xi_cpu; /* VCPU for delivery. */ + u_int xi_vector; /* Global isrc vector number. */ evtchn_port_t xi_port; - int xi_virq; + u_int xi_virq; void *xi_cookie; - u_int xi_close:1; /* close on unbind? */ - u_int xi_masked:1; + bool xi_close:1; /* close on unbind? */ + bool xi_masked:1; volatile u_int xi_refcount; }; @@ -433,7 +433,7 @@ xen_intr_bind_isrc(struct xenisrc **isrcp, evtchn_port_t local_port, } } isrc->xi_port = local_port; - isrc->xi_close = 0; + isrc->xi_close = false; xen_intr_port_to_isrc[local_port] = isrc; refcount_init(&isrc->xi_refcount, 1); mtx_unlock(&xen_intr_isrc_lock); @@ -579,7 +579,7 @@ xen_intr_handle_upcall(struct trapframe *trap_frame) /* Make sure we are firing on the right vCPU */ KASSERT((isrc->xi_cpu == PCPU_GET(cpuid)), - ("Received unexpected event on vCPU#%d, event bound to vCPU#%d", + ("Received unexpected event on vCPU#%u, event bound to vCPU#%u", PCPU_GET(cpuid), isrc->xi_cpu)); intr_execute_handlers(&isrc->xi_intsrc, trap_frame); @@ -696,7 +696,7 @@ static void xen_rebind_ipi(struct xenisrc *isrc) { #ifdef SMP - int cpu = isrc->xi_cpu; + u_int cpu = isrc->xi_cpu; u_int vcpu_id = XEN_CPUID_TO_VCPUID(cpu); int error; struct evtchn_bind_ipi bind_ipi = { .vcpu = vcpu_id }; @@ -715,7 +715,7 @@ xen_rebind_ipi(struct xenisrc *isrc) static void xen_rebind_virq(struct xenisrc *isrc) { - int cpu = isrc->xi_cpu; + u_int cpu = isrc->xi_cpu; u_int vcpu_id = XEN_CPUID_TO_VCPUID(cpu); int error; struct evtchn_bind_virq bind_virq = { .virq = isrc->xi_virq, @@ -724,7 +724,7 @@ xen_rebind_virq(struct xenisrc *isrc) error = HYPERVISOR_event_channel_op(EVTCHNOP_bind_virq, &bind_virq); if (error != 0) - panic("unable to rebind xen VIRQ#%d: %d", isrc->xi_virq, error); + panic("unable to rebind xen VIRQ#%u: %d", isrc->xi_virq, error); isrc->xi_port = bind_virq.port; } @@ -1373,12 +1373,12 @@ xen_intr_dump_port(struct xenisrc *isrc) { struct xen_intr_pcpu_data *pcpu; shared_info_t *s = HYPERVISOR_shared_info; - int i; + u_int i; db_printf("Port %d Type: %s\n", isrc->xi_port, xen_intr_print_type(isrc->xi_type)); if (isrc->xi_type == EVTCHN_TYPE_VIRQ) - db_printf("\tVirq: %d\n", isrc->xi_virq); + db_printf("\tVirq: %u\n", isrc->xi_virq); db_printf("\tMasked: %d Pending: %d\n", !!xen_test_bit(isrc->xi_port, &s->evtchn_mask[0]), @@ -1387,7 +1387,7 @@ xen_intr_dump_port(struct xenisrc *isrc) db_printf("\tPer-CPU Masks: "); CPU_FOREACH(i) { pcpu = DPCPU_ID_PTR(i, xen_intr_pcpu); - db_printf("cpu#%d: %d ", i, + db_printf("cpu#%u: %d ", i, !!xen_test_bit(isrc->xi_port, pcpu->evtchn_enabled)); } db_printf("\n"); @@ -1395,7 +1395,7 @@ xen_intr_dump_port(struct xenisrc *isrc) DB_SHOW_COMMAND(xen_evtchn, db_show_xen_evtchn) { - int i; + u_int i; if (!xen_domain()) { db_printf("Only available on Xen guests\n");