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>
This commit is contained in:
commit
95de21a430
|
@ -1,7 +1,6 @@
|
||||||
/* public domain */
|
/* public domain */
|
||||||
|
|
||||||
#include "qemu-common.h"
|
#include "qemu-common.h"
|
||||||
#include "audio.h"
|
|
||||||
|
|
||||||
#define AUDIO_CAP "win-int"
|
#define AUDIO_CAP "win-int"
|
||||||
#include <windows.h>
|
#include <windows.h>
|
||||||
|
|
|
@ -25,7 +25,6 @@
|
||||||
#include "qemu/timer.h"
|
#include "qemu/timer.h"
|
||||||
#include "block/block_int.h"
|
#include "block/block_int.h"
|
||||||
#include "qemu/module.h"
|
#include "qemu/module.h"
|
||||||
#include "qemu-common.h"
|
|
||||||
#include "block/aio.h"
|
#include "block/aio.h"
|
||||||
#include "raw-aio.h"
|
#include "raw-aio.h"
|
||||||
#include "qemu/event_notifier.h"
|
#include "qemu/event_notifier.h"
|
||||||
|
|
|
@ -24,7 +24,6 @@
|
||||||
#include "net/net.h"
|
#include "net/net.h"
|
||||||
#include "sysemu/sysemu.h"
|
#include "sysemu/sysemu.h"
|
||||||
#include "hw/boards.h"
|
#include "hw/boards.h"
|
||||||
#include "hw/sysbus.h"
|
|
||||||
#include "sysemu/blockdev.h"
|
#include "sysemu/blockdev.h"
|
||||||
#include "exec/address-spaces.h"
|
#include "exec/address-spaces.h"
|
||||||
|
|
||||||
|
|
|
@ -12,7 +12,6 @@
|
||||||
#include "hw/sysbus.h"
|
#include "hw/sysbus.h"
|
||||||
#include "hw/hw.h"
|
#include "hw/hw.h"
|
||||||
#include "hw/i2c/i2c.h"
|
#include "hw/i2c/i2c.h"
|
||||||
#include "hw/sysbus.h"
|
|
||||||
#include "audio/audio.h"
|
#include "audio/audio.h"
|
||||||
|
|
||||||
#define MP_AUDIO_SIZE 0x00001000
|
#define MP_AUDIO_SIZE 0x00001000
|
||||||
|
|
|
@ -37,7 +37,6 @@
|
||||||
#include "sysemu/char.h"
|
#include "sysemu/char.h"
|
||||||
#include "sysemu/sysemu.h"
|
#include "sysemu/sysemu.h"
|
||||||
#include "sysemu/arch_init.h"
|
#include "sysemu/arch_init.h"
|
||||||
#include "hw/boards.h"
|
|
||||||
#include "qemu/log.h"
|
#include "qemu/log.h"
|
||||||
#include "hw/mips/bios.h"
|
#include "hw/mips/bios.h"
|
||||||
#include "hw/ide.h"
|
#include "hw/ide.h"
|
||||||
|
|
|
@ -34,7 +34,6 @@
|
||||||
#include "qemu/log.h"
|
#include "qemu/log.h"
|
||||||
#include "qemu/error-report.h"
|
#include "qemu/error-report.h"
|
||||||
#include "sysemu/sysemu.h"
|
#include "sysemu/sysemu.h"
|
||||||
#include "qemu/log.h"
|
|
||||||
|
|
||||||
enum {
|
enum {
|
||||||
R_CTRL = 0,
|
R_CTRL = 0,
|
||||||
|
|
|
@ -43,8 +43,6 @@
|
||||||
#include "hw/ppc/xics.h"
|
#include "hw/ppc/xics.h"
|
||||||
#include "hw/pci/msi.h"
|
#include "hw/pci/msi.h"
|
||||||
|
|
||||||
#include "sysemu/kvm.h"
|
|
||||||
#include "kvm_ppc.h"
|
|
||||||
#include "hw/pci/pci.h"
|
#include "hw/pci/pci.h"
|
||||||
|
|
||||||
#include "exec/address-spaces.h"
|
#include "exec/address-spaces.h"
|
||||||
|
|
|
@ -1,6 +1,5 @@
|
||||||
#include "sysemu/sysemu.h"
|
#include "sysemu/sysemu.h"
|
||||||
#include "cpu.h"
|
#include "cpu.h"
|
||||||
#include "sysemu/sysemu.h"
|
|
||||||
#include "helper_regs.h"
|
#include "helper_regs.h"
|
||||||
#include "hw/ppc/spapr.h"
|
#include "hw/ppc/spapr.h"
|
||||||
#include "mmu-hash64.h"
|
#include "mmu-hash64.h"
|
||||||
|
|
|
@ -31,7 +31,6 @@
|
||||||
#include "hw/ptimer.h"
|
#include "hw/ptimer.h"
|
||||||
|
|
||||||
#include "hw/hw.h"
|
#include "hw/hw.h"
|
||||||
#include "qemu/timer.h"
|
|
||||||
#include "sysemu/sysemu.h"
|
#include "sysemu/sysemu.h"
|
||||||
|
|
||||||
#include "hw/arm/exynos4210.h"
|
#include "hw/arm/exynos4210.h"
|
||||||
|
|
|
@ -7,7 +7,6 @@
|
||||||
#include "hw/isa/isa.h"
|
#include "hw/isa/isa.h"
|
||||||
#include "hw/block/fdc.h"
|
#include "hw/block/fdc.h"
|
||||||
#include "net/net.h"
|
#include "net/net.h"
|
||||||
#include "exec/memory.h"
|
|
||||||
#include "hw/i386/ioapic.h"
|
#include "hw/i386/ioapic.h"
|
||||||
|
|
||||||
/* PC-style peripherals (also used by other machines). */
|
/* PC-style peripherals (also used by other machines). */
|
||||||
|
|
|
@ -15,7 +15,6 @@
|
||||||
|
|
||||||
#include "qapi/qmp/qobject.h"
|
#include "qapi/qmp/qobject.h"
|
||||||
#include "qemu/queue.h"
|
#include "qemu/queue.h"
|
||||||
#include "qemu/queue.h"
|
|
||||||
|
|
||||||
typedef struct QListEntry {
|
typedef struct QListEntry {
|
||||||
QObject *value;
|
QObject *value;
|
||||||
|
|
|
@ -4,7 +4,6 @@
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
#include "qemu/option.h"
|
#include "qemu/option.h"
|
||||||
#include "qapi/error.h"
|
#include "qapi/error.h"
|
||||||
#include "qemu/option.h"
|
|
||||||
|
|
||||||
QemuOptsList *qemu_find_opts(const char *group);
|
QemuOptsList *qemu_find_opts(const char *group);
|
||||||
QemuOptsList *qemu_find_opts_err(const char *group, Error **errp);
|
QemuOptsList *qemu_find_opts_err(const char *group, Error **errp);
|
||||||
|
|
|
@ -5050,10 +5050,10 @@ static int open_self_maps(void *cpu_env, int fd)
|
||||||
}
|
}
|
||||||
if (h2g_valid(min) && h2g_valid(max)) {
|
if (h2g_valid(min) && h2g_valid(max)) {
|
||||||
dprintf(fd, TARGET_ABI_FMT_lx "-" TARGET_ABI_FMT_lx
|
dprintf(fd, TARGET_ABI_FMT_lx "-" TARGET_ABI_FMT_lx
|
||||||
" %c%c%c%c %08" PRIx64 " %02x:%02x %d%s%s\n",
|
" %c%c%c%c %08" PRIx64 " %02x:%02x %d %s%s\n",
|
||||||
h2g(min), h2g(max), flag_r, flag_w,
|
h2g(min), h2g(max), flag_r, flag_w,
|
||||||
flag_x, flag_p, offset, dev_maj, dev_min, inode,
|
flag_x, flag_p, offset, dev_maj, dev_min, inode,
|
||||||
path[0] ? " " : "", path);
|
path[0] ? " " : "", path);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -63,7 +63,6 @@
|
||||||
#ifdef CONFIG_TRACE_SIMPLE
|
#ifdef CONFIG_TRACE_SIMPLE
|
||||||
#include "trace/simple.h"
|
#include "trace/simple.h"
|
||||||
#endif
|
#endif
|
||||||
#include "ui/qemu-spice.h"
|
|
||||||
#include "exec/memory.h"
|
#include "exec/memory.h"
|
||||||
#include "qmp-commands.h"
|
#include "qmp-commands.h"
|
||||||
#include "hmp.h"
|
#include "hmp.h"
|
||||||
|
|
|
@ -21,7 +21,6 @@
|
||||||
#include <sys/types.h>
|
#include <sys/types.h>
|
||||||
#include <stdbool.h>
|
#include <stdbool.h>
|
||||||
#include <glib.h>
|
#include <glib.h>
|
||||||
#include <strings.h>
|
|
||||||
|
|
||||||
#include "qemu-common.h"
|
#include "qemu-common.h"
|
||||||
#include "migration/page_cache.h"
|
#include "migration/page_cache.h"
|
||||||
|
|
|
@ -242,8 +242,6 @@ strdup(str)
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include "monitor/monitor.h"
|
|
||||||
|
|
||||||
void lprint(const char *format, ...)
|
void lprint(const char *format, ...)
|
||||||
{
|
{
|
||||||
va_list args;
|
va_list args;
|
||||||
|
|
|
@ -116,7 +116,7 @@ int cpu_moxie_handle_mmu_fault(CPUMoxieState *env, target_ulong address,
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
target_phys_addr_t cpu_get_phys_page_debug(CPUState *env, target_ulong addr)
|
hwaddr cpu_get_phys_page_debug(CPUState *env, target_ulong addr)
|
||||||
{
|
{
|
||||||
return addr;
|
return addr;
|
||||||
}
|
}
|
||||||
|
|
|
@ -30,8 +30,6 @@
|
||||||
#include "cpu.h"
|
#include "cpu.h"
|
||||||
#include "sysemu/cpus.h"
|
#include "sysemu/cpus.h"
|
||||||
#include "sysemu/device_tree.h"
|
#include "sysemu/device_tree.h"
|
||||||
#include "hw/sysbus.h"
|
|
||||||
#include "hw/ppc/spapr.h"
|
|
||||||
#include "mmu-hash64.h"
|
#include "mmu-hash64.h"
|
||||||
|
|
||||||
#include "hw/sysbus.h"
|
#include "hw/sysbus.h"
|
||||||
|
|
|
@ -39,7 +39,6 @@
|
||||||
#include <dirent.h>
|
#include <dirent.h>
|
||||||
#include <setjmp.h>
|
#include <setjmp.h>
|
||||||
#include <sys/shm.h>
|
#include <sys/shm.h>
|
||||||
#include <sched.h>
|
|
||||||
|
|
||||||
#define TESTPATH "/tmp/linux-test.tmp"
|
#define TESTPATH "/tmp/linux-test.tmp"
|
||||||
#define TESTPORT 7654
|
#define TESTPORT 7654
|
||||||
|
|
|
@ -55,7 +55,6 @@
|
||||||
#else
|
#else
|
||||||
#include "exec/address-spaces.h"
|
#include "exec/address-spaces.h"
|
||||||
#endif
|
#endif
|
||||||
#include "qemu/timer.h"
|
|
||||||
|
|
||||||
#include "exec/cputlb.h"
|
#include "exec/cputlb.h"
|
||||||
#include "translate-all.h"
|
#include "translate-all.h"
|
||||||
|
|
Loading…
Reference in New Issue