From 9ef008e5c3b1b3194ecf5e4f90d7e79ca76ff3d9 Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Thu, 12 Jan 2012 13:24:52 +0100 Subject: 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 --- python_modules/ptypes.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'python_modules') 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 -- cgit