Re: [Spice-devel] [PATCH spice-common 6/9] Generate automatically most C message declarations
>
> Acked-by: Christophe Fergeau
>
> only one caveat is that some of the structs are getting renamed to
> equivalent ones (SpiceMsgDisplayDrawBlend/SpiceMsgDisplayDrawCopy,
> SpiceMsgcMainAgentStart/SpiceMsgcMainAgentTokens and a few more), which
> is fine because they are typedef'ed to the other type anyway
> I guess it's worth mentioned in the commit log.
>
Original code did something similar, like
typedef struct SpiceMsgMainAgentTokens {
uint32_t num_tokens;
} SpiceMsgMainAgentTokens, SpiceMsgcMainAgentTokens, SpiceMsgcMainAgentStart;
just now is more evident because all the typedefs are in the same place.
> Reviewed-by: Christophe Fergeau
>
> Christophe
>
... omissis ...
Frediano
___
Spice-devel mailing list
Spice-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/spice-devel
Re: [Spice-devel] [PATCH spice-common 6/9] Generate automatically most C message declarations
Acked-by: Christophe Fergeau
only one caveat is that some of the structs are getting renamed to
equivalent ones (SpiceMsgDisplayDrawBlend/SpiceMsgDisplayDrawCopy,
SpiceMsgcMainAgentStart/SpiceMsgcMainAgentTokens and a few more), which
is fine because they are typedef'ed to the other type anyway
I guess it's worth mentioned in the commit log.
Reviewed-by: Christophe Fergeau
Christophe
On Sun, Mar 03, 2019 at 07:10:27PM +, Frediano Ziglio wrote:
> Signed-off-by: Frediano Ziglio
> ---
> common/messages.h | 495 +-
> spice.proto | 192 +-
> 2 files changed, 102 insertions(+), 585 deletions(-)
>
> diff --git a/common/messages.h b/common/messages.h
> index 36ee59d..5cda1d1 100644
> --- a/common/messages.h
> +++ b/common/messages.h
> @@ -42,10 +42,6 @@
>
> SPICE_BEGIN_DECLS
>
> -typedef struct SpiceMsgData {
> -uint8_t data[0];
> -} SpiceMsgData;
> -
> typedef struct SpiceMsgCompressedData {
> uint8_t type;
> uint32_t uncompressed_size;
> @@ -53,438 +49,8 @@ typedef struct SpiceMsgCompressedData {
> uint8_t *compressed_data;
> } SpiceMsgCompressedData;
>
> -typedef struct SpiceMsgEmpty {
> -uint8_t padding;
> -} SpiceMsgEmpty;
> -
> -typedef struct SpiceMsgInputsInit {
> -uint32_t keyboard_modifiers;
> -} SpiceMsgInputsInit;
> -
> -typedef struct SpiceMsgInputsKeyModifiers {
> -uint32_t modifiers;
> -} SpiceMsgInputsKeyModifiers;
> -
> -typedef struct SpiceMsgMainMultiMediaTime {
> -uint32_t time;
> -} SpiceMsgMainMultiMediaTime;
> -
> -typedef struct SpiceMigrationDstInfo {
> -uint16_t port;
> -uint16_t sport;
> -uint32_t host_size;
> -uint8_t *host_data;
> -uint32_t cert_subject_size;
> -uint8_t *cert_subject_data;
> -} SpiceMigrationDstInfo;
> -
> -typedef struct SpiceMsgMainMigrationBegin {
> -SpiceMigrationDstInfo dst_info;
> -} SpiceMsgMainMigrationBegin;
> -
> -typedef struct SpiceMsgMainMigrateBeginSeamless {
> -SpiceMigrationDstInfo dst_info;
> -uint32_t src_mig_version;
> -} SpiceMsgMainMigrateBeginSeamless;
> -
> -typedef struct SpiceMsgcMainMigrateDstDoSeamless {
> -uint32_t src_version;
> -} SpiceMsgcMainMigrateDstDoSeamless;
> -
> -typedef struct SpiceMsgMainMigrationSwitchHost {
> -uint16_t port;
> -uint16_t sport;
> -uint32_t host_size;
> -uint8_t *host_data;
> -uint32_t cert_subject_size;
> -uint8_t *cert_subject_data;
> -} SpiceMsgMainMigrationSwitchHost;
> -
> -
> -typedef struct SpiceMsgMigrate {
> -uint32_t flags;
> -} SpiceMsgMigrate;
> -
> -typedef struct SpiceResourceID {
> -uint8_t type;
> -uint64_t id;
> -} SpiceResourceID;
> -
> -typedef struct SpiceResourceList {
> -uint16_t count;
> -SpiceResourceID resources[0];
> -} SpiceResourceList;
> -
> -typedef struct SpiceMsgSetAck {
> -uint32_t generation;
> -uint32_t window;
> -} SpiceMsgSetAck;
> -
> -typedef struct SpiceMsgcAckSync {
> - uint32_t generation;
> -} SpiceMsgcAckSync;
> -
> -typedef struct SpiceWaitForChannel {
> -uint8_t channel_type;
> -uint8_t channel_id;
> -uint64_t message_serial;
> -} SpiceWaitForChannel;
> -
> -typedef struct SpiceMsgWaitForChannels {
> -uint8_t wait_count;
> -SpiceWaitForChannel wait_list[0];
> -} SpiceMsgWaitForChannels;
> -
> -typedef struct SpiceChannelId {
> -uint8_t type;
> -uint8_t id;
> -} SpiceChannelId;
> -
> -typedef struct SpiceMsgMainInit {
> -uint32_t session_id;
> -uint32_t display_channels_hint;
> -uint32_t supported_mouse_modes;
> -uint32_t current_mouse_mode;
> -uint32_t agent_connected;
> -uint32_t agent_tokens;
> -uint32_t multi_media_time;
> -uint32_t ram_hint;
> -} SpiceMsgMainInit;
> -
> -typedef struct SpiceMsgDisconnect {
> -uint64_t time_stamp;
> -uint32_t reason; // SPICE_ERR_?
> -} SpiceMsgDisconnect;
> -
> -typedef struct SpiceMsgNotify {
> -uint64_t time_stamp;
> -uint32_t severity;
> -uint32_t visibilty;
> -uint32_t what;
> -uint32_t message_len;
> -uint8_t message[0];
> -} SpiceMsgNotify;
> -
> -typedef struct SpiceMsgChannels {
> -uint32_t num_of_channels;
> -SpiceChannelId channels[0];
> -} SpiceMsgChannels;
> -
> -typedef struct SpiceMsgMainName {
> -uint32_t name_len;
> -uint8_t name[0];
> -} SpiceMsgMainName;
> -
> -typedef struct SpiceMsgMainUuid {
> -uint8_t uuid[16];
> -} SpiceMsgMainUuid;
> -
> -typedef struct SpiceMsgMainMouseMode {
> -uint32_t supported_modes;
> -uint32_t current_mode;
> -} SpiceMsgMainMouseMode;
> -
> -typedef struct SpiceMsgPing {
> -uint32_t id;
> -uint64_t timestamp;
> -void *data;
> -uint32_t data_len;
> -} SpiceMsgPing;
> -
> -typedef struct SpiceMsgMainAgentDisconnect {
> -uint32_t error_code; // SPICE_ERR_?
> -} SpiceMsgMainAgentDisconnect;
> -
> #define SPICE_AGENT_MAX_DATA_SIZE 2048
>
> -typedef struct SpiceMsgMainAgentTokens {
> -uint32_t num_tokens;
> -}
[Spice-devel] [PATCH spice-common 6/9] Generate automatically most C message declarations
Signed-off-by: Frediano Ziglio
---
common/messages.h | 495 +-
spice.proto | 192 +-
2 files changed, 102 insertions(+), 585 deletions(-)
diff --git a/common/messages.h b/common/messages.h
index 36ee59d..5cda1d1 100644
--- a/common/messages.h
+++ b/common/messages.h
@@ -42,10 +42,6 @@
SPICE_BEGIN_DECLS
-typedef struct SpiceMsgData {
-uint8_t data[0];
-} SpiceMsgData;
-
typedef struct SpiceMsgCompressedData {
uint8_t type;
uint32_t uncompressed_size;
@@ -53,438 +49,8 @@ typedef struct SpiceMsgCompressedData {
uint8_t *compressed_data;
} SpiceMsgCompressedData;
-typedef struct SpiceMsgEmpty {
-uint8_t padding;
-} SpiceMsgEmpty;
-
-typedef struct SpiceMsgInputsInit {
-uint32_t keyboard_modifiers;
-} SpiceMsgInputsInit;
-
-typedef struct SpiceMsgInputsKeyModifiers {
-uint32_t modifiers;
-} SpiceMsgInputsKeyModifiers;
-
-typedef struct SpiceMsgMainMultiMediaTime {
-uint32_t time;
-} SpiceMsgMainMultiMediaTime;
-
-typedef struct SpiceMigrationDstInfo {
-uint16_t port;
-uint16_t sport;
-uint32_t host_size;
-uint8_t *host_data;
-uint32_t cert_subject_size;
-uint8_t *cert_subject_data;
-} SpiceMigrationDstInfo;
-
-typedef struct SpiceMsgMainMigrationBegin {
-SpiceMigrationDstInfo dst_info;
-} SpiceMsgMainMigrationBegin;
-
-typedef struct SpiceMsgMainMigrateBeginSeamless {
-SpiceMigrationDstInfo dst_info;
-uint32_t src_mig_version;
-} SpiceMsgMainMigrateBeginSeamless;
-
-typedef struct SpiceMsgcMainMigrateDstDoSeamless {
-uint32_t src_version;
-} SpiceMsgcMainMigrateDstDoSeamless;
-
-typedef struct SpiceMsgMainMigrationSwitchHost {
-uint16_t port;
-uint16_t sport;
-uint32_t host_size;
-uint8_t *host_data;
-uint32_t cert_subject_size;
-uint8_t *cert_subject_data;
-} SpiceMsgMainMigrationSwitchHost;
-
-
-typedef struct SpiceMsgMigrate {
-uint32_t flags;
-} SpiceMsgMigrate;
-
-typedef struct SpiceResourceID {
-uint8_t type;
-uint64_t id;
-} SpiceResourceID;
-
-typedef struct SpiceResourceList {
-uint16_t count;
-SpiceResourceID resources[0];
-} SpiceResourceList;
-
-typedef struct SpiceMsgSetAck {
-uint32_t generation;
-uint32_t window;
-} SpiceMsgSetAck;
-
-typedef struct SpiceMsgcAckSync {
- uint32_t generation;
-} SpiceMsgcAckSync;
-
-typedef struct SpiceWaitForChannel {
-uint8_t channel_type;
-uint8_t channel_id;
-uint64_t message_serial;
-} SpiceWaitForChannel;
-
-typedef struct SpiceMsgWaitForChannels {
-uint8_t wait_count;
-SpiceWaitForChannel wait_list[0];
-} SpiceMsgWaitForChannels;
-
-typedef struct SpiceChannelId {
-uint8_t type;
-uint8_t id;
-} SpiceChannelId;
-
-typedef struct SpiceMsgMainInit {
-uint32_t session_id;
-uint32_t display_channels_hint;
-uint32_t supported_mouse_modes;
-uint32_t current_mouse_mode;
-uint32_t agent_connected;
-uint32_t agent_tokens;
-uint32_t multi_media_time;
-uint32_t ram_hint;
-} SpiceMsgMainInit;
-
-typedef struct SpiceMsgDisconnect {
-uint64_t time_stamp;
-uint32_t reason; // SPICE_ERR_?
-} SpiceMsgDisconnect;
-
-typedef struct SpiceMsgNotify {
-uint64_t time_stamp;
-uint32_t severity;
-uint32_t visibilty;
-uint32_t what;
-uint32_t message_len;
-uint8_t message[0];
-} SpiceMsgNotify;
-
-typedef struct SpiceMsgChannels {
-uint32_t num_of_channels;
-SpiceChannelId channels[0];
-} SpiceMsgChannels;
-
-typedef struct SpiceMsgMainName {
-uint32_t name_len;
-uint8_t name[0];
-} SpiceMsgMainName;
-
-typedef struct SpiceMsgMainUuid {
-uint8_t uuid[16];
-} SpiceMsgMainUuid;
-
-typedef struct SpiceMsgMainMouseMode {
-uint32_t supported_modes;
-uint32_t current_mode;
-} SpiceMsgMainMouseMode;
-
-typedef struct SpiceMsgPing {
-uint32_t id;
-uint64_t timestamp;
-void *data;
-uint32_t data_len;
-} SpiceMsgPing;
-
-typedef struct SpiceMsgMainAgentDisconnect {
-uint32_t error_code; // SPICE_ERR_?
-} SpiceMsgMainAgentDisconnect;
-
#define SPICE_AGENT_MAX_DATA_SIZE 2048
-typedef struct SpiceMsgMainAgentTokens {
-uint32_t num_tokens;
-} SpiceMsgMainAgentTokens, SpiceMsgcMainAgentTokens, SpiceMsgcMainAgentStart;
-
-typedef struct SpiceMsgMainAgentTokens SpiceMsgMainAgentConnectedTokens;
-
-typedef struct SpiceMsgcClientInfo {
-uint64_t cache_size;
-} SpiceMsgcClientInfo;
-
-typedef struct SpiceMsgcMainMouseModeRequest {
-uint32_t mode;
-} SpiceMsgcMainMouseModeRequest;
-
-typedef struct SpiceCursor {
-uint32_t flags;
-SpiceCursorHeader header;
-uint32_t data_size;
-uint8_t *data;
-} SpiceCursor;
-
-typedef struct SpiceMsgDisplayMode {
-uint32_t x_res;
-uint32_t y_res;
-uint32_t bits;
-} SpiceMsgDisplayMode;
-
-typedef struct SpiceMsgSurfaceCreate {
-uint32_t surface_id;
-uint32_t width;
-uint32_t height;
-uint32_t format;
-uint32_t flags;
-} SpiceMsgSurfaceCreate;
-
-typedef struct
