From nobody Fri Apr 19 15:04:37 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.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.133.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=1668014311; cv=none; d=zohomail.com; s=zohoarc; b=kXQiYykQdowKhcqefEugOoV0xa1o3Oqz95fomyKqo/XErIq6JM/7zPAeMfklz4H+PNukIsODlyiLDf1Fr7wGPpbHPldlz+cVCoFsXbtdIUEpvpGRDPCBReZ9wMHnjwFjjUJ9u3sdMHtNY15rg9/MeCUZqZ22RhHdzGX5lvI4vRQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1668014311; h=Content-Type:Content-Transfer-Encoding:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=hjIrTEdqnngvnWPxDvVHzmHrVKfD7Fhtxc+/wdZ8rKs=; b=TQaYMLLkeA7uTSGK9nKlk1m3vF8/2X3y5eahh5fkwycWQii85KWFX5NTJNNBNzsjuIKlLpueE1BPqW3VKC2cw+fUWpiRtPE//MJCLI2smv/w/JL3zEtwp27vf5pUSoGUiy25mqnGf60Zo9jo9F3qYw8DyQeQMYAn78i1fWsOw9g= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.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.133.124]) by mx.zohomail.com with SMTPS id 1668014311516536.0309522912744; Wed, 9 Nov 2022 09:18:31 -0800 (PST) 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-616-7cGRysytOn2MQBExDib9TA-1; Wed, 09 Nov 2022 12:18:27 -0500 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 8BA0F857F92; Wed, 9 Nov 2022 17:18:25 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (unknown [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 204E27AE5; Wed, 9 Nov 2022 17:18:25 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id D19831946594; Wed, 9 Nov 2022 17:18:19 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id C2BE51946588 for ; Wed, 9 Nov 2022 17:18:18 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id B39F410197; Wed, 9 Nov 2022 17:18:18 +0000 (UTC) Received: from speedmetal.redhat.com (ovpn-208-16.brq.redhat.com [10.40.208.16]) by smtp.corp.redhat.com (Postfix) with ESMTP id BF7647AE5 for ; Wed, 9 Nov 2022 17:18:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1668014309; 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:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=hjIrTEdqnngvnWPxDvVHzmHrVKfD7Fhtxc+/wdZ8rKs=; b=h6kCLaPysBF+5YDoWqGpAtDawc+bqo5/ZcY1C4m9F+FqOCo2JrZCmn42zYprJkG34KJXo5 G5xsOfbAJiIjEFh6wWoMm7xRxWv2GoLzcOoacu1YdWknWoJ7UkCyDv547wE1fgMl7bMR8a JDhX7ZTtEYpxPukOSmL7mwiOKaHKDl4= X-MC-Unique: 7cGRysytOn2MQBExDib9TA-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH] qemu: capabilities: Detect support for JSON args for -netdev Date: Wed, 9 Nov 2022 18:18:16 +0100 Message-Id: <9be9315694460912ea2af6fc12c26405084124fa.1668014296.git.pkrempa@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.5 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 3.1 on 10.11.54.5 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1668014313329100001 Content-Type: text/plain; charset="utf-8" JSON args for -netdev were added as precursor for adding the 'dgram' network backend type. Enable the detection and update test cases using DO_TEST_CAPS_LATEST. Enabling the capability also ensures that the -netdev argument is validated against the QAPI schema of 'netdev_add' which was already implemented but not enabled. The parser supporting JSON was added by qemu commit f3eedcddba3 and enabled when adding stream/dgram netdevs in commit 5166fe0ae46. Signed-off-by: Peter Krempa Reviewed-by: Michal Privoznik --- src/qemu/qemu_capabilities.c | 2 ++ tests/qemucapabilitiesdata/caps_7.2.0.x86_64.xml | 1 + tests/qemuxml2argvdata/boot-complex.x86_64-latest.args | 4 ++-- tests/qemuxml2argvdata/boot-order.x86_64-latest.args | 2 +- .../channel-unix-guestfwd.x86_64-latest.args | 4 ++-- .../qemuxml2argvdata/devices-acpi-index.x86_64-latest.args | 6 +++--- tests/qemuxml2argvdata/disk-ioeventfd.x86_64-latest.args | 2 +- tests/qemuxml2argvdata/event_idx.x86_64-latest.args | 2 +- .../graphics-spice-timeout.x86_64-latest.args | 2 +- tests/qemuxml2argvdata/name-escape.x86_64-latest.args | 2 +- tests/qemuxml2argvdata/net-user.x86_64-latest.args | 2 +- .../qemuxml2argvdata/net-vdpa-multiqueue.x86_64-latest.args | 2 +- tests/qemuxml2argvdata/net-vdpa.x86_64-latest.args | 2 +- tests/qemuxml2argvdata/net-vhostuser.x86_64-latest.args | 6 +++--- tests/qemuxml2argvdata/net-virtio-rss.x86_64-latest.args | 6 +++--- tests/qemuxml2argvdata/q35-pcie-autoadd.x86_64-latest.args | 4 ++-- tests/qemuxml2argvdata/q35-pcie.x86_64-latest.args | 4 ++-- .../q35-virt-manager-basic.x86_64-latest.args | 2 +- tests/qemuxml2argvdata/user-aliases.x86_64-latest.args | 6 +++--- tests/qemuxml2argvdata/virtio-lun.x86_64-latest.args | 2 +- .../virtio-non-transitional.x86_64-latest.args | 2 +- .../virtio-options-net-ats.x86_64-latest.args | 4 ++-- .../virtio-options-net-iommu.x86_64-latest.args | 4 ++-- .../virtio-options-net-packed.x86_64-latest.args | 4 ++-- tests/qemuxml2argvdata/virtio-options.x86_64-latest.args | 2 +- .../qemuxml2argvdata/virtio-transitional.x86_64-latest.args | 2 +- .../qemuxml2argvdata/x86_64-pc-graphics.x86_64-latest.args | 2 +- .../qemuxml2argvdata/x86_64-pc-headless.x86_64-latest.args | 2 +- .../qemuxml2argvdata/x86_64-q35-graphics.x86_64-latest.args | 2 +- .../qemuxml2argvdata/x86_64-q35-headless.x86_64-latest.args | 2 +- 30 files changed, 46 insertions(+), 43 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 4c301c3638..a2031e9aaa 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -1539,6 +1539,8 @@ static struct virQEMUCapsStringFlags virQEMUCapsQMPSc= hemaQueries[] =3D { { "nbd-server-start/arg-type/tls-creds", QEMU_CAPS_NBD_TLS }, { "nbd-server-add/arg-type/bitmap", QEMU_CAPS_NBD_BITMAP }, { "netdev_add/arg-type/+vhost-vdpa", QEMU_CAPS_NETDEV_VHOST_VDPA }, + /* JSON support for -netdev was introduced for the 'dgram' netdev type= */ + { "netdev_add/arg-type/type/^dgram", QEMU_CAPS_NETDEV_JSON }, { "object-add/arg-type/qom-type/^secret", QEMU_CAPS_OBJECT_JSON }, { "query-display-options/ret-type/+egl-headless/rendernode", QEMU_CAPS= _EGL_HEADLESS_RENDERNODE }, { "query-display-options/ret-type/+sdl", QEMU_CAPS_SDL }, diff --git a/tests/qemucapabilitiesdata/caps_7.2.0.x86_64.xml b/tests/qemuc= apabilitiesdata/caps_7.2.0.x86_64.xml index 56d1ff5fa9..6a861eea24 100644 --- a/tests/qemucapabilitiesdata/caps_7.2.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_7.2.0.x86_64.xml @@ -178,6 +178,7 @@ + diff --git a/tests/qemuxml2argvdata/boot-complex.x86_64-latest.args b/tests= /qemuxml2argvdata/boot-complex.x86_64-latest.args index b3b301b602..f7c0c2420b 100644 --- a/tests/qemuxml2argvdata/boot-complex.x86_64-latest.args +++ b/tests/qemuxml2argvdata/boot-complex.x86_64-latest.args @@ -50,9 +50,9 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -blockdev '{"driver":"host_device","filename":"/dev/fd1","node-name":"libv= irt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ -device '{"driver":"floppy","unit":1,"drive":"libvirt-1-format","id":"fdc0= -0-1"}' \ --netdev user,id=3Dhostnet0 \ +-netdev '{"type":"user","id":"hostnet0"}' \ -device '{"driver":"virtio-net-pci","netdev":"hostnet0","id":"net0","mac":= "00:11:22:33:44:11","bootindex":2,"bus":"pci.0","addr":"0x2"}' \ --netdev user,id=3Dhostnet1 \ +-netdev '{"type":"user","id":"hostnet1"}' \ -device '{"driver":"virtio-net-pci","netdev":"hostnet1","id":"net1","mac":= "00:11:22:33:44:22","bus":"pci.0","addr":"0x3"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ diff --git a/tests/qemuxml2argvdata/boot-order.x86_64-latest.args b/tests/q= emuxml2argvdata/boot-order.x86_64-latest.args index bbb27d6831..e3ff8da1af 100644 --- a/tests/qemuxml2argvdata/boot-order.x86_64-latest.args +++ b/tests/qemuxml2argvdata/boot-order.x86_64-latest.args @@ -41,7 +41,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -blockdev '{"driver":"file","filename":"/dev/null","node-name":"libvirt-1-= storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ -device '{"driver":"floppy","unit":1,"drive":"libvirt-1-format","id":"fdc0= -0-1"}' \ --netdev user,id=3Dhostnet0 \ +-netdev '{"type":"user","id":"hostnet0"}' \ -device '{"driver":"virtio-net-pci","netdev":"hostnet0","id":"net0","mac":= "00:11:22:33:44:55","bootindex":2,"bus":"pci.0","addr":"0x2"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x4"}' \ diff --git a/tests/qemuxml2argvdata/channel-unix-guestfwd.x86_64-latest.arg= s b/tests/qemuxml2argvdata/channel-unix-guestfwd.x86_64-latest.args index 6d34fa71bf..bac33b80ed 100644 --- a/tests/qemuxml2argvdata/channel-unix-guestfwd.x86_64-latest.args +++ b/tests/qemuxml2argvdata/channel-unix-guestfwd.x86_64-latest.args @@ -29,9 +29,9 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ -chardev socket,id=3Dcharchannel0,fd=3D1729,server=3Don,wait=3Doff \ --netdev user,guestfwd=3Dtcp:10.0.2.1:4600-chardev:charchannel0,id=3Dchanne= l0 \ +-netdev '{"type":"user","guestfwd":[{"str":"tcp:10.0.2.1:4600-chardev:char= channel0"}],"id":"channel0"}' \ -chardev socket,id=3Dcharchannel1,path=3D/tmp/guestfwd-connect.socket \ --netdev user,guestfwd=3Dtcp:10.0.2.1:4601-chardev:charchannel1,id=3Dchanne= l1 \ +-netdev '{"type":"user","guestfwd":[{"str":"tcp:10.0.2.1:4601-chardev:char= channel1"}],"id":"channel1"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ diff --git a/tests/qemuxml2argvdata/devices-acpi-index.x86_64-latest.args b= /tests/qemuxml2argvdata/devices-acpi-index.x86_64-latest.args index 41136d7d49..f2c3294f9c 100644 --- a/tests/qemuxml2argvdata/devices-acpi-index.x86_64-latest.args +++ b/tests/qemuxml2argvdata/devices-acpi-index.x86_64-latest.args @@ -33,11 +33,11 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-fdr-br/.config \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/test1.img"= ,"node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ -device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x4","acpi-index= ":42,"drive":"libvirt-1-format","id":"virtio-disk1"}' \ --netdev user,id=3Dhostnet0 \ +-netdev '{"type":"user","id":"hostnet0"}' \ -device '{"driver":"virtio-net-pci","netdev":"hostnet0","id":"net0","mac":= "00:11:22:33:44:55","bus":"pci.0","addr":"0x5","acpi-index":100}' \ --netdev user,id=3Dhostnet1 \ +-netdev '{"type":"user","id":"hostnet1"}' \ -device '{"driver":"virtio-net-pci","netdev":"hostnet1","id":"net1","mac":= "00:11:22:33:44:55","bus":"pci.0","addr":"0x7","acpi-index":200}' \ --netdev user,id=3Dhostnet2 \ +-netdev '{"type":"user","id":"hostnet2"}' \ -device '{"driver":"virtio-net-pci","netdev":"hostnet2","id":"net2","mac":= "00:11:22:33:44:55","bus":"pci.0","addr":"0x8","acpi-index":300}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"cirrus-vga","id":"video0","bus":"pci.0","addr":"0x2","= acpi-index":1729}' \ diff --git a/tests/qemuxml2argvdata/disk-ioeventfd.x86_64-latest.args b/tes= ts/qemuxml2argvdata/disk-ioeventfd.x86_64-latest.args index 0715c1fb43..ba7f58a9a3 100644 --- a/tests/qemuxml2argvdata/disk-ioeventfd.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-ioeventfd.x86_64-latest.args @@ -35,7 +35,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-test/.config \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/Fedora-14-x86_64-= Live-KDE.iso","node-name":"libvirt-1-storage","auto-read-only":true,"discar= d":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":true,"driver":"raw"= ,"file":"libvirt-1-storage"}' \ -device '{"driver":"ide-cd","bus":"ide.1","unit":0,"drive":"libvirt-1-form= at","id":"ide0-1-0","bootindex":1}' \ --netdev user,id=3Dhostnet0 \ +-netdev '{"type":"user","id":"hostnet0"}' \ -device '{"driver":"virtio-net-pci","tx":"bh","ioeventfd":false,"netdev":"= hostnet0","id":"net0","mac":"52:54:00:e5:48:58","bus":"pci.0","addr":"0x2"}= ' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x3"}' \ diff --git a/tests/qemuxml2argvdata/event_idx.x86_64-latest.args b/tests/qe= muxml2argvdata/event_idx.x86_64-latest.args index afdde09e8a..eb3ee51140 100644 --- a/tests/qemuxml2argvdata/event_idx.x86_64-latest.args +++ b/tests/qemuxml2argvdata/event_idx.x86_64-latest.args @@ -35,7 +35,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-test/.config \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/Fedora-14-x86_64-= Live-KDE.iso","node-name":"libvirt-1-storage","auto-read-only":true,"discar= d":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":true,"driver":"raw"= ,"file":"libvirt-1-storage"}' \ -device '{"driver":"ide-cd","bus":"ide.1","unit":0,"drive":"libvirt-1-form= at","id":"ide0-1-0","bootindex":1}' \ --netdev user,id=3Dhostnet0 \ +-netdev '{"type":"user","id":"hostnet0"}' \ -device '{"driver":"virtio-net-pci","event_idx":false,"netdev":"hostnet0",= "id":"net0","mac":"52:54:00:e5:48:58","bus":"pci.0","addr":"0x2"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x3"}' \ diff --git a/tests/qemuxml2argvdata/graphics-spice-timeout.x86_64-latest.ar= gs b/tests/qemuxml2argvdata/graphics-spice-timeout.x86_64-latest.args index 13c4c08e6f..4df15cd124 100644 --- a/tests/qemuxml2argvdata/graphics-spice-timeout.x86_64-latest.args +++ b/tests/qemuxml2argvdata/graphics-spice-timeout.x86_64-latest.args @@ -27,7 +27,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-f14/.config \ -boot menu=3Don,strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ -device '{"driver":"virtio-serial-pci","id":"virtio-serial0","bus":"pci.0"= ,"addr":"0x6"}' \ --netdev tap,fd=3D3,id=3Dhostnet0 \ +-netdev '{"type":"tap","fd":"3","id":"hostnet0"}' \ -device '{"driver":"rtl8139","netdev":"hostnet0","id":"net0","mac":"52:54:= 00:71:70:89","bus":"pci.0","addr":"0x7"}' \ -device '{"driver":"usb-tablet","id":"input0","bus":"usb.0","port":"1"}' \ -audiodev '{"id":"audio1","driver":"spice"}' \ diff --git a/tests/qemuxml2argvdata/name-escape.x86_64-latest.args b/tests/= qemuxml2argvdata/name-escape.x86_64-latest.args index 42b0ad3230..b09083eadb 100644 --- a/tests/qemuxml2argvdata/name-escape.x86_64-latest.args +++ b/tests/qemuxml2argvdata/name-escape.x86_64-latest.args @@ -39,7 +39,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-foo=3D1,bar=3D2/.con= fig \ -chardev file,id=3Dcharserial1,path=3D/dev/fdset/0,append=3Don \ -device '{"driver":"isa-serial","chardev":"charserial1","id":"serial1","in= dex":0}' \ -chardev pipe,id=3Dcharchannel0,path=3D/tmp/guestfwd,,foo \ --netdev user,guestfwd=3Dtcp:10.0.2.1:4600-chardev:charchannel0,id=3Dchanne= l0 \ +-netdev '{"type":"user","guestfwd":[{"str":"tcp:10.0.2.1:4600-chardev:char= channel0"}],"id":"channel0"}' \ -audiodev '{"id":"audio1","driver":"spice"}' \ -vnc vnc=3Dunix:/tmp/lib/domain--1-foo=3D1,,bar=3D2/vnc.sock,audiodev=3Dau= dio1 \ -spice unix,addr=3D/tmp/lib/domain--1-foo=3D1,,bar=3D2/spice.sock,gl=3Don,= rendernode=3D/dev/dri/foo,,bar,seamless-migration=3Don \ diff --git a/tests/qemuxml2argvdata/net-user.x86_64-latest.args b/tests/qem= uxml2argvdata/net-user.x86_64-latest.args index 87423d4cad..d8cf677423 100644 --- a/tests/qemuxml2argvdata/net-user.x86_64-latest.args +++ b/tests/qemuxml2argvdata/net-user.x86_64-latest.args @@ -31,7 +31,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ -device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ --netdev user,id=3Dhostnet0 \ +-netdev '{"type":"user","id":"hostnet0"}' \ -device '{"driver":"rtl8139","netdev":"hostnet0","id":"net0","mac":"00:11:= 22:33:44:55","bus":"pci.0","addr":"0x2"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ diff --git a/tests/qemuxml2argvdata/net-vdpa-multiqueue.x86_64-latest.args = b/tests/qemuxml2argvdata/net-vdpa-multiqueue.x86_64-latest.args index 4cb805451a..347573041b 100644 --- a/tests/qemuxml2argvdata/net-vdpa-multiqueue.x86_64-latest.args +++ b/tests/qemuxml2argvdata/net-vdpa-multiqueue.x86_64-latest.args @@ -29,7 +29,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ -add-fd set=3D0,fd=3D1732,opaque=3Dnet0-vdpa \ --netdev vhost-vdpa,vhostdev=3D/dev/fdset/0,queues=3D2,id=3Dhostnet0 \ +-netdev '{"type":"vhost-vdpa","vhostdev":"/dev/fdset/0","queues":2,"id":"h= ostnet0"}' \ -device '{"driver":"virtio-net-pci","mq":true,"vectors":6,"netdev":"hostne= t0","id":"net0","mac":"52:54:00:95:db:c0","bus":"pci.0","addr":"0x2"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ diff --git a/tests/qemuxml2argvdata/net-vdpa.x86_64-latest.args b/tests/qem= uxml2argvdata/net-vdpa.x86_64-latest.args index 93fe8fb444..be4f7c4ae2 100644 --- a/tests/qemuxml2argvdata/net-vdpa.x86_64-latest.args +++ b/tests/qemuxml2argvdata/net-vdpa.x86_64-latest.args @@ -29,7 +29,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ -add-fd set=3D0,fd=3D1732,opaque=3Dnet0-vdpa \ --netdev vhost-vdpa,vhostdev=3D/dev/fdset/0,id=3Dhostnet0 \ +-netdev '{"type":"vhost-vdpa","vhostdev":"/dev/fdset/0","id":"hostnet0"}' \ -device '{"driver":"virtio-net-pci","netdev":"hostnet0","id":"net0","mac":= "52:54:00:95:db:c0","bus":"pci.0","addr":"0x2"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ diff --git a/tests/qemuxml2argvdata/net-vhostuser.x86_64-latest.args b/test= s/qemuxml2argvdata/net-vhostuser.x86_64-latest.args index 1309c28c95..17d9715814 100644 --- a/tests/qemuxml2argvdata/net-vhostuser.x86_64-latest.args +++ b/tests/qemuxml2argvdata/net-vhostuser.x86_64-latest.args @@ -29,12 +29,12 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ -chardev socket,id=3Dcharnet0,path=3D/tmp/vhost0.sock,server=3Don \ --netdev vhost-user,chardev=3Dcharnet0,id=3Dhostnet0 \ +-netdev '{"type":"vhost-user","chardev":"charnet0","id":"hostnet0"}' \ -device '{"driver":"virtio-net-pci","netdev":"hostnet0","id":"net0","mac":= "52:54:00:ee:96:6b","bus":"pci.0","addr":"0x2"}' \ -chardev socket,id=3Dcharnet1,path=3D/tmp/vhost1.sock \ --netdev vhost-user,chardev=3Dcharnet1,id=3Dhostnet1 \ +-netdev '{"type":"vhost-user","chardev":"charnet1","id":"hostnet1"}' \ -device '{"driver":"virtio-net-pci","netdev":"hostnet1","id":"net1","mac":= "52:54:00:ee:96:6c","bus":"pci.0","addr":"0x3"}' \ --netdev socket,listen=3D:2015,id=3Dhostnet2 \ +-netdev '{"type":"socket","listen":":2015","id":"hostnet2"}' \ -device '{"driver":"rtl8139","netdev":"hostnet2","id":"net2","mac":"52:54:= 00:95:db:c0","bus":"pci.0","addr":"0x4"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ diff --git a/tests/qemuxml2argvdata/net-virtio-rss.x86_64-latest.args b/tes= ts/qemuxml2argvdata/net-virtio-rss.x86_64-latest.args index cabea93ba9..2d3f15ecd4 100644 --- a/tests/qemuxml2argvdata/net-virtio-rss.x86_64-latest.args +++ b/tests/qemuxml2argvdata/net-virtio-rss.x86_64-latest.args @@ -31,11 +31,11 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ -device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ --netdev user,id=3Dhostnet0 \ +-netdev '{"type":"user","id":"hostnet0"}' \ -device '{"driver":"virtio-net-pci","rss":true,"netdev":"hostnet0","id":"n= et0","mac":"00:11:22:33:44:55","bus":"pci.0","addr":"0x2"}' \ --netdev user,id=3Dhostnet1 \ +-netdev '{"type":"user","id":"hostnet1"}' \ -device '{"driver":"virtio-net-pci","hash":true,"netdev":"hostnet1","id":"= net1","mac":"00:11:22:33:44:66","bus":"pci.0","addr":"0x3"}' \ --netdev user,id=3Dhostnet2 \ +-netdev '{"type":"user","id":"hostnet2"}' \ -device '{"driver":"virtio-net-pci","rss":false,"hash":true,"netdev":"host= net2","id":"net2","mac":"00:11:22:33:44:77","bus":"pci.0","addr":"0x4"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x5"}' \ diff --git a/tests/qemuxml2argvdata/q35-pcie-autoadd.x86_64-latest.args b/t= ests/qemuxml2argvdata/q35-pcie-autoadd.x86_64-latest.args index 7992c33ace..fcb9e9e43f 100644 --- a/tests/qemuxml2argvdata/q35-pcie-autoadd.x86_64-latest.args +++ b/tests/qemuxml2argvdata/q35-pcie-autoadd.x86_64-latest.args @@ -49,9 +49,9 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-q35-test/.config \ -device '{"driver":"virtio-blk-pci","bus":"pci.7","addr":"0x0","drive":"li= bvirt-1-format","id":"virtio-disk1","bootindex":1}' \ -fsdev local,security_model=3Dpassthrough,id=3Dfsdev-fs0,path=3D/export/to= /guest \ -device '{"driver":"virtio-9p-pci","id":"fs0","fsdev":"fsdev-fs0","mount_t= ag":"/import/from/host","bus":"pci.1","addr":"0x0"}' \ --netdev user,id=3Dhostnet0 \ +-netdev '{"type":"user","id":"hostnet0"}' \ -device '{"driver":"virtio-net-pci","netdev":"hostnet0","id":"net0","mac":= "00:11:22:33:44:55","bus":"pci.2","addr":"0x0"}' \ --netdev user,id=3Dhostnet1 \ +-netdev '{"type":"user","id":"hostnet1"}' \ -device '{"driver":"e1000e","netdev":"hostnet1","id":"net1","mac":"00:11:2= 2:33:44:66","bus":"pci.3","addr":"0x0"}' \ -device '{"driver":"virtio-input-host-pci","id":"input0","evdev":"/dev/inp= ut/event1234","bus":"pci.10","addr":"0x0"}' \ -device '{"driver":"virtio-mouse-pci","id":"input1","bus":"pci.11","addr":= "0x0"}' \ diff --git a/tests/qemuxml2argvdata/q35-pcie.x86_64-latest.args b/tests/qem= uxml2argvdata/q35-pcie.x86_64-latest.args index 4a84c2e621..08afee14a4 100644 --- a/tests/qemuxml2argvdata/q35-pcie.x86_64-latest.args +++ b/tests/qemuxml2argvdata/q35-pcie.x86_64-latest.args @@ -50,9 +50,9 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-q35-test/.config \ -device '{"driver":"virtio-blk-pci","bus":"pci.9","addr":"0x0","drive":"li= bvirt-1-format","id":"virtio-disk1","bootindex":1}' \ -fsdev local,security_model=3Dpassthrough,id=3Dfsdev-fs0,path=3D/export/to= /guest \ -device '{"driver":"virtio-9p-pci","id":"fs0","fsdev":"fsdev-fs0","mount_t= ag":"/import/from/host","bus":"pci.3","addr":"0x0"}' \ --netdev user,id=3Dhostnet0 \ +-netdev '{"type":"user","id":"hostnet0"}' \ -device '{"driver":"virtio-net-pci","netdev":"hostnet0","id":"net0","mac":= "00:11:22:33:44:55","bus":"pci.4","addr":"0x0"}' \ --netdev user,id=3Dhostnet1 \ +-netdev '{"type":"user","id":"hostnet1"}' \ -device '{"driver":"e1000e","netdev":"hostnet1","id":"net1","mac":"00:11:2= 2:33:44:66","bus":"pci.5","addr":"0x0"}' \ -device '{"driver":"virtio-input-host-pci","id":"input0","evdev":"/dev/inp= ut/event1234","bus":"pci.12","addr":"0x0"}' \ -device '{"driver":"virtio-mouse-pci","id":"input1","bus":"pci.13","addr":= "0x0"}' \ diff --git a/tests/qemuxml2argvdata/q35-virt-manager-basic.x86_64-latest.ar= gs b/tests/qemuxml2argvdata/q35-virt-manager-basic.x86_64-latest.args index 77a7cf5e4f..2f75d79739 100644 --- a/tests/qemuxml2argvdata/q35-virt-manager-basic.x86_64-latest.args +++ b/tests/qemuxml2argvdata/q35-virt-manager-basic.x86_64-latest.args @@ -40,7 +40,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-virt-manager-basic/.= config \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/basic.qcow= 2","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}= ' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"qco= w2","file":"libvirt-1-storage"}' \ -device '{"driver":"virtio-blk-pci","bus":"pci.4","addr":"0x0","drive":"li= bvirt-1-format","id":"virtio-disk0","bootindex":1}' \ --netdev user,id=3Dhostnet0 \ +-netdev '{"type":"user","id":"hostnet0"}' \ -device '{"driver":"virtio-net-pci","netdev":"hostnet0","id":"net0","mac":= "52:54:00:9a:e6:c6","bus":"pci.1","addr":"0x0"}' \ -chardev pty,id=3Dcharserial0 \ -device '{"driver":"isa-serial","chardev":"charserial0","id":"serial0","in= dex":0}' \ diff --git a/tests/qemuxml2argvdata/user-aliases.x86_64-latest.args b/tests= /qemuxml2argvdata/user-aliases.x86_64-latest.args index d1a3f4af07..1a21437f06 100644 --- a/tests/qemuxml2argvdata/user-aliases.x86_64-latest.args +++ b/tests/qemuxml2argvdata/user-aliases.x86_64-latest.args @@ -51,11 +51,11 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-gentoo/.config \ -blockdev '{"driver":"file","filename":"/home/zippy/tmp/install-amd64-mini= mal-20140619.iso","node-name":"libvirt-1-storage","cache":{"direct":true,"n= o-flush":false},"auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":true,"cache":{"dire= ct":true,"no-flush":false},"driver":"raw","file":"libvirt-1-storage"}' \ -device '{"driver":"ide-cd","bus":"ide.1","unit":0,"share-rw":true,"drive"= :"libvirt-1-format","id":"ua-WhatAnAwesomeCDROM","bootindex":2,"write-cache= ":"on"}' \ --netdev tap,fd=3D3,vhost=3Don,vhostfd=3D44,id=3Dhostua-CheckoutThisNIC \ +-netdev '{"type":"tap","fd":"3","vhost":true,"vhostfd":"44","id":"hostua-C= heckoutThisNIC"}' \ -device '{"driver":"virtio-net-pci","netdev":"hostua-CheckoutThisNIC","id"= :"ua-CheckoutThisNIC","mac":"52:54:00:d6:c0:0b","bus":"pci.0","addr":"0x3"}= ' \ --netdev socket,listen=3D127.0.0.1:1234,id=3Dhostua-WeCanAlsoDoServerMode \ +-netdev '{"type":"socket","listen":"127.0.0.1:1234","id":"hostua-WeCanAlso= DoServerMode"}' \ -device '{"driver":"rtl8139","netdev":"hostua-WeCanAlsoDoServerMode","id":= "ua-WeCanAlsoDoServerMode","mac":"52:54:00:22:c9:42","bus":"pci.0","addr":"= 0x9"}' \ --netdev socket,connect=3D127.0.0.1:1234,id=3Dhostua-AndAlsoClientMode \ +-netdev '{"type":"socket","connect":"127.0.0.1:1234","id":"hostua-AndAlsoC= lientMode"}' \ -device '{"driver":"rtl8139","netdev":"hostua-AndAlsoClientMode","id":"ua-= AndAlsoClientMode","mac":"52:54:00:8c:b1:f8","bus":"pci.0","addr":"0xa"}' \ -device '{"driver":"ccid-card-emulated","backend":"nss-emulated","id":"sma= rtcard0","bus":"ua-myCCID.0"}' \ -chardev pty,id=3Dcharserial0 \ diff --git a/tests/qemuxml2argvdata/virtio-lun.x86_64-latest.args b/tests/q= emuxml2argvdata/virtio-lun.x86_64-latest.args index c6c9a98ffe..85193a4fe1 100644 --- a/tests/qemuxml2argvdata/virtio-lun.x86_64-latest.args +++ b/tests/qemuxml2argvdata/virtio-lun.x86_64-latest.args @@ -35,7 +35,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-test/.config \ -blockdev '{"driver":"host_device","filename":"/dev/sdfake2","node-name":"= libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ -device '{"driver":"virtio-blk-pci","scsi":true,"bus":"pci.0","addr":"0x5"= ,"drive":"libvirt-1-format","id":"virtio-disk1"}' \ --netdev user,id=3Dhostnet0 \ +-netdev '{"type":"user","id":"hostnet0"}' \ -device '{"driver":"virtio-net-pci","event_idx":false,"netdev":"hostnet0",= "id":"net0","mac":"52:54:00:e5:48:58","bus":"pci.0","addr":"0x2"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x3"}' \ diff --git a/tests/qemuxml2argvdata/virtio-non-transitional.x86_64-latest.a= rgs b/tests/qemuxml2argvdata/virtio-non-transitional.x86_64-latest.args index 541c074871..2eafeca9f3 100644 --- a/tests/qemuxml2argvdata/virtio-non-transitional.x86_64-latest.args +++ b/tests/qemuxml2argvdata/virtio-non-transitional.x86_64-latest.args @@ -44,7 +44,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -device '{"driver":"virtio-blk-pci-non-transitional","bus":"pci.5","addr":= "0x0","drive":"libvirt-1-format","id":"virtio-disk0","bootindex":1}' \ -fsdev local,security_model=3Dpassthrough,id=3Dfsdev-fs0,path=3D/export/fs= 1 \ -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 \ +-netdev '{"type":"user","id":"hostnet0"}' \ -device '{"driver":"virtio-net-pci-non-transitional","netdev":"hostnet0","= id":"net0","mac":"00:11:22:33:44:55","bus":"pci.2","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"}' \ diff --git a/tests/qemuxml2argvdata/virtio-options-net-ats.x86_64-latest.ar= gs b/tests/qemuxml2argvdata/virtio-options-net-ats.x86_64-latest.args index c35e26b21f..bb0c1991b0 100644 --- a/tests/qemuxml2argvdata/virtio-options-net-ats.x86_64-latest.args +++ b/tests/qemuxml2argvdata/virtio-options-net-ats.x86_64-latest.args @@ -28,9 +28,9 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -no-acpi \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --netdev user,id=3Dhostnet0 \ +-netdev '{"type":"user","id":"hostnet0"}' \ -device '{"driver":"virtio-net-pci","ats":true,"netdev":"hostnet0","id":"n= et0","mac":"52:54:56:58:5a:5c","bus":"pci.0","addr":"0x2"}' \ --netdev user,id=3Dhostnet1 \ +-netdev '{"type":"user","id":"hostnet1"}' \ -device '{"driver":"virtio-net-pci","ats":false,"netdev":"hostnet1","id":"= net1","mac":"62:64:66:68:6a:6c","bus":"pci.0","addr":"0x3"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x4"}' \ diff --git a/tests/qemuxml2argvdata/virtio-options-net-iommu.x86_64-latest.= args b/tests/qemuxml2argvdata/virtio-options-net-iommu.x86_64-latest.args index ec0247f42e..a2645f9d4f 100644 --- a/tests/qemuxml2argvdata/virtio-options-net-iommu.x86_64-latest.args +++ b/tests/qemuxml2argvdata/virtio-options-net-iommu.x86_64-latest.args @@ -28,9 +28,9 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -no-acpi \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --netdev user,id=3Dhostnet0 \ +-netdev '{"type":"user","id":"hostnet0"}' \ -device '{"driver":"virtio-net-pci","iommu_platform":true,"netdev":"hostne= t0","id":"net0","mac":"52:54:56:58:5a:5c","bus":"pci.0","addr":"0x2"}' \ --netdev user,id=3Dhostnet1 \ +-netdev '{"type":"user","id":"hostnet1"}' \ -device '{"driver":"virtio-net-pci","iommu_platform":false,"netdev":"hostn= et1","id":"net1","mac":"62:64:66:68:6a:6c","bus":"pci.0","addr":"0x3"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x4"}' \ diff --git a/tests/qemuxml2argvdata/virtio-options-net-packed.x86_64-latest= .args b/tests/qemuxml2argvdata/virtio-options-net-packed.x86_64-latest.args index 7aad3173f9..3e06320eee 100644 --- a/tests/qemuxml2argvdata/virtio-options-net-packed.x86_64-latest.args +++ b/tests/qemuxml2argvdata/virtio-options-net-packed.x86_64-latest.args @@ -28,9 +28,9 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -no-acpi \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --netdev user,id=3Dhostnet0 \ +-netdev '{"type":"user","id":"hostnet0"}' \ -device '{"driver":"virtio-net-pci","packed":true,"netdev":"hostnet0","id"= :"net0","mac":"52:54:56:58:5a:5c","bus":"pci.0","addr":"0x2"}' \ --netdev user,id=3Dhostnet1 \ +-netdev '{"type":"user","id":"hostnet1"}' \ -device '{"driver":"virtio-net-pci","packed":false,"netdev":"hostnet1","id= ":"net1","mac":"62:64:66:68:6a:6c","bus":"pci.0","addr":"0x3"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x4"}' \ diff --git a/tests/qemuxml2argvdata/virtio-options.x86_64-latest.args b/tes= ts/qemuxml2argvdata/virtio-options.x86_64-latest.args index ff21b4bf4a..3ff0a53fbf 100644 --- a/tests/qemuxml2argvdata/virtio-options.x86_64-latest.args +++ b/tests/qemuxml2argvdata/virtio-options.x86_64-latest.args @@ -37,7 +37,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -device '{"driver":"virtio-9p-pci","iommu_platform":true,"ats":true,"packe= d":true,"page-per-vq":true,"id":"fs0","fsdev":"fsdev-fs0","mount_tag":"fs1"= ,"bus":"pci.0","addr":"0x3"}' \ -fsdev local,security_model=3Dmapped,writeout=3Dimmediate,id=3Dfsdev-fs1,p= ath=3D/export/fs2 \ -device '{"driver":"virtio-9p-pci","iommu_platform":true,"ats":true,"packe= d":true,"page-per-vq":true,"id":"fs1","fsdev":"fsdev-fs1","mount_tag":"fs2"= ,"bus":"pci.0","addr":"0x4"}' \ --netdev user,id=3Dhostnet0 \ +-netdev '{"type":"user","id":"hostnet0"}' \ -device '{"driver":"virtio-net-pci","iommu_platform":true,"ats":true,"pack= ed":true,"page-per-vq":true,"rss":true,"hash":true,"netdev":"hostnet0","id"= :"net0","mac":"52:54:56:58:5a:5c","bus":"pci.0","addr":"0x6"}' \ -device '{"driver":"virtio-mouse-pci","iommu_platform":true,"ats":true,"pa= cked":true,"page-per-vq":true,"id":"input0","bus":"pci.0","addr":"0xe"}' \ -device '{"driver":"virtio-keyboard-pci","iommu_platform":true,"ats":true,= "packed":true,"page-per-vq":true,"id":"input1","bus":"pci.0","addr":"0x10"}= ' \ diff --git a/tests/qemuxml2argvdata/virtio-transitional.x86_64-latest.args = b/tests/qemuxml2argvdata/virtio-transitional.x86_64-latest.args index 6d18698ec7..3cf3959528 100644 --- a/tests/qemuxml2argvdata/virtio-transitional.x86_64-latest.args +++ b/tests/qemuxml2argvdata/virtio-transitional.x86_64-latest.args @@ -37,7 +37,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -device '{"driver":"virtio-blk-pci-transitional","bus":"pci.2","addr":"0x5= ","drive":"libvirt-1-format","id":"virtio-disk0","bootindex":1}' \ -fsdev local,security_model=3Dpassthrough,id=3Dfsdev-fs0,path=3D/export/fs= 1 \ -device '{"driver":"virtio-9p-pci-transitional","id":"fs0","fsdev":"fsdev-= fs0","mount_tag":"fs1","bus":"pci.2","addr":"0x1"}' \ --netdev user,id=3Dhostnet0 \ +-netdev '{"type":"user","id":"hostnet0"}' \ -device '{"driver":"virtio-net-pci-transitional","netdev":"hostnet0","id":= "net0","mac":"00:11:22:33:44:55","bus":"pci.2","addr":"0x2"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"vhost-scsi-pci-transitional","wwpn":"naa.5123456789abc= de0","vhostfd":"3","id":"hostdev0","bus":"pci.2","addr":"0x6"}' \ diff --git a/tests/qemuxml2argvdata/x86_64-pc-graphics.x86_64-latest.args b= /tests/qemuxml2argvdata/x86_64-pc-graphics.x86_64-latest.args index 56226138bf..ef0b9c620c 100644 --- a/tests/qemuxml2argvdata/x86_64-pc-graphics.x86_64-latest.args +++ b/tests/qemuxml2argvdata/x86_64-pc-graphics.x86_64-latest.args @@ -34,7 +34,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-guest/.config \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/guest.qcow= 2","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}= ' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"qco= w2","file":"libvirt-1-storage"}' \ -device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x6","drive":"li= bvirt-1-format","id":"virtio-disk0","bootindex":1}' \ --netdev user,id=3Dhostnet0 \ +-netdev '{"type":"user","id":"hostnet0"}' \ -device '{"driver":"virtio-net-pci","netdev":"hostnet0","id":"net0","mac":= "52:54:00:4c:e3:86","bus":"pci.0","addr":"0x3"}' \ -chardev pty,id=3Dcharserial0 \ -device '{"driver":"isa-serial","chardev":"charserial0","id":"serial0","in= dex":0}' \ diff --git a/tests/qemuxml2argvdata/x86_64-pc-headless.x86_64-latest.args b= /tests/qemuxml2argvdata/x86_64-pc-headless.x86_64-latest.args index 3c4688a89e..aee3161a75 100644 --- a/tests/qemuxml2argvdata/x86_64-pc-headless.x86_64-latest.args +++ b/tests/qemuxml2argvdata/x86_64-pc-headless.x86_64-latest.args @@ -35,7 +35,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-guest/.config \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/guest.qcow= 2","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}= ' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"qco= w2","file":"libvirt-1-storage"}' \ -device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x5","drive":"li= bvirt-1-format","id":"virtio-disk0","bootindex":1}' \ --netdev user,id=3Dhostnet0 \ +-netdev '{"type":"user","id":"hostnet0"}' \ -device '{"driver":"virtio-net-pci","netdev":"hostnet0","id":"net0","mac":= "52:54:00:09:a4:37","bus":"pci.0","addr":"0x2"}' \ -chardev pty,id=3Dcharserial0 \ -device '{"driver":"isa-serial","chardev":"charserial0","id":"serial0","in= dex":0}' \ diff --git a/tests/qemuxml2argvdata/x86_64-q35-graphics.x86_64-latest.args = b/tests/qemuxml2argvdata/x86_64-q35-graphics.x86_64-latest.args index 37a1afb897..337103d722 100644 --- a/tests/qemuxml2argvdata/x86_64-q35-graphics.x86_64-latest.args +++ b/tests/qemuxml2argvdata/x86_64-q35-graphics.x86_64-latest.args @@ -41,7 +41,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-guest/.config \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/guest.qcow= 2","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}= ' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"qco= w2","file":"libvirt-1-storage"}' \ -device '{"driver":"virtio-blk-pci","bus":"pci.4","addr":"0x0","drive":"li= bvirt-1-format","id":"virtio-disk0","bootindex":1}' \ --netdev user,id=3Dhostnet0 \ +-netdev '{"type":"user","id":"hostnet0"}' \ -device '{"driver":"virtio-net-pci","netdev":"hostnet0","id":"net0","mac":= "52:54:00:d2:70:0b","bus":"pci.1","addr":"0x0"}' \ -chardev pty,id=3Dcharserial0 \ -device '{"driver":"isa-serial","chardev":"charserial0","id":"serial0","in= dex":0}' \ diff --git a/tests/qemuxml2argvdata/x86_64-q35-headless.x86_64-latest.args = b/tests/qemuxml2argvdata/x86_64-q35-headless.x86_64-latest.args index b4d90dff5e..bf8a2f3af9 100644 --- a/tests/qemuxml2argvdata/x86_64-q35-headless.x86_64-latest.args +++ b/tests/qemuxml2argvdata/x86_64-q35-headless.x86_64-latest.args @@ -42,7 +42,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-guest/.config \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/guest.qcow= 2","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}= ' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"qco= w2","file":"libvirt-1-storage"}' \ -device '{"driver":"virtio-blk-pci","bus":"pci.4","addr":"0x0","drive":"li= bvirt-1-format","id":"virtio-disk0","bootindex":1}' \ --netdev user,id=3Dhostnet0 \ +-netdev '{"type":"user","id":"hostnet0"}' \ -device '{"driver":"virtio-net-pci","netdev":"hostnet0","id":"net0","mac":= "52:54:00:09:a4:37","bus":"pci.1","addr":"0x0"}' \ -chardev pty,id=3Dcharserial0 \ -device '{"driver":"isa-serial","chardev":"charserial0","id":"serial0","in= dex":0}' \ --=20 2.37.3