virtio: fixes
virtio feature negotiation rework Signed-off-by: Michael S. Tsirkin <mst@redhat.com> -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQEcBAABAgAGBQJX3D/+AAoJECgfDbjSjVRpAh0H/0OprEm1SrXWFMTlMwdtnl/0 b22PEyIzkaXu4eRLotxvAbN9KArc4cVUxx/sZ0t24OjLR9IxzD6Ffukndr0TSAia KZM8QAACD4nMVd7ITw0qyv6twO8juTPgB76BddBLJN16kKWkEQr7Ouh++Kl2xguY YKSzTT+DQRQxKQzojZVHCinReX75F2KfUgnUlL9SXZfSs8lSSFQpasLELc59iDG0 lSWyWWJYSfC9DEkivYeigsnrAYVwA9SvbBwGJUlemKafOPwO12gLGezb9JTAvQtQ 3Lctp0FGPnoc38P+T6B4uuDjqCvRGj1CU2yBeLHZ6nsFnoFAGb0PzfAA6ejmJCY= =/97N -----END PGP SIGNATURE----- Merge remote-tracking branch 'remotes/mst/tags/for_upstream' into staging virtio: fixes virtio feature negotiation rework Signed-off-by: Michael S. Tsirkin <mst@redhat.com> # gpg: Signature made Fri 16 Sep 2016 19:54:54 BST # gpg: using RSA key 0x281F0DB8D28D5469 # gpg: Good signature from "Michael S. Tsirkin <mst@kernel.org>" # gpg: aka "Michael S. Tsirkin <mst@redhat.com>" # Primary key fingerprint: 0270 606B 6F3C DF3D 0B17 0970 C350 3912 AFBE 8E67 # Subkey fingerprint: 5D09 FD08 71C8 F85B 94CA 8A0D 281F 0DB8 D28D 5469 * remotes/mst/tags/for_upstream: MAINTAINERS: add virtio-* tests virtio-bus: Plug devices after features are negotiated Signed-off-by: Peter Maydell <peter.maydell@linaro.org> # Conflicts: # MAINTAINERS
This commit is contained in:
commit
0f2fa73ba0
|
@ -831,6 +831,7 @@ Network devices
|
||||||
M: Jason Wang <jasowang@redhat.com>
|
M: Jason Wang <jasowang@redhat.com>
|
||||||
S: Odd Fixes
|
S: Odd Fixes
|
||||||
F: hw/net/
|
F: hw/net/
|
||||||
|
F: tests/virtio-net-test.c
|
||||||
T: git git://github.com/jasowang/qemu.git net
|
T: git git://github.com/jasowang/qemu.git net
|
||||||
|
|
||||||
SCSI
|
SCSI
|
||||||
|
@ -838,6 +839,7 @@ M: Paolo Bonzini <pbonzini@redhat.com>
|
||||||
S: Supported
|
S: Supported
|
||||||
F: include/hw/scsi/*
|
F: include/hw/scsi/*
|
||||||
F: hw/scsi/*
|
F: hw/scsi/*
|
||||||
|
F: tests/virtio-scsi-test.c
|
||||||
T: git git://github.com/bonzini/qemu.git scsi-next
|
T: git git://github.com/bonzini/qemu.git scsi-next
|
||||||
|
|
||||||
LSI53C895A
|
LSI53C895A
|
||||||
|
@ -890,6 +892,7 @@ S: Supported
|
||||||
F: hw/*/virtio*
|
F: hw/*/virtio*
|
||||||
F: net/vhost-user.c
|
F: net/vhost-user.c
|
||||||
F: include/hw/virtio/
|
F: include/hw/virtio/
|
||||||
|
F: tests/virtio-balloon-test.c
|
||||||
|
|
||||||
virtio-9p
|
virtio-9p
|
||||||
M: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
|
M: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
|
||||||
|
@ -907,6 +910,7 @@ L: qemu-block@nongnu.org
|
||||||
S: Supported
|
S: Supported
|
||||||
F: hw/block/virtio-blk.c
|
F: hw/block/virtio-blk.c
|
||||||
F: hw/block/dataplane/*
|
F: hw/block/dataplane/*
|
||||||
|
F: tests/virtio-blk-test.c
|
||||||
T: git git://github.com/stefanha/qemu.git block
|
T: git git://github.com/stefanha/qemu.git block
|
||||||
|
|
||||||
virtio-ccw
|
virtio-ccw
|
||||||
|
@ -929,6 +933,8 @@ S: Supported
|
||||||
F: hw/char/virtio-serial-bus.c
|
F: hw/char/virtio-serial-bus.c
|
||||||
F: hw/char/virtio-console.c
|
F: hw/char/virtio-console.c
|
||||||
F: include/hw/virtio/virtio-serial.h
|
F: include/hw/virtio/virtio-serial.h
|
||||||
|
F: tests/virtio-console-test.c
|
||||||
|
F: tests/virtio-serial-test.c
|
||||||
|
|
||||||
virtio-rng
|
virtio-rng
|
||||||
M: Amit Shah <amit.shah@redhat.com>
|
M: Amit Shah <amit.shah@redhat.com>
|
||||||
|
@ -937,6 +943,7 @@ F: hw/virtio/virtio-rng.c
|
||||||
F: include/hw/virtio/virtio-rng.h
|
F: include/hw/virtio/virtio-rng.h
|
||||||
F: include/sysemu/rng*.h
|
F: include/sysemu/rng*.h
|
||||||
F: backends/rng*.c
|
F: backends/rng*.c
|
||||||
|
F: tests/virtio-rng-test.c
|
||||||
|
|
||||||
nvme
|
nvme
|
||||||
M: Keith Busch <keith.busch@intel.com>
|
M: Keith Busch <keith.busch@intel.com>
|
||||||
|
|
|
@ -1261,6 +1261,16 @@ static int virtio_ccw_load_config(DeviceState *d, QEMUFile *f)
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static void virtio_ccw_pre_plugged(DeviceState *d, Error **errp)
|
||||||
|
{
|
||||||
|
VirtioCcwDevice *dev = VIRTIO_CCW_DEVICE(d);
|
||||||
|
VirtIODevice *vdev = virtio_bus_get_device(&dev->bus);
|
||||||
|
|
||||||
|
if (dev->max_rev >= 1) {
|
||||||
|
virtio_add_feature(&vdev->host_features, VIRTIO_F_VERSION_1);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
/* This is called by virtio-bus just after the device is plugged. */
|
/* This is called by virtio-bus just after the device is plugged. */
|
||||||
static void virtio_ccw_device_plugged(DeviceState *d, Error **errp)
|
static void virtio_ccw_device_plugged(DeviceState *d, Error **errp)
|
||||||
{
|
{
|
||||||
|
@ -1270,6 +1280,10 @@ static void virtio_ccw_device_plugged(DeviceState *d, Error **errp)
|
||||||
SubchDev *sch = ccw_dev->sch;
|
SubchDev *sch = ccw_dev->sch;
|
||||||
int n = virtio_get_num_queues(vdev);
|
int n = virtio_get_num_queues(vdev);
|
||||||
|
|
||||||
|
if (!virtio_has_feature(vdev->host_features, VIRTIO_F_VERSION_1)) {
|
||||||
|
dev->max_rev = 0;
|
||||||
|
}
|
||||||
|
|
||||||
if (virtio_get_num_queues(vdev) > VIRTIO_CCW_QUEUE_MAX) {
|
if (virtio_get_num_queues(vdev) > VIRTIO_CCW_QUEUE_MAX) {
|
||||||
error_setg(errp, "The number of virtqueues %d "
|
error_setg(errp, "The number of virtqueues %d "
|
||||||
"exceeds ccw limit %d", n,
|
"exceeds ccw limit %d", n,
|
||||||
|
@ -1283,25 +1297,11 @@ static void virtio_ccw_device_plugged(DeviceState *d, Error **errp)
|
||||||
|
|
||||||
sch->id.cu_model = virtio_bus_get_vdev_id(&dev->bus);
|
sch->id.cu_model = virtio_bus_get_vdev_id(&dev->bus);
|
||||||
|
|
||||||
if (dev->max_rev >= 1) {
|
|
||||||
virtio_add_feature(&vdev->host_features, VIRTIO_F_VERSION_1);
|
|
||||||
}
|
|
||||||
|
|
||||||
css_generate_sch_crws(sch->cssid, sch->ssid, sch->schid,
|
css_generate_sch_crws(sch->cssid, sch->ssid, sch->schid,
|
||||||
d->hotplugged, 1);
|
d->hotplugged, 1);
|
||||||
}
|
}
|
||||||
|
|
||||||
static void virtio_ccw_post_plugged(DeviceState *d, Error **errp)
|
|
||||||
{
|
|
||||||
VirtioCcwDevice *dev = VIRTIO_CCW_DEVICE(d);
|
|
||||||
VirtIODevice *vdev = virtio_bus_get_device(&dev->bus);
|
|
||||||
|
|
||||||
if (!virtio_host_has_feature(vdev, VIRTIO_F_VERSION_1)) {
|
|
||||||
/* A backend didn't support modern virtio. */
|
|
||||||
dev->max_rev = 0;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
static void virtio_ccw_device_unplugged(DeviceState *d)
|
static void virtio_ccw_device_unplugged(DeviceState *d)
|
||||||
{
|
{
|
||||||
VirtioCcwDevice *dev = VIRTIO_CCW_DEVICE(d);
|
VirtioCcwDevice *dev = VIRTIO_CCW_DEVICE(d);
|
||||||
|
@ -1593,8 +1593,8 @@ static void virtio_ccw_bus_class_init(ObjectClass *klass, void *data)
|
||||||
k->load_queue = virtio_ccw_load_queue;
|
k->load_queue = virtio_ccw_load_queue;
|
||||||
k->save_config = virtio_ccw_save_config;
|
k->save_config = virtio_ccw_save_config;
|
||||||
k->load_config = virtio_ccw_load_config;
|
k->load_config = virtio_ccw_load_config;
|
||||||
|
k->pre_plugged = virtio_ccw_pre_plugged;
|
||||||
k->device_plugged = virtio_ccw_device_plugged;
|
k->device_plugged = virtio_ccw_device_plugged;
|
||||||
k->post_plugged = virtio_ccw_post_plugged;
|
|
||||||
k->device_unplugged = virtio_ccw_device_unplugged;
|
k->device_unplugged = virtio_ccw_device_unplugged;
|
||||||
k->ioeventfd_started = virtio_ccw_ioeventfd_started;
|
k->ioeventfd_started = virtio_ccw_ioeventfd_started;
|
||||||
k->ioeventfd_set_started = virtio_ccw_ioeventfd_set_started;
|
k->ioeventfd_set_started = virtio_ccw_ioeventfd_set_started;
|
||||||
|
|
|
@ -49,16 +49,17 @@ void virtio_bus_device_plugged(VirtIODevice *vdev, Error **errp)
|
||||||
|
|
||||||
DPRINTF("%s: plug device.\n", qbus->name);
|
DPRINTF("%s: plug device.\n", qbus->name);
|
||||||
|
|
||||||
if (klass->device_plugged != NULL) {
|
if (klass->pre_plugged != NULL) {
|
||||||
klass->device_plugged(qbus->parent, errp);
|
klass->pre_plugged(qbus->parent, 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);
|
errp);
|
||||||
if (klass->post_plugged != NULL) {
|
|
||||||
klass->post_plugged(qbus->parent, errp);
|
if (klass->device_plugged != NULL) {
|
||||||
|
klass->device_plugged(qbus->parent, errp);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -1576,18 +1576,48 @@ static void virtio_pci_modern_io_region_unmap(VirtIOPCIProxy *proxy,
|
||||||
®ion->mr);
|
®ion->mr);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static void virtio_pci_pre_plugged(DeviceState *d, Error **errp)
|
||||||
|
{
|
||||||
|
VirtIOPCIProxy *proxy = VIRTIO_PCI(d);
|
||||||
|
VirtIODevice *vdev = virtio_bus_get_device(&proxy->bus);
|
||||||
|
|
||||||
|
if (virtio_pci_modern(proxy)) {
|
||||||
|
virtio_add_feature(&vdev->host_features, VIRTIO_F_VERSION_1);
|
||||||
|
}
|
||||||
|
|
||||||
|
virtio_add_feature(&vdev->host_features, VIRTIO_F_BAD_FEATURE);
|
||||||
|
}
|
||||||
|
|
||||||
/* This is called by virtio-bus just after the device is plugged. */
|
/* This is called by virtio-bus just after the device is plugged. */
|
||||||
static void virtio_pci_device_plugged(DeviceState *d, Error **errp)
|
static void virtio_pci_device_plugged(DeviceState *d, Error **errp)
|
||||||
{
|
{
|
||||||
VirtIOPCIProxy *proxy = VIRTIO_PCI(d);
|
VirtIOPCIProxy *proxy = VIRTIO_PCI(d);
|
||||||
VirtioBusState *bus = &proxy->bus;
|
VirtioBusState *bus = &proxy->bus;
|
||||||
bool legacy = virtio_pci_legacy(proxy);
|
bool legacy = virtio_pci_legacy(proxy);
|
||||||
bool modern = virtio_pci_modern(proxy);
|
bool modern;
|
||||||
bool modern_pio = proxy->flags & VIRTIO_PCI_FLAG_MODERN_PIO_NOTIFY;
|
bool modern_pio = proxy->flags & VIRTIO_PCI_FLAG_MODERN_PIO_NOTIFY;
|
||||||
uint8_t *config;
|
uint8_t *config;
|
||||||
uint32_t size;
|
uint32_t size;
|
||||||
VirtIODevice *vdev = virtio_bus_get_device(&proxy->bus);
|
VirtIODevice *vdev = virtio_bus_get_device(&proxy->bus);
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Virtio capabilities present without
|
||||||
|
* VIRTIO_F_VERSION_1 confuses guests
|
||||||
|
*/
|
||||||
|
if (!virtio_has_feature(vdev->host_features, VIRTIO_F_VERSION_1)) {
|
||||||
|
virtio_pci_disable_modern(proxy);
|
||||||
|
|
||||||
|
if (!legacy) {
|
||||||
|
error_setg(errp, "Device doesn't support modern mode, and legacy"
|
||||||
|
" mode is disabled");
|
||||||
|
error_append_hint(errp, "Set disable-legacy to off\n");
|
||||||
|
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
modern = virtio_pci_modern(proxy);
|
||||||
|
|
||||||
config = proxy->pci_dev.config;
|
config = proxy->pci_dev.config;
|
||||||
if (proxy->class_code) {
|
if (proxy->class_code) {
|
||||||
pci_config_set_class(config, proxy->class_code);
|
pci_config_set_class(config, proxy->class_code);
|
||||||
|
@ -1629,7 +1659,6 @@ static void virtio_pci_device_plugged(DeviceState *d, Error **errp)
|
||||||
|
|
||||||
struct virtio_pci_cfg_cap *cfg_mask;
|
struct virtio_pci_cfg_cap *cfg_mask;
|
||||||
|
|
||||||
virtio_add_feature(&vdev->host_features, VIRTIO_F_VERSION_1);
|
|
||||||
virtio_pci_modern_regions_init(proxy);
|
virtio_pci_modern_regions_init(proxy);
|
||||||
|
|
||||||
virtio_pci_modern_mem_region_map(proxy, &proxy->common, &cap);
|
virtio_pci_modern_mem_region_map(proxy, &proxy->common, &cap);
|
||||||
|
@ -1694,8 +1723,6 @@ static void virtio_pci_device_plugged(DeviceState *d, Error **errp)
|
||||||
if (!kvm_has_many_ioeventfds()) {
|
if (!kvm_has_many_ioeventfds()) {
|
||||||
proxy->flags &= ~VIRTIO_PCI_FLAG_USE_IOEVENTFD;
|
proxy->flags &= ~VIRTIO_PCI_FLAG_USE_IOEVENTFD;
|
||||||
}
|
}
|
||||||
|
|
||||||
virtio_add_feature(&vdev->host_features, VIRTIO_F_BAD_FEATURE);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static void virtio_pci_device_unplugged(DeviceState *d)
|
static void virtio_pci_device_unplugged(DeviceState *d)
|
||||||
|
@ -2508,6 +2535,7 @@ static void virtio_pci_bus_class_init(ObjectClass *klass, void *data)
|
||||||
k->query_guest_notifiers = virtio_pci_query_guest_notifiers;
|
k->query_guest_notifiers = virtio_pci_query_guest_notifiers;
|
||||||
k->set_guest_notifiers = virtio_pci_set_guest_notifiers;
|
k->set_guest_notifiers = virtio_pci_set_guest_notifiers;
|
||||||
k->vmstate_change = virtio_pci_vmstate_change;
|
k->vmstate_change = virtio_pci_vmstate_change;
|
||||||
|
k->pre_plugged = virtio_pci_pre_plugged;
|
||||||
k->device_plugged = virtio_pci_device_plugged;
|
k->device_plugged = virtio_pci_device_plugged;
|
||||||
k->device_unplugged = virtio_pci_device_unplugged;
|
k->device_unplugged = virtio_pci_device_unplugged;
|
||||||
k->query_nvectors = virtio_pci_query_nvectors;
|
k->query_nvectors = virtio_pci_query_nvectors;
|
||||||
|
|
|
@ -181,6 +181,11 @@ static inline void virtio_pci_force_virtio_1(VirtIOPCIProxy *proxy)
|
||||||
proxy->disable_legacy = ON_OFF_AUTO_ON;
|
proxy->disable_legacy = ON_OFF_AUTO_ON;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static inline void virtio_pci_disable_modern(VirtIOPCIProxy *proxy)
|
||||||
|
{
|
||||||
|
proxy->disable_modern = true;
|
||||||
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* virtio-scsi-pci: This extends VirtioPCIProxy.
|
* virtio-scsi-pci: This extends VirtioPCIProxy.
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -53,16 +53,16 @@ typedef struct VirtioBusClass {
|
||||||
bool (*query_guest_notifiers)(DeviceState *d);
|
bool (*query_guest_notifiers)(DeviceState *d);
|
||||||
int (*set_guest_notifiers)(DeviceState *d, int nvqs, bool assign);
|
int (*set_guest_notifiers)(DeviceState *d, int nvqs, bool assign);
|
||||||
void (*vmstate_change)(DeviceState *d, bool running);
|
void (*vmstate_change)(DeviceState *d, bool running);
|
||||||
|
/*
|
||||||
|
* Expose the features the transport layer supports before
|
||||||
|
* the negotiation takes place.
|
||||||
|
*/
|
||||||
|
void (*pre_plugged)(DeviceState *d, Error **errp);
|
||||||
/*
|
/*
|
||||||
* transport independent init function.
|
* transport independent init function.
|
||||||
* This is called by virtio-bus just after the device is plugged.
|
* This is called by virtio-bus just after the device is plugged.
|
||||||
*/
|
*/
|
||||||
void (*device_plugged)(DeviceState *d, Error **errp);
|
void (*device_plugged)(DeviceState *d, Error **errp);
|
||||||
/*
|
|
||||||
* Re-evaluate setup after feature bits have been validated
|
|
||||||
* by the device backend.
|
|
||||||
*/
|
|
||||||
void (*post_plugged)(DeviceState *d, Error **errp);
|
|
||||||
/*
|
/*
|
||||||
* transport independent exit function.
|
* transport independent exit function.
|
||||||
* This is called by virtio-bus just before the device is unplugged.
|
* This is called by virtio-bus just before the device is unplugged.
|
||||||
|
|
Loading…
Reference in a new issue