summaryrefslogtreecommitdiff
path: root/hw/virtio/virtio-balloon.c
diff options
context:
space:
mode:
authorJason Wang <jasowang@redhat.com>2015-07-27 17:49:19 +0800
committerMichael S. Tsirkin <mst@redhat.com>2015-07-27 18:11:53 +0300
commit9d5b731dd2d64deb3bc798ef4e3c08603d54ae02 (patch)
treef48bb5d3ac1a11ab88e4fe3255f80b3398cc4ae2 /hw/virtio/virtio-balloon.c
parent27462695cde2a2208b1ff8074c2e917b8203590b (diff)
downloadqemu-9d5b731dd2d64deb3bc798ef4e3c08603d54ae02.tar.gz
virtio: get_features() can fail
Signed-off-by: Jason Wang <jasowang@redhat.com> Reviewed-by: Michael S. Tsirkin <mst@redhat.com> Signed-off-by: Michael S. Tsirkin <mst@redhat.com> Acked-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'hw/virtio/virtio-balloon.c')
-rw-r--r--hw/virtio/virtio-balloon.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/hw/virtio/virtio-balloon.c b/hw/virtio/virtio-balloon.c
index 2990f8de5d..3577b7af91 100644
--- a/hw/virtio/virtio-balloon.c
+++ b/hw/virtio/virtio-balloon.c
@@ -310,7 +310,8 @@ static void virtio_balloon_set_config(VirtIODevice *vdev,
trace_virtio_balloon_set_config(dev->actual, oldactual);
}
-static uint64_t virtio_balloon_get_features(VirtIODevice *vdev, uint64_t f)
+static uint64_t virtio_balloon_get_features(VirtIODevice *vdev, uint64_t f,
+ Error **errp)
{
VirtIOBalloon *dev = VIRTIO_BALLOON(vdev);
f |= dev->host_features;