qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Michael Roth <mdroth@linux.vnet.ibm.com>
To: qemu-devel@nongnu.org
Cc: aliguori@us.ibm.com, quintela@redhat.com, owasserm@redhat.com,
	yamahata@valinux.co.jp, pbonzini@redhat.com, akong@redhat.com,
	afaerber@suse.de
Subject: [Qemu-devel] [PATCH 14/17] qidl: add qidl-based generation of vmstate field bindings
Date: Mon,  4 Jun 2012 20:00:15 -0500	[thread overview]
Message-ID: <1338858018-17189-15-git-send-email-mdroth@linux.vnet.ibm.com> (raw)
In-Reply-To: <1338858018-17189-1-git-send-email-mdroth@linux.vnet.ibm.com>

Add support for generating VMState field bindings/descriptions based on
QIDL annotations. Use a look-up table with hard-coded fields for cases where
we can't rely infer it from QIDL. These hard-coded fields will be quite
numerous, but the majority of fields should be coverable, and as such will
allow for automatic detection of migration changes for a broad swath of
device state.

And we almost get these for free from the serialization annotations so why
not.

Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
---
 scripts/qc.py |  107 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 106 insertions(+), 1 deletions(-)

diff --git a/scripts/qc.py b/scripts/qc.py
index 74f2a40..0f3942c 100755
--- a/scripts/qc.py
+++ b/scripts/qc.py
@@ -2,6 +2,7 @@
 
 import sys
 from ordereddict import OrderedDict
+from qapi import *
 
 marker = "qc_declaration"
 marked = False
@@ -468,6 +469,107 @@ def qapi_schema(node):
     schema['data'] = data
     print json.dumps(schema).replace("\"", "'")
 
+def vmstate_field_hacks(node, field):
+    # yes, this is gonna get hairy. may want to move to a seperate file at
+    # some point
+    push_indent()
+    vms_field=""
+    if node.has_key('typedef') and node['typedef'] == 'RTCState':
+        if field['type'] == 'struct tm':
+            vms_field += mcgen('''
+VMSTATE_INT32(%(variable)s.tm_sec, RTCState),
+VMSTATE_INT32(%(variable)s.tm_min, RTCState),
+VMSTATE_INT32(%(variable)s.tm_hour, RTCState),
+VMSTATE_INT32(%(variable)s.tm_wday, RTCState),
+VMSTATE_INT32(%(variable)s.tm_mday, RTCState),
+VMSTATE_INT32(%(variable)s.tm_mon, RTCState),
+VMSTATE_INT32(%(variable)s.tm_year, RTCState),
+''',
+                               variable=field['variable']).rstrip()
+    pop_indent()
+    return vms_field
+
+def vmstate_fields(node):
+    fields = None
+    state_type = ""
+    vms_primitives = ['INT8', 'INT16', 'INT32', 'INT64', 'UINT8', 'UINT16',
+                      'UINT32', 'UINT64', 'BOOL', 'TIMER']
+    if node.has_key('typedef'):
+        fields = node['type']['fields']
+        state_type = node['typedef']
+    elif node.has_key('struct'):
+        fields = node['fields']
+        state_type = node['struct']
+    else:
+        raise Exception("top-level neither typedef nor struct")
+
+    print mcgen('''
+VMStateField vmstate_%s[] = {
+''' % state_type.lower()).rstrip()
+
+    for field in fields:
+        if field.has_key('is_derived') or field.has_key('is_immutable') or field.has_key('is_broken'):
+            continue
+
+        vms_field_hack = vmstate_field_hacks(node, field)
+        if vms_field_hack:
+            print vms_field_hack
+            continue
+
+        vms_field = "VMSTATE"
+
+        if field['type'].endswith('_t'):
+            vms_type = field['type'][:-2].upper()
+        elif field['type'] == 'int':
+            vms_type = 'INT32'
+        elif field['type'] == 'bool':
+            vms_type = 'BOOL'
+        elif field['type'] == 'QEMUTimer':
+            vms_type = 'TIMER'
+        else:
+            raise Exception("unable to process field:\n%s\nfrom node:\n%s" % (field, node))
+
+        if field.has_key('is_array'):
+            if field.has_key('array_capacity'):
+                vms_field += '_VARRAY'
+            else:
+                if vms_type == 'UINT8':
+                    vms_field += '_BUFFER'
+                else:
+                    vms_field += '_ARRAY'
+
+        if not vms_field.endswith("_BUFFER"):
+            vms_field += "_" + vms_type
+
+        if field.has_key('version'):
+            vms_field += "_V"
+        else:
+            field['version'] = "0"
+
+        if vms_field in map(lambda x: "VMSTATE_" + x, vms_primitives):
+            vms_field += "(%s, %s)," % (field['variable'], state_type)
+        elif vms_field in map(lambda x: "VMSTATE_" + x + "_V", vms_primitives):
+            vms_field += "(%s, %s, %s)," % (field['variable'], state_type,
+                                            field['version'])
+        elif vms_field == 'VMSTATE_BUFFER':
+            vms_field += "(%s, %s)," % (field['variable'], state_type)
+        elif vms_field in map(lambda x: "VMSTATE_VARRAY_" + x, vms_primitives):
+            args = ", ".join([field['variable'], state_type,
+                             field['array_size'], field['version'],
+                             "vmstate_info_" + field['type'].strip("_t"),
+                             field['type']])
+            vms_field += "(%s)," % args
+        else:
+            raise Exception("unable to process field:\n%s\nfrom node:\n%s" % (field, node))
+
+        push_indent()
+        print cgen(vms_field).rstrip()
+        pop_indent()
+
+    print mcgen('''
+    VMSTATE_END_OF_LIST()
+};
+''',).rstrip()
 
 if __name__ == '__main__':
     la = LookAhead(skip(lexer(Input(sys.stdin))))
