Merge remote branch 'kraxel/spice.v14' into spice.kvm.v14spice.kvm.v14.spicevmc

Conflicts:
	Makefile.target
	configure
	hw/pc.c
	monitor.c
	pc-bios/vgabios-cirrus.bin
	pc-bios/vgabios.bin

1 files changed, 5 insertions, 0 deletions

diff --git a/osdep.c b/osdep.c
index 2375a69df..ed2fd400f 100644
--- a/osdep.c
+++ b/osdep.c
@@ -100,7 +100,12 @@ void *qemu_memalign(size_t alignment, size_t size)
 #if defined(_POSIX_C_SOURCE) && !defined(__sun__)
     int ret;
     void *ptr;
+#if 0
     ret = posix_memalign(&ptr, alignment, size);
+#else
+    ptr = memalign(alignment, size);
+    ret = (ptr == NULL) ? -1 : 0;
+#endif
     if (ret != 0) {
         fprintf(stderr, "Failed to allocate %zu B: %s\n",
                 size, strerror(ret));