OpenE2K
/
qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

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>
This commit is contained in:
Jason Wang 2015-07-27 17:49:19 +08:00 committed by Michael S. Tsirkin
parent 27462695cd
commit 9d5b731dd2
12 changed files with 24 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hw/9pfs/virtio-9p-device.c
View File

@ -21,7 +21,8 @@
#include "virtio-9p-coth.h" #include "virtio-9p-coth.h"
#include "hw/virtio/virtio-access.h" #include "hw/virtio/virtio-access.h"
static uint64_t virtio_9p_get_features(VirtIODevice *vdev, uint64_t features) static uint64_t virtio_9p_get_features(VirtIODevice *vdev, uint64_t features,
Error **errp)
{ {
virtio_add_feature(&features, VIRTIO_9P_MOUNT_TAG); virtio_add_feature(&features, VIRTIO_9P_MOUNT_TAG);
return features; return features;

3
hw/block/virtio-blk.c
View File

@ -722,7 +722,8 @@ static void virtio_blk_set_config(VirtIODevice *vdev, const uint8_t *config)
aio_context_release(blk_get_aio_context(s->blk)); aio_context_release(blk_get_aio_context(s->blk));
} }
static uint64_t virtio_blk_get_features(VirtIODevice *vdev, uint64_t features) static uint64_t virtio_blk_get_features(VirtIODevice *vdev, uint64_t features,
Error **errp)
{ {
VirtIOBlock *s = VIRTIO_BLK(vdev); VirtIOBlock *s = VIRTIO_BLK(vdev);

3
hw/char/virtio-serial-bus.c
View File

@ -500,7 +500,8 @@ static void handle_input(VirtIODevice *vdev, VirtQueue *vq)
} }
} }
static uint64_t get_features(VirtIODevice *vdev, uint64_t features) static uint64_t get_features(VirtIODevice *vdev, uint64_t features,
Error **errp)
{ {
VirtIOSerial *vser; VirtIOSerial *vser;

3
hw/display/virtio-gpu.c
View File

@ -89,7 +89,8 @@ static void virtio_gpu_set_config(VirtIODevice *vdev, const uint8_t *config)
} }
} }
static uint64_t virtio_gpu_get_features(VirtIODevice *vdev, uint64_t features) static uint64_t virtio_gpu_get_features(VirtIODevice *vdev, uint64_t features,
Error **errp)
{ {
return features; return features;
} }

3
hw/input/virtio-input.c
View File

@ -166,7 +166,8 @@ static void virtio_input_set_config(VirtIODevice *vdev,
virtio_notify_config(vdev); virtio_notify_config(vdev);
} }
static uint64_t virtio_input_get_features(VirtIODevice *vdev, uint64_t f) static uint64_t virtio_input_get_features(VirtIODevice *vdev, uint64_t f,
Error **errp)
{ {
return f; return f;
} }

3
hw/net/virtio-net.c
View File

@ -446,7 +446,8 @@ static void virtio_net_set_queues(VirtIONet *n)
static void virtio_net_set_multiqueue(VirtIONet *n, int multiqueue); static void virtio_net_set_multiqueue(VirtIONet *n, int multiqueue);
static uint64_t virtio_net_get_features(VirtIODevice *vdev, uint64_t features) static uint64_t virtio_net_get_features(VirtIODevice *vdev, uint64_t features,
Error **errp)
{ {
VirtIONet *n = VIRTIO_NET(vdev); VirtIONet *n = VIRTIO_NET(vdev);
NetClientState *nc = qemu_get_queue(n->nic); NetClientState *nc = qemu_get_queue(n->nic);

3
hw/scsi/vhost-scsi.c
View File

@ -153,7 +153,8 @@ static void vhost_scsi_stop(VHostSCSI *s)
} }
static uint64_t vhost_scsi_get_features(VirtIODevice *vdev, static uint64_t vhost_scsi_get_features(VirtIODevice *vdev,
uint64_t features) uint64_t features,
Error **errp)
{ {
VHostSCSI *s = VHOST_SCSI(vdev); VHostSCSI *s = VHOST_SCSI(vdev);

3
hw/scsi/virtio-scsi.c
View File

@ -629,7 +629,8 @@ static void virtio_scsi_set_config(VirtIODevice *vdev,
} }
static uint64_t virtio_scsi_get_features(VirtIODevice *vdev, static uint64_t virtio_scsi_get_features(VirtIODevice *vdev,
uint64_t requested_features) uint64_t requested_features,
Error **errp)
{ {
VirtIOSCSI *s = VIRTIO_SCSI(vdev); VirtIOSCSI *s = VIRTIO_SCSI(vdev);

3
hw/virtio/virtio-balloon.c
View File

@ -310,7 +310,8 @@ static void virtio_balloon_set_config(VirtIODevice *vdev,
trace_virtio_balloon_set_config(dev->actual, oldactual); 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); VirtIOBalloon *dev = VIRTIO_BALLOON(vdev);
f |= dev->host_features; f |= dev->host_features;

3
hw/virtio/virtio-bus.c
View File

@ -54,7 +54,8 @@ void virtio_bus_device_plugged(VirtIODevice *vdev, Error **errp)
/* Get the features of the plugged device. */ /* Get the features of the plugged device. */
assert(vdc->get_features != NULL); assert(vdc->get_features != NULL);
vdev->host_features = vdc->get_features(vdev, vdev->host_features); vdev->host_features = vdc->get_features(vdev, vdev->host_features,
errp);
} }
/* Reset the virtio_bus */ /* Reset the virtio_bus */

2
hw/virtio/virtio-rng.c
View File

@ -104,7 +104,7 @@ static void handle_input(VirtIODevice *vdev, VirtQueue *vq)
virtio_rng_process(vrng); virtio_rng_process(vrng);
} }
static uint64_t get_features(VirtIODevice *vdev, uint64_t f) static uint64_t get_features(VirtIODevice *vdev, uint64_t f, Error **errp)
{ {
return f; return f;
} }

4
include/hw/virtio/virtio.h
View File

@ -101,7 +101,9 @@ typedef struct VirtioDeviceClass {
/* This is what a VirtioDevice must implement */ /* This is what a VirtioDevice must implement */
DeviceRealize realize; DeviceRealize realize;
DeviceUnrealize unrealize; DeviceUnrealize unrealize;
uint64_t (*get_features)(VirtIODevice *vdev, uint64_t requested_features); uint64_t (*get_features)(VirtIODevice *vdev,
uint64_t requested_features,
Error **errp);
uint64_t (*bad_features)(VirtIODevice *vdev); uint64_t (*bad_features)(VirtIODevice *vdev);
void (*set_features)(VirtIODevice *vdev, uint64_t val); void (*set_features)(VirtIODevice *vdev, uint64_t val);
int (*validate_features)(VirtIODevice *vdev); int (*validate_features)(VirtIODevice *vdev);