Merge remote-tracking branch 'riku/linux-user-for-upstream' into staging

[qemu.git] / hw / virtio.h

diff --git a/hw/virtio.h b/hw/virtio.h
index 69e6bb1a4e37ba8c4f2fa186a59ec756626b7732..0fd0bb0ac574ba788de55b108aeb4190971dca47 100644 (file)
--- a/hw/virtio.h
+++ b/hw/virtio.h
@@ -197,7 +197,8 @@ void virtio_bind_device(VirtIODevice *vdev, const VirtIOBindings *binding,
                         void *opaque);
 
 /* Base devices.  */
-VirtIODevice *virtio_blk_init(DeviceState *dev, BlockConf *conf);
+VirtIODevice *virtio_blk_init(DeviceState *dev, BlockConf *conf,
+                              char **serial);
 struct virtio_net_conf;
 VirtIODevice *virtio_net_init(DeviceState *dev, NICConf *conf,
                               struct virtio_net_conf *net);