d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Change the type of the first argument to the I/O emulation handlers to

Browse Source 
'struct vm *'. Previously it used to be a 'void *' but there is no reason
to hide the actual type from the handler.

Discussed with:	tychon
MFC after:	1 week
This commit is contained in:
Neel Natu 2014-10-26 19:03:06 +00:00
parent 467298f5e3
commit f0c8263e55
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=273706
7 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sys/amd64/vmm/io/vatpic.c
View File

@ -641,7 +641,7 @@ vatpic_write(struct vatpic *vatpic, struct atpic *atpic, bool in, int port,
}
int
vatpic_master_handler(void *vm, int vcpuid, bool in, int port, int bytes,
vatpic_master_handler(struct vm *vm, int vcpuid, bool in, int port, int bytes,
uint32_t *eax)
{
struct vatpic *vatpic;
@ -661,7 +661,7 @@ vatpic_master_handler(void *vm, int vcpuid, bool in, int port, int bytes,
}
int
vatpic_slave_handler(void *vm, int vcpuid, bool in, int port, int bytes,
vatpic_slave_handler(struct vm *vm, int vcpuid, bool in, int port, int bytes,
uint32_t *eax)
{
struct vatpic *vatpic;
@ -681,7 +681,7 @@ vatpic_slave_handler(void *vm, int vcpuid, bool in, int port, int bytes,
}
int
vatpic_elc_handler(void *vm, int vcpuid, bool in, int port, int bytes,
vatpic_elc_handler(struct vm *vm, int vcpuid, bool in, int port, int bytes,
uint32_t *eax)
{
struct vatpic *vatpic;

10
sys/amd64/vmm/io/vatpic.h
View File

@ -39,11 +39,11 @@
struct vatpic *vatpic_init(struct vm *vm);
void vatpic_cleanup(struct vatpic *vatpic);
int vatpic_master_handler(void *vm, int vcpuid, bool in, int port, int bytes,
uint32_t *eax);
int vatpic_slave_handler(void *vm, int vcpuid, bool in, int port, int bytes,
uint32_t *eax);
int vatpic_elc_handler(void *vm, int vcpuid, bool in, int port, int bytes,
int vatpic_master_handler(struct vm *vm, int vcpuid, bool in, int port,
int bytes, uint32_t *eax);
int vatpic_slave_handler(struct vm *vm, int vcpuid, bool in, int port,
int bytes, uint32_t *eax);
int vatpic_elc_handler(struct vm *vm, int vcpuid, bool in, int port, int bytes,
uint32_t *eax);
int vatpic_assert_irq(struct vm *vm, int irq);

4
sys/amd64/vmm/io/vatpit.c
View File

@ -317,7 +317,7 @@ vatpit_update_mode(struct vatpit *vatpit, uint8_t val)
}
int
vatpit_handler(void *vm, int vcpuid, bool in, int port, int bytes,
vatpit_handler(struct vm *vm, int vcpuid, bool in, int port, int bytes,
uint32_t *eax)
{
struct vatpit *vatpit;
@ -400,7 +400,7 @@ vatpit_handler(void *vm, int vcpuid, bool in, int port, int bytes,
}
int
vatpit_nmisc_handler(void *vm, int vcpuid, bool in, int port, int bytes,
vatpit_nmisc_handler(struct vm *vm, int vcpuid, bool in, int port, int bytes,
uint32_t *eax)
{
struct vatpit *vatpit;

6
sys/amd64/vmm/io/vatpit.h
View File

@ -37,9 +37,9 @@
struct vatpit *vatpit_init(struct vm *vm);
void vatpit_cleanup(struct vatpit *vatpit);
int vatpit_handler(void *vm, int vcpuid, bool in, int port, int bytes,
uint32_t *eax);
int vatpit_nmisc_handler(void *vm, int vcpuid, bool in, int port, int bytes,
int vatpit_handler(struct vm *vm, int vcpuid, bool in, int port, int bytes,
uint32_t *eax);
int vatpit_nmisc_handler(struct vm *vm, int vcpuid, bool in, int port,
int bytes, uint32_t *eax);
#endif /* _VATPIT_H_ */

2
sys/amd64/vmm/io/vpmtmr.c
View File

@ -79,7 +79,7 @@ vpmtmr_cleanup(struct vpmtmr *vpmtmr)
}
int
vpmtmr_handler(void *vm, int vcpuid, bool in, int port, int bytes,
vpmtmr_handler(struct vm *vm, int vcpuid, bool in, int port, int bytes,
uint32_t *val)
{
struct vpmtmr *vpmtmr;

2
sys/amd64/vmm/io/vpmtmr.h
View File

@ -36,7 +36,7 @@ struct vpmtmr;
struct vpmtmr *vpmtmr_init(struct vm *vm);
void vpmtmr_cleanup(struct vpmtmr *pmtmr);
int vpmtmr_handler(void *vm, int vcpuid, bool in, int port, int bytes,
int vpmtmr_handler(struct vm *vm, int vcpuid, bool in, int port, int bytes,
uint32_t *val);
#endif

2
sys/amd64/vmm/vmm_ioport.h
View File

@ -29,7 +29,7 @@
#ifndef _VMM_IOPORT_H_
#define _VMM_IOPORT_H_
typedef int (*ioport_handler_func_t)(void *vm, int vcpuid,
typedef int (*ioport_handler_func_t)(struct vm *vm, int vcpuid,
bool in, int port, int bytes, uint32_t *val);
int vm_handle_inout(struct vm *vm, int vcpuid, struct vm_exit *vme, bool *retu);