From: Ed Maste <emaste@freebsd.org>
Date: Thu, 25 Apr 2013 17:59:41 +0000 (-0400)
Subject: bsd-user: Track change in FreeBSD SYSCTL(9) types
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=6ea8430d98c48eb67e47d14dfe8c0fdb86413555;p=qemu.git

bsd-user: Track change in FreeBSD SYSCTL(9) types

Originally from Garrett Cooper in FreeBSD PR ports/155558
http://www.freebsd.org/cgi/query-pr.cgi?pr=155558

Signed-off-by: Ed Maste <emaste@freebsd.org>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
---

diff --git a/bsd-user/syscall.c b/bsd-user/syscall.c
index 18b43f1a2a..69e3466a08 100644
--- a/bsd-user/syscall.c
+++ b/bsd-user/syscall.c
@@ -211,7 +211,11 @@ static int sysctl_oldcvt(void *holdp, size_t holdlen, uint32_t kind)
         *(uint64_t *)holdp = tswap64(*(unsigned long *)holdp);
         break;
 #endif
+#if !defined(__FreeBSD_version) || __FreeBSD_version < 900031
     case CTLTYPE_QUAD:
+#else
+    case CTLTYPE_U64:
+#endif
         *(uint64_t *)holdp = tswap64(*(uint64_t *)holdp);
         break;
     case CTLTYPE_STRING: