diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2012-06-07 17:21:40 +0800 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2012-06-07 17:21:40 +0800 |
| commit | fa79c914efd35cb60e0bc18512c03690c48b13e2 (patch) | |
| tree | f8b6d789285dc86155bfe3f907f1871d8011a1b0 /memory_mapping.c | |
| parent | 083dbf489d1b0592e910ecfb90b3858c23e49ab7 (diff) | |
| parent | 2dee8d54c62abb0a46578ad21cc25782b83e3773 (diff) | |
| download | focaccia-qemu-fa79c914efd35cb60e0bc18512c03690c48b13e2.tar.gz focaccia-qemu-fa79c914efd35cb60e0bc18512c03690c48b13e2.zip | |
Merge remote-tracking branch 'bonzini/nested-makefiles-3' into staging
* bonzini/nested-makefiles-3: (29 commits) build: do not create directories at configure time configure: ensure directory exists when creating symlink build: compile oslib-obj-y once build: limit usage of vpath build: libcacard Makefile cleanups build: move device tree to per-target Makefile.objs build: move per-target hw/ objects to nested Makefile.objs build: convert libhw to nested Makefile.objs build: move target-independent hw/ objects to nested Makefile.objs build: move qga/ objects to nested Makefile.objs build: move qapi/ objects to nested Makefile.objs build: move slirp/ objects to nested Makefile.objs build: move audio/ objects to nested Makefile.objs build: move ui/ objects to nested Makefile.objs build: move fsdev/ objects to nested Makefile.objs build: move net/ objects to nested Makefile.objs build: move block/ objects to nested Makefile.objs build: adapt qom/Makefile and move it to Makefile.objs build: move rules for nesting to Makefile.objs build: move other target-*/ objects to nested Makefile.objs ...
Diffstat (limited to 'memory_mapping.c')
| -rw-r--r-- | memory_mapping.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/memory_mapping.c b/memory_mapping.c index 8810bb09e3..1125e3fccf 100644 --- a/memory_mapping.c +++ b/memory_mapping.c @@ -165,8 +165,6 @@ void memory_mapping_list_init(MemoryMappingList *list) QTAILQ_INIT(&list->head); } -#if defined(CONFIG_HAVE_GET_MEMORY_MAPPING) - static CPUArchState *find_paging_enabled_cpu(CPUArchState *start_cpu) { CPUArchState *env; @@ -210,7 +208,6 @@ int qemu_get_guest_memory_mapping(MemoryMappingList *list) return 0; } -#endif void qemu_get_guest_simple_memory_mapping(MemoryMappingList *list) { |