The branch stable/13 has been updated by jhb:

URL: 
https://cgit.FreeBSD.org/src/commit/?id=fa466e70b325f826042e2bfd746471eb23a09f1d

commit fa466e70b325f826042e2bfd746471eb23a09f1d
Author:     Mark Johnston <[email protected]>
AuthorDate: 2022-10-22 17:34:00 +0000
Commit:     John Baldwin <[email protected]>
CommitDate: 2023-01-26 19:30:55 +0000

    bhyve: Address some warnings in bhyverun.c
    
    - Annotate unused parameters as such.
    - Avoid shadowing the global "vmexit".
    
    No functional change intended.
    
    MFC after:      1 week
    
    (cherry picked from commit 4a1c23a708f98c1588a196041cda5d55795e2f0c)
---
 usr.sbin/bhyve/bhyverun.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/usr.sbin/bhyve/bhyverun.c b/usr.sbin/bhyve/bhyverun.c
index 7d62ff58919e..cdd5a8833ba3 100644
--- a/usr.sbin/bhyve/bhyverun.c
+++ b/usr.sbin/bhyve/bhyverun.c
@@ -942,13 +942,13 @@ vmexit_breakpoint(struct vmctx *ctx __unused, struct 
vm_exit *vme, int *pvcpu)
 }
 
 static int
-vmexit_ipi(struct vmctx *ctx, struct vm_exit *vmexit, int *pvcpu)
+vmexit_ipi(struct vmctx *ctx, struct vm_exit *vme, int *pvcpu __unused)
 {
        int error = -1;
        int i;
-       switch (vmexit->u.ipi.mode) {
+       switch (vme->u.ipi.mode) {
        case APIC_DELMODE_INIT:
-               CPU_FOREACH_ISSET (i, &vmexit->u.ipi.dmask) {
+               CPU_FOREACH_ISSET(i, &vme->u.ipi.dmask) {
                        error = vm_suspend_cpu(ctx, i);
                        if (error) {
                                warnx("%s: failed to suspend cpu %d\n",
@@ -958,8 +958,8 @@ vmexit_ipi(struct vmctx *ctx, struct vm_exit *vmexit, int 
*pvcpu)
                }
                break;
        case APIC_DELMODE_STARTUP:
-               CPU_FOREACH_ISSET (i, &vmexit->u.ipi.dmask) {
-                       spinup_ap(ctx, i, vmexit->u.ipi.vector << PAGE_SHIFT);
+               CPU_FOREACH_ISSET(i, &vme->u.ipi.dmask) {
+                       spinup_ap(ctx, i, vme->u.ipi.vector << PAGE_SHIFT);
                }
                error = 0;
                break;

Reply via email to