diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2020-10-21 16:56:35 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2020-10-21 16:56:35 +0100 |
| commit | e06c687fdf24b52358539a52bba184e8f5ff5b35 (patch) | |
| tree | 6860c75ff78c8d541c6bbf8ec3b5d2f40daf2739 /hw | |
| parent | 67e8498937866b49b513e3acadef985c15f44fb5 (diff) | |
| parent | 28af9ba260634daa0bb50039a6103f31b91b1603 (diff) | |
| download | qemu-e06c687fdf24b52358539a52bba184e8f5ff5b35.zip qemu-e06c687fdf24b52358539a52bba184e8f5ff5b35.tar.gz qemu-e06c687fdf24b52358539a52bba184e8f5ff5b35.tar.bz2 | |
Merge remote-tracking branch 'remotes/armbru/tags/pull-qapi-2020-10-21' into staging
QAPI patches patches for 2020-10-21
# gpg: Signature made Wed 21 Oct 2020 04:01:41 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-qapi-2020-10-21:
qapi: Restrict Xen migration commands to migration.json
qapi: Restrict 'query-kvm' command to machine code
qapi: Restrict '(p)memsave' command to machine code
qapi: Restrict 'system wakeup/reset/powerdown' commands to machine.json
qapi: Restrict 'inject-nmi' command to machine code
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw')
| -rw-r--r-- | hw/i386/xen/xen-hvm.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/hw/i386/xen/xen-hvm.c b/hw/i386/xen/xen-hvm.c index f3ababf..9519c33 100644 --- a/hw/i386/xen/xen-hvm.c +++ b/hw/i386/xen/xen-hvm.c @@ -24,7 +24,7 @@ #include "hw/xen/xen-bus.h" #include "hw/xen/xen-x86.h" #include "qapi/error.h" -#include "qapi/qapi-commands-misc.h" +#include "qapi/qapi-commands-migration.h" #include "qemu/error-report.h" #include "qemu/main-loop.h" #include "qemu/range.h" |