From nobody Thu May 2 22:51:47 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) client-ip=170.10.129.124; envelope-from=libvir-list-bounces@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 170.10.129.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1642528773; cv=none; d=zohomail.com; s=zohoarc; b=ZY+ypO4VMC6hUd3Vw5VogY0YBsxyy8KtwVREheGQGfNK8V/JrBpt056twWnx9bLwRPpkKhZdX1Q0REMsYavIjUGPXUHQzVbVOiz4NA0XNR5wXoBD4648Sl72NAEWahzIhas9qc+Xu+NghehnICn0juxYjDg/k7RgBHWV8jrD3Go= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1642528773; h=Content-Type:Content-Transfer-Encoding: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=b9WkHtO9+RH0mTbkeaQEQbfZaHU1Y2/qVqEW1J6KmlU=; b=GNUQEt1mU0zBNXD+pefyleM4cL3gk2q7fw8yWqGtgxJ6BiVyqUHaTMO76VlsNUqCZuRhWp1jcS+FSdGQDeD8f1HbecS0l9ZZlOvWCHB/ZaJJ2VvOMnQUPb8mj1ZG/6MFDuDH8vX1h7x+Ijiy8If4PezBcsimXYGrHJAj94/YOCk= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mx.zohomail.com with SMTPS id 1642528773107870.9738301145975; Tue, 18 Jan 2022 09:59:33 -0800 (PST) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-53-lBk9eG9QNXCWBDQLsYaSTw-1; Tue, 18 Jan 2022 12:59:28 -0500 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 41F9E51091; Tue, 18 Jan 2022 17:59:22 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 1D4FE34D5B; Tue, 18 Jan 2022 17:59:22 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id DEA241826D13; Tue, 18 Jan 2022 17:59:21 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 20IHDZ3J006035 for ; Tue, 18 Jan 2022 12:13:35 -0500 Received: by smtp.corp.redhat.com (Postfix) id 00B524DC09; Tue, 18 Jan 2022 17:13:35 +0000 (UTC) Received: from hjs.redhat.com (unknown [10.43.2.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7F8954F86C for ; Tue, 18 Jan 2022 17:13:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1642528772; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=b9WkHtO9+RH0mTbkeaQEQbfZaHU1Y2/qVqEW1J6KmlU=; b=XpVJl3oEsOLjnzclKr8vPMMzmfX2VqqRMGNkWLXKeaLJOUYVKjZQNnUV+ey/Mth82QYngS vzIMMew6X4w0jCtRTk/GKoMlHMRIB4OIrpahWrdGxRgsD0GcjT+5rmrwogT2+sSF0Hh0b9 73s46m3l6n7wzW8pYFwXqAllGQ5C/sA= X-MC-Unique: lBk9eG9QNXCWBDQLsYaSTw-1 From: =?UTF-8?q?J=C3=A1n=20Tomko?= To: libvir-list@redhat.com Subject: [libvirt PATCHv2 1/3] qemu: capabilities: do not check for transitional input host Date: Tue, 18 Jan 2022 18:13:04 +0100 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-loop: libvir-list@redhat.com X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@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) X-ZM-MESSAGEID: 1642528774051100001 The (non-)transitional version of this device was only present in one upstream QEMU release (4.0), then removed by: commit d923e30578a65392e50e530e3a29b2edf5c51c5b virtio-input-host-pci: cleanup types Remove them from probing as well, since they are unlikely to be found. Signed-off-by: J=C3=A1n Tomko Reviewed-by: Andrea Bolognani --- src/qemu/qemu_capabilities.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index a71d3b912f..66d5effba8 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -1316,8 +1316,6 @@ struct virQEMUCapsStringFlags virQEMUCapsObjectTypes[= ] =3D { { "virtio-balloon-pci-non-transitional", QEMU_CAPS_VIRTIO_PCI_TRANSITI= ONAL }, { "vhost-vsock-pci-transitional", QEMU_CAPS_VIRTIO_PCI_TRANSITIONAL }, { "vhost-vsock-pci-non-transitional", QEMU_CAPS_VIRTIO_PCI_TRANSITIONA= L }, - { "virtio-input-host-pci-transitional", QEMU_CAPS_VIRTIO_PCI_TRANSITIO= NAL }, - { "virtio-input-host-pci-non-transitional", QEMU_CAPS_VIRTIO_PCI_TRANS= ITIONAL }, { "virtio-scsi-pci-transitional", QEMU_CAPS_VIRTIO_PCI_TRANSITIONAL }, { "virtio-scsi-pci-non-transitional", QEMU_CAPS_VIRTIO_PCI_TRANSITIONA= L }, { "virtio-serial-pci-transitional", QEMU_CAPS_VIRTIO_PCI_TRANSITIONAL = }, --=20 2.31.1 From nobody Thu May 2 22:51:47 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) client-ip=170.10.129.124; envelope-from=libvir-list-bounces@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 170.10.129.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1642528054; cv=none; d=zohomail.com; s=zohoarc; b=elFWMRhBBsU0w9IIpRlbeefdaNVKS/SX/ncGFyJoFECf7GZpBDZS/NlbyVEK9ov24hBjBOL+FsGQ9xOn/spYEZYCmqBSxCVwpBrqnHUKmty1kC7jysCEesaxs5nkZ+s8ONqAubyIZ64Oce6IEAoLw6pNGO2Y2dWZuTatgnHdWAg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1642528054; h=Content-Type:Content-Transfer-Encoding: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=5/dBD4Q0IkIAo8xVf8SMrYLRY2/MIgDa+U1NMUE2eyY=; b=ILizuVn8LgjDdMPn/OK14vw9dlHfLTmE9TwP4Hn7OU4GVT1Fe09kv3eUYMrIrV2812vZbO1paeKnZmHLwx2GrmlduSNlZ9p85X4FNpDTXBwRqkbSvA6nyvPIBQBHkz04FSUZWaHuFDpyTEDWOsCjJTgjfM0pk7gungNdIuNiJpI= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mx.zohomail.com with SMTPS id 1642528054571194.04545138173273; Tue, 18 Jan 2022 09:47:34 -0800 (PST) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-441-0T_t_VeMOLin7D4ZkkafiQ-1; Tue, 18 Jan 2022 12:47:17 -0500 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 7B7B0869ECB; Tue, 18 Jan 2022 17:37:27 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 5AD2C7ED93; Tue, 18 Jan 2022 17:37:27 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 2C77F1826D07; Tue, 18 Jan 2022 17:37:27 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 20IHDZws006046 for ; Tue, 18 Jan 2022 12:13:35 -0500 Received: by smtp.corp.redhat.com (Postfix) id C68CE5AB5A; Tue, 18 Jan 2022 17:13:35 +0000 (UTC) Received: from hjs.redhat.com (unknown [10.43.2.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4CFB45AB55 for ; Tue, 18 Jan 2022 17:13:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1642528052; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=5/dBD4Q0IkIAo8xVf8SMrYLRY2/MIgDa+U1NMUE2eyY=; b=KuuOozIu8gODAyRk4tNF9OFt36TCXTZny66N5fTvUhB540JQ4Mq1vGRWRo5Nj1GXB1u41Z e74KFm8S5r0EKxGitQpBXDO/0SjMVE0x/Jf/Ct3qh4w0FmBQdtRaTp+n5m5mm2IRsY7LQi d9CrIwOxkhFesp/pRHnEoyiaEmW1iLk= X-MC-Unique: 0T_t_VeMOLin7D4ZkkafiQ-1 From: =?UTF-8?q?J=C3=A1n=20Tomko?= To: libvir-list@redhat.com Subject: [libvirt PATCHv2 2/3] qemu: remove support for transitional virtio-input-host Date: Tue, 18 Jan 2022 18:13:05 +0100 Message-Id: <82b56b44a0ea180a1ec5ff304ce7902312ea5a59.1642525970.git.jtomko@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-loop: libvir-list@redhat.com X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@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) X-ZM-MESSAGEID: 1642528055718100001 This device was virtio 1.0-only so adding the (non-)transitional model did not make sense and it was only present in QEMU 4.0. Report a validation error for both of the users that will ever hit this code path and Signed-off-by: J=C3=A1n Tomko --- src/qemu/qemu_validate.c | 26 +++++-------------- .../virtio-non-transitional.x86_64-3.1.0.args | 4 +-- ...virtio-non-transitional.x86_64-latest.args | 4 +-- .../virtio-non-transitional.xml | 3 --- .../virtio-transitional.x86_64-3.1.0.args | 3 +-- .../virtio-transitional.x86_64-latest.args | 3 +-- .../qemuxml2argvdata/virtio-transitional.xml | 3 --- .../virtio-non-transitional.x86_64-latest.xml | 11 +------- .../virtio-transitional.x86_64-latest.xml | 6 +---- 9 files changed, 12 insertions(+), 51 deletions(-) diff --git a/src/qemu/qemu_validate.c b/src/qemu/qemu_validate.c index 3a69733f81..a4a6608779 100644 --- a/src/qemu/qemu_validate.c +++ b/src/qemu/qemu_validate.c @@ -4699,29 +4699,15 @@ qemuValidateDomainDeviceDefInput(const virDomainInp= utDef *input, if (input->bus !=3D VIR_DOMAIN_INPUT_BUS_VIRTIO) return 0; =20 - /* Only type=3Dpassthrough supports model=3Dvirtio-(non-)transitional = */ + /* model=3Dvirtio-(non-)transitional is unsupported */ switch ((virDomainInputModel)input->model) { case VIR_DOMAIN_INPUT_MODEL_VIRTIO_TRANSITIONAL: case VIR_DOMAIN_INPUT_MODEL_VIRTIO_NON_TRANSITIONAL: - switch ((virDomainInputType)input->type) { - case VIR_DOMAIN_INPUT_TYPE_MOUSE: - case VIR_DOMAIN_INPUT_TYPE_TABLET: - case VIR_DOMAIN_INPUT_TYPE_KBD: - case VIR_DOMAIN_INPUT_TYPE_EVDEV: - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("virtio (non-)transitional models are not " - "supported for input type=3D%s"), - virDomainInputTypeToString(input->type)); - return -1; - case VIR_DOMAIN_INPUT_TYPE_PASSTHROUGH: - break; - case VIR_DOMAIN_INPUT_TYPE_LAST: - default: - virReportEnumRangeError(virDomainInputType, - input->type); - return -1; - } - break; + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("virtio (non-)transitional models are not " + "supported for input type=3D%s"), + virDomainInputTypeToString(input->type)); + return -1; case VIR_DOMAIN_INPUT_MODEL_VIRTIO: case VIR_DOMAIN_INPUT_MODEL_DEFAULT: break; diff --git a/tests/qemuxml2argvdata/virtio-non-transitional.x86_64-3.1.0.ar= gs b/tests/qemuxml2argvdata/virtio-non-transitional.x86_64-3.1.0.args index a1b31c616c..2d0e568bb0 100644 --- a/tests/qemuxml2argvdata/virtio-non-transitional.x86_64-3.1.0.args +++ b/tests/qemuxml2argvdata/virtio-non-transitional.x86_64-3.1.0.args @@ -36,7 +36,6 @@ QEMU_AUDIO_DRV=3Dnone \ -device pcie-root-port,port=3D15,chassis=3D8,id=3Dpci.8,bus=3Dpcie.0,addr= =3D0x1.0x7 \ -device pcie-root-port,port=3D16,chassis=3D9,id=3Dpci.9,bus=3Dpcie.0,multi= function=3Don,addr=3D0x2 \ -device pcie-root-port,port=3D17,chassis=3D10,id=3Dpci.10,bus=3Dpcie.0,add= r=3D0x2.0x1 \ --device pcie-root-port,port=3D18,chassis=3D11,id=3Dpci.11,bus=3Dpcie.0,add= r=3D0x2.0x2 \ -device virtio-scsi-pci,disable-legacy=3Don,disable-modern=3Doff,id=3Dscsi= 0,bus=3Dpci.4,addr=3D0x0 \ -device virtio-serial-pci,disable-legacy=3Don,disable-modern=3Doff,id=3Dvi= rtio-serial0,bus=3Dpci.3,addr=3D0x0 \ -drive file=3D/dev/HostVG/QEMUGuest1,format=3Draw,if=3Dnone,id=3Ddrive-vir= tio-disk0 \ @@ -45,11 +44,10 @@ QEMU_AUDIO_DRV=3Dnone \ -device virtio-9p-pci,disable-legacy=3Don,disable-modern=3Doff,id=3Dfs0,fs= dev=3Dfsdev-fs0,mount_tag=3Dfs1,bus=3Dpci.1,addr=3D0x0 \ -netdev user,id=3Dhostnet0 \ -device virtio-net-pci,disable-legacy=3Don,disable-modern=3Doff,netdev=3Dh= ostnet0,id=3Dnet0,mac=3D00:11:22:33:44:55,bus=3Dpci.2,addr=3D0x0 \ --device virtio-input-host-pci,disable-legacy=3Don,disable-modern=3Doff,id= =3Dinput0,evdev=3D/dev/input/event1234,bus=3Dpci.9,addr=3D0x0 \ -device vhost-scsi-pci,disable-legacy=3Don,disable-modern=3Doff,wwpn=3Dnaa= .5123456789abcde0,vhostfd=3D3,id=3Dhostdev0,bus=3Dpci.6,addr=3D0x0 \ -device virtio-balloon-pci,disable-legacy=3Don,disable-modern=3Doff,id=3Db= alloon0,bus=3Dpci.7,addr=3D0x0 \ -object rng-random,id=3Dobjrng0,filename=3D/dev/urandom \ -device virtio-rng-pci,disable-legacy=3Don,disable-modern=3Doff,rng=3Dobjr= ng0,id=3Drng0,bus=3Dpci.8,addr=3D0x0 \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ --device vhost-vsock-pci,disable-legacy=3Don,disable-modern=3Doff,id=3Dvsoc= k0,guest-cid=3D4,vhostfd=3D6789,bus=3Dpci.10,addr=3D0x0 \ +-device vhost-vsock-pci,disable-legacy=3Don,disable-modern=3Doff,id=3Dvsoc= k0,guest-cid=3D4,vhostfd=3D6789,bus=3Dpci.9,addr=3D0x0 \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/virtio-non-transitional.x86_64-latest.a= rgs b/tests/qemuxml2argvdata/virtio-non-transitional.x86_64-latest.args index 8fa615b0b0..541c074871 100644 --- a/tests/qemuxml2argvdata/virtio-non-transitional.x86_64-latest.args +++ b/tests/qemuxml2argvdata/virtio-non-transitional.x86_64-latest.args @@ -37,7 +37,6 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -device '{"driver":"pcie-root-port","port":15,"chassis":8,"id":"pci.8","bu= s":"pcie.0","addr":"0x1.0x7"}' \ -device '{"driver":"pcie-root-port","port":16,"chassis":9,"id":"pci.9","bu= s":"pcie.0","multifunction":true,"addr":"0x2"}' \ -device '{"driver":"pcie-root-port","port":17,"chassis":10,"id":"pci.10","= bus":"pcie.0","addr":"0x2.0x1"}' \ --device '{"driver":"pcie-root-port","port":18,"chassis":11,"id":"pci.11","= bus":"pcie.0","addr":"0x2.0x2"}' \ -device '{"driver":"virtio-scsi-pci-non-transitional","id":"scsi0","bus":"= pci.4","addr":"0x0"}' \ -device '{"driver":"virtio-serial-pci-non-transitional","id":"virtio-seria= l0","bus":"pci.3","addr":"0x0"}' \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ @@ -47,12 +46,11 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -device '{"driver":"virtio-9p-pci-non-transitional","id":"fs0","fsdev":"fs= dev-fs0","mount_tag":"fs1","bus":"pci.1","addr":"0x0"}' \ -netdev user,id=3Dhostnet0 \ -device '{"driver":"virtio-net-pci-non-transitional","netdev":"hostnet0","= id":"net0","mac":"00:11:22:33:44:55","bus":"pci.2","addr":"0x0"}' \ --device '{"driver":"virtio-input-host-pci-non-transitional","id":"input0",= "evdev":"/dev/input/event1234","bus":"pci.9","addr":"0x0"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"vhost-scsi-pci-non-transitional","wwpn":"naa.512345678= 9abcde0","vhostfd":"3","id":"hostdev0","bus":"pci.6","addr":"0x0"}' \ -device '{"driver":"virtio-balloon-pci-non-transitional","id":"balloon0","= bus":"pci.7","addr":"0x0"}' \ -object '{"qom-type":"rng-random","id":"objrng0","filename":"/dev/urandom"= }' \ -device '{"driver":"virtio-rng-pci-non-transitional","rng":"objrng0","id":= "rng0","bus":"pci.8","addr":"0x0"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ --device '{"driver":"vhost-vsock-pci-non-transitional","id":"vsock0","guest= -cid":4,"vhostfd":"6789","bus":"pci.10","addr":"0x0"}' \ +-device '{"driver":"vhost-vsock-pci-non-transitional","id":"vsock0","guest= -cid":4,"vhostfd":"6789","bus":"pci.9","addr":"0x0"}' \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/virtio-non-transitional.xml b/tests/qem= uxml2argvdata/virtio-non-transitional.xml index 1d7ee6bfe6..9331cd7ea2 100644 --- a/tests/qemuxml2argvdata/virtio-non-transitional.xml +++ b/tests/qemuxml2argvdata/virtio-non-transitional.xml @@ -25,9 +25,6 @@ - - - diff --git a/tests/qemuxml2argvdata/virtio-transitional.x86_64-3.1.0.args b= /tests/qemuxml2argvdata/virtio-transitional.x86_64-3.1.0.args index aaa3f26228..83bb5d137d 100644 --- a/tests/qemuxml2argvdata/virtio-transitional.x86_64-3.1.0.args +++ b/tests/qemuxml2argvdata/virtio-transitional.x86_64-3.1.0.args @@ -37,11 +37,10 @@ QEMU_AUDIO_DRV=3Dnone \ -device virtio-9p-pci,disable-legacy=3Doff,disable-modern=3Doff,id=3Dfs0,f= sdev=3Dfsdev-fs0,mount_tag=3Dfs1,bus=3Dpci.2,addr=3D0x1 \ -netdev user,id=3Dhostnet0 \ -device virtio-net-pci,disable-legacy=3Doff,disable-modern=3Doff,netdev=3D= hostnet0,id=3Dnet0,mac=3D00:11:22:33:44:55,bus=3Dpci.2,addr=3D0x2 \ --device virtio-input-host-pci,disable-legacy=3Doff,disable-modern=3Doff,id= =3Dinput0,evdev=3D/dev/input/event1234,bus=3Dpci.2,addr=3D0x9 \ -device vhost-scsi-pci,disable-legacy=3Doff,disable-modern=3Doff,wwpn=3Dna= a.5123456789abcde0,vhostfd=3D3,id=3Dhostdev0,bus=3Dpci.2,addr=3D0x6 \ -device virtio-balloon-pci,disable-legacy=3Doff,disable-modern=3Doff,id=3D= balloon0,bus=3Dpci.2,addr=3D0x7 \ -object rng-random,id=3Dobjrng0,filename=3D/dev/urandom \ -device virtio-rng-pci,disable-legacy=3Doff,disable-modern=3Doff,rng=3Dobj= rng0,id=3Drng0,bus=3Dpci.2,addr=3D0x8 \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ --device vhost-vsock-pci,disable-legacy=3Doff,disable-modern=3Doff,id=3Dvso= ck0,guest-cid=3D4,vhostfd=3D6789,bus=3Dpci.2,addr=3D0xa \ +-device vhost-vsock-pci,disable-legacy=3Doff,disable-modern=3Doff,id=3Dvso= ck0,guest-cid=3D4,vhostfd=3D6789,bus=3Dpci.2,addr=3D0x9 \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/virtio-transitional.x86_64-latest.args = b/tests/qemuxml2argvdata/virtio-transitional.x86_64-latest.args index 255f8495e4..6d18698ec7 100644 --- a/tests/qemuxml2argvdata/virtio-transitional.x86_64-latest.args +++ b/tests/qemuxml2argvdata/virtio-transitional.x86_64-latest.args @@ -39,12 +39,11 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -device '{"driver":"virtio-9p-pci-transitional","id":"fs0","fsdev":"fsdev-= fs0","mount_tag":"fs1","bus":"pci.2","addr":"0x1"}' \ -netdev user,id=3Dhostnet0 \ -device '{"driver":"virtio-net-pci-transitional","netdev":"hostnet0","id":= "net0","mac":"00:11:22:33:44:55","bus":"pci.2","addr":"0x2"}' \ --device '{"driver":"virtio-input-host-pci-transitional","id":"input0","evd= ev":"/dev/input/event1234","bus":"pci.2","addr":"0x9"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"vhost-scsi-pci-transitional","wwpn":"naa.5123456789abc= de0","vhostfd":"3","id":"hostdev0","bus":"pci.2","addr":"0x6"}' \ -device '{"driver":"virtio-balloon-pci-transitional","id":"balloon0","bus"= :"pci.2","addr":"0x7"}' \ -object '{"qom-type":"rng-random","id":"objrng0","filename":"/dev/urandom"= }' \ -device '{"driver":"virtio-rng-pci-transitional","rng":"objrng0","id":"rng= 0","bus":"pci.2","addr":"0x8"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ --device '{"driver":"vhost-vsock-pci-transitional","id":"vsock0","guest-cid= ":4,"vhostfd":"6789","bus":"pci.2","addr":"0xa"}' \ +-device '{"driver":"vhost-vsock-pci-transitional","id":"vsock0","guest-cid= ":4,"vhostfd":"6789","bus":"pci.2","addr":"0x9"}' \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/virtio-transitional.xml b/tests/qemuxml= 2argvdata/virtio-transitional.xml index 31551ab69f..5c89162eae 100644 --- a/tests/qemuxml2argvdata/virtio-transitional.xml +++ b/tests/qemuxml2argvdata/virtio-transitional.xml @@ -25,9 +25,6 @@ - - - diff --git a/tests/qemuxml2xmloutdata/virtio-non-transitional.x86_64-latest= .xml b/tests/qemuxml2xmloutdata/virtio-non-transitional.x86_64-latest.xml index f100819fa9..26f6c6d34e 100644 --- a/tests/qemuxml2xmloutdata/virtio-non-transitional.x86_64-latest.xml +++ b/tests/qemuxml2xmloutdata/virtio-non-transitional.x86_64-latest.xml @@ -84,11 +84,6 @@
- - - -
- @@ -99,10 +94,6 @@
- - -
-