From nobody Fri Mar 29 13:50:41 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org ARC-Seal: i=1; a=rsa-sha256; t=1617638262; cv=none; d=zohomail.com; s=zohoarc; b=DHB+fPHaz6bnUvZbtoGoOFMmchxc0CNowbD3OYYt8SrObukr/jKVusEEM1pDk8xDvcaVMGaHeClxlwzKoBzJxIdY+EVbHrI4IB6AUwE7Huv91eueidhQ6BUQDg31mA02HDTARpHA6KElqUn/2+KdNIUMWVT1ZzDMD15Ns8OuUFE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1617638262; h=Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To; bh=wM0arhOfbdXKBnD+kuNFkMVWLt0+0LE5S6yLwtX1v4g=; b=ZZU9XAQ+bndMiN0ivfEKnjtPR0i/WUVNH6J+NTHlSpXlVANQGlLeZGbTwhHfIb25q4g6PUYsVcS4PwkA2X5bNMR2kI1c6xERL5GK3vq9HLgJKhGkweJjPwqZcVNlgOuQaducITakQ1F1y13d+otFldwLVWAfdA7wN2FbPz257kM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1617638262488467.9502650162307; Mon, 5 Apr 2021 08:57:42 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.105394.201732 (Exim 4.92) (envelope-from ) id 1lTRbO-00028K-Ff; Mon, 05 Apr 2021 15:57:22 +0000 Received: by outflank-mailman (output) from mailman id 105394.201732; Mon, 05 Apr 2021 15:57:22 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1lTRbO-00028B-91; Mon, 05 Apr 2021 15:57:22 +0000 Received: by outflank-mailman (input) for mailman id 105394; Mon, 05 Apr 2021 15:57:20 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1lTRbM-00027a-OL for xen-devel@lists.xenproject.org; Mon, 05 Apr 2021 15:57:20 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1lTRbL-0002nA-Ls; Mon, 05 Apr 2021 15:57:19 +0000 Received: from 54-240-197-235.amazon.com ([54.240.197.235] helo=ufe34d9ed68d054.ant.amazon.com) by xenbits.xenproject.org with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1lTRbL-00053b-CT; Mon, 05 Apr 2021 15:57:19 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From; bh=wM0arhOfbdXKBnD+kuNFkMVWLt0+0LE5S6yLwtX1v4g=; b=yK+fPDTfexuES8exRK8gSibPD 5zO9GPsi3gdF5Mf4ClqCwHiYojBQ0lPqt3biOe2NYHQS8U7TkQpf07ciBZ/Uupf5iWlihZ4qUJVet fFfEDFAbtETs+5V43M++oc3DKQHkyR0VSuHoR/nXgt89UcadmAND2MN1cuB/X065weMpE=; From: Julien Grall To: xen-devel@lists.xenproject.org Cc: julien@xen.org, Julien Grall , Andrew Cooper , George Dunlap , Ian Jackson , Jan Beulich , Stefano Stabellini , Wei Liu Subject: [PATCH 01/14] xen: Constify the second parameter of rangeset_new() Date: Mon, 5 Apr 2021 16:57:00 +0100 Message-Id: <20210405155713.29754-2-julien@xen.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210405155713.29754-1-julien@xen.org> References: <20210405155713.29754-1-julien@xen.org> X-ZohoMail-DKIM: pass (identity @xen.org) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Julien Grall The string 'name' will never get modified by the function, so mark it as const. Signed-off-by: Julien Grall Acked-by: Wei Liu Reviewed-by: Jan Beulich --- xen/common/rangeset.c | 2 +- xen/include/xen/rangeset.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/xen/common/rangeset.c b/xen/common/rangeset.c index 4ebba30ba303..d997d7bce9e2 100644 --- a/xen/common/rangeset.c +++ b/xen/common/rangeset.c @@ -421,7 +421,7 @@ bool_t rangeset_is_empty( } =20 struct rangeset *rangeset_new( - struct domain *d, char *name, unsigned int flags) + struct domain *d, const char *name, unsigned int flags) { struct rangeset *r; =20 diff --git a/xen/include/xen/rangeset.h b/xen/include/xen/rangeset.h index 5f62a9797170..135f33f6066f 100644 --- a/xen/include/xen/rangeset.h +++ b/xen/include/xen/rangeset.h @@ -36,7 +36,7 @@ void rangeset_domain_destroy( * rangeset_destroy(r). */ struct rangeset *rangeset_new( - struct domain *d, char *name, unsigned int flags); + struct domain *d, const char *name, unsigned int flags); void rangeset_destroy( struct rangeset *r); =20 --=20 2.17.1 From nobody Fri Mar 29 13:50:41 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org ARC-Seal: i=1; a=rsa-sha256; t=1617638264; cv=none; d=zohomail.com; s=zohoarc; b=QN+py3LVfMJgDwcpuR+TBRjYMNCCEVgqEXUl2pcnQ48oq0qVaVP2K0rWHuwyhl+vXEX3wM4iKeimGQXi7RVU6bALqgZtaTUdLLR1zBYrswDFdf7EgP2L/uN1SrZXYOudNMS2tdLCsL5zP0SatjoGt4KLKfc1FW81So2s5B6c8b4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1617638264; h=Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To; bh=FL2yQM6+D2+NHIgkPxbbHrXWAKmxpnXf59OkWXn01Qw=; b=nMEwukwB9v8Q3iVmWCuxvM8KXSGqJWp9fIuFwGAW98td/x/v3qTsdM+OXPwM4ByKbXJYcp6mb8Xl2aB6uieg3m1vJpBUslzL/MR5g9yATjlpqF3HLs0Lyv7PbsMYo8V4oX2DmKp9AV0RTkKWDHauOm2BtyLLxNYoE6gDSPbgWds= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1617638264318612.8258598694205; Mon, 5 Apr 2021 08:57:44 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.105395.201745 (Exim 4.92) (envelope-from ) id 1lTRbO-00029S-UG; Mon, 05 Apr 2021 15:57:22 +0000 Received: by outflank-mailman (output) from mailman id 105395.201745; Mon, 05 Apr 2021 15:57:22 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1lTRbO-00029F-Oe; Mon, 05 Apr 2021 15:57:22 +0000 Received: by outflank-mailman (input) for mailman id 105395; Mon, 05 Apr 2021 15:57:21 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1lTRbN-00027f-5b for xen-devel@lists.xenproject.org; Mon, 05 Apr 2021 15:57:21 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1lTRbM-0002nH-LS; Mon, 05 Apr 2021 15:57:20 +0000 Received: from 54-240-197-235.amazon.com ([54.240.197.235] helo=ufe34d9ed68d054.ant.amazon.com) by xenbits.xenproject.org with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1lTRbM-00053b-Cu; Mon, 05 Apr 2021 15:57:20 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From; bh=FL2yQM6+D2+NHIgkPxbbHrXWAKmxpnXf59OkWXn01Qw=; b=olnT+4wdfgOmsFVK0XVuv2Zrh FMugV25jq7TYAhXZfOZEa1zDLyx93/ejxZ9Kv3epsIjZOdLbwoUjxytoUG0qNy0SpfHXWj414Viu6 dMzKuBnjkGhNhdaD4dSgcQkaO8bEOSxwtvGYoAOt7gg6LdiOOvfVpuZRzaIu/bgntk344=; From: Julien Grall To: xen-devel@lists.xenproject.org Cc: julien@xen.org, Julien Grall , George Dunlap , Dario Faggioli Subject: [PATCH 02/14] xen/sched: Constify name and opt_name in struct scheduler Date: Mon, 5 Apr 2021 16:57:01 +0100 Message-Id: <20210405155713.29754-3-julien@xen.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210405155713.29754-1-julien@xen.org> References: <20210405155713.29754-1-julien@xen.org> X-ZohoMail-DKIM: pass (identity @xen.org) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Julien Grall Both name and opt_name are pointing to literal string. So mark both of the fields as const. Signed-off-by: Julien Grall Acked-by: George Dunlap Acked-by: Wei Liu Reviewed-by: Jan Beulich --- xen/common/sched/private.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/xen/common/sched/private.h b/xen/common/sched/private.h index 92d0d4961063..a870320146ef 100644 --- a/xen/common/sched/private.h +++ b/xen/common/sched/private.h @@ -272,8 +272,8 @@ static inline spinlock_t *pcpu_schedule_trylock(unsigne= d int cpu) } =20 struct scheduler { - char *name; /* full name for this scheduler */ - char *opt_name; /* option name for this scheduler */ + const char *name; /* full name for this scheduler */ + const char *opt_name; /* option name for this scheduler */ unsigned int sched_id; /* ID for this scheduler */ void *sched_data; /* global data pointer */ struct cpupool *cpupool;/* points to this scheduler's pool */ --=20 2.17.1 From nobody Fri Mar 29 13:50:41 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org ARC-Seal: i=1; a=rsa-sha256; t=1617638262; cv=none; d=zohomail.com; s=zohoarc; b=INQZ6hBhEYUlTpw+cdkde7koPSoj2X3NxOUcxHopiOTINULir8uy4uBDCwMza4/OYuPO1seoN8K9pu2UmSRic6TjBMdiJKAMP/pULb4k1dYp/bCBsNggqDH/WB4t4UaOzM3ps2yVpUhUeBjLmV3+A1UfNDJxPomzBexoJ5tka9k= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1617638262; h=Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To; bh=+qpe2Q4MYVn+N9AOgWxQnBcvE9Q4UEVlLyVO20fEAig=; b=ZY2Og5twulSNDlKBSoSB6IOi0mu5eJsWs4Hm2iQiyLQffKXRx53xA2/siILofxcrGHYbm2HWHwoHCfii173Hcyq5CxKh/9khq9Oou+VhXQtxP950DGiUk12/kYhTUDrHDlm7rws7RNTXnHL1k1NTI8kHUoscjf0J3BT+vkxqMRM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1617638262404245.67874171982987; Mon, 5 Apr 2021 08:57:42 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.105396.201761 (Exim 4.92) (envelope-from ) id 1lTRbR-0002CF-5O; Mon, 05 Apr 2021 15:57:25 +0000 Received: by outflank-mailman (output) from mailman id 105396.201761; Mon, 05 Apr 2021 15:57:25 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1lTRbR-0002C7-1f; Mon, 05 Apr 2021 15:57:25 +0000 Received: by outflank-mailman (input) for mailman id 105396; Mon, 05 Apr 2021 15:57:23 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1lTRbP-0002AY-BS for xen-devel@lists.xenproject.org; Mon, 05 Apr 2021 15:57:23 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1lTRbO-0002nT-3j; Mon, 05 Apr 2021 15:57:22 +0000 Received: from 54-240-197-235.amazon.com ([54.240.197.235] helo=ufe34d9ed68d054.ant.amazon.com) by xenbits.xenproject.org with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1lTRbN-00053b-Rj; Mon, 05 Apr 2021 15:57:22 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From; bh=+qpe2Q4MYVn+N9AOgWxQnBcvE9Q4UEVlLyVO20fEAig=; b=0s6PRARc2L7Ols9se5qmubITO gCphmgCs7lKIQzI5hW9F5lftz96cYZXIWqh44Nvg3k88t04xh2WXceIGv1LD5/oFrnBHoWEiz1uBO WH5HjSuPJUx+pmj180WxZlco8v+Pv8RpV0pKgXiRbET7wZNbUDGLZDTU9xIQ3kSC7NJFE=; From: Julien Grall To: xen-devel@lists.xenproject.org Cc: julien@xen.org, Julien Grall , Tim Deegan , Jan Beulich , Andrew Cooper , George Dunlap , =?UTF-8?q?Roger=20Pau=20Monn=C3=A9?= , Wei Liu Subject: [PATCH 03/14] xen/x86: shadow: The return type of sh_audit_flags() should be const Date: Mon, 5 Apr 2021 16:57:02 +0100 Message-Id: <20210405155713.29754-4-julien@xen.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210405155713.29754-1-julien@xen.org> References: <20210405155713.29754-1-julien@xen.org> X-ZohoMail-DKIM: pass (identity @xen.org) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Julien Grall The function sh_audit_flags() is returning pointer to literal strings. They should not be modified, so the return is now const and this is propagated to the callers. Take the opportunity to fix the coding style in the declaration of sh_audit_flags. Signed-off-by: Julien Grall Acked-by: Tim Deegan Acked-by: Wei Liu Reviewed-by: Roger Pau Monn=C3=A9 --- xen/arch/x86/mm/shadow/multi.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/xen/arch/x86/mm/shadow/multi.c b/xen/arch/x86/mm/shadow/multi.c index 9b43cb116c47..0342de81d2c1 100644 --- a/xen/arch/x86/mm/shadow/multi.c +++ b/xen/arch/x86/mm/shadow/multi.c @@ -4290,8 +4290,8 @@ static void sh_pagetable_dying(paddr_t gpa) done =3D 1; \ } while (0) =20 -static char * sh_audit_flags(struct vcpu *v, int level, - int gflags, int sflags) +static const char *sh_audit_flags(struct vcpu *v, int level, + int gflags, int sflags) /* Common code for auditing flag bits */ { if ( (sflags & _PAGE_PRESENT) && !(gflags & _PAGE_PRESENT) ) @@ -4324,7 +4324,7 @@ int sh_audit_l1_table(struct vcpu *v, mfn_t sl1mfn, m= fn_t x) mfn_t mfn, gmfn, gl1mfn; gfn_t gfn; p2m_type_t p2mt; - char *s; + const char *s; int done =3D 0; =20 /* Follow the backpointer */ @@ -4419,7 +4419,7 @@ int sh_audit_l2_table(struct vcpu *v, mfn_t sl2mfn, m= fn_t x) mfn_t mfn, gmfn, gl2mfn; gfn_t gfn; p2m_type_t p2mt; - char *s; + const char *s; int done =3D 0; =20 /* Follow the backpointer */ @@ -4471,7 +4471,7 @@ int sh_audit_l3_table(struct vcpu *v, mfn_t sl3mfn, m= fn_t x) mfn_t mfn, gmfn, gl3mfn; gfn_t gfn; p2m_type_t p2mt; - char *s; + const char *s; int done =3D 0; =20 /* Follow the backpointer */ @@ -4521,7 +4521,7 @@ int sh_audit_l4_table(struct vcpu *v, mfn_t sl4mfn, m= fn_t x) mfn_t mfn, gmfn, gl4mfn; gfn_t gfn; p2m_type_t p2mt; - char *s; + const char *s; int done =3D 0; =20 /* Follow the backpointer */ --=20 2.17.1 From nobody Fri Mar 29 13:50:41 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org ARC-Seal: i=1; a=rsa-sha256; t=1617638263; cv=none; d=zohomail.com; s=zohoarc; b=hynAoHXE/x1npwycIBI80AUh1MOyV5wKLRkTQw4db3WqN492CnBUcS6yMAzRzS4EjabZOrs9MAIDFskOWknODI+K9Y3HfSwdcHfn7vG6GniZL3qwCopIS4emliXksiLD+hjhyJO267iuUJ5FLRmn5oI4wBzEvGGfifRkimyjHTs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1617638263; h=Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To; bh=lOO8LxgjP7mfnbj4AR6O+AWqc4xBBvOnf0MxiUn+xT8=; b=UAjrNZzYHWbdB4R0ZXYUJd7t42ey/8NQYAo3dLsf2mVYW1efnL5mVBM0AkdfFa3EsdrTxORYI9rPEgK/xUTKc4vpdB4P/NFIqLmVLZ9gYmEv/4fFkIf8im3W9UQXDXCaSSpAOdjv28HvVC7CqZ1HsZEuf8UQ9XV3xCdeDVdHZmg= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1617638263131904.2505150109561; Mon, 5 Apr 2021 08:57:43 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.105397.201767 (Exim 4.92) (envelope-from ) id 1lTRbR-0002D7-M5; Mon, 05 Apr 2021 15:57:25 +0000 Received: by outflank-mailman (output) from mailman id 105397.201767; Mon, 05 Apr 2021 15:57:25 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1lTRbR-0002Cs-Cc; Mon, 05 Apr 2021 15:57:25 +0000 Received: by outflank-mailman (input) for mailman id 105397; Mon, 05 Apr 2021 15:57:24 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1lTRbQ-0002BR-Dp for xen-devel@lists.xenproject.org; Mon, 05 Apr 2021 15:57:24 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1lTRbP-0002nu-J8; Mon, 05 Apr 2021 15:57:23 +0000 Received: from 54-240-197-235.amazon.com ([54.240.197.235] helo=ufe34d9ed68d054.ant.amazon.com) by xenbits.xenproject.org with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1lTRbP-00053b-Ac; Mon, 05 Apr 2021 15:57:23 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From; bh=lOO8LxgjP7mfnbj4AR6O+AWqc4xBBvOnf0MxiUn+xT8=; b=nzCnexDfy6V5fekkYmcoVJHtI x8Fw26jDm+t15L03/PZnBhfbg0aMQoaEkyJzu7NnS9z0XgKqddyUx8/jOSxhsR52zgpVzT3wS5nnG Q0TQ/MaTBPAaO7eKnps6yl0ItuhcZXqeY9CDzSPWD1TnNwkO8TDdQUCPnCHTVTfs7e6Ds=; From: Julien Grall To: xen-devel@lists.xenproject.org Cc: julien@xen.org, Julien Grall , Andrew Cooper , George Dunlap , Ian Jackson , Jan Beulich , Stefano Stabellini , Wei Liu Subject: [PATCH 04/14] xen/char: console: Use const whenever we point to literal strings Date: Mon, 5 Apr 2021 16:57:03 +0100 Message-Id: <20210405155713.29754-5-julien@xen.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210405155713.29754-1-julien@xen.org> References: <20210405155713.29754-1-julien@xen.org> X-ZohoMail-DKIM: pass (identity @xen.org) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Julien Grall literal strings are not meant to be modified. So we should use const char * rather than char * when we want to store a pointer to them. Signed-off-by: Julien Grall Acked-by: Wei Liu Reviewed-by: Jan Beulich --- xen/drivers/char/console.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/xen/drivers/char/console.c b/xen/drivers/char/console.c index 23583751709c..72a7cd1c32c1 100644 --- a/xen/drivers/char/console.c +++ b/xen/drivers/char/console.c @@ -168,7 +168,7 @@ static int parse_guest_loglvl(const char *s); static char xenlog_val[LOGLVL_VAL_SZ]; static char xenlog_guest_val[LOGLVL_VAL_SZ]; =20 -static char *lvl2opt[] =3D { "none", "error", "warning", "info", "all" }; +static const char *lvl2opt[] =3D { "none", "error", "warning", "info", "al= l" }; =20 static void xenlog_update_val(int lower, int upper, char *val) { @@ -262,7 +262,7 @@ static int parse_guest_loglvl(const char *s) return ret; } =20 -static char *loglvl_str(int lvl) +static const char *loglvl_str(int lvl) { switch ( lvl ) { --=20 2.17.1 From nobody Fri Mar 29 13:50:42 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org ARC-Seal: i=1; a=rsa-sha256; t=1617638263; cv=none; d=zohomail.com; s=zohoarc; b=ZbySVArf8ev6+f8ecpo5QuQJZgCyoGEZip5TIBgciZOe0Z7RZwfXCA/MBZk4TJV8matjwjp0W7XF5JUoI6ioL1xVt+pZZNvKhyfXLKecaVnYrfX923fwv7rYv6rnitdPv+YSig2dlqHH6Um8OYtiMa6YNACpfAummtbVbGfgEt4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1617638263; h=Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To; bh=UP5LznC0lJpah31eRGW2Mg+D4mlUlr8pP6zrBCltxpg=; b=LimwmsaoqfvA7yXj+JHYLO8QUUJ0xhzPtfUW+N1P72iAj8Ix7KmyxMelLcvhVbRH+uTO8dRFFZQu0rqRq5N4RGS1HdMxTD4z6jMIb1wmk6KMhRiwHkawW3g7bOqRfgZL6zwJiJlxcky4JplHX+GYFilLDk0hzaW/FdCxnXolvh8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1617638263796447.9192789101843; Mon, 5 Apr 2021 08:57:43 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.105398.201784 (Exim 4.92) (envelope-from ) id 1lTRbS-0002Gm-Vj; Mon, 05 Apr 2021 15:57:26 +0000 Received: by outflank-mailman (output) from mailman id 105398.201784; Mon, 05 Apr 2021 15:57:26 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1lTRbS-0002GD-Pd; Mon, 05 Apr 2021 15:57:26 +0000 Received: by outflank-mailman (input) for mailman id 105398; Mon, 05 Apr 2021 15:57:25 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1lTRbR-0002D6-ES for xen-devel@lists.xenproject.org; Mon, 05 Apr 2021 15:57:25 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1lTRbQ-0002o2-JW; Mon, 05 Apr 2021 15:57:24 +0000 Received: from 54-240-197-235.amazon.com ([54.240.197.235] helo=ufe34d9ed68d054.ant.amazon.com) by xenbits.xenproject.org with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1lTRbQ-00053b-B0; Mon, 05 Apr 2021 15:57:24 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From; bh=UP5LznC0lJpah31eRGW2Mg+D4mlUlr8pP6zrBCltxpg=; b=fKxVMUNl5gG7H5iOYrMWGq7B/ 4p1nXE90RFkkuduYWN53HB64IKH3pa5RMwTXxDTvi1CUAIJI2YKX22vcUSR5YKlWhBSGMgi5rFup0 9yKFSloAfysJdwIXEO4F1qE29cF1ODgxDWlpwNnia2kgV1mV3qiiwtwcwRx5t4TsEmLBc=; From: Julien Grall To: xen-devel@lists.xenproject.org Cc: julien@xen.org, Julien Grall , Ian Jackson , Wei Liu Subject: [PATCH 05/14] tools/libs: guest: Use const whenever we point to literal strings Date: Mon, 5 Apr 2021 16:57:04 +0100 Message-Id: <20210405155713.29754-6-julien@xen.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210405155713.29754-1-julien@xen.org> References: <20210405155713.29754-1-julien@xen.org> X-ZohoMail-DKIM: pass (identity @xen.org) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Julien Grall literal strings are not meant to be modified. So we should use const *char rather than char * when we want to store a pointer to them. Signed-off-by: Julien Grall Acked-by: Wei Liu Reviewed-by: Anthony PERARD --- tools/include/xenguest.h | 10 +++++----- tools/libs/guest/xg_dom_core.c | 8 ++++---- tools/libs/guest/xg_dom_elfloader.c | 4 ++-- tools/libs/guest/xg_dom_hvmloader.c | 2 +- tools/libs/guest/xg_dom_x86.c | 9 +++++---- tools/libs/guest/xg_private.h | 2 +- 6 files changed, 18 insertions(+), 17 deletions(-) diff --git a/tools/include/xenguest.h b/tools/include/xenguest.h index 217022b6e767..a4492038cf3a 100644 --- a/tools/include/xenguest.h +++ b/tools/include/xenguest.h @@ -108,7 +108,7 @@ struct xc_dom_image { =20 /* info from (elf) kernel image */ struct elf_dom_parms *parms; - char *guest_type; + const char *guest_type; =20 /* memory layout */ struct xc_dom_seg kernel_seg; @@ -266,8 +266,8 @@ struct xc_dom_arch { /* arch-specific memory initialization. */ int (*meminit) (struct xc_dom_image * dom); =20 - char *guest_type; - char *native_protocol; + const char *guest_type; + const char *native_protocol; int page_shift; int sizeof_pfn; int p2m_base_supported; @@ -374,9 +374,9 @@ char *xc_dom_strdup(struct xc_dom_image *dom, const cha= r *str); =20 /* --- alloc memory pool ------------------------------------------- */ =20 -xen_pfn_t xc_dom_alloc_page(struct xc_dom_image *dom, char *name); +xen_pfn_t xc_dom_alloc_page(struct xc_dom_image *dom, const char *name); int xc_dom_alloc_segment(struct xc_dom_image *dom, - struct xc_dom_seg *seg, char *name, + struct xc_dom_seg *seg, const char *name, xen_vaddr_t start, xen_vaddr_t size); =20 /* --- misc bits --------------------------------------------------- */ diff --git a/tools/libs/guest/xg_dom_core.c b/tools/libs/guest/xg_dom_core.c index 98ef8e8fc9ca..4918ee517bdd 100644 --- a/tools/libs/guest/xg_dom_core.c +++ b/tools/libs/guest/xg_dom_core.c @@ -422,7 +422,7 @@ void *xc_dom_pfn_to_ptr_retcount(struct xc_dom_image *d= om, xen_pfn_t pfn, struct xc_dom_phys *phys; xen_pfn_t offset; unsigned int page_shift =3D XC_DOM_PAGE_SHIFT(dom); - char *mode =3D "unset"; + const char *mode =3D "unset"; =20 *count_out =3D 0; =20 @@ -525,7 +525,7 @@ void *xc_dom_pfn_to_ptr_retcount(struct xc_dom_image *d= om, xen_pfn_t pfn, return phys->ptr; } =20 -static int xc_dom_chk_alloc_pages(struct xc_dom_image *dom, char *name, +static int xc_dom_chk_alloc_pages(struct xc_dom_image *dom, const char *na= me, xen_pfn_t pages) { unsigned int page_size =3D XC_DOM_PAGE_SIZE(dom); @@ -576,7 +576,7 @@ static int xc_dom_alloc_pad(struct xc_dom_image *dom, x= en_vaddr_t boundary) } =20 int xc_dom_alloc_segment(struct xc_dom_image *dom, - struct xc_dom_seg *seg, char *name, + struct xc_dom_seg *seg, const char *name, xen_vaddr_t start, xen_vaddr_t size) { unsigned int page_size =3D XC_DOM_PAGE_SIZE(dom); @@ -611,7 +611,7 @@ int xc_dom_alloc_segment(struct xc_dom_image *dom, return 0; } =20 -xen_pfn_t xc_dom_alloc_page(struct xc_dom_image *dom, char *name) +xen_pfn_t xc_dom_alloc_page(struct xc_dom_image *dom, const char *name) { xen_vaddr_t start; xen_pfn_t pfn; diff --git a/tools/libs/guest/xg_dom_elfloader.c b/tools/libs/guest/xg_dom_= elfloader.c index 06e713fe1119..0d6247db5d08 100644 --- a/tools/libs/guest/xg_dom_elfloader.c +++ b/tools/libs/guest/xg_dom_elfloader.c @@ -50,8 +50,8 @@ void xc_elf_set_logfile(xc_interface *xch, struct elf_bin= ary *elf, =20 /* -----------------------------------------------------------------------= - */ =20 -static char *xc_dom_guest_type(struct xc_dom_image *dom, - struct elf_binary *elf) +static const char *xc_dom_guest_type(struct xc_dom_image *dom, + struct elf_binary *elf) { uint64_t machine =3D elf_uval(elf, elf->ehdr, e_machine); =20 diff --git a/tools/libs/guest/xg_dom_hvmloader.c b/tools/libs/guest/xg_dom_= hvmloader.c index ec6ebad7fd52..4e6f30858a59 100644 --- a/tools/libs/guest/xg_dom_hvmloader.c +++ b/tools/libs/guest/xg_dom_hvmloader.c @@ -130,7 +130,7 @@ static elf_errorstatus xc_dom_parse_hvm_kernel(struct x= c_dom_image *dom) =20 static int module_init_one(struct xc_dom_image *dom, struct xc_hvm_firmware_module *module, - char *name) + const char *name) { struct xc_dom_seg seg; void *dest; diff --git a/tools/libs/guest/xg_dom_x86.c b/tools/libs/guest/xg_dom_x86.c index 2953aeb90b35..e379b07f9945 100644 --- a/tools/libs/guest/xg_dom_x86.c +++ b/tools/libs/guest/xg_dom_x86.c @@ -1148,11 +1148,12 @@ static int vcpu_hvm(struct xc_dom_image *dom) =20 /* -----------------------------------------------------------------------= - */ =20 -static int x86_compat(xc_interface *xch, uint32_t domid, char *guest_type) +static int x86_compat(xc_interface *xch, uint32_t domid, + const char *guest_type) { static const struct { - char *guest; - uint32_t size; + const char *guest; + uint32_t size; } types[] =3D { { "xen-3.0-x86_32p", 32 }, { "xen-3.0-x86_64", 64 }, @@ -1664,7 +1665,7 @@ static int bootearly(struct xc_dom_image *dom) static int bootlate_pv(struct xc_dom_image *dom) { static const struct { - char *guest; + const char *guest; unsigned long pgd_type; } types[] =3D { { "xen-3.0-x86_32", MMUEXT_PIN_L2_TABLE}, diff --git a/tools/libs/guest/xg_private.h b/tools/libs/guest/xg_private.h index 8f9b257a2f3d..25e46d7ce195 100644 --- a/tools/libs/guest/xg_private.h +++ b/tools/libs/guest/xg_private.h @@ -43,7 +43,7 @@ #endif =20 struct xc_dom_loader { - char *name; + const char *name; /* Sadly the error returns from these functions are not consistent: */ elf_negerrnoval (*probe) (struct xc_dom_image * dom); elf_negerrnoval (*parser) (struct xc_dom_image * dom); --=20 2.17.1 From nobody Fri Mar 29 13:50:42 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org ARC-Seal: i=1; a=rsa-sha256; t=1617638264; cv=none; d=zohomail.com; s=zohoarc; b=XoinnwiNbUAVezmE8bcUYJ1+kA5sTz964k1EcoGWIPrZbiito8gS95YF+SCt5veGZ3Y54id1VM4pqjONLH/JeJ7IYSEzam9K0DA83ewaH1kCZ3n2APKM9mXJkKa0GzsLUQ64BWpceA+RZgnplt+EBpgt2j6xVG/2/Nh5uRJXwNk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1617638264; h=Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To; bh=KksYVhRFyICjFP1ckAs027N7azKI8dI/+aHOnCC8ZNM=; b=K/3gq5CuzB8vluzWr01wHd7mnOSVsOhYtk/9COkSvYHuhwcbja0I1J3yyAkFvRbE/gp4R6A/h9mq/JQf+ZPONJZqumOmGAaIgo8av/iojyJ6krcB0H06hADRtmLwGJlECQM1Cs+tt6XENjiBrVGdHIK67CABQb6kL1xZAyJ7eF4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1617638264473144.76547699811817; Mon, 5 Apr 2021 08:57:44 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.105399.201797 (Exim 4.92) (envelope-from ) id 1lTRbU-0002Jr-Cr; Mon, 05 Apr 2021 15:57:28 +0000 Received: by outflank-mailman (output) from mailman id 105399.201797; Mon, 05 Apr 2021 15:57:28 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1lTRbU-0002Jg-8S; Mon, 05 Apr 2021 15:57:28 +0000 Received: by outflank-mailman (input) for mailman id 105399; Mon, 05 Apr 2021 15:57:26 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1lTRbS-0002FR-Em for xen-devel@lists.xenproject.org; Mon, 05 Apr 2021 15:57:26 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1lTRbR-0002oD-LU; Mon, 05 Apr 2021 15:57:25 +0000 Received: from 54-240-197-235.amazon.com ([54.240.197.235] helo=ufe34d9ed68d054.ant.amazon.com) by xenbits.xenproject.org with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1lTRbR-00053b-BX; Mon, 05 Apr 2021 15:57:25 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From; bh=KksYVhRFyICjFP1ckAs027N7azKI8dI/+aHOnCC8ZNM=; b=MD7lFwzB7Qwcvo0bxHk/cU5DD RDZ8pugfP5wNpM9iE+LoFxmAAi2+x82jDVBUktTbN6r6/v2vcj9yuZjWSYgpW2W0xRNfbj9t7DzP0 nQzHyJ7I6AWMzbE+8yGh9lZhyWHM+s2kJjj+joi1uiclMGvy7Yvo8TBfIv8mrZULTD6KY=; From: Julien Grall To: xen-devel@lists.xenproject.org Cc: julien@xen.org, Julien Grall , Ian Jackson , Wei Liu Subject: [PATCH 06/14] tools/libs: stat: Use const whenever we point to literal strings Date: Mon, 5 Apr 2021 16:57:05 +0100 Message-Id: <20210405155713.29754-7-julien@xen.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210405155713.29754-1-julien@xen.org> References: <20210405155713.29754-1-julien@xen.org> X-ZohoMail-DKIM: pass (identity @xen.org) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Julien Grall literal strings are not meant to be modified. So we should use const char * rather than char * when we want to store a pointer to them. Signed-off-by: Julien Grall Acked-by: Wei Liu Reviewed-by: Anthony PERARD --- tools/libs/stat/xenstat_linux.c | 4 ++-- tools/libs/stat/xenstat_qmp.c | 12 ++++++------ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/tools/libs/stat/xenstat_linux.c b/tools/libs/stat/xenstat_linu= x.c index c00b26d4d898..875a0617ade8 100644 --- a/tools/libs/stat/xenstat_linux.c +++ b/tools/libs/stat/xenstat_linux.c @@ -66,7 +66,7 @@ static const char PROCNETDEV_HEADER[] =3D =20 /* We need to get the name of the bridge interface for use with bonding in= terfaces */ /* Use excludeName parameter to avoid adding bridges we don't care about, = eg. virbr0 */ -static void getBridge(char *excludeName, char *result, size_t resultLen) +static void getBridge(const char *excludeName, char *result, size_t result= Len) { struct dirent *de; DIR *d; @@ -113,7 +113,7 @@ static int parseNetDevLine(char *line, char *iface, uns= igned long long *rxBytes, int num =3D 19; =20 /* Regular exception to parse all the information from /proc/net/dev line= */ - char *regex =3D "([^:]*):([^ ]*)[ ]*([^ ]*)[ ]*([^ ]*)[ ]*([^ ]*)[ ]*([^ = ]*)[ ]*([^ ]*)" + const char *regex =3D "([^:]*):([^ ]*)[ ]*([^ ]*)[ ]*([^ ]*)[ ]*([^ ]*)[ = ]*([^ ]*)[ ]*([^ ]*)" "[ ]*([^ ]*)[ ]*([^ ]*)[ ]*([^ ]*)[ ]*([^ ]*)[ ]*([^ ]*)[ ]*([^ ]*)[ ]*" "([^ ]*)[ ]*([^ ]*)[ ]*([^ ]*)[ ]*([^ ]*)[ ]*([^ ]*)"; =20 diff --git a/tools/libs/stat/xenstat_qmp.c b/tools/libs/stat/xenstat_qmp.c index 0c5748ba68b3..2205a041313b 100644 --- a/tools/libs/stat/xenstat_qmp.c +++ b/tools/libs/stat/xenstat_qmp.c @@ -38,7 +38,7 @@ =20 #include =20 -static unsigned char *qmp_query(int, char *); +static unsigned char *qmp_query(int, const char *); =20 enum query_blockstats { QMP_STATS_RETURN =3D 0, @@ -80,7 +80,7 @@ enum query_block { static char *qmp_get_block_image(xenstat_node *node, char *qmp_devname, in= t qfd) { char *tmp, *file =3D NULL; - char *query_block_cmd =3D "{ \"execute\": \"query-block\" }"; + const char *query_block_cmd =3D "{ \"execute\": \"query-block\" }"; static const char *const qblock[] =3D { [ QMP_BLOCK_RETURN ] =3D "return", [ QMP_BLOCK_DEVICE ] =3D "device", @@ -264,7 +264,7 @@ done: } =20 /* Write a command via the QMP. Returns number of bytes written */ -static size_t qmp_write(int qfd, char *cmd, size_t cmd_len) +static size_t qmp_write(int qfd, const char *cmd, size_t cmd_len) { size_t pos =3D 0; ssize_t res; @@ -317,7 +317,7 @@ static int qmp_read(int qfd, unsigned char **qstats) } =20 /* With the given cmd, query QMP for requested data. Returns allocated buf= fer containing data or NULL */ -static unsigned char *qmp_query(int qfd, char *cmd) +static unsigned char *qmp_query(int qfd, const char *cmd) { unsigned char *qstats =3D NULL; int n; @@ -385,8 +385,8 @@ static int qmp_connect(char *path) */ static void read_attributes_qdisk_dom(xenstat_node *node, domid_t domain) { - char *cmd_mode =3D "{ \"execute\": \"qmp_capabilities\" }"; - char *query_blockstats_cmd =3D "{ \"execute\": \"query-blockstats\" }"; + const char *cmd_mode =3D "{ \"execute\": \"qmp_capabilities\" }"; + const char *query_blockstats_cmd =3D "{ \"execute\": \"query-blockstats\"= }"; unsigned char *qmp_stats, *val; char path[80]; int qfd; --=20 2.17.1 From nobody Fri Mar 29 13:50:42 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org ARC-Seal: i=1; a=rsa-sha256; t=1617638263; cv=none; d=zohomail.com; s=zohoarc; b=BqEH6jsjpewyATJMd9JnPcyR8eNt6gacRDQuwsxerQg1n65LjlpoO1kipBVqH+VQ3l3g/MDFMKKqYlOsWs/FAqkvHNYwbpd+n/QFCfEFOa/3daAFngPLjH5ouoN5FsT5wOye6vPVHXseRGXNkhs1b1NQoqarSQA9PRZE41zF8lY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1617638263; h=Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To; bh=fSnIgvoSjbUt91Rc+3WKbTs8Y6JmyyNkB+9IjjcALAg=; b=OOyHic/bM145tkXKwBbCC9TzGbKUkWzRvW/jWxTTnFI4k59E5Z6TiY8eOi1465EhvswfQGjGKYBFYkA+7ddGItXtR1bsPFAxj+G92dDCrfnvIywXNslsDW+lsBLfTA11HwaU7SR/+3rT9sN1FG33s4Jxm0t3TRGTnDUZM+CgMiY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1617638263859238.5823265589354; Mon, 5 Apr 2021 08:57:43 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.105400.201803 (Exim 4.92) (envelope-from ) id 1lTRbV-0002LF-09; Mon, 05 Apr 2021 15:57:29 +0000 Received: by outflank-mailman (output) from mailman id 105400.201803; Mon, 05 Apr 2021 15:57:28 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1lTRbU-0002Kq-MN; Mon, 05 Apr 2021 15:57:28 +0000 Received: by outflank-mailman (input) for mailman id 105400; Mon, 05 Apr 2021 15:57:27 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1lTRbT-0002Hp-Ab for xen-devel@lists.xenproject.org; Mon, 05 Apr 2021 15:57:27 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1lTRbS-0002oL-Nz; Mon, 05 Apr 2021 15:57:26 +0000 Received: from 54-240-197-235.amazon.com ([54.240.197.235] helo=ufe34d9ed68d054.ant.amazon.com) by xenbits.xenproject.org with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1lTRbS-00053b-Fh; Mon, 05 Apr 2021 15:57:26 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From; bh=fSnIgvoSjbUt91Rc+3WKbTs8Y6JmyyNkB+9IjjcALAg=; b=49TpKmuxcFkNIHf0NZn/D91QM liDzLY1pqQul9K2C/SIHFl+oM8o+pki3Cl4fUQm2psyk8/+nCbY6jUqjIBBEBzoI4Zap7OFnIWMr5 UKWnKZ9aH40D6z1jqY5HMTS537E5FENgqwyZiQgXenW3kkRonsxeLecm88Ks4xK7sd1Fk=; From: Julien Grall To: xen-devel@lists.xenproject.org Cc: julien@xen.org, Julien Grall , Ian Jackson , Wei Liu , Anthony PERARD Subject: [PATCH 07/14] tools/xl: Use const whenever we point to literal strings Date: Mon, 5 Apr 2021 16:57:06 +0100 Message-Id: <20210405155713.29754-8-julien@xen.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210405155713.29754-1-julien@xen.org> References: <20210405155713.29754-1-julien@xen.org> X-ZohoMail-DKIM: pass (identity @xen.org) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Julien Grall literal strings are not meant to be modified. So we should use const char * rather than char * when we want to store a pointer to them. Signed-off-by: Julien Grall Acked-by: Wei Liu --- tools/xl/xl.h | 8 ++++---- tools/xl/xl_console.c | 2 +- tools/xl/xl_utils.c | 4 ++-- tools/xl/xl_utils.h | 4 ++-- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/tools/xl/xl.h b/tools/xl/xl.h index 137a29077c1e..3052e3db0072 100644 --- a/tools/xl/xl.h +++ b/tools/xl/xl.h @@ -21,13 +21,13 @@ #include =20 struct cmd_spec { - char *cmd_name; + const char *cmd_name; int (*cmd_impl)(int argc, char **argv); int can_dryrun; int modifies; - char *cmd_desc; - char *cmd_usage; - char *cmd_option; + const char *cmd_desc; + const char *cmd_usage; + const char *cmd_option; }; =20 struct domain_create { diff --git a/tools/xl/xl_console.c b/tools/xl/xl_console.c index 4e65d7386733..b27f9e013697 100644 --- a/tools/xl/xl_console.c +++ b/tools/xl/xl_console.c @@ -27,7 +27,7 @@ int main_console(int argc, char **argv) uint32_t domid; int opt =3D 0, num =3D 0; libxl_console_type type =3D 0; - char *console_names =3D "pv, serial, vuart"; + const char *console_names =3D "pv, serial, vuart"; =20 SWITCH_FOREACH_OPT(opt, "n:t:", NULL, "console", 1) { case 't': diff --git a/tools/xl/xl_utils.c b/tools/xl/xl_utils.c index 4503ac7ea03c..17489d182954 100644 --- a/tools/xl/xl_utils.c +++ b/tools/xl/xl_utils.c @@ -27,7 +27,7 @@ #include "xl.h" #include "xl_utils.h" =20 -void dolog(const char *file, int line, const char *func, char *fmt, ...) +void dolog(const char *file, int line, const char *func, const char *fmt, = ...) { va_list ap; char *s =3D NULL; @@ -248,7 +248,7 @@ void print_bitmap(uint8_t *map, int maplen, FILE *strea= m) } } =20 -int do_daemonize(char *name, const char *pidfile) +int do_daemonize(const char *name, const char *pidfile) { char *fullname; pid_t child1; diff --git a/tools/xl/xl_utils.h b/tools/xl/xl_utils.h index d98b419f1075..0c337ede954b 100644 --- a/tools/xl/xl_utils.h +++ b/tools/xl/xl_utils.h @@ -123,7 +123,7 @@ int def_getopt(int argc, char * const argv[], const struct option *longopts, const char* helpstr, int reqargs); =20 -void dolog(const char *file, int line, const char *func, char *fmt, ...) +void dolog(const char *file, int line, const char *func, const char *fmt, = ...) __attribute__((format(printf,4,5))); =20 void xvasprintf(char **strp, const char *fmt, va_list ap) @@ -143,7 +143,7 @@ uint32_t find_domain(const char *p) __attribute__((warn= _unused_result)); =20 void print_bitmap(uint8_t *map, int maplen, FILE *stream); =20 -int do_daemonize(char *name, const char *pidfile); +int do_daemonize(const char *name, const char *pidfile); #endif /* XL_UTILS_H */ =20 /* --=20 2.17.1 From nobody Fri Mar 29 13:50:42 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org ARC-Seal: i=1; a=rsa-sha256; t=1617638267; cv=none; d=zohomail.com; s=zohoarc; b=i1egCxbsTOd6mIJifyR7pIHgzvQ0rfjlGEAOQdVAskP9F9FCoJ7GGEWYj82ZIakzfYEa+M4G+N/LnI0vS8u9DEwFvTro910i8E8VROEbFBRXRBR3UNmcQ9npIzOFCX4K7FQI8rLC4okSulS8urnEAikByP/wxPIOEfCYs5El0JA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1617638267; h=Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To; bh=lyhRqrnLbAOU2YP7TBUMqJqT/uwbvMLMSBzL3B6aYDM=; b=Y7Xb1RugKHhBvGVOOkHA4hVsP/CWN2DbMouQdljU8sNLjhHTZdj7kO4uqzmvgiojkCqFVioVOSyz0GNM3qFxpKEzHx5JVIxwWQdyX24a1yjRGK8y6tgjvUN8M/4S38MX82puqGdFH2+gukLjyj+E+HLeEof1NmFOUogq+c53wwQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1617638267495551.7226915111052; Mon, 5 Apr 2021 08:57:47 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.105401.201821 (Exim 4.92) (envelope-from ) id 1lTRbX-0002S9-MZ; Mon, 05 Apr 2021 15:57:31 +0000 Received: by outflank-mailman (output) from mailman id 105401.201821; Mon, 05 Apr 2021 15:57:31 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1lTRbX-0002Rn-GV; Mon, 05 Apr 2021 15:57:31 +0000 Received: by outflank-mailman (input) for mailman id 105401; Mon, 05 Apr 2021 15:57:29 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1lTRbU-0002LQ-RY for xen-devel@lists.xenproject.org; Mon, 05 Apr 2021 15:57:28 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1lTRbU-0002oS-3D; Mon, 05 Apr 2021 15:57:28 +0000 Received: from 54-240-197-235.amazon.com ([54.240.197.235] helo=ufe34d9ed68d054.ant.amazon.com) by xenbits.xenproject.org with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1lTRbT-00053b-RA; Mon, 05 Apr 2021 15:57:28 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From; bh=lyhRqrnLbAOU2YP7TBUMqJqT/uwbvMLMSBzL3B6aYDM=; b=3Gr5r9LZKz7autrB/fEbv7nk4 Ly3bxyt5lzdn97NLfjISrWngoQbegaXsde6Lwr3CrIngHV7M9hPpwSlT3WDkIRs7LsBNZ5GJCJlKG /dNxd9cj8TTaG/oNE7j4QlTNDneyiXVGPBsqpVmSar+7k68jy6uvQS9gzHYz79qx6eaRg=; From: Julien Grall To: xen-devel@lists.xenproject.org Cc: julien@xen.org, Julien Grall , Jan Beulich , Andrew Cooper , =?UTF-8?q?Roger=20Pau=20Monn=C3=A9?= , Wei Liu , Ian Jackson Subject: [PATCH 08/14] tools/firmware: hvmloader: Use const in __bug() and __assert_failed() Date: Mon, 5 Apr 2021 16:57:07 +0100 Message-Id: <20210405155713.29754-9-julien@xen.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210405155713.29754-1-julien@xen.org> References: <20210405155713.29754-1-julien@xen.org> X-ZohoMail-DKIM: pass (identity @xen.org) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Julien Grall __bug() and __assert_failed() are not meant to modify the string parameters. So mark them as const. Signed-off-by: Julien Grall Acked-by: Wei Liu Reviewed-by: Roger Pau Monn=C3=A9 --- tools/firmware/hvmloader/util.c | 4 ++-- tools/firmware/hvmloader/util.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tools/firmware/hvmloader/util.c b/tools/firmware/hvmloader/uti= l.c index 7da144b0bb15..581b35e5cfb5 100644 --- a/tools/firmware/hvmloader/util.c +++ b/tools/firmware/hvmloader/util.c @@ -722,14 +722,14 @@ static void __attribute__((noreturn)) crash(void) asm volatile ( "hlt" ); } =20 -void __assert_failed(char *assertion, char *file, int line) +void __assert_failed(const char *assertion, const char *file, int line) { printf("*** HVMLoader assertion '%s' failed at %s:%d\n", assertion, file, line); crash(); } =20 -void __bug(char *file, int line) +void __bug(const char *file, int line) { printf("*** HVMLoader bug at %s:%d\n", file, line); crash(); diff --git a/tools/firmware/hvmloader/util.h b/tools/firmware/hvmloader/uti= l.h index 4f0baade0e6c..8d95eab28a65 100644 --- a/tools/firmware/hvmloader/util.h +++ b/tools/firmware/hvmloader/util.h @@ -34,11 +34,11 @@ enum { #undef NULL #define NULL ((void*)0) =20 -void __assert_failed(char *assertion, char *file, int line) +void __assert_failed(const char *assertion, const char *file, int line) __attribute__((noreturn)); #define ASSERT(p) \ do { if (!(p)) __assert_failed(#p, __FILE__, __LINE__); } while (0) -void __bug(char *file, int line) __attribute__((noreturn)); +void __bug(const char *file, int line) __attribute__((noreturn)); #define BUG() __bug(__FILE__, __LINE__) #define BUG_ON(p) do { if (p) BUG(); } while (0) #define BUILD_BUG_ON(p) ((void)sizeof(char[1 - 2 * !!(p)])) --=20 2.17.1 From nobody Fri Mar 29 13:50:42 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org ARC-Seal: i=1; a=rsa-sha256; t=1617638266; cv=none; d=zohomail.com; s=zohoarc; b=NPzdUl3I41KOemyFujhUDZ9hrJHOTgctyBt4ZAHDQYqwgvd7H8MFtyDJzF1kWJ9exCyJWcH3YQv2WSWvIr3mwochzr1iHpxRMA33Q4YFQNRzrYNCS8YYxpcon/Z+0xNKI7NXd9/BefIv4zzChKCmGolvCAm1tMliI1quoAERlZM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1617638266; h=Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To; bh=UgMhryuGQDNF+IkibD7yNt0PjYxYcwu1lo/PGDlCLKY=; b=mpWPs+aXzDcrlUHgoc6GWtTHB+rj/LlJLMUMm5s2TJY6iv4CZ7GctXZFJMafbEOGNgyThmbl48k+KW9IROBlSckb3gPM1gCYGBR4EGisO8lEHKvLpCWKDbqJTv5oDRssfS6n+c6xHZP6+RoQB1Sp0y9dsFycM+FatXucQ3ICiwc= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1617638266582570.96309189698; Mon, 5 Apr 2021 08:57:46 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.105402.201829 (Exim 4.92) (envelope-from ) id 1lTRbY-0002TX-IF; Mon, 05 Apr 2021 15:57:32 +0000 Received: by outflank-mailman (output) from mailman id 105402.201829; Mon, 05 Apr 2021 15:57:32 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1lTRbY-0002T5-0E; Mon, 05 Apr 2021 15:57:32 +0000 Received: by outflank-mailman (input) for mailman id 105402; Mon, 05 Apr 2021 15:57:30 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1lTRbV-0002OA-Qm for xen-devel@lists.xenproject.org; Mon, 05 Apr 2021 15:57:29 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1lTRbV-0002oY-3V; Mon, 05 Apr 2021 15:57:29 +0000 Received: from 54-240-197-235.amazon.com ([54.240.197.235] helo=ufe34d9ed68d054.ant.amazon.com) by xenbits.xenproject.org with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1lTRbU-00053b-RZ; Mon, 05 Apr 2021 15:57:29 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From; bh=UgMhryuGQDNF+IkibD7yNt0PjYxYcwu1lo/PGDlCLKY=; b=bK51hyrcTT4viBqIAN1cWJGfC wDeFEzPJc59SCRpH4goiKY8qLNzgak/3/yWAPp2fjlQ9lW7KuFNoY4jzspPaP1t6GwB6rUSdOvqpg Owg7mfSgH7KOQZAOK0O0XUR62ee/usQYpI9yOoglRBSfzkeKH1Y0WXik9zTTeH6PVtzaY=; From: Julien Grall To: xen-devel@lists.xenproject.org Cc: julien@xen.org, Julien Grall , Ian Jackson , Wei Liu Subject: [PATCH 09/14] tools/console: Use const whenever we point to literal strings Date: Mon, 5 Apr 2021 16:57:08 +0100 Message-Id: <20210405155713.29754-10-julien@xen.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210405155713.29754-1-julien@xen.org> References: <20210405155713.29754-1-julien@xen.org> X-ZohoMail-DKIM: pass (identity @xen.org) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Julien Grall literal strings are not meant to be modified. So we should use const char * rather than char * when we want to store a pointer to them. Signed-off-by: Julien Grall Acked-by: Wei Liu --- tools/console/client/main.c | 4 ++-- tools/console/daemon/io.c | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/tools/console/client/main.c b/tools/console/client/main.c index 088be28dff02..80157be42144 100644 --- a/tools/console/client/main.c +++ b/tools/console/client/main.c @@ -325,7 +325,7 @@ int main(int argc, char **argv) { struct termios attr; int domid; - char *sopt =3D "hn:"; + const char *sopt =3D "hn:"; int ch; unsigned int num =3D 0; int opt_ind=3D0; @@ -345,7 +345,7 @@ int main(int argc, char **argv) char *end; console_type type =3D CONSOLE_INVAL; bool interactive =3D 0; - char *console_names =3D "serial, pv, vuart"; + const char *console_names =3D "serial, pv, vuart"; =20 while((ch =3D getopt_long(argc, argv, sopt, lopt, &opt_ind)) !=3D -1) { switch(ch) { diff --git a/tools/console/daemon/io.c b/tools/console/daemon/io.c index 4af27ffc5d02..6a8a94e31b65 100644 --- a/tools/console/daemon/io.c +++ b/tools/console/daemon/io.c @@ -87,14 +87,14 @@ struct buffer { }; =20 struct console { - char *ttyname; + const char *ttyname; int master_fd; int master_pollfd_idx; int slave_fd; int log_fd; struct buffer buffer; char *xspath; - char *log_suffix; + const char *log_suffix; int ring_ref; xenevtchn_handle *xce_handle; int xce_pollfd_idx; @@ -109,9 +109,9 @@ struct console { }; =20 struct console_type { - char *xsname; - char *ttyname; - char *log_suffix; + const char *xsname; + const char *ttyname; + const char *log_suffix; bool optional; bool use_gnttab; }; --=20 2.17.1 From nobody Fri Mar 29 13:50:42 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org ARC-Seal: i=1; a=rsa-sha256; t=1617639304; cv=none; d=zohomail.com; s=zohoarc; b=X/j2ajh1T605VRo1tGRefxrjUMWQpTK/I8/fQ20MFK7X0zWnmry7x5DvNcTjvoqGy0q3xLTRaTL7T646viqPbYgRZWPZ05OMnAaXcwAiFxzhGOUX/0oYMG3uIdangFfP/Z5RSBLYw1OHevXOK41K9z120bqhXA/S02tTTfnAy9o= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1617639304; h=Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To; bh=sR7NYKPgQAvYGz7bA4ItKG/zjd8QeLXKq9gu3Bw4Bo0=; b=c9+7mQeePOnKRU18Fb0dNNoMxTFcAsYPbsrnWNZsXynTwsqh/776Khkuaue5/so8lc8PyluefJ9rYfNZ8AJ+bRp5wKhCR+GF6nwGX/Emw/QkQ3W0abB83PLYOAXAjlhLp13gGVDoDjrDOefLi04K2bOZ0kGoj1rdYaeQjaKk798= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 161763930495658.82088820791023; Mon, 5 Apr 2021 09:15:04 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.105455.201885 (Exim 4.92) (envelope-from ) id 1lTRsB-0005Y0-Nf; Mon, 05 Apr 2021 16:14:43 +0000 Received: by outflank-mailman (output) from mailman id 105455.201885; Mon, 05 Apr 2021 16:14:43 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1lTRsB-0005Xf-E2; Mon, 05 Apr 2021 16:14:43 +0000 Received: by outflank-mailman (input) for mailman id 105455; Mon, 05 Apr 2021 16:14:40 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1lTRs8-0005UO-TX for xen-devel@lists.xenproject.org; Mon, 05 Apr 2021 16:14:40 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1lTRs6-0003ew-KW; Mon, 05 Apr 2021 16:14:38 +0000 Received: from 54-240-197-235.amazon.com ([54.240.197.235] helo=ufe34d9ed68d054.ant.amazon.com) by xenbits.xenproject.org with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1lTRbV-00053b-Vi; Mon, 05 Apr 2021 15:57:30 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From; bh=sR7NYKPgQAvYGz7bA4ItKG/zjd8QeLXKq9gu3Bw4Bo0=; b=6Lhk6beOV2W/H6rvRwFqdqbM7 xp78Qoz4oBW2SFdz8d8l3y2Paat0sOf9+y7S1K12LJJE49qqmdANkIOT+xghkfXeTTbEOYkhjGGB5 uAfW2i7iNvKAEdJnXHGnCjneTV67dMcXpnMTecvO+Ok96QJlUL0Mmz6CdHJXKkzFiL3sQ=; From: Julien Grall To: xen-devel@lists.xenproject.org Cc: julien@xen.org, Julien Grall , Tim Deegan , Ian Jackson , Wei Liu Subject: [PATCH 10/14] tools/kdd: Use const whenever we point to literal strings Date: Mon, 5 Apr 2021 16:57:09 +0100 Message-Id: <20210405155713.29754-11-julien@xen.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210405155713.29754-1-julien@xen.org> References: <20210405155713.29754-1-julien@xen.org> X-ZohoMail-DKIM: pass (identity @xen.org) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Julien Grall literal strings are not meant to be modified. So we should use const char * rather than char * when we want to shore a pointer to them. Signed-off-by: Julien Grall Acked-by: Tim Deegan Acked-by: Wei Liu --- tools/debugger/kdd/kdd.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/tools/debugger/kdd/kdd.c b/tools/debugger/kdd/kdd.c index a7d0976ea4a8..17513c26505e 100644 --- a/tools/debugger/kdd/kdd.c +++ b/tools/debugger/kdd/kdd.c @@ -67,7 +67,7 @@ typedef struct { uint32_t build; =20 int w64; int mp; - char *name; + const char *name; uint64_t base; /* KernBase: start looking here */ uint32_t range; /* | and search an area this size = */ uint32_t version; /* +-> NtBuildNumber */ @@ -237,7 +237,7 @@ static size_t blocking_write(int fd, const void *buf, s= ize_t count) } =20 /* Dump the contents of a complete serial packet into a log file. */ -static void kdd_log_pkt(kdd_state *s, char *name, kdd_pkt *p) +static void kdd_log_pkt(kdd_state *s, const char *name, kdd_pkt *p) { uint32_t sum =3D 0; unsigned int i, j; @@ -504,8 +504,8 @@ static int check_os(kdd_state *s) * @return -1 on failure to find the section name * @return 0 on success */ -static int get_pe64_sections(kdd_state *s, uint64_t filebase, char *sectna= me, - uint64_t *vaddr, uint32_t *vsize) +static int get_pe64_sections(kdd_state *s, uint64_t filebase, + const char *sectname, uint64_t *vaddr, uint32_t *vsize) { uint64_t pe_hdr =3D 0; uint64_t sect_start =3D 0; @@ -781,7 +781,7 @@ static void kdd_send_cmd(kdd_state *s, uint32_t subtype= , size_t extra) } =20 /* Cause the client to print a string */ -static void kdd_send_string(kdd_state *s, char *fmt, ...) +static void kdd_send_string(kdd_state *s, const char *fmt, ...) { uint32_t len =3D 0xffff - sizeof (kdd_msg); char *buf =3D (char *) s->txb + sizeof (kdd_hdr) + sizeof (kdd_msg); --=20 2.17.1 From nobody Fri Mar 29 13:50:42 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org ARC-Seal: i=1; a=rsa-sha256; t=1617639304; cv=none; d=zohomail.com; s=zohoarc; b=IXVQ6V6nuyoWmqcVYrNFSnFtHtTNzZr7qrnTbPdl4skZtbTPdK6RFMNRxGAjHIJa59t4IfkZpdp1jNFu8sdND5rvBws97OLP8BkL8GBH8gn0r4BUGYMF6FyhPFL5+DXpj9uwdHCoUD//nYm5DcpjOEH2t1SeP+K6cMnBcpfDpKU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1617639304; h=Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To; bh=fOozlpcQqX3U35FdV5utWkSVhrMD0HRaxwSjYqjDLQU=; b=G9LrGMMwjHu9G8LZm+L+9B7Y2RGEaMdGQzD+YBAXh1mFGuRxWlEYlIZstYs4gUyIIrLEUP/60W17smMyXoTSds7QbsUEX1Alo02hV+9+fnasfp/LCseJWZFBeC+nhfmxkreWnN/1DC+FcFF/lHalK4lPrPP7Qaueukzq4YSwY28= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1617639304332264.5972556938643; Mon, 5 Apr 2021 09:15:04 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.105452.201851 (Exim 4.92) (envelope-from ) id 1lTRsA-0005V5-Ct; Mon, 05 Apr 2021 16:14:42 +0000 Received: by outflank-mailman (output) from mailman id 105452.201851; Mon, 05 Apr 2021 16:14:42 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1lTRsA-0005Uu-6H; Mon, 05 Apr 2021 16:14:42 +0000 Received: by outflank-mailman (input) for mailman id 105452; Mon, 05 Apr 2021 16:14:39 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1lTRs7-0005U6-PK for xen-devel@lists.xenproject.org; Mon, 05 Apr 2021 16:14:39 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1lTRs6-0003eu-H5; Mon, 05 Apr 2021 16:14:38 +0000 Received: from 54-240-197-235.amazon.com ([54.240.197.235] helo=ufe34d9ed68d054.ant.amazon.com) by xenbits.xenproject.org with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1lTRbW-00053b-W8; Mon, 05 Apr 2021 15:57:31 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From; bh=fOozlpcQqX3U35FdV5utWkSVhrMD0HRaxwSjYqjDLQU=; b=s3UuLNW5J0CRb7QQWuy3WCObx 9Gdg6FRWFWbkIYxzFKoZOv2val092fE4cOQzcRm4YVQZ31kwcWJ3NT60CRP2B9jujZTo3yvvEONJz 7FInxspUOxEYrqmX/FCyAO/5RTJMMjSXJx9QixNpURGdf4BHNYESij6Ke2nVKGjrv2FC4=; From: Julien Grall To: xen-devel@lists.xenproject.org Cc: julien@xen.org, Julien Grall , Ian Jackson , Wei Liu Subject: [PATCH 11/14] tools/misc: Use const whenever we point to literal strings Date: Mon, 5 Apr 2021 16:57:10 +0100 Message-Id: <20210405155713.29754-12-julien@xen.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210405155713.29754-1-julien@xen.org> References: <20210405155713.29754-1-julien@xen.org> X-ZohoMail-DKIM: pass (identity @xen.org) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Julien Grall literal strings are not meant to be modified. So we should use const char * rather than char * when we we to store a pointer to them. Signed-off-by: Julien Grall Acked-by: Wei Liu Reviewed-by: Anthony PERARD --- tools/misc/xen-detect.c | 2 +- tools/misc/xenhypfs.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tools/misc/xen-detect.c b/tools/misc/xen-detect.c index eac9e46a35bb..18b28dabf311 100644 --- a/tools/misc/xen-detect.c +++ b/tools/misc/xen-detect.c @@ -44,7 +44,7 @@ enum guest_type { XEN_NONE =3D 3 }; =20 -static char *type; +static const char *type; static char *ver; =20 static void cpuid(uint32_t idx, uint32_t *regs, int pv_context) diff --git a/tools/misc/xenhypfs.c b/tools/misc/xenhypfs.c index 5da24aed905c..df398b07bdc0 100644 --- a/tools/misc/xenhypfs.c +++ b/tools/misc/xenhypfs.c @@ -81,9 +81,9 @@ static int xenhypfs_wr(char *path, char *val) return ret; } =20 -static char *xenhypfs_type(struct xenhypfs_dirent *ent) +static const char *xenhypfs_type(struct xenhypfs_dirent *ent) { - char *res; + const char *res; =20 switch (ent->type) { case xenhypfs_type_dir: @@ -134,7 +134,7 @@ static int xenhypfs_ls(char *path) return ret; } =20 -static int xenhypfs_tree_sub(char *path, unsigned int depth) +static int xenhypfs_tree_sub(const char *path, unsigned int depth) { struct xenhypfs_dirent *ent; unsigned int n, i; --=20 2.17.1 From nobody Fri Mar 29 13:50:42 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org ARC-Seal: i=1; a=rsa-sha256; t=1617639303; cv=none; d=zohomail.com; s=zohoarc; b=bxTkGg1PAyKXF2/KYLlAkC/5nOSebdcZsHIy5NVLVxSV49vu430erS6x1Vul/SfvVxgcZRmvjpb7/Q1pyeyX+fN0zF0Zn4/DDhpMKUzR/ATlCuS13WHXW16JHl2PaO5pCPA0jD+GIkC5ZwycXoeP1PIaefSljKhFb57+kZvBRGk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1617639303; h=Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To; bh=1rVbgSKi2I81qCiY+TmphdtF7pMSqnTa8m6g9BTXjUI=; b=FWjQo9EcyUuIG/6jMZSyZY0zzpEWPLGfA7sxUgpfvcx1ztsPe3iPgtIA33UGy/J5RxFUecmQGOJJaK6NRdVli9SD+v5zcNISXw2fVEwMG3vomrFjTdU8Jfo9aqPcgWq/fwE8199OooTJTzgwryUzQSm/WUdOZnaKDQkq9r6CzdM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1617639303746421.7055654965544; Mon, 5 Apr 2021 09:15:03 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.105453.201861 (Exim 4.92) (envelope-from ) id 1lTRsA-0005Vl-Nb; Mon, 05 Apr 2021 16:14:42 +0000 Received: by outflank-mailman (output) from mailman id 105453.201861; Mon, 05 Apr 2021 16:14:42 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1lTRsA-0005VW-G5; Mon, 05 Apr 2021 16:14:42 +0000 Received: by outflank-mailman (input) for mailman id 105453; Mon, 05 Apr 2021 16:14:39 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1lTRs7-0005U5-PK for xen-devel@lists.xenproject.org; Mon, 05 Apr 2021 16:14:39 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1lTRs6-0003f0-O5; Mon, 05 Apr 2021 16:14:38 +0000 Received: from 54-240-197-235.amazon.com ([54.240.197.235] helo=ufe34d9ed68d054.ant.amazon.com) by xenbits.xenproject.org with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1lTRbY-00053b-0I; Mon, 05 Apr 2021 15:57:32 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From; bh=1rVbgSKi2I81qCiY+TmphdtF7pMSqnTa8m6g9BTXjUI=; b=QZuh8HPVEcn1Kzdt/lFtkO/nW RtCGPYMVw2cVNrH0epDwZ5Eo55VeWcPPnYZT8x4dAa7KnvS6EKNMGh53IcV1wAp0/Y2tMhN95jMbC tD7vY3/eGnfiQp7Tuz+9FF1nTVSjCvFIfTP0BR/89L2N12L2cY/ZBBtCMBXG2pWY291NI=; From: Julien Grall To: xen-devel@lists.xenproject.org Cc: julien@xen.org, Julien Grall , Ian Jackson , Wei Liu Subject: [PATCH 12/14] tools/top: The string parameter in set_prompt() and set_delay() should be const Date: Mon, 5 Apr 2021 16:57:11 +0100 Message-Id: <20210405155713.29754-13-julien@xen.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210405155713.29754-1-julien@xen.org> References: <20210405155713.29754-1-julien@xen.org> X-ZohoMail-DKIM: pass (identity @xen.org) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Julien Grall Neither string parameter in set_prompt() and set_delay() are meant to be modified. In particular, new_prompt can point to a literal string. So mark the two parameters as const and propagate it. Signed-off-by: Julien Grall Acked-by: Wei Liu Reviewed-by: Anthony PERARD --- tools/xentop/xentop.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/tools/xentop/xentop.c b/tools/xentop/xentop.c index ebed070c0fa2..950e8935c4c1 100644 --- a/tools/xentop/xentop.c +++ b/tools/xentop/xentop.c @@ -81,8 +81,8 @@ static int current_row(void); static int lines(void); static void print(const char *, ...) __attribute__((format(printf,1,2))); static void attr_addstr(int attr, const char *str); -static void set_delay(char *value); -static void set_prompt(char *new_prompt, void (*func)(char *)); +static void set_delay(const char *value); +static void set_prompt(const char *new_prompt, void (*func)(const char *)); static int handle_key(int); static int compare(unsigned long long, unsigned long long); static int compare_domains(xenstat_domain **, xenstat_domain **); @@ -212,10 +212,10 @@ int show_vbds =3D 0; int repeat_header =3D 0; int show_full_name =3D 0; #define PROMPT_VAL_LEN 80 -char *prompt =3D NULL; +const char *prompt =3D NULL; char prompt_val[PROMPT_VAL_LEN]; int prompt_val_len =3D 0; -void (*prompt_complete_func)(char *); +void (*prompt_complete_func)(const char *); =20 static WINDOW *cwin; =20 @@ -331,7 +331,7 @@ static void attr_addstr(int attr, const char *str) } =20 /* Handle setting the delay from the user-supplied value in prompt_val */ -static void set_delay(char *value) +static void set_delay(const char *value) { int new_delay; new_delay =3D atoi(value); @@ -341,7 +341,7 @@ static void set_delay(char *value) =20 /* Enable prompting mode with the given prompt string; call the given func= tion * when a value is available. */ -static void set_prompt(char *new_prompt, void (*func)(char *)) +static void set_prompt(const char *new_prompt, void (*func)(const char *)) { prompt =3D new_prompt; prompt_val[0] =3D '\0'; --=20 2.17.1 From nobody Fri Mar 29 13:50:42 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org ARC-Seal: i=1; a=rsa-sha256; t=1617639304; cv=none; d=zohomail.com; s=zohoarc; b=VD/xO0NlGNthepBwxB3lfzSqWmHr7CFSPxUgRtohGIdI5aH4PwfZE2BLhqsQFntI5LLKj2vjXy4RBAAWm7RHBaFzcFUWu0xtTcMx0jN7RbiFhcXnftP+yKcYWbm6GZaVCbnKt5rs068fnhZk8lsH/r6rud8wcOvWRvvPqnImlFI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1617639304; h=Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To; bh=Gq4ESA+bbIOEoTSTMGcB7GGXPzKwaa55TZ5zrqKmigw=; b=XctV0dhRVwMN+6BiaZqVrdbwCCFqFq7orfJBFRThPMpuURJ7wE4yFg/7+ndoW/YHOs9zgy2KRYXUCbxYjNaZM9UQMQ9dS3KdJiOgEsW+w3ijwe6MZmnxhjqRAAJCzt4N9/6bgaZeoHO/rpFuOHw19BoHWLGoLTOjzAl1SiUuUzI= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1617639304287983.3672174059792; Mon, 5 Apr 2021 09:15:04 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.105451.201845 (Exim 4.92) (envelope-from ) id 1lTRsA-0005Ua-1o; Mon, 05 Apr 2021 16:14:42 +0000 Received: by outflank-mailman (output) from mailman id 105451.201845; Mon, 05 Apr 2021 16:14:42 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1lTRs9-0005UT-Uf; Mon, 05 Apr 2021 16:14:41 +0000 Received: by outflank-mailman (input) for mailman id 105451; Mon, 05 Apr 2021 16:14:39 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1lTRs7-0005U4-PK for xen-devel@lists.xenproject.org; Mon, 05 Apr 2021 16:14:39 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1lTRs6-0003ey-MJ; Mon, 05 Apr 2021 16:14:38 +0000 Received: from 54-240-197-235.amazon.com ([54.240.197.235] helo=ufe34d9ed68d054.ant.amazon.com) by xenbits.xenproject.org with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1lTRbZ-00053b-0i; Mon, 05 Apr 2021 15:57:33 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From; bh=Gq4ESA+bbIOEoTSTMGcB7GGXPzKwaa55TZ5zrqKmigw=; b=kW8nFemdtlQUkKpZjaUYbvq/a mF1OLiI2f3BLuq+h3OaS05P4bbOnfGec/wzj6vAAaKTQ8WQg+62jP5LCSAxuheympoBsBRDPSVO8d RXGq2eHcME2KHZkSmUjGjf73rw1dIaZOBLGWbmwZ6X62LwsvgixCuTfLRmZxxrZzcLEXc=; From: Julien Grall To: xen-devel@lists.xenproject.org Cc: julien@xen.org, Julien Grall , Ian Jackson , Wei Liu Subject: [PATCH 13/14] tools/xenmon: xenbaked: Mark const the field text in stat_map_t Date: Mon, 5 Apr 2021 16:57:12 +0100 Message-Id: <20210405155713.29754-14-julien@xen.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210405155713.29754-1-julien@xen.org> References: <20210405155713.29754-1-julien@xen.org> X-ZohoMail-DKIM: pass (identity @xen.org) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Julien Grall The field text in stat_map_t will point to string literals. So mark it as const to allow the compiler to catch any modified of the string. Signed-off-by: Julien Grall Acked-by: Wei Liu --- tools/xenmon/xenbaked.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/xenmon/xenbaked.c b/tools/xenmon/xenbaked.c index d3f940a26bb2..1ed34334c824 100644 --- a/tools/xenmon/xenbaked.c +++ b/tools/xenmon/xenbaked.c @@ -182,7 +182,7 @@ typedef struct { int event_count; int event_id; - char *text; + const char *text; } stat_map_t; =20 stat_map_t stat_map[] =3D { --=20 2.17.1 From nobody Fri Mar 29 13:50:42 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org ARC-Seal: i=1; a=rsa-sha256; t=1617639304; cv=none; d=zohomail.com; s=zohoarc; b=Uj2g4/uIWCmutZ5xb8Qpjcy47TNOupWEd/e4JPyWRMyjhY3usYugrJ6gJiVtpXnDHsNi7lLWA4EPcDjD8CXT9xjKQHY2RcwHIuGBk+RX4QQYFL8Q/UYp3AxI+RQYVDPHyK/mdWToqPlAN5ZH+99/azu7VxX+OzXSKls1RcCWWlg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1617639304; h=Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To; bh=YW9oGuy3t6k1yVdYEyjW8Earg8hRQJeA+vjl3JWhoBo=; b=kbq3749MHRwDlTdjIWV1JdyPqPHFipKQj5L8xVTqv+mopuelNlraudHazZ9Gzy9pr+Lm/IOsc3Qwi2Os2R8tNIwXBqDOzpz4OKuAK8NupJAi/5bAkYXWJx2FgUdxOgcdle/qcBMyntf/qf9PI1Umnfkgx+TEL89UQGNIbEmWpYw= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1617639304335760.3308494757115; Mon, 5 Apr 2021 09:15:04 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.105454.201873 (Exim 4.92) (envelope-from ) id 1lTRsB-0005WT-4d; Mon, 05 Apr 2021 16:14:43 +0000 Received: by outflank-mailman (output) from mailman id 105454.201873; Mon, 05 Apr 2021 16:14:43 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1lTRsA-0005WD-PM; Mon, 05 Apr 2021 16:14:42 +0000 Received: by outflank-mailman (input) for mailman id 105454; Mon, 05 Apr 2021 16:14:39 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1lTRs7-0005U7-PX for xen-devel@lists.xenproject.org; Mon, 05 Apr 2021 16:14:39 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1lTRs6-0003es-Eb; Mon, 05 Apr 2021 16:14:38 +0000 Received: from 54-240-197-235.amazon.com ([54.240.197.235] helo=ufe34d9ed68d054.ant.amazon.com) by xenbits.xenproject.org with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1lTRba-00053b-4i; Mon, 05 Apr 2021 15:57:34 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From; bh=YW9oGuy3t6k1yVdYEyjW8Earg8hRQJeA+vjl3JWhoBo=; b=ajbC8nh8c9j/DoiYvRFOnAVoe O5EupfUULfhonKEdYyMbDWJW/YSBR5etebR61NKpX1W+xrnE1gbqV/zuTC1wffKx5CGN53f9JBpV4 XKdytp7Mle026VbMKzLKx2n3NAbieCtndaGdNZIp3fN007vIWM4Vl7HxngnhmUC7On9v8=; From: Julien Grall To: xen-devel@lists.xenproject.org Cc: julien@xen.org, Julien Grall , George Dunlap , Ian Jackson , Wei Liu Subject: [PATCH 14/14] tools/xentrace: Use const whenever we point to literal strings Date: Mon, 5 Apr 2021 16:57:13 +0100 Message-Id: <20210405155713.29754-15-julien@xen.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210405155713.29754-1-julien@xen.org> References: <20210405155713.29754-1-julien@xen.org> X-ZohoMail-DKIM: pass (identity @xen.org) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Julien Grall literal strings are not meant to be modified. So we should use const char * rather than char * when we want to store a pointer to them. Signed-off-by: Julien Grall Acked-by: George Dunlap Acked-by: Wei Liu --- tools/xentrace/xenalyze.c | 71 ++++++++++++++++++++------------------- tools/xentrace/xenctx.c | 4 +-- 2 files changed, 39 insertions(+), 36 deletions(-) diff --git a/tools/xentrace/xenalyze.c b/tools/xentrace/xenalyze.c index b7f4e2bea83d..5de167031e01 100644 --- a/tools/xentrace/xenalyze.c +++ b/tools/xentrace/xenalyze.c @@ -356,7 +356,7 @@ void parse_symbol_file(char *fn) { char * find_symbol(unsigned long long addr) { struct symbol_struct * p=3DG.symbols; int i; - char * lastname=3D"ZERO"; + const char * lastname=3D"ZERO"; unsigned long long offset=3Daddr; static char name[144]; =20 @@ -495,7 +495,7 @@ struct { =20 #define HVM_VMX_EXIT_REASON_MAX (EXIT_REASON_XSETBV+1) =20 -char * hvm_vmx_exit_reason_name[HVM_VMX_EXIT_REASON_MAX] =3D { +const char * hvm_vmx_exit_reason_name[HVM_VMX_EXIT_REASON_MAX] =3D { [EXIT_REASON_EXCEPTION_NMI]=3D"EXCEPTION_NMI", [EXIT_REASON_EXTERNAL_INTERRUPT]=3D"EXTERNAL_INTERRUPT", [EXIT_REASON_TRIPLE_FAULT]=3D"TRIPLE_FAULT", @@ -698,7 +698,7 @@ enum VMEXIT_EXITCODE }; =20 #define HVM_SVM_EXIT_REASON_MAX 1025 -char * hvm_svm_exit_reason_name[HVM_SVM_EXIT_REASON_MAX] =3D { +const char * hvm_svm_exit_reason_name[HVM_SVM_EXIT_REASON_MAX] =3D { /* 0-15 */ "VMEXIT_CR0_READ", "VMEXIT_CR1_READ", @@ -875,7 +875,7 @@ char * hvm_svm_exit_reason_name[HVM_SVM_EXIT_REASON_MAX= ] =3D { #define EXTERNAL_INTERRUPT_MAX 256 =20 /* Stringify numbers */ -char * hvm_extint_vector_name[EXTERNAL_INTERRUPT_MAX] =3D { +const char * hvm_extint_vector_name[EXTERNAL_INTERRUPT_MAX] =3D { [SPURIOUS_APIC_VECTOR] =3D "SPURIOS_APIC", [ERROR_APIC_VECTOR] =3D "ERROR_APIC", [INVALIDATE_TLB_VECTOR]=3D "INVALIDATE_TLB", @@ -887,7 +887,7 @@ char * hvm_extint_vector_name[EXTERNAL_INTERRUPT_MAX] = =3D { =20 #define HVM_TRAP_MAX 20 =20 -char * hvm_trap_name[HVM_TRAP_MAX] =3D { +const char * hvm_trap_name[HVM_TRAP_MAX] =3D { [0] =3D "Divide", [1] =3D "RESERVED", [2] =3D "NMI", @@ -947,7 +947,7 @@ enum { HVM_EVENT_VLAPIC, HVM_EVENT_HANDLER_MAX }; -char * hvm_event_handler_name[HVM_EVENT_HANDLER_MAX] =3D { +const char * hvm_event_handler_name[HVM_EVENT_HANDLER_MAX] =3D { "(no handler)", "pf_xen", "pf_inject", @@ -1001,7 +1001,7 @@ enum { GUEST_INTERRUPT_CASE_MAX, }; =20 -char *guest_interrupt_case_name[] =3D { +const char *guest_interrupt_case_name[] =3D { [GUEST_INTERRUPT_CASE_WAKE_TO_HALT_ALONE]=3D"wake to halt alone", /* This interrupt woke, maybe another interrupt before halt */ [GUEST_INTERRUPT_CASE_WAKE_TO_HALT_ANY] =3D"wake to halt any ", @@ -1009,7 +1009,7 @@ char *guest_interrupt_case_name[] =3D { [GUEST_INTERRUPT_CASE_INTERRUPT_TO_HALT] =3D"intr to halt ", }; =20 -char *hvm_vol_name[HVM_VOL_MAX] =3D { +const char *hvm_vol_name[HVM_VOL_MAX] =3D { [HVM_VOL_VMENTRY]=3D"vmentry", [HVM_VOL_VMEXIT] =3D"vmexit", [HVM_VOL_HANDLER]=3D"handler", @@ -1056,7 +1056,7 @@ enum { HYPERCALL_MAX }; =20 -char *hypercall_name[HYPERCALL_MAX] =3D { +const char *hypercall_name[HYPERCALL_MAX] =3D { [HYPERCALL_set_trap_table]=3D"set_trap_table", [HYPERCALL_mmu_update]=3D"mmu_update", [HYPERCALL_set_gdt]=3D"set_gdt", @@ -1114,7 +1114,7 @@ enum { PF_XEN_EMUL_MAX, }; =20 -char * pf_xen_emul_name[PF_XEN_EMUL_MAX] =3D { +const char * pf_xen_emul_name[PF_XEN_EMUL_MAX] =3D { [PF_XEN_EMUL_LVL_0]=3D"non-linmap", [PF_XEN_EMUL_LVL_1]=3D"linmap l1", [PF_XEN_EMUL_LVL_2]=3D"linmap l2", @@ -1140,7 +1140,7 @@ enum { PF_XEN_NON_EMUL_MAX, }; =20 -char * pf_xen_non_emul_name[PF_XEN_NON_EMUL_MAX] =3D { +const char * pf_xen_non_emul_name[PF_XEN_NON_EMUL_MAX] =3D { [PF_XEN_NON_EMUL_VA_USER]=3D"va user", [PF_XEN_NON_EMUL_VA_KERNEL]=3D"va kernel", [PF_XEN_NON_EMUL_EIP_USER]=3D"eip user", @@ -1160,7 +1160,7 @@ enum { PF_XEN_FIXUP_MAX, }; =20 -char * pf_xen_fixup_name[PF_XEN_FIXUP_MAX] =3D { +const char * pf_xen_fixup_name[PF_XEN_FIXUP_MAX] =3D { [PF_XEN_FIXUP_PREALLOC_UNPIN] =3D "unpin", [PF_XEN_FIXUP_PREALLOC_UNHOOK] =3D "unhook", [PF_XEN_FIXUP_UNSYNC] =3D "unsync", @@ -1195,7 +1195,7 @@ enum { #define SHADOW_RESYNC_FULL 14 #define SHADOW_RESYNC_ONLY 15 =20 -char * pf_xen_name[PF_XEN_MAX] =3D { +const char * pf_xen_name[PF_XEN_MAX] =3D { [PF_XEN_NOT_SHADOW]=3D"propagate", [PF_XEN_FAST_PROPAGATE]=3D"fast propagate", [PF_XEN_FAST_MMIO]=3D"fast mmio", @@ -1304,7 +1304,7 @@ struct hvm_data { struct vcpu_data *v; /* up-pointer */ =20 /* SVM / VMX compatibility. FIXME - should be global */ - char ** exit_reason_name; + const char ** exit_reason_name; int exit_reason_max; struct hvm_summary_handler_node *exit_reason_summary_handler_list[HVM_= EXIT_REASON_MAX]; =20 @@ -1408,7 +1408,7 @@ enum { HVM_SHORT_SUMMARY_MAX, }; =20 -char *hvm_short_summary_name[HVM_SHORT_SUMMARY_MAX] =3D { +const char *hvm_short_summary_name[HVM_SHORT_SUMMARY_MAX] =3D { [HVM_SHORT_SUMMARY_EMULATE] =3D"emulate", [HVM_SHORT_SUMMARY_UNSYNC] =3D"unsync", [HVM_SHORT_SUMMARY_FIXUP] =3D"fixup", @@ -1478,7 +1478,7 @@ enum { PV_MAX }; =20 -char *pv_name[PV_MAX] =3D { +const char *pv_name[PV_MAX] =3D { [PV_HYPERCALL]=3D"hypercall", [PV_TRAP]=3D"trap", [PV_PAGE_FAULT]=3D"page_fault", @@ -1527,7 +1527,7 @@ int runstate_graph[RUNSTATE_MAX] =3D [RUNSTATE_INIT]=3D-2, }; =20 -char * runstate_name[RUNSTATE_MAX]=3D{ +const char * runstate_name[RUNSTATE_MAX]=3D{ [RUNSTATE_RUNNING]=3D "running", [RUNSTATE_RUNNABLE]=3D"runnable", [RUNSTATE_BLOCKED]=3D "blocked", /* to be blocked */ @@ -1545,7 +1545,7 @@ enum { RUNNABLE_STATE_MAX }; =20 -char * runnable_state_name[RUNNABLE_STATE_MAX]=3D{ +const char * runnable_state_name[RUNNABLE_STATE_MAX]=3D{ [RUNNABLE_STATE_INVALID]=3D"invalid", /* Should never show up */ [RUNNABLE_STATE_WAKE]=3D"wake", [RUNNABLE_STATE_PREEMPT]=3D"preempt", @@ -1565,7 +1565,7 @@ enum { MEM_MAX }; =20 -char *mem_name[MEM_MAX] =3D { +const char *mem_name[MEM_MAX] =3D { [MEM_PAGE_GRANT_MAP] =3D "grant-map", [MEM_PAGE_GRANT_UNMAP] =3D "grant-unmap", [MEM_PAGE_GRANT_TRANSFER] =3D "grant-transfer", @@ -1681,7 +1681,7 @@ enum { DOMAIN_RUNSTATE_MAX }; =20 -char * domain_runstate_name[] =3D { +const char * domain_runstate_name[] =3D { [DOMAIN_RUNSTATE_BLOCKED]=3D"blocked", [DOMAIN_RUNSTATE_PARTIAL_RUN]=3D"partial run", [DOMAIN_RUNSTATE_FULL_RUN]=3D"full run", @@ -1698,7 +1698,7 @@ enum { POD_RECLAIM_CONTEXT_MAX }; =20 -char * pod_reclaim_context_name[] =3D { +const char * pod_reclaim_context_name[] =3D { [POD_RECLAIM_CONTEXT_UNKNOWN]=3D"unknown", [POD_RECLAIM_CONTEXT_FAULT]=3D"fault", [POD_RECLAIM_CONTEXT_BALLOON]=3D"balloon", @@ -1756,7 +1756,7 @@ enum { TOPLEVEL_MAX=3DTOPLEVEL_HW+1, }; =20 -char * toplevel_name[TOPLEVEL_MAX] =3D { +const char * toplevel_name[TOPLEVEL_MAX] =3D { [TOPLEVEL_GEN]=3D"gen", [TOPLEVEL_SCHED]=3D"sched", [TOPLEVEL_DOM0OP]=3D"dom0op", @@ -2263,7 +2263,7 @@ static inline void clear_interval_cycles(struct inter= val_element *e) { e->instructions =3D 0; } =20 -static inline void print_cpu_affinity(struct cycle_summary *s, char *p) { +static inline void print_cpu_affinity(struct cycle_summary *s, const char = *p) { if(s->count) { long long avg; =20 @@ -2326,7 +2326,8 @@ static inline void print_cycle_percent_summary(struct= cycle_summary *s, } } =20 -static inline void print_cycle_summary(struct cycle_summary *s, char *p) { +static inline void print_cycle_summary(struct cycle_summary *s, + const char *p) { if(s->count) { long long avg; =20 @@ -2938,7 +2939,7 @@ void hvm_update_short_summary(struct hvm_data *h, int= element) { } =20 void hvm_short_summary(struct hvm_short_summary_struct *hss, - tsc_t total, char *prefix) { + tsc_t total, const char *prefix) { char desc[80]; int i; =20 @@ -3352,7 +3353,7 @@ void hvm_pf_xen_process(struct record_info *ri, struc= t hvm_data *h) { fprintf(warn, "%s: Strange, postprocess already set\n", __func__); } =20 -char * hvm_vlapic_icr_dest_shorthand_name[4] =3D { +const char * hvm_vlapic_icr_dest_shorthand_name[4] =3D { "dest_field", "self", "all-inc", "all-exc" }; =20 @@ -3800,7 +3801,7 @@ void update_io_address(struct io_address ** list, uns= igned int pa, int dir, update_cycles(&p->summary[dir], arc_cycles); } =20 -void hvm_io_address_summary(struct io_address *list, char * s) { +void hvm_io_address_summary(struct io_address *list, const char * s) { if(!list) return; =20 @@ -4484,7 +4485,7 @@ void hvm_intr_window_process(struct record_info *ri, = struct hvm_data *h) int32_t intr; } *r =3D (typeof(r))h->d; =20 - char *intsrc_name[] =3D { + const char *intsrc_name[] =3D { "none", "pic", "lapic", @@ -4687,14 +4688,15 @@ void hvm_generic_postprocess(struct hvm_data *h) } } =20 -void hvm_generic_dump(struct record_info *ri, char * prefix) +void hvm_generic_dump(struct record_info *ri, const char * prefix) { struct { unsigned vcpu:16, domain:16; unsigned d[4]; } *cr =3D (typeof(cr))ri->d; =20 - char *evt_string, evt_number[256]; + const char *evt_string; + char evt_number[256]; int i, evt, is_64 =3D 0; =20 evt =3D ri->event - TRC_HVM_HANDLER; @@ -6042,10 +6044,11 @@ void shadow_propagate_process(struct record_info *r= i, struct hvm_data *h) fprintf(warn, "%s: Strange, postprocess already set\n", __func__); } =20 -void shadow_fault_generic_dump(unsigned int event, uint32_t *d, char *pref= ix, - char * dump_header) +void shadow_fault_generic_dump(unsigned int event, uint32_t *d, + const char *prefix, const char * dump_heade= r) { - char *evt_string, evt_number[10]; + const char *evt_string; + char evt_number[10]; union shadow_event sevt =3D { .event =3D event }; int i; =20 @@ -8643,7 +8646,7 @@ void dump_generic(FILE * f, struct record_info *ri) fprintf(f, " ]\n"); } =20 -void dump_raw(char * s, struct record_info *ri) +void dump_raw(const char * s, struct record_info *ri) { int i; =20 diff --git a/tools/xentrace/xenctx.c b/tools/xentrace/xenctx.c index 2fa864f86723..972f473dbf02 100644 --- a/tools/xentrace/xenctx.c +++ b/tools/xentrace/xenctx.c @@ -302,7 +302,7 @@ static void read_symbol_table(const char *symtab) =20 #if defined(__i386__) || defined(__x86_64__) #define CR0_PE 0x1 -char *flag_values[22][2] =3D +const char *flag_values[22][2] =3D {/* clear, set, bit# */ { NULL, "c" }, // 0 Carry { NULL, NULL }, // 1 @@ -334,7 +334,7 @@ static void print_flags(uint64_t flags) =20 printf("\nflags: %08" PRIx64, flags); for (i =3D 21; i >=3D 0; i--) { - char *s =3D flag_values[i][(flags >> i) & 1]; + const char *s =3D flag_values[i][(flags >> i) & 1]; if (s !=3D NULL) printf(" %s", s); } --=20 2.17.1