Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id DC46EC4332F for ; Wed, 12 Oct 2022 18:26:35 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.421345.666607 (Exim 4.92) (envelope-from ) id 1oigQs-0002VT-S5; Wed, 12 Oct 2022 18:26:18 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 421345.666607; Wed, 12 Oct 2022 18:26:18 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oigQs-0002VM-OG; Wed, 12 Oct 2022 18:26:18 +0000 Received: by outflank-mailman (input) for mailman id 421345; Wed, 12 Oct 2022 18:26:17 +0000 Received: from se1-gles-sth1-in.inumbo.com ([159.253.27.254] helo=se1-gles-sth1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oigQq-00020j-Tr for xen-devel@lists.xenproject.org; Wed, 12 Oct 2022 18:26:17 +0000 Received: from esa5.hc3370-68.iphmx.com (esa5.hc3370-68.iphmx.com [216.71.155.168]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id 59b6f80e-4a5b-11ed-91b4-6bf2151ebd3b; Wed, 12 Oct 2022 20:26:14 +0200 (CEST) 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" X-Inumbo-ID: 59b6f80e-4a5b-11ed-91b4-6bf2151ebd3b DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=citrix.com; s=securemail; t=1665599174; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version; bh=A8MzLqExStAlbN29a+wsKio2UVeipAQb6TPTHKe3Ju4=; b=B3Q3/UB0cQM+If+L59wPyiSB15hYT9PD6mO/xKPBMvt3o8RAIHQUwgmR RBDZoIzgQJY6r0Ca456wwkWjSGiaXo/DuBy3qEuTsQekzLLs4AQy1mzq6 RQYunV+3zE0faXCCh2eomRUXoDruF2LOB4EvtYxBoCQxgSzKW+0dk+yF/ U=; Authentication-Results: esa5.hc3370-68.iphmx.com; dkim=none (message not signed) header.i=none X-SBRS: 2.7 X-MesageID: 81698666 X-Ironport-Server: esa5.hc3370-68.iphmx.com X-Remote-IP: 162.221.156.83 X-Policy: $RELAYED IronPort-Data: A9a23:ld4uO6Cu2vJ0JRVW/znjw5YqxClBgxIJ4kV8jS/XYbTApDJ2gTcBm 2sZCj+DbqmPNGH3LY9xbI21/U4BsJbXyIIwQQY4rX1jcSlH+JHPbTi7wuUcHAvJd5GeExg3h yk6QoOdRCzhZiaE/n9BCpC48T8mk/ngqoPUUIbsIjp2SRJvVBAvgBdin/9RqoNziJ2yDhjlV ena+qUzA3f4nW8pWo4ow/jb8kk25K2o4GhwUmEWPpingnePzxH5M7pHTU2BByOQapVZGOe8W 9HCwNmRlo8O105wYj8Nuu+TnnwiGtY+DyDX4pZlc/HKbix5jj4zys4G2M80Mi+7vdkrc+dZk 72hvbToIesg0zaldO41C3G0GAkmVUFKFSOuzdFSfqV/wmWfG0YAzcmCA2k6IbQ83+d6JFgXy vAVFiEQXiijp8yplefTpulE3qzPLeHuNYIb/Hph0SvYHbAtRpWrr6fivIECmm1q34YXQKiYN 5FxhTlHNXwsZzVmPFsNBY14t+CvnnTlKBVTqU6PpLpx6G/WpOB0+Oi0bouFJILULSlTtm2Vh Uv9/l78PhxAZNmZwGa70l+XouCayEsXX6pNTeblp5aGmma75mEVEgxQalK9rtGwkEv4UNVaQ 2QY8zQjhbI//0uqSp/6RRLQiG6JuFsQVsRdF8U+6RqR0ezE7gCBHG8GQzVdLts8u6cLqScCj wHT2YmzXHo27ePTGSn1GqqoQS2aNTQsCUoDaAo9FDQJ7ufyvbELrjLhUYM2eEKqteHdFTb1y jGMiSExgbQPkMIGv5mGEUD7byGE/caQEFNsjunDdif8t14iOtb5D2C9wQKDhcusOrp1WbVoU JIsv8GFpN4DApiW/MBmaLVcRer5jxpp3dC1vLKOI3XD327xk5JAVdoKiN2bGKuPGpxdEdMOS BaL0T69HLcJYBOXgVZfOupd8fgCw6n6DsjCXfvJdNdIaZUZXFbZonwzPBXJgDG9wRFEfUQD1 XGzK5/E4ZEyUP0P8dZLb71Fje9DKt4Wnws/uqwXPzz4iOHDNRZ5uJ8OMUeUb/BR0Z5oVD79q o8HX/ZmPj0FD4USlAGLrtNIRb3LRFBnba3LRzt/KrbffFI7SD54VZc8A9oJIuRYokicrc+Ql lnVZ6OS4AOXaaHvQelSVk1eVQ== IronPort-HdrOrdr: A9a23:Tntm6KndI+eQmoae1kcQQn6La8bpDfIu3DAbv31ZSRFFG/Fxl6 iV8sjztCWE8Qr5N0tBpTntAsW9qDbnhPtICOoqTNGftWvdyQiVxehZhOOIqVDd8m/Fh4pgPM 9bAs9D4bbLbGSS4/yU3ODBKadD/OW6 X-IronPort-AV: E=Sophos;i="5.95,180,1661832000"; d="scan'208";a="81698666" From: Andrew Cooper To: Xen-devel CC: Andrew Cooper , Christian Lindig , David Scott , Edwin Torok , Rob Hoes , Henry Wang Subject: [PATCH 1/2] tools/ocaml/xc: Fix code legibility in stub_xc_domain_create() Date: Wed, 12 Oct 2022 19:25:51 +0100 Message-ID: <20221012182552.26866-2-andrew.cooper3@citrix.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20221012182552.26866-1-andrew.cooper3@citrix.com> References: <20221012182552.26866-1-andrew.cooper3@citrix.com> MIME-Version: 1.0 Content-Type: text/plain Reposition the defines to match the outer style and to make the logic half-legible. No functional change. Fixes: 0570d7f276dd ("x86/msr: introduce an option for compatible MSR behavior selection") Signed-off-by: Andrew Cooper --- CC: Christian Lindig CC: David Scott CC: Edwin Torok CC: Rob Hoes CC: Henry Wang --- tools/ocaml/libs/xc/xenctrl_stubs.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/tools/ocaml/libs/xc/xenctrl_stubs.c b/tools/ocaml/libs/xc/xenctrl_stubs.c index 19335bdf4572..fe9c00ce008a 100644 --- a/tools/ocaml/libs/xc/xenctrl_stubs.c +++ b/tools/ocaml/libs/xc/xenctrl_stubs.c @@ -232,22 +232,20 @@ CAMLprim value stub_xc_domain_create(value xch, value wanted_domid, value config /* Mnemonics for the named fields inside xen_x86_arch_domainconfig */ #define VAL_EMUL_FLAGS Field(arch_domconfig, 0) +#define VAL_MISC_FLAGS Field(arch_domconfig, 1) cfg.arch.emulation_flags = ocaml_list_to_c_bitmap /* ! x86_arch_emulation_flags X86_EMU_ none */ /* ! XEN_X86_EMU_ XEN_X86_EMU_ALL all */ (VAL_EMUL_FLAGS); -#undef VAL_EMUL_FLAGS - -#define VAL_MISC_FLAGS Field(arch_domconfig, 1) - cfg.arch.misc_flags = ocaml_list_to_c_bitmap /* ! x86_arch_misc_flags X86_ none */ /* ! XEN_X86_ XEN_X86_MISC_FLAGS_MAX max */ (VAL_MISC_FLAGS); #undef VAL_MISC_FLAGS +#undef VAL_EMUL_FLAGS #else caml_failwith("Unhandled: x86"); -- 2.11.0