diff options
| author | Hans de Goede <hdegoede@redhat.com> | 2012-01-12 13:24:52 +0100 |
|---|---|---|
| committer | Marc-André Lureau <marcandre.lureau@gmail.com> | 2012-03-20 15:25:54 +0100 |
| commit | cdb54a8fa557edb5a61119d372722028389e6143 (patch) | |
| tree | 03e979b49464336d6af6d3304baeac8a1077ef19 /python_modules/ptypes.py | |
| parent | f74d9176a72ea758fc35ea34803c7041cf3e3ddc (diff) | |
| download | spice-protocol-cdb54a8fa557edb5a61119d372722028389e6143.tar.gz spice-protocol-cdb54a8fa557edb5a61119d372722028389e6143.tar.xz spice-protocol-cdb54a8fa557edb5a61119d372722028389e6143.zip | |
codegen: Fix enums.h generation
With the new usbredir code we have the new concept of the abstract /
generic spicevmc channel type (which just tunnels data from a qemu chardev),
and we've the usbredir channel, which is the only current user of this.
This was reflected in the protocols enum in spice-protocol.h by a manual
edit done by me, my bad. This patch teaches spice.proto about the relation
between the abstract spicevmc channel and the usbredir channel and
modifies codegen to deal with this.
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Diffstat (limited to 'python_modules/ptypes.py')
| -rw-r--r-- | python_modules/ptypes.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/python_modules/ptypes.py b/python_modules/ptypes.py index f12a2f3..4585949 100644 --- a/python_modules/ptypes.py +++ b/python_modules/ptypes.py @@ -947,6 +947,9 @@ class ChannelType(Type): server_messages_byname = self.base.server_messages_byname.copy() client_messages = self.base.client_messages[:] client_messages_byname = self.base.client_messages_byname.copy() + + # Set default member_name, FooChannel -> foo + self.member_name = self.name[:-7].lower() else: server_messages = [] server_messages_byname = {} @@ -998,7 +1001,6 @@ class ProtocolMember: def resolve(self, protocol): self.channel_type = self.channel_type.resolve() - assert(self.channel_type.member_name == None) self.channel_type.member_name = self.name return self |