diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2019-05-13 13:55:13 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2019-05-13 13:55:13 +0100 |
| commit | 01807c8b0e9f5da6981c2e62a3c1d8f661fb178e (patch) | |
| tree | 70207fdd19b59ff26dd45d0c0edf82baddf08e45 /net | |
| parent | 082b4061a4a28549bcb22ba3bab8e477e4fca018 (diff) | |
| parent | 6834c3f410f6ce77dd9cad78f3a9a864e7fc8ec5 (diff) | |
| download | qemu-01807c8b0e9f5da6981c2e62a3c1d8f661fb178e.zip qemu-01807c8b0e9f5da6981c2e62a3c1d8f661fb178e.tar.gz qemu-01807c8b0e9f5da6981c2e62a3c1d8f661fb178e.tar.bz2 | |
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 'net')
| -rw-r--r-- | net/colo.h | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -12,8 +12,8 @@ * later. See the COPYING file in the top-level directory. */ -#ifndef QEMU_COLO_PROXY_H -#define QEMU_COLO_PROXY_H +#ifndef NET_COLO_H +#define NET_COLO_H #include "qemu/jhash.h" #include "qemu/timer.h" @@ -103,4 +103,4 @@ void connection_hashtable_reset(GHashTable *connection_track_table); Packet *packet_new(const void *data, int size, int vnet_hdr_len); void packet_destroy(void *opaque, void *user_data); -#endif /* QEMU_COLO_PROXY_H */ +#endif /* NET_COLO_H */ |