diff options
| author | Victor Toso <victortoso@redhat.com> | 2015-08-14 18:24:28 +0200 |
|---|---|---|
| committer | Frediano Ziglio <fziglio@redhat.com> | 2015-08-20 10:54:56 +0100 |
| commit | fd75632a8f169dfc6d1fc5cb0a30bf4064cd7bce (patch) | |
| tree | f80ef1d14d68badbcd70e5d0f3e13467de625b7a /server | |
| parent | 94e55bce423a5d3023097552ca50151109e2ddf1 (diff) | |
| download | spice-fd75632a8f169dfc6d1fc5cb0a30bf4064cd7bce.tar.gz spice-fd75632a8f169dfc6d1fc5cb0a30bf4064cd7bce.tar.xz spice-fd75632a8f169dfc6d1fc5cb0a30bf4064cd7bce.zip | |
migration_protocol: use SPICE_MAGIC_CONST
spice-protocol has a new define to create the magic constants, let's use
that.
Diffstat (limited to 'server')
| -rw-r--r-- | server/migration_protocol.h | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/server/migration_protocol.h b/server/migration_protocol.h index fa17c7c4..21d3ec8e 100644 --- a/server/migration_protocol.h +++ b/server/migration_protocol.h @@ -18,6 +18,7 @@ #ifndef _H_MIGRATION_PROTOCOL #define _H_MIGRATION_PROTOCOL +#include <spice/macros.h> #include <spice/vd_agent.h> #include "glz_encoder_dictionary.h" @@ -60,7 +61,7 @@ typedef struct __attribute__ ((__packed__)) SpiceMigrateDataCharDevice { #define SPICE_MIGRATE_DATA_SPICEVMC_VERSION 1 /* NOTE: increase version when CHAR_DEVICE_VERSION is increased */ -#define SPICE_MIGRATE_DATA_SPICEVMC_MAGIC (*(uint32_t *)"SVMD") +#define SPICE_MIGRATE_DATA_SPICEVMC_MAGIC SPICE_MAGIC_CONST("SVMD") typedef struct __attribute__ ((__packed__)) SpiceMigrateDataSpiceVmc { SpiceMigrateDataCharDevice base; } SpiceMigrateDataSpiceVmc; @@ -71,7 +72,7 @@ typedef struct __attribute__ ((__packed__)) SpiceMigrateDataSpiceVmc { #define SPICE_MIGRATE_DATA_SMARTCARD_VERSION 1 /* NOTE: increase version when CHAR_DEVICE_VERSION is increased */ -#define SPICE_MIGRATE_DATA_SMARTCARD_MAGIC (*(uint32_t *)"SCMD") +#define SPICE_MIGRATE_DATA_SMARTCARD_MAGIC SPICE_MAGIC_CONST("SCMD") typedef struct __attribute__ ((__packed__)) SpiceMigrateDataSmartcard { SpiceMigrateDataCharDevice base; uint8_t reader_added; @@ -84,7 +85,7 @@ typedef struct __attribute__ ((__packed__)) SpiceMigrateDataSmartcard { * *********************************/ #define SPICE_MIGRATE_DATA_MAIN_VERSION 1 /* NOTE: increase version when CHAR_DEVICE_VERSION is increased */ -#define SPICE_MIGRATE_DATA_MAIN_MAGIC (*(uint32_t *)"MNMD") +#define SPICE_MIGRATE_DATA_MAIN_MAGIC SPICE_MAGIC_CONST("MNMD") typedef struct __attribute__ ((__packed__)) SpiceMigrateDataMain { SpiceMigrateDataCharDevice agent_base; @@ -115,7 +116,7 @@ typedef struct __attribute__ ((__packed__)) SpiceMigrateDataMain { * ***************/ #define SPICE_MIGRATE_DATA_DISPLAY_VERSION 1 -#define SPICE_MIGRATE_DATA_DISPLAY_MAGIC (*(uint32_t *)"DCMD") +#define SPICE_MIGRATE_DATA_DISPLAY_MAGIC SPICE_MAGIC_CONST("DCMD") /* * TODO: store the cache and dictionary data only in one channel (the @@ -187,7 +188,7 @@ typedef struct __attribute__ ((__packed__)) MigrateDisplaySurfacesAtClientLossy * ***************/ #define SPICE_MIGRATE_DATA_INPUTS_VERSION 1 -#define SPICE_MIGRATE_DATA_INPUTS_MAGIC (*(uint32_t *)"ICMD") +#define SPICE_MIGRATE_DATA_INPUTS_MAGIC SPICE_MAGIC_CONST("ICMD") typedef struct __attribute__ ((__packed__)) SpiceMigrateDataInputs { |