The branch main has been updated by jhb:

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

commit e7d5d2d1876afb429c6e1b4453bdd6d165bc5a68
Author:     John Baldwin <j...@freebsd.org>
AuthorDate: 2022-12-21 18:31:02 +0000
Commit:     John Baldwin <j...@freebsd.org>
CommitDate: 2022-12-21 18:31:02 +0000

    bhyve: Remove unused return value from spinup_ap.
    
    Reviewed by:    corvink, markj
    Differential Revision:  https://reviews.freebsd.org/D37641
---
 usr.sbin/bhyve/spinup_ap.c | 4 +---
 usr.sbin/bhyve/spinup_ap.h | 2 +-
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/usr.sbin/bhyve/spinup_ap.c b/usr.sbin/bhyve/spinup_ap.c
index 438091e564e7..e23265f8b82b 100644
--- a/usr.sbin/bhyve/spinup_ap.c
+++ b/usr.sbin/bhyve/spinup_ap.c
@@ -76,7 +76,7 @@ spinup_ap_realmode(struct vmctx *ctx, int newcpu, uint64_t 
*rip)
        assert(error == 0);
 }
 
-int
+void
 spinup_ap(struct vmctx *ctx, int newcpu, uint64_t rip)
 {
        int error;
@@ -104,6 +104,4 @@ spinup_ap(struct vmctx *ctx, int newcpu, uint64_t rip)
        spinup_ap_realmode(ctx, newcpu, &rip);
 
        vm_resume_cpu(ctx, newcpu);
-
-       return (newcpu);
 }
diff --git a/usr.sbin/bhyve/spinup_ap.h b/usr.sbin/bhyve/spinup_ap.h
index e67bac42944b..ee201427c585 100644
--- a/usr.sbin/bhyve/spinup_ap.h
+++ b/usr.sbin/bhyve/spinup_ap.h
@@ -31,6 +31,6 @@
 #ifndef        _SPINUP_AP_H_
 #define        _SPINUP_AP_H_
 
-int spinup_ap(struct vmctx *ctx, int newcpu, uint64_t rip);
+void spinup_ap(struct vmctx *ctx, int newcpu, uint64_t rip);
 
 #endif

Reply via email to