diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2013-05-22 08:22:36 -0500 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2013-05-22 08:22:36 -0500 |
| commit | 95de21a430f7bc4166a153b1f69b1425c8a99c7b (patch) | |
| tree | ed0754df09c7e0bd9bafce52cffdd8257a687897 /include | |
| parent | 3459f01b2d9612070ec23221a4ccb60a41b775ae (diff) | |
| parent | d2ad50210b35c2685640f7df931a0fccb49334f7 (diff) | |
| download | qemu-95de21a430f7bc4166a153b1f69b1425c8a99c7b.tar.gz | |
Merge remote-tracking branch 'mjt/trivial-patches' into staging
# By Christophe Lyon (1) and others
# Via Michael Tokarev
* mjt/trivial-patches:
target-moxie: replace target_phys_addr_t with hwaddr
Rename hexdump to avoid FreeBSD libutil conflict
remove some double-includes
translate: remove redundantly included qemu/timer.h
Remove twice include of qemu-common.h
fix /proc/self/maps output
Message-id: 51977B44.1000302@msgid.tls.msk.ru
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/hw/i386/pc.h | 1 | ||||
| -rw-r--r-- | include/qapi/qmp/qlist.h | 1 | ||||
| -rw-r--r-- | include/qemu/config-file.h | 1 |
3 files changed, 0 insertions, 3 deletions
diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h index 93d8357cec..663426cee8 100644 --- a/include/hw/i386/pc.h +++ b/include/hw/i386/pc.h @@ -7,7 +7,6 @@ #include "hw/isa/isa.h" #include "hw/block/fdc.h" #include "net/net.h" -#include "exec/memory.h" #include "hw/i386/ioapic.h" /* PC-style peripherals (also used by other machines). */ diff --git a/include/qapi/qmp/qlist.h b/include/qapi/qmp/qlist.h index 382f04c3c4..6cc4831df3 100644 --- a/include/qapi/qmp/qlist.h +++ b/include/qapi/qmp/qlist.h @@ -15,7 +15,6 @@ #include "qapi/qmp/qobject.h" #include "qemu/queue.h" -#include "qemu/queue.h" typedef struct QListEntry { QObject *value; diff --git a/include/qemu/config-file.h b/include/qemu/config-file.h index ccfccae2b4..ad4a9e5c3a 100644 --- a/include/qemu/config-file.h +++ b/include/qemu/config-file.h @@ -4,7 +4,6 @@ #include <stdio.h> #include "qemu/option.h" #include "qapi/error.h" -#include "qemu/option.h" QemuOptsList *qemu_find_opts(const char *group); QemuOptsList *qemu_find_opts_err(const char *group, Error **errp); |