diff options
| author | Peter Maydell | 2016-05-24 12:38:22 +0200 |
|---|---|---|
| committer | Peter Maydell | 2016-05-24 12:38:22 +0200 |
| commit | b0f6ef8915247f3230ffd9b71af9c3dadb6082c7 (patch) | |
| tree | 81eb4004395c7823c71541eb47c3e843d26ebf43 /include | |
| parent | Merge remote-tracking branch 'remotes/xtensa/tags/20160523-opencores_eth' int... (diff) | |
| parent | rng-random: rename RndRandom to RngRandom (diff) | |
| download | qemu-b0f6ef8915247f3230ffd9b71af9c3dadb6082c7.tar.gz qemu-b0f6ef8915247f3230ffd9b71af9c3dadb6082c7.tar.xz qemu-b0f6ef8915247f3230ffd9b71af9c3dadb6082c7.zip | |
Merge remote-tracking branch 'remotes/amit-virtio-rng/tags/rng-2.7-1' into staging
rng: rename RndRandom to RndRandom
# gpg: Signature made Mon 23 May 2016 16:44:58 BST using RSA key ID 657EF670
# gpg: Good signature from "Amit Shah <amit@amitshah.net>"
# gpg: aka "Amit Shah <amit@kernel.org>"
# gpg: aka "Amit Shah <amitshah@gmx.net>"
* remotes/amit-virtio-rng/tags/rng-2.7-1:
rng-random: rename RndRandom to RngRandom
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/hw/virtio/virtio-rng.h | 2 | ||||
| -rw-r--r-- | include/sysemu/rng-random.h | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/include/hw/virtio/virtio-rng.h b/include/hw/virtio/virtio-rng.h index 3f07de70c7..2bc1ee5b50 100644 --- a/include/hw/virtio/virtio-rng.h +++ b/include/hw/virtio/virtio-rng.h @@ -26,7 +26,7 @@ struct VirtIORNGConf { RngBackend *rng; uint64_t max_bytes; uint32_t period_ms; - RndRandom *default_backend; + RngRandom *default_backend; }; typedef struct VirtIORNG { diff --git a/include/sysemu/rng-random.h b/include/sysemu/rng-random.h index 4332772a24..38186fe83d 100644 --- a/include/sysemu/rng-random.h +++ b/include/sysemu/rng-random.h @@ -15,8 +15,8 @@ #include "qom/object.h" #define TYPE_RNG_RANDOM "rng-random" -#define RNG_RANDOM(obj) OBJECT_CHECK(RndRandom, (obj), TYPE_RNG_RANDOM) +#define RNG_RANDOM(obj) OBJECT_CHECK(RngRandom, (obj), TYPE_RNG_RANDOM) -typedef struct RndRandom RndRandom; +typedef struct RngRandom RngRandom; #endif |