diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2020-12-10 17:01:05 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2020-12-10 17:01:05 +0000 |
| commit | 2ecfc0657afa5d29a373271b342f704a1a3c6737 (patch) | |
| tree | 7089fede165ebba103fe39b204388f30116dd9dc /hw | |
| parent | 379e9eaed497a2e09b5985e1e15967d7bfea8296 (diff) | |
| parent | 4eb79bdf87206a223a7ad7a698af519d2ec75c14 (diff) | |
| download | qemu-2ecfc0657afa5d29a373271b342f704a1a3c6737.zip qemu-2ecfc0657afa5d29a373271b342f704a1a3c6737.tar.gz qemu-2ecfc0657afa5d29a373271b342f704a1a3c6737.tar.bz2 | |
Merge remote-tracking branch 'remotes/armbru/tags/pull-misc-2020-12-10' into staging
Miscellaneous patches for 2020-12-10
# gpg: Signature made Thu 10 Dec 2020 16:17:43 GMT
# 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-misc-2020-12-10:
docs/devel/writing-qmp-commands.txt: Fix docs
qapi: Normalize version references x.y.0 to just x.y
Tweak a few "Parameter 'NAME' expects THING" error message
qom: Improve {qom,device}-list-properties error messages
qga: Tweak a guest-shutdown error message
qga: Replace an unreachable error by abort()
ui: Tweak a client_migrate_info error message
ui: Improve a client_migrate_info error message
ui: Improve some set_passwd, expire_password error messages
block: Improve some block-commit, block-stream error messages
qerror: Eliminate QERR_ macros used in just one place
qerror: Drop unused QERR_ macros
Clean up includes
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw')
| -rw-r--r-- | hw/core/qdev-properties-system.c | 2 | ||||
| -rw-r--r-- | hw/display/artist.c | 1 | ||||
| -rw-r--r-- | hw/s390x/s390-pci-vfio.c | 3 |
3 files changed, 3 insertions, 3 deletions
diff --git a/hw/core/qdev-properties-system.c b/hw/core/qdev-properties-system.c index 9d80a07..8912fb4 100644 --- a/hw/core/qdev-properties-system.c +++ b/hw/core/qdev-properties-system.c @@ -776,7 +776,7 @@ static void set_pci_devfn(Object *obj, Visitor *v, const char *name, } if (value < -1 || value > 255) { error_setg(errp, QERR_INVALID_PARAMETER_VALUE, - name ? name : "null", "pci_devfn"); + name ? name : "null", "a value between -1 and 255"); return; } *ptr = value; diff --git a/hw/display/artist.c b/hw/display/artist.c index ed0e637..aa7bd59 100644 --- a/hw/display/artist.c +++ b/hw/display/artist.c @@ -9,7 +9,6 @@ #include "qemu/osdep.h" #include "qemu-common.h" #include "qemu/error-report.h" -#include "qemu/typedefs.h" #include "qemu/log.h" #include "qemu/module.h" #include "qemu/units.h" diff --git a/hw/s390x/s390-pci-vfio.c b/hw/s390x/s390-pci-vfio.c index 9296e1b..ead4f22 100644 --- a/hw/s390x/s390-pci-vfio.c +++ b/hw/s390x/s390-pci-vfio.c @@ -9,11 +9,12 @@ * directory. */ +#include "qemu/osdep.h" + #include <sys/ioctl.h> #include <linux/vfio.h> #include <linux/vfio_zdev.h> -#include "qemu/osdep.h" #include "trace.h" #include "hw/s390x/s390-pci-bus.h" #include "hw/s390x/s390-pci-clp.h" |