diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2012-12-10 08:35:15 -0600 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2012-12-10 08:35:15 -0600 |
| commit | 1c97e303d4ea80a2691334b0febe87a50660f99d (patch) | |
| tree | 6b84e52608c62dcb8a8ffc5e5a6ccc94d83c0c93 /cpu-all.h | |
| parent | 7c12fd9b29c6ca2119396f143d84706f2fba6222 (diff) | |
| parent | b34d12d153e6e5c5e5e00eac510b054a94409deb (diff) | |
| download | focaccia-qemu-1c97e303d4ea80a2691334b0febe87a50660f99d.tar.gz focaccia-qemu-1c97e303d4ea80a2691334b0febe87a50660f99d.zip | |
Merge remote-tracking branch 'afaerber/qom-cpu' into staging
* afaerber/qom-cpu: target-i386: Postpone cpuid_level update to realize time target-i386: Use define for cpuid vendor string size target-i386: Separate feature string parsing from CPU model lookup target-i386/cpu.c: Coding style fixes qdev: qdev_create(): use error_report() instead of hw_error() sysemu.h: Include qemu-types.h instead of qemu-common.h Create qemu-types.h for struct typedefs qlist.h: Do not include qemu-common.h qga/channel-posix.c: Include headers it needs qapi/qmp-registry.c: Include headers it needs ui/vnc-palette.c: Include headers it needs user: Rename qemu-types.h to qemu-user-types.h user: Move *-user/qemu-types.h to main directory Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'cpu-all.h')
| -rw-r--r-- | cpu-all.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cpu-all.h b/cpu-all.h index c9c51b83ac..d6b2b19743 100644 --- a/cpu-all.h +++ b/cpu-all.h @@ -180,7 +180,7 @@ static inline void tswap64s(uint64_t *s) #if defined(CONFIG_USER_ONLY) #include <assert.h> -#include "qemu-types.h" +#include "qemu-user-types.h" /* On some host systems the guest address space is reserved on the host. * This allows the guest address space to be offset to a convenient location. |