ShuriZma
/
xqemu
mirror of https://github.com/xqemu/xqemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

virtio: add set_status callback 

vhost net backend needs to be notified when
frontend status changes. Add a callback,
similar to set_features.

Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
This commit is contained in:
Michael S. Tsirkin 2010-03-17 13:08:05 +02:00 committed by Anthony Liguori
parent 1cbdabe203
commit 3e607cb503
4 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hw/s390-virtio-bus.c
View File

@ -242,7 +242,7 @@ void s390_virtio_device_update_status(VirtIOS390Device *dev)
VirtIODevice *vdev = dev->vdev; VirtIODevice *vdev = dev->vdev;
uint32_t features; uint32_t features;
vdev->status = ldub_phys(dev->dev_offs + VIRTIO_DEV_OFFS_STATUS); virtio_set_status(vdev, ldub_phys(dev->dev_offs + VIRTIO_DEV_OFFS_STATUS));
/* Update guest supported feature bitmap */ /* Update guest supported feature bitmap */

2
hw/syborg_virtio.c
View File

@ -149,7 +149,7 @@ static void syborg_virtio_writel(void *opaque, target_phys_addr_t offset,
virtio_queue_notify(vdev, value); virtio_queue_notify(vdev, value);
break; break;
case SYBORG_VIRTIO_STATUS: case SYBORG_VIRTIO_STATUS:
vdev->status = value & 0xFF; virtio_set_status(vdev, value & 0xFF);
if (vdev->status == 0) if (vdev->status == 0)
virtio_reset(vdev); virtio_reset(vdev);
break; break;

5
hw/virtio-pci.c
View File

@ -219,7 +219,7 @@ static void virtio_ioport_write(void *opaque, uint32_t addr, uint32_t val)
virtio_queue_notify(vdev, val); virtio_queue_notify(vdev, val);
break; break;
case VIRTIO_PCI_STATUS: case VIRTIO_PCI_STATUS:
vdev->status = val & 0xFF; virtio_set_status(vdev, val & 0xFF);
if (vdev->status == 0) { if (vdev->status == 0) {
virtio_reset(proxy->vdev); virtio_reset(proxy->vdev);
msix_unuse_all_vectors(&proxy->pci_dev); msix_unuse_all_vectors(&proxy->pci_dev);
@ -399,7 +399,8 @@ static void virtio_write_config(PCIDevice *pci_dev, uint32_t address,
if (PCI_COMMAND == address) { if (PCI_COMMAND == address) {
if (!(val & PCI_COMMAND_MASTER)) { if (!(val & PCI_COMMAND_MASTER)) {
if (!(proxy->bugs & VIRTIO_PCI_BUG_BUS_MASTER)) { if (!(proxy->bugs & VIRTIO_PCI_BUG_BUS_MASTER)) {
proxy->vdev->status &= ~VIRTIO_CONFIG_S_DRIVER_OK; virtio_set_status(proxy->vdev,
proxy->vdev->status & ~VIRTIO_CONFIG_S_DRIVER_OK);
} }
} }
} }

9
hw/virtio.h
View File

@ -115,12 +115,21 @@ struct VirtIODevice
void (*get_config)(VirtIODevice *vdev, uint8_t *config); void (*get_config)(VirtIODevice *vdev, uint8_t *config);
void (*set_config)(VirtIODevice *vdev, const uint8_t *config); void (*set_config)(VirtIODevice *vdev, const uint8_t *config);
void (*reset)(VirtIODevice *vdev); void (*reset)(VirtIODevice *vdev);
void (*set_status)(VirtIODevice *vdev, uint8_t val);
VirtQueue *vq; VirtQueue *vq;
const VirtIOBindings *binding; const VirtIOBindings *binding;
void *binding_opaque; void *binding_opaque;
uint16_t device_id; uint16_t device_id;
}; };
static inline void virtio_set_status(VirtIODevice *vdev, uint8_t val)
{
if (vdev->set_status) {
vdev->set_status(vdev, val);
}
vdev->status = val;
}
VirtQueue *virtio_add_queue(VirtIODevice *vdev, int queue_size, VirtQueue *virtio_add_queue(VirtIODevice *vdev, int queue_size,
void (*handle_output)(VirtIODevice *, void (*handle_output)(VirtIODevice *,
VirtQueue *)); VirtQueue *));