@@ -491,4 +593,7 @@ if __name__ == '__main__':
         #qapi_format(node, True)
         #qapi_format(node, False)
         #type_dump(node)
-        qapi_schema(node)
+        if '--vmstate' in sys.argv[1:]:
+            vmstate_fields(node)
+        else:
+            qapi_schema(node)
-- 
1.7.4.1

  parent reply	other threads:[~2012-06-05  1:01 UTC|newest]

Thread overview: 81+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-06-05  1:00 [Qemu-devel] [RFC] Use QEMU IDL for device serialization/vmstate Michael Roth
2012-06-05  1:00 ` [Qemu-devel] [PATCH 01/17] qidl: add QEMU IDL processor Michael Roth
2012-06-05  1:57   ` Anthony Liguori
2012-06-05  9:25   ` Kevin Wolf
2012-06-05  9:47     ` Anthony Liguori
2012-06-05 10:11       ` Kevin Wolf
2012-06-05 16:21     ` Michael Roth
2012-06-05 19:56       ` Paolo Bonzini
2012-06-05 23:40         ` Anthony Liguori
2012-06-06  5:12           ` Paolo Bonzini
2012-06-06  5:43             ` Anthony Liguori
2012-06-06  7:30       ` Kevin Wolf
2012-06-05 10:00   ` Peter Maydell
2012-06-05 10:10     ` Anthony Liguori
2012-06-11  7:13     ` Andreas Färber
2012-06-11  7:20       ` Paolo Bonzini
2012-06-11  7:56         ` Andreas Färber
2012-06-11  7:59           ` Paolo Bonzini
2012-06-11  9:02             ` Andreas Färber
2012-06-11  8:04           ` Andreas Färber
2012-06-11 13:12         ` Anthony Liguori
2012-06-11 13:37           ` Peter Maydell
2012-06-11 13:09       ` Peter Maydell
2012-06-05 10:06   ` Avi Kivity
2012-06-05 12:19     ` Gerd Hoffmann
2012-06-05 23:41       ` Anthony Liguori
2012-06-06  7:19       ` Avi Kivity
2012-06-05 21:11     ` Michael Roth
2012-06-06  7:31       ` Avi Kivity
2012-06-06 21:36         ` Michael Roth
2012-06-07  7:08           ` Avi Kivity
2012-06-05 23:51     ` Anthony Liguori
2012-06-06  1:25       ` Peter Maydell
2012-06-06  7:45       ` Avi Kivity
2012-06-06  8:27         ` Anthony Liguori
2012-06-06  8:37           ` Avi Kivity
2012-06-06  8:45             ` Anthony Liguori
2012-06-06  8:59               ` Avi Kivity
2012-06-06  9:17                 ` Anthony Liguori
2012-06-06  9:58                   ` Avi Kivity
2012-06-06 11:12                     ` Anthony Liguori
2012-06-06 11:25                       ` Avi Kivity
2012-06-06 23:20     ` Anthony Liguori
2012-06-05  1:00 ` [Qemu-devel] [PATCH 02/17] qidl: add qc definitions Michael Roth
2012-06-05  9:25   ` Kevin Wolf
2012-06-05 10:35   ` Jan Kiszka
2012-06-05 11:12     ` Anthony Liguori
2012-06-05 11:26       ` Jan Kiszka
2012-06-05 11:42         ` Kevin Wolf
2012-06-05 14:08   ` Paolo Bonzini
2012-06-05 21:44     ` Michael Roth
2012-06-05 23:35       ` Anthony Liguori
2012-06-05  1:00 ` [Qemu-devel] [PATCH 03/17] qapi: add visitor interfaces for arrays Michael Roth
2012-06-05  1:00 ` [Qemu-devel] [PATCH 04/17] qapi: QmpOutputVisitor, implement array handling Michael Roth
2012-06-05  1:00 ` [Qemu-devel] [PATCH 05/17] qapi: qapi-visit.py, support arrays and complex qapi definitions Michael Roth
2012-06-05  1:00 ` [Qemu-devel] [PATCH 06/17] qapi: qapi-visit.py, add gen support for existing types Michael Roth
2012-06-05  1:00 ` [Qemu-devel] [PATCH 07/17] qapi: add open-coded visitors for QEMUTimer/struct tm types Michael Roth
2012-06-05  1:00 ` [Qemu-devel] [PATCH 08/17] rtc: move RTCState declaration to header Michael Roth
2012-06-05  1:00 ` [Qemu-devel] [PATCH 09/17] rtc: add qc annotations Michael Roth
2012-06-05 10:25   ` Avi Kivity
2012-06-05 10:40     ` Jan Kiszka
2012-06-05 12:42       ` Avi Kivity
2012-06-05 22:07         ` Michael Roth
2012-06-05  1:00 ` [Qemu-devel] [PATCH 10/17] Makefile: add infrastructure to incorporate qidl-generated files Michael Roth
2012-06-05  1:00 ` [Qemu-devel] [PATCH 11/17] qapi: add qidl-generated qapi schema for rtc Michael Roth
2012-06-05  9:29   ` Kevin Wolf
2012-06-05 16:03     ` Michael Roth
2012-06-06  7:38       ` Kevin Wolf
2012-06-06 22:40         ` Michael Roth
2012-06-05 10:11   ` Avi Kivity
2012-06-05  1:00 ` [Qemu-devel] [PATCH 12/17] rtc: add a QOM property for accessing device state Michael Roth
2012-06-05 14:14   ` Paolo Bonzini
2012-06-05 17:54     ` Michael Roth
2012-06-05  1:00 ` [Qemu-devel] [PATCH 13/17] rtc: add _version() qidl annotations Michael Roth
2012-06-05  1:00 ` Michael Roth [this message]
2012-06-05  1:00 ` [Qemu-devel] [PATCH 15/17] Makefile: add qidl-generation of vmstate field descriptions Michael Roth
2012-06-05  1:00 ` [Qemu-devel] [PATCH 16/17] qidl: add qidl-generated vmstate fields for rtc Michael Roth
2012-06-05 10:26   ` Avi Kivity
2012-06-05 23:38     ` Anthony Liguori
2012-06-06  7:47       ` Avi Kivity
2012-06-05  1:00 ` [Qemu-devel] [PATCH 17/17] rtc: use qidl-generated vmstate bindings Michael Roth

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1338858018-17189-15-git-send-email-mdroth@linux.vnet.ibm.com \
    --to=mdroth@linux.vnet.ibm.com \
    --cc=afaerber@suse.de \
    --cc=akong@redhat.com \
    --cc=aliguori@us.ibm.com \
    --cc=owasserm@redhat.com \
    --cc=pbonzini@redhat.com \
    --cc=qemu-devel@nongnu.org \
    --cc=quintela@redhat.com \
    --cc=yamahata@valinux.co.jp \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).