From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34024) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bBOzy-00014e-0j for qemu-devel@nongnu.org; Fri, 10 Jun 2016 12:09:31 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bBOzw-0003AV-PD for qemu-devel@nongnu.org; Fri, 10 Jun 2016 12:09:29 -0400 Received: from orth.archaic.org.uk ([2001:8b0:1d0::2]:57645) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bBOzw-0003A6-Fl for qemu-devel@nongnu.org; Fri, 10 Jun 2016 12:09:28 -0400 From: Peter Maydell Date: Fri, 10 Jun 2016 17:09:22 +0100 Message-Id: <1465574962-2710-1-git-send-email-peter.maydell@linaro.org> Subject: [Qemu-devel] [PATCH v2] migration: Don't use *_to_cpup() and cpu_to_*w() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: patches@linaro.org, Juan Quintela , Amit Shah , Eric Blake The *_to_cpup() and cpu_to_*w() functions just compose a pointer dereference with a byteswap. Instead use ld*_p() and st*_p(), which handle potential pointer misalignment and avoid the need to cast the pointer. Signed-off-by: Peter Maydell --- Changes v1->v2: fix cpu_to_*w() uses too. The motivation here is that I'd like to get rid of _to_cpup() and cpu_to_*w() entirely: we don't have many places that use them. --- migration/migration.c | 12 ++++++------ migration/savevm.c | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/migration/migration.c b/migration/migration.c index 7ecbade..551da0a 100644 --- a/migration/migration.c +++ b/migration/migration.c @@ -1381,7 +1381,7 @@ static void *source_return_path_thread(void *opaque) /* OK, we have the message and the data */ switch (header_type) { case MIG_RP_MSG_SHUT: - sibling_error = be32_to_cpup((uint32_t *)buf); + sibling_error = ldl_be_p(buf); trace_source_return_path_thread_shut(sibling_error); if (sibling_error) { error_report("RP: Sibling indicated error %d", sibling_error); @@ -1395,13 +1395,13 @@ static void *source_return_path_thread(void *opaque) goto out; case MIG_RP_MSG_PONG: - tmp32 = be32_to_cpup((uint32_t *)buf); + tmp32 = ldl_be_p(buf); trace_source_return_path_thread_pong(tmp32); break; case MIG_RP_MSG_REQ_PAGES: - start = be64_to_cpup((uint64_t *)buf); - len = be32_to_cpup((uint32_t *)(buf + 8)); + start = ldq_be_p(buf); + len = ldl_be_p(buf + 8); migrate_handle_rp_req_pages(ms, NULL, start, len); break; @@ -1409,8 +1409,8 @@ static void *source_return_path_thread(void *opaque) expected_len = 12 + 1; /* header + termination */ if (header_len >= expected_len) { - start = be64_to_cpup((uint64_t *)buf); - len = be32_to_cpup((uint32_t *)(buf + 8)); + start = ldq_be_p(buf); + len = ldl_be_p(buf + 8); /* Now we expect an idstr */ tmp32 = buf[12]; /* Length of the following idstr */ buf[13 + tmp32] = '\0'; diff --git a/migration/savevm.c b/migration/savevm.c index 6c21231..7da46a6 100644 --- a/migration/savevm.c +++ b/migration/savevm.c @@ -822,9 +822,9 @@ void qemu_savevm_send_postcopy_ram_discard(QEMUFile *f, const char *name, buf[tmplen++] = '\0'; for (t = 0; t < len; t++) { - cpu_to_be64w((uint64_t *)(buf + tmplen), start_list[t]); + stq_be_p(buf + tmplen, start_list[t]); tmplen += 8; - cpu_to_be64w((uint64_t *)(buf + tmplen), length_list[t]); + stq_be_p(buf + tmplen, length_list[t]); tmplen += 8; } qemu_savevm_command_send(f, MIG_CMD_POSTCOPY_RAM_DISCARD, tmplen, buf); -- 1.9.1