diff options
| author | Markus Armbruster <armbru@redhat.com> | 2020-07-07 18:05:48 +0200 |
|---|---|---|
| committer | Markus Armbruster <armbru@redhat.com> | 2020-07-10 15:18:08 +0200 |
| commit | 5af3a05631daffc61a12dd2c25d15876f048fdd1 (patch) | |
| tree | b3de89b2640444b98671bf6c5017ac2659114a18 /hw/s390x | |
| parent | 14217038bc9e36246d311fa8e026a01a5d7bbd42 (diff) | |
| download | qemu-5af3a05631daffc61a12dd2c25d15876f048fdd1.zip qemu-5af3a05631daffc61a12dd2c25d15876f048fdd1.tar.gz qemu-5af3a05631daffc61a12dd2c25d15876f048fdd1.tar.bz2 | |
s390x/pci: Fix harmless mistake in zpci's property fid's setter
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>
Message-Id: <20200707160613.848843-21-armbru@redhat.com>
Diffstat (limited to 'hw/s390x')
| -rw-r--r-- | hw/s390x/s390-pci-bus.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/hw/s390x/s390-pci-bus.c b/hw/s390x/s390-pci-bus.c index 9e6b170..1e4537f 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; } |