diff options
| -rw-r--r-- | crypto/secret.c | 2 | ||||
| -rw-r--r-- | hw/net/vmware_utils.h | 2 | ||||
| -rw-r--r-- | include/fpu/softfloat.h | 13 | ||||
| -rw-r--r-- | migration/ram.c | 2 |
4 files changed, 7 insertions, 12 deletions
diff --git a/crypto/secret.c b/crypto/secret.c index 9a9257a7f0..a799da1bdb 100644 --- a/crypto/secret.c +++ b/crypto/secret.c @@ -434,7 +434,7 @@ int qcrypto_secret_lookup(const char *secretid, return -1; } - *data = g_new0(uint8, secret->rawlen + 1); + *data = g_new0(uint8_t, secret->rawlen + 1); memcpy(*data, secret->rawdata, secret->rawlen); (*data)[secret->rawlen] = '\0'; *datalen = secret->rawlen; diff --git a/hw/net/vmware_utils.h b/hw/net/vmware_utils.h index c2c2f900fa..c0dbb2ff41 100644 --- a/hw/net/vmware_utils.h +++ b/hw/net/vmware_utils.h @@ -49,7 +49,7 @@ vmw_shmem_rw(hwaddr addr, void *buf, int len, int is_write) } static inline void -vmw_shmem_set(hwaddr addr, uint8 val, int len) +vmw_shmem_set(hwaddr addr, uint8_t val, int len) { int i; VMW_SHPRN("SHMEM set: %" PRIx64 ", len: %d (value 0x%X)", addr, len, val); diff --git a/include/fpu/softfloat.h b/include/fpu/softfloat.h index a6842ad21d..575a7398cf 100644 --- a/include/fpu/softfloat.h +++ b/include/fpu/softfloat.h @@ -90,16 +90,11 @@ this code that are retained. #include "config-host.h" #include "qemu/osdep.h" -/*---------------------------------------------------------------------------- -| Each of the following `typedef's defines the most convenient type that holds -| integers of at least as many bits as specified. For example, `uint8' should -| be the most convenient type that can hold unsigned integers of as many as -| 8 bits. The `flag' type must be able to hold either a 0 or 1. For most -| implementations of C, `flag', `uint8', and `int8' should all be `typedef'ed -| to the same as `int'. -*----------------------------------------------------------------------------*/ +/* This 'flag' type must be able to hold at least 0 and 1. It should + * probably be replaced with 'bool' but the uses would need to be audited + * to check that they weren't accidentally relying on it being a larger type. + */ typedef uint8_t flag; -typedef uint8_t uint8; #define LIT64( a ) a##LL diff --git a/migration/ram.c b/migration/ram.c index 4e606ab1a4..e49749d03d 100644 --- a/migration/ram.c +++ b/migration/ram.c @@ -265,7 +265,7 @@ struct DecompressParam { QemuMutex mutex; QemuCond cond; void *des; - uint8 *compbuf; + uint8_t *compbuf; int len; }; typedef struct DecompressParam DecompressParam; |