For the NULL values you are adding above.  I don't like this.  It feels like a slippery slope towards breaking support for kvm and file in favor of xen.  If we are expanding the needs of the driver layer (which I'm somewhat hesitant to do anyway), then we should be providing the necessary functionality for each supported system.