[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 03/21] util: Move general qemu_getauxval to util/geta
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PULL 03/21] util: Move general qemu_getauxval to util/getauxval.c |
Date: |
Fri, 12 Sep 2014 15:58:40 +0200 |
From: Fam Zheng <address@hidden>
So that we won't have an empty getauxval.o which is disliked by ranlib.
Reported-by: Peter Maydell <address@hidden>
Tested-by: Peter Maydell <address@hidden>
Signed-off-by: Fam Zheng <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>
---
include/qemu/osdep.h | 4 ----
util/getauxval.c | 8 ++++++++
2 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/include/qemu/osdep.h b/include/qemu/osdep.h
index 9dd43fc..1565404 100644
--- a/include/qemu/osdep.h
+++ b/include/qemu/osdep.h
@@ -246,11 +246,7 @@ char *qemu_get_exec_dir(void);
* Search the auxiliary vector for @type, returning the value
* or 0 if @type is not present.
*/
-#if defined(CONFIG_GETAUXVAL) || defined(__linux__)
unsigned long qemu_getauxval(unsigned long type);
-#else
-static inline unsigned long qemu_getauxval(unsigned long type) { return 0; }
-#endif
void qemu_set_tty_echo(int fd, bool echo);
diff --git a/util/getauxval.c b/util/getauxval.c
index 25f48e5..1732ace 100644
--- a/util/getauxval.c
+++ b/util/getauxval.c
@@ -98,4 +98,12 @@ unsigned long qemu_getauxval(unsigned long type)
return 0;
}
+
+#else
+
+unsigned long qemu_getauxval(unsigned long type)
+{
+ return 0;
+}
+
#endif
--
2.1.0
- [Qemu-devel] [PULL 00/21] KVM, memory, build, migration changes for 2014-09-11, Paolo Bonzini, 2014/09/12
- [Qemu-devel] [PULL 02/21] trace: Only link generated-tracers.o with "simple" backend, Paolo Bonzini, 2014/09/12
- [Qemu-devel] [PULL 04/21] util: Don't link host-utils.o if it's empty, Paolo Bonzini, 2014/09/12
- [Qemu-devel] [PULL 01/21] kvm: do not abort if KVM_RUN fails, Paolo Bonzini, 2014/09/12
- [Qemu-devel] [PULL 03/21] util: Move general qemu_getauxval to util/getauxval.c,
Paolo Bonzini <=
- [Qemu-devel] [PULL 06/21] exec: add parameter errp to qemu_ram_alloc and qemu_ram_alloc_from_ptr, Paolo Bonzini, 2014/09/12
- [Qemu-devel] [PULL 08/21] memory: add parameter errp to memory_region_init_rom_device, Paolo Bonzini, 2014/09/12
- [Qemu-devel] [PULL 09/21] hostmem-ram: don't exit qemu if size of memory-backend-ram is way too big, Paolo Bonzini, 2014/09/12
- [Qemu-devel] [PULL 07/21] memory: add parameter errp to memory_region_init_ram, Paolo Bonzini, 2014/09/12
- [Qemu-devel] [PULL 11/21] exec: add parameter errp to gethugepagesize, Paolo Bonzini, 2014/09/12
- [Qemu-devel] [PULL 10/21] exec: report error when memory < hpagesize, Paolo Bonzini, 2014/09/12
- [Qemu-devel] [PULL 05/21] rules.mak: Fix DSO build by pulling in archive symbols, Paolo Bonzini, 2014/09/12
- [Qemu-devel] [PULL 13/21] apic_common: vapic_paddr synchronization fix, Paolo Bonzini, 2014/09/12