summaryrefslogtreecommitdiff
path: root/hw/hw.h
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 /hw/hw.h
parent68396ea9c0fe4f75ce30b1eba2c44c43c13344bb (diff)
downloadillumos-kvm-cmd-fa9a236458e9c22e1f64ab7150b1e38cd93330db.tar.gz
HVM-388 Run native kvm with qemu-v0.14.x
Diffstat (limited to 'hw/hw.h')
-rw-r--r--hw/hw.h9
1 files changed, 7 insertions, 2 deletions
diff --git a/hw/hw.h b/hw/hw.h
index 6d3d106..a412c18 100644
--- a/hw/hw.h
+++ b/hw/hw.h
@@ -350,7 +350,7 @@ extern const VMStateInfo vmstate_info_uint16;
extern const VMStateInfo vmstate_info_uint32;
extern const VMStateInfo vmstate_info_uint64;
-#ifdef __linux__
+#if defined(__linux__) || defined(__sun__)
extern const VMStateInfo vmstate_info_u64;
#endif
@@ -673,11 +673,16 @@ extern const VMStateDescription vmstate_usb_device;
/* This is needed because on linux __u64 is unsigned long long
and on glibc uint64_t is unsigned long on 64 bits */
-#ifdef __linux__
+#if defined(__linux__)
#define VMSTATE_U64_V(_f, _s, _v) \
VMSTATE_SINGLE(_f, _s, _v, vmstate_info_u64, __u64)
#define VMSTATE_U64(_f, _s) \
VMSTATE_U64_V(_f, _s, 0)
+#else
+#define VMSTATE_U64_V(_f, _s, _v) \
+ VMSTATE_SINGLE(_f, _s, _v, vmstate_info_uint64, uint64_t)
+#define VMSTATE_U64(_f, _s) \
+ VMSTATE_U64_V(_f, _s, 0)
#endif
#define VMSTATE_UINT8_EQUAL(_f, _s) \