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 /include/hw | |
| parent | 379e9eaed497a2e09b5985e1e15967d7bfea8296 (diff) | |
| parent | 4eb79bdf87206a223a7ad7a698af519d2ec75c14 (diff) | |
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 'include/hw')
| -rw-r--r-- | include/hw/block/swim.h | 1 | ||||
| -rw-r--r-- | include/hw/display/macfb.h | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/include/hw/block/swim.h b/include/hw/block/swim.h index 5a49029543..c1bd5f6555 100644 --- a/include/hw/block/swim.h +++ b/include/hw/block/swim.h @@ -11,7 +11,6 @@ #ifndef SWIM_H #define SWIM_H -#include "qemu/osdep.h" #include "hw/sysbus.h" #include "qom/object.h" diff --git a/include/hw/display/macfb.h b/include/hw/display/macfb.h index c133fa271e..80806b0306 100644 --- a/include/hw/display/macfb.h +++ b/include/hw/display/macfb.h @@ -13,7 +13,6 @@ #ifndef MACFB_H #define MACFB_H -#include "qemu/osdep.h" #include "exec/memory.h" #include "ui/console.h" #include "qom/object.h" |