This merely fixes sparse warnings, without actually
adding support for the new APIs.

Still working out the best way to enable the new
functionality.
Signed-off-by: NMichael S. Tsirkin <mst@redhat.com>