diff options
| author | Peter Maydell | 2019-05-13 14:55:13 +0200 |
|---|---|---|
| committer | Peter Maydell | 2019-05-13 14:55:13 +0200 |
| commit | 01807c8b0e9f5da6981c2e62a3c1d8f661fb178e (patch) | |
| tree | 70207fdd19b59ff26dd45d0c0edf82baddf08e45 /include/migration | |
| parent | Merge remote-tracking branch 'remotes/kraxel/tags/input-20190513-v2-pull-requ... (diff) | |
| parent | Clean up decorations and whitespace around header guards (diff) | |
| download | qemu-01807c8b0e9f5da6981c2e62a3c1d8f661fb178e.tar.gz qemu-01807c8b0e9f5da6981c2e62a3c1d8f661fb178e.tar.xz qemu-01807c8b0e9f5da6981c2e62a3c1d8f661fb178e.zip | |
Merge remote-tracking branch 'remotes/armbru/tags/pull-misc-2019-05-13' into staging
Miscellaneous patches for 2019-05-13
# gpg: Signature made Mon 13 May 2019 08:04:02 BST
# gpg: using RSA key 3870B400EB918653
# 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-2019-05-13:
Clean up decorations and whitespace around header guards
Normalize header guard symbol definition.
Clean up ill-advised or unusual header guards
Clean up header guards that don't match their file name
target/xtensa: Clean up core-isa.h header guards
linux-user/nios2 linux-user/riscv: Clean up header guards
authz: Normalize #include "authz/trace.h" to "trace.h"
Use #include "..." for our own headers, <...> for others
Clean up includes
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'include/migration')
| -rw-r--r-- | include/migration/qemu-file-types.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/migration/qemu-file-types.h b/include/migration/qemu-file-types.h index bbe04d4484..c0a1988155 100644 --- a/include/migration/qemu-file-types.h +++ b/include/migration/qemu-file-types.h @@ -22,8 +22,8 @@ * THE SOFTWARE. */ -#ifndef QEMU_FILE_H -#define QEMU_FILE_H +#ifndef MIGRATION_QEMU_FILE_TYPES_H +#define MIGRATION_QEMU_FILE_TYPES_H int qemu_file_get_error(QEMUFile *f); |