From nobody Mon Feb 9 04:59:23 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1654240715; cv=none; d=zohomail.com; s=zohoarc; b=h8a2yzY9AJ3GXRLDkD7VztZ/PmHBYXFxTHhxxV8ecaMkAbsLoW2bUL9R0molylU4g0sggxjMOUZhWtQkIwLM7lwZrRAxTCYKn+URYHt+3bsx4QwrIgfx+KAnA1xVx6xmWd+cymRpbrnVf8WVJUmvmgWGSImTgy5RC2Psp0EwPds= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1654240715; h=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=QUw7z6x9Tgf6A2qRi9nZZdwmOe3FoMGIzHEbW6Rsc9Q=; b=cOevXtTHw9cNFenv/PUjfIALN9DoqC7G3/sBh3Ygqjs7ntaS9QQl13lsDfLEhrNZxImhFwYhnLoYTcwZmJdbOUnJyikSs4XUy88ysNilaPMpaIIC3MUgIYzwpsr8QXii6Ong4CQaLixgSORPoXow7jgKM6tgmBCgiixcCKwWySk= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1654240715661160.4293475762438; Fri, 3 Jun 2022 00:18:35 -0700 (PDT) Received: from localhost ([::1]:52586 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nx1Zq-0003DT-2r for importer@patchew.org; Fri, 03 Jun 2022 03:18:34 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34002) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nx1HE-0005e2-R8 for qemu-devel@nongnu.org; Fri, 03 Jun 2022 02:59:24 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:43633) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nx1HC-0003I2-Fb for qemu-devel@nongnu.org; Fri, 03 Jun 2022 02:59:19 -0400 Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-606-N4wYtu4pNf2hlFxeWLKyDA-1; Fri, 03 Jun 2022 02:59:13 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 8855785A5BC; Fri, 3 Jun 2022 06:59:13 +0000 (UTC) Received: from thuth.com (unknown [10.39.192.172]) by smtp.corp.redhat.com (Postfix) with ESMTP id 17BE52166B26; Fri, 3 Jun 2022 06:59:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1654239556; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=QUw7z6x9Tgf6A2qRi9nZZdwmOe3FoMGIzHEbW6Rsc9Q=; b=HAbt4FQmkw7gFZU8+gRLLj4TZM5tukHKWSLrF51JK4KhEjm6EVoE4r2PtHsqexPToTTcqF xgnb7xY+jHaG2CBScXdhrihKqOYIZZo+/QzkUoiLsKQEzDFn+RDVEX3folcNqSXo+KGVs7 fX7uCYzjneSvNXs8Ek8lrAD3sfHCDuU= X-MC-Unique: N4wYtu4pNf2hlFxeWLKyDA-1 From: Thomas Huth To: qemu-devel@nongnu.org, Richard Henderson Cc: qemu-s390x@nongnu.org, Cornelia Huck Subject: [PULL 02/12] hw/s390x/s390-virtio-ccw: Improve the machine description string Date: Fri, 3 Jun 2022 08:58:55 +0200 Message-Id: <20220603065905.23805-3-thuth@redhat.com> In-Reply-To: <20220603065905.23805-1-thuth@redhat.com> References: <20220603065905.23805-1-thuth@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 2.78 on 10.11.54.6 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=170.10.133.124; envelope-from=thuth@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -21 X-Spam_score: -2.2 X-Spam_bar: -- X-Spam_report: (-2.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.082, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1654240716423100001 Content-Type: text/plain; charset="utf-8" The machine name already contains the words "ccw" and "virtio", so using "VirtIO-ccw" in the description likely does not really help the average user to get an idea what this machine type is about. Thus let's switch to "Virtual s390x machine" now, since "virtual machine" should be a familiar term, and "s390x" signals that this is about 64-bit guests (unlike S390 which could mean that it is 31-bit only). Also expand "v" to "version", since this makes it easier to use this macro also with non-numeric machine names in downstream. Message-Id: <20220506065026.513590-1-thuth@redhat.com> Acked-by: Cornelia Huck Signed-off-by: Thomas Huth --- hw/s390x/s390-virtio-ccw.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c index 047cca0487..cc3097bfee 100644 --- a/hw/s390x/s390-virtio-ccw.c +++ b/hw/s390x/s390-virtio-ccw.c @@ -768,7 +768,7 @@ bool css_migration_enabled(void) { = \ MachineClass *mc =3D MACHINE_CLASS(oc); = \ ccw_machine_##suffix##_class_options(mc); = \ - mc->desc =3D "VirtIO-ccw based S390 machine v" verstr; = \ + mc->desc =3D "Virtual s390x machine (version " verstr ")"; = \ if (latest) { = \ mc->alias =3D "s390-ccw-virtio"; = \ mc->is_default =3D true; = \ --=20 2.31.1