summaryrefslogtreecommitdiff
path: root/qemu-malloc.c
diff options
context:
space:
mode:
authorRobert Mustacchi <rm@joyent.com>2011-06-24 13:56:32 -0700
committerRobert Mustacchi <rm@joyent.com>2011-06-24 13:56:32 -0700
commitfa9a236458e9c22e1f64ab7150b1e38cd93330db (patch)
tree2c9ac47f02b5ff1fa30fb6f36b0d953aa038e65e /qemu-malloc.c
parent68396ea9c0fe4f75ce30b1eba2c44c43c13344bb (diff)
downloadillumos-kvm-cmd-fa9a236458e9c22e1f64ab7150b1e38cd93330db.tar.gz
HVM-388 Run native kvm with qemu-v0.14.x
Diffstat (limited to 'qemu-malloc.c')
-rw-r--r--qemu-malloc.c21
1 files changed, 21 insertions, 0 deletions
diff --git a/qemu-malloc.c b/qemu-malloc.c
index b9b3851..d27d595 100644
--- a/qemu-malloc.c
+++ b/qemu-malloc.c
@@ -62,9 +62,29 @@ void *qemu_realloc(void *ptr, size_t size)
return newptr;
}
+#ifdef CONFIG_SOLARIS
+void *qemu_mallocz(size_t size)
+{
+ char *ptr;
+ int i;
+ char x;
+
+ if (!size && !allow_zero_malloc()) {
+ abort();
+ }
+ ptr = qemu_oom_check(calloc(1, size ? size : 1));
+ for (i = 0; i < size; i++)
+ x = (char)*ptr+i;
+
+ trace_qemu_malloc(size, ptr);
+ return ptr;
+}
+
+#else
void *qemu_mallocz(size_t size)
{
void *ptr;
+
if (!size && !allow_zero_malloc()) {
abort();
}
@@ -72,6 +92,7 @@ void *qemu_mallocz(size_t size)
trace_qemu_malloc(size, ptr);
return ptr;
}
+#endif /* CONFIG_SOLARIS */
char *qemu_strdup(const char *str)
{