diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2013-04-15 17:06:04 -0500 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2013-04-15 17:06:04 -0500 |
| commit | 4ceb193d30fe9b1cda0dc73bddb8051659926fb9 (patch) | |
| tree | a9ffbe92293ba9b0cc3298591e7564aae19a0ef1 /include/hw/virtio | |
| parent | a907cf59d8a41ecb909ad4367cd016c7d71f8546 (diff) | |
| parent | c72dd2d04bd28f7ec6b073316270258684ba5fc3 (diff) | |
| download | focaccia-qemu-4ceb193d30fe9b1cda0dc73bddb8051659926fb9.tar.gz focaccia-qemu-4ceb193d30fe9b1cda0dc73bddb8051659926fb9.zip | |
Merge remote-tracking branch 'bonzini/hw-dirs' into staging
* bonzini/hw-dirs: exec: remove useless declarations from memory-internal.h memory: move core typedefs to qemu/typedefs.h include: avoid useless includes of exec/ headers sysemu: avoid proliferation of include/ subdirectories tpm: reorganize headers and split hardware part configure: fix TPM logic acpi.h: make it self contained acpi: move declarations from pc.h to acpi.h hw: Add lost ARM core again Fix failure to create q35 machine Add linux-headers to QEMU_INCLUDES arm: fix location of some include files Conflicts: configure aliguori: trivial conflict in configure output Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'include/hw/virtio')
| -rw-r--r-- | include/hw/virtio/virtio-rng.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/hw/virtio/virtio-rng.h b/include/hw/virtio/virtio-rng.h index 3711c97a70..c9cadc24b6 100644 --- a/include/hw/virtio/virtio-rng.h +++ b/include/hw/virtio/virtio-rng.h @@ -12,8 +12,8 @@ #ifndef _QEMU_VIRTIO_RNG_H #define _QEMU_VIRTIO_RNG_H -#include "qemu/rng.h" -#include "qemu/rng-random.h" +#include "sysemu/rng.h" +#include "sysemu/rng-random.h" /* The Virtio ID for the virtio rng device */ #define VIRTIO_ID_RNG 4 |