[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 01/29] qemu-timer: add QEMUTimer visitor
From: |
Michael Roth |
Subject: |
[Qemu-devel] [PATCH 01/29] qemu-timer: add QEMUTimer visitor |
Date: |
Thu, 1 Nov 2012 08:04:03 -0500 |
We'll use this for serializing rtc and elsewhere
Signed-off-by: Michael Roth <address@hidden>
---
Makefile | 3 ++-
qemu-timer.c | 29 +++++++++++++++++++++++++++++
qemu-timer.h | 4 ++++
3 files changed, 35 insertions(+), 1 deletion(-)
diff --git a/Makefile b/Makefile
index b575361..f2d2e70 100644
--- a/Makefile
+++ b/Makefile
@@ -172,7 +172,8 @@ qemu-img.o: qemu-img-cmds.h
tools-obj-y = $(oslib-obj-y) $(trace-obj-y) qemu-tool.o qemu-timer.o \
qemu-timer-common.o main-loop.o notify.o \
- iohandler.o cutils.o iov.o async.o error.o
+ iohandler.o cutils.o iov.o async.o error.o \
+ $(qapi-obj-y) $(qobject-obj-y)
tools-obj-$(CONFIG_POSIX) += compatfd.o
qemu-img$(EXESUF): qemu-img.o $(tools-obj-y) $(block-obj-y)
diff --git a/qemu-timer.c b/qemu-timer.c
index ede84ff..ef2ec6a 100644
--- a/qemu-timer.c
+++ b/qemu-timer.c
@@ -30,6 +30,7 @@
#include "hw/hw.h"
#include "qemu-timer.h"
+#include "qapi/qapi-visit-core.h"
#ifdef _WIN32
#include <mmsystem.h>
@@ -61,6 +62,34 @@ struct QEMUTimer {
int scale;
};
+void visit_type_QEMUTimer(Visitor *v, QEMUTimer **obj, const char *name,
+ Error **errp)
+{
+ int64_t expire_time, expire_time_cpy;
+
+ if (error_is_set(errp)) {
+ return;
+ }
+ if (!obj || !*obj) {
+ error_set(errp, QERR_INVALID_PARAMETER_VALUE, name ? name : NULL,
+ "non-NULL QEMUTimer");
+ return;
+ }
+ expire_time = expire_time_cpy = qemu_timer_expire_time_ns(*obj);
+ visit_start_struct(v, NULL, "QEMUTimer", name, 0, errp);
+ visit_type_int64(v, &expire_time, "expire_time", errp);
+ visit_end_struct(v, errp);
+
+ /* if we're modifying a QEMUTimer, re-arm/delete accordingly */
+ if (expire_time != expire_time_cpy) {
+ if (expire_time != -1) {
+ qemu_mod_timer_ns(*obj, expire_time);
+ } else {
+ qemu_del_timer(*obj);
+ }
+ }
+}
+
struct qemu_alarm_timer {
char const *name;
int (*start)(struct qemu_alarm_timer *t);
diff --git a/qemu-timer.h b/qemu-timer.h
index da7e97c..3d3d9d6 100644
--- a/qemu-timer.h
+++ b/qemu-timer.h
@@ -4,6 +4,7 @@
#include "qemu-common.h"
#include "main-loop.h"
#include "notify.h"
+#include "qapi/qapi-visit-core.h"
#ifdef __FreeBSD__
#include <sys/param.h>
@@ -67,6 +68,9 @@ int64_t cpu_get_ticks(void);
void cpu_enable_ticks(void);
void cpu_disable_ticks(void);
+void visit_type_QEMUTimer(Visitor *v, QEMUTimer **obj, const char *name,
+ Error **errp);
+
static inline QEMUTimer *qemu_new_timer_ns(QEMUClock *clock, QEMUTimerCB *cb,
void *opaque)
{
--
1.7.9.5
- [Qemu-devel] [PATCH 00/29] QIDL: First Batch of Device Conversions, Michael Roth, 2012/11/01
- [Qemu-devel] [PATCH 01/29] qemu-timer: add QEMUTimer visitor,
Michael Roth <=
- [Qemu-devel] [PATCH 02/29] qidl: qidl.h, mark common immutable types as q_immutable by default, Michael Roth, 2012/11/01
- [Qemu-devel] [PATCH 04/29] rtc: qidl_declare RTCState, Michael Roth, 2012/11/01
- [Qemu-devel] [PATCH 06/29] rtc: add qom property for RTCState state, Michael Roth, 2012/11/01
- [Qemu-devel] [PATCH 10/29] vga: qidl_declare VGACommonState, Michael Roth, 2012/11/01
- [Qemu-devel] [PATCH 13/29] cirrus: qidl_declare ISACirrusVGAState, Michael Roth, 2012/11/01
- [Qemu-devel] [PATCH 15/29] i440fx: qidl_declare PCII440FXState, Michael Roth, 2012/11/01
- [Qemu-devel] [PATCH 14/29] cirrus: add qom property for isa-cirrus-vga, Michael Roth, 2012/11/01
- [Qemu-devel] [PATCH 29/29] hpet: add qom property for hpet state, Michael Roth, 2012/11/01
- [Qemu-devel] [PATCH 27/29] ide: add qom property for piix3/piix4-ide state, Michael Roth, 2012/11/01
- [Qemu-devel] [PATCH 22/29] pci_bridge_dev: add qom property for pci-bridge state, Michael Roth, 2012/11/01