migration: Add spaces around operator

Signed-off-by: Bihong Yu <yubihong@huawei.com>
Reviewed-by: Chuan Zheng <zhengchuan@huawei.com>
Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Message-Id: <1603163448-27122-4-git-send-email-yubihong@huawei.com>
Reviewed-by: Juan Quintela <quintela@redhat.com>
Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
This commit is contained in:
Bihong Yu 2020-10-20 11:10:43 +08:00 committed by Dr. David Alan Gilbert
parent 29fccade10
commit 395cb45009
5 changed files with 10 additions and 10 deletions

View file

@ -2478,8 +2478,8 @@ static void migrate_handle_rp_req_pages(MigrationState *ms, const char* rbname,
* Since we currently insist on matching page sizes, just sanity check * Since we currently insist on matching page sizes, just sanity check
* we're being asked for whole host pages. * we're being asked for whole host pages.
*/ */
if (start & (our_host_ps-1) || if (start & (our_host_ps - 1) ||
(len & (our_host_ps-1))) { (len & (our_host_ps - 1))) {
error_report("%s: Misaligned page request, start: " RAM_ADDR_FMT error_report("%s: Misaligned page request, start: " RAM_ADDR_FMT
" len: %zd", __func__, start, len); " len: %zd", __func__, start, len);
mark_source_rp_bad(ms); mark_source_rp_bad(ms);

View file

@ -403,7 +403,7 @@ bool postcopy_ram_supported_by_host(MigrationIncomingState *mis)
strerror(errno)); strerror(errno));
goto out; goto out;
} }
g_assert(((size_t)testarea & (pagesize-1)) == 0); g_assert(((size_t)testarea & (pagesize - 1)) == 0);
reg_struct.range.start = (uintptr_t)testarea; reg_struct.range.start = (uintptr_t)testarea;
reg_struct.range.len = pagesize; reg_struct.range.len = pagesize;

View file

@ -1563,7 +1563,7 @@ int ram_save_queue_pages(const char *rbname, ram_addr_t start, ram_addr_t len)
rs->last_req_rb = ramblock; rs->last_req_rb = ramblock;
} }
trace_ram_save_queue_pages(ramblock->idstr, start, len); trace_ram_save_queue_pages(ramblock->idstr, start, len);
if (start+len > ramblock->used_length) { if (start + len > ramblock->used_length) {
error_report("%s request overrun start=" RAM_ADDR_FMT " len=" error_report("%s request overrun start=" RAM_ADDR_FMT " len="
RAM_ADDR_FMT " blocklen=" RAM_ADDR_FMT, RAM_ADDR_FMT " blocklen=" RAM_ADDR_FMT,
__func__, start, len, ramblock->used_length); __func__, start, len, ramblock->used_length);

View file

@ -520,7 +520,7 @@ static const VMStateDescription vmstate_configuration = {
VMSTATE_VBUFFER_ALLOC_UINT32(name, SaveState, 0, NULL, len), VMSTATE_VBUFFER_ALLOC_UINT32(name, SaveState, 0, NULL, len),
VMSTATE_END_OF_LIST() VMSTATE_END_OF_LIST()
}, },
.subsections = (const VMStateDescription*[]) { .subsections = (const VMStateDescription *[]) {
&vmstate_target_page_bits, &vmstate_target_page_bits,
&vmstate_capabilites, &vmstate_capabilites,
&vmstate_uuid, &vmstate_uuid,

View file

@ -32,13 +32,13 @@ static int vmstate_n_elems(void *opaque, const VMStateField *field)
if (field->flags & VMS_ARRAY) { if (field->flags & VMS_ARRAY) {
n_elems = field->num; n_elems = field->num;
} else if (field->flags & VMS_VARRAY_INT32) { } else if (field->flags & VMS_VARRAY_INT32) {
n_elems = *(int32_t *)(opaque+field->num_offset); n_elems = *(int32_t *)(opaque + field->num_offset);
} else if (field->flags & VMS_VARRAY_UINT32) { } else if (field->flags & VMS_VARRAY_UINT32) {
n_elems = *(uint32_t *)(opaque+field->num_offset); n_elems = *(uint32_t *)(opaque + field->num_offset);
} else if (field->flags & VMS_VARRAY_UINT16) { } else if (field->flags & VMS_VARRAY_UINT16) {
n_elems = *(uint16_t *)(opaque+field->num_offset); n_elems = *(uint16_t *)(opaque + field->num_offset);
} else if (field->flags & VMS_VARRAY_UINT8) { } else if (field->flags & VMS_VARRAY_UINT8) {
n_elems = *(uint8_t *)(opaque+field->num_offset); n_elems = *(uint8_t *)(opaque + field->num_offset);
} }
if (field->flags & VMS_MULTIPLY_ELEMENTS) { if (field->flags & VMS_MULTIPLY_ELEMENTS) {
@ -54,7 +54,7 @@ static int vmstate_size(void *opaque, const VMStateField *field)
int size = field->size; int size = field->size;
if (field->flags & VMS_VBUFFER) { if (field->flags & VMS_VBUFFER) {
size = *(int32_t *)(opaque+field->size_offset); size = *(int32_t *)(opaque + field->size_offset);
if (field->flags & VMS_MULTIPLY) { if (field->flags & VMS_MULTIPLY) {
size *= field->size; size *= field->size;
} }