* [Qemu-devel] [PATCH for-2.9 v2] virtio: Fix error handling in virtio_bus_device_plugged
@ 2017-03-17 12:32 Fam Zheng
2017-03-17 12:39 ` Cornelia Huck
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Fam Zheng @ 2017-03-17 12:32 UTC (permalink / raw)
To: qemu-devel; +Cc: cornelia.huck, drjones, Michael S. Tsirkin
For one thing we shouldn't continue if an error happened, for the other
two steps failing can cause an abort() in error_setg because we reuse
the same errp blindly.
Add error handling checks to fix both issues.
Signed-off-by: Fam Zheng <famz@redhat.com>
---
v2: Don't forget the last errp -> &local_err. [Drew]
---
hw/virtio/virtio-bus.c | 20 +++++++++++++++++---
1 file changed, 17 insertions(+), 3 deletions(-)
diff --git a/hw/virtio/virtio-bus.c b/hw/virtio/virtio-bus.c
index a886011..3042232 100644
--- a/hw/virtio/virtio-bus.c
+++ b/hw/virtio/virtio-bus.c
@@ -25,6 +25,7 @@
#include "qemu/osdep.h"
#include "hw/hw.h"
#include "qemu/error-report.h"
+#include "qapi/error.h"
#include "hw/qdev.h"
#include "hw/virtio/virtio-bus.h"
#include "hw/virtio/virtio.h"
@@ -48,20 +49,33 @@ void virtio_bus_device_plugged(VirtIODevice *vdev, Error **errp)
VirtioBusClass *klass = VIRTIO_BUS_GET_CLASS(bus);
VirtioDeviceClass *vdc = VIRTIO_DEVICE_GET_CLASS(vdev);
bool has_iommu = virtio_host_has_feature(vdev, VIRTIO_F_IOMMU_PLATFORM);
+ Error *local_err = NULL;
DPRINTF("%s: plug device.\n", qbus->name);
if (klass->pre_plugged != NULL) {
- klass->pre_plugged(qbus->parent, errp);
+ klass->pre_plugged(qbus->parent, &local_err);
+ if (local_err) {
+ error_propagate(errp, local_err);
+ return;
+ }
}
/* Get the features of the plugged device. */
assert(vdc->get_features != NULL);
vdev->host_features = vdc->get_features(vdev, vdev->host_features,
- errp);
+ &local_err);
+ if (local_err) {
+ error_propagate(errp, local_err);
+ return;
+ }
if (klass->device_plugged != NULL) {
- klass->device_plugged(qbus->parent, errp);
+ klass->device_plugged(qbus->parent, &local_err);
+ }
+ if (local_err) {
+ error_propagate(errp, local_err);
+ return;
}
if (klass->get_dma_as != NULL && has_iommu) {
--
2.9.3
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [Qemu-devel] [PATCH for-2.9 v2] virtio: Fix error handling in virtio_bus_device_plugged
2017-03-17 12:32 [Qemu-devel] [PATCH for-2.9 v2] virtio: Fix error handling in virtio_bus_device_plugged Fam Zheng
@ 2017-03-17 12:39 ` Cornelia Huck
2017-03-17 12:42 ` Andrew Jones
2017-03-17 18:23 ` Philippe Mathieu-Daudé
2 siblings, 0 replies; 4+ messages in thread
From: Cornelia Huck @ 2017-03-17 12:39 UTC (permalink / raw)
To: Fam Zheng; +Cc: qemu-devel, drjones, Michael S. Tsirkin
On Fri, 17 Mar 2017 20:32:42 +0800
Fam Zheng <famz@redhat.com> wrote:
> For one thing we shouldn't continue if an error happened, for the other
> two steps failing can cause an abort() in error_setg because we reuse
> the same errp blindly.
>
> Add error handling checks to fix both issues.
>
> Signed-off-by: Fam Zheng <famz@redhat.com>
>
> ---
>
> v2: Don't forget the last errp -> &local_err. [Drew]
> ---
> hw/virtio/virtio-bus.c | 20 +++++++++++++++++---
> 1 file changed, 17 insertions(+), 3 deletions(-)
Reviewed-by: Cornelia Huck <cornelia.huck@de.ibm.com>
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [Qemu-devel] [PATCH for-2.9 v2] virtio: Fix error handling in virtio_bus_device_plugged
2017-03-17 12:32 [Qemu-devel] [PATCH for-2.9 v2] virtio: Fix error handling in virtio_bus_device_plugged Fam Zheng
2017-03-17 12:39 ` Cornelia Huck
@ 2017-03-17 12:42 ` Andrew Jones
2017-03-17 18:23 ` Philippe Mathieu-Daudé
2 siblings, 0 replies; 4+ messages in thread
From: Andrew Jones @ 2017-03-17 12:42 UTC (permalink / raw)
To: Fam Zheng; +Cc: qemu-devel, cornelia.huck, Michael S. Tsirkin
On Fri, Mar 17, 2017 at 08:32:42PM +0800, Fam Zheng wrote:
> For one thing we shouldn't continue if an error happened, for the other
> two steps failing can cause an abort() in error_setg because we reuse
> the same errp blindly.
>
> Add error handling checks to fix both issues.
>
> Signed-off-by: Fam Zheng <famz@redhat.com>
>
> ---
>
> v2: Don't forget the last errp -> &local_err. [Drew]
> ---
> hw/virtio/virtio-bus.c | 20 +++++++++++++++++---
> 1 file changed, 17 insertions(+), 3 deletions(-)
>
> diff --git a/hw/virtio/virtio-bus.c b/hw/virtio/virtio-bus.c
> index a886011..3042232 100644
> --- a/hw/virtio/virtio-bus.c
> +++ b/hw/virtio/virtio-bus.c
> @@ -25,6 +25,7 @@
> #include "qemu/osdep.h"
> #include "hw/hw.h"
> #include "qemu/error-report.h"
> +#include "qapi/error.h"
> #include "hw/qdev.h"
> #include "hw/virtio/virtio-bus.h"
> #include "hw/virtio/virtio.h"
> @@ -48,20 +49,33 @@ void virtio_bus_device_plugged(VirtIODevice *vdev, Error **errp)
> VirtioBusClass *klass = VIRTIO_BUS_GET_CLASS(bus);
> VirtioDeviceClass *vdc = VIRTIO_DEVICE_GET_CLASS(vdev);
> bool has_iommu = virtio_host_has_feature(vdev, VIRTIO_F_IOMMU_PLATFORM);
> + Error *local_err = NULL;
>
> DPRINTF("%s: plug device.\n", qbus->name);
>
> if (klass->pre_plugged != NULL) {
> - klass->pre_plugged(qbus->parent, errp);
> + klass->pre_plugged(qbus->parent, &local_err);
> + if (local_err) {
> + error_propagate(errp, local_err);
> + return;
> + }
> }
>
> /* Get the features of the plugged device. */
> assert(vdc->get_features != NULL);
> vdev->host_features = vdc->get_features(vdev, vdev->host_features,
> - errp);
> + &local_err);
> + if (local_err) {
> + error_propagate(errp, local_err);
> + return;
> + }
>
> if (klass->device_plugged != NULL) {
> - klass->device_plugged(qbus->parent, errp);
> + klass->device_plugged(qbus->parent, &local_err);
> + }
> + if (local_err) {
> + error_propagate(errp, local_err);
> + return;
> }
>
> if (klass->get_dma_as != NULL && has_iommu) {
> --
> 2.9.3
>
>
Reviewed-by: Andrew Jones <drjones@redhat.com>
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [Qemu-devel] [PATCH for-2.9 v2] virtio: Fix error handling in virtio_bus_device_plugged
2017-03-17 12:32 [Qemu-devel] [PATCH for-2.9 v2] virtio: Fix error handling in virtio_bus_device_plugged Fam Zheng
2017-03-17 12:39 ` Cornelia Huck
2017-03-17 12:42 ` Andrew Jones
@ 2017-03-17 18:23 ` Philippe Mathieu-Daudé
2 siblings, 0 replies; 4+ messages in thread
From: Philippe Mathieu-Daudé @ 2017-03-17 18:23 UTC (permalink / raw)
To: Fam Zheng, qemu-devel; +Cc: cornelia.huck, drjones, Michael S. Tsirkin
On 03/17/2017 09:32 AM, Fam Zheng wrote:
> For one thing we shouldn't continue if an error happened, for the other
> two steps failing can cause an abort() in error_setg because we reuse
> the same errp blindly.
>
> Add error handling checks to fix both issues.
>
> Signed-off-by: Fam Zheng <famz@redhat.com>
>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
> ---
>
> v2: Don't forget the last errp -> &local_err. [Drew]
> ---
> hw/virtio/virtio-bus.c | 20 +++++++++++++++++---
> 1 file changed, 17 insertions(+), 3 deletions(-)
>
> diff --git a/hw/virtio/virtio-bus.c b/hw/virtio/virtio-bus.c
> index a886011..3042232 100644
> --- a/hw/virtio/virtio-bus.c
> +++ b/hw/virtio/virtio-bus.c
> @@ -25,6 +25,7 @@
> #include "qemu/osdep.h"
> #include "hw/hw.h"
> #include "qemu/error-report.h"
> +#include "qapi/error.h"
> #include "hw/qdev.h"
> #include "hw/virtio/virtio-bus.h"
> #include "hw/virtio/virtio.h"
> @@ -48,20 +49,33 @@ void virtio_bus_device_plugged(VirtIODevice *vdev, Error **errp)
> VirtioBusClass *klass = VIRTIO_BUS_GET_CLASS(bus);
> VirtioDeviceClass *vdc = VIRTIO_DEVICE_GET_CLASS(vdev);
> bool has_iommu = virtio_host_has_feature(vdev, VIRTIO_F_IOMMU_PLATFORM);
> + Error *local_err = NULL;
>
> DPRINTF("%s: plug device.\n", qbus->name);
>
> if (klass->pre_plugged != NULL) {
> - klass->pre_plugged(qbus->parent, errp);
> + klass->pre_plugged(qbus->parent, &local_err);
> + if (local_err) {
> + error_propagate(errp, local_err);
> + return;
> + }
> }
>
> /* Get the features of the plugged device. */
> assert(vdc->get_features != NULL);
> vdev->host_features = vdc->get_features(vdev, vdev->host_features,
> - errp);
> + &local_err);
> + if (local_err) {
> + error_propagate(errp, local_err);
> + return;
> + }
>
> if (klass->device_plugged != NULL) {
> - klass->device_plugged(qbus->parent, errp);
> + klass->device_plugged(qbus->parent, &local_err);
> + }
> + if (local_err) {
> + error_propagate(errp, local_err);
> + return;
> }
>
> if (klass->get_dma_as != NULL && has_iommu) {
>
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2017-03-17 18:23 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-03-17 12:32 [Qemu-devel] [PATCH for-2.9 v2] virtio: Fix error handling in virtio_bus_device_plugged Fam Zheng
2017-03-17 12:39 ` Cornelia Huck
2017-03-17 12:42 ` Andrew Jones
2017-03-17 18:23 ` Philippe Mathieu-Daudé
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.