falso
/
qemu-irix
mirror of https://github.com/n64decomp/qemu-irix.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

kvm: support any size for pio eventfd 

Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
This commit is contained in:
Michael S. Tsirkin 2013-04-02 00:54:45 +03:00
parent 500ffd4a29
commit 44c3f8f7c7
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
kvm-all.c
View File

@ -500,8 +500,8 @@ int kvm_check_extension(KVMState *s, unsigned int extension)
return ret; return ret;
} }
static int kvm_set_ioeventfd_mmio(int fd, uint32_t addr, uint32_t val, bool assign, static int kvm_set_ioeventfd_mmio(int fd, uint32_t addr, uint32_t val,
uint32_t size) bool assign, uint32_t size)
{ {
int ret; int ret;
struct kvm_ioeventfd iofd; struct kvm_ioeventfd iofd;
@ -529,13 +529,13 @@ static int kvm_set_ioeventfd_mmio(int fd, uint32_t addr, uint32_t val, bool assi
return 0; return 0;
} }
static int kvm_set_ioeventfd_pio_word(int fd, uint16_t addr, uint16_t val, static int kvm_set_ioeventfd_pio(int fd, uint16_t addr, uint16_t val,
bool assign) bool assign, uint32_t size)
{ {
struct kvm_ioeventfd kick = { struct kvm_ioeventfd kick = {
.datamatch = val, .datamatch = val,
.addr = addr, .addr = addr,
.len = 2, .len = size,
.flags = KVM_IOEVENTFD_FLAG_DATAMATCH | KVM_IOEVENTFD_FLAG_PIO, .flags = KVM_IOEVENTFD_FLAG_DATAMATCH | KVM_IOEVENTFD_FLAG_PIO,
.fd = fd, .fd = fd,
}; };
@ -571,7 +571,7 @@ static int kvm_check_many_ioeventfds(void)
if (ioeventfds[i] < 0) { if (ioeventfds[i] < 0) {
break; break;
} }
ret = kvm_set_ioeventfd_pio_word(ioeventfds[i], 0, i, true); ret = kvm_set_ioeventfd_pio(ioeventfds[i], 0, i, true, 2);
if (ret < 0) { if (ret < 0) {
close(ioeventfds[i]); close(ioeventfds[i]);
break; break;
@ -582,7 +582,7 @@ static int kvm_check_many_ioeventfds(void)
ret = i == ARRAY_SIZE(ioeventfds); ret = i == ARRAY_SIZE(ioeventfds);
while (i-- > 0) { while (i-- > 0) {
kvm_set_ioeventfd_pio_word(ioeventfds[i], 0, i, false); kvm_set_ioeventfd_pio(ioeventfds[i], 0, i, false, 2);
close(ioeventfds[i]); close(ioeventfds[i]);
} }
return ret; return ret;
@ -834,10 +834,10 @@ static void kvm_io_ioeventfd_add(MemoryListener *listener,
int fd = event_notifier_get_fd(e); int fd = event_notifier_get_fd(e);
int r; int r;
assert(match_data && section->size == 2); assert(match_data && section->size <= 8);
r = kvm_set_ioeventfd_pio_word(fd, section->offset_within_address_space, r = kvm_set_ioeventfd_pio(fd, section->offset_within_address_space,
data, true); data, true, section->size);
if (r < 0) { if (r < 0) {
abort(); abort();
} }
@ -852,8 +852,8 @@ static void kvm_io_ioeventfd_del(MemoryListener *listener,
int fd = event_notifier_get_fd(e); int fd = event_notifier_get_fd(e);
int r; int r;
r = kvm_set_ioeventfd_pio_word(fd, section->offset_within_address_space, r = kvm_set_ioeventfd_pio(fd, section->offset_within_address_space,
data, false); data, false, section->size);
if (r < 0) { if (r < 0) {
abort(); abort();
} }