hw/virtio: handle un-configured shutdown in virtio-pci
The assert() protecting against leakage is a little aggressive and causes needless crashes if a device is shutdown without having been configured. In this case no descriptors are lost because none have been assigned. Signed-off-by: Alex Bennée <alex.bennee@linaro.org> Message-Id: <20220728135503.1060062-4-alex.bennee@linaro.org> Reviewed-by: Michael S. Tsirkin <mst@redhat.com> Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
This commit is contained in:
parent
f20400ed0d
commit
5a9d5f09b1
|
@ -996,9 +996,14 @@ static int virtio_pci_set_guest_notifiers(DeviceState *d, int nvqs, bool assign)
|
||||||
|
|
||||||
nvqs = MIN(nvqs, VIRTIO_QUEUE_MAX);
|
nvqs = MIN(nvqs, VIRTIO_QUEUE_MAX);
|
||||||
|
|
||||||
/* When deassigning, pass a consistent nvqs value
|
/*
|
||||||
* to avoid leaking notifiers.
|
* When deassigning, pass a consistent nvqs value to avoid leaking
|
||||||
|
* notifiers. But first check we've actually been configured, exit
|
||||||
|
* early if we haven't.
|
||||||
*/
|
*/
|
||||||
|
if (!assign && !proxy->nvqs_with_notifiers) {
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
assert(assign || nvqs == proxy->nvqs_with_notifiers);
|
assert(assign || nvqs == proxy->nvqs_with_notifiers);
|
||||||
|
|
||||||
proxy->nvqs_with_notifiers = nvqs;
|
proxy->nvqs_with_notifiers = nvqs;
|
||||||
|
|
Loading…
Reference in New Issue