From: Andreas Färber <afaerber@suse.de>
Date: Fri, 22 Feb 2013 20:50:10 +0000 (+0100)
Subject: cpu: Introduce cpu_class_set_vmsd()
X-Git-Tag: qemu-xen-4.4.0-rc1~6^2~910^2~8
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=ca91b15f2d2e43eba8f9a3ec5090f0a11b861ba4;p=qemu-xen.git

cpu: Introduce cpu_class_set_vmsd()

This setter avoids redefining each VMStateDescription value to
vmstate_dummy by not referencing the value for CONFIG_USER_ONLY.

Suggested-by: Juan Quintela <quintela@redhat.com>
Reviewed-by: Eduardo Habkost <ehabkost@redhat.com>
Signed-off-by: Andreas Färber <afaerber@suse.de>
---

diff --git a/include/qom/cpu.h b/include/qom/cpu.h
index 5b1b0d7ac4..90c5f4579f 100644
--- a/include/qom/cpu.h
+++ b/include/qom/cpu.h
@@ -137,6 +137,27 @@ void cpu_reset(CPUState *cpu);
  */
 ObjectClass *cpu_class_by_name(const char *typename, const char *cpu_model);
 
+/**
+ * cpu_class_set_vmsd:
+ * @cc: CPU class
+ * @value: Value to set. Unused for %CONFIG_USER_ONLY.
+ *
+ * Sets #VMStateDescription for @cc.
+ *
+ * The @value argument is intentionally discarded for the non-softmmu targets
+ * to avoid linker errors or excessive preprocessor usage. If this behavior
+ * is undesired, you should assign #CPUState.vmsd directly instead.
+ */
+#ifndef CONFIG_USER_ONLY
+static inline void cpu_class_set_vmsd(CPUClass *cc,
+                                      const struct VMStateDescription *value)
+{
+    cc->vmsd = value;
+}
+#else
+#define cpu_class_set_vmsd(cc, value) ((cc)->vmsd = NULL)
+#endif
+
 /**
  * qemu_cpu_has_work:
  * @cpu: The vCPU to check.