From nobody Mon Feb 9 08:19:42 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=1597848066; cv=none; d=zohomail.com; s=zohoarc; b=iwt75mnpMg3aMxW6pEohQOXIC4+CyzeU0OC2/0I3cSa2gNjbkyxPbhgH44DqwamAxtZ8wI94x0lV96vHcIF+At9O4a+wux5K29P5MXy2AiJXauCluJ+0SbeiS0pnd1JgZ5Q7OJiPQdG22nWgENehcmplWz95hmhmVnJI80AmtUo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597848066; 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=OzOh70yaTNs0uTiq2/vD5Wi4o5uIzFKgdVh1Pbo4ad4=; b=A1TBA64oQxBxlsFx/STrlxopGpnvWYUFnWr0zyDYVFM3hiyFX+VFGVLtEx85mpxq1n177QASQb6DgbYveLJc4YWxYiExLjbg2+SNKSvuxYS4/Q1sf8Z/mp25ak+cjloFgj+dhjZcE/MkdVbyRPsNeFZZRvzR2XPjvzy4iskkfnI= 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 1597848066313208.37428405650735; Wed, 19 Aug 2020 07:41:06 -0700 (PDT) Received: from localhost ([::1]:55132 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k8PGy-0003UZ-UY for importer@patchew.org; Wed, 19 Aug 2020 10:41:04 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:48804) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k8PFI-0000KZ-0k for qemu-devel@nongnu.org; Wed, 19 Aug 2020 10:39:20 -0400 Received: from us-smtp-2.mimecast.com ([205.139.110.61]:42926 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1k8PFG-00023m-7X for qemu-devel@nongnu.org; Wed, 19 Aug 2020 10:39:19 -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-574-wItj1giEN2q8AXfWr8REsw-1; Wed, 19 Aug 2020 10:39:15 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 352D71014DF9; Wed, 19 Aug 2020 14:39:14 +0000 (UTC) Received: from steredhat.redhat.com (ovpn-113-40.ams2.redhat.com [10.36.113.40]) by smtp.corp.redhat.com (Postfix) with ESMTP id BDF2F5F7D8; Wed, 19 Aug 2020 14:39:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1597847957; 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=OzOh70yaTNs0uTiq2/vD5Wi4o5uIzFKgdVh1Pbo4ad4=; b=PXF21e7pA5+NDKlDdvBv5NoyGaCiV3eSbHmXXpm2SpGvjQi/64qzPYuWcoORDpWwM2NfHm m9CVkkgLC3B53KHu2AX+fdQgBZhID/SDCq8RREI/0egpJDcngEI9QR8BBJUP/s3TOS7+e2 h5vTceWE/wowL+cvLFPoJ3U8xwebKMI= X-MC-Unique: wItj1giEN2q8AXfWr8REsw-1 From: Stefano Garzarella To: qemu-devel@nongnu.org Subject: [PATCH v2 1/3] vhost-vsock-pci: force virtio version 1 Date: Wed, 19 Aug 2020 16:38:49 +0200 Message-Id: <20200819143851.78069-2-sgarzare@redhat.com> In-Reply-To: <20200819143851.78069-1-sgarzare@redhat.com> References: <20200819143851.78069-1-sgarzare@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=sgarzare@redhat.com X-Mimecast-Spam-Score: 0.001 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=205.139.110.61; envelope-from=sgarzare@redhat.com; helo=us-smtp-delivery-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/08/19 04:57:22 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -40 X-Spam_score: -4.1 X-Spam_bar: ---- X-Spam_report: (-4.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1, 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_H2=-1, 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: Thomas Huth , Qinghua Cheng , Qian Cai , David Hildenbrand , Cornelia Huck , qemu-stable@nongnu.org, Halil Pasic , Christian Borntraeger , qemu-s390x@nongnu.org, "Michael S. Tsirkin" , Richard Henderson 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" Commit 9b3a35ec82 ("virtio: verify that legacy support is not accidentally on") added a safety check that requires to set 'disable-legacy=3Don' on vhost-vsock-pci device: $ ./qemu-system-x86_64 ... -device vhost-vsock-pci,guest-cid=3D5 qemu-system-x86_64: -device vhost-vsock-pci,guest-cid=3D5: device is modern-only, use disable-legacy=3Don virtio-vsock was introduced after the release of VIRTIO 1.0 specifications, so it should be 'modern-only'. In addition Cornelia verified that forcing a legacy mode on vhost-vsock-pci device using x86-64 host and s390x guest, so with different endianness, produces strange behaviours. This patch forces virtio version 1 and removes the 'transitional_name' property removing the need to specify 'disable-legacy=3Don' on vhost-vsock-pci device. Cc: qemu-stable@nongnu.org Reported-by: Qian Cai Reported-by: Qinghua Cheng Buglink: https://bugzilla.redhat.com/show_bug.cgi?id=3D1868449 Suggested-by: Cornelia Huck Reviewed-by: Cornelia Huck Signed-off-by: Stefano Garzarella --- hw/virtio/vhost-vsock-pci.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/virtio/vhost-vsock-pci.c b/hw/virtio/vhost-vsock-pci.c index a815278e69..d1fcad0472 100644 --- a/hw/virtio/vhost-vsock-pci.c +++ b/hw/virtio/vhost-vsock-pci.c @@ -44,6 +44,7 @@ static void vhost_vsock_pci_realize(VirtIOPCIProxy *vpci_= dev, Error **errp) VHostVSockPCI *dev =3D VHOST_VSOCK_PCI(vpci_dev); DeviceState *vdev =3D DEVICE(&dev->vdev); =20 + virtio_pci_force_virtio_1(vpci_dev); qdev_realize(vdev, BUS(&vpci_dev->bus), errp); } =20 @@ -72,7 +73,6 @@ static void vhost_vsock_pci_instance_init(Object *obj) static const VirtioPCIDeviceTypeInfo vhost_vsock_pci_info =3D { .base_name =3D TYPE_VHOST_VSOCK_PCI, .generic_name =3D "vhost-vsock-pci", - .transitional_name =3D "vhost-vsock-pci-transitional", .non_transitional_name =3D "vhost-vsock-pci-non-transitional", .instance_size =3D sizeof(VHostVSockPCI), .instance_init =3D vhost_vsock_pci_instance_init, --=20 2.26.2 From nobody Mon Feb 9 08:19:42 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=1597848167; cv=none; d=zohomail.com; s=zohoarc; b=BkaW+ATNJTAsw52DzNx4wrmIneacGf15pHN0sZLaq5W2kkl3fuF0m/Tn7qAFiQrTuw/n+BXW0R3dc4rcXQr55Ph/bIB68gwCJW5h1g5Ci7iHNIcCB27my2sQuOvI7tY0mNS6JJT5rQk5R89fwbF4zVxdmdshbsXLf+2k24+p7NM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597848167; 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=PyjvQipO5fk4AXR6ZRzcuLhwiKd8Lh6A5C5j+BeJ9sc=; b=XR1hg+2j3HEmNXXCURdbR2NN5W9rjcvOQL10kZZif4CEeA4laT5oW/Sk3a51htOy11Yhn/cZ7LKdAteplL5hFWG5VpxBz1HtrjjViO2Ft5hSacyX2zjnERzgLzWIs+v2Wb0spj3VYjh0s1f/NpSDMDX3v7n5wvcL/rTQU97yK2U= 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 1597848167069370.98082264104266; Wed, 19 Aug 2020 07:42:47 -0700 (PDT) Received: from localhost ([::1]:60776 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k8PIb-0005pJ-OF for importer@patchew.org; Wed, 19 Aug 2020 10:42:45 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:48990) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k8PFb-0000tL-Kz for qemu-devel@nongnu.org; Wed, 19 Aug 2020 10:39:39 -0400 Received: from us-smtp-2.mimecast.com ([205.139.110.61]:36993 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1k8PFX-00028t-KP for qemu-devel@nongnu.org; Wed, 19 Aug 2020 10:39:39 -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-350-RcMiTt0CMTuDSWwMKLFeuA-1; Wed, 19 Aug 2020 10:39:30 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 764991007469; Wed, 19 Aug 2020 14:39:29 +0000 (UTC) Received: from steredhat.redhat.com (ovpn-113-40.ams2.redhat.com [10.36.113.40]) by smtp.corp.redhat.com (Postfix) with ESMTP id BDD555F7D8; Wed, 19 Aug 2020 14:39:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1597847975; 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=PyjvQipO5fk4AXR6ZRzcuLhwiKd8Lh6A5C5j+BeJ9sc=; b=RDxpblX470LgrovBeXgPLS0rInRPzPiGbjzkP3IfL6C2vj/jsq497wgzr/h5lO5hhAAQGj 89uQt7KiH73tlnH+V7YfLA3saWMJiraBNLI2/uNk5+6Au1nq0yX/AW3XVW8vk5l4naaoGA 2QIkxz4/+wry0IkwqoBriK8LVW71B50= X-MC-Unique: RcMiTt0CMTuDSWwMKLFeuA-1 From: Stefano Garzarella To: qemu-devel@nongnu.org Subject: [PATCH v2 2/3] vhost-user-vsock-pci: force virtio version 1 Date: Wed, 19 Aug 2020 16:38:50 +0200 Message-Id: <20200819143851.78069-3-sgarzare@redhat.com> In-Reply-To: <20200819143851.78069-1-sgarzare@redhat.com> References: <20200819143851.78069-1-sgarzare@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=sgarzare@redhat.com X-Mimecast-Spam-Score: 0.001 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=205.139.110.61; envelope-from=sgarzare@redhat.com; helo=us-smtp-delivery-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/08/19 04:57:22 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -40 X-Spam_score: -4.1 X-Spam_bar: ---- X-Spam_report: (-4.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1, 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_H2=-1, 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: Thomas Huth , Qinghua Cheng , Qian Cai , David Hildenbrand , Cornelia Huck , qemu-stable@nongnu.org, Halil Pasic , Christian Borntraeger , qemu-s390x@nongnu.org, "Michael S. Tsirkin" , Richard Henderson 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" Commit 9b3a35ec82 ("virtio: verify that legacy support is not accidentally on") added a safety check that requires to set 'disable-legacy=3Don' on vhost-user-vsock-pci device: $ ./qemu-system-x86_64 ... \ -chardev socket,id=3Dchar0,reconnect=3D0,path=3D/tmp/vhost4.socket \ -device vhost-user-vsock-pci,chardev=3Dchar0 qemu-system-x86_64: -device vhost-user-vsock-pci,chardev=3Dchar0: device is modern-only, use disable-legacy=3Don virtio-vsock was introduced after the release of VIRTIO 1.0 specifications, so it should be 'modern-only'. This patch forces virtio version 1 and removes the 'transitional_name' property, as done for vhost-vsock-pci, removing the need to specify 'disable-legacy=3Don' on vhost-user-vsock-pci device. Cc: qemu-stable@nongnu.org Suggested-by: Cornelia Huck Reviewed-by: Cornelia Huck Signed-off-by: Stefano Garzarella --- hw/virtio/vhost-user-vsock-pci.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/virtio/vhost-user-vsock-pci.c b/hw/virtio/vhost-user-vsock-= pci.c index f4cf95873d..3e17cf0480 100644 --- a/hw/virtio/vhost-user-vsock-pci.c +++ b/hw/virtio/vhost-user-vsock-pci.c @@ -40,6 +40,7 @@ static void vhost_user_vsock_pci_realize(VirtIOPCIProxy *= vpci_dev, Error **errp) VHostUserVSockPCI *dev =3D VHOST_USER_VSOCK_PCI(vpci_dev); DeviceState *vdev =3D DEVICE(&dev->vdev); =20 + virtio_pci_force_virtio_1(vpci_dev); qdev_realize(vdev, BUS(&vpci_dev->bus), errp); } =20 @@ -68,7 +69,6 @@ static void vhost_user_vsock_pci_instance_init(Object *ob= j) static const VirtioPCIDeviceTypeInfo vhost_user_vsock_pci_info =3D { .base_name =3D TYPE_VHOST_USER_VSOCK_PCI, .generic_name =3D "vhost-user-vsock-pci", - .transitional_name =3D "vhost-user-vsock-pci-transitional", .non_transitional_name =3D "vhost-user-vsock-pci-non-transitional", .instance_size =3D sizeof(VHostUserVSockPCI), .instance_init =3D vhost_user_vsock_pci_instance_init, --=20 2.26.2 From nobody Mon Feb 9 08:19:42 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=1597848047; cv=none; d=zohomail.com; s=zohoarc; b=knu/bzgzItDC5ZurSmsBMFxaCD4QR2bRTdw1vD86bm7yN9cfEKKb4ZWxbO0jEI9NCqbMrDf1B9fZKBhJW4uz/rl6u/PP+LBiIhdcmkK1kE1wlS69AXvd+IObPEoD8S4Km5LDNKktCeX3B3S1lujuC/nXhkCwH7PpPogTKxQp+IM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597848047; 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=ehGIYLQAKEMIRToBRGoYbRYuUV0B7Fyvr5joJ5ZwBs8=; b=hfEfMLspbGsefdRwIkYU3zmDMYYfOAMLzwjAI9M+uvq4X09PtKskx81q/cN0NGmOWATzYIMOe7i2Bg/Z721OEARXBfuMSqXBaTs+3ysRsjEUu71JIKp064pRJxOwlzUdNLWiqJ2mogKXjraptvxTtbJDuU45kDhJz7AzN+0pfCM= 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 1597848047714955.9693511076345; Wed, 19 Aug 2020 07:40:47 -0700 (PDT) Received: from localhost ([::1]:53368 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k8PGg-0002lm-En for importer@patchew.org; Wed, 19 Aug 2020 10:40:46 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:49020) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k8PFd-0000yx-UU for qemu-devel@nongnu.org; Wed, 19 Aug 2020 10:39:41 -0400 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:51331 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1k8PFc-0002AT-Dy for qemu-devel@nongnu.org; Wed, 19 Aug 2020 10:39:41 -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-297-588CTsdzPlytAndFRLsNyg-1; Wed, 19 Aug 2020 10:39:36 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 9E55F186A56F; Wed, 19 Aug 2020 14:39:34 +0000 (UTC) Received: from steredhat.redhat.com (ovpn-113-40.ams2.redhat.com [10.36.113.40]) by smtp.corp.redhat.com (Postfix) with ESMTP id 219D05F7D8; Wed, 19 Aug 2020 14:39:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1597847979; 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=ehGIYLQAKEMIRToBRGoYbRYuUV0B7Fyvr5joJ5ZwBs8=; b=CoioFfxdo3pbOasiB1U6RBiKmGI2sfNTYE8ZJdA4ykozkxcoywtN7BJEWMXT+CAuOO8dYD sSK0NSZ7nDrhLKiXRewDgdPJ1zEvu2lV0GtvA1mRuazP8n5yATR3Wa5BSH7w31yDMCF5OE Xka1EBRb67YkzynZbr9g/BSZGuGmp2M= X-MC-Unique: 588CTsdzPlytAndFRLsNyg-1 From: Stefano Garzarella To: qemu-devel@nongnu.org Subject: [PATCH v2 3/3] vhost-vsock-ccw: force virtio version 1 Date: Wed, 19 Aug 2020 16:38:51 +0200 Message-Id: <20200819143851.78069-4-sgarzare@redhat.com> In-Reply-To: <20200819143851.78069-1-sgarzare@redhat.com> References: <20200819143851.78069-1-sgarzare@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=sgarzare@redhat.com X-Mimecast-Spam-Score: 0.001 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=207.211.31.120; envelope-from=sgarzare@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/08/19 04:00:34 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1, 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_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, 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: Thomas Huth , Qinghua Cheng , Qian Cai , David Hildenbrand , Cornelia Huck , qemu-stable@nongnu.org, Halil Pasic , Christian Borntraeger , qemu-s390x@nongnu.org, "Michael S. Tsirkin" , Richard Henderson 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" virtio-vsock was introduced after the release of VIRTIO 1.0 specifications, so it should be 'modern-only'. This patch forces virtio version 1 as done for vhost-vsock-pci. Cc: qemu-stable@nongnu.org Suggested-by: Cornelia Huck Reviewed-by: Cornelia Huck Signed-off-by: Stefano Garzarella --- hw/s390x/vhost-vsock-ccw.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/hw/s390x/vhost-vsock-ccw.c b/hw/s390x/vhost-vsock-ccw.c index 0822ecca89..0759143efa 100644 --- a/hw/s390x/vhost-vsock-ccw.c +++ b/hw/s390x/vhost-vsock-ccw.c @@ -40,7 +40,9 @@ static void vhost_vsock_ccw_class_init(ObjectClass *klass= , void *data) static void vhost_vsock_ccw_instance_init(Object *obj) { VHostVSockCCWState *dev =3D VHOST_VSOCK_CCW(obj); + VirtioCcwDevice *ccw_dev =3D VIRTIO_CCW_DEVICE(obj); =20 + ccw_dev->force_revision_1 =3D true; virtio_instance_init_common(obj, &dev->vdev, sizeof(dev->vdev), TYPE_VHOST_VSOCK); } --=20 2.26.2