From nobody Mon Feb 9 09:28:31 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1602630524; cv=none; d=zohomail.com; s=zohoarc; b=T858Qbe5bXkjUeN7ZvmEk09rxgHJkKneft6gglRFY09p3PYt6kGOMzRsMQLSqLfpksKHR1Rv6dU143NbEAN9doJkACUshKiiU2RerSO68f+YAGFbtc0VDmflqlmAj2QoFur4fT8j/7Q3pbR7awlEbEpvb+irpdWsiTROmVZe15A= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1602630524; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=orSIgJvDF9xxjYGHgN+WlMbsHDPWVWiupoDqov+tdLA=; b=SOJfga3VQCGEr6WsEAnD+voaHbknLZcWKeGQyzdMoRhV2NOKYDD277LGAjXG3WHYYcNfD3C8wiLdEm3w3YTCNbcxjKYLr1t7rzzyiB+eBTBFi+NPMsQ+UfHiLLA7m9XNR/ShttN2E5jqv6pniO2qVT3L4qj35T5wFULNjR4Dwn8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1602630524902795.6144063976955; Tue, 13 Oct 2020 16:08:44 -0700 (PDT) Received: from localhost ([::1]:40086 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kSTPP-00018Z-PE for importer@patchew.org; Tue, 13 Oct 2020 19:08:43 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37934) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kSTMa-0006hk-Pf for qemu-devel@nongnu.org; Tue, 13 Oct 2020 19:05:48 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:35501) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kSTMX-0003iq-KE for qemu-devel@nongnu.org; Tue, 13 Oct 2020 19:05:48 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-409-xFOAd2c9P8-16GGMaZ4lVg-1; Tue, 13 Oct 2020 19:05:40 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id EEAFB80B71A; Tue, 13 Oct 2020 23:05:37 +0000 (UTC) Received: from localhost (ovpn-66-44.rdu2.redhat.com [10.10.66.44]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8C9075C1A3; Tue, 13 Oct 2020 23:05:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1602630343; 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=orSIgJvDF9xxjYGHgN+WlMbsHDPWVWiupoDqov+tdLA=; b=VD0zdOVIhCCWwsZJNR1HTEIlLEHQYgXuJ8miuDwqoaeJCQyRMxqBRjr07Up4LTr8a+a7IQ DP57nMufwPeVHahbnFT2vD7LsfQQdt0R3w/FT7sphmjKgBOJEz4le2lvTPycMmN72w6JyG CUWbln4bTlu6WOoYXJT+fcFw82vE5J8= X-MC-Unique: xFOAd2c9P8-16GGMaZ4lVg-1 From: Eduardo Habkost To: qemu-devel@nongnu.org Subject: [PATCH v2 5/7] i386: Wrap QMP code in !CONFIG_USER_ONLY Date: Tue, 13 Oct 2020 19:04:55 -0400 Message-Id: <20201013230457.150630-6-ehabkost@redhat.com> In-Reply-To: <20201013230457.150630-1-ehabkost@redhat.com> References: <20201013230457.150630-1-ehabkost@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=ehabkost@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=216.205.24.124; envelope-from=ehabkost@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/10/13 02:06:42 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Maydell , David Hildenbrand , Thomas Huth , Markus Armbruster , Wainer dos Santos Moschetta , Halil Pasic , Christian Borntraeger , Aleksandar Markovic , Richard Henderson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Aleksandar Rikalo , Eduardo Habkost , qemu-s390x@nongnu.org, qemu-arm@nongnu.org, Cleber Rosa , Jiri Denemark , David Gibson , "Daniel P. Berrange" , Cornelia Huck , qemu-ppc@nongnu.org, Paolo Bonzini , Aurelien Jarno Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" The QMP code was never called by *-user, and we will add machine-type-specific code there, so add #ifdefs to make it safe. Signed-off-by: Eduardo Habkost --- target/i386/cpu.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/target/i386/cpu.c b/target/i386/cpu.c index c78b2abfb8..bf4b4a4812 100644 --- a/target/i386/cpu.c +++ b/target/i386/cpu.c @@ -4171,6 +4171,7 @@ static X86CPUVersion x86_cpu_model_resolve_version(co= nst X86CPUModel *model, return v; } =20 +#ifndef CONFIG_USER_ONLY /* Resolve CPU model alias to actual CPU model name */ static char *x86_cpu_model_resolve_alias(const X86CPUModel *model, X86CPUVersion default_version) @@ -4186,6 +4187,7 @@ static char *x86_cpu_model_resolve_alias(const X86CPU= Model *model, } return x86_cpu_versioned_model_name(model->cpudef, version); } +#endif =20 void x86_cpu_change_kvm_default(const char *prop, const char *value) { @@ -4838,6 +4840,7 @@ static void x86_cpu_get_unavailable_features(Object *= obj, Visitor *v, visit_type_strList(v, "unavailable-features", &result, errp); } =20 +#ifndef CONFIG_USER_ONLY /* Check for missing features that may prevent the CPU class from * running using the current machine and accelerator. */ @@ -4876,6 +4879,7 @@ static void x86_cpu_class_check_missing_features(X86C= PUClass *xcc, =20 object_unref(OBJECT(xc)); } +#endif =20 /* Print all cpuid feature names in featureset */ @@ -4985,6 +4989,7 @@ void x86_cpu_list(void) g_list_free(names); } =20 +#ifndef CONFIG_USER_ONLY static void x86_cpu_definition_entry(gpointer data, gpointer user_data) { ObjectClass *oc =3D data; @@ -5025,6 +5030,7 @@ CpuDefinitionInfoList *qmp_query_cpu_definitions(Erro= r **errp) g_slist_free(list); return cpu_list; } +#endif =20 static uint64_t x86_cpu_get_supported_feature_word(FeatureWord w, bool migratable_only) --=20 2.28.0