diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2012-11-19 08:31:24 -0600 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2012-11-19 08:31:24 -0600 |
| commit | f44d771a8cfb3a22f9de76f8aae1832ee671ecd7 (patch) | |
| tree | dd18fb2cf5f15507284e83980cf3d14c2c951129 /scripts | |
| parent | d167dac993bc8223eb20b45e009bff22abd83354 (diff) | |
| parent | 37507094f350b75c62dc059f998e7185de3ab60a (diff) | |
| download | qemu-f44d771a8cfb3a22f9de76f8aae1832ee671ecd7.zip qemu-f44d771a8cfb3a22f9de76f8aae1832ee671ecd7.tar.gz qemu-f44d771a8cfb3a22f9de76f8aae1832ee671ecd7.tar.bz2 | |
Merge remote-tracking branch 'afaerber/qom-cpu' into staging
* afaerber/qom-cpu:
target-i386: Add Haswell CPU model
target-i386/cpu: Add new Opteron CPU model
target-i386/cpu: Name new CPUID bits
qapi-types.h: Don't include qemu-common.h
osdep: Move qemu_{open,close}() prototypes
qemu-config.h: Include headers it needs
vnc-palette.h: Include <stdbool.h>
qemu-fsdev-dummy.c: Include module.h
qdev: Split up header so it can be used in cpu.h
Move qemu_irq typedef out of qemu-common.h
qemu-common.h: Comment about usage rules
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/qapi-types.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/scripts/qapi-types.py b/scripts/qapi-types.py index 1b84834..6bc2391 100644 --- a/scripts/qapi-types.py +++ b/scripts/qapi-types.py @@ -273,7 +273,8 @@ fdecl.write(mcgen(''' #ifndef %(guard)s #define %(guard)s -#include "qemu-common.h" +#include <stdbool.h> +#include <stdint.h> ''', guard=guardname(h_file))) |