diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-04-07 16:20:40 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-04-07 16:20:40 -0700 |
| commit | d3436a1d03f9a416d8bedd968f16296e0140adcb (patch) | |
| tree | 6809a3acc09cafafa4df0646154eb990eeccaab6 /include | |
| parent | 741f37b8ccf10b3f9976f7e55b703af8087f182a (diff) | |
| parent | c00bbcf8628969e103d4a7b351a53746f1025576 (diff) | |
| download | linux-d3436a1d03f9a416d8bedd968f16296e0140adcb.tar.bz2 | |
Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost
Pull virtio/qemu fixes from Michael S Tsirkin:
"A couple of fixes for virtio and for the new QEMU fw cfg driver"
* tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost:
virtio: add VIRTIO_CONFIG_S_NEEDS_RESET device status bit
MAINTAINERS: add entry for QEMU
firmware: qemu_fw_cfg.c: hold ACPI global lock during device access
virtio: virtio 1.0 cs04 spec compliance for reset
qemu_fw_cfg: don't leak kobj on init error
Diffstat (limited to 'include')
| -rw-r--r-- | include/uapi/linux/virtio_config.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/uapi/linux/virtio_config.h b/include/uapi/linux/virtio_config.h index c18264df9504..4cb65bbfa654 100644 --- a/include/uapi/linux/virtio_config.h +++ b/include/uapi/linux/virtio_config.h @@ -40,6 +40,8 @@ #define VIRTIO_CONFIG_S_DRIVER_OK 4 /* Driver has finished configuring features */ #define VIRTIO_CONFIG_S_FEATURES_OK 8 +/* Device entered invalid state, driver must reset it */ +#define VIRTIO_CONFIG_S_NEEDS_RESET 0x40 /* We've given up on this device. */ #define VIRTIO_CONFIG_S_FAILED 0x80 |