[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v4 20/45] s390x/pci: Fix harmless mistake in zpci's property fid'
From: |
Markus Armbruster |
Subject: |
[PATCH v4 20/45] s390x/pci: Fix harmless mistake in zpci's property fid's setter |
Date: |
Tue, 7 Jul 2020 18:05:48 +0200 |
s390_pci_set_fid() sets zpci->fid_defined to true even when
visit_type_uint32() failed. Reproducer: "-device zpci,fid=junk".
Harmless in practice, because qdev_device_add() then fails, throwing
away @zpci. Fix it anyway.
Cc: Matthew Rosato <mjrosato@linux.ibm.com>
Cc: Cornelia Huck <cohuck@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Matthew Rosato <mjrosato@linux.ibm.com>
Reviewed-by: Cornelia Huck <cohuck@redhat.com>
---
hw/s390x/s390-pci-bus.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/hw/s390x/s390-pci-bus.c b/hw/s390x/s390-pci-bus.c
index 9e6b170fa8..1e4537f0e3 100644
--- a/hw/s390x/s390-pci-bus.c
+++ b/hw/s390x/s390-pci-bus.c
@@ -1269,7 +1269,9 @@ static void s390_pci_set_fid(Object *obj, Visitor *v,
const char *name,
return;
}
- visit_type_uint32(v, name, ptr, errp);
+ if (!visit_type_uint32(v, name, ptr, errp)) {
+ return;
+ }
zpci->fid_defined = true;
}
--
2.26.2
- Re: [PATCH v4 01/45] error: Fix examples in error.h's big comment, (continued)
- [PATCH v4 11/45] qemu-option: Factor out helper opt_create(), Markus Armbruster, 2020/07/07
- [PATCH v4 08/45] qemu-option: Make uses of find_desc_by_name() more similar, Markus Armbruster, 2020/07/07
- [PATCH v4 04/45] qdev: Use returned bool to check for qdev_realize() etc. failure, Markus Armbruster, 2020/07/07
- [PATCH v4 20/45] s390x/pci: Fix harmless mistake in zpci's property fid's setter,
Markus Armbruster <=
- [PATCH v4 15/45] block: Avoid error accumulation in bdrv_img_create(), Markus Armbruster, 2020/07/07
- [PATCH v4 10/45] qemu-option: Simplify around find_default_by_name(), Markus Armbruster, 2020/07/07
- [PATCH v4 09/45] qemu-option: Factor out helper find_default_by_name(), Markus Armbruster, 2020/07/07
- [PATCH v4 06/45] virtio-crypto-pci: Tidy up virtio_crypto_pci_realize(), Markus Armbruster, 2020/07/07
- [PATCH v4 23/45] qom: Crash more nicely on object_property_get_link() failure, Markus Armbruster, 2020/07/07
- [PATCH v4 18/45] qapi: Use returned bool to check for failure, Coccinelle part, Markus Armbruster, 2020/07/07
- [PATCH v4 38/45] block/parallels: Simplify parallels_open() after previous commit, Markus Armbruster, 2020/07/07
- [PATCH v4 13/45] qemu-option: Make functions taking Error ** return bool, not void, Markus Armbruster, 2020/07/07
- [PATCH v4 07/45] qemu-option: Check return value instead of @err where convenient, Markus Armbruster, 2020/07/07