xfnw/plan9fox
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

sdvirtio: make sure queue sizes are multiple of two

Browse source
This commit is contained in:
cinap_lenrek 2012-04-24 08:46:23 +02:00
parent 43fb53943e
commit 23c05d3235
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
sys/src/9/pc/sdvirtio.c
View file

@ -119,7 +119,7 @@ mkvqueue(int size)
sizeof(u16int)),
BY2PG, 0, 0);
if(p == nil || q == nil){
print("mkvqueue: no memory for Vqueue\n");
print("virtio: no memory for Vqueue\n");
free(p);
free(q);
return nil;
@ -169,12 +169,12 @@ viopnpdevs(int typ)
if(pcicfgr16(p, 0x2E) != typ)
continue;
if((vd = malloc(sizeof(*vd))) == nil){
print("viopnpdevs: cannot allocate memory for Vdev\n");
print("virtio: no memory for Vdev\n");
break;
}
vd->port = p->mem[0].bar & ~0x1;
if(ioalloc(vd->port, p->mem[0].size, 0, "virtio") < 0){
print("viopnpdevs: port %lux in use\n", vd->port);
print("virtio: port %lux in use\n", vd->port);
free(vd);
continue;
}
@ -188,7 +188,8 @@ viopnpdevs(int typ)
outb(vd->port+Status, Acknowledge|Driver);
for(i=0; i<nelem(vd->queue); i++){
outs(vd->port+Qselect, i);
if((n = ins(vd->port+Qsize)) == 0)
n = ins(vd->port+Qsize);
if(n == 0 || (n & (n-1)) != 0)
break;
if((vd->queue[i] = mkvqueue(n)) == nil)
break;