diff options
| author | Alon Levy <alevy@redhat.com> | 2012-03-21 17:57:32 +0200 |
|---|---|---|
| committer | Alon Levy <alevy@redhat.com> | 2012-03-21 17:57:32 +0200 |
| commit | 5391736c29c5452252a5f00833ea76087e7c8a71 (patch) | |
| tree | 0733c82161f19b15c42cee694f50d841bb7299c0 /server | |
| parent | f360273614ac06493ea5a9d501036fa36d3224ee (diff) | |
| download | spice-5391736c29c5452252a5f00833ea76087e7c8a71.tar.gz spice-5391736c29c5452252a5f00833ea76087e7c8a71.tar.xz spice-5391736c29c5452252a5f00833ea76087e7c8a71.zip | |
server/red_memslots: use QXLPHYSICAL for addresses
Cannot assume unsigned long == QXLPHYSICAL, not true for 32 bit
architectures.
Diffstat (limited to 'server')
| -rw-r--r-- | server/red_memslots.c | 2 | ||||
| -rw-r--r-- | server/red_memslots.h | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/server/red_memslots.c b/server/red_memslots.c index 50572183..8c8f3cc6 100644 --- a/server/red_memslots.c +++ b/server/red_memslots.c @@ -91,7 +91,7 @@ void validate_virt(RedMemSlotInfo *info, unsigned long virt, int slot_id, } } -unsigned long get_virt(RedMemSlotInfo *info, unsigned long addr, uint32_t add_size, +unsigned long get_virt(RedMemSlotInfo *info, QXLPHYSICAL addr, uint32_t add_size, int group_id) { int slot_id; diff --git a/server/red_memslots.h b/server/red_memslots.h index 7aea0a3b..75754d0c 100644 --- a/server/red_memslots.h +++ b/server/red_memslots.h @@ -43,12 +43,12 @@ typedef struct RedMemSlotInfo { unsigned long memslot_clean_virt_mask; } RedMemSlotInfo; -static inline int get_memslot_id(RedMemSlotInfo *info, unsigned long addr) +static inline int get_memslot_id(RedMemSlotInfo *info, uint64_t addr) { return addr >> info->memslot_id_shift; } -static inline int get_generation(RedMemSlotInfo *info, unsigned long addr) +static inline int get_generation(RedMemSlotInfo *info, uint64_t addr) { return (addr >> info->memslot_gen_shift) & info->memslot_gen_mask; } |