From nobody Mon Feb 9 19:05:45 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) client-ip=63.128.21.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1601563326; cv=none; d=zohomail.com; s=zohoarc; b=cmj9oXUS2gz3UJ038lJ6/7Z84R/PugbwUJrR42t/CPVQkkfVZKm8DRiFI9pC0nBsHVrLMWcqF1/UCkWZ66LOb3BFK6wbSoljliXnaoNt2B2/HkbcCpYAgSxZAvfR1LjG8lSQiYz3PZPqIlEMsdntd8B6KERIvy8R5kQwvdKA2qs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1601563326; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=ZpPmzecL1JnaAFfxJvQhWfBsNXB+MnX+YoPFlhUhAaM=; b=mlZBJBnYp93hT9uVhwO4ccno72ZXvcf4mtXKioS/QzPxBe1AVshZ3X5kODWmrKZSafYlXjeu4CZob3YRPT5jdhKTIGzdQiFyDcpzjcDOtzeey1Euu/mFgHsu51iKwaoHhcDCpJsPOGYDjjCtme6fDssjJsNZZiLZqbEWbpwv8UA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [63.128.21.124]) by mx.zohomail.com with SMTPS id 1601563326016104.58119999349151; Thu, 1 Oct 2020 07:42:06 -0700 (PDT) Received: from mail-wr1-f69.google.com (mail-wr1-f69.google.com [209.85.221.69]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-424-GW3PQ8vqPHe-xlVgL3NEtg-1; Thu, 01 Oct 2020 10:42:01 -0400 Received: by mail-wr1-f69.google.com with SMTP id f18so2134242wrv.19 for ; Thu, 01 Oct 2020 07:42:01 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.redhat.com (74.red-83-53-161.dynamicip.rima-tde.net. [83.53.161.74]) by smtp.gmail.com with ESMTPSA id z67sm235870wme.41.2020.10.01.07.41.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 01 Oct 2020 07:41:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1601563324; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=ZpPmzecL1JnaAFfxJvQhWfBsNXB+MnX+YoPFlhUhAaM=; b=U9TB4DrjWuvon25dQbFKgL4aZWnfQ45FU1NYRq2d3agPmUcVju801FM7i3zckzK4Odaqpo qpk4y3kf86MDOhMkbp43km6CsXOM7AE4RF6pj1wHwGwqD63xgUi1/bM7QCjf/6SHlWRgtr QJ71ZYScrxnwhTZtbavuGgsyUsOToxo= X-MC-Unique: GW3PQ8vqPHe-xlVgL3NEtg-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=ZpPmzecL1JnaAFfxJvQhWfBsNXB+MnX+YoPFlhUhAaM=; b=a80yqtTgbAcd/LJ9W9VPNPgV3JSgP4LX45pvD9KlJvh8IJllLbb52W5HoHzOCc3+NU ReNPaHsNFMcFM+T+g7hMYJynyyTdN2P6RE6tBJE5XgM87FoRRVjsjBqoNU7s5T7RoGA+ LAf1bV+hfz2tPEyhB2DXQftYEaVIHFnw5Q63cJH8Y4x1vdU7IWg+5miGCxOaRzHDKTFk FVS1UKZxjfcJH67HGWY5EQjiZvmqSjVwAgzXkhXOltqopzXAVri3qKbXXkSo1lVv/C7a dLcU2hAqtJ09OeVHd/EuedLJvHFVBY4XICDi+dqFPHcG2EijZb1irJAKHkk1OEimdCiy 1CDg== X-Gm-Message-State: AOAM530srr8+WCxEepaQ4k3Q4nLNZVKxry8qwMEDvt4zrvq5Ibc/KQrK 59CoxsS4vqklxfiyTUUbxFvT/QVaJ2l7Px5RmjiamNbf+3/qMhoBNiJ1+FZY4Ef/W4c2YRZIhMl 8apXB/CAAnccfRA== X-Received: by 2002:a1c:1fc6:: with SMTP id f189mr389801wmf.20.1601563319923; Thu, 01 Oct 2020 07:41:59 -0700 (PDT) X-Google-Smtp-Source: ABdhPJy2AAR5AwX//vaLlPmReSLdJYvN2sSBWcXdstcx/2WdlHHsuG5ZThU4FZ3f6fFxfbGf2Mb3Lg== X-Received: by 2002:a1c:1fc6:: with SMTP id f189mr389784wmf.20.1601563319688; Thu, 01 Oct 2020 07:41:59 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: Laurent Vivier , qemu-devel@nongnu.org Cc: Eduardo Habkost , Michael Tokarev , Richard Henderson , Markus Armbruster , Marcel Apfelbaum , qemu-trivial@nongnu.org, Eric Blake , Paolo Bonzini , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v4 1/3] target/i386/cpu: Trivial code movement Date: Thu, 1 Oct 2020 16:41:50 +0200 Message-Id: <20201001144152.1555659-2-philmd@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201001144152.1555659-1-philmd@redhat.com> References: <20201001144152.1555659-1-philmd@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=philmd@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Trivial code movement to reduce #ifdef'ry in the next commit. Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- target/i386/cpu.c | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/target/i386/cpu.c b/target/i386/cpu.c index 3ffd877dd5..2eec53ca22 100644 --- a/target/i386/cpu.c +++ b/target/i386/cpu.c @@ -4643,16 +4643,6 @@ static void x86_cpu_get_feature_words(Object *obj, V= isitor *v, visit_type_X86CPUFeatureWordInfoList(v, "feature-words", &list, errp); } =20 -/* Convert all '_' in a feature string option name to '-', to make feature - * name conform to QOM property naming rule, which uses '-' instead of '_'. - */ -static inline void feat2prop(char *s) -{ - while ((s =3D strchr(s, '_'))) { - *s =3D '-'; - } -} - /* Return the feature property name for a feature flag bit */ static const char *x86_cpu_feature_name(FeatureWord w, int bitnr) { @@ -4677,6 +4667,17 @@ static const char *x86_cpu_feature_name(FeatureWord = w, int bitnr) return name; } =20 +/* + * Convert all '_' in a feature string option name to '-', to make feature + * name conform to QOM property naming rule, which uses '-' instead of '_'. + */ +static inline void feat2prop(char *s) +{ + while ((s =3D strchr(s, '_'))) { + *s =3D '-'; + } +} + /* Compatibily hack to maintain legacy +-feat semantic, * where +-feat overwrites any feature set by * feat=3Don|feat even if the later is parsed after +-feat --=20 2.26.2