From nobody Fri May 10 04:49:20 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1610683075; cv=none; d=zohomail.com; s=zohoarc; b=dqVXOATC4OeuQF3x1UfuEilVodR/TiUsnhJg6aWyGwbjJkxbKAbsCxXoKNzhuo4oBWf3F3Fc64NuVfU/zgZWbZM5u2AD0Ts5xk009C0McpHW7CgJO1QTC0FWCTZgJKrA8GEimtMhAZmvhhgtkIXysKdbLsYUP7rex1wNWBlRSaw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1610683075; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=b/767JVwXeyypNVgBbMx0/PseeyfyCeXvKThXoEf7ZI=; b=njhvE6xVTE/7LddFAmum1w9krUlmfTqyADQ5uTDWP6SLKW3DODR7+/glZIW9YtM50Z8VH313nQkMx9975hEpHbyTmI8glo+vXh0hGvYqPL4k3tBa++jABhbn/JzbWBdAnMEy2BJPjVjX4l6hg5rsJhxAGDGGWNNafdDPwQ3mhIE= ARC-Authentication-Results: i=1; mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1610683075483194.57450352743467; Thu, 14 Jan 2021 19:57:55 -0800 (PST) Received: from localhost ([::1]:59450 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l0GFG-0006xy-CH for importer@patchew.org; Thu, 14 Jan 2021 22:57:54 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:54956) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l0GDD-0006UT-Td for qemu-devel@nongnu.org; Thu, 14 Jan 2021 22:55:47 -0500 Received: from szxga05-in.huawei.com ([45.249.212.191]:3033) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l0GDB-0004Hn-OB for qemu-devel@nongnu.org; Thu, 14 Jan 2021 22:55:47 -0500 Received: from DGGEMS406-HUB.china.huawei.com (unknown [172.30.72.60]) by szxga05-in.huawei.com (SkyGuard) with ESMTP id 4DH6km4zhMzj7RN; Fri, 15 Jan 2021 11:54:40 +0800 (CST) Received: from [10.108.235.54] (10.108.235.54) by DGGEMS406-HUB.china.huawei.com (10.3.19.206) with Microsoft SMTP Server id 14.3.498.0; Fri, 15 Jan 2021 11:55:35 +0800 Subject: [PATCH v2 1/5] softmmu: fix problems about spaces From: chaihaoyu To: , , Peter Xu , Paolo Bonzini References: Message-ID: <4f1ef805-d1de-26e7-d0b6-3f443a1f7c4a@huawei.com> Date: Fri, 15 Jan 2021 11:55:35 +0800 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:78.0) Gecko/20100101 Thunderbird/78.4.0 MIME-Version: 1.0 In-Reply-To: Content-Transfer-Encoding: quoted-printable X-Originating-IP: [10.108.235.54] X-CFilter-Loop: Reflected Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=45.249.212.191; envelope-from=chaihaoyu1@huawei.com; helo=szxga05-in.huawei.com X-Spam_score_int: -41 X-Spam_score: -4.2 X-Spam_bar: ---- X-Spam_report: (-4.2 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_MED=-2.3, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: alex.chen@huawei.com, hunongda@huawei.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" This patch fixes error messages found by checkpatch.pl: fix problems about spaces: Signed-off-by: Haoyu Chai --- softmmu/bootdevice.c | 4 ++-- softmmu/memory.c | 16 ++++++++-------- softmmu/qdev-monitor.c | 4 ++-- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/softmmu/bootdevice.c b/softmmu/bootdevice.c index add4e3d2d1..4edb80de8c 100644 --- a/softmmu/bootdevice.c +++ b/softmmu/bootdevice.c @@ -257,7 +257,7 @@ char *get_boot_devices_list(size_t *size) bootpath =3D get_boot_device_path(i->dev, ignore_suffixes, i->suff= ix); if (total) { - list[total-1] =3D '\n'; + list[total - 1] =3D '\n'; } len =3D strlen(bootpath) + 1; list =3D g_realloc(list, total + len); @@ -269,7 +269,7 @@ char *get_boot_devices_list(size_t *size) *size =3D total; if (boot_strict && *size > 0) { - list[total-1] =3D '\n'; + list[total - 1] =3D '\n'; list =3D g_realloc(list, total + 5); memcpy(&list[total], "HALT", 5); *size =3D total + 5; diff --git a/softmmu/memory.c b/softmmu/memory.c index 333e1ed7b0..2d346b9de4 100644 --- a/softmmu/memory.c +++ b/softmmu/memory.c @@ -336,7 +336,7 @@ static void flatview_simplify(FlatView *view) while (i < view->nr) { j =3D i + 1; while (j < view->nr - && can_merge(&view->ranges[j-1], &view->ranges[j])) { + && can_merge(&view->ranges[j - 1], &view->ranges[j])) { int128_addto(&view->ranges[i].addr.size, view->ranges[j].addr.= size); ++j; } @@ -841,8 +841,8 @@ static void address_space_update_ioeventfds(AddressSpac= e *as) ioeventfds =3D g_realloc(ioeventfds, ioeventfd_max * sizeof(*ioeventfds)); } - ioeventfds[ioeventfd_nb-1] =3D fr->mr->ioeventfds[i]; - ioeventfds[ioeventfd_nb-1].addr =3D tmp; + ioeventfds[ioeventfd_nb - 1] =3D fr->mr->ioeventfds[i]; + ioeventfds[ioeventfd_nb - 1].addr =3D tmp; } } } @@ -2371,8 +2371,8 @@ void memory_region_add_eventfd(MemoryRegion *mr, ++mr->ioeventfd_nb; mr->ioeventfds =3D g_realloc(mr->ioeventfds, sizeof(*mr->ioeventfds) * mr->ioeventfd_= nb); - memmove(&mr->ioeventfds[i+1], &mr->ioeventfds[i], - sizeof(*mr->ioeventfds) * (mr->ioeventfd_nb-1 - i)); + memmove(&mr->ioeventfds[i + 1], &mr->ioeventfds[i], + sizeof(*mr->ioeventfds) * (mr->ioeventfd_nb - 1 - i)); mr->ioeventfds[i] =3D mrfd; ioeventfd_update_pending |=3D mr->enabled; memory_region_transaction_commit(); @@ -2404,11 +2404,11 @@ void memory_region_del_eventfd(MemoryRegion *mr, } } assert(i !=3D mr->ioeventfd_nb); - memmove(&mr->ioeventfds[i], &mr->ioeventfds[i+1], - sizeof(*mr->ioeventfds) * (mr->ioeventfd_nb - (i+1))); + memmove(&mr->ioeventfds[i], &mr->ioeventfds[i + 1], + sizeof(*mr->ioeventfds) * (mr->ioeventfd_nb - (i + 1))); --mr->ioeventfd_nb; mr->ioeventfds =3D g_realloc(mr->ioeventfds, - sizeof(*mr->ioeventfds)*mr->ioeventfd_nb= + 1); + sizeof(*mr->ioeventfds) * mr->ioeventfd_= nb + 1); ioeventfd_update_pending |=3D mr->enabled; memory_region_transaction_commit(); } diff --git a/softmmu/qdev-monitor.c b/softmmu/qdev-monitor.c index 8dc656becc..a681d6a4e8 100644 --- a/softmmu/qdev-monitor.c +++ b/softmmu/qdev-monitor.c @@ -501,7 +501,7 @@ static BusState *qbus_find(const char *path, Error **er= rp) } /* find device */ - if (sscanf(path+pos, "%127[^/]%n", elem, &len) !=3D 1) { + if (sscanf(path + pos, "%127[^/]%n", elem, &len) !=3D 1) { g_assert_not_reached(); elem[0] =3D len =3D 0; } @@ -536,7 +536,7 @@ static BusState *qbus_find(const char *path, Error **er= rp) } /* find bus */ - if (sscanf(path+pos, "%127[^/]%n", elem, &len) !=3D 1) { + if (sscanf(path + pos, "%127[^/]%n", elem, &len) !=3D 1) { g_assert_not_reached(); elem[0] =3D len =3D 0; } --=20 2.29.1.59.gf9b6481aed From nobody Fri May 10 04:49:20 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1610683169; cv=none; d=zohomail.com; s=zohoarc; b=Olnaa+ftqiqqZTZgz3sukXdt4WeCLHLukrK3ZdjF++f+cQT7OU7guknXbo/ZZ+A5BC0A/607vSoQENijTsGh5Fkx3b7kjXf+aq2izzZFpQ3whSc4uyomfelwcW6u3tavvusln2Zieq3Pj9WLH90i3Nw/7+LnP83g/gWX9pTI2Sg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1610683169; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=TUIujFteIW4GIKH1FqFpI3/NjTlaKi8mY4Bl2XP2dao=; b=lUJV2oWfD1HqVJzQ0hzk/zlcBDUypBGYNBVXGDP5be+vJLaPv1RydMjo709uA5MLv1tUCZd9fJSvR5V3M0HdIHJ1lWTWGQs4e8cA5ovMdAfJTMMDQwr7N0Nw6aiuUxcgGYqt9juXHP1IEKGvZsX8vZbAQXemWAFbJ3/77Xg0B2s= ARC-Authentication-Results: i=1; mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 161068316947778.86142992890757; Thu, 14 Jan 2021 19:59:29 -0800 (PST) Received: from localhost ([::1]:35362 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l0GGl-0000Uu-DP for importer@patchew.org; Thu, 14 Jan 2021 22:59:27 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:55090) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l0GEL-0006y4-70 for qemu-devel@nongnu.org; Thu, 14 Jan 2021 22:56:57 -0500 Received: from szxga07-in.huawei.com ([45.249.212.35]:2639) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l0GEI-0004kW-9b for qemu-devel@nongnu.org; Thu, 14 Jan 2021 22:56:56 -0500 Received: from DGGEMS402-HUB.china.huawei.com (unknown [172.30.72.58]) by szxga07-in.huawei.com (SkyGuard) with ESMTP id 4DH6ly6rFSz7Gw8; Fri, 15 Jan 2021 11:55:42 +0800 (CST) Received: from [10.108.235.54] (10.108.235.54) by DGGEMS402-HUB.china.huawei.com (10.3.19.202) with Microsoft SMTP Server id 14.3.498.0; Fri, 15 Jan 2021 11:56:36 +0800 Subject: [PATCH v2 2/5] softmmu: braces {} are needed for if statement From: chaihaoyu To: , , Peter Xu , Paolo Bonzini References: Message-ID: Date: Fri, 15 Jan 2021 11:56:36 +0800 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:78.0) Gecko/20100101 Thunderbird/78.4.0 MIME-Version: 1.0 In-Reply-To: Content-Transfer-Encoding: quoted-printable X-Originating-IP: [10.108.235.54] X-CFilter-Loop: Reflected Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=45.249.212.35; envelope-from=chaihaoyu1@huawei.com; helo=szxga07-in.huawei.com X-Spam_score_int: -41 X-Spam_score: -4.2 X-Spam_bar: ---- X-Spam_report: (-4.2 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_MED=-2.3, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: alex.chen@huawei.com, hunongda@huawei.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" This patch fixes error messages found by checkpatch.pl: braces {} are needed for if statement Signed-off-by: Haoyu Chai --- softmmu/cpus.c | 6 ++++-- softmmu/dma-helpers.c | 3 ++- softmmu/memory.c | 3 ++- softmmu/physmem.c | 15 ++++++++++----- softmmu/qdev-monitor.c | 12 ++++++++---- 5 files changed, 26 insertions(+), 13 deletions(-) diff --git a/softmmu/cpus.c b/softmmu/cpus.c index 1dc20b9dc3..0d16855543 100644 --- a/softmmu/cpus.c +++ b/softmmu/cpus.c @@ -744,8 +744,9 @@ void qmp_memsave(int64_t addr, int64_t size, const char= *filename, while (size !=3D 0) { l =3D sizeof(buf); - if (l > size) + if (l > size) { l =3D size; + } if (cpu_memory_rw_debug(cpu, addr, buf, l, 0) !=3D 0) { error_setg(errp, "Invalid addr 0x%016" PRIx64 "/size %" PRId64 " specified", orig_addr, orig_size); @@ -778,8 +779,9 @@ void qmp_pmemsave(int64_t addr, int64_t size, const cha= r *filename, while (size !=3D 0) { l =3D sizeof(buf); - if (l > size) + if (l > size) { l =3D size; + } cpu_physical_memory_read(addr, buf, l); if (fwrite(buf, 1, l, f) !=3D l) { error_setg(errp, QERR_IO_ERROR); diff --git a/softmmu/dma-helpers.c b/softmmu/dma-helpers.c index 29001b5459..ccea3a7750 100644 --- a/softmmu/dma-helpers.c +++ b/softmmu/dma-helpers.c @@ -165,8 +165,9 @@ static void dma_blk_cb(void *opaque, int ret) } } } - if (!mem) + if (!mem) { break; + } qemu_iovec_add(&dbs->iov, mem, cur_len); dbs->sg_cur_byte +=3D cur_len; if (dbs->sg_cur_byte =3D=3D dbs->sg->sg[dbs->sg_cur_index].len) { diff --git a/softmmu/memory.c b/softmmu/memory.c index 2d346b9de4..0ff81def99 100644 --- a/softmmu/memory.c +++ b/softmmu/memory.c @@ -671,8 +671,9 @@ void flatview_for_each_range(FlatView *fv, flatview_cb = cb , void *opaque) assert(cb); FOR_EACH_FLAT_RANGE(fr, fv) { - if (cb(fr->addr.start, fr->addr.size, fr->mr, opaque)) + if (cb(fr->addr.start, fr->addr.size, fr->mr, opaque)) { break; + } } } diff --git a/softmmu/physmem.c b/softmmu/physmem.c index 6301f4f0a5..43e37660c7 100644 --- a/softmmu/physmem.c +++ b/softmmu/physmem.c @@ -797,8 +797,9 @@ int cpu_watchpoint_insert(CPUState *cpu, vaddr addr, va= ddr len, tlb_flush(cpu); } - if (watchpoint) + if (watchpoint) { *watchpoint =3D wp; + } return 0; } @@ -1210,8 +1211,9 @@ void flatview_add_to_dispatch(FlatView *fv, MemoryReg= ionSection *section) void qemu_flush_coalesced_mmio_buffer(void) { - if (kvm_enabled()) + if (kvm_enabled()) { kvm_flush_coalesced_mmio_buffer(); + } } void qemu_mutex_lock_ramlist(void) @@ -2495,8 +2497,9 @@ static int subpage_register(subpage_t *mmio, uint32_t= start, uint32_t end, { int idx, eidx; - if (start >=3D TARGET_PAGE_SIZE || end >=3D TARGET_PAGE_SIZE) + if (start >=3D TARGET_PAGE_SIZE || end >=3D TARGET_PAGE_SIZE) { return -1; + } idx =3D SUBPAGE_IDX(start); eidx =3D SUBPAGE_IDX(end); #if defined(DEBUG_SUBPAGE) @@ -3410,11 +3413,13 @@ int cpu_memory_rw_debug(CPUState *cpu, target_ulong= addr, phys_addr =3D cpu_get_phys_page_attrs_debug(cpu, page, &attrs); asidx =3D cpu_asidx_from_attrs(cpu, attrs); /* if no physical page mapped, return an error */ - if (phys_addr =3D=3D -1) + if (phys_addr =3D=3D -1) { return -1; + } l =3D (page + TARGET_PAGE_SIZE) - addr; - if (l > len) + if (l > len) { l =3D len; + } phys_addr +=3D (addr & ~TARGET_PAGE_MASK); if (is_write) { res =3D address_space_write_rom(cpu->cpu_ases[asidx].as, phys_= addr, diff --git a/softmmu/qdev-monitor.c b/softmmu/qdev-monitor.c index a681d6a4e8..8642b2a208 100644 --- a/softmmu/qdev-monitor.c +++ b/softmmu/qdev-monitor.c @@ -182,10 +182,12 @@ static int set_property(void *opaque, const char *nam= e, const char *value, { Object *obj =3D opaque; - if (strcmp(name, "driver") =3D=3D 0) + if (strcmp(name, "driver") =3D=3D 0) { return 0; - if (strcmp(name, "bus") =3D=3D 0) + } + if (strcmp(name, "bus") =3D=3D 0) { return 0; + } if (!object_property_parse(obj, name, value, errp)) { return -1; @@ -683,8 +685,9 @@ static void qbus_print(Monitor *mon, BusState *bus, int= indent); static void qdev_print_props(Monitor *mon, DeviceState *dev, Property *pro= ps, int indent) { - if (!props) + if (!props) { return; + } for (; props->name; props++) { char *value; char *legacy_name =3D g_strdup_printf("legacy-%s", props->name); @@ -769,8 +772,9 @@ static void qbus_print(Monitor *mon, BusState *bus, int= indent) void hmp_info_qtree(Monitor *mon, const QDict *qdict) { - if (sysbus_get_default()) + if (sysbus_get_default()) { qbus_print(mon, sysbus_get_default(), 0); + } } void hmp_info_qdm(Monitor *mon, const QDict *qdict) --=20 2.29.1.59.gf9b6481aed From nobody Fri May 10 04:49:20 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1610683122; cv=none; d=zohomail.com; s=zohoarc; b=bCHHYWik8jVq+udM9GW1ZbtNezzwxjjh6QteuToWlgGyLsg0bwtaTytj28gBZ3Zbp9+0dkgV1tHTKx+BXAApGgaZH4YDDVMgTEW0Ynbf6xLd4jACiG9FfIi0nT9Sm09QMtp0m/h4HEBS+H8QFpYKU59/pf3JbIHfa0KmEyiTsl8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1610683122; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=ElKxxpHOE/bZYe6d69Oy/kHKQiX5Li3Ce52jeGtMxvw=; b=YPwYzf4yWHWFxUv24ShHeLGeS0rF5FLZ2akPp+rsySf6iujamAr6W3HO1BaExiXkADSKW6iS1v6M5XLlEr3WA+PLdfYYsggUiBcbbYgMqVQEEbAEkqD6odi7ihtbVitoRO/DEcoWvoDbbNzDFVDyhWlTOMOHj2Dya0z++a6Zh78= ARC-Authentication-Results: i=1; mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1610683122181190.68764275451167; Thu, 14 Jan 2021 19:58:42 -0800 (PST) Received: from localhost ([::1]:33418 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l0GG0-00086Y-Ij for importer@patchew.org; Thu, 14 Jan 2021 22:58:40 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:55166) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l0GEk-00077A-1e for qemu-devel@nongnu.org; Thu, 14 Jan 2021 22:57:22 -0500 Received: from szxga06-in.huawei.com ([45.249.212.32]:2594) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l0GEi-0004rk-1v for qemu-devel@nongnu.org; Thu, 14 Jan 2021 22:57:21 -0500 Received: from DGGEMS412-HUB.china.huawei.com (unknown [172.30.72.58]) by szxga06-in.huawei.com (SkyGuard) with ESMTP id 4DH6mm3ydlzj6nc; Fri, 15 Jan 2021 11:56:24 +0800 (CST) Received: from [10.108.235.54] (10.108.235.54) by DGGEMS412-HUB.china.huawei.com (10.3.19.212) with Microsoft SMTP Server id 14.3.498.0; Fri, 15 Jan 2021 11:57:07 +0800 Subject: [PATCH v2 3/5] softmmu: don't use '#' flag of printf format ('%#') in format strings From: chaihaoyu To: , , Peter Xu , Paolo Bonzini References: Message-ID: <6cfe1902-1de6-43ca-c448-ad8c650f2c61@huawei.com> Date: Fri, 15 Jan 2021 11:57:07 +0800 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:78.0) Gecko/20100101 Thunderbird/78.4.0 MIME-Version: 1.0 In-Reply-To: Content-Transfer-Encoding: quoted-printable X-Originating-IP: [10.108.235.54] X-CFilter-Loop: Reflected Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=45.249.212.32; envelope-from=chaihaoyu1@huawei.com; helo=szxga06-in.huawei.com X-Spam_score_int: -41 X-Spam_score: -4.2 X-Spam_bar: ---- X-Spam_report: (-4.2 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_MED=-2.3, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: alex.chen@huawei.com, hunongda@huawei.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" This patch fixes error messages found by checkpatch.pl: don't use '#' flag of printf format ('%#') in format strings Signed-off-by: Haoyu Chai --- softmmu/device_tree.c | 2 +- softmmu/runstate.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/softmmu/device_tree.c b/softmmu/device_tree.c index b9a3ddc518..f1f4fd6f0d 100644 --- a/softmmu/device_tree.c +++ b/softmmu/device_tree.c @@ -367,7 +367,7 @@ int qemu_fdt_setprop_cell(void *fdt, const char *node_p= ath, r =3D fdt_setprop_cell(fdt, findnode_nofail(fdt, node_path), property,= val); if (r < 0) { - error_report("%s: Couldn't set %s/%s =3D %#08x: %s", __func__, + error_report("%s: Couldn't set %s/%s =3D 0x%08x: %s", __func__, node_path, property, val, fdt_strerror(r)); exit(1); } diff --git a/softmmu/runstate.c b/softmmu/runstate.c index 636aab0add..87ce18282b 100644 --- a/softmmu/runstate.c +++ b/softmmu/runstate.c @@ -490,8 +490,8 @@ void qemu_system_guest_panicked(GuestPanicInformation *= info) if (info) { if (info->type =3D=3D GUEST_PANIC_INFORMATION_TYPE_HYPER_V) { - qemu_log_mask(LOG_GUEST_ERROR, "\nHV crash parameters: (%#"PRI= x64 - " %#"PRIx64" %#"PRIx64" %#"PRIx64" %#"PRIx64")\n= ", + qemu_log_mask(LOG_GUEST_ERROR, "\nHV crash parameters: (0x%"PR= Ix64 + " 0x%"PRIx64" 0x%"PRIx64" 0x%"PRIx64" 0x%"PRIx64= ")\n", info->u.hyper_v.arg1, info->u.hyper_v.arg2, info->u.hyper_v.arg3, --=20 2.29.1.59.gf9b6481aed From nobody Fri May 10 04:49:20 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1610683232; cv=none; d=zohomail.com; s=zohoarc; b=h2PD6cCVb1/2lUPvowfCWvNLyTeX0PJM/niydnnZLrgfZW30He7unorFQSEg98Mczmo9q7Sbp9k1L03pBzRSmcVnTQ5PdkZ0svDFoF57p6jjiWG/HDRlQjPaBRqqig5TtHeDmTvmq59CMJMI3r+OxwYxbmcpDRw6CQ3YpGpWVIU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1610683232; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=Ry8QwQCx5HtRPny1QVb3cxYmMiONinqrruDHi5a7sFo=; b=RqNVAGN1HgMAqWVQbFRq09BtjBwOOHgCBbSSUmmOag572cwUpvaacw6Gm0xXCsfxe4YNurHWWWfCgpL2d9dm5T2iTLZb+nAqAFeOGzWvtX5Uz7y/MptXwV5nUwWWuVE2S1d4ZqNOHaWF2VloZgBgzIXhU5aRVkNtWfROmVVdxS0= ARC-Authentication-Results: i=1; mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 16106832320941014.3213673733612; Thu, 14 Jan 2021 20:00:32 -0800 (PST) Received: from localhost ([::1]:37676 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l0GHn-0001Tx-18 for importer@patchew.org; Thu, 14 Jan 2021 23:00:31 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:55256) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l0GFM-0007g9-6b for qemu-devel@nongnu.org; Thu, 14 Jan 2021 22:58:00 -0500 Received: from szxga05-in.huawei.com ([45.249.212.191]:3034) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l0GFK-00055Z-Gc for qemu-devel@nongnu.org; Thu, 14 Jan 2021 22:57:59 -0500 Received: from DGGEMS402-HUB.china.huawei.com (unknown [172.30.72.58]) by szxga05-in.huawei.com (SkyGuard) with ESMTP id 4DH6nK4nRtzj6w2; Fri, 15 Jan 2021 11:56:53 +0800 (CST) Received: from [10.108.235.54] (10.108.235.54) by DGGEMS402-HUB.china.huawei.com (10.3.19.202) with Microsoft SMTP Server id 14.3.498.0; Fri, 15 Jan 2021 11:57:47 +0800 Subject: [PATCH v2 4/5] softmmu: "foo* bar" should be "foo *bar" From: chaihaoyu To: , , Peter Xu , Paolo Bonzini References: Message-ID: <846cf433-1369-b3b8-2df9-46b54ae7eb6e@huawei.com> Date: Fri, 15 Jan 2021 11:57:47 +0800 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:78.0) Gecko/20100101 Thunderbird/78.4.0 MIME-Version: 1.0 In-Reply-To: Content-Transfer-Encoding: quoted-printable X-Originating-IP: [10.108.235.54] X-CFilter-Loop: Reflected Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=45.249.212.191; envelope-from=chaihaoyu1@huawei.com; helo=szxga05-in.huawei.com X-Spam_score_int: -41 X-Spam_score: -4.2 X-Spam_bar: ---- X-Spam_report: (-4.2 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_MED=-2.3, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: alex.chen@huawei.com, hunongda@huawei.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" This patch fixes error messages found by checkpatch.pl: "foo* bar" should be "foo *bar" Signed-off-by: Haoyu Chai --- softmmu/globals.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/softmmu/globals.c b/softmmu/globals.c index 7d0fc81183..341a7029ff 100644 --- a/softmmu/globals.c +++ b/softmmu/globals.c @@ -35,7 +35,7 @@ enum vga_retrace_method vga_retrace_method =3D VGA_RETRACE_DUMB; int display_opengl; -const char* keyboard_layout; +const char *keyboard_layout; bool enable_mlock; bool enable_cpu_pm; int nb_nics; --=20 2.29.1.59.gf9b6481aed From nobody Fri May 10 04:49:20 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1610683327; cv=none; d=zohomail.com; s=zohoarc; b=H7L66YekaxWsS1L2QD3KqhRRQPYhr+bEHbnP1UmP230QYpfQpMKiYfYWdfMn3K7CKA7QbfSgJrbeLTpR7a6aEa1wytYR8k5tglCU5BYg5NgihYbPSpK3k+QI/HcUpvk8W3zeX1uoe9FF7LKVn4Xfomr0Dx5MDafcd9mmygNoXC4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1610683327; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=psoPj8NMVyCcEmT5oxYe66uP1WWGwAP9hjYHL+XefZE=; b=iut46AiVpbwdD3anZFHvV3tuiBY6F1O3BXwsWeOgN3LlX/LGseFWnT+BZ8doHa1CxcDxdp14pyyiuVPd6AXSOkpTBFdlY/VYHDHJWCwe/Q+60ljFtBiV6NZA7q28q3jaB+nfevcycmjYu9a8wY1oYPER5h05c4krMc4tcKTl6W4= ARC-Authentication-Results: i=1; mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1610683327915630.7167997306345; Thu, 14 Jan 2021 20:02:07 -0800 (PST) Received: from localhost ([::1]:39836 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l0GJK-0002VY-TE for importer@patchew.org; Thu, 14 Jan 2021 23:02:06 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:55320) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l0GFx-0008Qc-BK for qemu-devel@nongnu.org; Thu, 14 Jan 2021 22:58:37 -0500 Received: from szxga04-in.huawei.com ([45.249.212.190]:2853) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l0GFv-0005IG-7T for qemu-devel@nongnu.org; Thu, 14 Jan 2021 22:58:37 -0500 Received: from DGGEMS408-HUB.china.huawei.com (unknown [172.30.72.60]) by szxga04-in.huawei.com (SkyGuard) with ESMTP id 4DH6nc1lbBzl504; Fri, 15 Jan 2021 11:57:08 +0800 (CST) Received: from [10.108.235.54] (10.108.235.54) by DGGEMS408-HUB.china.huawei.com (10.3.19.208) with Microsoft SMTP Server id 14.3.498.0; Fri, 15 Jan 2021 11:58:18 +0800 Subject: [PATCH v2 5/5] softmmu: code indent should never use tabs From: chaihaoyu To: , , Peter Xu , Paolo Bonzini References: Message-ID: <4502cbe1-a076-3857-8af1-83112cc3fae4@huawei.com> Date: Fri, 15 Jan 2021 11:58:17 +0800 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:78.0) Gecko/20100101 Thunderbird/78.4.0 MIME-Version: 1.0 In-Reply-To: Content-Transfer-Encoding: quoted-printable X-Originating-IP: [10.108.235.54] X-CFilter-Loop: Reflected Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=45.249.212.190; envelope-from=chaihaoyu1@huawei.com; helo=szxga04-in.huawei.com X-Spam_score_int: -41 X-Spam_score: -4.2 X-Spam_bar: ---- X-Spam_report: (-4.2 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_MED=-2.3, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: alex.chen@huawei.com, hunongda@huawei.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" This patch fixes error messages found by checkpatch.pl: code indent should never use tabs Signed-off-by: Haoyu Chai --- softmmu/physmem.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/softmmu/physmem.c b/softmmu/physmem.c index 43e37660c7..7aed899e3f 100644 --- a/softmmu/physmem.c +++ b/softmmu/physmem.c @@ -3273,7 +3273,7 @@ int64_t address_space_cache_init(MemoryRegionCache *c= ache, * cache->xlat and the end of the section. */ diff =3D int128_sub(cache->mrs.size, - int128_make64(cache->xlat - cache->mrs.offset_within_region)); + int128_make64(cache->xlat - cache->mrs.offset_within_regio= n)); l =3D int128_get64(int128_min(diff, int128_make64(l))); mr =3D cache->mrs.mr; --=20 2.29.1.59.gf9b6481aed