mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

migration/rdma: define htonll/ntohll only if not predefined

Browse Source 
Solaris has #defines for htonll and ntohll which cause syntax errors
when compiling code that attempts to (re)define these functions..

Signed-off-by: Nick Briggs <nicholas.h.briggs@gmail.com>
Link: https://lore.kernel.org/r/65a04a7d.497ab3.3e7bef1f@gateway.sonic.net
Signed-off-by: Peter Xu <peterx@redhat.com>
(cherry picked from commit 44ce1b5d2f)
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
This commit is contained in:
Nick Briggs 2024-01-11 13:20:17 -05:00 committed by Michael Tokarev
parent fcc79f2e09
commit 2472f8467d
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
migration/rdma.c
View File

@ -268,6 +268,7 @@ static const char *control_desc(unsigned int rdma_control)
return strs[rdma_control]; return strs[rdma_control];
} }
#if !defined(htonll)
static uint64_t htonll(uint64_t v) static uint64_t htonll(uint64_t v)
{ {
union { uint32_t lv[2]; uint64_t llv; } u; union { uint32_t lv[2]; uint64_t llv; } u;
@ -275,13 +276,16 @@ static uint64_t htonll(uint64_t v)
u.lv[1] = htonl(v & 0xFFFFFFFFULL); u.lv[1] = htonl(v & 0xFFFFFFFFULL);
return u.llv; return u.llv;
} }
#endif
#if !defined(ntohll)
static uint64_t ntohll(uint64_t v) static uint64_t ntohll(uint64_t v)
{ {
union { uint32_t lv[2]; uint64_t llv; } u; union { uint32_t lv[2]; uint64_t llv; } u;
u.llv = v; u.llv = v;
return ((uint64_t)ntohl(u.lv[0]) << 32) | (uint64_t) ntohl(u.lv[1]); return ((uint64_t)ntohl(u.lv[0]) << 32) | (uint64_t) ntohl(u.lv[1]);
} }
#endif
static void dest_block_to_network(RDMADestBlock *db) static void dest_block_to_network(RDMADestBlock *db)
{ {