diff options
author | Daniel P. Berrange <berrange@redhat.com> | 2013-11-22 14:09:55 +0000 |
---|---|---|
committer | Daniel P. Berrange <berrange@redhat.com> | 2013-11-22 14:45:49 +0000 |
commit | 3b564fae6950ca2e2f6d1b7db75d8706b2ee0d3e (patch) | |
tree | e54662d3c5278e1f3014bbefcef1db0dea96efea | |
parent | b50580e891264130338a79cf3ef6217807f172cd (diff) | |
download | libvirt-python-v8-master.tar.gz libvirt-python-v8-master.tar.xz libvirt-python-v8-master.zip |
Entries in the -overrides.xml files should only be recorded
if the API also exists in the main API XML file.
Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
-rwxr-xr-x | generator.py | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/generator.py b/generator.py index 1d8f8f3..ea5b8a1 100755 --- a/generator.py +++ b/generator.py @@ -27,6 +27,7 @@ import os import xml.sax debug = 0 +onlyOverrides = False def getparser(): # Attach parser to an unmarshalling object. return both objects. @@ -183,12 +184,18 @@ class docParser(xml.sax.handler.ContentHandler): def function(name, desc, ret, args, file, module, cond): + if onlyOverrides and name not in functions: + return functions[name] = (desc, ret, args, file, module, cond) def qemu_function(name, desc, ret, args, file, module, cond): + if onlyOverrides and name not in qemu_functions: + return qemu_functions[name] = (desc, ret, args, file, module, cond) def lxc_function(name, desc, ret, args, file, module, cond): + if onlyOverrides and name not in lxc_functions: + return lxc_functions[name] = (desc, ret, args, file, module, cond) def enum(type, name, value): @@ -213,16 +220,22 @@ def enum(type, name, value): elif value == 'VIR_DOMAIN_AFFECT_CONFIG': value = 2 if name[-5:] != '_LAST': + if onlyOverrides and name not in enums[type]: + return enums[type][name] = value def lxc_enum(type, name, value): if not lxc_enums.has_key(type): lxc_enums[type] = {} + if onlyOverrides and name not in lxc_enums[type]: + return lxc_enums[type][name] = value def qemu_enum(type, name, value): if not qemu_enums.has_key(type): qemu_enums[type] = {} + if onlyOverrides and name not in qemu_enums[type]: + return qemu_enums[type][name] = value @@ -791,6 +804,7 @@ def buildStubs(module, api_xml): f = open(api_xml) data = f.read() f.close() + onlyOverrides = False (parser, target) = getparser() parser.feed(data) parser.close() @@ -809,6 +823,7 @@ def buildStubs(module, api_xml): f = open(override_api_xml) data = f.read() f.close() + onlyOverrides = True (parser, target) = getparser() parser.feed(data) parser.close() |