From nobody Mon Feb 9 12:35:41 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=1597834409; cv=none; d=zohomail.com; s=zohoarc; b=ltG1osFrrz7wiYhAnlLHkMpSAumeGPASfQ4o8HUXlFIdFS/sCUhpUIf+mMyed6UwCBUoABZRVbt0hU9LiJEkkDqxt10HhgPGNMzYCHoFV37T5T1D6PeWOEsIGppIOwJtC5YUNUJPS4dfB+X2Vp8lKsfxBJbwbMjPOdTe8njyz4U= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597834409; 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=yMvBEYvFcEJdn+65LCaVDcDOWIxg9f9bn1dPpJH1rrE=; b=TlLULAf7wd52wEY+URCphyaQYiysXrc2tol82vvjXNu4pZ+eV03bOENDrc1QWDJv06eNS6prf1X91MJbef1BBMZlQU5cyLDqxJv8HbEsxn7wN4XdfDgLYANc87kMYdvJUUUs28aQkdtUAsjaohhkHcAmvHJbzPN0VqfrZOViKdc= 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 1597834409395237.72507016959503; Wed, 19 Aug 2020 03:53:29 -0700 (PDT) Received: from localhost ([::1]:39826 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k8Lii-0002sU-3H for importer@patchew.org; Wed, 19 Aug 2020 06:53:28 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41034) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k8Lhe-00018y-5G for qemu-devel@nongnu.org; Wed, 19 Aug 2020 06:52:22 -0400 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:28772 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 1k8Lhc-0004TC-CP for qemu-devel@nongnu.org; Wed, 19 Aug 2020 06:52:21 -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-525-Y29eTOIBNNmyi3LNwlZExw-1; Wed, 19 Aug 2020 06:52:18 -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 11F951084C8E; Wed, 19 Aug 2020 10:52:17 +0000 (UTC) Received: from steredhat.redhat.com (ovpn-114-132.ams2.redhat.com [10.36.114.132]) by smtp.corp.redhat.com (Postfix) with ESMTP id 1F4875C1A3; Wed, 19 Aug 2020 10:52:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1597834339; 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=yMvBEYvFcEJdn+65LCaVDcDOWIxg9f9bn1dPpJH1rrE=; b=c+ld+sxOnCKbf1KVaoRAW/hcvyAlq6TJy40ifedcJUoipjQzE9jbfbJOaJZQzhxVsJPBiE i1nn/rR5fG3V2eND8U21zB42OjOdcIpnmkf9tgjAkP2cB1iDee2iALagxuQp+Y6RrXNMzT NiWW1hUmJgEmdCEalVvYEradsFbhrUw= X-MC-Unique: Y29eTOIBNNmyi3LNwlZExw-1 From: Stefano Garzarella To: qemu-devel@nongnu.org Subject: [PATCH 1/3] vhost-vsock-pci: force virtio version 1 Date: Wed, 19 Aug 2020 12:51:54 +0200 Message-Id: <20200819105156.54163-2-sgarzare@redhat.com> In-Reply-To: <20200819105156.54163-1-sgarzare@redhat.com> References: <20200819105156.54163-1-sgarzare@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=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=ham 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 checks 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 remove 'transitional_name' properties 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 Signed-off-by: Stefano Garzarella Reviewed-by: Cornelia Huck --- 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 12:35:41 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=1597834416; cv=none; d=zohomail.com; s=zohoarc; b=K2IbWt4Fti9IkVtFzuzoVGdbdvaxJ3VMxg1fawg37jgHuOz5uG4zY/nt7gX+OnCaIbwoJMB+GMgIacK02SS94cFBacSDZaIi1HB719jbZ25/ks4HItnelwrtV5q/oVisM4CuMCXnInS1ZaopK7fxupcFbS1hEvm178/cabM7qs0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597834416; 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=tQveUMVHXpAVIuMc9Efemp7yOcZK66SV5jGiFwZPCO0=; b=JpW49QcbzXzJnfzjo8fAB0M1C5trFKVxboNmws5C5sgjNSEhoSADRpmh0IuTUcCOaPH7F7cDTx+a/QWixU5cUSkEPq9DO0PTejXOpv8TvRnqZe94Wm2dzwjaXz9/ms7+FtRuNE+3XMikRHPRjUMuet7Ijmx8pk9cuZ88B8klTto= 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 1597834416829807.5097914712238; Wed, 19 Aug 2020 03:53:36 -0700 (PDT) Received: from localhost ([::1]:40680 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k8Lip-0003Es-DZ for importer@patchew.org; Wed, 19 Aug 2020 06:53:35 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41144) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k8Lhn-0001XI-JY for qemu-devel@nongnu.org; Wed, 19 Aug 2020 06:52:31 -0400 Received: from us-smtp-1.mimecast.com ([207.211.31.81]:32216 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 1k8Lhk-0004U7-DF for qemu-devel@nongnu.org; Wed, 19 Aug 2020 06:52:31 -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-173-eMoB15Z3ML-smyQFPJgWNQ-1; Wed, 19 Aug 2020 06:52:25 -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 5585E1084C8C; Wed, 19 Aug 2020 10:52:24 +0000 (UTC) Received: from steredhat.redhat.com (ovpn-114-132.ams2.redhat.com [10.36.114.132]) by smtp.corp.redhat.com (Postfix) with ESMTP id 9BBF15C1A3; Wed, 19 Aug 2020 10:52:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1597834347; 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=tQveUMVHXpAVIuMc9Efemp7yOcZK66SV5jGiFwZPCO0=; b=Pl3zUrtsAKLGcO1raATwWvjAHdR8vomf29TBdSBdxN+pzem/ReS3qEe3cL5P65fSAl13H0 4loGashzJHYAxC0KlmaD2AWbS3I1DIYnDtehlM6zSxmEhvEjHlTOZ/DeJMEShYvWprfYPe 3BDBSlAVXZZa7/AaLtNPYhVViJOJj54= X-MC-Unique: eMoB15Z3ML-smyQFPJgWNQ-1 From: Stefano Garzarella To: qemu-devel@nongnu.org Subject: [PATCH 2/3] vhost-user-vsock-pci: force virtio version 1 Date: Wed, 19 Aug 2020 12:51:55 +0200 Message-Id: <20200819105156.54163-3-sgarzare@redhat.com> In-Reply-To: <20200819105156.54163-1-sgarzare@redhat.com> References: <20200819105156.54163-1-sgarzare@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=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.81; 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 01:46:53 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 checks 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 remove 'transitional_name' properties, 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 Signed-off-by: Stefano Garzarella Reviewed-by: Cornelia Huck --- 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 12:35:41 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=1597834438; cv=none; d=zohomail.com; s=zohoarc; b=gtpwNVun54Shx+pWm7evch9iQ/fsArOpH10zuSM5qJi07VBnuVe3ctrNPaOSYfYcIT6TMkc9hkxsJKTn3sxmHAZLgQOzcNf+euQLm0+U6xljSDI8Tm1POPkW4CUIn03d5sgMJbRjobIH487ZQ1uSRyJhsAwjb1ygqOIrhYtN4ps= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597834438; 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=050x6x/nruS+dqlDdRlFvCxjeOafaWjPF0d0fV4cSGs=; b=erazqaVGwxs3EA4ig8O4S8hYpsw6Yr8K0NKzzINGnAz5ot6+KpMEIsZJ4hgIL6ohFwGJCpFuYT14i7cIwYhTNc/THSCRezEpFKLMlu6So/RjRzt18K4Ykvi1j5ozlChC3vV6mpgwosxYvPe3H02+Nj6BB42gUt5P4OJ92v/o/oQ= 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 1597834438457537.4039546772085; Wed, 19 Aug 2020 03:53:58 -0700 (PDT) Received: from localhost ([::1]:42962 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k8LjA-00048d-9B for importer@patchew.org; Wed, 19 Aug 2020 06:53:56 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41248) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k8Lhw-0001vb-Qm for qemu-devel@nongnu.org; Wed, 19 Aug 2020 06:52:40 -0400 Received: from us-smtp-2.mimecast.com ([205.139.110.61]:29654 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 1k8Lhu-0004Vr-0P for qemu-devel@nongnu.org; Wed, 19 Aug 2020 06:52:40 -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-418-2z42ECsHOtiRr_4vSARQxg-1; Wed, 19 Aug 2020 06:52:35 -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 6C28210066FF; Wed, 19 Aug 2020 10:52:34 +0000 (UTC) Received: from steredhat.redhat.com (ovpn-114-132.ams2.redhat.com [10.36.114.132]) by smtp.corp.redhat.com (Postfix) with ESMTP id 046085C1A3; Wed, 19 Aug 2020 10:52:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1597834357; 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=050x6x/nruS+dqlDdRlFvCxjeOafaWjPF0d0fV4cSGs=; b=MSiZ8HG1/V+VYY3gMeDW7qSRFnJ5Ljnv+zTV35+cAxYuinETpcZWZRD6T1DSDeP9OqZAOC ZW8lrW9uSQUAJqS8pVKslHodltsFCX31f8+lFJ/KVhy7YR1EEqn8KMQ+wavHMVaGX9EiDm uysSkyz3VFJ4FX0Pe5kz3wRY8Ac/jco= X-MC-Unique: 2z42ECsHOtiRr_4vSARQxg-1 From: Stefano Garzarella To: qemu-devel@nongnu.org Subject: [PATCH 3/3] vhost-vsock-ccw: force virtio version 1 Date: Wed, 19 Aug 2020 12:51:56 +0200 Message-Id: <20200819105156.54163-4-sgarzare@redhat.com> In-Reply-To: <20200819105156.54163-1-sgarzare@redhat.com> References: <20200819105156.54163-1-sgarzare@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=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" 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 Signed-off-by: Stefano Garzarella Reviewed-by: Cornelia Huck --- 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