github/acrn-hypervisor
1
0
Fork 0
mirror of https://github.com/projectacrn/acrn-hypervisor.git synced 2026-06-08 18:14:53 +00:00
Code Issues Projects Releases Wiki Activity

dm: virtio: remove hv_caps from virtio_ops

Browse Source 
currently, each virtio device has their own virtio_ops implementation.
Take virtio-blk for example:

static struct virtio_ops virtio_blk_ops = {
        "virtio_blk",
        1,
        sizeof(struct virtio_blk_config),
        virtio_blk_reset,
        virtio_blk_notify,
        virtio_blk_cfgread,
        virtio_blk_cfgwrite,
        NULL,
        NULL,
        VIRTIO_BLK_S_HOSTCAPS,
};

If start DM with two virtio-blk, this global variable will be
assigined to two virtio-blk instances. Changing hv_caps for one
instance will affect others. But different instances may need
different capabilities.

To support this requirement, we suggest to move hv_caps to
virtio_base structure, and each instance can return their own
capabilities.

Signed-off-by: Conghui Chen <conghui.chen@intel.com>
Reviewed-by: Yin Fengwei <fengwei.yin@intel.com>
Acked-by: Yu Wang <yu1.wang@intel.com>
This commit is contained in:
Conghui Chen
2018-07-27 09:50:55 +00:00
committed by lijinxia
parent a2b299179d
commit f4fcf5d6eb
11 changed files with 12 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
devicemodel/hw/pci/virtio/virtio.c
View File

@@ -381,7 +381,7 @@ vq_getchain(struct virtio_vq_info *vq, uint16_t *pidx,
if ((vdir->flags & VRING_DESC_F_INDIRECT) == 0) {
_vq_record(i, vdir, ctx, iov, n_iov, flags);
i++;
} else if ((base->vops->hv_caps &
} else if ((base->device_caps &
VIRTIO_RING_F_INDIRECT_DESC) == 0) {
fprintf(stderr,
"%s: descriptor has forbidden INDIRECT flag, "
@@ -696,7 +696,7 @@ bad:
switch (offset) {
case VIRTIO_CR_HOSTCAP:
value = vops->hv_caps;
value = base->device_caps;
break;
case VIRTIO_CR_GUESTCAP:
value = base->negotiated_caps;
@@ -813,7 +813,7 @@ bad:
switch (offset) {
case VIRTIO_CR_GUESTCAP:
base->negotiated_caps = value & vops->hv_caps;
base->negotiated_caps = value & base->device_caps;
if (vops->apply_features)
(*vops->apply_features)(DEV_STRUCT(base),
base->negotiated_caps);
@@ -1020,7 +1020,7 @@ virtio_set_modern_bar(struct virtio_base *base, bool use_notify_pio)
vops = base->vops;
if (!vops || (vops->hv_caps & VIRTIO_F_VERSION_1) == 0)
if (!vops || (base->device_caps & VIRTIO_F_VERSION_1) == 0)
return -1;
if (use_notify_pio)
@@ -1111,9 +1111,9 @@ virtio_common_cfg_read(struct pci_vdev *dev, uint64_t offset, int size)
break;
case VIRTIO_COMMON_DF:
if (base->device_feature_select == 0)
value = vops->hv_caps & 0xffffffff;
value = base->device_caps & 0xffffffff;
else if (base->device_feature_select == 1)
value = (vops->hv_caps >> 32) & 0xffffffff;
value = (base->device_caps >> 32) & 0xffffffff;
else /* present 0, see 4.1.4.3.1 */
value = 0;
break;
@@ -1240,7 +1240,7 @@ virtio_common_cfg_write(struct pci_vdev *dev, uint64_t offset, int size,
value &= 0xffffffff;
base->negotiated_caps =
(value << (base->driver_feature_select * 32))
& vops->hv_caps;
& base->device_caps;
if (vops->apply_features)
(*vops->apply_features)(DEV_STRUCT(base),
base->negotiated_caps);