diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2020-07-10 14:41:23 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2020-07-10 14:41:23 +0100 |
| commit | f2a1cf9180f63e88bb38ff21c169da97c3f2bad5 (patch) | |
| tree | b7582f17ac7fb572a23b02bfdac638d19d780d48 /include/hw | |
| parent | b6d7e9b66f59ca6ebc6e9b830cd5e7bf849d31cf (diff) | |
| parent | 1de7096d8378a57e2d75d9cacc9a119e7e41640d (diff) | |
| download | qemu-f2a1cf9180f63e88bb38ff21c169da97c3f2bad5.zip qemu-f2a1cf9180f63e88bb38ff21c169da97c3f2bad5.tar.gz qemu-f2a1cf9180f63e88bb38ff21c169da97c3f2bad5.tar.bz2 | |
Merge remote-tracking branch 'remotes/armbru/tags/pull-error-2020-07-07-v2' into staging
Error reporting patches patches for 2020-07-07
# gpg: Signature made Fri 10 Jul 2020 14:24:42 BST
# gpg: using RSA key 354BC8B3D7EB2A6B68674E5F3870B400EB918653
# gpg: issuer "armbru@redhat.com"
# gpg: Good signature from "Markus Armbruster <armbru@redhat.com>" [full]
# gpg: aka "Markus Armbruster <armbru@pond.sub.org>" [full]
# Primary key fingerprint: 354B C8B3 D7EB 2A6B 6867 4E5F 3870 B400 EB91 8653
* remotes/armbru/tags/pull-error-2020-07-07-v2: (53 commits)
xen: Use ERRP_GUARD()
nbd: Use ERRP_GUARD()
virtio-9p: Use ERRP_GUARD()
fw_cfg: Use ERRP_GUARD()
pflash: Use ERRP_GUARD()
sd: Use ERRP_GUARD()
scripts: Coccinelle script to use ERRP_GUARD()
error: New macro ERRP_GUARD()
hmp: Ignore Error objects where the return value suffices
qdev: Ignore Error objects where the return value suffices
qemu-img: Ignore Error objects where the return value suffices
error: Avoid error_propagate() after migrate_add_blocker()
qapi: Purge error_propagate() from QAPI core
qapi: Smooth visitor error checking in generated code
qapi: Smooth another visitor error checking pattern
block/parallels: Simplify parallels_open() after previous commit
error: Reduce unnecessary error propagation
error: Eliminate error_propagate() manually
error: Eliminate error_propagate() with Coccinelle, part 2
error: Eliminate error_propagate() with Coccinelle, part 1
...
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'include/hw')
| -rw-r--r-- | include/hw/audio/pcspk.h | 2 | ||||
| -rw-r--r-- | include/hw/qdev-properties.h | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/include/hw/audio/pcspk.h b/include/hw/audio/pcspk.h index 06cba00..9506179 100644 --- a/include/hw/audio/pcspk.h +++ b/include/hw/audio/pcspk.h @@ -33,7 +33,7 @@ static inline void pcspk_init(ISADevice *isadev, ISABus *bus, ISADevice *pit) { - object_property_set_link(OBJECT(isadev), OBJECT(pit), "pit", NULL); + object_property_set_link(OBJECT(isadev), "pit", OBJECT(pit), NULL); isa_realize_and_unref(isadev, bus, &error_fatal); } diff --git a/include/hw/qdev-properties.h b/include/hw/qdev-properties.h index 944e3f2..587e5b7 100644 --- a/include/hw/qdev-properties.h +++ b/include/hw/qdev-properties.h @@ -239,8 +239,8 @@ extern const PropertyInfo qdev_prop_pcie_link_width; /* * Set properties between creation and realization. */ -void qdev_prop_set_drive_err(DeviceState *dev, const char *name, - BlockBackend *value, Error **errp); +bool qdev_prop_set_drive_err(DeviceState *dev, const char *name, + BlockBackend *value, Error **errp); /* * Set properties between creation and realization. |