From: Jan Kiszka <jan.kiszka@xxxxxxxxxxx>
This reverts commit e4d6d49061b45e7134437cdd5bae2d443eedc3bc.
It's no longer used.
Conflicts:
savevm.c
Signed-off-by: Jan Kiszka <jan.kiszka@xxxxxxxxxxx>
---
hw/hw.h | 13 -------------
savevm.c | 23 -----------------------
2 files changed, 0 insertions(+), 36 deletions(-)
diff --git a/hw/hw.h b/hw/hw.h
index 2ca601d..56447a7 100644
--- a/hw/hw.h
+++ b/hw/hw.h
@@ -353,10 +353,6 @@ extern const VMStateInfo vmstate_info_uint16;
extern const VMStateInfo vmstate_info_uint32;
extern const VMStateInfo vmstate_info_uint64;
-#ifdef __linux__
-extern const VMStateInfo vmstate_info_u64;
-#endif
-
extern const VMStateInfo vmstate_info_timer;
extern const VMStateInfo vmstate_info_ptimer;
extern const VMStateInfo vmstate_info_buffer;
@@ -766,15 +762,6 @@ extern const VMStateDescription vmstate_ptimer;
#define VMSTATE_UINT64(_f, _s) \
VMSTATE_UINT64_V(_f, _s, 0)
-/* This is needed because on linux __u64 is unsigned long long
- and on glibc uint64_t is unsigned long on 64 bits */
-#ifdef __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)
-#endif
-
#define VMSTATE_UINT8_EQUAL(_f, _s) \
VMSTATE_SINGLE(_f, _s, 0, vmstate_info_uint8_equal, uint8_t)
diff --git a/savevm.c b/savevm.c
index e26bf6e..f4ff1a1 100644
--- a/savevm.c
+++ b/savevm.c
@@ -925,29 +925,6 @@ const VMStateInfo vmstate_info_uint64 = {
.put = put_uint64,
};
-/* 64 bit linux kernel unsigned int */
-
-#ifdef __linux__
-static int get_u64(QEMUFile *f, void *pv, size_t size)
-{
- uint64_t *v = pv;
- qemu_get_be64s(f, v);
- return 0;
-}
-
-static void put_u64(QEMUFile *f, void *pv, size_t size)
-{
- uint64_t *v = pv;
- qemu_put_be64s(f, v);
-}
-
-const VMStateInfo vmstate_info_u64 = {
- .name = "__u64",
- .get = get_u64,
- .put = put_u64,
-};
-#endif /* __linux__ */
-
/* 8 bit int. See that the received value is the same than the one
in the field */
--
1.7.1
--
To unsubscribe from this list: send the line "unsubscribe kvm" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
