Merge branch 'master' of github.com:hioa-cs/IncludeOS into dev

AnnikaH · AnnikaH · commit 0b7ff01a48cf · 2016-10-05T20:56:51.000+02:00
diff --git a/src/drivers/virtioblk.cpp b/src/drivers/virtioblk.cpp
@@ -34,7 +34,7 @@ void null_deleter(uint8_t*) {};
 #include <statman>
 
 VirtioBlk::VirtioBlk(hw::PCI_Device& d)
-  : Virtio(d), hw::Drive(), req(queue_size(0), 0, iobase())
+  : Virtio(d), hw::Drive(), req(queue_size(0), 0, iobase()), inflight(0)
 {
   INFO("VirtioBlk", "Driver initializing");
   {

Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ void null_deleter(uint8_t*) {};`
`34`	`34`	`#include <statman>`
`35`	`35`
`36`	`36`	`VirtioBlk::VirtioBlk(hw::PCI_Device& d)`
`37`		`- : Virtio(d), hw::Drive(), req(queue_size(0), 0, iobase())`
	`37`	`+ : Virtio(d), hw::Drive(), req(queue_size(0), 0, iobase()), inflight(0)`
`38`	`38`	`{`
`39`	`39`	`INFO("VirtioBlk", "Driver initializing");`
`40`	`40`	`{`