Skip to content

Commit

Permalink
bhyve: Annotate unused function parameters
Browse files Browse the repository at this point in the history
MFC after:	1 week

(cherry picked from commit 98d920d)
  • Loading branch information
markjdb authored and bsdjhb committed Jan 26, 2023
1 parent a9cbcdd commit e696777
Show file tree
Hide file tree
Showing 37 changed files with 238 additions and 218 deletions.
29 changes: 15 additions & 14 deletions sys/amd64/vmm/vmm_instruction_emul.c
Expand Up @@ -624,8 +624,7 @@ emulate_mov(void *vm, int vcpuid, uint64_t gpa, struct vie *vie,

static int
emulate_movx(void *vm, int vcpuid, uint64_t gpa, struct vie *vie,
mem_region_read_t memread, mem_region_write_t memwrite,
void *arg)
mem_region_read_t memread, mem_region_write_t memwrite __unused, void *arg)
{
int error, size;
enum vm_reg_name reg;
Expand Down Expand Up @@ -712,9 +711,9 @@ emulate_movx(void *vm, int vcpuid, uint64_t gpa, struct vie *vie,
* Helper function to calculate and validate a linear address.
*/
static int
get_gla(void *vm, int vcpuid, struct vie *vie, struct vm_guest_paging *paging,
int opsize, int addrsize, int prot, enum vm_reg_name seg,
enum vm_reg_name gpr, uint64_t *gla, int *fault)
get_gla(void *vm, int vcpuid, struct vie *vie __unused,
struct vm_guest_paging *paging, int opsize, int addrsize, int prot,
enum vm_reg_name seg, enum vm_reg_name gpr, uint64_t *gla, int *fault)
{
struct seg_desc desc;
uint64_t cr0, val, rflags;
Expand Down Expand Up @@ -948,7 +947,7 @@ emulate_movs(void *vm, int vcpuid, uint64_t gpa, struct vie *vie,

static int
emulate_stos(void *vm, int vcpuid, uint64_t gpa, struct vie *vie,
struct vm_guest_paging *paging, mem_region_read_t memread,
struct vm_guest_paging *paging __unused, mem_region_read_t memread __unused,
mem_region_write_t memwrite, void *arg)
{
int error, opsize, repeat;
Expand Down Expand Up @@ -1186,7 +1185,7 @@ emulate_or(void *vm, int vcpuid, uint64_t gpa, struct vie *vie,

static int
emulate_cmp(void *vm, int vcpuid, uint64_t gpa, struct vie *vie,
mem_region_read_t memread, mem_region_write_t memwrite, void *arg)
mem_region_read_t memread, mem_region_write_t memwrite __unused, void *arg)
{
int error, size;
uint64_t regop, memop, op1, op2, rflags, rflags2;
Expand Down Expand Up @@ -1278,7 +1277,7 @@ emulate_cmp(void *vm, int vcpuid, uint64_t gpa, struct vie *vie,

static int
emulate_test(void *vm, int vcpuid, uint64_t gpa, struct vie *vie,
mem_region_read_t memread, mem_region_write_t memwrite, void *arg)
mem_region_read_t memread, mem_region_write_t memwrite __unused, void *arg)
{
int error, size;
uint64_t op1, rflags, rflags2;
Expand Down Expand Up @@ -1328,7 +1327,7 @@ emulate_test(void *vm, int vcpuid, uint64_t gpa, struct vie *vie,
static int
emulate_bextr(void *vm, int vcpuid, uint64_t gpa, struct vie *vie,
struct vm_guest_paging *paging, mem_region_read_t memread,
mem_region_write_t memwrite, void *arg)
mem_region_write_t memwrite __unused, void *arg)
{
uint64_t src1, src2, dst, rflags;
unsigned start, len;
Expand Down Expand Up @@ -1404,7 +1403,7 @@ emulate_bextr(void *vm, int vcpuid, uint64_t gpa, struct vie *vie,

static int
emulate_add(void *vm, int vcpuid, uint64_t gpa, struct vie *vie,
mem_region_read_t memread, mem_region_write_t memwrite, void *arg)
mem_region_read_t memread, mem_region_write_t memwrite __unused, void *arg)
{
int error, size;
uint64_t nval, rflags, rflags2, val1, val2;
Expand Down Expand Up @@ -1460,7 +1459,7 @@ emulate_add(void *vm, int vcpuid, uint64_t gpa, struct vie *vie,

static int
emulate_sub(void *vm, int vcpuid, uint64_t gpa, struct vie *vie,
mem_region_read_t memread, mem_region_write_t memwrite, void *arg)
mem_region_read_t memread, mem_region_write_t memwrite __unused, void *arg)
{
int error, size;
uint64_t nval, rflags, rflags2, val1, val2;
Expand Down Expand Up @@ -1660,7 +1659,7 @@ emulate_pop(void *vm, int vcpuid, uint64_t mmio_gpa, struct vie *vie,

static int
emulate_group1(void *vm, int vcpuid, uint64_t gpa, struct vie *vie,
struct vm_guest_paging *paging, mem_region_read_t memread,
struct vm_guest_paging *paging __unused, mem_region_read_t memread,
mem_region_write_t memwrite, void *memarg)
{
int error;
Expand Down Expand Up @@ -1688,7 +1687,8 @@ emulate_group1(void *vm, int vcpuid, uint64_t gpa, struct vie *vie,

static int
emulate_bittest(void *vm, int vcpuid, uint64_t gpa, struct vie *vie,
mem_region_read_t memread, mem_region_write_t memwrite, void *memarg)
mem_region_read_t memread, mem_region_write_t memwrite __unused,
void *memarg)
{
uint64_t val, rflags;
int error, bitmask, bitoff;
Expand Down Expand Up @@ -1730,7 +1730,8 @@ emulate_bittest(void *vm, int vcpuid, uint64_t gpa, struct vie *vie,

static int
emulate_twob_group15(void *vm, int vcpuid, uint64_t gpa, struct vie *vie,
mem_region_read_t memread, mem_region_write_t memwrite, void *memarg)
mem_region_read_t memread, mem_region_write_t memwrite __unused,
void *memarg)
{
int error;
uint64_t buf;
Expand Down
5 changes: 3 additions & 2 deletions usr.sbin/bhyve/block_if.c
Expand Up @@ -397,7 +397,8 @@ blockif_thr(void *arg)
}

static void
blockif_sigcont_handler(int signal, enum ev_type type, void *arg)
blockif_sigcont_handler(int signal __unused, enum ev_type type __unused,
void *arg __unused)
{
struct blockif_sig_elem *bse;

Expand Down Expand Up @@ -641,7 +642,7 @@ blockif_open(nvlist_t *nvl, const char *ident)
}

static void
blockif_resized(int fd, enum ev_type type, void *arg)
blockif_resized(int fd, enum ev_type type __unused, void *arg)
{
struct blockif_ctxt *bc;
struct stat sb;
Expand Down
5 changes: 3 additions & 2 deletions usr.sbin/bhyve/bootrom.c
Expand Up @@ -84,8 +84,9 @@ static struct bootrom_var_state {
* that the Firmware Volume area is writable and persistent.
*/
static int
bootrom_var_mem_handler(struct vmctx *ctx, int vcpu, int dir, uint64_t addr,
int size, uint64_t *val, void *arg1, long arg2)
bootrom_var_mem_handler(struct vmctx *ctx __unused, int vcpu __unused, int dir,
uint64_t addr, int size, uint64_t *val, void *arg1 __unused,
long arg2 __unused)
{
off_t offset;

Expand Down
14 changes: 7 additions & 7 deletions usr.sbin/bhyve/fwctl.c
Expand Up @@ -119,7 +119,7 @@ errop_set(int err)
}

static int
errop_start(uint32_t len)
errop_start(uint32_t len __unused)
{
errop_code = ENOENT;

Expand All @@ -128,7 +128,7 @@ errop_start(uint32_t len)
}

static void
errop_data(uint32_t data, uint32_t len)
errop_data(uint32_t data __unused, uint32_t len __unused)
{

/* ignore */
Expand All @@ -144,7 +144,7 @@ errop_result(struct iovec **data)
}

static void
errop_done(struct iovec *data)
errop_done(struct iovec *data __unused)
{

/* assert data is NULL */
Expand Down Expand Up @@ -200,7 +200,7 @@ fget_start(uint32_t len)
}

static void
fget_data(uint32_t data, uint32_t len)
fget_data(uint32_t data, uint32_t len __unused)
{

*((uint32_t *) &fget_str[fget_cnt]) = data;
Expand Down Expand Up @@ -244,7 +244,7 @@ fget_result(struct iovec **data, int val)
}

static void
fget_done(struct iovec *data)
fget_done(struct iovec *data __unused)
{

/* nothing needs to be freed */
Expand Down Expand Up @@ -520,8 +520,8 @@ fwctl_outl(uint32_t val)
}

static int
fwctl_handler(struct vmctx *ctx, int vcpu, int in, int port, int bytes,
uint32_t *eax, void *arg)
fwctl_handler(struct vmctx *ctx __unused, int vcpu __unused, int in,
int port __unused, int bytes, uint32_t *eax, void *arg __unused)
{

if (in) {
Expand Down
6 changes: 3 additions & 3 deletions usr.sbin/bhyve/gdb.c
Expand Up @@ -1704,7 +1704,7 @@ check_command(int fd)
}

static void
gdb_readable(int fd, enum ev_type event, void *arg)
gdb_readable(int fd, enum ev_type event __unused, void *arg __unused)
{
ssize_t nread;
int pending;
Expand Down Expand Up @@ -1743,14 +1743,14 @@ gdb_readable(int fd, enum ev_type event, void *arg)
}

static void
gdb_writable(int fd, enum ev_type event, void *arg)
gdb_writable(int fd, enum ev_type event __unused, void *arg __unused)
{

send_pending_data(fd);
}

static void
new_connection(int fd, enum ev_type event, void *arg)
new_connection(int fd, enum ev_type event __unused, void *arg)
{
int optval, s;

Expand Down
4 changes: 2 additions & 2 deletions usr.sbin/bhyve/inout.c
Expand Up @@ -66,8 +66,8 @@ static struct {
} inout_handlers[MAX_IOPORTS];

static int
default_inout(struct vmctx *ctx, int vcpu, int in, int port, int bytes,
uint32_t *eax, void *arg)
default_inout(struct vmctx *ctx __unused, int vcpu __unused, int in,
int port __unused, int bytes, uint32_t *eax, void *arg __unused)
{
if (in) {
switch (bytes) {
Expand Down
2 changes: 1 addition & 1 deletion usr.sbin/bhyve/mevent.c
Expand Up @@ -99,7 +99,7 @@ mevent_qunlock(void)
}

static void
mevent_pipe_read(int fd, enum ev_type type, void *param)
mevent_pipe_read(int fd, enum ev_type type __unused, void *param __unused)
{
char buf[MEVENT_MAX];
int status;
Expand Down
4 changes: 2 additions & 2 deletions usr.sbin/bhyve/mptbl.c
Expand Up @@ -213,8 +213,8 @@ mpt_count_ioint_entries(void)
}

static void
mpt_generate_pci_int(int bus, int slot, int pin, int pirq_pin, int ioapic_irq,
void *arg)
mpt_generate_pci_int(int bus, int slot, int pin, int pirq_pin __unused,
int ioapic_irq, void *arg)
{
int_entry_ptr *mpiep, mpie;

Expand Down
16 changes: 8 additions & 8 deletions usr.sbin/bhyve/net_backends.c
Expand Up @@ -222,7 +222,7 @@ tap_cleanup(struct net_backend *be)

static int
tap_init(struct net_backend *be, const char *devname,
nvlist_t *nvl, net_be_rxeof_t cb, void *param)
nvlist_t *nvl __unused, net_be_rxeof_t cb, void *param)
{
struct tap_priv *priv = NET_BE_PRIV(be);
char tbuf[80];
Expand Down Expand Up @@ -397,15 +397,15 @@ tap_recv_disable(struct net_backend *be)
}

static uint64_t
tap_get_cap(struct net_backend *be)
tap_get_cap(struct net_backend *be __unused)
{

return (0); /* no capabilities for now */
}

static int
tap_set_cap(struct net_backend *be, uint64_t features,
unsigned vnet_hdr_len)
tap_set_cap(struct net_backend *be __unused, uint64_t features,
unsigned vnet_hdr_len)
{

return ((features || vnet_hdr_len) ? -1 : 0);
Expand Down Expand Up @@ -452,7 +452,7 @@ DATA_SET(net_backend_set, vmnet_backend);
#define NG_SBUF_MAX_SIZE (4 * 1024 * 1024)

static int
ng_init(struct net_backend *be, const char *devname,
ng_init(struct net_backend *be, const char *devname __unused,
nvlist_t *nvl, net_be_rxeof_t cb, void *param)
{
struct tap_priv *p = NET_BE_PRIV(be);
Expand Down Expand Up @@ -677,16 +677,16 @@ netmap_get_cap(struct net_backend *be)
}

static int
netmap_set_cap(struct net_backend *be, uint64_t features,
unsigned vnet_hdr_len)
netmap_set_cap(struct net_backend *be, uint64_t features __unused,
unsigned vnet_hdr_len)
{

return (netmap_set_vnet_hdr_len(be, vnet_hdr_len));
}

static int
netmap_init(struct net_backend *be, const char *devname,
nvlist_t *nvl, net_be_rxeof_t cb, void *param)
nvlist_t *nvl __unused, net_be_rxeof_t cb, void *param)
{
struct netmap_priv *priv = NET_BE_PRIV(be);

Expand Down
15 changes: 8 additions & 7 deletions usr.sbin/bhyve/pci_ahci.c
Expand Up @@ -2189,8 +2189,9 @@ pci_ahci_host_write(struct pci_ahci_softc *sc, uint64_t offset, uint64_t value)
}

static void
pci_ahci_write(struct vmctx *ctx, int vcpu, struct pci_devinst *pi,
int baridx, uint64_t offset, int size, uint64_t value)
pci_ahci_write(struct vmctx *ctx __unused, int vcpu __unused,
struct pci_devinst *pi, int baridx, uint64_t offset, int size,
uint64_t value)
{
struct pci_ahci_softc *sc = pi->pi_arg;

Expand Down Expand Up @@ -2283,8 +2284,8 @@ pci_ahci_port_read(struct pci_ahci_softc *sc, uint64_t offset)
}

static uint64_t
pci_ahci_read(struct vmctx *ctx, int vcpu, struct pci_devinst *pi, int baridx,
uint64_t regoff, int size)
pci_ahci_read(struct vmctx *ctx __unused, int vcpu __unused,
struct pci_devinst *pi, int baridx, uint64_t regoff, int size)
{
struct pci_ahci_softc *sc = pi->pi_arg;
uint64_t offset;
Expand Down Expand Up @@ -2411,7 +2412,7 @@ pci_ahci_hd_legacy_config(nvlist_t *nvl, const char *opts)
}

static int
pci_ahci_init(struct vmctx *ctx, struct pci_devinst *pi, nvlist_t *nvl)
pci_ahci_init(struct vmctx *ctx __unused, struct pci_devinst *pi, nvlist_t *nvl)
{
char bident[sizeof("XX:XX:XX")];
char node_name[sizeof("XX")];
Expand Down Expand Up @@ -2659,7 +2660,7 @@ pci_ahci_snapshot(struct vm_snapshot_meta *meta)
}

static int
pci_ahci_pause(struct vmctx *ctx, struct pci_devinst *pi)
pci_ahci_pause(struct vmctx *ctx __unused, struct pci_devinst *pi)
{
struct pci_ahci_softc *sc;
struct blockif_ctxt *bctxt;
Expand All @@ -2679,7 +2680,7 @@ pci_ahci_pause(struct vmctx *ctx, struct pci_devinst *pi)
}

static int
pci_ahci_resume(struct vmctx *ctx, struct pci_devinst *pi)
pci_ahci_resume(struct vmctx *ctx __unused, struct pci_devinst *pi)
{
struct pci_ahci_softc *sc;
struct blockif_ctxt *bctxt;
Expand Down

0 comments on commit e696777

Please sign in to comment.