From nobody Sun Apr 28 13:01:00 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=1634542703; cv=none; d=zohomail.com; s=zohoarc; b=Cck0T6BNykbT/JL6Cd2+72Umr7Szwfvq/jw/h3mYT4G+Utj2AslCjqe3WAMEi7hnnlFnWJtFp3WkOfFi/p1o5DTnPh5HmzCo1WMI0t5i8E2ulk1JJq8581bC82FYU+PR4AoQ2CpaBu1sVzA2Bx93f1XjyYAUd4u2brjqo0lukV8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1634542703; 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=FYsEmMbflWZcrWnEl04MXtwLzsYeSObGchoroHooCTg=; b=MNKBIb/vyTvrMbyk5fU6Az4O6fq26S4p2vFx05OBlgYVgXdZ4n1UgIG615D0ae2u7SV72QpZNQJjk3nfZA4YEohHkqyXj6wKA6w+f4CXTojXzq21uZKPkN14a65deE/Wz/FPSoT8i1Q696gTxMJqMWr0SJMux+wqidxcdMqVmMQ= 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 1634542703271243.69837278753914; Mon, 18 Oct 2021 00:38:23 -0700 (PDT) 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-484-IUzcedM_MLmEoiSxWw8Jew-1; Mon, 18 Oct 2021 03:38:20 -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 D54EE10055B2; Mon, 18 Oct 2021 07:38:15 +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 0902D5C23A; Mon, 18 Oct 2021 07:38:11 +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 B1EEE181A1D1; Mon, 18 Oct 2021 07:38:07 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 19I7bPgi016728 for ; Mon, 18 Oct 2021 03:37:25 -0400 Received: by smtp.corp.redhat.com (Postfix) id 22F9170953; Mon, 18 Oct 2021 07:37:25 +0000 (UTC) Received: from speedmetal.lan (unknown [10.40.208.20]) by smtp.corp.redhat.com (Postfix) with ESMTP id 455756FEED for ; Mon, 18 Oct 2021 07:37:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1634542702; 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=FYsEmMbflWZcrWnEl04MXtwLzsYeSObGchoroHooCTg=; b=VnWZIG+B6ry+WbvLtVCFcFZZoY2Zqjn7rd3Bq6YRTPgLTK4y05iOBJyMz6QKsMbJ0Wgenv IXuva8rFl11kOuJxdjiH7+CRXURT9doLPhw4EkDxNNAKsdiWQkED7unqpyMDnPUX0vjQgc mVXDESmEkhGVqr+3c/21bdFkG8rjOdU= X-MC-Unique: IUzcedM_MLmEoiSxWw8Jew-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 1/6] qemucapabilitiestest: Update qemu-6.2 cycle capability test data Date: Mon, 18 Oct 2021 09:37:07 +0200 Message-Id: <611455ee44ee3b3f1475200b068567f0d7f880a3.1634542402.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 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.16 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-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1634542705421100001 Content-Type: text/plain; charset="utf-8" Update to v6.1.0-1510-gc148a05721 which most notably adds the 'json-cli' feature for 'device_add' QMP command meaning that -device accepts JSON. Signed-off-by: Peter Krempa Reviewed-by: J=C3=A1n Tomko --- .../caps_6.2.0.x86_64.replies | 99 ++++++++++--------- .../caps_6.2.0.x86_64.xml | 2 +- 2 files changed, 52 insertions(+), 49 deletions(-) diff --git a/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.replies b/tests/q= emucapabilitiesdata/caps_6.2.0.x86_64.replies index bfa327e102..aa7a779a68 100644 --- a/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.replies @@ -21,7 +21,7 @@ "minor": 1, "major": 6 }, - "package": "v6.1.0-1313-gc09124dcb8" + "package": "v6.1.0-1510-gc148a05721" }, "id": "libvirt-2" } @@ -1122,7 +1122,10 @@ "name": "device_add", "ret-type": "0", "meta-type": "command", - "arg-type": "180" + "arg-type": "180", + "features": [ + "json-cli" + ] }, { "name": "device_del", @@ -1446,9 +1449,9 @@ }, { "name": "query-sev-attestation-report", - "ret-type": "235", + "ret-type": "233", "meta-type": "command", - "arg-type": "234" + "arg-type": "232" }, { "name": "query-sgx", @@ -6126,19 +6129,19 @@ "type": "401" }, { - "case": "memory-backend-file", + "case": "memory-backend-epc", "type": "402" }, { - "case": "memory-backend-memfd", + "case": "memory-backend-file", "type": "403" }, { - "case": "memory-backend-ram", + "case": "memory-backend-memfd", "type": "404" }, { - "case": "memory-backend-epc", + "case": "memory-backend-ram", "type": "405" }, { @@ -7269,7 +7272,7 @@ "meta-type": "object" }, { - "name": "234", + "name": "232", "members": [ { "name": "mnonce", @@ -7279,7 +7282,7 @@ "meta-type": "object" }, { - "name": "235", + "name": "233", "members": [ { "name": "data", @@ -11313,10 +11316,10 @@ "input-barrier", "input-linux", "iothread", + "memory-backend-epc", "memory-backend-file", "memory-backend-memfd", "memory-backend-ram", - "memory-backend-epc", "pef-guest", "pr-manager-helper", "qtest", @@ -11852,30 +11855,6 @@ "name": "x-use-canonical-path-for-ramblock-id", "default": null, "type": "bool" - }, - { - "name": "align", - "default": null, - "type": "int" - }, - { - "name": "discard-data", - "default": null, - "type": "bool" - }, - { - "name": "mem-path", - "type": "str" - }, - { - "name": "pmem", - "default": null, - "type": "bool" - }, - { - "name": "readonly", - "default": null, - "type": "bool" } ], "meta-type": "object" @@ -11933,17 +11912,26 @@ "type": "bool" }, { - "name": "hugetlb", + "name": "align", + "default": null, + "type": "int" + }, + { + "name": "discard-data", "default": null, "type": "bool" }, { - "name": "hugetlbsize", + "name": "mem-path", + "type": "str" + }, + { + "name": "pmem", "default": null, - "type": "int" + "type": "bool" }, { - "name": "seal", + "name": "readonly", "default": null, "type": "bool" } @@ -12001,6 +11989,21 @@ "name": "x-use-canonical-path-for-ramblock-id", "default": null, "type": "bool" + }, + { + "name": "hugetlb", + "default": null, + "type": "bool" + }, + { + "name": "hugetlbsize", + "default": null, + "type": "int" + }, + { + "name": "seal", + "default": null, + "type": "bool" } ], "meta-type": "object" @@ -17168,8 +17171,8 @@ "parent": "pci-device" }, { - "name": "sev-guest", - "parent": "confidential-guest-support" + "name": "chardev-stdio", + "parent": "chardev-fd" }, { "name": "usb-wacom-tablet", @@ -17192,8 +17195,8 @@ "parent": "pci-vga" }, { - "name": "virtio-blk-pci-transitional", - "parent": "virtio-blk-pci-base" + "name": "kvm-pit", + "parent": "pit-common" }, { "name": "Haswell-v1-x86_64-cpu", @@ -17216,8 +17219,8 @@ "parent": "generic-pc-machine" }, { - "name": "kvm-pit", - "parent": "pit-common" + "name": "sev-guest", + "parent": "confidential-guest-support" }, { "name": "ich9-usb-uhci5", @@ -19472,8 +19475,8 @@ "parent": "qio-channel" }, { - "name": "chardev-stdio", - "parent": "chardev-fd" + "name": "virtio-blk-pci-transitional", + "parent": "virtio-blk-pci-base" }, { "name": "virtio-vga", @@ -29472,7 +29475,7 @@ "id": "libvirt-48", "error": { "class": "GenericError", - "desc": "Failed to open /dev/sev: No such file or directory" + "desc": "SEV: Failed to open /dev/sev: No such file or directory" } } diff --git a/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml b/tests/qemuc= apabilitiesdata/caps_6.2.0.x86_64.xml index 41f6c1c460..56a613c767 100644 --- a/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml @@ -242,7 +242,7 @@ 6001050 0 43100244 - v6.1.0-1313-gc09124dcb8 + v6.1.0-1510-gc148a05721 x86_64 --=20 2.31.1 From nobody Sun Apr 28 13:01:00 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=1634542731; cv=none; d=zohomail.com; s=zohoarc; b=dFUmwIl1TSbOG8pAqrynTsURGYI7jOXdM0Igy/Rj1xTFPJhqCDwpraXXkIT8t4xkx7jbCOtmK8o1iRIqIY/+iAbcC5BqpO2X1Dz/jFwVwEog1DuGThW3fpITrpmFTmNtzbi/MMyGjb/YwuXM+7WV1fSut8d9QKjkYIQCTpysVao= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1634542731; 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=x2S6/PQR4Yq7PwPyJFB5xUecbt5LgrI6E4rPbNISvLs=; b=NkUbkDPxCiQnvc7yFO1l05TIMOlF4+GojCkKbrosozHAncmN5FC2xJLaBRT7eUKPzi9JppgjFT/UEbCfzf/8T2sNsuqe/QoKKVYT7fWuFo3UfojfxxNnxxloJ8Mm3xZkfLgfiLYd45oHGFWVzIZaskfMm7DD4auzA0UTSdOuV1k= 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 1634542731072741.1609753300196; Mon, 18 Oct 2021 00:38:51 -0700 (PDT) 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-124-CwimpWbeOVqbOxjBEzrwlg-1; Mon, 18 Oct 2021 03:38:46 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id C386910A8E02; Mon, 18 Oct 2021 07:38:41 +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 63B1B10246EB; Mon, 18 Oct 2021 07:38:41 +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 06DC41832DD6; Mon, 18 Oct 2021 07:38:41 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 19I7bRr8016739 for ; Mon, 18 Oct 2021 03:37:27 -0400 Received: by smtp.corp.redhat.com (Postfix) id 6AEE55BB0D; Mon, 18 Oct 2021 07:37:27 +0000 (UTC) Received: from speedmetal.lan (unknown [10.40.208.20]) by smtp.corp.redhat.com (Postfix) with ESMTP id 9BB96708E0 for ; Mon, 18 Oct 2021 07:37:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1634542730; 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=x2S6/PQR4Yq7PwPyJFB5xUecbt5LgrI6E4rPbNISvLs=; b=JViw8ZqetM429AEbYbk0AOcL/pIY8XuqnObJuO0b1QhRBYO9TXNyPnqELHvyflo/LmQUEv LKPEu8mWYHH54J2jOZWT0oAcmnizGAJugjLPBLsBru+BWRen6u2RAiSoc1h1Y4GGRrQBgh Shjx+MzENXWB3lkO44tx4JNf+7l8SUk= X-MC-Unique: CwimpWbeOVqbOxjBEzrwlg-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 2/6] testQEMUSchemaValidateCommand: Add possibility for partial QMP validation Date: Mon, 18 Oct 2021 09:37:08 +0200 Message-Id: <22a48e30507eeb40a99bc214239555aa2394bcc9.1634542402.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 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.22 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-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1634542733311100001 Content-Type: text/plain; charset="utf-8" The QMP schema for 'device_add' is not complete yet. Allow validation of incomplete schema so that we can enable at least some validation. Once there's more schema in the future all present members are still validated. Signed-off-by: Peter Krempa Reviewed-by: J=C3=A1n Tomko --- tests/qemumigparamstest.c | 1 + tests/qemumigrationcookiexmltest.c | 1 + tests/qemumonitortestutils.c | 1 + tests/qemuxml2argvtest.c | 2 +- tests/testutilsqemuschema.c | 11 ++++++++++- tests/testutilsqemuschema.h | 1 + 6 files changed, 15 insertions(+), 2 deletions(-) diff --git a/tests/qemumigparamstest.c b/tests/qemumigparamstest.c index dd6b7d5d60..f445c92ff8 100644 --- a/tests/qemumigparamstest.c +++ b/tests/qemumigparamstest.c @@ -171,6 +171,7 @@ qemuMigParamsTestJSON(const void *opaque) data->qmpschema, false, false, + false, &debug) < 0) { VIR_TEST_VERBOSE("failed to validate migration params '%s' against= QMP schema: %s", actualJSON, virBufferCurrentContent(&debug)); diff --git a/tests/qemumigrationcookiexmltest.c b/tests/qemumigrationcookie= xmltest.c index 6ef5dc0ad6..316bfedd15 100644 --- a/tests/qemumigrationcookiexmltest.c +++ b/tests/qemumigrationcookiexmltest.c @@ -342,6 +342,7 @@ testQemuMigrationCookieBlockDirtyBitmaps(const void *op= aque) qmpschema, false, false, + false, &debug) < 0) { VIR_TEST_VERBOSE("failed to validate migration params '%s' against= QMP schema: %s", actualJSON, virBufferCurrentContent(&debug)); diff --git a/tests/qemumonitortestutils.c b/tests/qemumonitortestutils.c index 71b26c326e..f5eb77d190 100644 --- a/tests/qemumonitortestutils.c +++ b/tests/qemumonitortestutils.c @@ -542,6 +542,7 @@ qemuMonitorTestProcessCommandDefaultValidate(qemuMonito= rTest *test, if (testQEMUSchemaValidateCommand(cmdname, args, test->qapischema, test->skipValidationDeprecated, test->skipValidationRemoved, + false, &debug) < 0) { if (virTestGetDebug() =3D=3D 2) { g_autofree char *argstr =3D NULL; diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index a0ee5f9943..d6cc2a51c2 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -535,7 +535,7 @@ testCompareXMLToArgvValidateSchemaCommand(GStrv args, return -1; if (testQEMUSchemaValidateCommand(command->schema, jsonargs, - schema, false, false, &debug= ) < 0) { + schema, false, false, false,= &debug) < 0) { VIR_TEST_VERBOSE("failed to validate '%s %s' against QAPI = schema: %s", command->name, curargs, virBufferCurrentC= ontent(&debug)); return -1; diff --git a/tests/testutilsqemuschema.c b/tests/testutilsqemuschema.c index f6347231a8..4f9db98e07 100644 --- a/tests/testutilsqemuschema.c +++ b/tests/testutilsqemuschema.c @@ -25,6 +25,7 @@ struct testQEMUSchemaValidateCtxt { GHashTable *schema; virBuffer *debug; bool allowDeprecated; + bool allowIncomplete; /* allow members not (yet) covered by the schema= */ }; @@ -137,6 +138,10 @@ testQEMUSchemaValidateObjectMember(const char *key, /* lookup 'member' entry for key */ if (!(keymember =3D testQEMUSchemaStealObjectMemberByName(key, data->r= ootmembers))) { + if (data->ctxt->allowIncomplete) { + virBufferAddLit(data->ctxt->debug, " schema missing - OK(waive= d)\n"); + return 0; + } virBufferAddLit(data->ctxt->debug, "ERROR: attribute not in schema= \n"); return -1; } @@ -553,6 +558,8 @@ testQEMUSchemaValidate(virJSONValue *obj, * @allowDeprecated: don't fails schema validation if @command or one of @= arguments * is deprecated * @allowRemoved: skip validation fully if @command was not found + * @allowIncomplete: don't fail validation if members not covered by schem= a are present + * (for waiving commands with incomplete schema) * @debug: a virBuffer which will be filled with debug information if prov= ided * * Validates whether @command and its @arguments conform to the QAPI schema @@ -571,11 +578,13 @@ testQEMUSchemaValidateCommand(const char *command, GHashTable *schema, bool allowDeprecated, bool allowRemoved, + bool allowIncomplete, virBuffer *debug) { struct testQEMUSchemaValidateCtxt ctxt =3D { .schema =3D schema, .debug =3D debug, - .allowDeprecated =3D allowD= eprecated }; + .allowDeprecated =3D allowD= eprecated, + .allowIncomplete =3D allowI= ncomplete }; g_autofree char *schemapatharguments =3D g_strdup_printf("%s/arg-type"= , command); g_autoptr(virJSONValue) emptyargs =3D NULL; virJSONValue *schemarootcommand; diff --git a/tests/testutilsqemuschema.h b/tests/testutilsqemuschema.h index ba881a991a..cb1e6da69e 100644 --- a/tests/testutilsqemuschema.h +++ b/tests/testutilsqemuschema.h @@ -35,6 +35,7 @@ testQEMUSchemaValidateCommand(const char *command, GHashTable *schema, bool allowDeprecated, bool allowRemoved, + bool allowIncomplete, virBuffer *debug); int --=20 2.31.1 From nobody Sun Apr 28 13:01:00 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=1634542722; cv=none; d=zohomail.com; s=zohoarc; b=MoOh57XphomaZHlzhfw09mXGfZ4pbc3FN3XFt62FR0HBvdEYoOOjL7cCi5Db2MfTQiRi/C+P7cKjUFu45kCpF/wqffZgzbj4uZWekwHarGiGBt+d4ARQOphpQBemzYTuhhyTW+aQ6S7e3zB7QjMh8dezjNPKnOs1TrxM0fP9ep4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1634542722; 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=fw/ujdbYwxTEG2mmc+W3QIJnXHJ6xMERE1PO1kKfJeI=; b=VKADOmwFVsdpiTuV/67sfZhYOHpCPmuzwn+NGLcfrmzAtAyUMgbpbu1g2+SmVYAk8mJoXoG82N1tsGVrgfj8/EbuQ+Y3vP3Gx1IhHOUkJKueAKlMM1Kn5HnDFsgbYgX27n2tstKxwe6vj6z4ESRLnRxfSST4hjVaQDXYWaBlQho= 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 1634542722022626.9036141893624; Mon, 18 Oct 2021 00:38:42 -0700 (PDT) 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-118-cumH-4QSMp-2hCgWx5OBCg-1; Mon, 18 Oct 2021 03:38:37 -0400 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 2FB3D800685; Mon, 18 Oct 2021 07:38:30 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 0C75F60C82; Mon, 18 Oct 2021 07:38:30 +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 8E3AE4EA2A; Mon, 18 Oct 2021 07:38:29 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 19I7bUs0016749 for ; Mon, 18 Oct 2021 03:37:31 -0400 Received: by smtp.corp.redhat.com (Postfix) id D65F17086D; Mon, 18 Oct 2021 07:37:30 +0000 (UTC) Received: from speedmetal.lan (unknown [10.40.208.20]) by smtp.corp.redhat.com (Postfix) with ESMTP id 2F95E5BB12 for ; Mon, 18 Oct 2021 07:37:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1634542721; 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=fw/ujdbYwxTEG2mmc+W3QIJnXHJ6xMERE1PO1kKfJeI=; b=HiZO0POVyIxjK2k8jRuzqmtZmn6VKs0kV+kgdWMcVC2q6WKv3ml1dFpghUMRspXHComQU6 a4RVEoIc9ryI4i0HDGwBjV6k+KLko1YBZVzM/xc5ThSQm1fUHC5cRAi81xpNq5ts7AZCRA ND15WJX12ByxR5Ts0qPeuYOiN6GR/JE= X-MC-Unique: cumH-4QSMp-2hCgWx5OBCg-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 3/6] qemuMonitorTestProcessCommandDefaultValidate: Partially validate 'device_add' Date: Mon, 18 Oct 2021 09:37:09 +0200 Message-Id: <0eda90c402c5c8d26e06c37d0e95cce1a5bdef1b.1634542402.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 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-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1634542722868100001 Content-Type: text/plain; charset="utf-8" Use the 'allowIncomplete' argument of testQEMUSchemaValidateCommand to validate at least properties which are already described by the schema. Signed-off-by: Peter Krempa Reviewed-by: J=C3=A1n Tomko --- tests/qemumonitortestutils.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/tests/qemumonitortestutils.c b/tests/qemumonitortestutils.c index f5eb77d190..35a1bce071 100644 --- a/tests/qemumonitortestutils.c +++ b/tests/qemumonitortestutils.c @@ -524,6 +524,7 @@ qemuMonitorTestProcessCommandDefaultValidate(qemuMonito= rTest *test, virJSONValue *args) { g_auto(virBuffer) debug =3D VIR_BUFFER_INITIALIZER; + bool allowIncomplete =3D false; if (!test->qapischema) return 0; @@ -535,14 +536,14 @@ qemuMonitorTestProcessCommandDefaultValidate(qemuMoni= torTest *test, return -1; } - /* 'device_add' needs to be skipped as it does not have fully defined = schema */ + /* The schema of 'device_add' is incomplete so we relax the validator = */ if (STREQ(cmdname, "device_add")) - return 0; + allowIncomplete =3D true; if (testQEMUSchemaValidateCommand(cmdname, args, test->qapischema, test->skipValidationDeprecated, test->skipValidationRemoved, - false, + allowIncomplete, &debug) < 0) { if (virTestGetDebug() =3D=3D 2) { g_autofree char *argstr =3D NULL; --=20 2.31.1 From nobody Sun Apr 28 13:01:00 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=1634542819; cv=none; d=zohomail.com; s=zohoarc; b=RJQdML3TW/hEAGknZ2iSgJgQgiFtnJ8JDKovViWFH+TseEtB2yIRtPjO3uqbFNEzrRxRvQOL+q8zWAojePHoCgiDdEeW2+2IlZbhgcgj8ruqMpByWF54GJHfRLb27iNHB03jYGlMjDZVJgQuBwQ1hmve0g0xKtIivIRvOtCq0J0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1634542819; 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=fkpV8Dr7AB9nbR5saDCCRKg7qQkT0hKi58pG8w0fOys=; b=Swrn5zHg1hwclc7qnBUGgTaxnu19UEkts0Xx6TQ2TAQnr6laxncyLCryPHVPgSUhUpV7V+1hzsfFmVgvuH17BKMxtw+3cYfhKNnAEu3h6qsq0ZWrljv7NE1LLK8jpv8y9dc5Sm38OY5R7sdYQHAR2T2I4DixicKjZXGh615phig= 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 1634542819933760.7924992531666; Mon, 18 Oct 2021 00:40:19 -0700 (PDT) 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-143-JGMI95JvOxa012vwZCmk-A-1; Mon, 18 Oct 2021 03:38:53 -0400 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 04A6210A8E15; Mon, 18 Oct 2021 07:38:49 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id C7AB619736; Mon, 18 Oct 2021 07:38:48 +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 90AB04EA30; Mon, 18 Oct 2021 07:38:48 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 19I7bYuO016769 for ; Mon, 18 Oct 2021 03:37:34 -0400 Received: by smtp.corp.redhat.com (Postfix) id C99C65BB12; Mon, 18 Oct 2021 07:37:34 +0000 (UTC) Received: from speedmetal.lan (unknown [10.40.208.20]) by smtp.corp.redhat.com (Postfix) with ESMTP id 75E2B5BB0D for ; Mon, 18 Oct 2021 07:37:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1634542818; 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=fkpV8Dr7AB9nbR5saDCCRKg7qQkT0hKi58pG8w0fOys=; b=f/wm1RXr1rjLiULyTk2TLMQoYFPgNCJZJaaplLgxVQpBYqw8NelGuqY26tq8ht/vTxUOPP rv4tewqNJ60Be2L4TKMHxen4Q9P5bChIBxBnhUZTlvQmlDWxE7Z375yt0d4DK5fs0+s2GQ 2wBj9VdGx9g2OtzFpAQc+hLEt7N1v6E= X-MC-Unique: JGMI95JvOxa012vwZCmk-A-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 4/6] qemu: Use JSON directly for '-device' Date: Mon, 18 Oct 2021 09:37:10 +0200 Message-Id: <6db6af058227c4aaa41ba7987049623ac883318e.1634542402.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 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-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1634542820907100001 Content-Type: text/plain; charset="utf-8" Starting with QEMU-6.2 started accepting a JSON object as argument for '-device' which will also become the only syntax considered stable by qemu in the future. Since libvirt was recently converted to generate the properties via JSON to begin wit we can start using it on the commandline as well, by simply enabling the QEMU_CAPS_DEVICE_JSON capability, which we do by probing for the 'json-cli' feature flag of 'device_add'. Normally a change which changes a commandline output should be happening only after the impacted real-caps test files are forked in the version preceding the change, but in this case it's not necessary as the logic for generating the device properties stays identical and we just change the output format (avoid conversion). Additionally we still have a lot of tests validating the conversion to the old commandline options. Signed-off-by: Peter Krempa Reviewed-by: J=C3=A1n Tomko --- src/qemu/qemu_capabilities.c | 1 + .../caps_6.2.0.x86_64.xml | 1 + .../audio-alsa-best.x86_64-latest.args | 4 +- .../audio-alsa-full.x86_64-latest.args | 4 +- .../audio-alsa-minimal.x86_64-latest.args | 4 +- .../audio-coreaudio-best.x86_64-latest.args | 4 +- .../audio-coreaudio-full.x86_64-latest.args | 4 +- ...audio-coreaudio-minimal.x86_64-latest.args | 4 +- ...udio-default-nographics.x86_64-latest.args | 4 +- .../audio-default-sdl.x86_64-latest.args | 6 +-- .../audio-default-spice.x86_64-latest.args | 6 +-- .../audio-default-vnc.x86_64-latest.args | 6 +-- .../audio-file-best.x86_64-latest.args | 4 +- .../audio-file-full.x86_64-latest.args | 4 +- .../audio-file-minimal.x86_64-latest.args | 4 +- .../audio-jack-full.x86_64-latest.args | 4 +- .../audio-jack-minimal.x86_64-latest.args | 4 +- .../audio-many-backends.x86_64-latest.args | 14 +++---- .../audio-none-best.x86_64-latest.args | 4 +- .../audio-none-full.x86_64-latest.args | 4 +- .../audio-none-minimal.x86_64-latest.args | 4 +- .../audio-oss-best.x86_64-latest.args | 4 +- .../audio-oss-full.x86_64-latest.args | 4 +- .../audio-oss-minimal.x86_64-latest.args | 4 +- .../audio-pulseaudio-best.x86_64-latest.args | 4 +- .../audio-pulseaudio-full.x86_64-latest.args | 4 +- ...udio-pulseaudio-minimal.x86_64-latest.args | 4 +- .../audio-sdl-best.x86_64-latest.args | 4 +- .../audio-sdl-full.x86_64-latest.args | 4 +- .../audio-sdl-minimal.x86_64-latest.args | 4 +- .../audio-spice-best.x86_64-latest.args | 4 +- .../audio-spice-full.x86_64-latest.args | 4 +- .../audio-spice-minimal.x86_64-latest.args | 4 +- .../blkdeviotune-group-num.x86_64-latest.args | 8 ++-- ...blkdeviotune-max-length.x86_64-latest.args | 8 ++-- .../blkdeviotune-max.x86_64-latest.args | 8 ++-- .../channel-unix-guestfwd.x86_64-latest.args | 4 +- .../console-virtio-unix.x86_64-latest.args | 10 ++--- .../controller-virtio-scsi.x86_64-latest.args | 24 +++++------ ...-Icelake-Server-pconfig.x86_64-latest.args | 4 +- .../cpu-host-model.x86_64-latest.args | 10 ++--- .../cpu-translation.x86_64-latest.args | 4 +- .../cputune-cpuset-big-id.x86_64-latest.args | 6 +-- .../devices-acpi-index.x86_64-latest.args | 16 +++---- .../disk-aio-io_uring.x86_64-latest.args | 6 +-- .../disk-aio.x86_64-latest.args | 8 ++-- ...-backing-chains-noindex.x86_64-latest.args | 16 +++---- .../disk-blockio.x86_64-latest.args | 8 ++-- .../disk-boot-cdrom.x86_64-latest.args | 6 +-- .../disk-boot-disk.x86_64-latest.args | 6 +-- .../disk-cache.x86_64-latest.args | 14 +++---- .../disk-cdrom-bus-other.x86_64-latest.args | 6 +-- ...m-empty-network-invalid.x86_64-latest.args | 4 +- .../disk-cdrom-network.x86_64-latest.args | 10 ++--- .../disk-cdrom-tray.x86_64-latest.args | 10 ++--- .../disk-cdrom.x86_64-latest.args | 10 ++--- .../disk-copy_on_read.x86_64-latest.args | 12 +++--- .../disk-detect-zeroes.x86_64-latest.args | 8 ++-- .../disk-discard.x86_64-latest.args | 8 ++-- .../disk-error-policy.x86_64-latest.args | 8 ++-- .../disk-floppy-q35-2_11.x86_64-latest.args | 12 +++--- .../disk-floppy-q35-2_9.x86_64-latest.args | 12 +++--- .../disk-floppy-tray.x86_64-latest.args | 10 ++--- .../disk-floppy.x86_64-latest.args | 8 ++-- .../disk-fmt-qcow.x86_64-latest.args | 6 +-- .../disk-geometry.x86_64-latest.args | 6 +-- .../disk-ide-split.x86_64-latest.args | 8 ++-- .../disk-ide-wwn.x86_64-latest.args | 6 +-- .../disk-ioeventfd.x86_64-latest.args | 12 +++--- .../disk-metadata-cache.x86_64-latest.args | 8 ++-- .../disk-network-gluster.x86_64-latest.args | 8 ++-- .../disk-network-http.x86_64-latest.args | 10 ++--- .../disk-network-iscsi.x86_64-latest.args | 18 ++++---- .../disk-network-nbd.x86_64-latest.args | 12 +++--- .../disk-network-nfs.x86_64-latest.args | 6 +-- ...sk-network-rbd-no-colon.x86_64-latest.args | 8 ++-- .../disk-network-rbd.x86_64-latest.args | 14 +++---- ...isk-network-source-auth.x86_64-latest.args | 8 ++-- ...isk-network-tlsx509-nbd.x86_64-latest.args | 4 +- .../disk-no-boot.x86_64-latest.args | 8 ++-- .../disk-nvme.x86_64-latest.args | 12 +++--- .../disk-order.x86_64-latest.args | 12 +++--- .../disk-readonly-disk.x86_64-latest.args | 8 ++-- .../disk-rotation.x86_64-latest.args | 12 +++--- .../disk-sata-device.x86_64-latest.args | 8 ++-- .../disk-scsi-device-auto.x86_64-latest.args | 10 ++--- .../disk-scsi-disk-split.x86_64-latest.args | 20 ++++----- .../disk-scsi-disk-vpd.x86_64-latest.args | 12 +++--- .../disk-scsi-disk-wwn.x86_64-latest.args | 12 +++--- ...sk-scsi-lun-passthrough.x86_64-latest.args | 12 +++--- .../disk-scsi.x86_64-latest.args | 26 ++++++------ .../disk-serial.x86_64-latest.args | 8 ++-- .../disk-shared.x86_64-latest.args | 14 +++---- .../disk-slices.x86_64-latest.args | 14 +++---- .../disk-snapshot.x86_64-latest.args | 10 ++--- .../disk-source-pool-mode.x86_64-latest.args | 12 +++--- .../disk-source-pool.x86_64-latest.args | 14 +++---- .../disk-transient.x86_64-latest.args | 6 +-- ...sk-usb-device-removable.x86_64-latest.args | 8 ++-- .../disk-usb-device.x86_64-latest.args | 8 ++-- .../disk-vhostuser.x86_64-latest.args | 8 ++-- .../disk-virtio-queues.x86_64-latest.args | 8 ++-- ...irtio-scsi-reservations.x86_64-latest.args | 10 ++--- .../disk-virtio.x86_64-latest.args | 10 ++--- .../encrypted-disk-usage.x86_64-latest.args | 6 +-- .../encrypted-disk.x86_64-latest.args | 6 +-- .../eoi-disabled.x86_64-latest.args | 4 +- .../eoi-enabled.x86_64-latest.args | 4 +- .../event_idx.x86_64-latest.args | 12 +++--- .../fips-enabled.x86_64-latest.args | 6 +-- .../floppy-drive-fat.x86_64-latest.args | 6 +-- .../qemuxml2argvdata/fs9p.x86_64-latest.args | 6 +-- .../genid-auto.x86_64-latest.args | 4 +- .../qemuxml2argvdata/genid.x86_64-latest.args | 4 +- ...egl-headless-rendernode.x86_64-latest.args | 6 +-- .../graphics-egl-headless.x86_64-latest.args | 6 +-- ...pice-gl-auto-rendernode.x86_64-latest.args | 6 +-- ...ics-vnc-auto-socket-cfg.x86_64-latest.args | 6 +-- ...raphics-vnc-auto-socket.x86_64-latest.args | 4 +- ...aphics-vnc-egl-headless.x86_64-latest.args | 6 +-- ...hics-vnc-no-listen-attr.x86_64-latest.args | 6 +-- .../graphics-vnc-none.x86_64-latest.args | 4 +- .../graphics-vnc-policy.x86_64-latest.args | 6 +-- .../graphics-vnc-power.x86_64-latest.args | 6 +-- ...remove-generated-socket.x86_64-latest.args | 6 +-- .../graphics-vnc-sasl.x86_64-latest.args | 6 +-- ...-vnc-socket-new-cmdline.x86_64-latest.args | 4 +- .../graphics-vnc-socket.x86_64-latest.args | 4 +- ...graphics-vnc-tls-secret.x86_64-latest.args | 4 +- .../graphics-vnc-tls.x86_64-latest.args | 4 +- .../graphics-vnc-websocket.x86_64-latest.args | 4 +- .../graphics-vnc.x86_64-latest.args | 6 +-- ...tdev-mdev-display-ramfb.x86_64-latest.args | 6 +-- ...play-spice-egl-headless.x86_64-latest.args | 6 +-- ...ev-display-spice-opengl.x86_64-latest.args | 6 +-- ...isplay-vnc-egl-headless.x86_64-latest.args | 6 +-- ...ostdev-mdev-display-vnc.x86_64-latest.args | 6 +-- .../hostdev-scsi-lsi.x86_64-latest.args | 20 ++++----- ...ostdev-scsi-virtio-scsi.x86_64-latest.args | 22 +++++----- .../hugepages-memaccess3.x86_64-latest.args | 2 +- .../hugepages-nvdimm.x86_64-latest.args | 4 +- .../hyperv-off.x86_64-latest.args | 4 +- .../hyperv-panic.x86_64-latest.args | 2 +- .../hyperv-stimer-direct.x86_64-latest.args | 2 +- .../hyperv.x86_64-latest.args | 2 +- .../input-linux.x86_64-latest.args | 4 +- .../intel-iommu-aw-bits.x86_64-latest.args | 2 +- ...ntel-iommu-caching-mode.x86_64-latest.args | 2 +- ...ntel-iommu-device-iotlb.x86_64-latest.args | 2 +- .../intel-iommu-eim.x86_64-latest.args | 2 +- .../intel-iommu.x86_64-latest.args | 2 +- ...threads-virtio-scsi-pci.x86_64-latest.args | 10 ++--- .../kvmclock+eoi-disabled.x86_64-latest.args | 4 +- ...luks-disks-source-qcow2.x86_64-latest.args | 16 +++---- .../luks-disks-source.x86_64-latest.args | 14 +++---- .../luks-disks.x86_64-latest.args | 8 ++-- ...memory-default-hugepage.x86_64-latest.args | 4 +- .../memfd-memory-numa.x86_64-latest.args | 6 +-- ...y-hotplug-nvdimm-access.x86_64-latest.args | 8 ++-- ...ry-hotplug-nvdimm-align.x86_64-latest.args | 8 ++-- ...ry-hotplug-nvdimm-label.x86_64-latest.args | 8 ++-- ...ory-hotplug-nvdimm-pmem.x86_64-latest.args | 8 ++-- ...hotplug-nvdimm-readonly.x86_64-latest.args | 8 ++-- .../memory-hotplug-nvdimm.x86_64-latest.args | 8 ++-- ...mory-hotplug-virtio-mem.x86_64-latest.args | 10 ++--- ...ory-hotplug-virtio-pmem.x86_64-latest.args | 8 ++-- .../misc-no-reboot.x86_64-latest.args | 4 +- .../mlock-off.x86_64-latest.args | 2 +- .../mlock-on.x86_64-latest.args | 2 +- .../net-vdpa.x86_64-latest.args | 4 +- .../net-vhostuser.x86_64-latest.args | 8 ++-- .../numatune-hmat.x86_64-latest.args | 4 +- ...emnode-restrictive-mode.x86_64-latest.args | 4 +- .../numatune-memnode.x86_64-latest.args | 4 +- .../os-firmware-bios.x86_64-latest.args | 16 +++---- ...re-efi-no-enrolled-keys.x86_64-latest.args | 6 +-- ...os-firmware-efi-secboot.x86_64-latest.args | 16 +++---- .../os-firmware-efi.x86_64-latest.args | 16 +++---- .../panic-double.x86_64-latest.args | 4 +- .../panic-no-address.x86_64-latest.args | 8 ++-- .../qemuxml2argvdata/panic.x86_64-latest.args | 8 ++-- .../parallel-unix-chardev.x86_64-latest.args | 8 ++-- ...-hotplug-bridge-disable.x86_64-latest.args | 4 +- ...i-hotplug-bridge-enable.x86_64-latest.args | 4 +- ...pi-root-hotplug-disable.x86_64-latest.args | 4 +- ...cpi-root-hotplug-enable.x86_64-latest.args | 4 +- ...cie-root-port-nohotplug.x86_64-latest.args | 18 ++++---- .../pv-spinlock-disabled.x86_64-latest.args | 4 +- .../pv-spinlock-enabled.x86_64-latest.args | 4 +- ...-hotplug-bridge-disable.x86_64-latest.args | 10 ++--- ...i-hotplug-bridge-enable.x86_64-latest.args | 10 ++--- .../qemu-ns.x86_64-latest.args | 6 +-- .../serial-unix-chardev.x86_64-latest.args | 8 ++-- ...rtcard-passthrough-unix.x86_64-latest.args | 8 ++-- .../tpm-emulator-tpm2-enc.x86_64-latest.args | 6 +-- ...pm-emulator-tpm2-pstate.x86_64-latest.args | 6 +-- .../tpm-emulator-tpm2.x86_64-latest.args | 6 +-- .../tpm-emulator.x86_64-latest.args | 6 +-- .../tpm-passthrough-crb.x86_64-latest.args | 6 +-- .../tpm-passthrough.x86_64-latest.args | 6 +-- .../tseg-explicit-size.x86_64-latest.args | 10 ++--- .../usb-redir-unix.x86_64-latest.args | 14 +++---- ...vhost-user-fs-fd-memory.x86_64-latest.args | 2 +- ...vhost-user-fs-hugepages.x86_64-latest.args | 12 +++--- ...host-user-gpu-secondary.x86_64-latest.args | 10 ++--- .../vhost-user-vga.x86_64-latest.args | 8 ++-- .../vhost-vsock-auto.x86_64-latest.args | 6 +-- .../vhost-vsock.x86_64-latest.args | 6 +-- ...eo-bochs-display-device.x86_64-latest.args | 8 ++-- ...video-qxl-device-vram64.x86_64-latest.args | 6 +-- ...o-qxl-sec-device-vram64.x86_64-latest.args | 8 ++-- ...eo-ramfb-display-device.x86_64-latest.args | 8 ++-- ...video-virtio-vga-gpu-gl.x86_64-latest.args | 8 ++-- .../virtio-9p-createmode.x86_64-latest.args | 14 +++---- .../virtio-9p-multidevs.x86_64-latest.args | 12 +++--- .../virtio-lun.x86_64-latest.args | 12 +++--- ...virtio-non-transitional.x86_64-latest.args | 42 +++++++++---------- ...-options-controller-ats.x86_64-latest.args | 12 +++--- ...ptions-controller-iommu.x86_64-latest.args | 12 +++--- ...tions-controller-packed.x86_64-latest.args | 12 +++--- ...virtio-options-disk-ats.x86_64-latest.args | 8 ++-- ...rtio-options-disk-iommu.x86_64-latest.args | 8 ++-- ...tio-options-disk-packed.x86_64-latest.args | 8 ++-- .../virtio-options-fs-ats.x86_64-latest.args | 8 ++-- ...virtio-options-fs-iommu.x86_64-latest.args | 8 ++-- ...irtio-options-fs-packed.x86_64-latest.args | 8 ++-- ...irtio-options-input-ats.x86_64-latest.args | 8 ++-- ...tio-options-input-iommu.x86_64-latest.args | 8 ++-- ...io-options-input-packed.x86_64-latest.args | 8 ++-- ...-options-memballoon-ats.x86_64-latest.args | 4 +- ...loon-freepage-reporting.x86_64-latest.args | 4 +- ...ptions-memballoon-iommu.x86_64-latest.args | 4 +- ...tions-memballoon-packed.x86_64-latest.args | 4 +- .../virtio-options-net-ats.x86_64-latest.args | 8 ++-- ...irtio-options-net-iommu.x86_64-latest.args | 8 ++-- ...rtio-options-net-packed.x86_64-latest.args | 8 ++-- .../virtio-options-rng-ats.x86_64-latest.args | 8 ++-- ...irtio-options-rng-iommu.x86_64-latest.args | 8 ++-- ...rtio-options-rng-packed.x86_64-latest.args | 8 ++-- ...irtio-options-video-ats.x86_64-latest.args | 8 ++-- ...tio-options-video-iommu.x86_64-latest.args | 8 ++-- ...io-options-video-packed.x86_64-latest.args | 8 ++-- .../virtio-options.x86_64-latest.args | 28 ++++++------- .../virtio-rng-builtin.x86_64-latest.args | 6 +-- .../virtio-rng-egd-unix.x86_64-latest.args | 6 +-- .../virtio-transitional.x86_64-latest.args | 26 ++++++------ .../watchdog-device.x86_64-latest.args | 8 ++-- .../watchdog-dump.x86_64-latest.args | 8 ++-- .../watchdog-injectnmi.x86_64-latest.args | 8 ++-- .../watchdog.x86_64-latest.args | 6 +-- ...-default-cpu-kvm-pc-4.2.x86_64-latest.args | 6 +-- ...default-cpu-kvm-q35-4.2.x86_64-latest.args | 14 +++---- ...-default-cpu-tcg-pc-4.2.x86_64-latest.args | 6 +-- ...default-cpu-tcg-q35-4.2.x86_64-latest.args | 14 +++---- .../x86_64-pc-graphics.x86_64-latest.args | 20 ++++----- .../x86_64-pc-headless.x86_64-latest.args | 16 +++---- .../x86_64-q35-graphics.x86_64-latest.args | 34 +++++++-------- .../x86_64-q35-headless.x86_64-latest.args | 30 ++++++------- 258 files changed, 1039 insertions(+), 1037 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 1043c4b1e6..4cdf22f5eb 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -1566,6 +1566,7 @@ static struct virQEMUCapsStringFlags virQEMUCapsQMPSc= hemaQueries[] =3D { { "chardev-add/arg-type/backend/+socket/data/reconnect", QEMU_CAPS_CHA= RDEV_RECONNECT }, { "chardev-add/arg-type/backend/+file/data/logfile", QEMU_CAPS_CHARDEV= _LOGFILE }, { "chardev-add/arg-type/backend/+file/data/logappend", QEMU_CAPS_CHARD= EV_FILE_APPEND }, + { "device_add/$json-cli", QEMU_CAPS_DEVICE_JSON }, { "human-monitor-command/$savevm-monitor-nodes", QEMU_CAPS_SAVEVM_MONI= TOR_NODES }, { "migrate-set-parameters/arg-type/max-bandwidth", QEMU_CAPS_MIGRATION= _PARAM_BANDWIDTH }, { "migrate-set-parameters/arg-type/downtime-limit", QEMU_CAPS_MIGRATIO= N_PARAM_DOWNTIME }, diff --git a/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml b/tests/qemuc= apabilitiesdata/caps_6.2.0.x86_64.xml index 56a613c767..3adced70cc 100644 --- a/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml @@ -239,6 +239,7 @@ + 6001050 0 43100244 diff --git a/tests/qemuxml2argvdata/audio-alsa-best.x86_64-latest.args b/te= sts/qemuxml2argvdata/audio-alsa-best.x86_64-latest.args index 0fd84746db..46350b9c01 100644 --- a/tests/qemuxml2argvdata/audio-alsa-best.x86_64-latest.args +++ b/tests/qemuxml2argvdata/audio-alsa-best.x86_64-latest.args @@ -26,10 +26,10 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ -blockdev '{"driver":"host_cdrom","filename":"/dev/cdrom","node-name":"lib= virt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":true,"driver":"raw"= ,"file":"libvirt-1-storage"}' \ --device ide-cd,bus=3Dide.1,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-1-0= ,bootindex=3D1 \ +-device '{"driver":"ide-cd","bus":"ide.1","unit":0,"drive":"libvirt-1-form= at","id":"ide0-1-0","bootindex":1}' \ -audiodev id=3Daudio1,driver=3Dalsa,timer-period=3D50,in.mixing-engine=3Do= n,in.fixed-settings=3Don,in.voices=3D1,in.frequency=3D44100,in.channels=3D2= ,in.format=3Ds16,out.mixing-engine=3Don,out.fixed-settings=3Don,out.voices= =3D2,out.frequency=3D22050,out.channels=3D4,out.format=3Df32,in.dev=3D/dev/= dsp0,out.dev=3D/dev/dsp1 \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/audio-alsa-full.x86_64-latest.args b/te= sts/qemuxml2argvdata/audio-alsa-full.x86_64-latest.args index bb54751992..186cc0db0c 100644 --- a/tests/qemuxml2argvdata/audio-alsa-full.x86_64-latest.args +++ b/tests/qemuxml2argvdata/audio-alsa-full.x86_64-latest.args @@ -26,10 +26,10 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ -blockdev '{"driver":"host_cdrom","filename":"/dev/cdrom","node-name":"lib= virt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":true,"driver":"raw"= ,"file":"libvirt-1-storage"}' \ --device ide-cd,bus=3Dide.1,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-1-0= ,bootindex=3D1 \ +-device '{"driver":"ide-cd","bus":"ide.1","unit":0,"drive":"libvirt-1-form= at","id":"ide0-1-0","bootindex":1}' \ -audiodev id=3Daudio1,driver=3Dalsa,in.mixing-engine=3Don,in.fixed-setting= s=3Don,in.voices=3D1,in.buffer-length=3D100,in.frequency=3D44100,in.channel= s=3D2,in.format=3Ds16,out.mixing-engine=3Don,out.fixed-settings=3Don,out.vo= ices=3D2,out.buffer-length=3D200,out.frequency=3D22050,out.channels=3D4,out= .format=3Df32,in.dev=3D/dev/dsp0,out.dev=3D/dev/dsp1 \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/audio-alsa-minimal.x86_64-latest.args b= /tests/qemuxml2argvdata/audio-alsa-minimal.x86_64-latest.args index d214149efe..905f4d6c52 100644 --- a/tests/qemuxml2argvdata/audio-alsa-minimal.x86_64-latest.args +++ b/tests/qemuxml2argvdata/audio-alsa-minimal.x86_64-latest.args @@ -26,10 +26,10 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ -blockdev '{"driver":"host_cdrom","filename":"/dev/cdrom","node-name":"lib= virt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":true,"driver":"raw"= ,"file":"libvirt-1-storage"}' \ --device ide-cd,bus=3Dide.1,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-1-0= ,bootindex=3D1 \ +-device '{"driver":"ide-cd","bus":"ide.1","unit":0,"drive":"libvirt-1-form= at","id":"ide0-1-0","bootindex":1}' \ -audiodev id=3Daudio1,driver=3Dalsa \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/audio-coreaudio-best.x86_64-latest.args= b/tests/qemuxml2argvdata/audio-coreaudio-best.x86_64-latest.args index 3d8b6f33ae..b375409aed 100644 --- a/tests/qemuxml2argvdata/audio-coreaudio-best.x86_64-latest.args +++ b/tests/qemuxml2argvdata/audio-coreaudio-best.x86_64-latest.args @@ -26,10 +26,10 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ -blockdev '{"driver":"host_cdrom","filename":"/dev/cdrom","node-name":"lib= virt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":true,"driver":"raw"= ,"file":"libvirt-1-storage"}' \ --device ide-cd,bus=3Dide.1,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-1-0= ,bootindex=3D1 \ +-device '{"driver":"ide-cd","bus":"ide.1","unit":0,"drive":"libvirt-1-form= at","id":"ide0-1-0","bootindex":1}' \ -audiodev id=3Daudio1,driver=3Dcoreaudio,timer-period=3D50,in.mixing-engin= e=3Don,in.fixed-settings=3Don,in.voices=3D1,in.frequency=3D44100,in.channel= s=3D2,in.format=3Ds16,out.mixing-engine=3Don,out.fixed-settings=3Don,out.vo= ices=3D2,out.buffer-length=3D200,out.frequency=3D22050,out.channels=3D4,out= .format=3Df32,out.buffer-count=3D42 \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/audio-coreaudio-full.x86_64-latest.args= b/tests/qemuxml2argvdata/audio-coreaudio-full.x86_64-latest.args index dcbd46df5b..dd1ef1a405 100644 --- a/tests/qemuxml2argvdata/audio-coreaudio-full.x86_64-latest.args +++ b/tests/qemuxml2argvdata/audio-coreaudio-full.x86_64-latest.args @@ -26,10 +26,10 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ -blockdev '{"driver":"host_cdrom","filename":"/dev/cdrom","node-name":"lib= virt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":true,"driver":"raw"= ,"file":"libvirt-1-storage"}' \ --device ide-cd,bus=3Dide.1,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-1-0= ,bootindex=3D1 \ +-device '{"driver":"ide-cd","bus":"ide.1","unit":0,"drive":"libvirt-1-form= at","id":"ide0-1-0","bootindex":1}' \ -audiodev id=3Daudio1,driver=3Dcoreaudio,in.mixing-engine=3Don,in.fixed-se= ttings=3Don,in.voices=3D1,in.buffer-length=3D100,in.frequency=3D44100,in.ch= annels=3D2,in.format=3Ds16,out.mixing-engine=3Don,out.fixed-settings=3Don,o= ut.voices=3D2,out.buffer-length=3D200,out.frequency=3D22050,out.channels=3D= 4,out.format=3Df32,in.buffer-count=3D50,out.buffer-count=3D42 \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/audio-coreaudio-minimal.x86_64-latest.a= rgs b/tests/qemuxml2argvdata/audio-coreaudio-minimal.x86_64-latest.args index 4ce32b8a65..7fa4539a18 100644 --- a/tests/qemuxml2argvdata/audio-coreaudio-minimal.x86_64-latest.args +++ b/tests/qemuxml2argvdata/audio-coreaudio-minimal.x86_64-latest.args @@ -26,10 +26,10 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ -blockdev '{"driver":"host_cdrom","filename":"/dev/cdrom","node-name":"lib= virt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":true,"driver":"raw"= ,"file":"libvirt-1-storage"}' \ --device ide-cd,bus=3Dide.1,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-1-0= ,bootindex=3D1 \ +-device '{"driver":"ide-cd","bus":"ide.1","unit":0,"drive":"libvirt-1-form= at","id":"ide0-1-0","bootindex":1}' \ -audiodev id=3Daudio1,driver=3Dcoreaudio \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/audio-default-nographics.x86_64-latest.= args b/tests/qemuxml2argvdata/audio-default-nographics.x86_64-latest.args index d214149efe..905f4d6c52 100644 --- a/tests/qemuxml2argvdata/audio-default-nographics.x86_64-latest.args +++ b/tests/qemuxml2argvdata/audio-default-nographics.x86_64-latest.args @@ -26,10 +26,10 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ -blockdev '{"driver":"host_cdrom","filename":"/dev/cdrom","node-name":"lib= virt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":true,"driver":"raw"= ,"file":"libvirt-1-storage"}' \ --device ide-cd,bus=3Dide.1,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-1-0= ,bootindex=3D1 \ +-device '{"driver":"ide-cd","bus":"ide.1","unit":0,"drive":"libvirt-1-form= at","id":"ide0-1-0","bootindex":1}' \ -audiodev id=3Daudio1,driver=3Dalsa \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/audio-default-sdl.x86_64-latest.args b/= tests/qemuxml2argvdata/audio-default-sdl.x86_64-latest.args index 95c9537a30..3ecf1657f9 100644 --- a/tests/qemuxml2argvdata/audio-default-sdl.x86_64-latest.args +++ b/tests/qemuxml2argvdata/audio-default-sdl.x86_64-latest.args @@ -26,12 +26,12 @@ SDL_AUDIODRIVER=3Desd \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ -blockdev '{"driver":"host_cdrom","filename":"/dev/cdrom","node-name":"lib= virt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":true,"driver":"raw"= ,"file":"libvirt-1-storage"}' \ --device ide-cd,bus=3Dide.1,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-1-0= ,bootindex=3D1 \ +-device '{"driver":"ide-cd","bus":"ide.1","unit":0,"drive":"libvirt-1-form= at","id":"ide0-1-0","bootindex":1}' \ -audiodev id=3Daudio1,driver=3Dsdl \ -display sdl \ --device cirrus-vga,id=3Dvideo0,bus=3Dpci.0,addr=3D0x2 \ +-device '{"driver":"cirrus-vga","id":"video0","bus":"pci.0","addr":"0x2"}'= \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/audio-default-spice.x86_64-latest.args = b/tests/qemuxml2argvdata/audio-default-spice.x86_64-latest.args index a462dbbed9..70b5b35091 100644 --- a/tests/qemuxml2argvdata/audio-default-spice.x86_64-latest.args +++ b/tests/qemuxml2argvdata/audio-default-spice.x86_64-latest.args @@ -25,12 +25,12 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ -blockdev '{"driver":"host_cdrom","filename":"/dev/cdrom","node-name":"lib= virt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":true,"driver":"raw"= ,"file":"libvirt-1-storage"}' \ --device ide-cd,bus=3Dide.1,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-1-0= ,bootindex=3D1 \ +-device '{"driver":"ide-cd","bus":"ide.1","unit":0,"drive":"libvirt-1-form= at","id":"ide0-1-0","bootindex":1}' \ -audiodev id=3Daudio1,driver=3Dspice \ -spice port=3D0,seamless-migration=3Don \ --device cirrus-vga,id=3Dvideo0,bus=3Dpci.0,addr=3D0x2 \ +-device '{"driver":"cirrus-vga","id":"video0","bus":"pci.0","addr":"0x2"}'= \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/audio-default-vnc.x86_64-latest.args b/= tests/qemuxml2argvdata/audio-default-vnc.x86_64-latest.args index 093bf51f67..b8ec56100e 100644 --- a/tests/qemuxml2argvdata/audio-default-vnc.x86_64-latest.args +++ b/tests/qemuxml2argvdata/audio-default-vnc.x86_64-latest.args @@ -25,12 +25,12 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ -blockdev '{"driver":"host_cdrom","filename":"/dev/cdrom","node-name":"lib= virt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":true,"driver":"raw"= ,"file":"libvirt-1-storage"}' \ --device ide-cd,bus=3Dide.1,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-1-0= ,bootindex=3D1 \ +-device '{"driver":"ide-cd","bus":"ide.1","unit":0,"drive":"libvirt-1-form= at","id":"ide0-1-0","bootindex":1}' \ -audiodev id=3Daudio1,driver=3Dalsa \ -vnc 127.0.0.1:0,audiodev=3Daudio1 \ --device cirrus-vga,id=3Dvideo0,bus=3Dpci.0,addr=3D0x2 \ +-device '{"driver":"cirrus-vga","id":"video0","bus":"pci.0","addr":"0x2"}'= \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/audio-file-best.x86_64-latest.args b/te= sts/qemuxml2argvdata/audio-file-best.x86_64-latest.args index ff48527de6..8327031d4a 100644 --- a/tests/qemuxml2argvdata/audio-file-best.x86_64-latest.args +++ b/tests/qemuxml2argvdata/audio-file-best.x86_64-latest.args @@ -26,10 +26,10 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ -blockdev '{"driver":"host_cdrom","filename":"/dev/cdrom","node-name":"lib= virt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":true,"driver":"raw"= ,"file":"libvirt-1-storage"}' \ --device ide-cd,bus=3Dide.1,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-1-0= ,bootindex=3D1 \ +-device '{"driver":"ide-cd","bus":"ide.1","unit":0,"drive":"libvirt-1-form= at","id":"ide0-1-0","bootindex":1}' \ -audiodev id=3Daudio1,driver=3Dwav,timer-period=3D50,in.mixing-engine=3Don= ,in.fixed-settings=3Don,in.voices=3D1,in.frequency=3D44100,in.channels=3D2,= in.format=3Ds16,out.mixing-engine=3Don,out.fixed-settings=3Don,out.voices= =3D2,out.frequency=3D22050,out.channels=3D4,out.format=3Df32,path=3Daudio.w= av \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/audio-file-full.x86_64-latest.args b/te= sts/qemuxml2argvdata/audio-file-full.x86_64-latest.args index de5b2569d4..ca6e579382 100644 --- a/tests/qemuxml2argvdata/audio-file-full.x86_64-latest.args +++ b/tests/qemuxml2argvdata/audio-file-full.x86_64-latest.args @@ -26,10 +26,10 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ -blockdev '{"driver":"host_cdrom","filename":"/dev/cdrom","node-name":"lib= virt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":true,"driver":"raw"= ,"file":"libvirt-1-storage"}' \ --device ide-cd,bus=3Dide.1,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-1-0= ,bootindex=3D1 \ +-device '{"driver":"ide-cd","bus":"ide.1","unit":0,"drive":"libvirt-1-form= at","id":"ide0-1-0","bootindex":1}' \ -audiodev id=3Daudio1,driver=3Dwav,in.mixing-engine=3Don,in.fixed-settings= =3Don,in.voices=3D1,in.buffer-length=3D100,in.frequency=3D44100,in.channels= =3D2,in.format=3Ds16,out.mixing-engine=3Don,out.fixed-settings=3Don,out.voi= ces=3D2,out.buffer-length=3D200,out.frequency=3D22050,out.channels=3D4,out.= format=3Df32,path=3Daudio.wav \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/audio-file-minimal.x86_64-latest.args b= /tests/qemuxml2argvdata/audio-file-minimal.x86_64-latest.args index 3ae389e0cc..c06c8cf7ea 100644 --- a/tests/qemuxml2argvdata/audio-file-minimal.x86_64-latest.args +++ b/tests/qemuxml2argvdata/audio-file-minimal.x86_64-latest.args @@ -26,10 +26,10 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ -blockdev '{"driver":"host_cdrom","filename":"/dev/cdrom","node-name":"lib= virt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":true,"driver":"raw"= ,"file":"libvirt-1-storage"}' \ --device ide-cd,bus=3Dide.1,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-1-0= ,bootindex=3D1 \ +-device '{"driver":"ide-cd","bus":"ide.1","unit":0,"drive":"libvirt-1-form= at","id":"ide0-1-0","bootindex":1}' \ -audiodev id=3Daudio1,driver=3Dwav \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/audio-jack-full.x86_64-latest.args b/te= sts/qemuxml2argvdata/audio-jack-full.x86_64-latest.args index 6bdf5a9543..c77fd0ca5e 100644 --- a/tests/qemuxml2argvdata/audio-jack-full.x86_64-latest.args +++ b/tests/qemuxml2argvdata/audio-jack-full.x86_64-latest.args @@ -26,10 +26,10 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ -blockdev '{"driver":"host_cdrom","filename":"/dev/cdrom","node-name":"lib= virt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":true,"driver":"raw"= ,"file":"libvirt-1-storage"}' \ --device ide-cd,bus=3Dide.1,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-1-0= ,bootindex=3D1 \ +-device '{"driver":"ide-cd","bus":"ide.1","unit":0,"drive":"libvirt-1-form= at","id":"ide0-1-0","bootindex":1}' \ -audiodev id=3Daudio1,driver=3Djack,in.mixing-engine=3Don,in.fixed-setting= s=3Don,in.voices=3D1,in.buffer-length=3D100,in.frequency=3D44100,in.channel= s=3D2,in.format=3Ds16,out.mixing-engine=3Don,out.fixed-settings=3Don,out.vo= ices=3D2,out.buffer-length=3D200,out.frequency=3D22050,out.channels=3D4,out= .format=3Df32,in.server-name=3Dfish,in.client-name=3Dfood,in.connect-ports= =3Dyum,out.server-name=3Dfish,out.client-name=3Dfood,out.connect-ports=3Dyu= m \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/audio-jack-minimal.x86_64-latest.args b= /tests/qemuxml2argvdata/audio-jack-minimal.x86_64-latest.args index 50307617ca..3ddbfc967b 100644 --- a/tests/qemuxml2argvdata/audio-jack-minimal.x86_64-latest.args +++ b/tests/qemuxml2argvdata/audio-jack-minimal.x86_64-latest.args @@ -26,10 +26,10 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ -blockdev '{"driver":"host_cdrom","filename":"/dev/cdrom","node-name":"lib= virt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":true,"driver":"raw"= ,"file":"libvirt-1-storage"}' \ --device ide-cd,bus=3Dide.1,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-1-0= ,bootindex=3D1 \ +-device '{"driver":"ide-cd","bus":"ide.1","unit":0,"drive":"libvirt-1-form= at","id":"ide0-1-0","bootindex":1}' \ -audiodev id=3Daudio1,driver=3Djack \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/audio-many-backends.x86_64-latest.args = b/tests/qemuxml2argvdata/audio-many-backends.x86_64-latest.args index 090ea4c76b..4117eb9e7f 100644 --- a/tests/qemuxml2argvdata/audio-many-backends.x86_64-latest.args +++ b/tests/qemuxml2argvdata/audio-many-backends.x86_64-latest.args @@ -25,18 +25,18 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ -blockdev '{"driver":"host_cdrom","filename":"/dev/cdrom","node-name":"lib= virt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":true,"driver":"raw"= ,"file":"libvirt-1-storage"}' \ --device ide-cd,bus=3Dide.1,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-1-0= ,bootindex=3D1 \ +-device '{"driver":"ide-cd","bus":"ide.1","unit":0,"drive":"libvirt-1-form= at","id":"ide0-1-0","bootindex":1}' \ -audiodev id=3Daudio1,driver=3Dnone \ -audiodev id=3Daudio2,driver=3Dalsa \ -audiodev id=3Daudio3,driver=3Dpa \ -vnc 127.0.0.1:0,audiodev=3Daudio2 \ --device cirrus-vga,id=3Dvideo0,bus=3Dpci.0,addr=3D0x2 \ --device AC97,id=3Dsound0,audiodev=3Daudio1,bus=3Dpci.0,addr=3D0x3 \ --device intel-hda,id=3Dsound1,bus=3Dpci.0,addr=3D0x4 \ --device hda-duplex,id=3Dsound1-codec0,bus=3Dsound1.0,cad=3D0,audiodev=3Dau= dio2 \ --device ES1370,id=3Dsound2,audiodev=3Daudio3,bus=3Dpci.0,addr=3D0x5 \ +-device '{"driver":"cirrus-vga","id":"video0","bus":"pci.0","addr":"0x2"}'= \ +-device '{"driver":"AC97","id":"sound0","audiodev":"audio1","bus":"pci.0",= "addr":"0x3"}' \ +-device '{"driver":"intel-hda","id":"sound1","bus":"pci.0","addr":"0x4"}' \ +-device '{"driver":"hda-duplex","id":"sound1-codec0","bus":"sound1.0","cad= ":0,"audiodev":"audio2"}' \ +-device '{"driver":"ES1370","id":"sound2","audiodev":"audio3","bus":"pci.0= ","addr":"0x5"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/audio-none-best.x86_64-latest.args b/te= sts/qemuxml2argvdata/audio-none-best.x86_64-latest.args index feaa72ddbd..4c26196c34 100644 --- a/tests/qemuxml2argvdata/audio-none-best.x86_64-latest.args +++ b/tests/qemuxml2argvdata/audio-none-best.x86_64-latest.args @@ -26,10 +26,10 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ -blockdev '{"driver":"host_cdrom","filename":"/dev/cdrom","node-name":"lib= virt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":true,"driver":"raw"= ,"file":"libvirt-1-storage"}' \ --device ide-cd,bus=3Dide.1,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-1-0= ,bootindex=3D1 \ +-device '{"driver":"ide-cd","bus":"ide.1","unit":0,"drive":"libvirt-1-form= at","id":"ide0-1-0","bootindex":1}' \ -audiodev id=3Daudio1,driver=3Dnone,timer-period=3D50,in.mixing-engine=3Do= n,in.fixed-settings=3Don,in.voices=3D1,in.frequency=3D44100,in.channels=3D2= ,in.format=3Ds16,out.mixing-engine=3Don,out.fixed-settings=3Don,out.voices= =3D2,out.frequency=3D22050,out.channels=3D4,out.format=3Df32 \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/audio-none-full.x86_64-latest.args b/te= sts/qemuxml2argvdata/audio-none-full.x86_64-latest.args index b9a1838505..9296201865 100644 --- a/tests/qemuxml2argvdata/audio-none-full.x86_64-latest.args +++ b/tests/qemuxml2argvdata/audio-none-full.x86_64-latest.args @@ -26,10 +26,10 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ -blockdev '{"driver":"host_cdrom","filename":"/dev/cdrom","node-name":"lib= virt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":true,"driver":"raw"= ,"file":"libvirt-1-storage"}' \ --device ide-cd,bus=3Dide.1,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-1-0= ,bootindex=3D1 \ +-device '{"driver":"ide-cd","bus":"ide.1","unit":0,"drive":"libvirt-1-form= at","id":"ide0-1-0","bootindex":1}' \ -audiodev id=3Daudio1,driver=3Dnone,in.mixing-engine=3Don,in.fixed-setting= s=3Don,in.voices=3D1,in.buffer-length=3D100,in.frequency=3D44100,in.channel= s=3D2,in.format=3Ds16,out.mixing-engine=3Don,out.fixed-settings=3Don,out.vo= ices=3D2,out.buffer-length=3D200,out.frequency=3D22050,out.channels=3D4,out= .format=3Df32 \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/audio-none-minimal.x86_64-latest.args b= /tests/qemuxml2argvdata/audio-none-minimal.x86_64-latest.args index f70fe75ec1..b85e774e50 100644 --- a/tests/qemuxml2argvdata/audio-none-minimal.x86_64-latest.args +++ b/tests/qemuxml2argvdata/audio-none-minimal.x86_64-latest.args @@ -26,10 +26,10 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ -blockdev '{"driver":"host_cdrom","filename":"/dev/cdrom","node-name":"lib= virt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":true,"driver":"raw"= ,"file":"libvirt-1-storage"}' \ --device ide-cd,bus=3Dide.1,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-1-0= ,bootindex=3D1 \ +-device '{"driver":"ide-cd","bus":"ide.1","unit":0,"drive":"libvirt-1-form= at","id":"ide0-1-0","bootindex":1}' \ -audiodev id=3Daudio1,driver=3Dnone \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/audio-oss-best.x86_64-latest.args b/tes= ts/qemuxml2argvdata/audio-oss-best.x86_64-latest.args index b66fa68bc8..b20f939d05 100644 --- a/tests/qemuxml2argvdata/audio-oss-best.x86_64-latest.args +++ b/tests/qemuxml2argvdata/audio-oss-best.x86_64-latest.args @@ -26,10 +26,10 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ -blockdev '{"driver":"host_cdrom","filename":"/dev/cdrom","node-name":"lib= virt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":true,"driver":"raw"= ,"file":"libvirt-1-storage"}' \ --device ide-cd,bus=3Dide.1,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-1-0= ,bootindex=3D1 \ +-device '{"driver":"ide-cd","bus":"ide.1","unit":0,"drive":"libvirt-1-form= at","id":"ide0-1-0","bootindex":1}' \ -audiodev id=3Daudio1,driver=3Doss,timer-period=3D50,in.mixing-engine=3Don= ,in.fixed-settings=3Don,in.voices=3D1,in.frequency=3D44100,in.channels=3D2,= in.format=3Ds16,out.mixing-engine=3Don,out.fixed-settings=3Don,out.voices= =3D2,out.frequency=3D22050,out.channels=3D4,out.format=3Df32,in.dev=3D/dev/= dsp0,in.buffer-count=3D30,in.try-poll=3Don,out.dev=3D/dev/dsp1,out.buffer-c= ount=3D30,out.try-poll=3Doff \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/audio-oss-full.x86_64-latest.args b/tes= ts/qemuxml2argvdata/audio-oss-full.x86_64-latest.args index 2af073140b..2c1812a339 100644 --- a/tests/qemuxml2argvdata/audio-oss-full.x86_64-latest.args +++ b/tests/qemuxml2argvdata/audio-oss-full.x86_64-latest.args @@ -26,10 +26,10 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ -blockdev '{"driver":"host_cdrom","filename":"/dev/cdrom","node-name":"lib= virt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":true,"driver":"raw"= ,"file":"libvirt-1-storage"}' \ --device ide-cd,bus=3Dide.1,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-1-0= ,bootindex=3D1 \ +-device '{"driver":"ide-cd","bus":"ide.1","unit":0,"drive":"libvirt-1-form= at","id":"ide0-1-0","bootindex":1}' \ -audiodev id=3Daudio1,driver=3Doss,in.mixing-engine=3Don,in.fixed-settings= =3Don,in.voices=3D1,in.buffer-length=3D100,in.frequency=3D44100,in.channels= =3D2,in.format=3Ds16,out.mixing-engine=3Don,out.fixed-settings=3Don,out.voi= ces=3D2,out.buffer-length=3D200,out.frequency=3D22050,out.channels=3D4,out.= format=3Df32,in.dev=3D/dev/dsp0,in.buffer-count=3D50,in.try-poll=3Don,out.d= ev=3D/dev/dsp1,out.buffer-count=3D30,out.try-poll=3Doff,try-mmap=3Don,exclu= sive=3Don,dsp-policy=3D3 \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/audio-oss-minimal.x86_64-latest.args b/= tests/qemuxml2argvdata/audio-oss-minimal.x86_64-latest.args index b9f3c6e7e0..a7bb979766 100644 --- a/tests/qemuxml2argvdata/audio-oss-minimal.x86_64-latest.args +++ b/tests/qemuxml2argvdata/audio-oss-minimal.x86_64-latest.args @@ -26,10 +26,10 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ -blockdev '{"driver":"host_cdrom","filename":"/dev/cdrom","node-name":"lib= virt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":true,"driver":"raw"= ,"file":"libvirt-1-storage"}' \ --device ide-cd,bus=3Dide.1,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-1-0= ,bootindex=3D1 \ +-device '{"driver":"ide-cd","bus":"ide.1","unit":0,"drive":"libvirt-1-form= at","id":"ide0-1-0","bootindex":1}' \ -audiodev id=3Daudio1,driver=3Doss \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/audio-pulseaudio-best.x86_64-latest.arg= s b/tests/qemuxml2argvdata/audio-pulseaudio-best.x86_64-latest.args index eabff7302f..f8250a3922 100644 --- a/tests/qemuxml2argvdata/audio-pulseaudio-best.x86_64-latest.args +++ b/tests/qemuxml2argvdata/audio-pulseaudio-best.x86_64-latest.args @@ -26,10 +26,10 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ -blockdev '{"driver":"host_cdrom","filename":"/dev/cdrom","node-name":"lib= virt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":true,"driver":"raw"= ,"file":"libvirt-1-storage"}' \ --device ide-cd,bus=3Dide.1,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-1-0= ,bootindex=3D1 \ +-device '{"driver":"ide-cd","bus":"ide.1","unit":0,"drive":"libvirt-1-form= at","id":"ide0-1-0","bootindex":1}' \ -audiodev id=3Daudio1,driver=3Dpa,timer-period=3D50,in.mixing-engine=3Don,= in.fixed-settings=3Don,in.voices=3D1,in.buffer-length=3D200,in.frequency=3D= 44100,in.channels=3D2,in.format=3Ds16,out.mixing-engine=3Don,out.fixed-sett= ings=3Don,out.voices=3D2,out.buffer-length=3D200,out.frequency=3D22050,out.= channels=3D4,out.format=3Df32,in.name=3Dfish,out.name=3Dfish,server=3Dacme.= example.org \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/audio-pulseaudio-full.x86_64-latest.arg= s b/tests/qemuxml2argvdata/audio-pulseaudio-full.x86_64-latest.args index 1008e2a4a9..3a753e1b1b 100644 --- a/tests/qemuxml2argvdata/audio-pulseaudio-full.x86_64-latest.args +++ b/tests/qemuxml2argvdata/audio-pulseaudio-full.x86_64-latest.args @@ -26,10 +26,10 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ -blockdev '{"driver":"host_cdrom","filename":"/dev/cdrom","node-name":"lib= virt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":true,"driver":"raw"= ,"file":"libvirt-1-storage"}' \ --device ide-cd,bus=3Dide.1,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-1-0= ,bootindex=3D1 \ +-device '{"driver":"ide-cd","bus":"ide.1","unit":0,"drive":"libvirt-1-form= at","id":"ide0-1-0","bootindex":1}' \ -audiodev id=3Daudio1,driver=3Dpa,in.mixing-engine=3Don,in.fixed-settings= =3Don,in.voices=3D1,in.buffer-length=3D100,in.frequency=3D44100,in.channels= =3D2,in.format=3Ds16,out.mixing-engine=3Don,out.fixed-settings=3Don,out.voi= ces=3D2,out.buffer-length=3D200,out.frequency=3D22050,out.channels=3D4,out.= format=3Df32,in.name=3Dfish,in.stream-name=3Dfood,in.latency=3D100,out.name= =3Dfish,out.stream-name=3Dfood,out.latency=3D200,server=3Dacme.example.org \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/audio-pulseaudio-minimal.x86_64-latest.= args b/tests/qemuxml2argvdata/audio-pulseaudio-minimal.x86_64-latest.args index 9a34f78c00..1919e51148 100644 --- a/tests/qemuxml2argvdata/audio-pulseaudio-minimal.x86_64-latest.args +++ b/tests/qemuxml2argvdata/audio-pulseaudio-minimal.x86_64-latest.args @@ -26,10 +26,10 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ -blockdev '{"driver":"host_cdrom","filename":"/dev/cdrom","node-name":"lib= virt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":true,"driver":"raw"= ,"file":"libvirt-1-storage"}' \ --device ide-cd,bus=3Dide.1,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-1-0= ,bootindex=3D1 \ +-device '{"driver":"ide-cd","bus":"ide.1","unit":0,"drive":"libvirt-1-form= at","id":"ide0-1-0","bootindex":1}' \ -audiodev id=3Daudio1,driver=3Dpa \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/audio-sdl-best.x86_64-latest.args b/tes= ts/qemuxml2argvdata/audio-sdl-best.x86_64-latest.args index 4c8d46598a..fdadf1451e 100644 --- a/tests/qemuxml2argvdata/audio-sdl-best.x86_64-latest.args +++ b/tests/qemuxml2argvdata/audio-sdl-best.x86_64-latest.args @@ -27,10 +27,10 @@ SDL_AUDIODRIVER=3Dpulseaudio \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ -blockdev '{"driver":"host_cdrom","filename":"/dev/cdrom","node-name":"lib= virt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":true,"driver":"raw"= ,"file":"libvirt-1-storage"}' \ --device ide-cd,bus=3Dide.1,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-1-0= ,bootindex=3D1 \ +-device '{"driver":"ide-cd","bus":"ide.1","unit":0,"drive":"libvirt-1-form= at","id":"ide0-1-0","bootindex":1}' \ -audiodev id=3Daudio1,driver=3Dsdl,timer-period=3D50,in.mixing-engine=3Don= ,in.fixed-settings=3Don,in.voices=3D1,in.frequency=3D44100,in.channels=3D2,= in.format=3Ds16,out.mixing-engine=3Don,out.fixed-settings=3Don,out.voices= =3D2,out.buffer-length=3D200,out.frequency=3D22050,out.channels=3D4,out.for= mat=3Df32 \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/audio-sdl-full.x86_64-latest.args b/tes= ts/qemuxml2argvdata/audio-sdl-full.x86_64-latest.args index f635127bfa..ee14fb9ad6 100644 --- a/tests/qemuxml2argvdata/audio-sdl-full.x86_64-latest.args +++ b/tests/qemuxml2argvdata/audio-sdl-full.x86_64-latest.args @@ -27,10 +27,10 @@ SDL_AUDIODRIVER=3Dpulseaudio \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ -blockdev '{"driver":"host_cdrom","filename":"/dev/cdrom","node-name":"lib= virt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":true,"driver":"raw"= ,"file":"libvirt-1-storage"}' \ --device ide-cd,bus=3Dide.1,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-1-0= ,bootindex=3D1 \ +-device '{"driver":"ide-cd","bus":"ide.1","unit":0,"drive":"libvirt-1-form= at","id":"ide0-1-0","bootindex":1}' \ -audiodev id=3Daudio1,driver=3Dsdl,in.mixing-engine=3Don,in.fixed-settings= =3Don,in.voices=3D1,in.buffer-length=3D100,in.frequency=3D44100,in.channels= =3D2,in.format=3Ds16,out.mixing-engine=3Don,out.fixed-settings=3Don,out.voi= ces=3D2,out.buffer-length=3D200,out.frequency=3D22050,out.channels=3D4,out.= format=3Df32,in.buffer-count=3D40,out.buffer-count=3D50 \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/audio-sdl-minimal.x86_64-latest.args b/= tests/qemuxml2argvdata/audio-sdl-minimal.x86_64-latest.args index 0bae72d407..2582248400 100644 --- a/tests/qemuxml2argvdata/audio-sdl-minimal.x86_64-latest.args +++ b/tests/qemuxml2argvdata/audio-sdl-minimal.x86_64-latest.args @@ -26,10 +26,10 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ -blockdev '{"driver":"host_cdrom","filename":"/dev/cdrom","node-name":"lib= virt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":true,"driver":"raw"= ,"file":"libvirt-1-storage"}' \ --device ide-cd,bus=3Dide.1,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-1-0= ,bootindex=3D1 \ +-device '{"driver":"ide-cd","bus":"ide.1","unit":0,"drive":"libvirt-1-form= at","id":"ide0-1-0","bootindex":1}' \ -audiodev id=3Daudio1,driver=3Dsdl \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/audio-spice-best.x86_64-latest.args b/t= ests/qemuxml2argvdata/audio-spice-best.x86_64-latest.args index 4b1d4a2ece..76a655c645 100644 --- a/tests/qemuxml2argvdata/audio-spice-best.x86_64-latest.args +++ b/tests/qemuxml2argvdata/audio-spice-best.x86_64-latest.args @@ -26,10 +26,10 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ -blockdev '{"driver":"host_cdrom","filename":"/dev/cdrom","node-name":"lib= virt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":true,"driver":"raw"= ,"file":"libvirt-1-storage"}' \ --device ide-cd,bus=3Dide.1,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-1-0= ,bootindex=3D1 \ +-device '{"driver":"ide-cd","bus":"ide.1","unit":0,"drive":"libvirt-1-form= at","id":"ide0-1-0","bootindex":1}' \ -audiodev id=3Daudio1,driver=3Dspice,timer-period=3D50,in.mixing-engine=3D= on,in.fixed-settings=3Don,in.voices=3D1,in.frequency=3D44100,in.channels=3D= 2,in.format=3Ds16,out.mixing-engine=3Don,out.fixed-settings=3Don,out.voices= =3D2,out.frequency=3D22050,out.channels=3D4,out.format=3Df32 \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/audio-spice-full.x86_64-latest.args b/t= ests/qemuxml2argvdata/audio-spice-full.x86_64-latest.args index 13447036fb..e961ad0fc9 100644 --- a/tests/qemuxml2argvdata/audio-spice-full.x86_64-latest.args +++ b/tests/qemuxml2argvdata/audio-spice-full.x86_64-latest.args @@ -26,10 +26,10 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ -blockdev '{"driver":"host_cdrom","filename":"/dev/cdrom","node-name":"lib= virt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":true,"driver":"raw"= ,"file":"libvirt-1-storage"}' \ --device ide-cd,bus=3Dide.1,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-1-0= ,bootindex=3D1 \ +-device '{"driver":"ide-cd","bus":"ide.1","unit":0,"drive":"libvirt-1-form= at","id":"ide0-1-0","bootindex":1}' \ -audiodev id=3Daudio1,driver=3Dspice,in.mixing-engine=3Don,in.fixed-settin= gs=3Don,in.voices=3D1,in.buffer-length=3D100,in.frequency=3D44100,in.channe= ls=3D2,in.format=3Ds16,out.mixing-engine=3Don,out.fixed-settings=3Don,out.v= oices=3D2,out.buffer-length=3D200,out.frequency=3D22050,out.channels=3D4,ou= t.format=3Df32 \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/audio-spice-minimal.x86_64-latest.args = b/tests/qemuxml2argvdata/audio-spice-minimal.x86_64-latest.args index dd73e11023..615297edd6 100644 --- a/tests/qemuxml2argvdata/audio-spice-minimal.x86_64-latest.args +++ b/tests/qemuxml2argvdata/audio-spice-minimal.x86_64-latest.args @@ -26,10 +26,10 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ -blockdev '{"driver":"host_cdrom","filename":"/dev/cdrom","node-name":"lib= virt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":true,"driver":"raw"= ,"file":"libvirt-1-storage"}' \ --device ide-cd,bus=3Dide.1,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-1-0= ,bootindex=3D1 \ +-device '{"driver":"ide-cd","bus":"ide.1","unit":0,"drive":"libvirt-1-form= at","id":"ide0-1-0","bootindex":1}' \ -audiodev id=3Daudio1,driver=3Dspice \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/blkdeviotune-group-num.x86_64-latest.ar= gs b/tests/qemuxml2argvdata/blkdeviotune-group-num.x86_64-latest.args index 2c508a257a..bf817f8f05 100644 --- a/tests/qemuxml2argvdata/blkdeviotune-group-num.x86_64-latest.args +++ b/tests/qemuxml2argvdata/blkdeviotune-group-num.x86_64-latest.args @@ -26,14 +26,14 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-2-storage","cache":{"direct":true,"no-flush":false},"auto= -read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-2-format","read-only":false,"cache":{"dir= ect":true,"no-flush":false},"driver":"qcow2","file":"libvirt-2-storage"}' \ --device ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-2-format,id=3Dide0-0-0= ,bootindex=3D1,write-cache=3Don \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-2-form= at","id":"ide0-0-0","bootindex":1,"write-cache":"on"}' \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest2","no= de-name":"libvirt-1-storage","cache":{"direct":true,"no-flush":false},"auto= -read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"cache":{"dir= ect":true,"no-flush":false},"driver":"qcow2","file":"libvirt-1-storage"}' \ --device ide-hd,bus=3Dide.0,unit=3D1,drive=3Dlibvirt-1-format,id=3Dide0-0-1= ,write-cache=3Don \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":1,"drive":"libvirt-1-form= at","id":"ide0-0-1","write-cache":"on"}' \ -audiodev id=3Daudio1,driver=3Dnone \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x3 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x3"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/blkdeviotune-max-length.x86_64-latest.a= rgs b/tests/qemuxml2argvdata/blkdeviotune-max-length.x86_64-latest.args index 2c508a257a..bf817f8f05 100644 --- a/tests/qemuxml2argvdata/blkdeviotune-max-length.x86_64-latest.args +++ b/tests/qemuxml2argvdata/blkdeviotune-max-length.x86_64-latest.args @@ -26,14 +26,14 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-2-storage","cache":{"direct":true,"no-flush":false},"auto= -read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-2-format","read-only":false,"cache":{"dir= ect":true,"no-flush":false},"driver":"qcow2","file":"libvirt-2-storage"}' \ --device ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-2-format,id=3Dide0-0-0= ,bootindex=3D1,write-cache=3Don \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-2-form= at","id":"ide0-0-0","bootindex":1,"write-cache":"on"}' \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest2","no= de-name":"libvirt-1-storage","cache":{"direct":true,"no-flush":false},"auto= -read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"cache":{"dir= ect":true,"no-flush":false},"driver":"qcow2","file":"libvirt-1-storage"}' \ --device ide-hd,bus=3Dide.0,unit=3D1,drive=3Dlibvirt-1-format,id=3Dide0-0-1= ,write-cache=3Don \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":1,"drive":"libvirt-1-form= at","id":"ide0-0-1","write-cache":"on"}' \ -audiodev id=3Daudio1,driver=3Dnone \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x3 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x3"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/blkdeviotune-max.x86_64-latest.args b/t= ests/qemuxml2argvdata/blkdeviotune-max.x86_64-latest.args index 2c508a257a..bf817f8f05 100644 --- a/tests/qemuxml2argvdata/blkdeviotune-max.x86_64-latest.args +++ b/tests/qemuxml2argvdata/blkdeviotune-max.x86_64-latest.args @@ -26,14 +26,14 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-2-storage","cache":{"direct":true,"no-flush":false},"auto= -read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-2-format","read-only":false,"cache":{"dir= ect":true,"no-flush":false},"driver":"qcow2","file":"libvirt-2-storage"}' \ --device ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-2-format,id=3Dide0-0-0= ,bootindex=3D1,write-cache=3Don \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-2-form= at","id":"ide0-0-0","bootindex":1,"write-cache":"on"}' \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest2","no= de-name":"libvirt-1-storage","cache":{"direct":true,"no-flush":false},"auto= -read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"cache":{"dir= ect":true,"no-flush":false},"driver":"qcow2","file":"libvirt-1-storage"}' \ --device ide-hd,bus=3Dide.0,unit=3D1,drive=3Dlibvirt-1-format,id=3Dide0-0-1= ,write-cache=3Don \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":1,"drive":"libvirt-1-form= at","id":"ide0-0-1","write-cache":"on"}' \ -audiodev id=3Daudio1,driver=3Dnone \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x3 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x3"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/channel-unix-guestfwd.x86_64-latest.arg= s b/tests/qemuxml2argvdata/channel-unix-guestfwd.x86_64-latest.args index 5405419ef5..6a9e00a4a3 100644 --- a/tests/qemuxml2argvdata/channel-unix-guestfwd.x86_64-latest.args +++ b/tests/qemuxml2argvdata/channel-unix-guestfwd.x86_64-latest.args @@ -26,12 +26,12 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ +-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 \ -chardev socket,id=3Dcharchannel1,path=3D/tmp/guestfwd-connect.socket \ -netdev user,guestfwd=3Dtcp:10.0.2.1:4601-chardev:charchannel1,id=3Dchanne= l1 \ -audiodev id=3Daudio1,driver=3Dnone \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/console-virtio-unix.x86_64-latest.args = b/tests/qemuxml2argvdata/console-virtio-unix.x86_64-latest.args index 8fbbebc175..6f5e7d0690 100644 --- a/tests/qemuxml2argvdata/console-virtio-unix.x86_64-latest.args +++ b/tests/qemuxml2argvdata/console-virtio-unix.x86_64-latest.args @@ -26,13 +26,13 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ --device virtio-serial-pci,id=3Dvirtio-serial0,bus=3Dpci.0,addr=3D0x2 \ +-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":"0x2"}' \ -chardev socket,id=3Dcharconsole0,fd=3D1729,server=3Don,wait=3Doff \ --device virtconsole,chardev=3Dcharconsole0,id=3Dconsole0 \ +-device '{"driver":"virtconsole","chardev":"charconsole0","id":"console0"}= ' \ -chardev socket,id=3Dcharconsole1,path=3D/tmp/connect.socket \ --device virtconsole,chardev=3Dcharconsole1,id=3Dconsole1 \ +-device '{"driver":"virtconsole","chardev":"charconsole1","id":"console1"}= ' \ -audiodev id=3Daudio1,driver=3Dnone \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x3 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x3"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/controller-virtio-scsi.x86_64-latest.ar= gs b/tests/qemuxml2argvdata/controller-virtio-scsi.x86_64-latest.args index 0a38fbcc38..5a277bccbe 100644 --- a/tests/qemuxml2argvdata/controller-virtio-scsi.x86_64-latest.args +++ b/tests/qemuxml2argvdata/controller-virtio-scsi.x86_64-latest.args @@ -26,28 +26,28 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ --device virtio-scsi-pci,id=3Dscsi0,bus=3Dpci.0,addr=3D0x2 \ --device virtio-scsi-pci,id=3Dscsi1,num_queues=3D8,bus=3Dpci.0,addr=3D0x3 \ --device virtio-scsi-pci,id=3Dscsi2,cmd_per_lun=3D50,bus=3Dpci.0,addr=3D0x4= \ --device virtio-scsi-pci,id=3Dscsi3,max_sectors=3D512,bus=3Dpci.0,addr=3D0x= 5 \ --device virtio-scsi-pci,id=3Dscsi4,ioeventfd=3Don,bus=3Dpci.0,addr=3D0x6 \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ +-device '{"driver":"virtio-scsi-pci","id":"scsi0","bus":"pci.0","addr":"0x= 2"}' \ +-device '{"driver":"virtio-scsi-pci","id":"scsi1","num_queues":8,"bus":"pc= i.0","addr":"0x3"}' \ +-device '{"driver":"virtio-scsi-pci","id":"scsi2","cmd_per_lun":50,"bus":"= pci.0","addr":"0x4"}' \ +-device '{"driver":"virtio-scsi-pci","id":"scsi3","max_sectors":512,"bus":= "pci.0","addr":"0x5"}' \ +-device '{"driver":"virtio-scsi-pci","id":"scsi4","ioeventfd":true,"bus":"= pci.0","addr":"0x6"}' \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-5-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-5-format","read-only":false,"driver":"raw= ","file":"libvirt-5-storage"}' \ --device scsi-hd,bus=3Dscsi0.0,channel=3D0,scsi-id=3D0,lun=3D0,device_id=3D= drive-scsi0-0-0-0,drive=3Dlibvirt-5-format,id=3Dscsi0-0-0-0,bootindex=3D1 \ +-device '{"driver":"scsi-hd","bus":"scsi0.0","channel":0,"scsi-id":0,"lun"= :0,"device_id":"drive-scsi0-0-0-0","drive":"libvirt-5-format","id":"scsi0-0= -0-0","bootindex":1}' \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest2","no= de-name":"libvirt-4-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-4-format","read-only":false,"driver":"raw= ","file":"libvirt-4-storage"}' \ --device scsi-hd,bus=3Dscsi1.0,channel=3D0,scsi-id=3D0,lun=3D0,device_id=3D= drive-scsi1-0-0-0,drive=3Dlibvirt-4-format,id=3Dscsi1-0-0-0 \ +-device '{"driver":"scsi-hd","bus":"scsi1.0","channel":0,"scsi-id":0,"lun"= :0,"device_id":"drive-scsi1-0-0-0","drive":"libvirt-4-format","id":"scsi1-0= -0-0"}' \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest3","no= de-name":"libvirt-3-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-3-format","read-only":false,"driver":"raw= ","file":"libvirt-3-storage"}' \ --device scsi-hd,bus=3Dscsi2.0,channel=3D0,scsi-id=3D0,lun=3D0,device_id=3D= drive-scsi2-0-0-0,drive=3Dlibvirt-3-format,id=3Dscsi2-0-0-0 \ +-device '{"driver":"scsi-hd","bus":"scsi2.0","channel":0,"scsi-id":0,"lun"= :0,"device_id":"drive-scsi2-0-0-0","drive":"libvirt-3-format","id":"scsi2-0= -0-0"}' \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest4","no= de-name":"libvirt-2-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-2-format","read-only":false,"driver":"raw= ","file":"libvirt-2-storage"}' \ --device scsi-hd,bus=3Dscsi3.0,channel=3D0,scsi-id=3D0,lun=3D0,device_id=3D= drive-scsi3-0-0-0,drive=3Dlibvirt-2-format,id=3Dscsi3-0-0-0 \ +-device '{"driver":"scsi-hd","bus":"scsi3.0","channel":0,"scsi-id":0,"lun"= :0,"device_id":"drive-scsi3-0-0-0","drive":"libvirt-2-format","id":"scsi3-0= -0-0"}' \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest5","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 scsi-hd,bus=3Dscsi4.0,channel=3D0,scsi-id=3D0,lun=3D0,device_id=3D= drive-scsi4-0-0-0,drive=3Dlibvirt-1-format,id=3Dscsi4-0-0-0 \ +-device '{"driver":"scsi-hd","bus":"scsi4.0","channel":0,"scsi-id":0,"lun"= :0,"device_id":"drive-scsi4-0-0-0","drive":"libvirt-1-format","id":"scsi4-0= -0-0"}' \ -audiodev id=3Daudio1,driver=3Dnone \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x7 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x7"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/cpu-Icelake-Server-pconfig.x86_64-lates= t.args b/tests/qemuxml2argvdata/cpu-Icelake-Server-pconfig.x86_64-latest.ar= gs index a92dc2f41e..27b5c2c2d0 100644 --- a/tests/qemuxml2argvdata/cpu-Icelake-Server-pconfig.x86_64-latest.args +++ b/tests/qemuxml2argvdata/cpu-Icelake-Server-pconfig.x86_64-latest.args @@ -26,8 +26,8 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-test/.config \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ -audiodev id=3Daudio1,driver=3Dnone \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/cpu-host-model.x86_64-latest.args b/tes= ts/qemuxml2argvdata/cpu-host-model.x86_64-latest.args index ee31f01bf7..95b5e4a50b 100644 --- a/tests/qemuxml2argvdata/cpu-host-model.x86_64-latest.args +++ b/tests/qemuxml2argvdata/cpu-host-model.x86_64-latest.args @@ -26,11 +26,11 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device pcie-root-port,port=3D8,chassis=3D1,id=3Dpci.1,bus=3Dpcie.0,multif= unction=3Don,addr=3D0x1 \ --device pcie-root-port,port=3D9,chassis=3D2,id=3Dpci.2,bus=3Dpcie.0,addr= =3D0x1.0x1 \ --device pcie-root-port,port=3D10,chassis=3D3,id=3Dpci.3,bus=3Dpcie.0,addr= =3D0x1.0x2 \ --device qemu-xhci,id=3Dusb,bus=3Dpci.1,addr=3D0x0 \ +-device '{"driver":"pcie-root-port","port":8,"chassis":1,"id":"pci.1","bus= ":"pcie.0","multifunction":true,"addr":"0x1"}' \ +-device '{"driver":"pcie-root-port","port":9,"chassis":2,"id":"pci.2","bus= ":"pcie.0","addr":"0x1.0x1"}' \ +-device '{"driver":"pcie-root-port","port":10,"chassis":3,"id":"pci.3","bu= s":"pcie.0","addr":"0x1.0x2"}' \ +-device '{"driver":"qemu-xhci","id":"usb","bus":"pci.1","addr":"0x0"}' \ -audiodev id=3Daudio1,driver=3Dnone \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.2,addr=3D0x0 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.2","add= r":"0x0"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/cpu-translation.x86_64-latest.args b/te= sts/qemuxml2argvdata/cpu-translation.x86_64-latest.args index bb6b5c9986..c24d8ec201 100644 --- a/tests/qemuxml2argvdata/cpu-translation.x86_64-latest.args +++ b/tests/qemuxml2argvdata/cpu-translation.x86_64-latest.args @@ -26,8 +26,8 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ -audiodev id=3Daudio1,driver=3Dnone \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/cputune-cpuset-big-id.x86_64-latest.arg= s b/tests/qemuxml2argvdata/cputune-cpuset-big-id.x86_64-latest.args index 7ae87f6616..ad189c76fa 100644 --- a/tests/qemuxml2argvdata/cputune-cpuset-big-id.x86_64-latest.args +++ b/tests/qemuxml2argvdata/cputune-cpuset-big-id.x86_64-latest.args @@ -26,11 +26,11 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ -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 ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-0-0= ,bootindex=3D1 \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ -audiodev id=3Daudio1,driver=3Dnone \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/devices-acpi-index.x86_64-latest.args b= /tests/qemuxml2argvdata/devices-acpi-index.x86_64-latest.args index a17130c080..9fecc94299 100644 --- a/tests/qemuxml2argvdata/devices-acpi-index.x86_64-latest.args +++ b/tests/qemuxml2argvdata/devices-acpi-index.x86_64-latest.args @@ -25,21 +25,21 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-fdr-br/.config \ -rtc base=3Dutc \ -no-shutdown \ -boot strict=3Don \ --device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/test.img",= "node-name":"libvirt-2-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-2-format","read-only":false,"driver":"raw= ","file":"libvirt-2-storage"}' \ --device virtio-blk-pci,bus=3Dpci.0,addr=3D0x3,acpi-index=3D1,drive=3Dlibvi= rt-2-format,id=3Dvirtio-disk0,bootindex=3D1 \ +-device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x3","acpi-index= ":1,"drive":"libvirt-2-format","id":"virtio-disk0","bootindex":1}' \ -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 virtio-blk-pci,bus=3Dpci.0,addr=3D0x4,acpi-index=3D42,drive=3Dlibv= irt-1-format,id=3Dvirtio-disk1 \ +-device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x4","acpi-index= ":42,"drive":"libvirt-1-format","id":"virtio-disk1"}' \ -netdev user,id=3Dhostnet0 \ --device virtio-net-pci,netdev=3Dhostnet0,id=3Dnet0,mac=3D00:11:22:33:44:55= ,bus=3Dpci.0,addr=3D0x5,acpi-index=3D100 \ +-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 \ --device virtio-net-pci,netdev=3Dhostnet1,id=3Dnet1,mac=3D00:11:22:33:44:55= ,bus=3Dpci.0,addr=3D0x7,acpi-index=3D200 \ +-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 \ --device virtio-net-pci,netdev=3Dhostnet2,id=3Dnet2,mac=3D00:11:22:33:44:55= ,bus=3Dpci.0,addr=3D0x8,acpi-index=3D300 \ +-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=3Daudio1,driver=3Dnone \ --device cirrus-vga,id=3Dvideo0,bus=3Dpci.0,addr=3D0x2,acpi-index=3D1729 \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x6 \ +-device '{"driver":"cirrus-vga","id":"video0","bus":"pci.0","addr":"0x2","= acpi-index":1729}' \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x6"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/disk-aio-io_uring.x86_64-latest.args b/= tests/qemuxml2argvdata/disk-aio-io_uring.x86_64-latest.args index 199cc0cad4..8c6943bc93 100644 --- a/tests/qemuxml2argvdata/disk-aio-io_uring.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-aio-io_uring.x86_64-latest.args @@ -26,11 +26,11 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","ai= o":"io_uring","node-name":"libvirt-1-storage","auto-read-only":true,"discar= d":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"qco= w2","file":"libvirt-1-storage"}' \ --device virtio-blk-pci,bus=3Dpci.0,addr=3D0x9,drive=3Dlibvirt-1-format,id= =3Dvirtio-disk0,bootindex=3D1 \ +-device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x9","drive":"li= bvirt-1-format","id":"virtio-disk0","bootindex":1}' \ -audiodev id=3Daudio1,driver=3Dnone \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/disk-aio.x86_64-latest.args b/tests/qem= uxml2argvdata/disk-aio.x86_64-latest.args index 1c3084ce95..3d291c49f9 100644 --- a/tests/qemuxml2argvdata/disk-aio.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-aio.x86_64-latest.args @@ -26,14 +26,14 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","ai= o":"native","node-name":"libvirt-2-storage","cache":{"direct":true,"no-flus= h":false},"auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-2-format","read-only":false,"cache":{"dir= ect":true,"no-flush":false},"driver":"qcow2","file":"libvirt-2-storage"}' \ --device ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-2-format,id=3Dide0-0-0= ,bootindex=3D1,write-cache=3Don \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-2-form= at","id":"ide0-0-0","bootindex":1,"write-cache":"on"}' \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest2","ai= o":"threads","node-name":"libvirt-1-storage","auto-read-only":true,"discard= ":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":true,"driver":"raw"= ,"file":"libvirt-1-storage"}' \ --device ide-cd,bus=3Dide.1,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-1-0= \ +-device '{"driver":"ide-cd","bus":"ide.1","unit":0,"drive":"libvirt-1-form= at","id":"ide0-1-0"}' \ -audiodev id=3Daudio1,driver=3Dnone \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/disk-backing-chains-noindex.x86_64-late= st.args b/tests/qemuxml2argvdata/disk-backing-chains-noindex.x86_64-latest.= args index 33785a29d5..a71b7b6e97 100644 --- a/tests/qemuxml2argvdata/disk-backing-chains-noindex.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-backing-chains-noindex.x86_64-latest.args @@ -26,12 +26,12 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ -blockdev '{"driver":"file","filename":"/tmp/missing-backing-store.qcow","= node-name":"libvirt-25-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-25-format","read-only":true,"driver":"qco= w2","file":"libvirt-25-storage"}' \ -blockdev '{"driver":"gluster","volume":"Volume2","path":"Image","server":= [{"type":"unix","path":"/path/to/sock"}],"debug":4,"node-name":"libvirt-24-= storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-24-format","read-only":false,"driver":"qc= ow2","file":"libvirt-24-storage","backing":"libvirt-25-format"}' \ --device virtio-blk-pci,bus=3Dpci.0,addr=3D0x2,drive=3Dlibvirt-24-format,id= =3Dvirtio-disk0,bootindex=3D1 \ +-device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x2","drive":"li= bvirt-24-format","id":"virtio-disk0","bootindex":1}' \ -blockdev '{"driver":"file","filename":"/tmp/Fedora-17-x86_64-Live-KDE.iso= ","node-name":"libvirt-23-storage","auto-read-only":true,"discard":"unmap"}= ' \ -blockdev '{"node-name":"libvirt-23-format","read-only":true,"driver":"raw= ","file":"libvirt-23-storage"}' \ -blockdev '{"driver":"file","filename":"/tmp/image5.qcow","node-name":"lib= virt-22-storage","auto-read-only":true,"discard":"unmap"}' \ @@ -46,19 +46,19 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -blockdev '{"node-name":"libvirt-18-format","read-only":true,"driver":"qco= w2","file":"libvirt-18-storage","backing":"libvirt-19-format"}' \ -blockdev '{"driver":"nbd","server":{"type":"unix","path":"/var/run/nbdsoc= k"},"export":"bar","node-name":"libvirt-17-storage","auto-read-only":true,"= discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-17-format","read-only":false,"driver":"qc= ow2","file":"libvirt-17-storage","backing":"libvirt-18-format"}' \ --device virtio-blk-pci,bus=3Dpci.0,addr=3D0x3,drive=3Dlibvirt-17-format,id= =3Dvirtio-disk1 \ +-device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x3","drive":"li= bvirt-17-format","id":"virtio-disk1"}' \ -blockdev '{"driver":"gluster","volume":"Volume1","path":"Image","server":= [{"type":"inet","host":"example.org","port":"6000"}],"debug":4,"node-name":= "libvirt-16-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-16-format","read-only":false,"driver":"ra= w","file":"libvirt-16-storage"}' \ --device virtio-blk-pci,bus=3Dpci.0,addr=3D0x4,drive=3Dlibvirt-16-format,id= =3Dvirtio-disk2 \ +-device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x4","drive":"li= bvirt-16-format","id":"virtio-disk2"}' \ -blockdev '{"driver":"file","filename":"/tmp/image.qcow","node-name":"libv= irt-15-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-15-format","read-only":true,"driver":"qco= w2","file":"libvirt-15-storage","backing":null}' \ -object '{"qom-type":"secret","id":"libvirt-14-storage-auth-secret0","data= ":"9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1","keyid= ":"masterKey0","iv":"AAECAwQFBgcICQoLDA0ODw=3D=3D","format":"base64"}' \ -blockdev '{"driver":"rbd","pool":"pool","image":"image","server":[{"host"= :"mon1.example.org","port":"6321"},{"host":"mon2.example.org","port":"6322"= },{"host":"mon3.example.org","port":"6322"}],"user":"myname","auth-client-r= equired":["cephx","none"],"key-secret":"libvirt-14-storage-auth-secret0","n= ode-name":"libvirt-14-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-14-format","read-only":false,"driver":"qc= ow2","file":"libvirt-14-storage","backing":"libvirt-15-format"}' \ --device virtio-blk-pci,bus=3Dpci.0,addr=3D0x5,drive=3Dlibvirt-14-format,id= =3Dvirtio-disk3 \ +-device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x5","drive":"li= bvirt-14-format","id":"virtio-disk3"}' \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest11","n= ode-name":"libvirt-13-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-13-format","read-only":false,"driver":"qc= ow2","file":"libvirt-13-storage"}' \ --device virtio-blk-pci,bus=3Dpci.0,addr=3D0x6,drive=3Dlibvirt-13-format,id= =3Dvirtio-disk4 \ +-device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x6","drive":"li= bvirt-13-format","id":"virtio-disk4"}' \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/rhel7.qcow= 2","node-name":"libvirt-12-storage","auto-read-only":true,"discard":"unmap"= }' \ -blockdev '{"node-name":"libvirt-12-format","read-only":true,"driver":"qco= w2","file":"libvirt-12-storage","backing":null}' \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/rhel7.1483= 536402","node-name":"libvirt-11-storage","auto-read-only":true,"discard":"u= nmap"}' \ @@ -83,8 +83,8 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -blockdev '{"node-name":"libvirt-2-format","read-only":true,"driver":"qcow= 2","file":"libvirt-2-storage","backing":"libvirt-3-format"}' \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/rhel7.1484= 071880","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"un= map"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"qco= w2","file":"libvirt-1-storage","backing":"libvirt-2-format"}' \ --device virtio-blk-pci,bus=3Dpci.0,addr=3D0x7,drive=3Dlibvirt-1-format,id= =3Dvirtio-disk5 \ +-device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x7","drive":"li= bvirt-1-format","id":"virtio-disk5"}' \ -audiodev id=3Daudio1,driver=3Dnone \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x8 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x8"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/disk-blockio.x86_64-latest.args b/tests= /qemuxml2argvdata/disk-blockio.x86_64-latest.args index aae77afd82..20c34e12a8 100644 --- a/tests/qemuxml2argvdata/disk-blockio.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-blockio.x86_64-latest.args @@ -26,14 +26,14 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-2-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-2-format","read-only":true,"driver":"raw"= ,"file":"libvirt-2-storage"}' \ --device ide-cd,bus=3Dide.0,unit=3D1,drive=3Dlibvirt-2-format,id=3Dide0-0-1= \ +-device '{"driver":"ide-cd","bus":"ide.0","unit":1,"drive":"libvirt-2-form= at","id":"ide0-0-1"}' \ -blockdev '{"driver":"file","filename":"/tmp/idedisk.img","node-name":"lib= virt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ --device ide-hd,bus=3Dide.0,unit=3D2,drive=3Dlibvirt-1-format,id=3Dide0-0-2= ,bootindex=3D1,logical_block_size=3D512,physical_block_size=3D512 \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":2,"drive":"libvirt-1-form= at","id":"ide0-0-2","bootindex":1,"logical_block_size":512,"physical_block_= size":512}' \ -audiodev id=3Daudio1,driver=3Dnone \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/disk-boot-cdrom.x86_64-latest.args b/te= sts/qemuxml2argvdata/disk-boot-cdrom.x86_64-latest.args index 64238ed75f..ec23a0be13 100644 --- a/tests/qemuxml2argvdata/disk-boot-cdrom.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-boot-cdrom.x86_64-latest.args @@ -26,13 +26,13 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-2-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-2-format","read-only":false,"driver":"raw= ","file":"libvirt-2-storage"}' \ --device ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-2-format,id=3Dide0-0-0= \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-2-form= at","id":"ide0-0-0"}' \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest2","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":true,"driver":"raw"= ,"file":"libvirt-1-storage"}' \ --device ide-cd,bus=3Dide.1,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-1-0= ,bootindex=3D1 \ +-device '{"driver":"ide-cd","bus":"ide.1","unit":0,"drive":"libvirt-1-form= at","id":"ide0-1-0","bootindex":1}' \ -audiodev id=3Daudio1,driver=3Dnone \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/disk-boot-disk.x86_64-latest.args b/tes= ts/qemuxml2argvdata/disk-boot-disk.x86_64-latest.args index f5f2740023..07f43e5762 100644 --- a/tests/qemuxml2argvdata/disk-boot-disk.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-boot-disk.x86_64-latest.args @@ -26,13 +26,13 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-2-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-2-format","read-only":false,"driver":"raw= ","file":"libvirt-2-storage"}' \ --device ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-2-format,id=3Dide0-0-0= ,bootindex=3D1 \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-2-form= at","id":"ide0-0-0","bootindex":1}' \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest2","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":true,"driver":"raw"= ,"file":"libvirt-1-storage"}' \ --device ide-cd,bus=3Dide.1,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-1-0= \ +-device '{"driver":"ide-cd","bus":"ide.1","unit":0,"drive":"libvirt-1-form= at","id":"ide0-1-0"}' \ -audiodev id=3Daudio1,driver=3Dnone \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/disk-cache.x86_64-latest.args b/tests/q= emuxml2argvdata/disk-cache.x86_64-latest.args index 7c78e04f77..59c4f7932a 100644 --- a/tests/qemuxml2argvdata/disk-cache.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-cache.x86_64-latest.args @@ -26,23 +26,23 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ --device lsi,id=3Dscsi0,bus=3Dpci.0,addr=3D0x2 \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ +-device '{"driver":"lsi","id":"scsi0","bus":"pci.0","addr":"0x2"}' \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-5-storage","cache":{"direct":false,"no-flush":false},"aut= o-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-5-format","read-only":false,"cache":{"dir= ect":false,"no-flush":false},"driver":"qcow2","file":"libvirt-5-storage"}' \ --device ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-5-format,id=3Dide0-0-0= ,bootindex=3D1,write-cache=3Don \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-5-form= at","id":"ide0-0-0","bootindex":1,"write-cache":"on"}' \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-4-storage","cache":{"direct":false,"no-flush":true},"auto= -read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-4-format","read-only":false,"cache":{"dir= ect":false,"no-flush":true},"driver":"qcow2","file":"libvirt-4-storage"}' \ --device ide-hd,bus=3Dide.0,unit=3D1,drive=3Dlibvirt-4-format,id=3Dide0-0-1= ,write-cache=3Don \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":1,"drive":"libvirt-4-form= at","id":"ide0-0-1","write-cache":"on"}' \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-3-storage","cache":{"direct":true,"no-flush":false},"auto= -read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-3-format","read-only":false,"cache":{"dir= ect":true,"no-flush":false},"driver":"qcow2","file":"libvirt-3-storage"}' \ --device scsi-hd,bus=3Dscsi0.0,scsi-id=3D0,device_id=3Ddrive-scsi0-0-0,driv= e=3Dlibvirt-3-format,id=3Dscsi0-0-0,write-cache=3Don \ +-device '{"driver":"scsi-hd","bus":"scsi0.0","scsi-id":0,"device_id":"driv= e-scsi0-0-0","drive":"libvirt-3-format","id":"scsi0-0-0","write-cache":"on"= }' \ -blockdev '{"driver":"host_device","filename":"/dev/disk/by-path/ip-192.16= 8.44.1:3260-iscsi-iqn.2011-02.lan.hdserver:hydrar-desktop.win7vm-lun-0","no= de-name":"libvirt-2-storage","cache":{"direct":false,"no-flush":false},"aut= o-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-2-format","read-only":false,"cache":{"dir= ect":false,"no-flush":false},"driver":"qcow2","file":"libvirt-2-storage"}' \ --device virtio-blk-pci,bus=3Dpci.0,addr=3D0x3,drive=3Dlibvirt-2-format,id= =3Dvirtio-disk0,write-cache=3Doff \ +-device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x3","drive":"li= bvirt-2-format","id":"virtio-disk0","write-cache":"off"}' \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","cache":{"direct":true,"no-flush":false},"auto= -read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"cache":{"dir= ect":true,"no-flush":false},"driver":"qcow2","file":"libvirt-1-storage"}' \ --device usb-storage,bus=3Dusb.0,port=3D1,drive=3Dlibvirt-1-format,id=3Dusb= -disk1,removable=3Doff,write-cache=3Doff \ +-device '{"driver":"usb-storage","bus":"usb.0","port":"1","drive":"libvirt= -1-format","id":"usb-disk1","removable":false,"write-cache":"off"}' \ -audiodev id=3Daudio1,driver=3Dnone \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/disk-cdrom-bus-other.x86_64-latest.args= b/tests/qemuxml2argvdata/disk-cdrom-bus-other.x86_64-latest.args index 2167332ac9..f14011e68d 100644 --- a/tests/qemuxml2argvdata/disk-cdrom-bus-other.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-cdrom-bus-other.x86_64-latest.args @@ -26,11 +26,11 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ -blockdev '{"driver":"file","filename":"/root/boot.iso","node-name":"libvi= rt-2-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-2-format","read-only":true,"driver":"raw"= ,"file":"libvirt-2-storage"}' \ --device usb-storage,bus=3Dusb.0,port=3D1,drive=3Dlibvirt-2-format,id=3Dusb= -disk0,removable=3Doff \ --device usb-storage,bus=3Dusb.0,port=3D2,id=3Dusb-disk1,removable=3Doff \ +-device '{"driver":"usb-storage","bus":"usb.0","port":"1","drive":"libvirt= -2-format","id":"usb-disk0","removable":false}' \ +-device '{"driver":"usb-storage","bus":"usb.0","port":"2","id":"usb-disk1"= ,"removable":false}' \ -audiodev id=3Daudio1,driver=3Dnone \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/disk-cdrom-empty-network-invalid.x86_64= -latest.args b/tests/qemuxml2argvdata/disk-cdrom-empty-network-invalid.x86_= 64-latest.args index 9457414a09..f488cdf5f3 100644 --- a/tests/qemuxml2argvdata/disk-cdrom-empty-network-invalid.x86_64-latest= .args +++ b/tests/qemuxml2argvdata/disk-cdrom-empty-network-invalid.x86_64-latest= .args @@ -26,8 +26,8 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ --device ide-cd,bus=3Dide.1,unit=3D1,id=3Dide0-1-1 \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ +-device '{"driver":"ide-cd","bus":"ide.1","unit":1,"id":"ide0-1-1"}' \ -audiodev id=3Daudio1,driver=3Dnone \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/disk-cdrom-network.x86_64-latest.args b= /tests/qemuxml2argvdata/disk-cdrom-network.x86_64-latest.args index 5c81dacb77..d898d6d648 100644 --- a/tests/qemuxml2argvdata/disk-cdrom-network.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-cdrom-network.x86_64-latest.args @@ -25,17 +25,17 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -rtc base=3Dutc \ -no-shutdown \ -boot strict=3Don \ --device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ -blockdev '{"driver":"ftp","url":"ftp://host.name:21/url/path/file.iso","n= ode-name":"libvirt-3-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-3-format","read-only":true,"driver":"raw"= ,"file":"libvirt-3-storage"}' \ --device ide-cd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-3-format,id=3Dide0-0-0= ,bootindex=3D1 \ +-device '{"driver":"ide-cd","bus":"ide.0","unit":0,"drive":"libvirt-3-form= at","id":"ide0-0-0","bootindex":1}' \ -blockdev '{"driver":"ftps","url":"ftps://host.name:990/url/path/file.iso"= ,"node-name":"libvirt-2-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-2-format","read-only":true,"driver":"raw"= ,"file":"libvirt-2-storage"}' \ --device ide-cd,bus=3Dide.0,unit=3D1,drive=3Dlibvirt-2-format,id=3Dide0-0-1= \ +-device '{"driver":"ide-cd","bus":"ide.0","unit":1,"drive":"libvirt-2-form= at","id":"ide0-0-1"}' \ -blockdev '{"driver":"https","url":"https://host.name:443/url/path/file.is= o?test=3Dval","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 ide-cd,bus=3Dide.1,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-1-0= \ +-device '{"driver":"ide-cd","bus":"ide.1","unit":0,"drive":"libvirt-1-form= at","id":"ide0-1-0"}' \ -audiodev id=3Daudio1,driver=3Dnone \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/disk-cdrom-tray.x86_64-latest.args b/te= sts/qemuxml2argvdata/disk-cdrom-tray.x86_64-latest.args index 4b8016c0cb..a6709016ac 100644 --- a/tests/qemuxml2argvdata/disk-cdrom-tray.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-cdrom-tray.x86_64-latest.args @@ -26,17 +26,17 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-test/.config \ -no-shutdown \ -no-acpi \ -boot menu=3Don,strict=3Don \ --device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/f14.img","= node-name":"libvirt-3-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-3-format","read-only":false,"driver":"qco= w2","file":"libvirt-3-storage"}' \ --device virtio-blk-pci,bus=3Dpci.0,addr=3D0x4,drive=3Dlibvirt-3-format,id= =3Dvirtio-disk0,bootindex=3D2 \ +-device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x4","drive":"li= bvirt-3-format","id":"virtio-disk0","bootindex":2}' \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/Fedora-14-x86_64-= Live-KDE.iso","node-name":"libvirt-2-storage","auto-read-only":true,"discar= d":"unmap"}' \ -blockdev '{"node-name":"libvirt-2-format","read-only":true,"driver":"raw"= ,"file":"libvirt-2-storage"}' \ --device ide-cd,bus=3Dide.1,unit=3D0,drive=3Dlibvirt-2-format,id=3Dide0-1-0= ,bootindex=3D1 \ +-device '{"driver":"ide-cd","bus":"ide.1","unit":0,"drive":"libvirt-2-form= at","id":"ide0-1-0","bootindex":1}' \ -blockdev '{"driver":"file","filename":"/tmp/cdrom.img","node-name":"libvi= rt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":true,"driver":"raw"= ,"file":"libvirt-1-storage"}' \ --device ide-cd,bus=3Dide.1,unit=3D1,drive=3Dlibvirt-1-format,id=3Dide0-1-1= \ +-device '{"driver":"ide-cd","bus":"ide.1","unit":1,"drive":"libvirt-1-form= at","id":"ide0-1-1"}' \ -audiodev id=3Daudio1,driver=3Dnone \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/disk-cdrom.x86_64-latest.args b/tests/q= emuxml2argvdata/disk-cdrom.x86_64-latest.args index 1ece828c51..7352a42059 100644 --- a/tests/qemuxml2argvdata/disk-cdrom.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-cdrom.x86_64-latest.args @@ -26,15 +26,15 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ -blockdev '{"driver":"host_cdrom","filename":"/dev/cdrom","node-name":"lib= virt-4-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-4-format","read-only":true,"driver":"raw"= ,"file":"libvirt-4-storage"}' \ --device ide-cd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-4-format,id=3Dide0-0-0= \ +-device '{"driver":"ide-cd","bus":"ide.0","unit":0,"drive":"libvirt-4-form= at","id":"ide0-0-0"}' \ -blockdev '{"driver":"file","filename":"/root/boot.iso","node-name":"libvi= rt-3-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-3-format","read-only":true,"driver":"raw"= ,"file":"libvirt-3-storage"}' \ --device ide-cd,bus=3Dide.0,unit=3D1,drive=3Dlibvirt-3-format,id=3Dide0-0-1= \ --device ide-cd,bus=3Dide.1,unit=3D0,id=3Dide0-1-0,write-cache=3Don \ --device ide-cd,bus=3Dide.1,unit=3D1,id=3Dide0-1-1 \ +-device '{"driver":"ide-cd","bus":"ide.0","unit":1,"drive":"libvirt-3-form= at","id":"ide0-0-1"}' \ +-device '{"driver":"ide-cd","bus":"ide.1","unit":0,"id":"ide0-1-0","write-= cache":"on"}' \ +-device '{"driver":"ide-cd","bus":"ide.1","unit":1,"id":"ide0-1-1"}' \ -audiodev id=3Daudio1,driver=3Dnone \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/disk-copy_on_read.x86_64-latest.args b/= tests/qemuxml2argvdata/disk-copy_on_read.x86_64-latest.args index 690d4f3ea1..12755d9a9b 100644 --- a/tests/qemuxml2argvdata/disk-copy_on_read.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-copy_on_read.x86_64-latest.args @@ -26,18 +26,18 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-test/.config \ -no-shutdown \ -no-acpi \ -boot menu=3Don,strict=3Don \ --device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ --device virtio-serial-pci,id=3Dvirtio-serial0,bus=3Dpci.0,addr=3D0x6 \ +-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"}' \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/f14.img","= node-name":"libvirt-2-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-2-format","read-only":false,"driver":"qco= w2","file":"libvirt-2-storage"}' \ -blockdev '{"driver":"copy-on-read","node-name":"libvirt-CoR-vda","file":"= libvirt-2-format","discard":"unmap"}' \ --device virtio-blk-pci,bus=3Dpci.0,addr=3D0x4,drive=3Dlibvirt-CoR-vda,id= =3Dvirtio-disk0,bootindex=3D2 \ +-device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x4","drive":"li= bvirt-CoR-vda","id":"virtio-disk0","bootindex":2}' \ -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 ide-cd,bus=3Dide.1,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-1-0= ,bootindex=3D1 \ +-device '{"driver":"ide-cd","bus":"ide.1","unit":0,"drive":"libvirt-1-form= at","id":"ide0-1-0","bootindex":1}' \ -netdev user,id=3Dhostnet0 \ --device virtio-net-pci,tx=3Dbh,netdev=3Dhostnet0,id=3Dnet0,mac=3D52:54:00:= e5:48:58,bus=3Dpci.0,addr=3D0x2 \ +-device '{"driver":"virtio-net-pci","tx":"bh","netdev":"hostnet0","id":"ne= t0","mac":"52:54:00:e5:48:58","bus":"pci.0","addr":"0x2"}' \ -audiodev id=3Daudio1,driver=3Dnone \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x3 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x3"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/disk-detect-zeroes.x86_64-latest.args b= /tests/qemuxml2argvdata/disk-detect-zeroes.x86_64-latest.args index 5faaa20754..7f63bd536f 100644 --- a/tests/qemuxml2argvdata/disk-detect-zeroes.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-detect-zeroes.x86_64-latest.args @@ -26,14 +26,14 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-test/.config \ -no-shutdown \ -no-acpi \ -boot menu=3Don,strict=3Don \ --device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/f14.img","= node-name":"libvirt-2-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-2-format","read-only":false,"discard":"un= map","detect-zeroes":"unmap","driver":"qcow2","file":"libvirt-2-storage"}' \ --device virtio-blk-pci,bus=3Dpci.0,addr=3D0x4,drive=3Dlibvirt-2-format,id= =3Dvirtio-disk0,bootindex=3D2 \ +-device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x4","drive":"li= bvirt-2-format","id":"virtio-disk0","bootindex":2}' \ -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,"discard":"ign= ore","detect-zeroes":"on","driver":"raw","file":"libvirt-1-storage"}' \ --device ide-cd,bus=3Dide.1,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-1-0= ,bootindex=3D1 \ +-device '{"driver":"ide-cd","bus":"ide.1","unit":0,"drive":"libvirt-1-form= at","id":"ide0-1-0","bootindex":1}' \ -audiodev id=3Daudio1,driver=3Dnone \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x3 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x3"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/disk-discard.x86_64-latest.args b/tests= /qemuxml2argvdata/disk-discard.x86_64-latest.args index 4b26d68065..0f762b9edd 100644 --- a/tests/qemuxml2argvdata/disk-discard.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-discard.x86_64-latest.args @@ -26,14 +26,14 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-test/.config \ -no-shutdown \ -no-acpi \ -boot menu=3Don,strict=3Don \ --device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/f14.img","= node-name":"libvirt-2-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-2-format","read-only":false,"discard":"un= map","driver":"qcow2","file":"libvirt-2-storage"}' \ --device virtio-blk-pci,bus=3Dpci.0,addr=3D0x4,drive=3Dlibvirt-2-format,id= =3Dvirtio-disk0,bootindex=3D2 \ +-device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x4","drive":"li= bvirt-2-format","id":"virtio-disk0","bootindex":2}' \ -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,"discard":"ign= ore","driver":"raw","file":"libvirt-1-storage"}' \ --device ide-cd,bus=3Dide.1,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-1-0= ,bootindex=3D1 \ +-device '{"driver":"ide-cd","bus":"ide.1","unit":0,"drive":"libvirt-1-form= at","id":"ide0-1-0","bootindex":1}' \ -audiodev id=3Daudio1,driver=3Dnone \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/disk-error-policy.x86_64-latest.args b/= tests/qemuxml2argvdata/disk-error-policy.x86_64-latest.args index b686fe1a27..6fc2250ca5 100644 --- a/tests/qemuxml2argvdata/disk-error-policy.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-error-policy.x86_64-latest.args @@ -26,16 +26,16 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-3-storage","cache":{"direct":true,"no-flush":false},"auto= -read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-3-format","read-only":false,"cache":{"dir= ect":true,"no-flush":false},"driver":"qcow2","file":"libvirt-3-storage"}' \ --device ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-3-format,id=3Dide0-0-0= ,bootindex=3D1,write-cache=3Don,werror=3Dstop,rerror=3Dstop \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-3-form= at","id":"ide0-0-0","bootindex":1,"write-cache":"on","werror":"stop","rerro= r":"stop"}' \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest2","no= de-name":"libvirt-2-storage","cache":{"direct":true,"no-flush":false},"auto= -read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-2-format","read-only":false,"cache":{"dir= ect":true,"no-flush":false},"driver":"qcow2","file":"libvirt-2-storage"}' \ --device ide-hd,bus=3Dide.0,unit=3D1,drive=3Dlibvirt-2-format,id=3Dide0-0-1= ,write-cache=3Don,werror=3Denospc \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":1,"drive":"libvirt-2-form= at","id":"ide0-0-1","write-cache":"on","werror":"enospc"}' \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest3","no= de-name":"libvirt-1-storage","cache":{"direct":true,"no-flush":false},"auto= -read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"cache":{"dir= ect":true,"no-flush":false},"driver":"qcow2","file":"libvirt-1-storage"}' \ --device ide-hd,bus=3Dide.1,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-1-0= ,write-cache=3Don,werror=3Dreport,rerror=3Dignore \ +-device '{"driver":"ide-hd","bus":"ide.1","unit":0,"drive":"libvirt-1-form= at","id":"ide0-1-0","write-cache":"on","werror":"report","rerror":"ignore"}= ' \ -audiodev id=3Daudio1,driver=3Dnone \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/disk-floppy-q35-2_11.x86_64-latest.args= b/tests/qemuxml2argvdata/disk-floppy-q35-2_11.x86_64-latest.args index ca01a34f58..3f99c56a87 100644 --- a/tests/qemuxml2argvdata/disk-floppy-q35-2_11.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-floppy-q35-2_11.x86_64-latest.args @@ -26,16 +26,16 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device pcie-root-port,port=3D8,chassis=3D1,id=3Dpci.1,bus=3Dpcie.0,multif= unction=3Don,addr=3D0x1 \ --device pcie-root-port,port=3D9,chassis=3D2,id=3Dpci.2,bus=3Dpcie.0,addr= =3D0x1.0x1 \ --device qemu-xhci,id=3Dusb,bus=3Dpci.1,addr=3D0x0 \ --device isa-fdc,bootindexA=3D1 \ +-device '{"driver":"pcie-root-port","port":8,"chassis":1,"id":"pci.1","bus= ":"pcie.0","multifunction":true,"addr":"0x1"}' \ +-device '{"driver":"pcie-root-port","port":9,"chassis":2,"id":"pci.2","bus= ":"pcie.0","addr":"0x1.0x1"}' \ +-device '{"driver":"qemu-xhci","id":"usb","bus":"pci.1","addr":"0x0"}' \ +-device '{"driver":"isa-fdc","bootindexA":1}' \ -blockdev '{"driver":"file","filename":"/tmp/firmware.img","node-name":"li= bvirt-2-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-2-format","read-only":false,"driver":"raw= ","file":"libvirt-2-storage"}' \ --device floppy,unit=3D0,drive=3Dlibvirt-2-format,id=3Dfdc0-0-0 \ +-device '{"driver":"floppy","unit":0,"drive":"libvirt-2-format","id":"fdc0= -0-0"}' \ -blockdev '{"driver":"file","filename":"/tmp/data.img","node-name":"libvir= t-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 floppy,unit=3D1,drive=3Dlibvirt-1-format,id=3Dfdc0-0-1 \ +-device '{"driver":"floppy","unit":1,"drive":"libvirt-1-format","id":"fdc0= -0-1"}' \ -audiodev id=3Daudio1,driver=3Dnone \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/disk-floppy-q35-2_9.x86_64-latest.args = b/tests/qemuxml2argvdata/disk-floppy-q35-2_9.x86_64-latest.args index 1bb3851b2a..21a990305b 100644 --- a/tests/qemuxml2argvdata/disk-floppy-q35-2_9.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-floppy-q35-2_9.x86_64-latest.args @@ -26,16 +26,16 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device pcie-root-port,port=3D8,chassis=3D1,id=3Dpci.1,bus=3Dpcie.0,multif= unction=3Don,addr=3D0x1 \ --device pcie-root-port,port=3D9,chassis=3D2,id=3Dpci.2,bus=3Dpcie.0,addr= =3D0x1.0x1 \ --device qemu-xhci,id=3Dusb,bus=3Dpci.1,addr=3D0x0 \ --device isa-fdc,bootindexA=3D1 \ +-device '{"driver":"pcie-root-port","port":8,"chassis":1,"id":"pci.1","bus= ":"pcie.0","multifunction":true,"addr":"0x1"}' \ +-device '{"driver":"pcie-root-port","port":9,"chassis":2,"id":"pci.2","bus= ":"pcie.0","addr":"0x1.0x1"}' \ +-device '{"driver":"qemu-xhci","id":"usb","bus":"pci.1","addr":"0x0"}' \ +-device '{"driver":"isa-fdc","bootindexA":1}' \ -blockdev '{"driver":"file","filename":"/tmp/firmware.img","node-name":"li= bvirt-2-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-2-format","read-only":false,"driver":"raw= ","file":"libvirt-2-storage"}' \ --device floppy,unit=3D0,drive=3Dlibvirt-2-format,id=3Dfdc0-0-0 \ +-device '{"driver":"floppy","unit":0,"drive":"libvirt-2-format","id":"fdc0= -0-0"}' \ -blockdev '{"driver":"file","filename":"/tmp/data.img","node-name":"libvir= t-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 floppy,unit=3D1,drive=3Dlibvirt-1-format,id=3Dfdc0-0-1 \ +-device '{"driver":"floppy","unit":1,"drive":"libvirt-1-format","id":"fdc0= -0-1"}' \ -audiodev id=3Daudio1,driver=3Dnone \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/disk-floppy-tray.x86_64-latest.args b/t= ests/qemuxml2argvdata/disk-floppy-tray.x86_64-latest.args index 17166a1e8b..f1d647e55e 100644 --- a/tests/qemuxml2argvdata/disk-floppy-tray.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-floppy-tray.x86_64-latest.args @@ -26,17 +26,17 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-3-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-3-format","read-only":false,"driver":"raw= ","file":"libvirt-3-storage"}' \ --device ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-3-format,id=3Dide0-0-0= ,bootindex=3D1 \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-3-form= at","id":"ide0-0-0","bootindex":1}' \ -blockdev '{"driver":"host_device","filename":"/dev/fd0","node-name":"libv= irt-2-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-2-format","read-only":false,"driver":"raw= ","file":"libvirt-2-storage"}' \ --device floppy,unit=3D0,drive=3Dlibvirt-2-format,id=3Dfdc0-0-0 \ +-device '{"driver":"floppy","unit":0,"drive":"libvirt-2-format","id":"fdc0= -0-0"}' \ -blockdev '{"driver":"file","filename":"/tmp/firmware.img","node-name":"li= bvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ --device floppy,unit=3D1,drive=3Dlibvirt-1-format,id=3Dfdc0-0-1 \ +-device '{"driver":"floppy","unit":1,"drive":"libvirt-1-format","id":"fdc0= -0-1"}' \ -audiodev id=3Daudio1,driver=3Dnone \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/disk-floppy.x86_64-latest.args b/tests/= qemuxml2argvdata/disk-floppy.x86_64-latest.args index 5e0dea7f1e..3992169f54 100644 --- a/tests/qemuxml2argvdata/disk-floppy.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-floppy.x86_64-latest.args @@ -26,16 +26,16 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-3-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-3-format","read-only":false,"driver":"raw= ","file":"libvirt-3-storage"}' \ --device ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-3-format,id=3Dide0-0-0= ,bootindex=3D1 \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-3-form= at","id":"ide0-0-0","bootindex":1}' \ -blockdev '{"driver":"host_device","filename":"/dev/fd0","node-name":"libv= irt-2-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-2-format","read-only":false,"driver":"raw= ","file":"libvirt-2-storage"}' \ --device floppy,unit=3D0,drive=3Dlibvirt-2-format,id=3Dfdc0-0-0 \ +-device '{"driver":"floppy","unit":0,"drive":"libvirt-2-format","id":"fdc0= -0-0"}' \ -blockdev '{"driver":"file","filename":"/tmp/firmware.img","node-name":"li= bvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ --device floppy,unit=3D1,drive=3Dlibvirt-1-format,id=3Dfdc0-0-1 \ +-device '{"driver":"floppy","unit":1,"drive":"libvirt-1-format","id":"fdc0= -0-1"}' \ -audiodev id=3Daudio1,driver=3Dnone \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/disk-fmt-qcow.x86_64-latest.args b/test= s/qemuxml2argvdata/disk-fmt-qcow.x86_64-latest.args index afdfc94c27..c3b1303031 100644 --- a/tests/qemuxml2argvdata/disk-fmt-qcow.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-fmt-qcow.x86_64-latest.args @@ -26,13 +26,13 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-2-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-2-format","read-only":false,"driver":"qco= w2","file":"libvirt-2-storage"}' \ --device ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-2-format,id=3Dide0-0-0= ,bootindex=3D1 \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-2-form= at","id":"ide0-0-0","bootindex":1}' \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest2","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":true,"driver":"raw"= ,"file":"libvirt-1-storage"}' \ --device ide-cd,bus=3Dide.1,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-1-0= \ +-device '{"driver":"ide-cd","bus":"ide.1","unit":0,"drive":"libvirt-1-form= at","id":"ide0-1-0"}' \ -audiodev id=3Daudio1,driver=3Dnone \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/disk-geometry.x86_64-latest.args b/test= s/qemuxml2argvdata/disk-geometry.x86_64-latest.args index 84ecde34c1..f75bc09249 100644 --- a/tests/qemuxml2argvdata/disk-geometry.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-geometry.x86_64-latest.args @@ -26,11 +26,11 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ -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 ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-0-0= ,bootindex=3D1,cyls=3D16383,heads=3D16,secs=3D63,bios-chs-trans=3Dlba \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1,"cyls":16383,"heads":16,"secs":63,"bios-c= hs-trans":"lba"}' \ -audiodev id=3Daudio1,driver=3Dnone \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/disk-ide-split.x86_64-latest.args b/tes= ts/qemuxml2argvdata/disk-ide-split.x86_64-latest.args index 3f139fd340..0fe9d9e71f 100644 --- a/tests/qemuxml2argvdata/disk-ide-split.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-ide-split.x86_64-latest.args @@ -26,14 +26,14 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-2-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-2-format","read-only":true,"driver":"raw"= ,"file":"libvirt-2-storage"}' \ --device ide-cd,bus=3Dide.0,unit=3D1,drive=3Dlibvirt-2-format,id=3Dide0-0-1= \ +-device '{"driver":"ide-cd","bus":"ide.0","unit":1,"drive":"libvirt-2-form= at","id":"ide0-0-1"}' \ -blockdev '{"driver":"file","filename":"/tmp/idedisk.img","node-name":"lib= virt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ --device ide-hd,bus=3Dide.0,unit=3D2,drive=3Dlibvirt-1-format,id=3Dide0-0-2= ,bootindex=3D1 \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":2,"drive":"libvirt-1-form= at","id":"ide0-0-2","bootindex":1}' \ -audiodev id=3Daudio1,driver=3Dnone \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/disk-ide-wwn.x86_64-latest.args b/tests= /qemuxml2argvdata/disk-ide-wwn.x86_64-latest.args index 8560754c24..82143b4853 100644 --- a/tests/qemuxml2argvdata/disk-ide-wwn.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-ide-wwn.x86_64-latest.args @@ -26,11 +26,11 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ -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 ide-hd,bus=3Dide.0,unit=3D1,drive=3Dlibvirt-1-format,id=3Dide0-0-1= ,bootindex=3D1,wwn=3D5764824127192592813,serial=3DWD-WMAP9A966149 \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":1,"drive":"libvirt-1-form= at","id":"ide0-0-1","bootindex":1,"wwn":5764824127192592813,"serial":"WD-WM= AP9A966149"}' \ -audiodev id=3Daudio1,driver=3Dnone \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/disk-ioeventfd.x86_64-latest.args b/tes= ts/qemuxml2argvdata/disk-ioeventfd.x86_64-latest.args index 136bf314d9..000a361b1c 100644 --- a/tests/qemuxml2argvdata/disk-ioeventfd.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-ioeventfd.x86_64-latest.args @@ -26,17 +26,17 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-test/.config \ -no-shutdown \ -no-acpi \ -boot menu=3Don,strict=3Don \ --device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ --device virtio-serial-pci,id=3Dvirtio-serial0,bus=3Dpci.0,addr=3D0x6 \ +-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"}' \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/f14.img","= node-name":"libvirt-2-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-2-format","read-only":false,"driver":"qco= w2","file":"libvirt-2-storage"}' \ --device virtio-blk-pci,ioeventfd=3Don,bus=3Dpci.0,addr=3D0x4,drive=3Dlibvi= rt-2-format,id=3Dvirtio-disk0,bootindex=3D2 \ +-device '{"driver":"virtio-blk-pci","ioeventfd":true,"bus":"pci.0","addr":= "0x4","drive":"libvirt-2-format","id":"virtio-disk0","bootindex":2}' \ -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 ide-cd,bus=3Dide.1,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-1-0= ,bootindex=3D1 \ +-device '{"driver":"ide-cd","bus":"ide.1","unit":0,"drive":"libvirt-1-form= at","id":"ide0-1-0","bootindex":1}' \ -netdev user,id=3Dhostnet0 \ --device virtio-net-pci,tx=3Dbh,ioeventfd=3Doff,netdev=3Dhostnet0,id=3Dnet0= ,mac=3D52:54:00:e5:48:58,bus=3Dpci.0,addr=3D0x2 \ +-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=3Daudio1,driver=3Dnone \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x3 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x3"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/disk-metadata-cache.x86_64-latest.args = b/tests/qemuxml2argvdata/disk-metadata-cache.x86_64-latest.args index 1c9bd754c7..59201284e6 100644 --- a/tests/qemuxml2argvdata/disk-metadata-cache.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-metadata-cache.x86_64-latest.args @@ -26,16 +26,16 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ -blockdev '{"driver":"file","filename":"/tmp/QEMUGuest1.img","node-name":"= libvirt-3-storage","cache":{"direct":true,"no-flush":false},"auto-read-only= ":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-3-format","read-only":false,"cache":{"dir= ect":true,"no-flush":false},"driver":"qcow2","cache-size":12345,"file":"lib= virt-3-storage"}' \ --device ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-3-format,id=3Dide0-0-0= ,bootindex=3D1,write-cache=3Don \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-3-form= at","id":"ide0-0-0","bootindex":1,"write-cache":"on"}' \ -blockdev '{"driver":"file","filename":"/tmp/backing-store.qcow","node-nam= e":"libvirt-2-storage","cache":{"direct":true,"no-flush":false},"auto-read-= only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-2-format","read-only":true,"cache":{"dire= ct":true,"no-flush":false},"driver":"qcow2","cache-size":1048576,"file":"li= bvirt-2-storage","backing":null}' \ -blockdev '{"driver":"file","filename":"/tmp/QEMUGuest2.img","node-name":"= libvirt-1-storage","cache":{"direct":true,"no-flush":false},"auto-read-only= ":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"cache":{"dir= ect":true,"no-flush":false},"driver":"qcow2","file":"libvirt-1-storage","ba= cking":"libvirt-2-format"}' \ --device ide-hd,bus=3Dide.0,unit=3D1,drive=3Dlibvirt-1-format,id=3Dide0-0-1= ,write-cache=3Don \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":1,"drive":"libvirt-1-form= at","id":"ide0-0-1","write-cache":"on"}' \ -audiodev id=3Daudio1,driver=3Dnone \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/disk-network-gluster.x86_64-latest.args= b/tests/qemuxml2argvdata/disk-network-gluster.x86_64-latest.args index 49552d193c..a54d3e2e38 100644 --- a/tests/qemuxml2argvdata/disk-network-gluster.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-network-gluster.x86_64-latest.args @@ -26,16 +26,16 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ -blockdev '{"driver":"gluster","volume":"Volume1","path":"Image","server":= [{"type":"inet","host":"example.org","port":"6000"}],"debug":4,"node-name":= "libvirt-3-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-3-format","read-only":false,"driver":"raw= ","file":"libvirt-3-storage"}' \ --device virtio-blk-pci,bus=3Dpci.0,addr=3D0x2,drive=3Dlibvirt-3-format,id= =3Dvirtio-disk0,bootindex=3D1 \ +-device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x2","drive":"li= bvirt-3-format","id":"virtio-disk0","bootindex":1}' \ -blockdev '{"driver":"gluster","volume":"Volume2","path":"Image","server":= [{"type":"unix","path":"/path/to/sock"}],"debug":4,"node-name":"libvirt-2-s= torage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-2-format","read-only":false,"driver":"raw= ","file":"libvirt-2-storage"}' \ --device virtio-blk-pci,bus=3Dpci.0,addr=3D0x3,drive=3Dlibvirt-2-format,id= =3Dvirtio-disk1 \ +-device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x3","drive":"li= bvirt-2-format","id":"virtio-disk1"}' \ -blockdev '{"driver":"gluster","volume":"Volume3","path":"Image.qcow2","se= rver":[{"type":"inet","host":"example.org","port":"6000"},{"type":"inet","h= ost":"example.org","port":"24007"},{"type":"unix","path":"/path/to/sock"}],= "debug":4,"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 virtio-blk-pci,bus=3Dpci.0,addr=3D0x4,drive=3Dlibvirt-1-format,id= =3Dvirtio-disk2 \ +-device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x4","drive":"li= bvirt-1-format","id":"virtio-disk2"}' \ -audiodev id=3Daudio1,driver=3Dnone \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/disk-network-http.x86_64-latest.args b/= tests/qemuxml2argvdata/disk-network-http.x86_64-latest.args index 84a7309bae..91b7a2aee1 100644 --- a/tests/qemuxml2argvdata/disk-network-http.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-network-http.x86_64-latest.args @@ -26,21 +26,21 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ -blockdev '{"driver":"http","url":"http://example.org:80/test.img","timeou= t":1234,"node-name":"libvirt-4-storage","auto-read-only":true,"discard":"un= map"}' \ -blockdev '{"node-name":"libvirt-4-format","read-only":false,"driver":"raw= ","file":"libvirt-4-storage"}' \ --device virtio-blk-pci,bus=3Dpci.0,addr=3D0x2,drive=3Dlibvirt-4-format,id= =3Dvirtio-disk0,bootindex=3D1 \ +-device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x2","drive":"li= bvirt-4-format","id":"virtio-disk0","bootindex":1}' \ -blockdev '{"driver":"https","url":"https://example.org:443/test2.img","re= adahead":1024,"node-name":"libvirt-3-storage","auto-read-only":true,"discar= d":"unmap"}' \ -blockdev '{"node-name":"libvirt-3-format","read-only":false,"driver":"raw= ","file":"libvirt-3-storage"}' \ --device virtio-blk-pci,bus=3Dpci.0,addr=3D0x3,drive=3Dlibvirt-3-format,id= =3Dvirtio-disk1 \ +-device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x3","drive":"li= bvirt-3-format","id":"virtio-disk1"}' \ -object '{"qom-type":"secret","id":"libvirt-2-storage-httpcookie-secret0",= "data":"DrPR9NA6GKJb7qi1KbjHaealKEMVtOWUl2h3yvO5lgIh6cyLHemmlg+h9fcgwREA","= keyid":"masterKey0","iv":"AAECAwQFBgcICQoLDA0ODw=3D=3D","format":"base64"}'= \ -blockdev '{"driver":"http","url":"http://example.org:1234/test3.img","coo= kie-secret":"libvirt-2-storage-httpcookie-secret0","node-name":"libvirt-2-s= torage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-2-format","read-only":false,"driver":"raw= ","file":"libvirt-2-storage"}' \ --device virtio-blk-pci,bus=3Dpci.0,addr=3D0x4,drive=3Dlibvirt-2-format,id= =3Dvirtio-disk2 \ +-device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x4","drive":"li= bvirt-2-format","id":"virtio-disk2"}' \ -object '{"qom-type":"secret","id":"libvirt-1-storage-httpcookie-secret0",= "data":"DrPR9NA6GKJb7qi1KbjHaealKEMVtOWUl2h3yvO5lgIh6cyLHemmlg+h9fcgwREA","= keyid":"masterKey0","iv":"AAECAwQFBgcICQoLDA0ODw=3D=3D","format":"base64"}'= \ -blockdev '{"driver":"https","url":"https://example.org:1234/test4.img?par= =3Dval&other=3Dble","sslverify":false,"cookie-secret":"libvirt-1-storage-ht= tpcookie-secret0","node-name":"libvirt-1-storage","auto-read-only":true,"di= scard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ --device virtio-blk-pci,bus=3Dpci.0,addr=3D0x5,drive=3Dlibvirt-1-format,id= =3Dvirtio-disk3 \ +-device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x5","drive":"li= bvirt-1-format","id":"virtio-disk3"}' \ -audiodev id=3Daudio1,driver=3Dnone \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/disk-network-iscsi.x86_64-latest.args b= /tests/qemuxml2argvdata/disk-network-iscsi.x86_64-latest.args index 9fa6c5f259..2aaa3d87b0 100644 --- a/tests/qemuxml2argvdata/disk-network-iscsi.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-network-iscsi.x86_64-latest.args @@ -26,32 +26,32 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ --device virtio-scsi-pci,id=3Dscsi0,bus=3Dpci.0,addr=3D0x2 \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ +-device '{"driver":"virtio-scsi-pci","id":"scsi0","bus":"pci.0","addr":"0x= 2"}' \ -blockdev '{"driver":"iscsi","portal":"example.org:6000","target":"iqn.199= 2-01.com.example","lun":0,"transport":"tcp","node-name":"libvirt-7-storage"= ,"auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-7-format","read-only":false,"driver":"raw= ","file":"libvirt-7-storage"}' \ --device virtio-blk-pci,bus=3Dpci.0,addr=3D0x3,drive=3Dlibvirt-7-format,id= =3Dvirtio-disk0,bootindex=3D1 \ +-device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x3","drive":"li= bvirt-7-format","id":"virtio-disk0","bootindex":1}' \ -blockdev '{"driver":"iscsi","portal":"example.org:6000","target":"iqn.199= 2-01.com.example","lun":1,"transport":"tcp","node-name":"libvirt-6-storage"= ,"auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-6-format","read-only":false,"driver":"raw= ","file":"libvirt-6-storage"}' \ --device virtio-blk-pci,bus=3Dpci.0,addr=3D0x4,drive=3Dlibvirt-6-format,id= =3Dvirtio-disk1 \ +-device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x4","drive":"li= bvirt-6-format","id":"virtio-disk1"}' \ -object '{"qom-type":"secret","id":"libvirt-5-storage-auth-secret0","data"= :"9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1","keyid"= :"masterKey0","iv":"AAECAwQFBgcICQoLDA0ODw=3D=3D","format":"base64"}' \ -blockdev '{"driver":"iscsi","portal":"example.org:6000","target":"iqn.199= 2-01.com.example:storage","lun":1,"transport":"tcp","user":"myname","passwo= rd-secret":"libvirt-5-storage-auth-secret0","node-name":"libvirt-5-storage"= ,"auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-5-format","read-only":false,"driver":"raw= ","file":"libvirt-5-storage"}' \ --device virtio-blk-pci,bus=3Dpci.0,addr=3D0x5,drive=3Dlibvirt-5-format,id= =3Dvirtio-disk2 \ +-device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x5","drive":"li= bvirt-5-format","id":"virtio-disk2"}' \ -object '{"qom-type":"secret","id":"libvirt-4-storage-auth-secret0","data"= :"9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1","keyid"= :"masterKey0","iv":"AAECAwQFBgcICQoLDA0ODw=3D=3D","format":"base64"}' \ -blockdev '{"driver":"iscsi","portal":"example.org:6000","target":"iqn.199= 2-01.com.example:storage","lun":2,"transport":"tcp","user":"myname","passwo= rd-secret":"libvirt-4-storage-auth-secret0","node-name":"libvirt-4-storage"= ,"auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-4-format","read-only":false,"driver":"raw= ","file":"libvirt-4-storage"}' \ --device virtio-blk-pci,bus=3Dpci.0,addr=3D0x6,drive=3Dlibvirt-4-format,id= =3Dvirtio-disk3 \ +-device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x6","drive":"li= bvirt-4-format","id":"virtio-disk3"}' \ -blockdev '{"driver":"iscsi","portal":"example.org:3260","target":"iqn.199= 2-01.com.example","lun":0,"transport":"tcp","node-name":"libvirt-3-storage"= ,"auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-3-format","read-only":false,"driver":"raw= ","file":"libvirt-3-storage"}' \ --device scsi-block,bus=3Dscsi0.0,channel=3D0,scsi-id=3D0,lun=3D0,drive=3Dl= ibvirt-3-format,id=3Dscsi0-0-0-0 \ +-device '{"driver":"scsi-block","bus":"scsi0.0","channel":0,"scsi-id":0,"l= un":0,"drive":"libvirt-3-format","id":"scsi0-0-0-0"}' \ -blockdev '{"driver":"iscsi","portal":"example.org:3260","target":"iqn.199= 2-01.com.example:server","lun":0,"transport":"tcp","initiator-name":"iqn.19= 92-01.com.example:client","node-name":"libvirt-2-storage","auto-read-only":= true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-2-format","read-only":false,"driver":"raw= ","file":"libvirt-2-storage"}' \ --device scsi-block,bus=3Dscsi0.0,channel=3D0,scsi-id=3D0,lun=3D1,drive=3Dl= ibvirt-2-format,id=3Dscsi0-0-0-1 \ +-device '{"driver":"scsi-block","bus":"scsi0.0","channel":0,"scsi-id":0,"l= un":1,"drive":"libvirt-2-format","id":"scsi0-0-0-1"}' \ -object '{"qom-type":"secret","id":"libvirt-1-storage-auth-secret0","data"= :"9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1","keyid"= :"masterKey0","iv":"AAECAwQFBgcICQoLDA0ODw=3D=3D","format":"base64"}' \ -blockdev '{"driver":"iscsi","portal":"example.org:3260","target":"iqn.199= 2-01.com.example:server","lun":0,"transport":"tcp","user":"myname","passwor= d-secret":"libvirt-1-storage-auth-secret0","initiator-name":"iqn.1992-01.co= m.example:client","node-name":"libvirt-1-storage","auto-read-only":true,"di= scard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ --device scsi-block,bus=3Dscsi0.0,channel=3D0,scsi-id=3D0,lun=3D2,drive=3Dl= ibvirt-1-format,id=3Dscsi0-0-0-2 \ +-device '{"driver":"scsi-block","bus":"scsi0.0","channel":0,"scsi-id":0,"l= un":2,"drive":"libvirt-1-format","id":"scsi0-0-0-2"}' \ -audiodev id=3Daudio1,driver=3Dnone \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/disk-network-nbd.x86_64-latest.args b/t= ests/qemuxml2argvdata/disk-network-nbd.x86_64-latest.args index 565af0e811..f2700ff336 100644 --- a/tests/qemuxml2argvdata/disk-network-nbd.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-network-nbd.x86_64-latest.args @@ -26,22 +26,22 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ -blockdev '{"driver":"nbd","server":{"type":"inet","host":"example.org","p= ort":"6000"},"node-name":"libvirt-5-storage","auto-read-only":true,"discard= ":"unmap"}' \ -blockdev '{"node-name":"libvirt-5-format","read-only":false,"driver":"raw= ","file":"libvirt-5-storage"}' \ --device virtio-blk-pci,bus=3Dpci.0,addr=3D0x2,drive=3Dlibvirt-5-format,id= =3Dvirtio-disk0,bootindex=3D1 \ +-device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x2","drive":"li= bvirt-5-format","id":"virtio-disk0","bootindex":1}' \ -blockdev '{"driver":"nbd","server":{"type":"inet","host":"example.org","p= ort":"6000"},"export":"bar","node-name":"libvirt-4-storage","auto-read-only= ":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-4-format","read-only":false,"driver":"raw= ","file":"libvirt-4-storage"}' \ --device virtio-blk-pci,bus=3Dpci.0,addr=3D0x3,drive=3Dlibvirt-4-format,id= =3Dvirtio-disk1 \ +-device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x3","drive":"li= bvirt-4-format","id":"virtio-disk1"}' \ -blockdev '{"driver":"nbd","server":{"type":"inet","host":"::1","port":"60= 00"},"node-name":"libvirt-3-storage","auto-read-only":true,"discard":"unmap= "}' \ -blockdev '{"node-name":"libvirt-3-format","read-only":false,"driver":"raw= ","file":"libvirt-3-storage"}' \ --device virtio-blk-pci,bus=3Dpci.0,addr=3D0x4,drive=3Dlibvirt-3-format,id= =3Dvirtio-disk2 \ +-device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x4","drive":"li= bvirt-3-format","id":"virtio-disk2"}' \ -blockdev '{"driver":"nbd","server":{"type":"inet","host":"::1","port":"60= 00"},"export":"bar","node-name":"libvirt-2-storage","auto-read-only":true,"= discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-2-format","read-only":false,"driver":"raw= ","file":"libvirt-2-storage"}' \ --device virtio-blk-pci,bus=3Dpci.0,addr=3D0x5,drive=3Dlibvirt-2-format,id= =3Dvirtio-disk3 \ +-device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x5","drive":"li= bvirt-2-format","id":"virtio-disk3"}' \ -blockdev '{"driver":"nbd","server":{"type":"unix","path":"/var/run/nbdsoc= k"},"export":"bar","node-name":"libvirt-1-storage","auto-read-only":true,"d= iscard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ --device virtio-blk-pci,bus=3Dpci.0,addr=3D0x6,drive=3Dlibvirt-1-format,id= =3Dvirtio-disk4 \ +-device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x6","drive":"li= bvirt-1-format","id":"virtio-disk4"}' \ -audiodev id=3Daudio1,driver=3Dnone \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/disk-network-nfs.x86_64-latest.args b/t= ests/qemuxml2argvdata/disk-network-nfs.x86_64-latest.args index 6a48289c06..a2a617b5db 100644 --- a/tests/qemuxml2argvdata/disk-network-nfs.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-network-nfs.x86_64-latest.args @@ -26,15 +26,15 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ -blockdev '{"driver":"nfs","server":{"host":"example.com","type":"inet"},"= path":"/foo/bar/baz","user":6234,"group":12354,"node-name":"libvirt-3-stora= ge","cache":{"direct":true,"no-flush":false},"auto-read-only":true,"discard= ":"unmap"}' \ -blockdev '{"node-name":"libvirt-3-format","read-only":false,"cache":{"dir= ect":true,"no-flush":false},"driver":"raw","file":"libvirt-3-storage"}' \ --device virtio-blk-pci,bus=3Dpci.0,addr=3D0x4,drive=3Dlibvirt-3-format,id= =3Dvirtio-disk0,bootindex=3D1,write-cache=3Don,serial=3Deb90327c-8302-4725-= 9e1b-4e85ed4dc251 \ +-device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x4","drive":"li= bvirt-3-format","id":"virtio-disk0","bootindex":1,"write-cache":"on","seria= l":"eb90327c-8302-4725-9e1b-4e85ed4dc251"}' \ -blockdev '{"driver":"nfs","server":{"host":"example.org","type":"inet"},"= path":"/backing/store/nfs","user":1234,"group":5678,"node-name":"libvirt-2-= storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-2-format","read-only":true,"driver":"qcow= 2","file":"libvirt-2-storage","backing":null}' \ -blockdev '{"driver":"gluster","volume":"Volume2","path":"Image","server":= [{"type":"unix","path":"/path/to/sock"}],"debug":4,"node-name":"libvirt-1-s= torage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"qco= w2","file":"libvirt-1-storage","backing":"libvirt-2-format"}' \ --device virtio-blk-pci,bus=3Dpci.0,addr=3D0x2,drive=3Dlibvirt-1-format,id= =3Dvirtio-disk1 \ +-device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x2","drive":"li= bvirt-1-format","id":"virtio-disk1"}' \ -audiodev id=3Daudio1,driver=3Dnone \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/disk-network-rbd-no-colon.x86_64-latest= .args b/tests/qemuxml2argvdata/disk-network-rbd-no-colon.x86_64-latest.args index 9a35dbcf7f..b39bc64393 100644 --- a/tests/qemuxml2argvdata/disk-network-rbd-no-colon.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-network-rbd-no-colon.x86_64-latest.args @@ -26,14 +26,14 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-2-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-2-format","read-only":false,"driver":"raw= ","file":"libvirt-2-storage"}' \ --device ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-2-format,id=3Dide0-0-0= ,bootindex=3D1 \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-2-form= at","id":"ide0-0-0","bootindex":1}' \ -blockdev '{"driver":"rbd","pool":"poolname","image":"imagename:rbd_cache= =3D1:rbd_cache_size=3D67108864:rbd_cache_max_dirty=3D0","server":[{"host":"= mon1.example.org","port":"6321"},{"host":"mon2.example.org","port":"6322"},= {"host":"mon3.example.org","port":"6322"}],"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 virtio-blk-pci,bus=3Dpci.0,addr=3D0x2,drive=3Dlibvirt-1-format,id= =3Dvirtio-disk0 \ +-device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x2","drive":"li= bvirt-1-format","id":"virtio-disk0"}' \ -audiodev id=3Daudio1,driver=3Dnone \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x3 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x3"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/disk-network-rbd.x86_64-latest.args b/t= ests/qemuxml2argvdata/disk-network-rbd.x86_64-latest.args index 94cf0724eb..2ce7637ae6 100644 --- a/tests/qemuxml2argvdata/disk-network-rbd.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-network-rbd.x86_64-latest.args @@ -26,26 +26,26 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ -blockdev '{"driver":"rbd","pool":"pool","image":"image","server":[{"host"= :"mon1.example.org","port":"6321"},{"host":"mon2.example.org","port":"6322"= },{"host":"mon3.example.org","port":"6322"}],"node-name":"libvirt-6-storage= ","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-6-format","read-only":false,"driver":"raw= ","file":"libvirt-6-storage"}' \ --device virtio-blk-pci,bus=3Dpci.0,addr=3D0x2,drive=3Dlibvirt-6-format,id= =3Dvirtio-disk0,bootindex=3D1 \ +-device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x2","drive":"li= bvirt-6-format","id":"virtio-disk0","bootindex":1}' \ -blockdev '{"driver":"rbd","pool":"pool","image":"image","snapshot":"asdf"= ,"node-name":"libvirt-5-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-5-format","read-only":false,"driver":"raw= ","file":"libvirt-5-storage"}' \ --device virtio-blk-pci,bus=3Dpci.0,addr=3D0x3,drive=3Dlibvirt-5-format,id= =3Dvirtio-disk1 \ +-device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x3","drive":"li= bvirt-5-format","id":"virtio-disk1"}' \ -blockdev '{"driver":"rbd","pool":"pool","image":"image","snapshot":"foo",= "server":[{"host":"mon1.example.org","port":"6321"},{"host":"mon2.example.o= rg","port":"6322"},{"host":"mon3.example.org","port":"6322"}],"node-name":"= libvirt-4-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-4-format","read-only":false,"driver":"raw= ","file":"libvirt-4-storage"}' \ --device virtio-blk-pci,bus=3Dpci.0,addr=3D0x4,drive=3Dlibvirt-4-format,id= =3Dvirtio-disk2 \ +-device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x4","drive":"li= bvirt-4-format","id":"virtio-disk2"}' \ -blockdev '{"driver":"rbd","pool":"pool","image":"image","snapshot":"foo",= "conf":"/blah/test.conf","node-name":"libvirt-3-storage","auto-read-only":t= rue,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-3-format","read-only":false,"driver":"raw= ","file":"libvirt-3-storage"}' \ --device virtio-blk-pci,bus=3Dpci.0,addr=3D0x5,drive=3Dlibvirt-3-format,id= =3Dvirtio-disk3 \ +-device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x5","drive":"li= bvirt-3-format","id":"virtio-disk3"}' \ -object '{"qom-type":"secret","id":"libvirt-2-storage-auth-secret0","data"= :"9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1","keyid"= :"masterKey0","iv":"AAECAwQFBgcICQoLDA0ODw=3D=3D","format":"base64"}' \ -blockdev '{"driver":"rbd","pool":"pool","image":"image","server":[{"host"= :"mon1.example.org","port":"6321"},{"host":"mon2.example.org","port":"6322"= },{"host":"mon3.example.org","port":"6322"}],"user":"myname","auth-client-r= equired":["cephx","none"],"key-secret":"libvirt-2-storage-auth-secret0","no= de-name":"libvirt-2-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-2-format","read-only":false,"driver":"raw= ","file":"libvirt-2-storage"}' \ --device virtio-blk-pci,bus=3Dpci.0,addr=3D0x6,drive=3Dlibvirt-2-format,id= =3Dvirtio-disk4 \ +-device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x6","drive":"li= bvirt-2-format","id":"virtio-disk4"}' \ -blockdev '{"driver":"rbd","pool":"pool","image":"image","server":[{"host"= :"::1","port":"6321"},{"host":"example.org","port":"6789"},{"host":"ffff:12= 34:567:abc::0f","port":"6322"},{"host":"2001:db8::ff00:42:8329","port":"632= 2"}],"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 virtio-blk-pci,bus=3Dpci.0,addr=3D0x7,drive=3Dlibvirt-1-format,id= =3Dvirtio-disk5 \ +-device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x7","drive":"li= bvirt-1-format","id":"virtio-disk5"}' \ -audiodev id=3Daudio1,driver=3Dnone \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/disk-network-source-auth.x86_64-latest.= args b/tests/qemuxml2argvdata/disk-network-source-auth.x86_64-latest.args index 258e255cf7..5241ff3475 100644 --- a/tests/qemuxml2argvdata/disk-network-source-auth.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-network-source-auth.x86_64-latest.args @@ -26,19 +26,19 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ -object '{"qom-type":"secret","id":"libvirt-3-storage-auth-secret0","data"= :"9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1","keyid"= :"masterKey0","iv":"AAECAwQFBgcICQoLDA0ODw=3D=3D","format":"base64"}' \ -blockdev '{"driver":"iscsi","portal":"example.org:6000","target":"iqn.199= 2-01.com.example:storage","lun":1,"transport":"tcp","user":"myname","passwo= rd-secret":"libvirt-3-storage-auth-secret0","node-name":"libvirt-3-storage"= ,"auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-3-format","read-only":false,"driver":"raw= ","file":"libvirt-3-storage"}' \ --device virtio-blk-pci,bus=3Dpci.0,addr=3D0x2,drive=3Dlibvirt-3-format,id= =3Dvirtio-disk0,bootindex=3D1 \ +-device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x2","drive":"li= bvirt-3-format","id":"virtio-disk0","bootindex":1}' \ -object '{"qom-type":"secret","id":"libvirt-2-storage-auth-secret0","data"= :"9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1","keyid"= :"masterKey0","iv":"AAECAwQFBgcICQoLDA0ODw=3D=3D","format":"base64"}' \ -blockdev '{"driver":"rbd","pool":"pool","image":"image","server":[{"host"= :"mon1.example.org","port":"6321"},{"host":"mon2.example.org","port":"6322"= },{"host":"mon3.example.org","port":"6322"}],"user":"myname","auth-client-r= equired":["cephx","none"],"key-secret":"libvirt-2-storage-auth-secret0","no= de-name":"libvirt-2-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-2-format","read-only":false,"driver":"raw= ","file":"libvirt-2-storage"}' \ --device virtio-blk-pci,bus=3Dpci.0,addr=3D0x3,drive=3Dlibvirt-2-format,id= =3Dvirtio-disk1 \ +-device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x3","drive":"li= bvirt-2-format","id":"virtio-disk1"}' \ -object '{"qom-type":"secret","id":"libvirt-1-storage-auth-secret0","data"= :"9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1","keyid"= :"masterKey0","iv":"AAECAwQFBgcICQoLDA0ODw=3D=3D","format":"base64"}' \ -blockdev '{"driver":"rbd","pool":"pool","image":"image2","server":[{"host= ":"mon1.example.org","port":"6321"},{"host":"mon2.example.org","port":"6322= "},{"host":"mon3.example.org","port":"6322"}],"user":"myname","auth-client-= required":["cephx","none"],"key-secret":"libvirt-1-storage-auth-secret0","n= ode-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 virtio-blk-pci,bus=3Dpci.0,addr=3D0x4,drive=3Dlibvirt-1-format,id= =3Dvirtio-disk2 \ +-device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x4","drive":"li= bvirt-1-format","id":"virtio-disk2"}' \ -audiodev id=3Daudio1,driver=3Dnone \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/disk-network-tlsx509-nbd.x86_64-latest.= args b/tests/qemuxml2argvdata/disk-network-tlsx509-nbd.x86_64-latest.args index ba5876babb..ae8e6e10f5 100644 --- a/tests/qemuxml2argvdata/disk-network-tlsx509-nbd.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-network-tlsx509-nbd.x86_64-latest.args @@ -26,12 +26,12 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ -object '{"qom-type":"secret","id":"objlibvirt-1-storage_tls0-secret0","da= ta":"9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1","key= id":"masterKey0","iv":"AAECAwQFBgcICQoLDA0ODw=3D=3D","format":"base64"}' \ -object '{"qom-type":"tls-creds-x509","id":"objlibvirt-1-storage_tls0","di= r":"/etc/pki/libvirt-nbd/dummy,path","endpoint":"client","verify-peer":true= ,"passwordid":"objlibvirt-1-storage_tls0-secret0"}' \ -blockdev '{"driver":"nbd","server":{"type":"inet","host":"example.com","p= ort":"1234"},"tls-creds":"objlibvirt-1-storage_tls0","node-name":"libvirt-1= -storage","cache":{"direct":true,"no-flush":false},"auto-read-only":true,"d= iscard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"cache":{"dir= ect":true,"no-flush":false},"driver":"raw","file":"libvirt-1-storage"}' \ --device virtio-blk-pci,bus=3Dpci.0,addr=3D0x7,drive=3Dlibvirt-1-format,id= =3Dvirtio-disk3,bootindex=3D1,write-cache=3Don \ +-device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x7","drive":"li= bvirt-1-format","id":"virtio-disk3","bootindex":1,"write-cache":"on"}' \ -audiodev id=3Daudio1,driver=3Dnone \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/disk-no-boot.x86_64-latest.args b/tests= /qemuxml2argvdata/disk-no-boot.x86_64-latest.args index 5721d691cb..2094d7e722 100644 --- a/tests/qemuxml2argvdata/disk-no-boot.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-no-boot.x86_64-latest.args @@ -26,17 +26,17 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ -global isa-fdc.bootindexA=3D3 \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-3-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-3-format","read-only":false,"driver":"raw= ","file":"libvirt-3-storage"}' \ --device ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-3-format,id=3Dide0-0-0= ,bootindex=3D2 \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-3-form= at","id":"ide0-0-0","bootindex":2}' \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest2","no= de-name":"libvirt-2-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-2-format","read-only":true,"driver":"raw"= ,"file":"libvirt-2-storage"}' \ --device ide-cd,bus=3Dide.1,unit=3D0,drive=3Dlibvirt-2-format,id=3Dide0-1-0= ,bootindex=3D1 \ +-device '{"driver":"ide-cd","bus":"ide.1","unit":0,"drive":"libvirt-2-form= at","id":"ide0-1-0","bootindex":1}' \ -blockdev '{"driver":"host_device","filename":"/dev/fd0","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 floppy,unit=3D0,drive=3Dlibvirt-1-format,id=3Dfdc0-0-0 \ +-device '{"driver":"floppy","unit":0,"drive":"libvirt-1-format","id":"fdc0= -0-0"}' \ -audiodev id=3Daudio1,driver=3Dnone \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/disk-nvme.x86_64-latest.args b/tests/qe= muxml2argvdata/disk-nvme.x86_64-latest.args index 051d6f82e4..d97994b56e 100644 --- a/tests/qemuxml2argvdata/disk-nvme.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-nvme.x86_64-latest.args @@ -26,21 +26,21 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ --device virtio-scsi-pci,id=3Dscsi0,bus=3Dpci.0,addr=3D0x3 \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ +-device '{"driver":"virtio-scsi-pci","id":"scsi0","bus":"pci.0","addr":"0x= 3"}' \ -blockdev '{"driver":"nvme","device":"0000:01:00.0","namespace":1,"node-na= me":"libvirt-4-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-4-format","read-only":false,"driver":"raw= ","file":"libvirt-4-storage"}' \ --device virtio-blk-pci,bus=3Dpci.0,addr=3D0x4,drive=3Dlibvirt-4-format,id= =3Dvirtio-disk0,bootindex=3D1 \ +-device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x4","drive":"li= bvirt-4-format","id":"virtio-disk0","bootindex":1}' \ -blockdev '{"driver":"nvme","device":"0000:01:00.0","namespace":2,"node-na= me":"libvirt-3-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-3-format","read-only":false,"driver":"raw= ","file":"libvirt-3-storage"}' \ --device virtio-blk-pci,bus=3Dpci.0,addr=3D0x5,drive=3Dlibvirt-3-format,id= =3Dvirtio-disk1 \ +-device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x5","drive":"li= bvirt-3-format","id":"virtio-disk1"}' \ -blockdev '{"driver":"nvme","device":"0000:02:00.0","namespace":1,"node-na= me":"libvirt-2-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-2-format","read-only":false,"driver":"raw= ","file":"libvirt-2-storage"}' \ --device virtio-blk-pci,bus=3Dpci.0,addr=3D0x6,drive=3Dlibvirt-2-format,id= =3Dvirtio-disk2 \ +-device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x6","drive":"li= bvirt-2-format","id":"virtio-disk2"}' \ -object '{"qom-type":"secret","id":"libvirt-1-format-encryption-secret0","= data":"9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1","k= eyid":"masterKey0","iv":"AAECAwQFBgcICQoLDA0ODw=3D=3D","format":"base64"}' \ -blockdev '{"driver":"nvme","device":"0001:02:00.0","namespace":2,"node-na= me":"libvirt-1-storage","cache":{"direct":true,"no-flush":false},"auto-read= -only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"cache":{"dir= ect":true,"no-flush":false},"driver":"qcow2","encrypt":{"format":"luks","ke= y-secret":"libvirt-1-format-encryption-secret0"},"file":"libvirt-1-storage"= }' \ --device virtio-blk-pci,bus=3Dpci.0,addr=3D0x7,drive=3Dlibvirt-1-format,id= =3Dvirtio-disk3,write-cache=3Don \ +-device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x7","drive":"li= bvirt-1-format","id":"virtio-disk3","write-cache":"on"}' \ -audiodev id=3Daudio1,driver=3Dnone \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/disk-order.x86_64-latest.args b/tests/q= emuxml2argvdata/disk-order.x86_64-latest.args index 1138d27ab5..970b25f429 100644 --- a/tests/qemuxml2argvdata/disk-order.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-order.x86_64-latest.args @@ -26,20 +26,20 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-4-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-4-format","read-only":false,"driver":"raw= ","file":"libvirt-4-storage"}' \ --device ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-4-format,id=3Dide0-0-0= ,bootindex=3D1 \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-4-form= at","id":"ide0-0-0","bootindex":1}' \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest2","no= de-name":"libvirt-3-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-3-format","read-only":true,"driver":"raw"= ,"file":"libvirt-3-storage"}' \ --device ide-cd,bus=3Dide.1,unit=3D0,drive=3Dlibvirt-3-format,id=3Dide0-1-0= \ +-device '{"driver":"ide-cd","bus":"ide.1","unit":0,"drive":"libvirt-3-form= at","id":"ide0-1-0"}' \ -blockdev '{"driver":"file","filename":"/tmp/data.img","node-name":"libvir= t-2-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-2-format","read-only":false,"driver":"raw= ","file":"libvirt-2-storage"}' \ --device virtio-blk-pci,bus=3Dpci.0,addr=3D0x2,drive=3Dlibvirt-2-format,id= =3Dvirtio-disk0 \ +-device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x2","drive":"li= bvirt-2-format","id":"virtio-disk0"}' \ -blockdev '{"driver":"file","filename":"/tmp/logs.img","node-name":"libvir= t-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ --device virtio-blk-pci,bus=3Dpci.0,addr=3D0x3,drive=3Dlibvirt-1-format,id= =3Dvirtio-disk1 \ +-device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x3","drive":"li= bvirt-1-format","id":"virtio-disk1"}' \ -audiodev id=3Daudio1,driver=3Dnone \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x4 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x4"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/disk-readonly-disk.x86_64-latest.args b= /tests/qemuxml2argvdata/disk-readonly-disk.x86_64-latest.args index 75c40feefe..5006d5cea2 100644 --- a/tests/qemuxml2argvdata/disk-readonly-disk.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-readonly-disk.x86_64-latest.args @@ -26,14 +26,14 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-2-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-2-format","read-only":false,"driver":"raw= ","file":"libvirt-2-storage"}' \ --device ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-2-format,id=3Dide0-0-0= ,bootindex=3D1 \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-2-form= at","id":"ide0-0-0","bootindex":1}' \ -blockdev '{"driver":"host_device","filename":"/dev/sr0","node-name":"libv= irt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":true,"driver":"raw"= ,"file":"libvirt-1-storage"}' \ --device ide-cd,bus=3Dide.1,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-1-0= \ +-device '{"driver":"ide-cd","bus":"ide.1","unit":0,"drive":"libvirt-1-form= at","id":"ide0-1-0"}' \ -audiodev id=3Daudio1,driver=3Dnone \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/disk-rotation.x86_64-latest.args b/test= s/qemuxml2argvdata/disk-rotation.x86_64-latest.args index 082c478dbe..fe117c43f5 100644 --- a/tests/qemuxml2argvdata/disk-rotation.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-rotation.x86_64-latest.args @@ -26,18 +26,18 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ --device virtio-scsi-pci,id=3Dscsi0,bus=3Dpci.0,addr=3D0x2 \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ +-device '{"driver":"virtio-scsi-pci","id":"scsi0","bus":"pci.0","addr":"0x= 2"}' \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-3-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-3-format","read-only":false,"driver":"raw= ","file":"libvirt-3-storage"}' \ --device scsi-hd,bus=3Dscsi0.0,channel=3D0,scsi-id=3D0,lun=3D0,device_id=3D= drive-scsi0-0-0-0,drive=3Dlibvirt-3-format,id=3Dscsi0-0-0-0,bootindex=3D1,r= otation_rate=3D7200 \ +-device '{"driver":"scsi-hd","bus":"scsi0.0","channel":0,"scsi-id":0,"lun"= :0,"device_id":"drive-scsi0-0-0-0","drive":"libvirt-3-format","id":"scsi0-0= -0-0","bootindex":1,"rotation_rate":7200}' \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest2","no= de-name":"libvirt-2-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-2-format","read-only":false,"driver":"raw= ","file":"libvirt-2-storage"}' \ --device scsi-hd,bus=3Dscsi0.0,channel=3D0,scsi-id=3D0,lun=3D1,device_id=3D= drive-scsi0-0-0-1,drive=3Dlibvirt-2-format,id=3Dscsi0-0-0-1,rotation_rate= =3D1 \ +-device '{"driver":"scsi-hd","bus":"scsi0.0","channel":0,"scsi-id":0,"lun"= :1,"device_id":"drive-scsi0-0-0-1","drive":"libvirt-2-format","id":"scsi0-0= -0-1","rotation_rate":1}' \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest3","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 ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-0-0= ,rotation_rate=3D4500 \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","rotation_rate":4500}' \ -audiodev id=3Daudio1,driver=3Dnone \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x3 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x3"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/disk-sata-device.x86_64-latest.args b/t= ests/qemuxml2argvdata/disk-sata-device.x86_64-latest.args index f1d236e8a5..2ce3938869 100644 --- a/tests/qemuxml2argvdata/disk-sata-device.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-sata-device.x86_64-latest.args @@ -26,12 +26,12 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ --device ahci,id=3Dsata0,bus=3Dpci.0,addr=3D0x2 \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ +-device '{"driver":"ahci","id":"sata0","bus":"pci.0","addr":"0x2"}' \ -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 ide-hd,bus=3Dsata0.0,drive=3Dlibvirt-1-format,id=3Dsata0-0-0,booti= ndex=3D1 \ +-device '{"driver":"ide-hd","bus":"sata0.0","drive":"libvirt-1-format","id= ":"sata0-0-0","bootindex":1}' \ -audiodev id=3Daudio1,driver=3Dnone \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x3 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x3"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/disk-scsi-device-auto.x86_64-latest.arg= s b/tests/qemuxml2argvdata/disk-scsi-device-auto.x86_64-latest.args index 45a09a381d..d6b70b28fc 100644 --- a/tests/qemuxml2argvdata/disk-scsi-device-auto.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-scsi-device-auto.x86_64-latest.args @@ -26,15 +26,15 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ --device lsi,id=3Dscsi0,bus=3Dpci.0,addr=3D0x2 \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ +-device '{"driver":"lsi","id":"scsi0","bus":"pci.0","addr":"0x2"}' \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-2-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-2-format","read-only":false,"driver":"raw= ","file":"libvirt-2-storage"}' \ --device ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-2-format,id=3Dide0-0-0= ,bootindex=3D1 \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-2-form= at","id":"ide0-0-0","bootindex":1}' \ -blockdev '{"driver":"file","filename":"/tmp/scsidisk.img","node-name":"li= bvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ --device scsi-hd,bus=3Dscsi0.0,scsi-id=3D0,device_id=3Ddrive-scsi0-0-0,driv= e=3Dlibvirt-1-format,id=3Dscsi0-0-0 \ +-device '{"driver":"scsi-hd","bus":"scsi0.0","scsi-id":0,"device_id":"driv= e-scsi0-0-0","drive":"libvirt-1-format","id":"scsi0-0-0"}' \ -audiodev id=3Daudio1,driver=3Dnone \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x3 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x3"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/disk-scsi-disk-split.x86_64-latest.args= b/tests/qemuxml2argvdata/disk-scsi-disk-split.x86_64-latest.args index 9682fab58c..1eeebe3497 100644 --- a/tests/qemuxml2argvdata/disk-scsi-disk-split.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-scsi-disk-split.x86_64-latest.args @@ -26,24 +26,24 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ --device virtio-scsi-pci,id=3Dscsi0,bus=3Dpci.0,addr=3D0x2 \ --device lsi,id=3Dscsi1,bus=3Dpci.0,addr=3D0x3 \ --device lsi,id=3Dscsi2,bus=3Dpci.0,addr=3D0x4 \ --device virtio-scsi-pci,id=3Dscsi3,bus=3Dpci.0,addr=3D0x5 \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ +-device '{"driver":"virtio-scsi-pci","id":"scsi0","bus":"pci.0","addr":"0x= 2"}' \ +-device '{"driver":"lsi","id":"scsi1","bus":"pci.0","addr":"0x3"}' \ +-device '{"driver":"lsi","id":"scsi2","bus":"pci.0","addr":"0x4"}' \ +-device '{"driver":"virtio-scsi-pci","id":"scsi3","bus":"pci.0","addr":"0x= 5"}' \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-4-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-4-format","read-only":true,"driver":"raw"= ,"file":"libvirt-4-storage"}' \ --device scsi-cd,bus=3Dscsi0.0,channel=3D0,scsi-id=3D1,lun=3D0,device_id=3D= drive-scsi0-0-1-0,drive=3Dlibvirt-4-format,id=3Dscsi0-0-1-0 \ +-device '{"driver":"scsi-cd","bus":"scsi0.0","channel":0,"scsi-id":1,"lun"= :0,"device_id":"drive-scsi0-0-1-0","drive":"libvirt-4-format","id":"scsi0-0= -1-0"}' \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest2","no= de-name":"libvirt-3-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-3-format","read-only":true,"driver":"raw"= ,"file":"libvirt-3-storage"}' \ --device scsi-cd,bus=3Dscsi0.0,channel=3D0,scsi-id=3D0,lun=3D0,device_id=3D= drive-scsi0-0-0-0,drive=3Dlibvirt-3-format,id=3Dscsi0-0-0-0 \ +-device '{"driver":"scsi-cd","bus":"scsi0.0","channel":0,"scsi-id":0,"lun"= :0,"device_id":"drive-scsi0-0-0-0","drive":"libvirt-3-format","id":"scsi0-0= -0-0"}' \ -blockdev '{"driver":"file","filename":"/tmp/scsidisk.img","node-name":"li= bvirt-2-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-2-format","read-only":false,"driver":"raw= ","file":"libvirt-2-storage"}' \ --device scsi-hd,bus=3Dscsi0.0,channel=3D0,scsi-id=3D0,lun=3D1,device_id=3D= drive-scsi0-0-0-1,drive=3Dlibvirt-2-format,id=3Dscsi0-0-0-1,bootindex=3D1 \ +-device '{"driver":"scsi-hd","bus":"scsi0.0","channel":0,"scsi-id":0,"lun"= :1,"device_id":"drive-scsi0-0-0-1","drive":"libvirt-2-format","id":"scsi0-0= -0-1","bootindex":1}' \ -blockdev '{"driver":"file","filename":"/tmp/scsidisk.img","node-name":"li= bvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ --device scsi-hd,bus=3Dscsi0.0,channel=3D0,scsi-id=3D1,lun=3D1,device_id=3D= drive-scsi0-0-1-1,drive=3Dlibvirt-1-format,id=3Dscsi0-0-1-1 \ +-device '{"driver":"scsi-hd","bus":"scsi0.0","channel":0,"scsi-id":1,"lun"= :1,"device_id":"drive-scsi0-0-1-1","drive":"libvirt-1-format","id":"scsi0-0= -1-1"}' \ -audiodev id=3Daudio1,driver=3Dnone \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x6 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x6"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/disk-scsi-disk-vpd.x86_64-latest.args b= /tests/qemuxml2argvdata/disk-scsi-disk-vpd.x86_64-latest.args index df46dd53e0..b8f8dd8d4d 100644 --- a/tests/qemuxml2argvdata/disk-scsi-disk-vpd.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-scsi-disk-vpd.x86_64-latest.args @@ -26,16 +26,16 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ --device virtio-scsi-pci,id=3Dscsi0,bus=3Dpci.0,addr=3D0x2 \ --device lsi,id=3Dscsi1,bus=3Dpci.0,addr=3D0x3 \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ +-device '{"driver":"virtio-scsi-pci","id":"scsi0","bus":"pci.0","addr":"0x= 2"}' \ +-device '{"driver":"lsi","id":"scsi1","bus":"pci.0","addr":"0x3"}' \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-2-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-2-format","read-only":true,"driver":"raw"= ,"file":"libvirt-2-storage"}' \ --device scsi-cd,bus=3Dscsi0.0,channel=3D0,scsi-id=3D0,lun=3D0,device_id=3D= drive-scsi0-0-0-0,drive=3Dlibvirt-2-format,id=3Dscsi0-0-0-0,vendor=3DSEAGAT= E,product=3DST3146707LC \ +-device '{"driver":"scsi-cd","bus":"scsi0.0","channel":0,"scsi-id":0,"lun"= :0,"device_id":"drive-scsi0-0-0-0","drive":"libvirt-2-format","id":"scsi0-0= -0-0","vendor":"SEAGATE","product":"ST3146707LC"}' \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest2","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":true,"driver":"raw"= ,"file":"libvirt-1-storage"}' \ --device 'scsi-hd,bus=3Dscsi1.0,scsi-id=3D0,device_id=3Ddrive-scsi1-0-0,dri= ve=3Dlibvirt-1-format,id=3Dscsi1-0-0,bootindex=3D1,vendor=3DSEA GATE,produc= t=3DST67 807GD' \ +-device '{"driver":"scsi-hd","bus":"scsi1.0","scsi-id":0,"device_id":"driv= e-scsi1-0-0","drive":"libvirt-1-format","id":"scsi1-0-0","bootindex":1,"ven= dor":"SEA GATE","product":"ST67 807GD"}' \ -audiodev id=3Daudio1,driver=3Dnone \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x4 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x4"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/disk-scsi-disk-wwn.x86_64-latest.args b= /tests/qemuxml2argvdata/disk-scsi-disk-wwn.x86_64-latest.args index 887d2219af..6eaa3fdc37 100644 --- a/tests/qemuxml2argvdata/disk-scsi-disk-wwn.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-scsi-disk-wwn.x86_64-latest.args @@ -26,16 +26,16 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ --device virtio-scsi-pci,id=3Dscsi0,bus=3Dpci.0,addr=3D0x2 \ --device lsi,id=3Dscsi1,bus=3Dpci.0,addr=3D0x3 \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ +-device '{"driver":"virtio-scsi-pci","id":"scsi0","bus":"pci.0","addr":"0x= 2"}' \ +-device '{"driver":"lsi","id":"scsi1","bus":"pci.0","addr":"0x3"}' \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-2-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-2-format","read-only":true,"driver":"raw"= ,"file":"libvirt-2-storage"}' \ --device scsi-cd,bus=3Dscsi0.0,channel=3D0,scsi-id=3D1,lun=3D0,device_id=3D= WD-WMAP9A966149,drive=3Dlibvirt-2-format,id=3Dscsi0-0-1-0,wwn=3D57648241271= 92592812,serial=3DWD-WMAP9A966149 \ +-device '{"driver":"scsi-cd","bus":"scsi0.0","channel":0,"scsi-id":1,"lun"= :0,"device_id":"WD-WMAP9A966149","drive":"libvirt-2-format","id":"scsi0-0-1= -0","wwn":5764824127192592812,"serial":"WD-WMAP9A966149"}' \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest2","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 scsi-hd,bus=3Dscsi0.0,channel=3D0,scsi-id=3D0,lun=3D0,device_id=3D= drive-scsi0-0-0-0,drive=3Dlibvirt-1-format,id=3Dscsi0-0-0-0,bootindex=3D1,w= wn=3D5764824127192592813 \ +-device '{"driver":"scsi-hd","bus":"scsi0.0","channel":0,"scsi-id":0,"lun"= :0,"device_id":"drive-scsi0-0-0-0","drive":"libvirt-1-format","id":"scsi0-0= -0-0","bootindex":1,"wwn":5764824127192592813}' \ -audiodev id=3Daudio1,driver=3Dnone \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x4 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x4"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/disk-scsi-lun-passthrough.x86_64-latest= .args b/tests/qemuxml2argvdata/disk-scsi-lun-passthrough.x86_64-latest.args index 59b7115e6b..7f8332f429 100644 --- a/tests/qemuxml2argvdata/disk-scsi-lun-passthrough.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-scsi-lun-passthrough.x86_64-latest.args @@ -26,16 +26,16 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ --device virtio-scsi-pci,id=3Dscsi0,bus=3Dpci.0,addr=3D0x2 \ --device lsi,id=3Dscsi1,bus=3Dpci.0,addr=3D0x3 \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ +-device '{"driver":"virtio-scsi-pci","id":"scsi0","bus":"pci.0","addr":"0x= 2"}' \ +-device '{"driver":"lsi","id":"scsi1","bus":"pci.0","addr":"0x3"}' \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-2-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-2-format","read-only":false,"driver":"raw= ","file":"libvirt-2-storage"}' \ --device scsi-block,bus=3Dscsi0.0,channel=3D0,scsi-id=3D0,lun=3D0,drive=3Dl= ibvirt-2-format,id=3Dscsi0-0-0-0,bootindex=3D1 \ +-device '{"driver":"scsi-block","bus":"scsi0.0","channel":0,"scsi-id":0,"l= un":0,"drive":"libvirt-2-format","id":"scsi0-0-0-0","bootindex":1}' \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest2","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 scsi-block,bus=3Dscsi0.0,channel=3D0,scsi-id=3D1,lun=3D1,drive=3Dl= ibvirt-1-format,id=3Dscsi0-0-1-1 \ +-device '{"driver":"scsi-block","bus":"scsi0.0","channel":0,"scsi-id":1,"l= un":1,"drive":"libvirt-1-format","id":"scsi0-0-1-1"}' \ -audiodev id=3Daudio1,driver=3Dnone \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x4 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x4"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/disk-scsi.x86_64-latest.args b/tests/qe= muxml2argvdata/disk-scsi.x86_64-latest.args index 79b66da881..c564a1592e 100644 --- a/tests/qemuxml2argvdata/disk-scsi.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-scsi.x86_64-latest.args @@ -26,31 +26,31 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ --device lsi,id=3Dscsi0,bus=3Dpci.0,addr=3D0x2 \ --device megasas,id=3Dscsi1,bus=3Dpci.0,addr=3D0x3 \ --device mptsas1068,id=3Dscsi2,bus=3Dpci.0,addr=3D0x4 \ --device spapr-vscsi,id=3Dscsi3,reg=3D8192 \ --device pvscsi,id=3Dscsi4,bus=3Dpci.0,addr=3D0x5 \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ +-device '{"driver":"lsi","id":"scsi0","bus":"pci.0","addr":"0x2"}' \ +-device '{"driver":"megasas","id":"scsi1","bus":"pci.0","addr":"0x3"}' \ +-device '{"driver":"mptsas1068","id":"scsi2","bus":"pci.0","addr":"0x4"}' \ +-device '{"driver":"spapr-vscsi","id":"scsi3","reg":8192}' \ +-device '{"driver":"pvscsi","id":"scsi4","bus":"pci.0","addr":"0x5"}' \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-6-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-6-format","read-only":false,"driver":"raw= ","file":"libvirt-6-storage"}' \ --device ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-6-format,id=3Dide0-0-0= ,bootindex=3D1 \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-6-form= at","id":"ide0-0-0","bootindex":1}' \ -blockdev '{"driver":"file","filename":"/tmp/scsidisk.img","node-name":"li= bvirt-5-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-5-format","read-only":false,"driver":"raw= ","file":"libvirt-5-storage"}' \ --device scsi-hd,bus=3Dscsi0.0,scsi-id=3D0,device_id=3Ddrive-scsi0-0-0,driv= e=3Dlibvirt-5-format,id=3Dscsi0-0-0 \ +-device '{"driver":"scsi-hd","bus":"scsi0.0","scsi-id":0,"device_id":"driv= e-scsi0-0-0","drive":"libvirt-5-format","id":"scsi0-0-0"}' \ -blockdev '{"driver":"file","filename":"/tmp/scsidisk2.img","node-name":"l= ibvirt-4-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-4-format","read-only":false,"driver":"raw= ","file":"libvirt-4-storage"}' \ --device scsi-hd,bus=3Dscsi1.0,channel=3D0,scsi-id=3D0,lun=3D0,device_id=3D= abcdefghijklmn,drive=3Dlibvirt-4-format,id=3Dscsi1-0-0-0,serial=3Dabcdefghi= jklmn \ +-device '{"driver":"scsi-hd","bus":"scsi1.0","channel":0,"scsi-id":0,"lun"= :0,"device_id":"abcdefghijklmn","drive":"libvirt-4-format","id":"scsi1-0-0-= 0","serial":"abcdefghijklmn"}' \ -blockdev '{"driver":"file","filename":"/tmp/scsidisk3.img","node-name":"l= ibvirt-3-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-3-format","read-only":false,"driver":"raw= ","file":"libvirt-3-storage"}' \ --device scsi-hd,bus=3Dscsi2.0,channel=3D0,scsi-id=3D0,lun=3D0,device_id=3D= drive-scsi2-0-0-0,drive=3Dlibvirt-3-format,id=3Dscsi2-0-0-0,wwn=3D576482412= 7192592812 \ +-device '{"driver":"scsi-hd","bus":"scsi2.0","channel":0,"scsi-id":0,"lun"= :0,"device_id":"drive-scsi2-0-0-0","drive":"libvirt-3-format","id":"scsi2-0= -0-0","wwn":5764824127192592812}' \ -blockdev '{"driver":"file","filename":"/tmp/scsidisk4.img","node-name":"l= ibvirt-2-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-2-format","read-only":false,"driver":"raw= ","file":"libvirt-2-storage"}' \ --device scsi-hd,bus=3Dscsi3.0,channel=3D0,scsi-id=3D0,lun=3D0,device_id=3D= drive-scsi3-0-0-0,drive=3Dlibvirt-2-format,id=3Dscsi3-0-0-0 \ +-device '{"driver":"scsi-hd","bus":"scsi3.0","channel":0,"scsi-id":0,"lun"= :0,"device_id":"drive-scsi3-0-0-0","drive":"libvirt-2-format","id":"scsi3-0= -0-0"}' \ -blockdev '{"driver":"file","filename":"/tmp/scsidisk5.img","node-name":"l= ibvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ --device scsi-hd,bus=3Dscsi4.0,channel=3D0,scsi-id=3D0,lun=3D0,device_id=3D= drive-scsi4-0-0-0,drive=3Dlibvirt-1-format,id=3Dscsi4-0-0-0 \ +-device '{"driver":"scsi-hd","bus":"scsi4.0","channel":0,"scsi-id":0,"lun"= :0,"device_id":"drive-scsi4-0-0-0","drive":"libvirt-1-format","id":"scsi4-0= -0-0"}' \ -audiodev id=3Daudio1,driver=3Dnone \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x6 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x6"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/disk-serial.x86_64-latest.args b/tests/= qemuxml2argvdata/disk-serial.x86_64-latest.args index 4700f0fb3c..e51cc87ffb 100644 --- a/tests/qemuxml2argvdata/disk-serial.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-serial.x86_64-latest.args @@ -26,15 +26,15 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-2-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-2-format","read-only":false,"driver":"raw= ","file":"libvirt-2-storage"}' \ --device 'ide-hd,bus=3Dide.0,unit=3D1,drive=3Dlibvirt-2-format,id=3Dide0-0-= 1,bootindex=3D1,serial=3D\ \ WD-WMAP9A966149' \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":1,"drive":"libvirt-2-form= at","id":"ide0-0-1","bootindex":1,"serial":"\\ \\ WD-WMAP9A966149"}' \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/AllSerialChars"= ,"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 'ide-hd,bus=3Dide.0,unit=3D2,drive=3Dlibvirt-1-format,id=3Dide0-0-= 2,serial=3DabcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-_= \ .+' \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":2,"drive":"libvirt-1-form= at","id":"ide0-0-2","serial":"abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRS= TUVWXYZ0123456789-_\\ .+"}' \ -drive file=3D/some/file,format=3Draw,if=3Dsd,index=3D0 \ -audiodev id=3Daudio1,driver=3Dnone \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/disk-shared.x86_64-latest.args b/tests/= qemuxml2argvdata/disk-shared.x86_64-latest.args index 0395455cae..7780de7730 100644 --- a/tests/qemuxml2argvdata/disk-shared.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-shared.x86_64-latest.args @@ -26,21 +26,21 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ --device virtio-scsi-pci,id=3Dscsi0,bus=3Dpci.0,addr=3D0x2 \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ +-device '{"driver":"virtio-scsi-pci","id":"scsi0","bus":"pci.0","addr":"0x= 2"}' \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-4-storage","cache":{"direct":true,"no-flush":false},"auto= -read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-4-format","read-only":false,"cache":{"dir= ect":true,"no-flush":false},"driver":"raw","file":"libvirt-4-storage"}' \ --device ide-hd,bus=3Dide.0,unit=3D0,share-rw=3Don,drive=3Dlibvirt-4-format= ,id=3Dide0-0-0,bootindex=3D1,write-cache=3Don,serial=3DXYZXYZXYZYXXYZYZYXYZ= Y \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"share-rw":true,"drive"= :"libvirt-4-format","id":"ide0-0-0","bootindex":1,"write-cache":"on","seria= l":"XYZXYZXYZYXXYZYZYXYZY"}' \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest2","no= de-name":"libvirt-3-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-3-format","read-only":true,"driver":"raw"= ,"file":"libvirt-3-storage"}' \ --device ide-cd,bus=3Dide.1,unit=3D0,drive=3Dlibvirt-3-format,id=3Dide0-1-0= \ +-device '{"driver":"ide-cd","bus":"ide.1","unit":0,"drive":"libvirt-3-form= at","id":"ide0-1-0"}' \ -blockdev '{"driver":"host_device","filename":"/dev/scsi","node-name":"lib= virt-2-storage","cache":{"direct":true,"no-flush":false},"auto-read-only":t= rue,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-2-format","read-only":false,"cache":{"dir= ect":true,"no-flush":false},"driver":"raw","file":"libvirt-2-storage"}' \ --device scsi-hd,bus=3Dscsi0.0,channel=3D0,scsi-id=3D0,lun=3D0,device_id=3D= drive-scsi0-0-0-0,share-rw=3Don,drive=3Dlibvirt-2-format,id=3Dscsi0-0-0-0,w= rite-cache=3Don \ +-device '{"driver":"scsi-hd","bus":"scsi0.0","channel":0,"scsi-id":0,"lun"= :0,"device_id":"drive-scsi0-0-0-0","share-rw":true,"drive":"libvirt-2-forma= t","id":"scsi0-0-0-0","write-cache":"on"}' \ -blockdev '{"driver":"host_device","filename":"/dev/virtio","node-name":"l= ibvirt-1-storage","cache":{"direct":true,"no-flush":false},"auto-read-only"= :true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"cache":{"dir= ect":true,"no-flush":false},"driver":"raw","file":"libvirt-1-storage"}' \ --device virtio-blk-pci,bus=3Dpci.0,addr=3D0x3,share-rw=3Don,drive=3Dlibvir= t-1-format,id=3Dvirtio-disk0,write-cache=3Don \ +-device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x3","share-rw":= true,"drive":"libvirt-1-format","id":"virtio-disk0","write-cache":"on"}' \ -audiodev id=3Daudio1,driver=3Dnone \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x4 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x4"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/disk-slices.x86_64-latest.args b/tests/= qemuxml2argvdata/disk-slices.x86_64-latest.args index f41bbeea09..1394b7144f 100644 --- a/tests/qemuxml2argvdata/disk-slices.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-slices.x86_64-latest.args @@ -26,30 +26,30 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/raw.img","= node-name":"libvirt-6-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-6-format","read-only":false,"driver":"raw= ","offset":0,"size":321,"file":"libvirt-6-storage"}' \ --device virtio-blk-pci,bus=3Dpci.0,addr=3D0x2,drive=3Dlibvirt-6-format,id= =3Dvirtio-disk0,bootindex=3D1 \ +-device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x2","drive":"li= bvirt-6-format","id":"virtio-disk0","bootindex":1}' \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/raw.img","= node-name":"libvirt-5-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"driver":"raw","node-name":"libvirt-5-slice-sto","offset":9876= ,"size":123456789,"file":"libvirt-5-storage","auto-read-only":true,"discard= ":"unmap"}' \ -blockdev '{"node-name":"libvirt-5-format","read-only":true,"driver":"qcow= 2","file":"libvirt-5-slice-sto","backing":null}' \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/overlay.qc= ow2","node-name":"libvirt-4-storage","auto-read-only":true,"discard":"unmap= "}' \ -blockdev '{"node-name":"libvirt-4-format","read-only":false,"driver":"qco= w2","file":"libvirt-4-storage","backing":"libvirt-5-format"}' \ --device virtio-blk-pci,bus=3Dpci.0,addr=3D0x3,drive=3Dlibvirt-4-format,id= =3Dvirtio-disk1 \ +-device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x3","drive":"li= bvirt-4-format","id":"virtio-disk1"}' \ -object '{"qom-type":"secret","id":"libvirt-3-format-encryption-secret0","= data":"9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1","k= eyid":"masterKey0","iv":"AAECAwQFBgcICQoLDA0ODw=3D=3D","format":"base64"}' \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/luks.img",= "node-name":"libvirt-3-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"driver":"raw","node-name":"libvirt-3-slice-sto","offset":1234= ,"size":321,"file":"libvirt-3-storage","auto-read-only":true,"discard":"unm= ap"}' \ -blockdev '{"node-name":"libvirt-3-format","read-only":false,"driver":"luk= s","key-secret":"libvirt-3-format-encryption-secret0","file":"libvirt-3-sli= ce-sto"}' \ --device virtio-blk-pci,bus=3Dpci.0,addr=3D0x4,drive=3Dlibvirt-3-format,id= =3Dvirtio-disk2 \ +-device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x4","drive":"li= bvirt-3-format","id":"virtio-disk2"}' \ -blockdev '{"driver":"nvme","device":"0000:02:00.0","namespace":1,"node-na= me":"libvirt-2-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-2-format","read-only":false,"driver":"raw= ","offset":1234,"size":321,"file":"libvirt-2-storage"}' \ --device virtio-blk-pci,bus=3Dpci.0,addr=3D0x6,drive=3Dlibvirt-2-format,id= =3Dvirtio-disk3 \ +-device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x6","drive":"li= bvirt-2-format","id":"virtio-disk3"}' \ -object '{"qom-type":"secret","id":"libvirt-1-format-encryption-secret0","= data":"9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1","k= eyid":"masterKey0","iv":"AAECAwQFBgcICQoLDA0ODw=3D=3D","format":"base64"}' \ -blockdev '{"driver":"nvme","device":"0001:02:00.0","namespace":2,"node-na= me":"libvirt-1-storage","cache":{"direct":true,"no-flush":false},"auto-read= -only":true,"discard":"unmap"}' \ -blockdev '{"driver":"raw","node-name":"libvirt-1-slice-sto","offset":1234= ,"size":321,"file":"libvirt-1-storage","auto-read-only":true,"discard":"unm= ap","cache":{"direct":true,"no-flush":false}}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"cache":{"dir= ect":true,"no-flush":false},"driver":"qcow2","encrypt":{"format":"luks","ke= y-secret":"libvirt-1-format-encryption-secret0"},"file":"libvirt-1-slice-st= o"}' \ --device virtio-blk-pci,bus=3Dpci.0,addr=3D0x7,drive=3Dlibvirt-1-format,id= =3Dvirtio-disk4,write-cache=3Don \ +-device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x7","drive":"li= bvirt-1-format","id":"virtio-disk4","write-cache":"on"}' \ -audiodev id=3Daudio1,driver=3Dnone \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x5 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x5"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/disk-snapshot.x86_64-latest.args b/test= s/qemuxml2argvdata/disk-snapshot.x86_64-latest.args index c400de452f..c674f70c79 100644 --- a/tests/qemuxml2argvdata/disk-snapshot.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-snapshot.x86_64-latest.args @@ -26,17 +26,17 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-3-storage","cache":{"direct":true,"no-flush":false},"auto= -read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-3-format","read-only":false,"cache":{"dir= ect":true,"no-flush":false},"driver":"qcow2","file":"libvirt-3-storage"}' \ --device ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-3-format,id=3Dide0-0-0= ,bootindex=3D1,write-cache=3Don \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-3-form= at","id":"ide0-0-0","bootindex":1,"write-cache":"on"}' \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest3","no= de-name":"libvirt-2-storage","cache":{"direct":true,"no-flush":false},"auto= -read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-2-format","read-only":false,"cache":{"dir= ect":true,"no-flush":false},"driver":"qcow2","file":"libvirt-2-storage"}' \ --device ide-hd,bus=3Dide.2,unit=3D0,drive=3Dlibvirt-2-format,id=3Dide0-2-0= ,write-cache=3Don \ +-device '{"driver":"ide-hd","bus":"ide.2","unit":0,"drive":"libvirt-2-form= at","id":"ide0-2-0","write-cache":"on"}' \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest2","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":true,"driver":"raw"= ,"file":"libvirt-1-storage"}' \ --device ide-cd,bus=3Dide.1,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-1-0= \ +-device '{"driver":"ide-cd","bus":"ide.1","unit":0,"drive":"libvirt-1-form= at","id":"ide0-1-0"}' \ -audiodev id=3Daudio1,driver=3Dnone \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/disk-source-pool-mode.x86_64-latest.arg= s b/tests/qemuxml2argvdata/disk-source-pool-mode.x86_64-latest.args index a72147cb7f..94fd9d25fc 100644 --- a/tests/qemuxml2argvdata/disk-source-pool-mode.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-source-pool-mode.x86_64-latest.args @@ -26,20 +26,20 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ -blockdev '{"driver":"host_device","filename":"/some/block/device/unit:0:0= :1","node-name":"libvirt-4-storage","auto-read-only":true,"discard":"unmap"= }' \ -blockdev '{"node-name":"libvirt-4-format","read-only":true,"driver":"raw"= ,"file":"libvirt-4-storage"}' \ --device ide-cd,bus=3Dide.0,unit=3D1,drive=3Dlibvirt-4-format,id=3Dide0-0-1= \ +-device '{"driver":"ide-cd","bus":"ide.0","unit":1,"drive":"libvirt-4-form= at","id":"ide0-0-1"}' \ -blockdev '{"driver":"iscsi","portal":"iscsi.example.com:3260","target":"d= emo-target","lun":2,"transport":"tcp","node-name":"libvirt-3-storage","auto= -read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-3-format","read-only":true,"driver":"raw"= ,"file":"libvirt-3-storage"}' \ --device ide-cd,bus=3Dide.0,unit=3D2,drive=3Dlibvirt-3-format,id=3Dide0-0-2= \ +-device '{"driver":"ide-cd","bus":"ide.0","unit":2,"drive":"libvirt-3-form= at","id":"ide0-0-2"}' \ -blockdev '{"driver":"file","filename":"/tmp/idedisk.img","node-name":"lib= virt-2-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-2-format","read-only":false,"driver":"raw= ","file":"libvirt-2-storage"}' \ --device ide-hd,bus=3Dide.0,unit=3D3,drive=3Dlibvirt-2-format,id=3Dide0-0-3= ,bootindex=3D1 \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":3,"drive":"libvirt-2-form= at","id":"ide0-0-3","bootindex":1}' \ -blockdev '{"driver":"iscsi","portal":"iscsi.example.com:3260","target":"d= emo-target","lun":3,"transport":"tcp","node-name":"libvirt-1-storage","auto= -read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":true,"driver":"raw"= ,"file":"libvirt-1-storage"}' \ --device ide-cd,bus=3Dide.0,unit=3D4,drive=3Dlibvirt-1-format,id=3Dide0-0-4= \ +-device '{"driver":"ide-cd","bus":"ide.0","unit":4,"drive":"libvirt-1-form= at","id":"ide0-0-4"}' \ -audiodev id=3Daudio1,driver=3Dnone \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/disk-source-pool.x86_64-latest.args b/t= ests/qemuxml2argvdata/disk-source-pool.x86_64-latest.args index a48af2689c..a9498f0682 100644 --- a/tests/qemuxml2argvdata/disk-source-pool.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-source-pool.x86_64-latest.args @@ -26,21 +26,21 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ -blockdev '{"driver":"host_device","filename":"/some/block/device/cdrom","= node-name":"libvirt-5-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-5-format","read-only":true,"driver":"raw"= ,"file":"libvirt-5-storage"}' \ --device ide-cd,bus=3Dide.0,unit=3D1,drive=3Dlibvirt-5-format,id=3Dide0-0-1= \ --device ide-cd,bus=3Dide.1,unit=3D0,id=3Dide0-1-0 \ +-device '{"driver":"ide-cd","bus":"ide.0","unit":1,"drive":"libvirt-5-form= at","id":"ide0-0-1"}' \ +-device '{"driver":"ide-cd","bus":"ide.1","unit":0,"id":"ide0-1-0"}' \ -blockdev '{"driver":"file","filename":"/tmp/idedisk.img","node-name":"lib= virt-3-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-3-format","read-only":false,"driver":"raw= ","file":"libvirt-3-storage"}' \ --device ide-hd,bus=3Dide.0,unit=3D2,drive=3Dlibvirt-3-format,id=3Dide0-0-2= ,bootindex=3D1 \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":2,"drive":"libvirt-3-form= at","id":"ide0-0-2","bootindex":1}' \ -blockdev '{"driver":"vvfat","dir":"/some/dir/device/vol1","floppy":false,= "rw":false,"node-name":"libvirt-2-storage","auto-read-only":true,"discard":= "unmap"}' \ -blockdev '{"node-name":"libvirt-2-format","read-only":true,"driver":"raw"= ,"file":"libvirt-2-storage"}' \ --device virtio-blk-pci,bus=3Dpci.0,addr=3D0x2,drive=3Dlibvirt-2-format,id= =3Dvirtio-disk0 \ +-device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x2","drive":"li= bvirt-2-format","id":"virtio-disk0"}' \ -blockdev '{"driver":"vvfat","dir":"/some/dir/device/vol2","floppy":false,= "rw":false,"node-name":"libvirt-1-storage","auto-read-only":true,"discard":= "unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":true,"driver":"raw"= ,"file":"libvirt-1-storage"}' \ --device virtio-blk-pci,bus=3Dpci.0,addr=3D0x4,drive=3Dlibvirt-1-format,id= =3Dvirtio-disk1 \ +-device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x4","drive":"li= bvirt-1-format","id":"virtio-disk1"}' \ -audiodev id=3Daudio1,driver=3Dnone \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x3 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x3"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/disk-transient.x86_64-latest.args b/tes= ts/qemuxml2argvdata/disk-transient.x86_64-latest.args index 18f16c3489..7cbdc8d0bf 100644 --- a/tests/qemuxml2argvdata/disk-transient.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-transient.x86_64-latest.args @@ -26,11 +26,11 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ -blockdev '{"driver":"file","filename":"/tmp/QEMUGuest1.img","node-name":"= libvirt-1-storage","cache":{"direct":true,"no-flush":false},"auto-read-only= ":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"cache":{"dir= ect":true,"no-flush":false},"driver":"qcow2","file":"libvirt-1-storage"}' \ --device ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-0-0= ,write-cache=3Don \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","write-cache":"on"}' \ -audiodev id=3Daudio1,driver=3Dnone \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x3 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x3"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/disk-usb-device-removable.x86_64-latest= .args b/tests/qemuxml2argvdata/disk-usb-device-removable.x86_64-latest.args index 0b26bb35a0..01016b429e 100644 --- a/tests/qemuxml2argvdata/disk-usb-device-removable.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-usb-device-removable.x86_64-latest.args @@ -26,14 +26,14 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-2-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-2-format","read-only":false,"driver":"raw= ","file":"libvirt-2-storage"}' \ --device ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-2-format,id=3Dide0-0-0= ,bootindex=3D1 \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-2-form= at","id":"ide0-0-0","bootindex":1}' \ -blockdev '{"driver":"file","filename":"/tmp/usbdisk.img","node-name":"lib= virt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ --device usb-storage,bus=3Dusb.0,port=3D1,drive=3Dlibvirt-1-format,id=3Dusb= -disk0,removable=3Don \ +-device '{"driver":"usb-storage","bus":"usb.0","port":"1","drive":"libvirt= -1-format","id":"usb-disk0","removable":true}' \ -audiodev id=3Daudio1,driver=3Dnone \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/disk-usb-device.x86_64-latest.args b/te= sts/qemuxml2argvdata/disk-usb-device.x86_64-latest.args index 673d32e855..0e65a0e429 100644 --- a/tests/qemuxml2argvdata/disk-usb-device.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-usb-device.x86_64-latest.args @@ -26,14 +26,14 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-2-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-2-format","read-only":false,"driver":"raw= ","file":"libvirt-2-storage"}' \ --device ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-2-format,id=3Dide0-0-0= ,bootindex=3D1 \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-2-form= at","id":"ide0-0-0","bootindex":1}' \ -blockdev '{"driver":"file","filename":"/tmp/usbdisk.img","node-name":"lib= virt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ --device usb-storage,bus=3Dusb.0,port=3D1,drive=3Dlibvirt-1-format,id=3Dusb= -disk0,removable=3Doff \ +-device '{"driver":"usb-storage","bus":"usb.0","port":"1","drive":"libvirt= -1-format","id":"usb-disk0","removable":false}' \ -audiodev id=3Daudio1,driver=3Dnone \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/disk-vhostuser.x86_64-latest.args b/tes= ts/qemuxml2argvdata/disk-vhostuser.x86_64-latest.args index 9a956390ee..070d17ac98 100644 --- a/tests/qemuxml2argvdata/disk-vhostuser.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-vhostuser.x86_64-latest.args @@ -26,12 +26,12 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ -chardev socket,id=3Dchr-vu-virtio-disk0,path=3D/tmp/vhost1.sock \ --device vhost-user-blk-pci,bus=3Dpci.0,addr=3D0x2,chardev=3Dchr-vu-virtio-= disk0,id=3Dvirtio-disk0,bootindex=3D1 \ +-device '{"driver":"vhost-user-blk-pci","bus":"pci.0","addr":"0x2","charde= v":"chr-vu-virtio-disk0","id":"virtio-disk0","bootindex":1}' \ -chardev socket,id=3Dchr-vu-virtio-disk1,path=3D/tmp/vhost1.sock,reconnect= =3D10 \ --device vhost-user-blk-pci,iommu_platform=3Don,ats=3Don,packed=3Don,bus=3D= pci.0,addr=3D0x3,chardev=3Dchr-vu-virtio-disk1,id=3Dvirtio-disk1 \ +-device '{"driver":"vhost-user-blk-pci","iommu_platform":true,"ats":true,"= packed":true,"bus":"pci.0","addr":"0x3","chardev":"chr-vu-virtio-disk1","id= ":"virtio-disk1"}' \ -audiodev id=3Daudio1,driver=3Dnone \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x4 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x4"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/disk-virtio-queues.x86_64-latest.args b= /tests/qemuxml2argvdata/disk-virtio-queues.x86_64-latest.args index b1ff6de857..662f6ab858 100644 --- a/tests/qemuxml2argvdata/disk-virtio-queues.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-virtio-queues.x86_64-latest.args @@ -26,16 +26,16 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ -blockdev '{"driver":"file","filename":"/tmp/data.img","node-name":"libvir= t-3-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-3-format","read-only":false,"driver":"raw= ","file":"libvirt-3-storage"}' \ --device virtio-blk-pci,num-queues=3D4,bus=3Dpci.0,addr=3D0x3,drive=3Dlibvi= rt-3-format,id=3Dvirtio-disk0,bootindex=3D1 \ +-device '{"driver":"virtio-blk-pci","num-queues":4,"bus":"pci.0","addr":"0= x3","drive":"libvirt-3-format","id":"virtio-disk0","bootindex":1}' \ -blockdev '{"driver":"file","filename":"/tmp/data1.img","node-name":"libvi= rt-2-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-2-format","read-only":false,"driver":"raw= ","file":"libvirt-2-storage"}' \ --device virtio-blk-pci,queue-size=3D256,bus=3Dpci.0,addr=3D0x4,drive=3Dlib= virt-2-format,id=3Dvirtio-disk1 \ +-device '{"driver":"virtio-blk-pci","queue-size":256,"bus":"pci.0","addr":= "0x4","drive":"libvirt-2-format","id":"virtio-disk1"}' \ -blockdev '{"driver":"file","filename":"/tmp/data2.img","node-name":"libvi= rt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ --device virtio-blk-pci,num-queues=3D4,queue-size=3D256,bus=3Dpci.0,addr=3D= 0x5,drive=3Dlibvirt-1-format,id=3Dvirtio-disk2 \ +-device '{"driver":"virtio-blk-pci","num-queues":4,"queue-size":256,"bus":= "pci.0","addr":"0x5","drive":"libvirt-1-format","id":"virtio-disk2"}' \ -audiodev id=3Daudio1,driver=3Dnone \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/disk-virtio-scsi-reservations.x86_64-la= test.args b/tests/qemuxml2argvdata/disk-virtio-scsi-reservations.x86_64-lat= est.args index 9ff8f8f8fe..a80c207027 100644 --- a/tests/qemuxml2argvdata/disk-virtio-scsi-reservations.x86_64-latest.ar= gs +++ b/tests/qemuxml2argvdata/disk-virtio-scsi-reservations.x86_64-latest.ar= gs @@ -27,16 +27,16 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ --device virtio-scsi-pci,id=3Dscsi0,num_queues=3D8,bus=3Dpci.0,addr=3D0x3 \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ +-device '{"driver":"virtio-scsi-pci","id":"scsi0","num_queues":8,"bus":"pc= i.0","addr":"0x3"}' \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","pr= -manager":"pr-helper0","node-name":"libvirt-2-storage","auto-read-only":tru= e,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-2-format","read-only":false,"driver":"raw= ","file":"libvirt-2-storage"}' \ --device scsi-block,bus=3Dscsi0.0,channel=3D0,scsi-id=3D0,lun=3D0,drive=3Dl= ibvirt-2-format,id=3Dscsi0-0-0-0,bootindex=3D1 \ +-device '{"driver":"scsi-block","bus":"scsi0.0","channel":0,"scsi-id":0,"l= un":0,"drive":"libvirt-2-format","id":"scsi0-0-0-0","bootindex":1}' \ -object '{"qom-type":"pr-manager-helper","id":"pr-helper-libvirt-1-storage= ","path":"/path/to/qemu-pr-helper.sock"}' \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest2","pr= -manager":"pr-helper-libvirt-1-storage","node-name":"libvirt-1-storage","au= to-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ --device scsi-block,bus=3Dscsi0.0,channel=3D0,scsi-id=3D0,lun=3D1,drive=3Dl= ibvirt-1-format,id=3Dscsi0-0-0-1 \ +-device '{"driver":"scsi-block","bus":"scsi0.0","channel":0,"scsi-id":0,"l= un":1,"drive":"libvirt-1-format","id":"scsi0-0-0-1"}' \ -audiodev id=3Daudio1,driver=3Dnone \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x4 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x4"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/disk-virtio.x86_64-latest.args b/tests/= qemuxml2argvdata/disk-virtio.x86_64-latest.args index 0848b46ae7..bb159103f9 100644 --- a/tests/qemuxml2argvdata/disk-virtio.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-virtio.x86_64-latest.args @@ -26,19 +26,19 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-4-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-4-format","read-only":false,"driver":"raw= ","file":"libvirt-4-storage"}' \ --device ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-4-format,id=3Dide0-0-0= ,bootindex=3D1 \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-4-form= at","id":"ide0-0-0","bootindex":1}' \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest2","no= de-name":"libvirt-3-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-3-format","read-only":true,"driver":"raw"= ,"file":"libvirt-3-storage"}' \ --device ide-cd,bus=3Dide.1,unit=3D0,drive=3Dlibvirt-3-format,id=3Dide0-1-0= \ +-device '{"driver":"ide-cd","bus":"ide.1","unit":0,"drive":"libvirt-3-form= at","id":"ide0-1-0"}' \ -blockdev '{"driver":"file","filename":"/tmp/data.img","node-name":"libvir= t-2-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-2-format","read-only":false,"driver":"raw= ","file":"libvirt-2-storage"}' \ --device virtio-blk-pci,bus=3Dpci.0,addr=3D0x2,drive=3Dlibvirt-2-format,id= =3Dvirtio-disk0 \ +-device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x2","drive":"li= bvirt-2-format","id":"virtio-disk0"}' \ -blockdev '{"driver":"file","filename":"/tmp/logs.img","node-name":"libvir= t-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ --device virtio-blk-pci,bus=3Dpci.0,addr=3D0x3,drive=3Dlibvirt-1-format,id= =3Dvirtio-disk1 \ +-device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x3","drive":"li= bvirt-1-format","id":"virtio-disk1"}' \ -audiodev id=3Daudio1,driver=3Dnone \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/encrypted-disk-usage.x86_64-latest.args= b/tests/qemuxml2argvdata/encrypted-disk-usage.x86_64-latest.args index 943b442478..db702af164 100644 --- a/tests/qemuxml2argvdata/encrypted-disk-usage.x86_64-latest.args +++ b/tests/qemuxml2argvdata/encrypted-disk-usage.x86_64-latest.args @@ -26,12 +26,12 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-encryptdisk/.confi= g \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ -object '{"qom-type":"secret","id":"libvirt-1-format-encryption-secret0","= data":"9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1","k= eyid":"masterKey0","iv":"AAECAwQFBgcICQoLDA0ODw=3D=3D","format":"base64"}' \ -blockdev '{"driver":"file","filename":"/storage/guest_disks/encryptdisk",= "node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"qco= w2","encrypt":{"format":"luks","key-secret":"libvirt-1-format-encryption-se= cret0"},"file":"libvirt-1-storage"}' \ --device virtio-blk-pci,bus=3Dpci.0,addr=3D0x4,drive=3Dlibvirt-1-format,id= =3Dvirtio-disk0,bootindex=3D1 \ +-device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x4","drive":"li= bvirt-1-format","id":"virtio-disk0","bootindex":1}' \ -audiodev id=3Daudio1,driver=3Dnone \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x3 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x3"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/encrypted-disk.x86_64-latest.args b/tes= ts/qemuxml2argvdata/encrypted-disk.x86_64-latest.args index 901ea75a00..c5e3184b35 100644 --- a/tests/qemuxml2argvdata/encrypted-disk.x86_64-latest.args +++ b/tests/qemuxml2argvdata/encrypted-disk.x86_64-latest.args @@ -26,12 +26,12 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-encryptdisk/.confi= g \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ -object '{"qom-type":"secret","id":"libvirt-1-format-encryption-secret0","= data":"9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1","k= eyid":"masterKey0","iv":"AAECAwQFBgcICQoLDA0ODw=3D=3D","format":"base64"}' \ -blockdev '{"driver":"file","filename":"/storage/guest_disks/encryptdisk",= "node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"qco= w2","encrypt":{"format":"luks","key-secret":"libvirt-1-format-encryption-se= cret0"},"file":"libvirt-1-storage"}' \ --device virtio-blk-pci,bus=3Dpci.0,addr=3D0x4,drive=3Dlibvirt-1-format,id= =3Dvirtio-disk0,bootindex=3D1 \ +-device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x4","drive":"li= bvirt-1-format","id":"virtio-disk0","bootindex":1}' \ -audiodev id=3Daudio1,driver=3Dnone \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/eoi-disabled.x86_64-latest.args b/tests= /qemuxml2argvdata/eoi-disabled.x86_64-latest.args index 6f67fb3bc6..46df7331f7 100644 --- a/tests/qemuxml2argvdata/eoi-disabled.x86_64-latest.args +++ b/tests/qemuxml2argvdata/eoi-disabled.x86_64-latest.args @@ -25,8 +25,8 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -rtc base=3Dutc \ -no-shutdown \ -boot strict=3Don \ --device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ -audiodev id=3Daudio1,driver=3Dnone \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/eoi-enabled.x86_64-latest.args b/tests/= qemuxml2argvdata/eoi-enabled.x86_64-latest.args index 8ba1627a53..454d745dfa 100644 --- a/tests/qemuxml2argvdata/eoi-enabled.x86_64-latest.args +++ b/tests/qemuxml2argvdata/eoi-enabled.x86_64-latest.args @@ -25,8 +25,8 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -rtc base=3Dutc \ -no-shutdown \ -boot strict=3Don \ --device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ -audiodev id=3Daudio1,driver=3Dnone \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/event_idx.x86_64-latest.args b/tests/qe= muxml2argvdata/event_idx.x86_64-latest.args index f8fb992920..600ab691d2 100644 --- a/tests/qemuxml2argvdata/event_idx.x86_64-latest.args +++ b/tests/qemuxml2argvdata/event_idx.x86_64-latest.args @@ -26,17 +26,17 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-test/.config \ -no-shutdown \ -no-acpi \ -boot menu=3Don,strict=3Don \ --device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ --device virtio-serial-pci,id=3Dvirtio-serial0,bus=3Dpci.0,addr=3D0x6 \ +-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"}' \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/f14.img","= node-name":"libvirt-2-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-2-format","read-only":false,"driver":"qco= w2","file":"libvirt-2-storage"}' \ --device virtio-blk-pci,event_idx=3Don,bus=3Dpci.0,addr=3D0x4,drive=3Dlibvi= rt-2-format,id=3Dvirtio-disk0,bootindex=3D2 \ +-device '{"driver":"virtio-blk-pci","event_idx":true,"bus":"pci.0","addr":= "0x4","drive":"libvirt-2-format","id":"virtio-disk0","bootindex":2}' \ -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 ide-cd,bus=3Dide.1,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-1-0= ,bootindex=3D1 \ +-device '{"driver":"ide-cd","bus":"ide.1","unit":0,"drive":"libvirt-1-form= at","id":"ide0-1-0","bootindex":1}' \ -netdev user,id=3Dhostnet0 \ --device virtio-net-pci,event_idx=3Doff,netdev=3Dhostnet0,id=3Dnet0,mac=3D5= 2:54:00:e5:48:58,bus=3Dpci.0,addr=3D0x2 \ +-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=3Daudio1,driver=3Dnone \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x3 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x3"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/fips-enabled.x86_64-latest.args b/tests= /qemuxml2argvdata/fips-enabled.x86_64-latest.args index 08cf2450af..5cfc5607d2 100644 --- a/tests/qemuxml2argvdata/fips-enabled.x86_64-latest.args +++ b/tests/qemuxml2argvdata/fips-enabled.x86_64-latest.args @@ -26,11 +26,11 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ -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 ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-0-0= ,bootindex=3D1 \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ -audiodev id=3Daudio1,driver=3Dnone \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/floppy-drive-fat.x86_64-latest.args b/t= ests/qemuxml2argvdata/floppy-drive-fat.x86_64-latest.args index e212ba0a41..3c6b524e0e 100644 --- a/tests/qemuxml2argvdata/floppy-drive-fat.x86_64-latest.args +++ b/tests/qemuxml2argvdata/floppy-drive-fat.x86_64-latest.args @@ -26,12 +26,12 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ -global isa-fdc.bootindexA=3D1 \ -blockdev '{"driver":"vvfat","dir":"/var/somefiles","floppy":true,"rw":fal= se,"node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}= ' \ -blockdev '{"node-name":"libvirt-1-format","read-only":true,"driver":"raw"= ,"file":"libvirt-1-storage"}' \ --device floppy,unit=3D0,drive=3Dlibvirt-1-format,id=3Dfdc0-0-0 \ +-device '{"driver":"floppy","unit":0,"drive":"libvirt-1-format","id":"fdc0= -0-0"}' \ -audiodev id=3Daudio1,driver=3Dnone \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/fs9p.x86_64-latest.args b/tests/qemuxml= 2argvdata/fs9p.x86_64-latest.args index b5c66cbf90..ee440aad87 100644 --- a/tests/qemuxml2argvdata/fs9p.x86_64-latest.args +++ b/tests/qemuxml2argvdata/fs9p.x86_64-latest.args @@ -27,11 +27,11 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-acpi \ -boot strict=3Don \ -fsdev local,security_model=3Dpassthrough,id=3Dfsdev-fs0,path=3D/export/to= /guest \ --device virtio-9p-pci,id=3Dfs0,fsdev=3Dfsdev-fs0,mount_tag=3D/import/from/= host,bus=3Dpci.0,addr=3D0x2 \ +-device '{"driver":"virtio-9p-pci","id":"fs0","fsdev":"fsdev-fs0","mount_t= ag":"/import/from/host","bus":"pci.0","addr":"0x2"}' \ -fsdev local,security_model=3Dmapped,writeout=3Dimmediate,id=3Dfsdev-fs1,p= ath=3D/export/to/guest2 \ --device virtio-9p-pci,id=3Dfs1,fsdev=3Dfsdev-fs1,mount_tag=3D/import/from/= host2,bus=3Dpci.0,addr=3D0x3 \ +-device '{"driver":"virtio-9p-pci","id":"fs1","fsdev":"fsdev-fs1","mount_t= ag":"/import/from/host2","bus":"pci.0","addr":"0x3"}' \ -fsdev handle,writeout=3Dimmediate,id=3Dfsdev-fs2,path=3D/export/to/guest3= \ --device virtio-9p-pci,id=3Dfs2,fsdev=3Dfsdev-fs2,mount_tag=3D/import/from/= host3,bus=3Dpci.0,addr=3D0x4 \ +-device '{"driver":"virtio-9p-pci","id":"fs2","fsdev":"fsdev-fs2","mount_t= ag":"/import/from/host3","bus":"pci.0","addr":"0x4"}' \ -audiodev id=3Daudio1,driver=3Dnone \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/genid-auto.x86_64-latest.args b/tests/q= emuxml2argvdata/genid-auto.x86_64-latest.args index 54250e4284..71daf8f4c9 100644 --- a/tests/qemuxml2argvdata/genid-auto.x86_64-latest.args +++ b/tests/qemuxml2argvdata/genid-auto.x86_64-latest.args @@ -17,7 +17,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ --device vmgenid,guid=3D00010203-0405-4607-8809-0a0b0c0d0e0f,id=3Dvmgenid0 \ +-device '{"driver":"vmgenid","guid":"00010203-0405-4607-8809-0a0b0c0d0e0f"= ,"id":"vmgenid0"}' \ -display none \ -no-user-config \ -nodefaults \ @@ -26,7 +26,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -rtc base=3Dutc \ -no-shutdown \ -boot strict=3Don \ --device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ -audiodev id=3Daudio1,driver=3Dnone \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/genid.x86_64-latest.args b/tests/qemuxm= l2argvdata/genid.x86_64-latest.args index 6aef0bff48..dba094376f 100644 --- a/tests/qemuxml2argvdata/genid.x86_64-latest.args +++ b/tests/qemuxml2argvdata/genid.x86_64-latest.args @@ -17,7 +17,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ --device vmgenid,guid=3De9392370-2917-565e-692b-d057f46512d6,id=3Dvmgenid0 \ +-device '{"driver":"vmgenid","guid":"e9392370-2917-565e-692b-d057f46512d6"= ,"id":"vmgenid0"}' \ -display none \ -no-user-config \ -nodefaults \ @@ -26,7 +26,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -rtc base=3Dutc \ -no-shutdown \ -boot strict=3Don \ --device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ -audiodev id=3Daudio1,driver=3Dnone \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/graphics-egl-headless-rendernode.x86_64= -latest.args b/tests/qemuxml2argvdata/graphics-egl-headless-rendernode.x86_= 64-latest.args index 106c6ee23c..434aa11ba6 100644 --- a/tests/qemuxml2argvdata/graphics-egl-headless-rendernode.x86_64-latest= .args +++ b/tests/qemuxml2argvdata/graphics-egl-headless-rendernode.x86_64-latest= .args @@ -25,11 +25,11 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ -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 ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-0-0= ,bootindex=3D1 \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ -display egl-headless,rendernode=3D/dev/dri/foo \ --device cirrus-vga,id=3Dvideo0,bus=3Dpci.0,addr=3D0x2 \ +-device '{"driver":"cirrus-vga","id":"video0","bus":"pci.0","addr":"0x2"}'= \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/graphics-egl-headless.x86_64-latest.arg= s b/tests/qemuxml2argvdata/graphics-egl-headless.x86_64-latest.args index 106c6ee23c..434aa11ba6 100644 --- a/tests/qemuxml2argvdata/graphics-egl-headless.x86_64-latest.args +++ b/tests/qemuxml2argvdata/graphics-egl-headless.x86_64-latest.args @@ -25,11 +25,11 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ -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 ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-0-0= ,bootindex=3D1 \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ -display egl-headless,rendernode=3D/dev/dri/foo \ --device cirrus-vga,id=3Dvideo0,bus=3Dpci.0,addr=3D0x2 \ +-device '{"driver":"cirrus-vga","id":"video0","bus":"pci.0","addr":"0x2"}'= \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/graphics-spice-gl-auto-rendernode.x86_6= 4-latest.args b/tests/qemuxml2argvdata/graphics-spice-gl-auto-rendernode.x8= 6_64-latest.args index 460b9f4981..b4404eb70b 100644 --- a/tests/qemuxml2argvdata/graphics-spice-gl-auto-rendernode.x86_64-lates= t.args +++ b/tests/qemuxml2argvdata/graphics-spice-gl-auto-rendernode.x86_64-lates= t.args @@ -25,10 +25,10 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ -audiodev id=3Daudio1,driver=3Dspice \ -spice port=3D0,gl=3Don,rendernode=3D/dev/dri/foo,seamless-migration=3Don \ --device cirrus-vga,id=3Dvideo0,bus=3Dpci.0,addr=3D0x2 \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x3 \ +-device '{"driver":"cirrus-vga","id":"video0","bus":"pci.0","addr":"0x2"}'= \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x3"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/graphics-vnc-auto-socket-cfg.x86_64-lat= est.args b/tests/qemuxml2argvdata/graphics-vnc-auto-socket-cfg.x86_64-lates= t.args index 5fa93dc611..81ed944499 100644 --- a/tests/qemuxml2argvdata/graphics-vnc-auto-socket-cfg.x86_64-latest.args +++ b/tests/qemuxml2argvdata/graphics-vnc-auto-socket-cfg.x86_64-latest.args @@ -25,12 +25,12 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ -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 ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-0-0= ,bootindex=3D1 \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ -audiodev id=3Daudio1,driver=3Dnone \ -vnc vnc=3Dunix:/tmp/lib/domain--1-QEMUGuest1/vnc.sock,audiodev=3Daudio1 \ --device cirrus-vga,id=3Dvideo0,bus=3Dpci.0,addr=3D0x2 \ +-device '{"driver":"cirrus-vga","id":"video0","bus":"pci.0","addr":"0x2"}'= \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/graphics-vnc-auto-socket.x86_64-latest.= args b/tests/qemuxml2argvdata/graphics-vnc-auto-socket.x86_64-latest.args index c2ea5ca77c..036469af15 100644 --- a/tests/qemuxml2argvdata/graphics-vnc-auto-socket.x86_64-latest.args +++ b/tests/qemuxml2argvdata/graphics-vnc-auto-socket.x86_64-latest.args @@ -25,9 +25,9 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ -audiodev id=3Daudio1,driver=3Dnone \ -vnc vnc=3Dunix:/tmp/lib/domain--1-QEMUGuest1/vnc.sock,audiodev=3Daudio1 \ --device cirrus-vga,id=3Dvideo0,bus=3Dpci.0,addr=3D0x2 \ +-device '{"driver":"cirrus-vga","id":"video0","bus":"pci.0","addr":"0x2"}'= \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/graphics-vnc-egl-headless.x86_64-latest= .args b/tests/qemuxml2argvdata/graphics-vnc-egl-headless.x86_64-latest.args index 82e3659173..8c03254a9f 100644 --- a/tests/qemuxml2argvdata/graphics-vnc-egl-headless.x86_64-latest.args +++ b/tests/qemuxml2argvdata/graphics-vnc-egl-headless.x86_64-latest.args @@ -25,13 +25,13 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ -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 ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-0-0= ,bootindex=3D1 \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ -audiodev id=3Daudio1,driver=3Dnone \ -vnc '[2001:1:2:3:4:5:1234:1234]:3,audiodev=3Daudio1' \ -display egl-headless,rendernode=3D/dev/dri/foo \ --device cirrus-vga,id=3Dvideo0,bus=3Dpci.0,addr=3D0x2 \ +-device '{"driver":"cirrus-vga","id":"video0","bus":"pci.0","addr":"0x2"}'= \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/graphics-vnc-no-listen-attr.x86_64-late= st.args b/tests/qemuxml2argvdata/graphics-vnc-no-listen-attr.x86_64-latest.= args index a0bc3560d8..94848500f8 100644 --- a/tests/qemuxml2argvdata/graphics-vnc-no-listen-attr.x86_64-latest.args +++ b/tests/qemuxml2argvdata/graphics-vnc-no-listen-attr.x86_64-latest.args @@ -25,12 +25,12 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ -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 ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-0-0= ,bootindex=3D1 \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ -audiodev id=3Daudio1,driver=3Dnone \ -vnc '[2001:1:2:3:4:5:1234:1234]:3,audiodev=3Daudio1' \ --device cirrus-vga,id=3Dvideo0,bus=3Dpci.0,addr=3D0x2 \ +-device '{"driver":"cirrus-vga","id":"video0","bus":"pci.0","addr":"0x2"}'= \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/graphics-vnc-none.x86_64-latest.args b/= tests/qemuxml2argvdata/graphics-vnc-none.x86_64-latest.args index 32b54db8cd..ecd928c727 100644 --- a/tests/qemuxml2argvdata/graphics-vnc-none.x86_64-latest.args +++ b/tests/qemuxml2argvdata/graphics-vnc-none.x86_64-latest.args @@ -25,9 +25,9 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ -audiodev id=3Daudio1,driver=3Dnone \ -vnc none,audiodev=3Daudio1 \ --device cirrus-vga,id=3Dvideo0,bus=3Dpci.0,addr=3D0x2 \ +-device '{"driver":"cirrus-vga","id":"video0","bus":"pci.0","addr":"0x2"}'= \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/graphics-vnc-policy.x86_64-latest.args = b/tests/qemuxml2argvdata/graphics-vnc-policy.x86_64-latest.args index d7ec89dd2e..fef983571c 100644 --- a/tests/qemuxml2argvdata/graphics-vnc-policy.x86_64-latest.args +++ b/tests/qemuxml2argvdata/graphics-vnc-policy.x86_64-latest.args @@ -25,12 +25,12 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ -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 ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-0-0= ,bootindex=3D1 \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ -audiodev id=3Daudio1,driver=3Dnone \ -vnc '[::]:59630,share=3Dallow-exclusive,audiodev=3Daudio1' \ --device cirrus-vga,id=3Dvideo0,bus=3Dpci.0,addr=3D0x2 \ +-device '{"driver":"cirrus-vga","id":"video0","bus":"pci.0","addr":"0x2"}'= \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/graphics-vnc-power.x86_64-latest.args b= /tests/qemuxml2argvdata/graphics-vnc-power.x86_64-latest.args index d668a627f8..24ceb9a7ab 100644 --- a/tests/qemuxml2argvdata/graphics-vnc-power.x86_64-latest.args +++ b/tests/qemuxml2argvdata/graphics-vnc-power.x86_64-latest.args @@ -25,12 +25,12 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ -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 ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-0-0= ,bootindex=3D1 \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ -audiodev id=3Daudio1,driver=3Dnone \ -vnc '[::]:59630,power-control=3Don,audiodev=3Daudio1' \ --device cirrus-vga,id=3Dvideo0,bus=3Dpci.0,addr=3D0x2 \ +-device '{"driver":"cirrus-vga","id":"video0","bus":"pci.0","addr":"0x2"}'= \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/graphics-vnc-remove-generated-socket.x8= 6_64-latest.args b/tests/qemuxml2argvdata/graphics-vnc-remove-generated-soc= ket.x86_64-latest.args index 17eb03319d..06477d5ece 100644 --- a/tests/qemuxml2argvdata/graphics-vnc-remove-generated-socket.x86_64-la= test.args +++ b/tests/qemuxml2argvdata/graphics-vnc-remove-generated-socket.x86_64-la= test.args @@ -25,12 +25,12 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ -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 ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-0-0= ,bootindex=3D1 \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ -audiodev id=3Daudio1,driver=3Dnone \ -vnc 127.0.0.1:0,audiodev=3Daudio1 \ --device cirrus-vga,id=3Dvideo0,bus=3Dpci.0,addr=3D0x2 \ +-device '{"driver":"cirrus-vga","id":"video0","bus":"pci.0","addr":"0x2"}'= \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/graphics-vnc-sasl.x86_64-latest.args b/= tests/qemuxml2argvdata/graphics-vnc-sasl.x86_64-latest.args index 46dbde8e51..d687ae0e0a 100644 --- a/tests/qemuxml2argvdata/graphics-vnc-sasl.x86_64-latest.args +++ b/tests/qemuxml2argvdata/graphics-vnc-sasl.x86_64-latest.args @@ -26,12 +26,12 @@ SASL_CONF_PATH=3D/root/.sasl2 \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ -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 ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-0-0= ,bootindex=3D1 \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ -audiodev id=3Daudio1,driver=3Dnone \ -vnc 127.0.0.1:3,sasl=3Don,audiodev=3Daudio1 \ --device cirrus-vga,id=3Dvideo0,bus=3Dpci.0,addr=3D0x2 \ +-device '{"driver":"cirrus-vga","id":"video0","bus":"pci.0","addr":"0x2"}'= \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/graphics-vnc-socket-new-cmdline.x86_64-= latest.args b/tests/qemuxml2argvdata/graphics-vnc-socket-new-cmdline.x86_64= -latest.args index 9c87bab4d2..9b7d0aff9e 100644 --- a/tests/qemuxml2argvdata/graphics-vnc-socket-new-cmdline.x86_64-latest.= args +++ b/tests/qemuxml2argvdata/graphics-vnc-socket-new-cmdline.x86_64-latest.= args @@ -25,9 +25,9 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ -audiodev id=3Daudio1,driver=3Dnone \ -vnc vnc=3Dunix:/tmp/foo=3Dbar.sock,audiodev=3Daudio1 \ --device cirrus-vga,id=3Dvideo0,bus=3Dpci.0,addr=3D0x2 \ +-device '{"driver":"cirrus-vga","id":"video0","bus":"pci.0","addr":"0x2"}'= \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/graphics-vnc-socket.x86_64-latest.args = b/tests/qemuxml2argvdata/graphics-vnc-socket.x86_64-latest.args index af595caf10..40dc3a1770 100644 --- a/tests/qemuxml2argvdata/graphics-vnc-socket.x86_64-latest.args +++ b/tests/qemuxml2argvdata/graphics-vnc-socket.x86_64-latest.args @@ -25,9 +25,9 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ -audiodev id=3Daudio1,driver=3Dnone \ -vnc vnc=3Dunix:/tmp/vnc.sock,audiodev=3Daudio1 \ --device cirrus-vga,id=3Dvideo0,bus=3Dpci.0,addr=3D0x2 \ +-device '{"driver":"cirrus-vga","id":"video0","bus":"pci.0","addr":"0x2"}'= \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/graphics-vnc-tls-secret.x86_64-latest.a= rgs b/tests/qemuxml2argvdata/graphics-vnc-tls-secret.x86_64-latest.args index 35469b64e0..150ee86763 100644 --- a/tests/qemuxml2argvdata/graphics-vnc-tls-secret.x86_64-latest.args +++ b/tests/qemuxml2argvdata/graphics-vnc-tls-secret.x86_64-latest.args @@ -26,11 +26,11 @@ SASL_CONF_PATH=3D/root/.sasl2 \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ -audiodev id=3Daudio1,driver=3Dnone \ -object '{"qom-type":"secret","id":"vnc-tls-creds0-secret0","data":"9eao5F= 8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1","keyid":"master= Key0","iv":"AAECAwQFBgcICQoLDA0ODw=3D=3D","format":"base64"}' \ -object '{"qom-type":"tls-creds-x509","id":"vnc-tls-creds0","dir":"/etc/pk= i/libvirt-vnc","endpoint":"server","verify-peer":true,"passwordid":"vnc-tls= -creds0-secret0"}' \ -vnc 127.0.0.1:3,tls-creds=3Dvnc-tls-creds0,sasl=3Don,audiodev=3Daudio1 \ --device cirrus-vga,id=3Dvideo0,bus=3Dpci.0,addr=3D0x2 \ +-device '{"driver":"cirrus-vga","id":"video0","bus":"pci.0","addr":"0x2"}'= \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-latest.args b/t= ests/qemuxml2argvdata/graphics-vnc-tls.x86_64-latest.args index 819ec9ad4b..99dc77e23f 100644 --- a/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-latest.args +++ b/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-latest.args @@ -26,10 +26,10 @@ SASL_CONF_PATH=3D/root/.sasl2 \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ -audiodev id=3Daudio1,driver=3Dnone \ -object '{"qom-type":"tls-creds-x509","id":"vnc-tls-creds0","dir":"/etc/pk= i/libvirt-vnc","endpoint":"server","verify-peer":true}' \ -vnc 127.0.0.1:3,tls-creds=3Dvnc-tls-creds0,sasl=3Don,audiodev=3Daudio1 \ --device cirrus-vga,id=3Dvideo0,bus=3Dpci.0,addr=3D0x2 \ +-device '{"driver":"cirrus-vga","id":"video0","bus":"pci.0","addr":"0x2"}'= \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/graphics-vnc-websocket.x86_64-latest.ar= gs b/tests/qemuxml2argvdata/graphics-vnc-websocket.x86_64-latest.args index ac7129d400..458634ead0 100644 --- a/tests/qemuxml2argvdata/graphics-vnc-websocket.x86_64-latest.args +++ b/tests/qemuxml2argvdata/graphics-vnc-websocket.x86_64-latest.args @@ -25,9 +25,9 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ -audiodev id=3Daudio1,driver=3Dnone \ -vnc 127.0.0.1:0,websocket=3D5700,audiodev=3Daudio1 \ --device cirrus-vga,id=3Dvideo0,bus=3Dpci.0,addr=3D0x2 \ +-device '{"driver":"cirrus-vga","id":"video0","bus":"pci.0","addr":"0x2"}'= \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/graphics-vnc.x86_64-latest.args b/tests= /qemuxml2argvdata/graphics-vnc.x86_64-latest.args index a0bc3560d8..94848500f8 100644 --- a/tests/qemuxml2argvdata/graphics-vnc.x86_64-latest.args +++ b/tests/qemuxml2argvdata/graphics-vnc.x86_64-latest.args @@ -25,12 +25,12 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ -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 ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-0-0= ,bootindex=3D1 \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ -audiodev id=3Daudio1,driver=3Dnone \ -vnc '[2001:1:2:3:4:5:1234:1234]:3,audiodev=3Daudio1' \ --device cirrus-vga,id=3Dvideo0,bus=3Dpci.0,addr=3D0x2 \ +-device '{"driver":"cirrus-vga","id":"video0","bus":"pci.0","addr":"0x2"}'= \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/hostdev-mdev-display-ramfb.x86_64-lates= t.args b/tests/qemuxml2argvdata/hostdev-mdev-display-ramfb.x86_64-latest.ar= gs index ab1ac4e1be..c47a7dea2d 100644 --- a/tests/qemuxml2argvdata/hostdev-mdev-display-ramfb.x86_64-latest.args +++ b/tests/qemuxml2argvdata/hostdev-mdev-display-ramfb.x86_64-latest.args @@ -25,10 +25,10 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest2/.config= \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ -audiodev id=3Daudio1,driver=3Dnone \ -vnc 127.0.0.1:0,audiodev=3Daudio1 \ --device qxl-vga,id=3Dvideo0,ram_size=3D67108864,vram_size=3D67108864,vram6= 4_size_mb=3D0,vgamem_mb=3D16,max_outputs=3D1,bus=3Dpci.0,addr=3D0x2 \ --device vfio-pci-nohotplug,id=3Dhostdev0,sysfsdev=3D/sys/bus/mdev/devices/= 53764d0e-85a0-42b4-af5c-2046b460b1dc,display=3Don,ramfb=3Don,bus=3Dpci.0,ad= dr=3D0x3 \ +-device '{"driver":"qxl-vga","id":"video0","ram_size":67108864,"vram_size"= :67108864,"vram64_size_mb":0,"vgamem_mb":16,"max_outputs":1,"bus":"pci.0","= addr":"0x2"}' \ +-device '{"driver":"vfio-pci-nohotplug","id":"hostdev0","sysfsdev":"/sys/b= us/mdev/devices/53764d0e-85a0-42b4-af5c-2046b460b1dc","display":"on","ramfb= ":true,"bus":"pci.0","addr":"0x3"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/hostdev-mdev-display-spice-egl-headless= .x86_64-latest.args b/tests/qemuxml2argvdata/hostdev-mdev-display-spice-egl= -headless.x86_64-latest.args index 59e005b06a..c659ad10e1 100644 --- a/tests/qemuxml2argvdata/hostdev-mdev-display-spice-egl-headless.x86_64= -latest.args +++ b/tests/qemuxml2argvdata/hostdev-mdev-display-spice-egl-headless.x86_64= -latest.args @@ -25,11 +25,11 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest2/.config= \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ -audiodev id=3Daudio1,driver=3Dspice \ -spice port=3D0,seamless-migration=3Don \ -display egl-headless,rendernode=3D/dev/dri/foo \ --device qxl-vga,id=3Dvideo0,ram_size=3D67108864,vram_size=3D67108864,vram6= 4_size_mb=3D0,vgamem_mb=3D16,max_outputs=3D1,bus=3Dpci.0,addr=3D0x2 \ --device vfio-pci,id=3Dhostdev0,sysfsdev=3D/sys/bus/mdev/devices/53764d0e-8= 5a0-42b4-af5c-2046b460b1dc,display=3Don,bus=3Dpci.0,addr=3D0x3 \ +-device '{"driver":"qxl-vga","id":"video0","ram_size":67108864,"vram_size"= :67108864,"vram64_size_mb":0,"vgamem_mb":16,"max_outputs":1,"bus":"pci.0","= addr":"0x2"}' \ +-device '{"driver":"vfio-pci","id":"hostdev0","sysfsdev":"/sys/bus/mdev/de= vices/53764d0e-85a0-42b4-af5c-2046b460b1dc","display":"on","bus":"pci.0","a= ddr":"0x3"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/hostdev-mdev-display-spice-opengl.x86_6= 4-latest.args b/tests/qemuxml2argvdata/hostdev-mdev-display-spice-opengl.x8= 6_64-latest.args index 9b95b8d36f..43d1ab2f2b 100644 --- a/tests/qemuxml2argvdata/hostdev-mdev-display-spice-opengl.x86_64-lates= t.args +++ b/tests/qemuxml2argvdata/hostdev-mdev-display-spice-opengl.x86_64-lates= t.args @@ -25,10 +25,10 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest2/.config= \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ -audiodev id=3Daudio1,driver=3Dspice \ -spice port=3D0,gl=3Don,rendernode=3D/dev/dri/foo,seamless-migration=3Don \ --device qxl-vga,id=3Dvideo0,ram_size=3D67108864,vram_size=3D67108864,vram6= 4_size_mb=3D0,vgamem_mb=3D16,max_outputs=3D1,bus=3Dpci.0,addr=3D0x2 \ --device vfio-pci,id=3Dhostdev0,sysfsdev=3D/sys/bus/mdev/devices/53764d0e-8= 5a0-42b4-af5c-2046b460b1dc,display=3Don,bus=3Dpci.0,addr=3D0x3 \ +-device '{"driver":"qxl-vga","id":"video0","ram_size":67108864,"vram_size"= :67108864,"vram64_size_mb":0,"vgamem_mb":16,"max_outputs":1,"bus":"pci.0","= addr":"0x2"}' \ +-device '{"driver":"vfio-pci","id":"hostdev0","sysfsdev":"/sys/bus/mdev/de= vices/53764d0e-85a0-42b4-af5c-2046b460b1dc","display":"on","bus":"pci.0","a= ddr":"0x3"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/hostdev-mdev-display-vnc-egl-headless.x= 86_64-latest.args b/tests/qemuxml2argvdata/hostdev-mdev-display-vnc-egl-hea= dless.x86_64-latest.args index fae541a4e2..90e2d7ffae 100644 --- a/tests/qemuxml2argvdata/hostdev-mdev-display-vnc-egl-headless.x86_64-l= atest.args +++ b/tests/qemuxml2argvdata/hostdev-mdev-display-vnc-egl-headless.x86_64-l= atest.args @@ -25,11 +25,11 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest2/.config= \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ -audiodev id=3Daudio1,driver=3Dnone \ -vnc 127.0.0.1:0,audiodev=3Daudio1 \ -display egl-headless,rendernode=3D/dev/dri/foo \ --device qxl-vga,id=3Dvideo0,ram_size=3D67108864,vram_size=3D67108864,vram6= 4_size_mb=3D0,vgamem_mb=3D16,max_outputs=3D1,bus=3Dpci.0,addr=3D0x2 \ --device vfio-pci,id=3Dhostdev0,sysfsdev=3D/sys/bus/mdev/devices/53764d0e-8= 5a0-42b4-af5c-2046b460b1dc,display=3Don,bus=3Dpci.0,addr=3D0x3 \ +-device '{"driver":"qxl-vga","id":"video0","ram_size":67108864,"vram_size"= :67108864,"vram64_size_mb":0,"vgamem_mb":16,"max_outputs":1,"bus":"pci.0","= addr":"0x2"}' \ +-device '{"driver":"vfio-pci","id":"hostdev0","sysfsdev":"/sys/bus/mdev/de= vices/53764d0e-85a0-42b4-af5c-2046b460b1dc","display":"on","bus":"pci.0","a= ddr":"0x3"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/hostdev-mdev-display-vnc.x86_64-latest.= args b/tests/qemuxml2argvdata/hostdev-mdev-display-vnc.x86_64-latest.args index a917efef84..9911c79452 100644 --- a/tests/qemuxml2argvdata/hostdev-mdev-display-vnc.x86_64-latest.args +++ b/tests/qemuxml2argvdata/hostdev-mdev-display-vnc.x86_64-latest.args @@ -25,10 +25,10 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest2/.config= \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ -audiodev id=3Daudio1,driver=3Dnone \ -vnc 127.0.0.1:0,audiodev=3Daudio1 \ --device qxl-vga,id=3Dvideo0,ram_size=3D67108864,vram_size=3D67108864,vram6= 4_size_mb=3D0,vgamem_mb=3D16,max_outputs=3D1,bus=3Dpci.0,addr=3D0x2 \ --device vfio-pci,id=3Dhostdev0,sysfsdev=3D/sys/bus/mdev/devices/53764d0e-8= 5a0-42b4-af5c-2046b460b1dc,display=3Don,bus=3Dpci.0,addr=3D0x3 \ +-device '{"driver":"qxl-vga","id":"video0","ram_size":67108864,"vram_size"= :67108864,"vram64_size_mb":0,"vgamem_mb":16,"max_outputs":1,"bus":"pci.0","= addr":"0x2"}' \ +-device '{"driver":"vfio-pci","id":"hostdev0","sysfsdev":"/sys/bus/mdev/de= vices/53764d0e-85a0-42b4-af5c-2046b460b1dc","display":"on","bus":"pci.0","a= ddr":"0x3"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/hostdev-scsi-lsi.x86_64-latest.args b/t= ests/qemuxml2argvdata/hostdev-scsi-lsi.x86_64-latest.args index eeec33fe98..347940df86 100644 --- a/tests/qemuxml2argvdata/hostdev-scsi-lsi.x86_64-latest.args +++ b/tests/qemuxml2argvdata/hostdev-scsi-lsi.x86_64-latest.args @@ -26,26 +26,26 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest2/.config= \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ --device lsi,id=3Dscsi0,bus=3Dpci.0,addr=3D0x2 \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ +-device '{"driver":"lsi","id":"scsi0","bus":"pci.0","addr":"0x2"}' \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest2","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 ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-0-0= ,bootindex=3D1 \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ -audiodev id=3Daudio1,driver=3Dnone \ -blockdev '{"driver":"host_device","filename":"/dev/sg0","node-name":"libv= irt-2-backend","read-only":false}' \ --device scsi-generic,drive=3Dlibvirt-2-backend,id=3Dhostdev0,bus=3Dscsi0.0= ,scsi-id=3D7 \ +-device '{"driver":"scsi-generic","drive":"libvirt-2-backend","id":"hostde= v0","bus":"scsi0.0","scsi-id":7}' \ -blockdev '{"driver":"host_device","filename":"/dev/sg0","node-name":"libv= irt-3-backend","read-only":true}' \ --device scsi-generic,drive=3Dlibvirt-3-backend,id=3Dhostdev1,bus=3Dscsi0.0= ,scsi-id=3D6 \ +-device '{"driver":"scsi-generic","drive":"libvirt-3-backend","id":"hostde= v1","bus":"scsi0.0","scsi-id":6}' \ -blockdev '{"driver":"iscsi","portal":"example.org:3260","target":"iqn.199= 2-01.com.example","lun":0,"transport":"tcp","node-name":"libvirt-4-backend"= ,"read-only":false}' \ --device scsi-generic,drive=3Dlibvirt-4-backend,id=3Dhostdev2,bus=3Dscsi0.0= ,scsi-id=3D4 \ +-device '{"driver":"scsi-generic","drive":"libvirt-4-backend","id":"hostde= v2","bus":"scsi0.0","scsi-id":4}' \ -blockdev '{"driver":"iscsi","portal":"example.org:3260","target":"iqn.199= 2-01.com.example","lun":1,"transport":"tcp","node-name":"libvirt-5-backend"= ,"read-only":false}' \ --device scsi-generic,drive=3Dlibvirt-5-backend,id=3Dhostdev3,bus=3Dscsi0.0= ,scsi-id=3D5 \ +-device '{"driver":"scsi-generic","drive":"libvirt-5-backend","id":"hostde= v3","bus":"scsi0.0","scsi-id":5}' \ -object '{"qom-type":"secret","id":"libvirt-6-backend-secret0","data":"9ea= o5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1","keyid":"mas= terKey0","iv":"AAECAwQFBgcICQoLDA0ODw=3D=3D","format":"base64"}' \ -blockdev '{"driver":"iscsi","portal":"example.org:3260","target":"iqn.199= 2-01.com.example:storage","lun":1,"transport":"tcp","user":"myname","passwo= rd-secret":"libvirt-6-backend-secret0","node-name":"libvirt-6-backend","rea= d-only":false}' \ --device scsi-generic,drive=3Dlibvirt-6-backend,id=3Dhostdev4,bus=3Dscsi0.0= ,scsi-id=3D3 \ +-device '{"driver":"scsi-generic","drive":"libvirt-6-backend","id":"hostde= v4","bus":"scsi0.0","scsi-id":3}' \ -object '{"qom-type":"secret","id":"libvirt-7-backend-secret0","data":"9ea= o5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1","keyid":"mas= terKey0","iv":"AAECAwQFBgcICQoLDA0ODw=3D=3D","format":"base64"}' \ -blockdev '{"driver":"iscsi","portal":"example.org:3260","target":"iqn.199= 2-01.com.example:storage","lun":2,"transport":"tcp","user":"myname","passwo= rd-secret":"libvirt-7-backend-secret0","node-name":"libvirt-7-backend","rea= d-only":false}' \ --device scsi-generic,drive=3Dlibvirt-7-backend,id=3Dhostdev5,bus=3Dscsi0.0= ,scsi-id=3D2 \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x3 \ +-device '{"driver":"scsi-generic","drive":"libvirt-7-backend","id":"hostde= v5","bus":"scsi0.0","scsi-id":2}' \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x3"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/hostdev-scsi-virtio-scsi.x86_64-latest.= args b/tests/qemuxml2argvdata/hostdev-scsi-virtio-scsi.x86_64-latest.args index ad2cde5171..e51cc0cd77 100644 --- a/tests/qemuxml2argvdata/hostdev-scsi-virtio-scsi.x86_64-latest.args +++ b/tests/qemuxml2argvdata/hostdev-scsi-virtio-scsi.x86_64-latest.args @@ -26,28 +26,28 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest2/.config= \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ --device virtio-scsi-pci,id=3Dscsi0,bus=3Dpci.0,addr=3D0x2 \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ +-device '{"driver":"virtio-scsi-pci","id":"scsi0","bus":"pci.0","addr":"0x= 2"}' \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest2","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 ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-0-0= ,bootindex=3D1 \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ -audiodev id=3Daudio1,driver=3Dnone \ -blockdev '{"driver":"host_device","filename":"/dev/sg0","node-name":"libv= irt-2-backend","read-only":false}' \ --device scsi-generic,drive=3Dlibvirt-2-backend,id=3Dhostdev0,bus=3Dscsi0.0= ,channel=3D0,scsi-id=3D4,lun=3D8 \ +-device '{"driver":"scsi-generic","drive":"libvirt-2-backend","id":"hostde= v0","bus":"scsi0.0","channel":0,"scsi-id":4,"lun":8}' \ -blockdev '{"driver":"host_device","filename":"/dev/sg0","node-name":"libv= irt-3-backend","read-only":true}' \ --device scsi-generic,drive=3Dlibvirt-3-backend,id=3Dhostdev1,bus=3Dscsi0.0= ,channel=3D0,scsi-id=3D4,lun=3D7 \ +-device '{"driver":"scsi-generic","drive":"libvirt-3-backend","id":"hostde= v1","bus":"scsi0.0","channel":0,"scsi-id":4,"lun":7}' \ -blockdev '{"driver":"host_device","filename":"/dev/sg0","node-name":"libv= irt-4-backend","read-only":false}' \ --device scsi-generic,drive=3Dlibvirt-4-backend,id=3Dua-7996c8dc-a4fa-4012-= b76f-043d20144263,bus=3Dscsi0.0,channel=3D0,scsi-id=3D4,lun=3D6 \ +-device '{"driver":"scsi-generic","drive":"libvirt-4-backend","id":"ua-799= 6c8dc-a4fa-4012-b76f-043d20144263","bus":"scsi0.0","channel":0,"scsi-id":4,= "lun":6}' \ -blockdev '{"driver":"iscsi","portal":"example.org:3260","target":"iqn.199= 2-01.com.example","lun":0,"transport":"tcp","node-name":"libvirt-5-backend"= ,"read-only":false}' \ --device scsi-generic,drive=3Dlibvirt-5-backend,id=3Dhostdev2,bus=3Dscsi0.0= ,channel=3D0,scsi-id=3D2,lun=3D4 \ +-device '{"driver":"scsi-generic","drive":"libvirt-5-backend","id":"hostde= v2","bus":"scsi0.0","channel":0,"scsi-id":2,"lun":4}' \ -blockdev '{"driver":"iscsi","portal":"example.org:3260","target":"iqn.199= 2-01.com.example","lun":1,"transport":"tcp","node-name":"libvirt-6-backend"= ,"read-only":true}' \ --device scsi-generic,drive=3Dlibvirt-6-backend,id=3Dhostdev3,bus=3Dscsi0.0= ,channel=3D0,scsi-id=3D2,lun=3D5 \ +-device '{"driver":"scsi-generic","drive":"libvirt-6-backend","id":"hostde= v3","bus":"scsi0.0","channel":0,"scsi-id":2,"lun":5}' \ -object '{"qom-type":"secret","id":"libvirt-7-backend-secret0","data":"9ea= o5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1","keyid":"mas= terKey0","iv":"AAECAwQFBgcICQoLDA0ODw=3D=3D","format":"base64"}' \ -blockdev '{"driver":"iscsi","portal":"example.org:3260","target":"iqn.199= 2-01.com.example:storage","lun":1,"transport":"tcp","user":"myname","passwo= rd-secret":"libvirt-7-backend-secret0","node-name":"libvirt-7-backend","rea= d-only":false}' \ --device scsi-generic,drive=3Dlibvirt-7-backend,id=3Dhostdev4,bus=3Dscsi0.0= ,channel=3D0,scsi-id=3D3,lun=3D4 \ +-device '{"driver":"scsi-generic","drive":"libvirt-7-backend","id":"hostde= v4","bus":"scsi0.0","channel":0,"scsi-id":3,"lun":4}' \ -object '{"qom-type":"secret","id":"libvirt-8-backend-secret0","data":"9ea= o5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1","keyid":"mas= terKey0","iv":"AAECAwQFBgcICQoLDA0ODw=3D=3D","format":"base64"}' \ -blockdev '{"driver":"iscsi","portal":"example.org:3260","target":"iqn.199= 2-01.com.example:storage","lun":2,"transport":"tcp","user":"myname","passwo= rd-secret":"libvirt-8-backend-secret0","initiator-name":"iqn.2020-07.com.ex= ample:test","node-name":"libvirt-8-backend","read-only":false}' \ --device scsi-generic,drive=3Dlibvirt-8-backend,id=3Dhostdev5,bus=3Dscsi0.0= ,channel=3D0,scsi-id=3D3,lun=3D5 \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x3 \ +-device '{"driver":"scsi-generic","drive":"libvirt-8-backend","id":"hostde= v5","bus":"scsi0.0","channel":0,"scsi-id":3,"lun":5}' \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x3"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/hugepages-memaccess3.x86_64-latest.args= b/tests/qemuxml2argvdata/hugepages-memaccess3.x86_64-latest.args index ae5b48aa1c..1ddf8536f5 100644 --- a/tests/qemuxml2argvdata/hugepages-memaccess3.x86_64-latest.args +++ b/tests/qemuxml2argvdata/hugepages-memaccess3.x86_64-latest.args @@ -26,7 +26,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-fedora/.config \ -no-shutdown \ -no-acpi \ -boot menu=3Don,strict=3Don \ --device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ -audiodev id=3Daudio1,driver=3Dnone \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/hugepages-nvdimm.x86_64-latest.args b/t= ests/qemuxml2argvdata/hugepages-nvdimm.x86_64-latest.args index 9f3c6fa63f..94eea13977 100644 --- a/tests/qemuxml2argvdata/hugepages-nvdimm.x86_64-latest.args +++ b/tests/qemuxml2argvdata/hugepages-nvdimm.x86_64-latest.args @@ -18,7 +18,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -object '{"qom-type":"memory-backend-file","id":"ram-node0","mem-path":"/d= ev/hugepages2M/libvirt/qemu/-1-QEMUGuest1","share":true,"prealloc":true,"si= ze":1073741824}' \ -numa node,nodeid=3D0,cpus=3D0-1,memdev=3Dram-node0 \ -object '{"qom-type":"memory-backend-file","id":"memnvdimm0","mem-path":"/= tmp/nvdimm","share":true,"prealloc":true,"size":536870912}' \ --device nvdimm,node=3D0,memdev=3Dmemnvdimm0,id=3Dnvdimm0,slot=3D0 \ +-device '{"driver":"nvdimm","node":0,"memdev":"memnvdimm0","id":"nvdimm0",= "slot":0}' \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -display none \ -no-user-config \ @@ -29,7 +29,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ -audiodev id=3Daudio1,driver=3Dnone \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/hyperv-off.x86_64-latest.args b/tests/q= emuxml2argvdata/hyperv-off.x86_64-latest.args index f02bf480a4..283c4930c0 100644 --- a/tests/qemuxml2argvdata/hyperv-off.x86_64-latest.args +++ b/tests/qemuxml2argvdata/hyperv-off.x86_64-latest.args @@ -25,8 +25,8 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -rtc base=3Dutc \ -no-shutdown \ -boot strict=3Don \ --device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ -audiodev id=3Daudio1,driver=3Dnone \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/hyperv-panic.x86_64-latest.args b/tests= /qemuxml2argvdata/hyperv-panic.x86_64-latest.args index 2226cc3848..70059fdf57 100644 --- a/tests/qemuxml2argvdata/hyperv-panic.x86_64-latest.args +++ b/tests/qemuxml2argvdata/hyperv-panic.x86_64-latest.args @@ -25,7 +25,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -rtc base=3Dutc \ -no-shutdown \ -boot strict=3Don \ --device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ -audiodev id=3Daudio1,driver=3Dnone \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/hyperv-stimer-direct.x86_64-latest.args= b/tests/qemuxml2argvdata/hyperv-stimer-direct.x86_64-latest.args index a05c009389..a2ed7ff79a 100644 --- a/tests/qemuxml2argvdata/hyperv-stimer-direct.x86_64-latest.args +++ b/tests/qemuxml2argvdata/hyperv-stimer-direct.x86_64-latest.args @@ -25,7 +25,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -rtc base=3Dutc \ -no-shutdown \ -boot strict=3Don \ --device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ -audiodev id=3Daudio1,driver=3Dnone \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/hyperv.x86_64-latest.args b/tests/qemux= ml2argvdata/hyperv.x86_64-latest.args index 32ee369ff3..130ba75e4e 100644 --- a/tests/qemuxml2argvdata/hyperv.x86_64-latest.args +++ b/tests/qemuxml2argvdata/hyperv.x86_64-latest.args @@ -25,7 +25,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -rtc base=3Dutc \ -no-shutdown \ -boot strict=3Don \ --device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ -audiodev id=3Daudio1,driver=3Dnone \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/input-linux.x86_64-latest.args b/tests/= qemuxml2argvdata/input-linux.x86_64-latest.args index 3c7e65a7f0..98f534750c 100644 --- a/tests/qemuxml2argvdata/input-linux.x86_64-latest.args +++ b/tests/qemuxml2argvdata/input-linux.x86_64-latest.args @@ -26,9 +26,9 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ -object '{"qom-type":"input-linux","id":"input0","evdev":"/dev/input/event= 1234","repeat":true,"grab_all":true,"grab-toggle":"alt-alt"}' \ -audiodev id=3Daudio1,driver=3Dnone \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/intel-iommu-aw-bits.x86_64-latest.args = b/tests/qemuxml2argvdata/intel-iommu-aw-bits.x86_64-latest.args index 48535d2bdf..081c9e46be 100644 --- a/tests/qemuxml2argvdata/intel-iommu-aw-bits.x86_64-latest.args +++ b/tests/qemuxml2argvdata/intel-iommu-aw-bits.x86_64-latest.args @@ -26,7 +26,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device intel-iommu,intremap=3Don,aw-bits=3D48 \ +-device '{"driver":"intel-iommu","intremap":"on","aw-bits":48}' \ -audiodev id=3Daudio1,driver=3Dnone \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/intel-iommu-caching-mode.x86_64-latest.= args b/tests/qemuxml2argvdata/intel-iommu-caching-mode.x86_64-latest.args index 902d00f5cf..9a4d11e03c 100644 --- a/tests/qemuxml2argvdata/intel-iommu-caching-mode.x86_64-latest.args +++ b/tests/qemuxml2argvdata/intel-iommu-caching-mode.x86_64-latest.args @@ -26,7 +26,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device intel-iommu,intremap=3Don,caching-mode=3Don \ +-device '{"driver":"intel-iommu","intremap":"on","caching-mode":true}' \ -audiodev id=3Daudio1,driver=3Dnone \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/intel-iommu-device-iotlb.x86_64-latest.= args b/tests/qemuxml2argvdata/intel-iommu-device-iotlb.x86_64-latest.args index 7e6b0a74d8..eeecbb67b5 100644 --- a/tests/qemuxml2argvdata/intel-iommu-device-iotlb.x86_64-latest.args +++ b/tests/qemuxml2argvdata/intel-iommu-device-iotlb.x86_64-latest.args @@ -26,7 +26,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device intel-iommu,intremap=3Don,device-iotlb=3Don \ +-device '{"driver":"intel-iommu","intremap":"on","device-iotlb":true}' \ -audiodev id=3Daudio1,driver=3Dnone \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/intel-iommu-eim.x86_64-latest.args b/te= sts/qemuxml2argvdata/intel-iommu-eim.x86_64-latest.args index c04ce0460a..5dd52f10bc 100644 --- a/tests/qemuxml2argvdata/intel-iommu-eim.x86_64-latest.args +++ b/tests/qemuxml2argvdata/intel-iommu-eim.x86_64-latest.args @@ -26,7 +26,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device intel-iommu,intremap=3Don,eim=3Don \ +-device '{"driver":"intel-iommu","intremap":"on","eim":"on"}' \ -audiodev id=3Daudio1,driver=3Dnone \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/intel-iommu.x86_64-latest.args b/tests/= qemuxml2argvdata/intel-iommu.x86_64-latest.args index 082f8a3270..bea1b72f24 100644 --- a/tests/qemuxml2argvdata/intel-iommu.x86_64-latest.args +++ b/tests/qemuxml2argvdata/intel-iommu.x86_64-latest.args @@ -26,7 +26,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device intel-iommu \ +-device '{"driver":"intel-iommu"}' \ -audiodev id=3Daudio1,driver=3Dnone \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/iothreads-virtio-scsi-pci.x86_64-latest= .args b/tests/qemuxml2argvdata/iothreads-virtio-scsi-pci.x86_64-latest.args index 2763a7f9d8..94963bd7a4 100644 --- a/tests/qemuxml2argvdata/iothreads-virtio-scsi-pci.x86_64-latest.args +++ b/tests/qemuxml2argvdata/iothreads-virtio-scsi-pci.x86_64-latest.args @@ -28,17 +28,17 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ --device virtio-scsi-pci,iothread=3Diothread2,id=3Dscsi0,bus=3Dpci.0,addr= =3D0xb \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ +-device '{"driver":"virtio-scsi-pci","iothread":"iothread2","id":"scsi0","= bus":"pci.0","addr":"0xb"}' \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-3-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-3-format","read-only":false,"driver":"raw= ","file":"libvirt-3-storage"}' \ --device ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-3-format,id=3Dide0-0-0= ,bootindex=3D1 \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-3-form= at","id":"ide0-0-0","bootindex":1}' \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/iothrtest1= .img","node-name":"libvirt-2-storage","auto-read-only":true,"discard":"unma= p"}' \ -blockdev '{"node-name":"libvirt-2-format","read-only":false,"driver":"raw= ","file":"libvirt-2-storage"}' \ --device virtio-blk-pci,iothread=3Diothread1,bus=3Dpci.0,addr=3D0x4,drive= =3Dlibvirt-2-format,id=3Dvirtio-disk1 \ +-device '{"driver":"virtio-blk-pci","iothread":"iothread1","bus":"pci.0","= addr":"0x4","drive":"libvirt-2-format","id":"virtio-disk1"}' \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/iothrtest2= .img","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unma= p"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ --device scsi-hd,bus=3Dscsi0.0,channel=3D0,scsi-id=3D0,lun=3D3,device_id=3D= drive-scsi0-0-0-3,drive=3Dlibvirt-1-format,id=3Dscsi0-0-0-3 \ +-device '{"driver":"scsi-hd","bus":"scsi0.0","channel":0,"scsi-id":0,"lun"= :3,"device_id":"drive-scsi0-0-0-3","drive":"libvirt-1-format","id":"scsi0-0= -0-3"}' \ -audiodev id=3Daudio1,driver=3Dnone \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/kvmclock+eoi-disabled.x86_64-latest.arg= s b/tests/qemuxml2argvdata/kvmclock+eoi-disabled.x86_64-latest.args index 57bdb536ab..764a22d0d4 100644 --- a/tests/qemuxml2argvdata/kvmclock+eoi-disabled.x86_64-latest.args +++ b/tests/qemuxml2argvdata/kvmclock+eoi-disabled.x86_64-latest.args @@ -25,8 +25,8 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -rtc base=3Dutc \ -no-shutdown \ -boot strict=3Don \ --device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ -audiodev id=3Daudio1,driver=3Dnone \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/luks-disks-source-qcow2.x86_64-latest.a= rgs b/tests/qemuxml2argvdata/luks-disks-source-qcow2.x86_64-latest.args index 57f770a758..9608620467 100644 --- a/tests/qemuxml2argvdata/luks-disks-source-qcow2.x86_64-latest.args +++ b/tests/qemuxml2argvdata/luks-disks-source-qcow2.x86_64-latest.args @@ -26,36 +26,36 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-encryptdisk/.confi= g \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ -object '{"qom-type":"secret","id":"libvirt-7-format-encryption-secret0","= data":"9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1","k= eyid":"masterKey0","iv":"AAECAwQFBgcICQoLDA0ODw=3D=3D","format":"base64"}' \ -blockdev '{"driver":"file","filename":"/storage/guest_disks/encryptdisk",= "node-name":"libvirt-7-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-7-format","read-only":false,"driver":"qco= w2","encrypt":{"format":"luks","key-secret":"libvirt-7-format-encryption-se= cret0"},"file":"libvirt-7-storage"}' \ --device virtio-blk-pci,bus=3Dpci.0,addr=3D0x4,drive=3Dlibvirt-7-format,id= =3Dvirtio-disk0,bootindex=3D1 \ +-device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x4","drive":"li= bvirt-7-format","id":"virtio-disk0","bootindex":1}' \ -object '{"qom-type":"secret","id":"libvirt-6-format-encryption-secret0","= data":"9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1","k= eyid":"masterKey0","iv":"AAECAwQFBgcICQoLDA0ODw=3D=3D","format":"base64"}' \ -blockdev '{"driver":"file","filename":"/storage/guest_disks/encryptdisk2"= ,"node-name":"libvirt-6-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-6-format","read-only":false,"driver":"qco= w2","encrypt":{"format":"luks","key-secret":"libvirt-6-format-encryption-se= cret0"},"file":"libvirt-6-storage"}' \ --device virtio-blk-pci,bus=3Dpci.0,addr=3D0x5,drive=3Dlibvirt-6-format,id= =3Dvirtio-disk1 \ +-device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x5","drive":"li= bvirt-6-format","id":"virtio-disk1"}' \ -object '{"qom-type":"secret","id":"libvirt-5-storage-auth-secret0","data"= :"9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1","keyid"= :"masterKey0","iv":"AAECAwQFBgcICQoLDA0ODw=3D=3D","format":"base64"}' \ -object '{"qom-type":"secret","id":"libvirt-5-format-encryption-secret0","= data":"9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1","k= eyid":"masterKey0","iv":"AAECAwQFBgcICQoLDA0ODw=3D=3D","format":"base64"}' \ -blockdev '{"driver":"iscsi","portal":"example.org:6000","target":"iqn.199= 2-01.com.example:storage","lun":1,"transport":"tcp","user":"myname","passwo= rd-secret":"libvirt-5-storage-auth-secret0","node-name":"libvirt-5-storage"= ,"auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-5-format","read-only":false,"driver":"qco= w2","encrypt":{"format":"luks","key-secret":"libvirt-5-format-encryption-se= cret0"},"file":"libvirt-5-storage"}' \ --device virtio-blk-pci,bus=3Dpci.0,addr=3D0x2,drive=3Dlibvirt-5-format,id= =3Dvirtio-disk2 \ +-device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x2","drive":"li= bvirt-5-format","id":"virtio-disk2"}' \ -object '{"qom-type":"secret","id":"libvirt-4-format-encryption-secret0","= data":"9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1","k= eyid":"masterKey0","iv":"AAECAwQFBgcICQoLDA0ODw=3D=3D","format":"base64"}' \ -blockdev '{"driver":"iscsi","portal":"iscsi.example.com:3260","target":"d= emo-target","lun":3,"transport":"tcp","node-name":"libvirt-4-storage","auto= -read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-4-format","read-only":false,"driver":"qco= w2","encrypt":{"format":"luks","key-secret":"libvirt-4-format-encryption-se= cret0"},"file":"libvirt-4-storage"}' \ --device virtio-blk-pci,bus=3Dpci.0,addr=3D0x6,drive=3Dlibvirt-4-format,id= =3Dvirtio-disk3 \ +-device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x6","drive":"li= bvirt-4-format","id":"virtio-disk3"}' \ -object '{"qom-type":"secret","id":"libvirt-3-format-encryption-secret0","= data":"9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1","k= eyid":"masterKey0","iv":"AAECAwQFBgcICQoLDA0ODw=3D=3D","format":"base64"}' \ -blockdev '{"driver":"rbd","pool":"pool","image":"image","server":[{"host"= :"mon1.example.org","port":"6321"},{"host":"mon2.example.org","port":"6322"= },{"host":"mon3.example.org","port":"6322"}],"node-name":"libvirt-3-storage= ","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-3-format","read-only":false,"driver":"qco= w2","encrypt":{"format":"luks","key-secret":"libvirt-3-format-encryption-se= cret0"},"file":"libvirt-3-storage"}' \ --device virtio-blk-pci,bus=3Dpci.0,addr=3D0x7,drive=3Dlibvirt-3-format,id= =3Dvirtio-disk4 \ +-device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x7","drive":"li= bvirt-3-format","id":"virtio-disk4"}' \ -object '{"qom-type":"secret","id":"libvirt-2-format-encryption-secret0","= data":"9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1","k= eyid":"masterKey0","iv":"AAECAwQFBgcICQoLDA0ODw=3D=3D","format":"base64"}' \ -blockdev '{"driver":"file","filename":"/storage/guest_disks/base.qcow2","= node-name":"libvirt-2-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-2-format","read-only":true,"driver":"qcow= 2","encrypt":{"format":"luks","key-secret":"libvirt-2-format-encryption-sec= ret0"},"file":"libvirt-2-storage","backing":null}' \ -object '{"qom-type":"secret","id":"libvirt-1-format-encryption-secret0","= data":"9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1","k= eyid":"masterKey0","iv":"AAECAwQFBgcICQoLDA0ODw=3D=3D","format":"base64"}' \ -blockdev '{"driver":"file","filename":"/storage/guest_disks/encryptdisk5"= ,"node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"qco= w2","encrypt":{"format":"luks","key-secret":"libvirt-1-format-encryption-se= cret0"},"file":"libvirt-1-storage","backing":"libvirt-2-format"}' \ --device virtio-blk-pci,bus=3Dpci.0,addr=3D0x8,drive=3Dlibvirt-1-format,id= =3Dvirtio-disk5 \ +-device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x8","drive":"li= bvirt-1-format","id":"virtio-disk5"}' \ -audiodev id=3Daudio1,driver=3Dnone \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x3 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x3"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/luks-disks-source.x86_64-latest.args b/= tests/qemuxml2argvdata/luks-disks-source.x86_64-latest.args index 67ecf0ea95..31726ba9f3 100644 --- a/tests/qemuxml2argvdata/luks-disks-source.x86_64-latest.args +++ b/tests/qemuxml2argvdata/luks-disks-source.x86_64-latest.args @@ -26,29 +26,29 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-encryptdisk/.confi= g \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ -object '{"qom-type":"secret","id":"libvirt-5-format-encryption-secret0","= data":"9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1","k= eyid":"masterKey0","iv":"AAECAwQFBgcICQoLDA0ODw=3D=3D","format":"base64"}' \ -blockdev '{"driver":"file","filename":"/storage/guest_disks/encryptdisk",= "node-name":"libvirt-5-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-5-format","read-only":false,"driver":"luk= s","key-secret":"libvirt-5-format-encryption-secret0","file":"libvirt-5-sto= rage"}' \ --device virtio-blk-pci,bus=3Dpci.0,addr=3D0x4,drive=3Dlibvirt-5-format,id= =3Dvirtio-disk0,bootindex=3D1 \ +-device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x4","drive":"li= bvirt-5-format","id":"virtio-disk0","bootindex":1}' \ -object '{"qom-type":"secret","id":"libvirt-4-format-encryption-secret0","= data":"9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1","k= eyid":"masterKey0","iv":"AAECAwQFBgcICQoLDA0ODw=3D=3D","format":"base64"}' \ -blockdev '{"driver":"file","filename":"/storage/guest_disks/encryptdisk2"= ,"node-name":"libvirt-4-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-4-format","read-only":false,"driver":"luk= s","key-secret":"libvirt-4-format-encryption-secret0","file":"libvirt-4-sto= rage"}' \ --device virtio-blk-pci,bus=3Dpci.0,addr=3D0x5,drive=3Dlibvirt-4-format,id= =3Dvirtio-disk1 \ +-device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x5","drive":"li= bvirt-4-format","id":"virtio-disk1"}' \ -object '{"qom-type":"secret","id":"libvirt-3-storage-auth-secret0","data"= :"9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1","keyid"= :"masterKey0","iv":"AAECAwQFBgcICQoLDA0ODw=3D=3D","format":"base64"}' \ -object '{"qom-type":"secret","id":"libvirt-3-format-encryption-secret0","= data":"9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1","k= eyid":"masterKey0","iv":"AAECAwQFBgcICQoLDA0ODw=3D=3D","format":"base64"}' \ -blockdev '{"driver":"iscsi","portal":"example.org:6000","target":"iqn.199= 2-01.com.example:storage","lun":1,"transport":"tcp","user":"myname","passwo= rd-secret":"libvirt-3-storage-auth-secret0","node-name":"libvirt-3-storage"= ,"auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-3-format","read-only":false,"driver":"luk= s","key-secret":"libvirt-3-format-encryption-secret0","file":"libvirt-3-sto= rage"}' \ --device virtio-blk-pci,bus=3Dpci.0,addr=3D0x2,drive=3Dlibvirt-3-format,id= =3Dvirtio-disk2 \ +-device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x2","drive":"li= bvirt-3-format","id":"virtio-disk2"}' \ -object '{"qom-type":"secret","id":"libvirt-2-format-encryption-secret0","= data":"9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1","k= eyid":"masterKey0","iv":"AAECAwQFBgcICQoLDA0ODw=3D=3D","format":"base64"}' \ -blockdev '{"driver":"iscsi","portal":"iscsi.example.com:3260","target":"d= emo-target","lun":3,"transport":"tcp","node-name":"libvirt-2-storage","auto= -read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-2-format","read-only":false,"driver":"luk= s","key-secret":"libvirt-2-format-encryption-secret0","file":"libvirt-2-sto= rage"}' \ --device virtio-blk-pci,bus=3Dpci.0,addr=3D0x6,drive=3Dlibvirt-2-format,id= =3Dvirtio-disk3 \ +-device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x6","drive":"li= bvirt-2-format","id":"virtio-disk3"}' \ -object '{"qom-type":"secret","id":"libvirt-1-format-encryption-secret0","= data":"9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1","k= eyid":"masterKey0","iv":"AAECAwQFBgcICQoLDA0ODw=3D=3D","format":"base64"}' \ -blockdev '{"driver":"rbd","pool":"pool","image":"image","server":[{"host"= :"mon1.example.org","port":"6321"},{"host":"mon2.example.org","port":"6322"= },{"host":"mon3.example.org","port":"6322"}],"node-name":"libvirt-1-storage= ","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"luk= s","key-secret":"libvirt-1-format-encryption-secret0","file":"libvirt-1-sto= rage"}' \ --device virtio-blk-pci,bus=3Dpci.0,addr=3D0x7,drive=3Dlibvirt-1-format,id= =3Dvirtio-disk4 \ +-device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x7","drive":"li= bvirt-1-format","id":"virtio-disk4"}' \ -audiodev id=3Daudio1,driver=3Dnone \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x3 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x3"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/luks-disks.x86_64-latest.args b/tests/q= emuxml2argvdata/luks-disks.x86_64-latest.args index c9db60c736..d285f09cc8 100644 --- a/tests/qemuxml2argvdata/luks-disks.x86_64-latest.args +++ b/tests/qemuxml2argvdata/luks-disks.x86_64-latest.args @@ -26,16 +26,16 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-encryptdisk/.confi= g \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ -object '{"qom-type":"secret","id":"libvirt-2-format-encryption-secret0","= data":"9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1","k= eyid":"masterKey0","iv":"AAECAwQFBgcICQoLDA0ODw=3D=3D","format":"base64"}' \ -blockdev '{"driver":"file","filename":"/storage/guest_disks/encryptdisk",= "node-name":"libvirt-2-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-2-format","read-only":false,"driver":"luk= s","key-secret":"libvirt-2-format-encryption-secret0","file":"libvirt-2-sto= rage"}' \ --device virtio-blk-pci,bus=3Dpci.0,addr=3D0x4,drive=3Dlibvirt-2-format,id= =3Dvirtio-disk0,bootindex=3D1 \ +-device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x4","drive":"li= bvirt-2-format","id":"virtio-disk0","bootindex":1}' \ -object '{"qom-type":"secret","id":"libvirt-1-format-encryption-secret0","= data":"9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1","k= eyid":"masterKey0","iv":"AAECAwQFBgcICQoLDA0ODw=3D=3D","format":"base64"}' \ -blockdev '{"driver":"file","filename":"/storage/guest_disks/encryptdisk2"= ,"node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"luk= s","key-secret":"libvirt-1-format-encryption-secret0","file":"libvirt-1-sto= rage"}' \ --device virtio-blk-pci,bus=3Dpci.0,addr=3D0x5,drive=3Dlibvirt-1-format,id= =3Dvirtio-disk1 \ +-device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x5","drive":"li= bvirt-1-format","id":"virtio-disk1"}' \ -audiodev id=3Daudio1,driver=3Dnone \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x3 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x3"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/memfd-memory-default-hugepage.x86_64-la= test.args b/tests/qemuxml2argvdata/memfd-memory-default-hugepage.x86_64-lat= est.args index 5e54908666..f3d1c6c5f4 100644 --- a/tests/qemuxml2argvdata/memfd-memory-default-hugepage.x86_64-latest.ar= gs +++ b/tests/qemuxml2argvdata/memfd-memory-default-hugepage.x86_64-latest.ar= gs @@ -27,8 +27,8 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-instance-00000092/.c= onfig \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ -audiodev id=3Daudio1,driver=3Dnone \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x3 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x3"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/memfd-memory-numa.x86_64-latest.args b/= tests/qemuxml2argvdata/memfd-memory-numa.x86_64-latest.args index 3b33db3c55..4b6468001a 100644 --- a/tests/qemuxml2argvdata/memfd-memory-numa.x86_64-latest.args +++ b/tests/qemuxml2argvdata/memfd-memory-numa.x86_64-latest.args @@ -18,7 +18,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-instance-00000092/.c= onfig \ -object '{"qom-type":"memory-backend-memfd","id":"ram-node0","hugetlb":tru= e,"hugetlbsize":2097152,"share":true,"prealloc":true,"size":15032385536,"ho= st-nodes":[3],"policy":"preferred"}' \ -numa node,nodeid=3D0,cpus=3D0-7,memdev=3Dram-node0 \ -object '{"qom-type":"memory-backend-file","id":"memnvdimm0","mem-path":"/= tmp/nvdimm","share":true,"prealloc":true,"size":536870912,"host-nodes":[3],= "policy":"preferred"}' \ --device nvdimm,node=3D0,memdev=3Dmemnvdimm0,id=3Dnvdimm0,slot=3D0 \ +-device '{"driver":"nvdimm","node":0,"memdev":"memnvdimm0","id":"nvdimm0",= "slot":0}' \ -uuid 126f2720-6f8e-45ab-a886-ec9277079a67 \ -display none \ -no-user-config \ @@ -29,8 +29,8 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-instance-00000092/.c= onfig \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ -audiodev id=3Daudio1,driver=3Dnone \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x3 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x3"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-access.x86_64-lat= est.args b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-access.x86_64-lates= t.args index d124ba7f29..9bd4038381 100644 --- a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-access.x86_64-latest.args +++ b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-access.x86_64-latest.args @@ -18,7 +18,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -object '{"qom-type":"memory-backend-ram","id":"ram-node0","size":22439526= 4}' \ -numa node,nodeid=3D0,cpus=3D0-1,memdev=3Dram-node0 \ -object '{"qom-type":"memory-backend-file","id":"memnvdimm0","mem-path":"/= tmp/nvdimm","share":false,"prealloc":true,"size":536870912}' \ --device nvdimm,node=3D0,memdev=3Dmemnvdimm0,id=3Dnvdimm0,slot=3D0 \ +-device '{"driver":"nvdimm","node":0,"memdev":"memnvdimm0","id":"nvdimm0",= "slot":0}' \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -display none \ -no-user-config \ @@ -29,11 +29,11 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ -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 ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-0-0= ,bootindex=3D1 \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ -audiodev id=3Daudio1,driver=3Dnone \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x3 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x3"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-align.x86_64-late= st.args b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-align.x86_64-latest.= args index c3f5c8d558..87d48b1bb8 100644 --- a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-align.x86_64-latest.args +++ b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-align.x86_64-latest.args @@ -18,7 +18,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -object '{"qom-type":"memory-backend-ram","id":"ram-node0","size":22439526= 4}' \ -numa node,nodeid=3D0,cpus=3D0-1,memdev=3Dram-node0 \ -object '{"qom-type":"memory-backend-file","id":"memnvdimm0","mem-path":"/= tmp/nvdimm","share":false,"prealloc":true,"size":536870912,"align":2097152}= ' \ --device nvdimm,node=3D0,memdev=3Dmemnvdimm0,id=3Dnvdimm0,slot=3D0 \ +-device '{"driver":"nvdimm","node":0,"memdev":"memnvdimm0","id":"nvdimm0",= "slot":0}' \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -display none \ -no-user-config \ @@ -29,11 +29,11 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ -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 ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-0-0= ,bootindex=3D1 \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ -audiodev id=3Daudio1,driver=3Dnone \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x3 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x3"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-label.x86_64-late= st.args b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-label.x86_64-latest.= args index 51ff3dc455..37ccab931a 100644 --- a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-label.x86_64-latest.args +++ b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-label.x86_64-latest.args @@ -18,7 +18,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -object '{"qom-type":"memory-backend-ram","id":"ram-node0","size":22439526= 4}' \ -numa node,nodeid=3D0,cpus=3D0-1,memdev=3Dram-node0 \ -object '{"qom-type":"memory-backend-file","id":"memnvdimm0","mem-path":"/= tmp/nvdimm","share":false,"prealloc":true,"size":536870912}' \ --device nvdimm,node=3D0,label-size=3D131072,memdev=3Dmemnvdimm0,id=3Dnvdim= m0,slot=3D0 \ +-device '{"driver":"nvdimm","node":0,"label-size":131072,"memdev":"memnvdi= mm0","id":"nvdimm0","slot":0}' \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -display none \ -no-user-config \ @@ -29,11 +29,11 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ -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 ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-0-0= ,bootindex=3D1 \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ -audiodev id=3Daudio1,driver=3Dnone \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x3 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x3"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-pmem.x86_64-lates= t.args b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-pmem.x86_64-latest.ar= gs index 19ecd08ae5..772c63cbc9 100644 --- a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-pmem.x86_64-latest.args +++ b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-pmem.x86_64-latest.args @@ -18,7 +18,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -object '{"qom-type":"memory-backend-ram","id":"ram-node0","size":22439526= 4}' \ -numa node,nodeid=3D0,cpus=3D0-1,memdev=3Dram-node0 \ -object '{"qom-type":"memory-backend-file","id":"memnvdimm0","mem-path":"/= tmp/nvdimm","share":false,"size":536870912,"pmem":true}' \ --device nvdimm,node=3D0,memdev=3Dmemnvdimm0,id=3Dnvdimm0,slot=3D0 \ +-device '{"driver":"nvdimm","node":0,"memdev":"memnvdimm0","id":"nvdimm0",= "slot":0}' \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -display none \ -no-user-config \ @@ -29,11 +29,11 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ -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 ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-0-0= ,bootindex=3D1 \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ -audiodev id=3Daudio1,driver=3Dnone \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x3 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x3"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-readonly.x86_64-l= atest.args b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-readonly.x86_64-l= atest.args index 6e9cf15a14..e1c57c2d03 100644 --- a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-readonly.x86_64-latest.a= rgs +++ b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-readonly.x86_64-latest.a= rgs @@ -18,7 +18,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -object '{"qom-type":"memory-backend-ram","id":"ram-node0","size":22439526= 4}' \ -numa node,nodeid=3D0,cpus=3D0-1,memdev=3Dram-node0 \ -object '{"qom-type":"memory-backend-file","id":"memnvdimm0","mem-path":"/= tmp/nvdimm","share":false,"prealloc":true,"size":536870912}' \ --device nvdimm,node=3D0,unarmed=3Don,memdev=3Dmemnvdimm0,id=3Dnvdimm0,slot= =3D0 \ +-device '{"driver":"nvdimm","node":0,"unarmed":true,"memdev":"memnvdimm0",= "id":"nvdimm0","slot":0}' \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -display none \ -no-user-config \ @@ -29,11 +29,11 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ -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 ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-0-0= ,bootindex=3D1 \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ -audiodev id=3Daudio1,driver=3Dnone \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x3 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x3"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/memory-hotplug-nvdimm.x86_64-latest.arg= s b/tests/qemuxml2argvdata/memory-hotplug-nvdimm.x86_64-latest.args index 789f4fa11f..671af859aa 100644 --- a/tests/qemuxml2argvdata/memory-hotplug-nvdimm.x86_64-latest.args +++ b/tests/qemuxml2argvdata/memory-hotplug-nvdimm.x86_64-latest.args @@ -18,7 +18,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -object '{"qom-type":"memory-backend-ram","id":"ram-node0","size":10737418= 24}' \ -numa node,nodeid=3D0,cpus=3D0-1,memdev=3Dram-node0 \ -object '{"qom-type":"memory-backend-file","id":"memnvdimm0","mem-path":"/= tmp/nvdimm","prealloc":true,"size":536870912}' \ --device nvdimm,node=3D0,memdev=3Dmemnvdimm0,id=3Dnvdimm0,slot=3D0 \ +-device '{"driver":"nvdimm","node":0,"memdev":"memnvdimm0","id":"nvdimm0",= "slot":0}' \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -display none \ -no-user-config \ @@ -29,11 +29,11 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ -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 ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-0-0= ,bootindex=3D1 \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ -audiodev id=3Daudio1,driver=3Dnone \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x3 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x3"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/memory-hotplug-virtio-mem.x86_64-latest= .args b/tests/qemuxml2argvdata/memory-hotplug-virtio-mem.x86_64-latest.args index 22ee1bc459..069206173b 100644 --- a/tests/qemuxml2argvdata/memory-hotplug-virtio-mem.x86_64-latest.args +++ b/tests/qemuxml2argvdata/memory-hotplug-virtio-mem.x86_64-latest.args @@ -18,9 +18,9 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -object '{"qom-type":"memory-backend-ram","id":"ram-node0","size":21453864= 96}' \ -numa node,nodeid=3D0,cpus=3D0-1,memdev=3Dram-node0 \ -object '{"qom-type":"memory-backend-ram","id":"memvirtiomem0","reserve":f= alse,"size":1073741824}' \ --device virtio-mem-pci,node=3D0,block-size=3D2097152,requested-size=3D5368= 70912,memdev=3Dmemvirtiomem0,id=3Dvirtiomem0,bus=3Dpci.0,addr=3D0x2 \ +-device '{"driver":"virtio-mem-pci","node":0,"block-size":2097152,"request= ed-size":536870912,"memdev":"memvirtiomem0","id":"virtiomem0","bus":"pci.0"= ,"addr":"0x2"}' \ -object '{"qom-type":"memory-backend-file","id":"memvirtiomem1","mem-path"= :"/dev/hugepages2M/libvirt/qemu/-1-QEMUGuest1","reserve":false,"size":21474= 83648,"host-nodes":[1,2,3],"policy":"bind"}' \ --device virtio-mem-pci,node=3D0,block-size=3D2097152,requested-size=3D1073= 741824,memdev=3Dmemvirtiomem1,id=3Dvirtiomem1,bus=3Dpci.0,addr=3D0x3 \ +-device '{"driver":"virtio-mem-pci","node":0,"block-size":2097152,"request= ed-size":1073741824,"memdev":"memvirtiomem1","id":"virtiomem1","bus":"pci.0= ","addr":"0x3"}' \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -display none \ -no-user-config \ @@ -31,11 +31,11 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ -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 ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-0-0= ,bootindex=3D1 \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ -audiodev id=3Daudio1,driver=3Dnone \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x4 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x4"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/memory-hotplug-virtio-pmem.x86_64-lates= t.args b/tests/qemuxml2argvdata/memory-hotplug-virtio-pmem.x86_64-latest.ar= gs index 4b1c17378b..882a08b84d 100644 --- a/tests/qemuxml2argvdata/memory-hotplug-virtio-pmem.x86_64-latest.args +++ b/tests/qemuxml2argvdata/memory-hotplug-virtio-pmem.x86_64-latest.args @@ -18,7 +18,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -object '{"qom-type":"memory-backend-ram","id":"ram-node0","size":21453864= 96}' \ -numa node,nodeid=3D0,cpus=3D0-1,memdev=3Dram-node0 \ -object '{"qom-type":"memory-backend-file","id":"memvirtiopmem0","mem-path= ":"/tmp/virtio_pmem","share":true,"size":536870912}' \ --device virtio-pmem-pci,memdev=3Dmemvirtiopmem0,id=3Dvirtiopmem0,bus=3Dpci= .0,addr=3D0x5 \ +-device '{"driver":"virtio-pmem-pci","memdev":"memvirtiopmem0","id":"virti= opmem0","bus":"pci.0","addr":"0x5"}' \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -display none \ -no-user-config \ @@ -29,11 +29,11 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ -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 ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-0-0= ,bootindex=3D1 \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ -audiodev id=3Daudio1,driver=3Dnone \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x3 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x3"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/misc-no-reboot.x86_64-latest.args b/tes= ts/qemuxml2argvdata/misc-no-reboot.x86_64-latest.args index f34e9c8708..3041af6a59 100644 --- a/tests/qemuxml2argvdata/misc-no-reboot.x86_64-latest.args +++ b/tests/qemuxml2argvdata/misc-no-reboot.x86_64-latest.args @@ -26,10 +26,10 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ -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 ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-0-0= ,bootindex=3D1 \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ -audiodev id=3Daudio1,driver=3Dnone \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/mlock-off.x86_64-latest.args b/tests/qe= muxml2argvdata/mlock-off.x86_64-latest.args index 16973e6c4f..0c0064e1d3 100644 --- a/tests/qemuxml2argvdata/mlock-off.x86_64-latest.args +++ b/tests/qemuxml2argvdata/mlock-off.x86_64-latest.args @@ -26,7 +26,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ -audiodev id=3Daudio1,driver=3Dnone \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/mlock-on.x86_64-latest.args b/tests/qem= uxml2argvdata/mlock-on.x86_64-latest.args index b6d1988c30..949913a4c1 100644 --- a/tests/qemuxml2argvdata/mlock-on.x86_64-latest.args +++ b/tests/qemuxml2argvdata/mlock-on.x86_64-latest.args @@ -26,7 +26,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ -audiodev id=3Daudio1,driver=3Dnone \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/net-vdpa.x86_64-latest.args b/tests/qem= uxml2argvdata/net-vdpa.x86_64-latest.args index 76320b2374..cb27a2a7be 100644 --- a/tests/qemuxml2argvdata/net-vdpa.x86_64-latest.args +++ b/tests/qemuxml2argvdata/net-vdpa.x86_64-latest.args @@ -26,10 +26,10 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ -add-fd set=3D0,fd=3D1732,opaque=3D/dev/vhost-vdpa-0 \ -netdev vhost-vdpa,vhostdev=3D/dev/fdset/0,id=3Dhostnet0 \ --device virtio-net-pci,netdev=3Dhostnet0,id=3Dnet0,mac=3D52:54:00:95:db:c0= ,bus=3Dpci.0,addr=3D0x2 \ +-device '{"driver":"virtio-net-pci","netdev":"hostnet0","id":"net0","mac":= "52:54:00:95:db:c0","bus":"pci.0","addr":"0x2"}' \ -audiodev id=3Daudio1,driver=3Dnone \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/net-vhostuser.x86_64-latest.args b/test= s/qemuxml2argvdata/net-vhostuser.x86_64-latest.args index 1ac6d60fb8..03f56ef81a 100644 --- a/tests/qemuxml2argvdata/net-vhostuser.x86_64-latest.args +++ b/tests/qemuxml2argvdata/net-vhostuser.x86_64-latest.args @@ -26,15 +26,15 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ +-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 \ --device virtio-net-pci,netdev=3Dhostnet0,id=3Dnet0,mac=3D52:54:00:ee:96:6b= ,bus=3Dpci.0,addr=3D0x2 \ +-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 \ --device virtio-net-pci,netdev=3Dhostnet1,id=3Dnet1,mac=3D52:54:00:ee:96:6c= ,bus=3Dpci.0,addr=3D0x3 \ +-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 \ --device rtl8139,netdev=3Dhostnet2,id=3Dnet2,mac=3D52:54:00:95:db:c0,bus=3D= pci.0,addr=3D0x4 \ +-device '{"driver":"rtl8139","netdev":"hostnet2","id":"net2","mac":"52:54:= 00:95:db:c0","bus":"pci.0","addr":"0x4"}' \ -audiodev id=3Daudio1,driver=3Dnone \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/numatune-hmat.x86_64-latest.args b/test= s/qemuxml2argvdata/numatune-hmat.x86_64-latest.args index 54ab91b09c..fc4756fcc2 100644 --- a/tests/qemuxml2argvdata/numatune-hmat.x86_64-latest.args +++ b/tests/qemuxml2argvdata/numatune-hmat.x86_64-latest.args @@ -41,8 +41,8 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest/.config \ -rtc base=3Dutc \ -no-shutdown \ -boot strict=3Don \ --device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ -audiodev id=3Daudio1,driver=3Dnone \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x3 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x3"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/numatune-memnode-restrictive-mode.x86_6= 4-latest.args b/tests/qemuxml2argvdata/numatune-memnode-restrictive-mode.x8= 6_64-latest.args index 6d5e2eb76e..b547b0b3d6 100644 --- a/tests/qemuxml2argvdata/numatune-memnode-restrictive-mode.x86_64-lates= t.args +++ b/tests/qemuxml2argvdata/numatune-memnode-restrictive-mode.x86_64-lates= t.args @@ -31,8 +31,8 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest/.config \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ -audiodev id=3Daudio1,driver=3Dnone \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/numatune-memnode.x86_64-latest.args b/t= ests/qemuxml2argvdata/numatune-memnode.x86_64-latest.args index fa639f48fe..6a08a7efbd 100644 --- a/tests/qemuxml2argvdata/numatune-memnode.x86_64-latest.args +++ b/tests/qemuxml2argvdata/numatune-memnode.x86_64-latest.args @@ -31,8 +31,8 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest/.config \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ -audiodev id=3Daudio1,driver=3Dnone \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/os-firmware-bios.x86_64-latest.args b/t= ests/qemuxml2argvdata/os-firmware-bios.x86_64-latest.args index 12f4e8fcb9..18e9f0d3ea 100644 --- a/tests/qemuxml2argvdata/os-firmware-bios.x86_64-latest.args +++ b/tests/qemuxml2argvdata/os-firmware-bios.x86_64-latest.args @@ -28,14 +28,14 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-fedora/.config \ -global ICH9-LPC.disable_s3=3D0 \ -global ICH9-LPC.disable_s4=3D1 \ -boot menu=3Don,strict=3Don \ --device i82801b11-bridge,id=3Dpci.1,bus=3Dpcie.0,addr=3D0x1e \ --device pci-bridge,chassis_nr=3D2,id=3Dpci.2,bus=3Dpci.1,addr=3D0x0 \ --device ioh3420,port=3D8,chassis=3D3,id=3Dpci.3,bus=3Dpcie.0,addr=3D0x1 \ --device ich9-usb-ehci1,id=3Dusb,bus=3Dpcie.0,addr=3D0x1d.0x7 \ --device ich9-usb-uhci1,masterbus=3Dusb.0,firstport=3D0,bus=3Dpcie.0,multif= unction=3Don,addr=3D0x1d \ --device ich9-usb-uhci2,masterbus=3Dusb.0,firstport=3D2,bus=3Dpcie.0,addr= =3D0x1d.0x1 \ --device ich9-usb-uhci3,masterbus=3Dusb.0,firstport=3D4,bus=3Dpcie.0,addr= =3D0x1d.0x2 \ +-device '{"driver":"i82801b11-bridge","id":"pci.1","bus":"pcie.0","addr":"= 0x1e"}' \ +-device '{"driver":"pci-bridge","chassis_nr":2,"id":"pci.2","bus":"pci.1",= "addr":"0x0"}' \ +-device '{"driver":"ioh3420","port":8,"chassis":3,"id":"pci.3","bus":"pcie= .0","addr":"0x1"}' \ +-device '{"driver":"ich9-usb-ehci1","id":"usb","bus":"pcie.0","addr":"0x1d= .0x7"}' \ +-device '{"driver":"ich9-usb-uhci1","masterbus":"usb.0","firstport":0,"bus= ":"pcie.0","multifunction":true,"addr":"0x1d"}' \ +-device '{"driver":"ich9-usb-uhci2","masterbus":"usb.0","firstport":2,"bus= ":"pcie.0","addr":"0x1d.0x1"}' \ +-device '{"driver":"ich9-usb-uhci3","masterbus":"usb.0","firstport":4,"bus= ":"pcie.0","addr":"0x1d.0x2"}' \ -audiodev id=3Daudio1,driver=3Dnone \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.2,addr=3D0x1 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.2","add= r":"0x1"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/os-firmware-efi-no-enrolled-keys.x86_64= -latest.args b/tests/qemuxml2argvdata/os-firmware-efi-no-enrolled-keys.x86_= 64-latest.args index 5669c4c12a..9a1f6a0ebf 100644 --- a/tests/qemuxml2argvdata/os-firmware-efi-no-enrolled-keys.x86_64-latest= .args +++ b/tests/qemuxml2argvdata/os-firmware-efi-no-enrolled-keys.x86_64-latest= .args @@ -29,9 +29,9 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-fedora/.config \ -rtc base=3Dutc \ -no-shutdown \ -boot strict=3Don \ --device pcie-root-port,port=3D8,chassis=3D1,id=3Dpci.1,bus=3Dpcie.0,multif= unction=3Don,addr=3D0x1 \ --device pcie-root-port,port=3D9,chassis=3D2,id=3Dpci.2,bus=3Dpcie.0,addr= =3D0x1.0x1 \ --device qemu-xhci,id=3Dusb,bus=3Dpci.1,addr=3D0x0 \ +-device '{"driver":"pcie-root-port","port":8,"chassis":1,"id":"pci.1","bus= ":"pcie.0","multifunction":true,"addr":"0x1"}' \ +-device '{"driver":"pcie-root-port","port":9,"chassis":2,"id":"pci.2","bus= ":"pcie.0","addr":"0x1.0x1"}' \ +-device '{"driver":"qemu-xhci","id":"usb","bus":"pci.1","addr":"0x0"}' \ -audiodev id=3Daudio1,driver=3Dnone \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/os-firmware-efi-secboot.x86_64-latest.a= rgs b/tests/qemuxml2argvdata/os-firmware-efi-secboot.x86_64-latest.args index b0dc79088a..7aca5f5ea3 100644 --- a/tests/qemuxml2argvdata/os-firmware-efi-secboot.x86_64-latest.args +++ b/tests/qemuxml2argvdata/os-firmware-efi-secboot.x86_64-latest.args @@ -32,14 +32,14 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-fedora/.config \ -global ICH9-LPC.disable_s3=3D0 \ -global ICH9-LPC.disable_s4=3D1 \ -boot menu=3Don,strict=3Don \ --device i82801b11-bridge,id=3Dpci.1,bus=3Dpcie.0,addr=3D0x1e \ --device pci-bridge,chassis_nr=3D2,id=3Dpci.2,bus=3Dpci.1,addr=3D0x0 \ --device ioh3420,port=3D8,chassis=3D3,id=3Dpci.3,bus=3Dpcie.0,addr=3D0x1 \ --device ich9-usb-ehci1,id=3Dusb,bus=3Dpcie.0,addr=3D0x1d.0x7 \ --device ich9-usb-uhci1,masterbus=3Dusb.0,firstport=3D0,bus=3Dpcie.0,multif= unction=3Don,addr=3D0x1d \ --device ich9-usb-uhci2,masterbus=3Dusb.0,firstport=3D2,bus=3Dpcie.0,addr= =3D0x1d.0x1 \ --device ich9-usb-uhci3,masterbus=3Dusb.0,firstport=3D4,bus=3Dpcie.0,addr= =3D0x1d.0x2 \ +-device '{"driver":"i82801b11-bridge","id":"pci.1","bus":"pcie.0","addr":"= 0x1e"}' \ +-device '{"driver":"pci-bridge","chassis_nr":2,"id":"pci.2","bus":"pci.1",= "addr":"0x0"}' \ +-device '{"driver":"ioh3420","port":8,"chassis":3,"id":"pci.3","bus":"pcie= .0","addr":"0x1"}' \ +-device '{"driver":"ich9-usb-ehci1","id":"usb","bus":"pcie.0","addr":"0x1d= .0x7"}' \ +-device '{"driver":"ich9-usb-uhci1","masterbus":"usb.0","firstport":0,"bus= ":"pcie.0","multifunction":true,"addr":"0x1d"}' \ +-device '{"driver":"ich9-usb-uhci2","masterbus":"usb.0","firstport":2,"bus= ":"pcie.0","addr":"0x1d.0x1"}' \ +-device '{"driver":"ich9-usb-uhci3","masterbus":"usb.0","firstport":4,"bus= ":"pcie.0","addr":"0x1d.0x2"}' \ -audiodev id=3Daudio1,driver=3Dnone \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.2,addr=3D0x1 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.2","add= r":"0x1"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/os-firmware-efi.x86_64-latest.args b/te= sts/qemuxml2argvdata/os-firmware-efi.x86_64-latest.args index 99dcc39d0f..dcf2455461 100644 --- a/tests/qemuxml2argvdata/os-firmware-efi.x86_64-latest.args +++ b/tests/qemuxml2argvdata/os-firmware-efi.x86_64-latest.args @@ -31,14 +31,14 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-fedora/.config \ -global ICH9-LPC.disable_s3=3D0 \ -global ICH9-LPC.disable_s4=3D1 \ -boot menu=3Don,strict=3Don \ --device i82801b11-bridge,id=3Dpci.1,bus=3Dpcie.0,addr=3D0x1e \ --device pci-bridge,chassis_nr=3D2,id=3Dpci.2,bus=3Dpci.1,addr=3D0x0 \ --device ioh3420,port=3D8,chassis=3D3,id=3Dpci.3,bus=3Dpcie.0,addr=3D0x1 \ --device ich9-usb-ehci1,id=3Dusb,bus=3Dpcie.0,addr=3D0x1d.0x7 \ --device ich9-usb-uhci1,masterbus=3Dusb.0,firstport=3D0,bus=3Dpcie.0,multif= unction=3Don,addr=3D0x1d \ --device ich9-usb-uhci2,masterbus=3Dusb.0,firstport=3D2,bus=3Dpcie.0,addr= =3D0x1d.0x1 \ --device ich9-usb-uhci3,masterbus=3Dusb.0,firstport=3D4,bus=3Dpcie.0,addr= =3D0x1d.0x2 \ +-device '{"driver":"i82801b11-bridge","id":"pci.1","bus":"pcie.0","addr":"= 0x1e"}' \ +-device '{"driver":"pci-bridge","chassis_nr":2,"id":"pci.2","bus":"pci.1",= "addr":"0x0"}' \ +-device '{"driver":"ioh3420","port":8,"chassis":3,"id":"pci.3","bus":"pcie= .0","addr":"0x1"}' \ +-device '{"driver":"ich9-usb-ehci1","id":"usb","bus":"pcie.0","addr":"0x1d= .0x7"}' \ +-device '{"driver":"ich9-usb-uhci1","masterbus":"usb.0","firstport":0,"bus= ":"pcie.0","multifunction":true,"addr":"0x1d"}' \ +-device '{"driver":"ich9-usb-uhci2","masterbus":"usb.0","firstport":2,"bus= ":"pcie.0","addr":"0x1d.0x1"}' \ +-device '{"driver":"ich9-usb-uhci3","masterbus":"usb.0","firstport":4,"bus= ":"pcie.0","addr":"0x1d.0x2"}' \ -audiodev id=3Daudio1,driver=3Dnone \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.2,addr=3D0x1 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.2","add= r":"0x1"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/panic-double.x86_64-latest.args b/tests= /qemuxml2argvdata/panic-double.x86_64-latest.args index 960339c1b2..9e54f2f990 100644 --- a/tests/qemuxml2argvdata/panic-double.x86_64-latest.args +++ b/tests/qemuxml2argvdata/panic-double.x86_64-latest.args @@ -25,8 +25,8 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -rtc base=3Dutc \ -no-shutdown \ -boot strict=3Don \ --device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ -audiodev id=3Daudio1,driver=3Dnone \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ --device pvpanic,ioport=3D1285 \ +-device '{"driver":"pvpanic","ioport":1285}' \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/panic-no-address.x86_64-latest.args b/t= ests/qemuxml2argvdata/panic-no-address.x86_64-latest.args index 7949091e87..1e63fde002 100644 --- a/tests/qemuxml2argvdata/panic-no-address.x86_64-latest.args +++ b/tests/qemuxml2argvdata/panic-no-address.x86_64-latest.args @@ -26,12 +26,12 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ -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 ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-0-0= ,bootindex=3D1 \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ -audiodev id=3Daudio1,driver=3Dnone \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ --device pvpanic \ +-device '{"driver":"pvpanic"}' \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/panic.x86_64-latest.args b/tests/qemuxm= l2argvdata/panic.x86_64-latest.args index 35e387696e..782d252cde 100644 --- a/tests/qemuxml2argvdata/panic.x86_64-latest.args +++ b/tests/qemuxml2argvdata/panic.x86_64-latest.args @@ -26,12 +26,12 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ -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 ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-0-0= ,bootindex=3D1 \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ -audiodev id=3Daudio1,driver=3Dnone \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ --device pvpanic,ioport=3D1285 \ +-device '{"driver":"pvpanic","ioport":1285}' \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/parallel-unix-chardev.x86_64-latest.arg= s b/tests/qemuxml2argvdata/parallel-unix-chardev.x86_64-latest.args index dad197b1cf..3c15fc9910 100644 --- a/tests/qemuxml2argvdata/parallel-unix-chardev.x86_64-latest.args +++ b/tests/qemuxml2argvdata/parallel-unix-chardev.x86_64-latest.args @@ -26,12 +26,12 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ -chardev socket,id=3Dcharparallel0,fd=3D1729,server=3Don,wait=3Doff \ --device isa-parallel,chardev=3Dcharparallel0,id=3Dparallel0 \ +-device '{"driver":"isa-parallel","chardev":"charparallel0","id":"parallel= 0"}' \ -chardev socket,id=3Dcharparallel1,path=3D/tmp/parport1.socket \ --device isa-parallel,chardev=3Dcharparallel1,id=3Dparallel1 \ +-device '{"driver":"isa-parallel","chardev":"charparallel1","id":"parallel= 1"}' \ -audiodev id=3Daudio1,driver=3Dnone \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/pc-i440fx-acpi-hotplug-bridge-disable.x= 86_64-latest.args b/tests/qemuxml2argvdata/pc-i440fx-acpi-hotplug-bridge-di= sable.x86_64-latest.args index 26de6c81ec..8a3e91c95e 100644 --- a/tests/qemuxml2argvdata/pc-i440fx-acpi-hotplug-bridge-disable.x86_64-l= atest.args +++ b/tests/qemuxml2argvdata/pc-i440fx-acpi-hotplug-bridge-disable.x86_64-l= atest.args @@ -27,8 +27,8 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-i440fx/.config \ -no-acpi \ -global PIIX4_PM.acpi-pci-hotplug-with-bridge-support=3Doff \ -boot strict=3Don \ --device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ -audiodev id=3Daudio1,driver=3Dnone \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/pc-i440fx-acpi-hotplug-bridge-enable.x8= 6_64-latest.args b/tests/qemuxml2argvdata/pc-i440fx-acpi-hotplug-bridge-ena= ble.x86_64-latest.args index 92b1c8c541..77ef82f25b 100644 --- a/tests/qemuxml2argvdata/pc-i440fx-acpi-hotplug-bridge-enable.x86_64-la= test.args +++ b/tests/qemuxml2argvdata/pc-i440fx-acpi-hotplug-bridge-enable.x86_64-la= test.args @@ -27,8 +27,8 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-i440fx/.config \ -no-acpi \ -global PIIX4_PM.acpi-pci-hotplug-with-bridge-support=3Don \ -boot strict=3Don \ --device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ -audiodev id=3Daudio1,driver=3Dnone \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/pc-i440fx-acpi-root-hotplug-disable.x86= _64-latest.args b/tests/qemuxml2argvdata/pc-i440fx-acpi-root-hotplug-disabl= e.x86_64-latest.args index 056a925bc0..9e19078aa3 100644 --- a/tests/qemuxml2argvdata/pc-i440fx-acpi-root-hotplug-disable.x86_64-lat= est.args +++ b/tests/qemuxml2argvdata/pc-i440fx-acpi-root-hotplug-disable.x86_64-lat= est.args @@ -27,8 +27,8 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-i440fx/.config \ -no-acpi \ -boot strict=3Don \ -global PIIX4_PM.acpi-root-pci-hotplug=3Doff \ --device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ -audiodev id=3Daudio1,driver=3Dnone \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/pc-i440fx-acpi-root-hotplug-enable.x86_= 64-latest.args b/tests/qemuxml2argvdata/pc-i440fx-acpi-root-hotplug-enable.= x86_64-latest.args index 244877a88f..7cd8d4a05f 100644 --- a/tests/qemuxml2argvdata/pc-i440fx-acpi-root-hotplug-enable.x86_64-late= st.args +++ b/tests/qemuxml2argvdata/pc-i440fx-acpi-root-hotplug-enable.x86_64-late= st.args @@ -27,8 +27,8 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-i440fx/.config \ -no-acpi \ -boot strict=3Don \ -global PIIX4_PM.acpi-root-pci-hotplug=3Don \ --device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ -audiodev id=3Daudio1,driver=3Dnone \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/pcie-root-port-nohotplug.x86_64-latest.= args b/tests/qemuxml2argvdata/pcie-root-port-nohotplug.x86_64-latest.args index a43f6dda90..e75054b80d 100644 --- a/tests/qemuxml2argvdata/pcie-root-port-nohotplug.x86_64-latest.args +++ b/tests/qemuxml2argvdata/pcie-root-port-nohotplug.x86_64-latest.args @@ -26,15 +26,15 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-guest/.config \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device pcie-root-port,port=3D8,chassis=3D1,id=3Dpci.1,bus=3Dpcie.0,multif= unction=3Don,addr=3D0x1 \ --device pcie-root-port,port=3D9,chassis=3D2,id=3Dpci.2,hotplug=3Doff,bus= =3Dpcie.0,addr=3D0x1.0x1 \ --device ioh3420,port=3D10,chassis=3D3,id=3Dpci.3,hotplug=3Doff,bus=3Dpcie.= 0,addr=3D0x1.0x2 \ --device x3130-upstream,id=3Dpci.4,bus=3Dpci.1,addr=3D0x0 \ --device xio3130-downstream,port=3D0,chassis=3D5,id=3Dpci.5,hotplug=3Doff,b= us=3Dpci.4,addr=3D0x0 \ --device xio3130-downstream,port=3D1,chassis=3D6,id=3Dpci.6,hotplug=3Don,bu= s=3Dpci.4,addr=3D0x1 \ --device xio3130-downstream,port=3D2,chassis=3D7,id=3Dpci.7,bus=3Dpci.4,add= r=3D0x2 \ --device xio3130-downstream,port=3D39,chassis=3D30,id=3Dpci.8,bus=3Dpci.4,a= ddr=3D0x3 \ --device qemu-xhci,id=3Dusb,bus=3Dpci.2,addr=3D0x0 \ +-device '{"driver":"pcie-root-port","port":8,"chassis":1,"id":"pci.1","bus= ":"pcie.0","multifunction":true,"addr":"0x1"}' \ +-device '{"driver":"pcie-root-port","port":9,"chassis":2,"id":"pci.2","hot= plug":false,"bus":"pcie.0","addr":"0x1.0x1"}' \ +-device '{"driver":"ioh3420","port":10,"chassis":3,"id":"pci.3","hotplug":= false,"bus":"pcie.0","addr":"0x1.0x2"}' \ +-device '{"driver":"x3130-upstream","id":"pci.4","bus":"pci.1","addr":"0x0= "}' \ +-device '{"driver":"xio3130-downstream","port":0,"chassis":5,"id":"pci.5",= "hotplug":false,"bus":"pci.4","addr":"0x0"}' \ +-device '{"driver":"xio3130-downstream","port":1,"chassis":6,"id":"pci.6",= "hotplug":true,"bus":"pci.4","addr":"0x1"}' \ +-device '{"driver":"xio3130-downstream","port":2,"chassis":7,"id":"pci.7",= "bus":"pci.4","addr":"0x2"}' \ +-device '{"driver":"xio3130-downstream","port":39,"chassis":30,"id":"pci.8= ","bus":"pci.4","addr":"0x3"}' \ +-device '{"driver":"qemu-xhci","id":"usb","bus":"pci.2","addr":"0x0"}' \ -audiodev id=3Daudio1,driver=3Dnone \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/pv-spinlock-disabled.x86_64-latest.args= b/tests/qemuxml2argvdata/pv-spinlock-disabled.x86_64-latest.args index a7a107f4b8..d728d3e110 100644 --- a/tests/qemuxml2argvdata/pv-spinlock-disabled.x86_64-latest.args +++ b/tests/qemuxml2argvdata/pv-spinlock-disabled.x86_64-latest.args @@ -25,8 +25,8 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -rtc base=3Dutc \ -no-shutdown \ -boot strict=3Don \ --device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ -audiodev id=3Daudio1,driver=3Dnone \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/pv-spinlock-enabled.x86_64-latest.args = b/tests/qemuxml2argvdata/pv-spinlock-enabled.x86_64-latest.args index b217034eb0..bdf07ba921 100644 --- a/tests/qemuxml2argvdata/pv-spinlock-enabled.x86_64-latest.args +++ b/tests/qemuxml2argvdata/pv-spinlock-enabled.x86_64-latest.args @@ -25,8 +25,8 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -rtc base=3Dutc \ -no-shutdown \ -boot strict=3Don \ --device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ -audiodev id=3Daudio1,driver=3Dnone \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/q35-acpi-hotplug-bridge-disable.x86_64-= latest.args b/tests/qemuxml2argvdata/q35-acpi-hotplug-bridge-disable.x86_64= -latest.args index 1284975b75..5558f371ea 100644 --- a/tests/qemuxml2argvdata/q35-acpi-hotplug-bridge-disable.x86_64-latest.= args +++ b/tests/qemuxml2argvdata/q35-acpi-hotplug-bridge-disable.x86_64-latest.= args @@ -27,11 +27,11 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-q35/.config \ -no-acpi \ -global ICH9-LPC.acpi-pci-hotplug-with-bridge-support=3Doff \ -boot strict=3Don \ --device i82801b11-bridge,id=3Dpci.1,bus=3Dpcie.0,addr=3D0x1e \ --device pci-bridge,chassis_nr=3D2,id=3Dpci.2,bus=3Dpci.1,addr=3D0x0 \ --device ioh3420,port=3D8,chassis=3D3,id=3Dpci.3,bus=3Dpcie.0,addr=3D0x1 \ --device qemu-xhci,id=3Dusb,bus=3Dpci.3,addr=3D0x0 \ +-device '{"driver":"i82801b11-bridge","id":"pci.1","bus":"pcie.0","addr":"= 0x1e"}' \ +-device '{"driver":"pci-bridge","chassis_nr":2,"id":"pci.2","bus":"pci.1",= "addr":"0x0"}' \ +-device '{"driver":"ioh3420","port":8,"chassis":3,"id":"pci.3","bus":"pcie= .0","addr":"0x1"}' \ +-device '{"driver":"qemu-xhci","id":"usb","bus":"pci.3","addr":"0x0"}' \ -audiodev id=3Daudio1,driver=3Dnone \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.2,addr=3D0x1 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.2","add= r":"0x1"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/q35-acpi-hotplug-bridge-enable.x86_64-l= atest.args b/tests/qemuxml2argvdata/q35-acpi-hotplug-bridge-enable.x86_64-l= atest.args index 07ad55abb6..4ff07ad3b8 100644 --- a/tests/qemuxml2argvdata/q35-acpi-hotplug-bridge-enable.x86_64-latest.a= rgs +++ b/tests/qemuxml2argvdata/q35-acpi-hotplug-bridge-enable.x86_64-latest.a= rgs @@ -27,11 +27,11 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-q35/.config \ -no-acpi \ -global ICH9-LPC.acpi-pci-hotplug-with-bridge-support=3Don \ -boot strict=3Don \ --device i82801b11-bridge,id=3Dpci.1,bus=3Dpcie.0,addr=3D0x1e \ --device pci-bridge,chassis_nr=3D2,id=3Dpci.2,bus=3Dpci.1,addr=3D0x0 \ --device ioh3420,port=3D8,chassis=3D3,id=3Dpci.3,bus=3Dpcie.0,addr=3D0x1 \ --device qemu-xhci,id=3Dusb,bus=3Dpci.3,addr=3D0x0 \ +-device '{"driver":"i82801b11-bridge","id":"pci.1","bus":"pcie.0","addr":"= 0x1e"}' \ +-device '{"driver":"pci-bridge","chassis_nr":2,"id":"pci.2","bus":"pci.1",= "addr":"0x0"}' \ +-device '{"driver":"ioh3420","port":8,"chassis":3,"id":"pci.3","bus":"pcie= .0","addr":"0x1"}' \ +-device '{"driver":"qemu-xhci","id":"usb","bus":"pci.3","addr":"0x0"}' \ -audiodev id=3Daudio1,driver=3Dnone \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.2,addr=3D0x1 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.2","add= r":"0x1"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/qemu-ns.x86_64-latest.args b/tests/qemu= xml2argvdata/qemu-ns.x86_64-latest.args index c434ff17a1..34688dbcf4 100644 --- a/tests/qemuxml2argvdata/qemu-ns.x86_64-latest.args +++ b/tests/qemuxml2argvdata/qemu-ns.x86_64-latest.args @@ -29,12 +29,12 @@ BAR=3D'' \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ -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 ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-0-0= ,bootindex=3D1 \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ -audiodev id=3Daudio1,driver=3Dnone \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ -unknown parameter \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/serial-unix-chardev.x86_64-latest.args = b/tests/qemuxml2argvdata/serial-unix-chardev.x86_64-latest.args index 55a568d50f..64ad0be640 100644 --- a/tests/qemuxml2argvdata/serial-unix-chardev.x86_64-latest.args +++ b/tests/qemuxml2argvdata/serial-unix-chardev.x86_64-latest.args @@ -26,12 +26,12 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ -chardev socket,id=3Dcharserial0,path=3D/tmp/serial.sock \ --device isa-serial,chardev=3Dcharserial0,id=3Dserial0 \ +-device '{"driver":"isa-serial","chardev":"charserial0","id":"serial0"}' \ -chardev socket,id=3Dcharserial1,fd=3D1729,server=3Don,wait=3Doff \ --device isa-serial,chardev=3Dcharserial1,id=3Dserial1 \ +-device '{"driver":"isa-serial","chardev":"charserial1","id":"serial1"}' \ -audiodev id=3Daudio1,driver=3Dnone \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/smartcard-passthrough-unix.x86_64-lates= t.args b/tests/qemuxml2argvdata/smartcard-passthrough-unix.x86_64-latest.ar= gs index da82e3d50a..6e88026146 100644 --- a/tests/qemuxml2argvdata/smartcard-passthrough-unix.x86_64-latest.args +++ b/tests/qemuxml2argvdata/smartcard-passthrough-unix.x86_64-latest.args @@ -26,11 +26,11 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ --device usb-ccid,id=3Dccid0,bus=3Dusb.0,port=3D1 \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ +-device '{"driver":"usb-ccid","id":"ccid0","bus":"usb.0","port":"1"}' \ -chardev socket,id=3Dcharsmartcard0,fd=3D1729,server=3Don,wait=3Doff \ --device ccid-card-passthru,chardev=3Dcharsmartcard0,id=3Dsmartcard0,bus=3D= ccid0.0 \ +-device '{"driver":"ccid-card-passthru","chardev":"charsmartcard0","id":"s= martcard0","bus":"ccid0.0"}' \ -audiodev id=3Daudio1,driver=3Dnone \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/tpm-emulator-tpm2-enc.x86_64-latest.arg= s b/tests/qemuxml2argvdata/tpm-emulator-tpm2-enc.x86_64-latest.args index a36eef6d03..ff96260bf0 100644 --- a/tests/qemuxml2argvdata/tpm-emulator-tpm2-enc.x86_64-latest.args +++ b/tests/qemuxml2argvdata/tpm-emulator-tpm2-enc.x86_64-latest.args @@ -25,11 +25,11 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-TPM-VM/.config \ -rtc base=3Dutc \ -no-shutdown \ -boot menu=3Don,strict=3Don \ --device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ -tpmdev emulator,id=3Dtpm-tpm0,chardev=3Dchrtpm \ -chardev socket,id=3Dchrtpm,path=3D/dev/test \ --device tpm-tis,tpmdev=3Dtpm-tpm0,id=3Dtpm0 \ +-device '{"driver":"tpm-tis","tpmdev":"tpm-tpm0","id":"tpm0"}' \ -audiodev id=3Daudio1,driver=3Dnone \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/tpm-emulator-tpm2-pstate.x86_64-latest.= args b/tests/qemuxml2argvdata/tpm-emulator-tpm2-pstate.x86_64-latest.args index a36eef6d03..ff96260bf0 100644 --- a/tests/qemuxml2argvdata/tpm-emulator-tpm2-pstate.x86_64-latest.args +++ b/tests/qemuxml2argvdata/tpm-emulator-tpm2-pstate.x86_64-latest.args @@ -25,11 +25,11 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-TPM-VM/.config \ -rtc base=3Dutc \ -no-shutdown \ -boot menu=3Don,strict=3Don \ --device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ -tpmdev emulator,id=3Dtpm-tpm0,chardev=3Dchrtpm \ -chardev socket,id=3Dchrtpm,path=3D/dev/test \ --device tpm-tis,tpmdev=3Dtpm-tpm0,id=3Dtpm0 \ +-device '{"driver":"tpm-tis","tpmdev":"tpm-tpm0","id":"tpm0"}' \ -audiodev id=3Daudio1,driver=3Dnone \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/tpm-emulator-tpm2.x86_64-latest.args b/= tests/qemuxml2argvdata/tpm-emulator-tpm2.x86_64-latest.args index a36eef6d03..ff96260bf0 100644 --- a/tests/qemuxml2argvdata/tpm-emulator-tpm2.x86_64-latest.args +++ b/tests/qemuxml2argvdata/tpm-emulator-tpm2.x86_64-latest.args @@ -25,11 +25,11 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-TPM-VM/.config \ -rtc base=3Dutc \ -no-shutdown \ -boot menu=3Don,strict=3Don \ --device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ -tpmdev emulator,id=3Dtpm-tpm0,chardev=3Dchrtpm \ -chardev socket,id=3Dchrtpm,path=3D/dev/test \ --device tpm-tis,tpmdev=3Dtpm-tpm0,id=3Dtpm0 \ +-device '{"driver":"tpm-tis","tpmdev":"tpm-tpm0","id":"tpm0"}' \ -audiodev id=3Daudio1,driver=3Dnone \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/tpm-emulator.x86_64-latest.args b/tests= /qemuxml2argvdata/tpm-emulator.x86_64-latest.args index a36eef6d03..ff96260bf0 100644 --- a/tests/qemuxml2argvdata/tpm-emulator.x86_64-latest.args +++ b/tests/qemuxml2argvdata/tpm-emulator.x86_64-latest.args @@ -25,11 +25,11 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-TPM-VM/.config \ -rtc base=3Dutc \ -no-shutdown \ -boot menu=3Don,strict=3Don \ --device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ -tpmdev emulator,id=3Dtpm-tpm0,chardev=3Dchrtpm \ -chardev socket,id=3Dchrtpm,path=3D/dev/test \ --device tpm-tis,tpmdev=3Dtpm-tpm0,id=3Dtpm0 \ +-device '{"driver":"tpm-tis","tpmdev":"tpm-tpm0","id":"tpm0"}' \ -audiodev id=3Daudio1,driver=3Dnone \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/tpm-passthrough-crb.x86_64-latest.args = b/tests/qemuxml2argvdata/tpm-passthrough-crb.x86_64-latest.args index 5f7cc2b272..6f60c4b710 100644 --- a/tests/qemuxml2argvdata/tpm-passthrough-crb.x86_64-latest.args +++ b/tests/qemuxml2argvdata/tpm-passthrough-crb.x86_64-latest.args @@ -25,12 +25,12 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-TPM-VM/.config \ -rtc base=3Dutc \ -no-shutdown \ -boot menu=3Don,strict=3Don \ --device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ -tpmdev passthrough,id=3Dtpm-tpm0,path=3D/dev/fdset/0,cancel-path=3D/dev/f= dset/1 \ -add-fd set=3D0,fd=3D1730 \ -add-fd set=3D1,fd=3D1731 \ --device tpm-crb,tpmdev=3Dtpm-tpm0,id=3Dtpm0 \ +-device '{"driver":"tpm-crb","tpmdev":"tpm-tpm0","id":"tpm0"}' \ -audiodev id=3Daudio1,driver=3Dnone \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/tpm-passthrough.x86_64-latest.args b/te= sts/qemuxml2argvdata/tpm-passthrough.x86_64-latest.args index a0a93a8fbf..f5a69821e9 100644 --- a/tests/qemuxml2argvdata/tpm-passthrough.x86_64-latest.args +++ b/tests/qemuxml2argvdata/tpm-passthrough.x86_64-latest.args @@ -25,12 +25,12 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-TPM-VM/.config \ -rtc base=3Dutc \ -no-shutdown \ -boot menu=3Don,strict=3Don \ --device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ -tpmdev passthrough,id=3Dtpm-tpm0,path=3D/dev/fdset/0,cancel-path=3D/dev/f= dset/1 \ -add-fd set=3D0,fd=3D1730 \ -add-fd set=3D1,fd=3D1731 \ --device tpm-tis,tpmdev=3Dtpm-tpm0,id=3Dtpm0 \ +-device '{"driver":"tpm-tis","tpmdev":"tpm-tpm0","id":"tpm0"}' \ -audiodev id=3Daudio1,driver=3Dnone \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/tseg-explicit-size.x86_64-latest.args b= /tests/qemuxml2argvdata/tseg-explicit-size.x86_64-latest.args index ed72935350..1a73a35eb3 100644 --- a/tests/qemuxml2argvdata/tseg-explicit-size.x86_64-latest.args +++ b/tests/qemuxml2argvdata/tseg-explicit-size.x86_64-latest.args @@ -27,11 +27,11 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device pcie-root-port,port=3D8,chassis=3D1,id=3Dpci.1,bus=3Dpcie.0,multif= unction=3Don,addr=3D0x1 \ --device pcie-root-port,port=3D9,chassis=3D2,id=3Dpci.2,bus=3Dpcie.0,addr= =3D0x1.0x1 \ --device pcie-root-port,port=3D10,chassis=3D3,id=3Dpci.3,bus=3Dpcie.0,addr= =3D0x1.0x2 \ --device qemu-xhci,id=3Dusb,bus=3Dpci.1,addr=3D0x0 \ +-device '{"driver":"pcie-root-port","port":8,"chassis":1,"id":"pci.1","bus= ":"pcie.0","multifunction":true,"addr":"0x1"}' \ +-device '{"driver":"pcie-root-port","port":9,"chassis":2,"id":"pci.2","bus= ":"pcie.0","addr":"0x1.0x1"}' \ +-device '{"driver":"pcie-root-port","port":10,"chassis":3,"id":"pci.3","bu= s":"pcie.0","addr":"0x1.0x2"}' \ +-device '{"driver":"qemu-xhci","id":"usb","bus":"pci.1","addr":"0x0"}' \ -audiodev id=3Daudio1,driver=3Dnone \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.2,addr=3D0x0 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.2","add= r":"0x0"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/usb-redir-unix.x86_64-latest.args b/tes= ts/qemuxml2argvdata/usb-redir-unix.x86_64-latest.args index fd969b7dde..bb3c26dbd4 100644 --- a/tests/qemuxml2argvdata/usb-redir-unix.x86_64-latest.args +++ b/tests/qemuxml2argvdata/usb-redir-unix.x86_64-latest.args @@ -26,15 +26,15 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device ich9-usb-ehci1,id=3Dusb,bus=3Dpci.0,addr=3D0x4.0x7 \ --device ich9-usb-uhci1,masterbus=3Dusb.0,firstport=3D0,bus=3Dpci.0,multifu= nction=3Don,addr=3D0x4 \ --device ich9-usb-uhci2,masterbus=3Dusb.0,firstport=3D2,bus=3Dpci.0,addr=3D= 0x4.0x1 \ --device ich9-usb-uhci3,masterbus=3Dusb.0,firstport=3D4,bus=3Dpci.0,addr=3D= 0x4.0x2 \ +-device '{"driver":"ich9-usb-ehci1","id":"usb","bus":"pci.0","addr":"0x4.0= x7"}' \ +-device '{"driver":"ich9-usb-uhci1","masterbus":"usb.0","firstport":0,"bus= ":"pci.0","multifunction":true,"addr":"0x4"}' \ +-device '{"driver":"ich9-usb-uhci2","masterbus":"usb.0","firstport":2,"bus= ":"pci.0","addr":"0x4.0x1"}' \ +-device '{"driver":"ich9-usb-uhci3","masterbus":"usb.0","firstport":4,"bus= ":"pci.0","addr":"0x4.0x2"}' \ -audiodev id=3Daudio1,driver=3Dnone \ -chardev socket,id=3Dcharredir0,path=3D/tmp/connect.socket \ --device usb-redir,chardev=3Dcharredir0,id=3Dredir0,bus=3Dusb.0,port=3D1 \ +-device '{"driver":"usb-redir","chardev":"charredir0","id":"redir0","bus":= "usb.0","port":"1"}' \ -chardev socket,id=3Dcharredir1,fd=3D1729,server=3Don,wait=3Doff \ --device usb-redir,chardev=3Dcharredir1,id=3Dredir1,bus=3Dusb.0,port=3D2 \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ +-device '{"driver":"usb-redir","chardev":"charredir1","id":"redir1","bus":= "usb.0","port":"2"}' \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/vhost-user-fs-fd-memory.x86_64-latest.a= rgs b/tests/qemuxml2argvdata/vhost-user-fs-fd-memory.x86_64-latest.args index 8adab6da81..699d82cdca 100644 --- a/tests/qemuxml2argvdata/vhost-user-fs-fd-memory.x86_64-latest.args +++ b/tests/qemuxml2argvdata/vhost-user-fs-fd-memory.x86_64-latest.args @@ -28,7 +28,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-guest/.config \ -no-acpi \ -boot strict=3Don \ -chardev socket,id=3Dchr-vu-fs0,path=3D/tmp/lib/domain--1-guest/fs0-fs.soc= k \ --device vhost-user-fs-pci,id=3Dfs0,chardev=3Dchr-vu-fs0,queue-size=3D1024,= tag=3Dmount_tag,bus=3Dpci.0,addr=3D0x2 \ +-device '{"driver":"vhost-user-fs-pci","id":"fs0","chardev":"chr-vu-fs0","= queue-size":1024,"tag":"mount_tag","bus":"pci.0","addr":"0x2"}' \ -audiodev id=3Daudio1,driver=3Dnone \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/vhost-user-fs-hugepages.x86_64-latest.a= rgs b/tests/qemuxml2argvdata/vhost-user-fs-hugepages.x86_64-latest.args index 8743ef8d3f..3892b034f2 100644 --- a/tests/qemuxml2argvdata/vhost-user-fs-hugepages.x86_64-latest.args +++ b/tests/qemuxml2argvdata/vhost-user-fs-hugepages.x86_64-latest.args @@ -26,15 +26,15 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-guest/.config \ -rtc base=3Dutc \ -no-shutdown \ -boot strict=3Don \ --device pcie-root-port,port=3D8,chassis=3D1,id=3Dpci.1,bus=3Dpcie.0,multif= unction=3Don,addr=3D0x1 \ --device pcie-root-port,port=3D9,chassis=3D2,id=3Dpci.2,bus=3Dpcie.0,addr= =3D0x1.0x1 \ --device pcie-root-port,port=3D10,chassis=3D3,id=3Dpci.3,bus=3Dpcie.0,addr= =3D0x1.0x2 \ --device pcie-root-port,port=3D11,chassis=3D4,id=3Dpci.4,bus=3Dpcie.0,addr= =3D0x1.0x3 \ +-device '{"driver":"pcie-root-port","port":8,"chassis":1,"id":"pci.1","bus= ":"pcie.0","multifunction":true,"addr":"0x1"}' \ +-device '{"driver":"pcie-root-port","port":9,"chassis":2,"id":"pci.2","bus= ":"pcie.0","addr":"0x1.0x1"}' \ +-device '{"driver":"pcie-root-port","port":10,"chassis":3,"id":"pci.3","bu= s":"pcie.0","addr":"0x1.0x2"}' \ +-device '{"driver":"pcie-root-port","port":11,"chassis":4,"id":"pci.4","bu= s":"pcie.0","addr":"0x1.0x3"}' \ -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 virtio-blk-pci,bus=3Dpci.4,addr=3D0x0,drive=3Dlibvirt-1-format,id= =3Dvirtio-disk0,bootindex=3D1 \ +-device '{"driver":"virtio-blk-pci","bus":"pci.4","addr":"0x0","drive":"li= bvirt-1-format","id":"virtio-disk0","bootindex":1}' \ -chardev socket,id=3Dchr-vu-fs0,path=3D/tmp/lib/domain--1-guest/fs0-fs.soc= k \ --device vhost-user-fs-pci,id=3Dfs0,chardev=3Dchr-vu-fs0,tag=3Dmount_tag,bo= otindex=3D2,bus=3Dpci.1,addr=3D0x0 \ +-device '{"driver":"vhost-user-fs-pci","id":"fs0","chardev":"chr-vu-fs0","= tag":"mount_tag","bootindex":2,"bus":"pci.1","addr":"0x0"}' \ -audiodev id=3Daudio1,driver=3Dnone \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/vhost-user-gpu-secondary.x86_64-latest.= args b/tests/qemuxml2argvdata/vhost-user-gpu-secondary.x86_64-latest.args index 6df0365e76..d35f120018 100644 --- a/tests/qemuxml2argvdata/vhost-user-gpu-secondary.x86_64-latest.args +++ b/tests/qemuxml2argvdata/vhost-user-gpu-secondary.x86_64-latest.args @@ -27,15 +27,15 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ -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 ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-0-0= ,bootindex=3D1 \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ -audiodev id=3Daudio1,driver=3Dnone \ -chardev socket,id=3Dchr-vu-video0,fd=3D1729 \ -chardev socket,id=3Dchr-vu-video1,fd=3D1729 \ --device vhost-user-vga,id=3Dvideo0,max_outputs=3D1,chardev=3Dchr-vu-video0= ,bus=3Dpci.0,addr=3D0x2 \ --device vhost-user-gpu-pci,id=3Dvideo1,max_outputs=3D1,chardev=3Dchr-vu-vi= deo1,bus=3Dpci.0,addr=3D0x4 \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x3 \ +-device '{"driver":"vhost-user-vga","id":"video0","max_outputs":1,"chardev= ":"chr-vu-video0","bus":"pci.0","addr":"0x2"}' \ +-device '{"driver":"vhost-user-gpu-pci","id":"video1","max_outputs":1,"cha= rdev":"chr-vu-video1","bus":"pci.0","addr":"0x4"}' \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x3"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/vhost-user-vga.x86_64-latest.args b/tes= ts/qemuxml2argvdata/vhost-user-vga.x86_64-latest.args index 0bdd98d3b6..7710a5b5a6 100644 --- a/tests/qemuxml2argvdata/vhost-user-vga.x86_64-latest.args +++ b/tests/qemuxml2argvdata/vhost-user-vga.x86_64-latest.args @@ -27,13 +27,13 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ -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 ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-0-0= ,bootindex=3D1 \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ -audiodev id=3Daudio1,driver=3Dnone \ -chardev socket,id=3Dchr-vu-video0,fd=3D1729 \ --device vhost-user-vga,id=3Dvideo0,max_outputs=3D1,chardev=3Dchr-vu-video0= ,bus=3Dpci.0,addr=3D0x2 \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x3 \ +-device '{"driver":"vhost-user-vga","id":"video0","max_outputs":1,"chardev= ":"chr-vu-video0","bus":"pci.0","addr":"0x2"}' \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x3"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/vhost-vsock-auto.x86_64-latest.args b/t= ests/qemuxml2argvdata/vhost-vsock-auto.x86_64-latest.args index 1c19f35b34..4002a47898 100644 --- a/tests/qemuxml2argvdata/vhost-vsock-auto.x86_64-latest.args +++ b/tests/qemuxml2argvdata/vhost-vsock-auto.x86_64-latest.args @@ -26,9 +26,9 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-test/.config \ -no-shutdown \ -no-acpi \ -boot menu=3Don,strict=3Don \ --device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ --device virtio-serial-pci,id=3Dvirtio-serial0,bus=3Dpci.0,addr=3D0x6 \ +-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"}' \ -audiodev id=3Daudio1,driver=3Dnone \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ --device vhost-vsock-pci,id=3Dvsock0,guest-cid=3D42,vhostfd=3D6789,bus=3Dpc= i.0,addr=3D0x2 \ +-device '{"driver":"vhost-vsock-pci","id":"vsock0","guest-cid":42,"vhostfd= ":"6789","bus":"pci.0","addr":"0x2"}' \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/vhost-vsock.x86_64-latest.args b/tests/= qemuxml2argvdata/vhost-vsock.x86_64-latest.args index fa7bfd8a1d..5388bbf748 100644 --- a/tests/qemuxml2argvdata/vhost-vsock.x86_64-latest.args +++ b/tests/qemuxml2argvdata/vhost-vsock.x86_64-latest.args @@ -26,9 +26,9 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-test/.config \ -no-shutdown \ -no-acpi \ -boot menu=3Don,strict=3Don \ --device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ --device virtio-serial-pci,id=3Dvirtio-serial0,bus=3Dpci.0,addr=3D0x6 \ +-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"}' \ -audiodev id=3Daudio1,driver=3Dnone \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ --device vhost-vsock-pci,id=3Dvsock0,guest-cid=3D4,vhostfd=3D6789,bus=3Dpci= .0,addr=3D0x7 \ +-device '{"driver":"vhost-vsock-pci","id":"vsock0","guest-cid":4,"vhostfd"= :"6789","bus":"pci.0","addr":"0x7"}' \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/video-bochs-display-device.x86_64-lates= t.args b/tests/qemuxml2argvdata/video-bochs-display-device.x86_64-latest.ar= gs index 3af0ecf2b1..b21f56d93a 100644 --- a/tests/qemuxml2argvdata/video-bochs-display-device.x86_64-latest.args +++ b/tests/qemuxml2argvdata/video-bochs-display-device.x86_64-latest.args @@ -26,12 +26,12 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/QEMUGuest1= ","node-name":"libvirt-1-storage","cache":{"direct":true,"no-flush":false},= "auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"cache":{"dir= ect":true,"no-flush":false},"driver":"qcow2","file":"libvirt-1-storage"}' \ --device ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-0-0= ,bootindex=3D1,write-cache=3Don \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1,"write-cache":"on"}' \ -audiodev id=3Daudio1,driver=3Dnone \ --device bochs-display,id=3Dvideo0,vgamem=3D16777216,bus=3Dpci.0,addr=3D0x2= \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x3 \ +-device '{"driver":"bochs-display","id":"video0","vgamem":16777216,"bus":"= pci.0","addr":"0x2"}' \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x3"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/video-qxl-device-vram64.x86_64-latest.a= rgs b/tests/qemuxml2argvdata/video-qxl-device-vram64.x86_64-latest.args index 513da37f37..b3a8db9729 100644 --- a/tests/qemuxml2argvdata/video-qxl-device-vram64.x86_64-latest.args +++ b/tests/qemuxml2argvdata/video-qxl-device-vram64.x86_64-latest.args @@ -26,9 +26,9 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ -audiodev id=3Daudio1,driver=3Dnone \ --device qxl-vga,id=3Dvideo0,ram_size=3D67108864,vram_size=3D67108864,vram6= 4_size_mb=3D128,vgamem_mb=3D16,max_outputs=3D1,bus=3Dpci.0,addr=3D0x2 \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x3 \ +-device '{"driver":"qxl-vga","id":"video0","ram_size":67108864,"vram_size"= :67108864,"vram64_size_mb":128,"vgamem_mb":16,"max_outputs":1,"bus":"pci.0"= ,"addr":"0x2"}' \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x3"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/video-qxl-sec-device-vram64.x86_64-late= st.args b/tests/qemuxml2argvdata/video-qxl-sec-device-vram64.x86_64-latest.= args index f484af81ed..7533e7446c 100644 --- a/tests/qemuxml2argvdata/video-qxl-sec-device-vram64.x86_64-latest.args +++ b/tests/qemuxml2argvdata/video-qxl-sec-device-vram64.x86_64-latest.args @@ -26,10 +26,10 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ -audiodev id=3Daudio1,driver=3Dnone \ --device qxl-vga,id=3Dvideo0,ram_size=3D67108864,vram_size=3D67108864,vram6= 4_size_mb=3D0,vgamem_mb=3D16,max_outputs=3D1,bus=3Dpci.0,addr=3D0x2 \ --device qxl,id=3Dvideo1,ram_size=3D67108864,vram_size=3D67108864,vram64_si= ze_mb=3D128,vgamem_mb=3D16,max_outputs=3D1,bus=3Dpci.0,addr=3D0x4 \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x3 \ +-device '{"driver":"qxl-vga","id":"video0","ram_size":67108864,"vram_size"= :67108864,"vram64_size_mb":0,"vgamem_mb":16,"max_outputs":1,"bus":"pci.0","= addr":"0x2"}' \ +-device '{"driver":"qxl","id":"video1","ram_size":67108864,"vram_size":671= 08864,"vram64_size_mb":128,"vgamem_mb":16,"max_outputs":1,"bus":"pci.0","ad= dr":"0x4"}' \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x3"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/video-ramfb-display-device.x86_64-lates= t.args b/tests/qemuxml2argvdata/video-ramfb-display-device.x86_64-latest.ar= gs index 630b80fbd0..b4dd773957 100644 --- a/tests/qemuxml2argvdata/video-ramfb-display-device.x86_64-latest.args +++ b/tests/qemuxml2argvdata/video-ramfb-display-device.x86_64-latest.args @@ -26,12 +26,12 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/QEMUGuest1= ","node-name":"libvirt-1-storage","cache":{"direct":true,"no-flush":false},= "auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"cache":{"dir= ect":true,"no-flush":false},"driver":"qcow2","file":"libvirt-1-storage"}' \ --device ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-0-0= ,bootindex=3D1,write-cache=3Don \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1,"write-cache":"on"}' \ -audiodev id=3Daudio1,driver=3Dnone \ --device ramfb,id=3Dvideo0 \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ +-device '{"driver":"ramfb","id":"video0"}' \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/video-virtio-vga-gpu-gl.x86_64-latest.a= rgs b/tests/qemuxml2argvdata/video-virtio-vga-gpu-gl.x86_64-latest.args index d38082410f..43433428ad 100644 --- a/tests/qemuxml2argvdata/video-virtio-vga-gpu-gl.x86_64-latest.args +++ b/tests/qemuxml2argvdata/video-virtio-vga-gpu-gl.x86_64-latest.args @@ -26,10 +26,10 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ -audiodev id=3Daudio1,driver=3Dnone \ --device virtio-vga-gl,id=3Dvideo0,max_outputs=3D1,bus=3Dpci.0,addr=3D0x2 \ --device virtio-gpu-gl-pci,id=3Dvideo1,max_outputs=3D1,bus=3Dpci.0,addr=3D0= x4 \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x3 \ +-device '{"driver":"virtio-vga-gl","id":"video0","max_outputs":1,"bus":"pc= i.0","addr":"0x2"}' \ +-device '{"driver":"virtio-gpu-gl-pci","id":"video1","max_outputs":1,"bus"= :"pci.0","addr":"0x4"}' \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x3"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/virtio-9p-createmode.x86_64-latest.args= b/tests/qemuxml2argvdata/virtio-9p-createmode.x86_64-latest.args index 1243f9d305..505123d073 100644 --- a/tests/qemuxml2argvdata/virtio-9p-createmode.x86_64-latest.args +++ b/tests/qemuxml2argvdata/virtio-9p-createmode.x86_64-latest.args @@ -26,18 +26,18 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ -fsdev local,security_model=3Dmapped,fmode=3D0644,id=3Dfsdev-fs0,path=3D/e= xport/fs0 \ --device virtio-9p-pci,id=3Dfs0,fsdev=3Dfsdev-fs0,mount_tag=3Dfs0,bus=3Dpci= .0,addr=3D0x2 \ +-device '{"driver":"virtio-9p-pci","id":"fs0","fsdev":"fsdev-fs0","mount_t= ag":"fs0","bus":"pci.0","addr":"0x2"}' \ -fsdev local,security_model=3Dmapped,dmode=3D0755,id=3Dfsdev-fs1,path=3D/e= xport/fs1 \ --device virtio-9p-pci,id=3Dfs1,fsdev=3Dfsdev-fs1,mount_tag=3Dfs1,bus=3Dpci= .0,addr=3D0x3 \ +-device '{"driver":"virtio-9p-pci","id":"fs1","fsdev":"fsdev-fs1","mount_t= ag":"fs1","bus":"pci.0","addr":"0x3"}' \ -fsdev local,security_model=3Dmapped,fmode=3D0640,dmode=3D0750,id=3Dfsdev-= fs2,path=3D/export/fs2 \ --device virtio-9p-pci,id=3Dfs2,fsdev=3Dfsdev-fs2,mount_tag=3Dfs2,bus=3Dpci= .0,addr=3D0x4 \ +-device '{"driver":"virtio-9p-pci","id":"fs2","fsdev":"fsdev-fs2","mount_t= ag":"fs2","bus":"pci.0","addr":"0x4"}' \ -fsdev local,security_model=3Dmapped,id=3Dfsdev-fs3,path=3D/export/fs3 \ --device virtio-9p-pci,id=3Dfs3,fsdev=3Dfsdev-fs3,mount_tag=3Dfs3,bus=3Dpci= .0,addr=3D0x5 \ +-device '{"driver":"virtio-9p-pci","id":"fs3","fsdev":"fsdev-fs3","mount_t= ag":"fs3","bus":"pci.0","addr":"0x5"}' \ -chardev pty,id=3Dcharserial0 \ --device isa-serial,chardev=3Dcharserial0,id=3Dserial0 \ +-device '{"driver":"isa-serial","chardev":"charserial0","id":"serial0"}' \ -audiodev id=3Daudio1,driver=3Dnone \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0xc \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0xc"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/virtio-9p-multidevs.x86_64-latest.args = b/tests/qemuxml2argvdata/virtio-9p-multidevs.x86_64-latest.args index 43dfae29bf..47c036406c 100644 --- a/tests/qemuxml2argvdata/virtio-9p-multidevs.x86_64-latest.args +++ b/tests/qemuxml2argvdata/virtio-9p-multidevs.x86_64-latest.args @@ -26,16 +26,16 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ -fsdev local,security_model=3Dmapped,multidevs=3Dremap,id=3Dfsdev-fs0,path= =3D/export/fs0 \ --device virtio-9p-pci,id=3Dfs0,fsdev=3Dfsdev-fs0,mount_tag=3Dfs0,bus=3Dpci= .0,addr=3D0x2 \ +-device '{"driver":"virtio-9p-pci","id":"fs0","fsdev":"fsdev-fs0","mount_t= ag":"fs0","bus":"pci.0","addr":"0x2"}' \ -fsdev local,security_model=3Dmapped,multidevs=3Dforbid,id=3Dfsdev-fs1,pat= h=3D/export/fs1 \ --device virtio-9p-pci,id=3Dfs1,fsdev=3Dfsdev-fs1,mount_tag=3Dfs1,bus=3Dpci= .0,addr=3D0x3 \ +-device '{"driver":"virtio-9p-pci","id":"fs1","fsdev":"fsdev-fs1","mount_t= ag":"fs1","bus":"pci.0","addr":"0x3"}' \ -fsdev local,security_model=3Dmapped,multidevs=3Dwarn,id=3Dfsdev-fs2,path= =3D/export/fs2 \ --device virtio-9p-pci,id=3Dfs2,fsdev=3Dfsdev-fs2,mount_tag=3Dfs2,bus=3Dpci= .0,addr=3D0x4 \ +-device '{"driver":"virtio-9p-pci","id":"fs2","fsdev":"fsdev-fs2","mount_t= ag":"fs2","bus":"pci.0","addr":"0x4"}' \ -chardev pty,id=3Dcharserial0 \ --device isa-serial,chardev=3Dcharserial0,id=3Dserial0 \ +-device '{"driver":"isa-serial","chardev":"charserial0","id":"serial0"}' \ -audiodev id=3Daudio1,driver=3Dnone \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0xc \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0xc"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/virtio-lun.x86_64-latest.args b/tests/q= emuxml2argvdata/virtio-lun.x86_64-latest.args index e66502ea4e..c973a9acbf 100644 --- a/tests/qemuxml2argvdata/virtio-lun.x86_64-latest.args +++ b/tests/qemuxml2argvdata/virtio-lun.x86_64-latest.args @@ -26,17 +26,17 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-test/.config \ -no-shutdown \ -no-acpi \ -boot menu=3Don,strict=3Don \ --device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ --device virtio-serial-pci,id=3Dvirtio-serial0,bus=3Dpci.0,addr=3D0x6 \ +-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"}' \ -blockdev '{"driver":"host_device","filename":"/dev/sdfake","node-name":"l= ibvirt-2-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-2-format","read-only":false,"driver":"raw= ","file":"libvirt-2-storage"}' \ --device virtio-blk-pci,scsi=3Don,bus=3Dpci.0,addr=3D0x4,drive=3Dlibvirt-2-= format,id=3Dvirtio-disk0,bootindex=3D2 \ +-device '{"driver":"virtio-blk-pci","scsi":true,"bus":"pci.0","addr":"0x4"= ,"drive":"libvirt-2-format","id":"virtio-disk0","bootindex":2}' \ -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 virtio-blk-pci,scsi=3Don,bus=3Dpci.0,addr=3D0x5,drive=3Dlibvirt-1-= format,id=3Dvirtio-disk1 \ +-device '{"driver":"virtio-blk-pci","scsi":true,"bus":"pci.0","addr":"0x5"= ,"drive":"libvirt-1-format","id":"virtio-disk1"}' \ -netdev user,id=3Dhostnet0 \ --device virtio-net-pci,event_idx=3Doff,netdev=3Dhostnet0,id=3Dnet0,mac=3D5= 2:54:00:e5:48:58,bus=3Dpci.0,addr=3D0x2 \ +-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=3Daudio1,driver=3Dnone \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x3 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x3"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -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 305e2cbc2f..cf53746120 100644 --- a/tests/qemuxml2argvdata/virtio-non-transitional.x86_64-latest.args +++ b/tests/qemuxml2argvdata/virtio-non-transitional.x86_64-latest.args @@ -26,32 +26,32 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device pcie-root-port,port=3D8,chassis=3D1,id=3Dpci.1,bus=3Dpcie.0,multif= unction=3Don,addr=3D0x1 \ --device pcie-root-port,port=3D9,chassis=3D2,id=3Dpci.2,bus=3Dpcie.0,addr= =3D0x1.0x1 \ --device pcie-root-port,port=3D10,chassis=3D3,id=3Dpci.3,bus=3Dpcie.0,addr= =3D0x1.0x2 \ --device pcie-root-port,port=3D11,chassis=3D4,id=3Dpci.4,bus=3Dpcie.0,addr= =3D0x1.0x3 \ --device pcie-root-port,port=3D12,chassis=3D5,id=3Dpci.5,bus=3Dpcie.0,addr= =3D0x1.0x4 \ --device pcie-root-port,port=3D13,chassis=3D6,id=3Dpci.6,bus=3Dpcie.0,addr= =3D0x1.0x5 \ --device pcie-root-port,port=3D14,chassis=3D7,id=3Dpci.7,bus=3Dpcie.0,addr= =3D0x1.0x6 \ --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-non-transitional,id=3Dscsi0,bus=3Dpci.4,addr=3D0x0= \ --device virtio-serial-pci-non-transitional,id=3Dvirtio-serial0,bus=3Dpci.3= ,addr=3D0x0 \ +-device '{"driver":"pcie-root-port","port":8,"chassis":1,"id":"pci.1","bus= ":"pcie.0","multifunction":true,"addr":"0x1"}' \ +-device '{"driver":"pcie-root-port","port":9,"chassis":2,"id":"pci.2","bus= ":"pcie.0","addr":"0x1.0x1"}' \ +-device '{"driver":"pcie-root-port","port":10,"chassis":3,"id":"pci.3","bu= s":"pcie.0","addr":"0x1.0x2"}' \ +-device '{"driver":"pcie-root-port","port":11,"chassis":4,"id":"pci.4","bu= s":"pcie.0","addr":"0x1.0x3"}' \ +-device '{"driver":"pcie-root-port","port":12,"chassis":5,"id":"pci.5","bu= s":"pcie.0","addr":"0x1.0x4"}' \ +-device '{"driver":"pcie-root-port","port":13,"chassis":6,"id":"pci.6","bu= s":"pcie.0","addr":"0x1.0x5"}' \ +-device '{"driver":"pcie-root-port","port":14,"chassis":7,"id":"pci.7","bu= s":"pcie.0","addr":"0x1.0x6"}' \ +-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"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ --device virtio-blk-pci-non-transitional,bus=3Dpci.5,addr=3D0x0,drive=3Dlib= virt-1-format,id=3Dvirtio-disk0,bootindex=3D1 \ +-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 virtio-9p-pci-non-transitional,id=3Dfs0,fsdev=3Dfsdev-fs0,mount_ta= g=3Dfs1,bus=3Dpci.1,addr=3D0x0 \ +-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 virtio-net-pci-non-transitional,netdev=3Dhostnet0,id=3Dnet0,mac=3D= 00:11:22:33:44:55,bus=3Dpci.2,addr=3D0x0 \ --device virtio-input-host-pci-non-transitional,id=3Dinput0,evdev=3D/dev/in= put/event1234,bus=3Dpci.9,addr=3D0x0 \ +-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=3Daudio1,driver=3Dnone \ --device vhost-scsi-pci-non-transitional,wwpn=3Dnaa.5123456789abcde0,vhostf= d=3D3,id=3Dhostdev0,bus=3Dpci.6,addr=3D0x0 \ --device virtio-balloon-pci-non-transitional,id=3Dballoon0,bus=3Dpci.7,addr= =3D0x0 \ +-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 virtio-rng-pci-non-transitional,rng=3Dobjrng0,id=3Drng0,bus=3Dpci.= 8,addr=3D0x0 \ +-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 vhost-vsock-pci-non-transitional,id=3Dvsock0,guest-cid=3D4,vhostfd= =3D6789,bus=3Dpci.10,addr=3D0x0 \ +-device '{"driver":"vhost-vsock-pci-non-transitional","id":"vsock0","guest= -cid":4,"vhostfd":"6789","bus":"pci.10","addr":"0x0"}' \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/virtio-options-controller-ats.x86_64-la= test.args b/tests/qemuxml2argvdata/virtio-options-controller-ats.x86_64-lat= est.args index 5ac1467fae..8738acd381 100644 --- a/tests/qemuxml2argvdata/virtio-options-controller-ats.x86_64-latest.ar= gs +++ b/tests/qemuxml2argvdata/virtio-options-controller-ats.x86_64-latest.ar= gs @@ -26,12 +26,12 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ --device virtio-scsi-pci,ats=3Don,id=3Dscsi0,bus=3Dpci.0,addr=3D0x2 \ --device virtio-scsi-pci,ats=3Doff,id=3Dscsi1,bus=3Dpci.0,addr=3D0x3 \ --device virtio-serial-pci,ats=3Don,id=3Dvirtio-serial0,bus=3Dpci.0,addr=3D= 0x4 \ --device virtio-serial-pci,ats=3Doff,id=3Dvirtio-serial1,bus=3Dpci.0,addr= =3D0x5 \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ +-device '{"driver":"virtio-scsi-pci","ats":true,"id":"scsi0","bus":"pci.0"= ,"addr":"0x2"}' \ +-device '{"driver":"virtio-scsi-pci","ats":false,"id":"scsi1","bus":"pci.0= ","addr":"0x3"}' \ +-device '{"driver":"virtio-serial-pci","ats":true,"id":"virtio-serial0","b= us":"pci.0","addr":"0x4"}' \ +-device '{"driver":"virtio-serial-pci","ats":false,"id":"virtio-serial1","= bus":"pci.0","addr":"0x5"}' \ -audiodev id=3Daudio1,driver=3Dnone \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x6 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x6"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/virtio-options-controller-iommu.x86_64-= latest.args b/tests/qemuxml2argvdata/virtio-options-controller-iommu.x86_64= -latest.args index 3b48553883..8ae33d9c8c 100644 --- a/tests/qemuxml2argvdata/virtio-options-controller-iommu.x86_64-latest.= args +++ b/tests/qemuxml2argvdata/virtio-options-controller-iommu.x86_64-latest.= args @@ -26,12 +26,12 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ --device virtio-scsi-pci,iommu_platform=3Don,id=3Dscsi0,bus=3Dpci.0,addr=3D= 0x2 \ --device virtio-scsi-pci,iommu_platform=3Doff,id=3Dscsi1,bus=3Dpci.0,addr= =3D0x3 \ --device virtio-serial-pci,iommu_platform=3Don,id=3Dvirtio-serial0,bus=3Dpc= i.0,addr=3D0x4 \ --device virtio-serial-pci,iommu_platform=3Doff,id=3Dvirtio-serial1,bus=3Dp= ci.0,addr=3D0x5 \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ +-device '{"driver":"virtio-scsi-pci","iommu_platform":true,"id":"scsi0","b= us":"pci.0","addr":"0x2"}' \ +-device '{"driver":"virtio-scsi-pci","iommu_platform":false,"id":"scsi1","= bus":"pci.0","addr":"0x3"}' \ +-device '{"driver":"virtio-serial-pci","iommu_platform":true,"id":"virtio-= serial0","bus":"pci.0","addr":"0x4"}' \ +-device '{"driver":"virtio-serial-pci","iommu_platform":false,"id":"virtio= -serial1","bus":"pci.0","addr":"0x5"}' \ -audiodev id=3Daudio1,driver=3Dnone \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x6 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x6"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/virtio-options-controller-packed.x86_64= -latest.args b/tests/qemuxml2argvdata/virtio-options-controller-packed.x86_= 64-latest.args index 19a318c4fb..fbe579b1ea 100644 --- a/tests/qemuxml2argvdata/virtio-options-controller-packed.x86_64-latest= .args +++ b/tests/qemuxml2argvdata/virtio-options-controller-packed.x86_64-latest= .args @@ -26,12 +26,12 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ --device virtio-scsi-pci,packed=3Don,id=3Dscsi0,bus=3Dpci.0,addr=3D0x2 \ --device virtio-scsi-pci,packed=3Doff,id=3Dscsi1,bus=3Dpci.0,addr=3D0x3 \ --device virtio-serial-pci,packed=3Don,id=3Dvirtio-serial0,bus=3Dpci.0,addr= =3D0x4 \ --device virtio-serial-pci,packed=3Doff,id=3Dvirtio-serial1,bus=3Dpci.0,add= r=3D0x5 \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ +-device '{"driver":"virtio-scsi-pci","packed":true,"id":"scsi0","bus":"pci= .0","addr":"0x2"}' \ +-device '{"driver":"virtio-scsi-pci","packed":false,"id":"scsi1","bus":"pc= i.0","addr":"0x3"}' \ +-device '{"driver":"virtio-serial-pci","packed":true,"id":"virtio-serial0"= ,"bus":"pci.0","addr":"0x4"}' \ +-device '{"driver":"virtio-serial-pci","packed":false,"id":"virtio-serial1= ","bus":"pci.0","addr":"0x5"}' \ -audiodev id=3Daudio1,driver=3Dnone \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x6 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x6"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/virtio-options-disk-ats.x86_64-latest.a= rgs b/tests/qemuxml2argvdata/virtio-options-disk-ats.x86_64-latest.args index e5bb1962a6..5641054ce2 100644 --- a/tests/qemuxml2argvdata/virtio-options-disk-ats.x86_64-latest.args +++ b/tests/qemuxml2argvdata/virtio-options-disk-ats.x86_64-latest.args @@ -26,14 +26,14 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/img1","nod= e-name":"libvirt-2-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-2-format","read-only":false,"driver":"raw= ","file":"libvirt-2-storage"}' \ --device virtio-blk-pci,ats=3Don,bus=3Dpci.0,addr=3D0x2,drive=3Dlibvirt-2-f= ormat,id=3Dvirtio-disk0,bootindex=3D1 \ +-device '{"driver":"virtio-blk-pci","ats":true,"bus":"pci.0","addr":"0x2",= "drive":"libvirt-2-format","id":"virtio-disk0","bootindex":1}' \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/img2","nod= e-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 virtio-blk-pci,ats=3Doff,bus=3Dpci.0,addr=3D0x3,drive=3Dlibvirt-1-= format,id=3Dvirtio-disk1 \ +-device '{"driver":"virtio-blk-pci","ats":false,"bus":"pci.0","addr":"0x3"= ,"drive":"libvirt-1-format","id":"virtio-disk1"}' \ -audiodev id=3Daudio1,driver=3Dnone \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x4 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x4"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/virtio-options-disk-iommu.x86_64-latest= .args b/tests/qemuxml2argvdata/virtio-options-disk-iommu.x86_64-latest.args index 381410c7ca..373c61e121 100644 --- a/tests/qemuxml2argvdata/virtio-options-disk-iommu.x86_64-latest.args +++ b/tests/qemuxml2argvdata/virtio-options-disk-iommu.x86_64-latest.args @@ -26,14 +26,14 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/img1","nod= e-name":"libvirt-2-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-2-format","read-only":false,"driver":"raw= ","file":"libvirt-2-storage"}' \ --device virtio-blk-pci,iommu_platform=3Don,bus=3Dpci.0,addr=3D0x2,drive=3D= libvirt-2-format,id=3Dvirtio-disk0,bootindex=3D1 \ +-device '{"driver":"virtio-blk-pci","iommu_platform":true,"bus":"pci.0","a= ddr":"0x2","drive":"libvirt-2-format","id":"virtio-disk0","bootindex":1}' \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/img2","nod= e-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 virtio-blk-pci,iommu_platform=3Doff,bus=3Dpci.0,addr=3D0x3,drive= =3Dlibvirt-1-format,id=3Dvirtio-disk1 \ +-device '{"driver":"virtio-blk-pci","iommu_platform":false,"bus":"pci.0","= addr":"0x3","drive":"libvirt-1-format","id":"virtio-disk1"}' \ -audiodev id=3Daudio1,driver=3Dnone \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x4 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x4"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/virtio-options-disk-packed.x86_64-lates= t.args b/tests/qemuxml2argvdata/virtio-options-disk-packed.x86_64-latest.ar= gs index 0241ae85a5..1ace1dde87 100644 --- a/tests/qemuxml2argvdata/virtio-options-disk-packed.x86_64-latest.args +++ b/tests/qemuxml2argvdata/virtio-options-disk-packed.x86_64-latest.args @@ -26,14 +26,14 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/img1","nod= e-name":"libvirt-2-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-2-format","read-only":false,"driver":"raw= ","file":"libvirt-2-storage"}' \ --device virtio-blk-pci,packed=3Don,bus=3Dpci.0,addr=3D0x2,drive=3Dlibvirt-= 2-format,id=3Dvirtio-disk0,bootindex=3D1 \ +-device '{"driver":"virtio-blk-pci","packed":true,"bus":"pci.0","addr":"0x= 2","drive":"libvirt-2-format","id":"virtio-disk0","bootindex":1}' \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/img2","nod= e-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 virtio-blk-pci,packed=3Doff,bus=3Dpci.0,addr=3D0x3,drive=3Dlibvirt= -1-format,id=3Dvirtio-disk1 \ +-device '{"driver":"virtio-blk-pci","packed":false,"bus":"pci.0","addr":"0= x3","drive":"libvirt-1-format","id":"virtio-disk1"}' \ -audiodev id=3Daudio1,driver=3Dnone \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x4 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x4"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/virtio-options-fs-ats.x86_64-latest.arg= s b/tests/qemuxml2argvdata/virtio-options-fs-ats.x86_64-latest.args index 6956c7bdc6..781818908c 100644 --- a/tests/qemuxml2argvdata/virtio-options-fs-ats.x86_64-latest.args +++ b/tests/qemuxml2argvdata/virtio-options-fs-ats.x86_64-latest.args @@ -26,12 +26,12 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ -fsdev local,security_model=3Dpassthrough,id=3Dfsdev-fs0,path=3D/export/fs= 1 \ --device virtio-9p-pci,ats=3Don,id=3Dfs0,fsdev=3Dfsdev-fs0,mount_tag=3Dfs1,= bus=3Dpci.0,addr=3D0x2 \ +-device '{"driver":"virtio-9p-pci","ats":true,"id":"fs0","fsdev":"fsdev-fs= 0","mount_tag":"fs1","bus":"pci.0","addr":"0x2"}' \ -fsdev local,security_model=3Dpassthrough,id=3Dfsdev-fs1,path=3D/export/fs= 2 \ --device virtio-9p-pci,ats=3Doff,id=3Dfs1,fsdev=3Dfsdev-fs1,mount_tag=3Dfs2= ,bus=3Dpci.0,addr=3D0x3 \ +-device '{"driver":"virtio-9p-pci","ats":false,"id":"fs1","fsdev":"fsdev-f= s1","mount_tag":"fs2","bus":"pci.0","addr":"0x3"}' \ -audiodev id=3Daudio1,driver=3Dnone \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x4 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x4"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/virtio-options-fs-iommu.x86_64-latest.a= rgs b/tests/qemuxml2argvdata/virtio-options-fs-iommu.x86_64-latest.args index d964d11f8a..5c71c9e72e 100644 --- a/tests/qemuxml2argvdata/virtio-options-fs-iommu.x86_64-latest.args +++ b/tests/qemuxml2argvdata/virtio-options-fs-iommu.x86_64-latest.args @@ -26,12 +26,12 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ -fsdev local,security_model=3Dpassthrough,id=3Dfsdev-fs0,path=3D/export/fs= 1 \ --device virtio-9p-pci,iommu_platform=3Don,id=3Dfs0,fsdev=3Dfsdev-fs0,mount= _tag=3Dfs1,bus=3Dpci.0,addr=3D0x2 \ +-device '{"driver":"virtio-9p-pci","iommu_platform":true,"id":"fs0","fsdev= ":"fsdev-fs0","mount_tag":"fs1","bus":"pci.0","addr":"0x2"}' \ -fsdev local,security_model=3Dpassthrough,id=3Dfsdev-fs1,path=3D/export/fs= 2 \ --device virtio-9p-pci,iommu_platform=3Doff,id=3Dfs1,fsdev=3Dfsdev-fs1,moun= t_tag=3Dfs2,bus=3Dpci.0,addr=3D0x3 \ +-device '{"driver":"virtio-9p-pci","iommu_platform":false,"id":"fs1","fsde= v":"fsdev-fs1","mount_tag":"fs2","bus":"pci.0","addr":"0x3"}' \ -audiodev id=3Daudio1,driver=3Dnone \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x4 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x4"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/virtio-options-fs-packed.x86_64-latest.= args b/tests/qemuxml2argvdata/virtio-options-fs-packed.x86_64-latest.args index 5eac96bead..39a6bff451 100644 --- a/tests/qemuxml2argvdata/virtio-options-fs-packed.x86_64-latest.args +++ b/tests/qemuxml2argvdata/virtio-options-fs-packed.x86_64-latest.args @@ -26,12 +26,12 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ -fsdev local,security_model=3Dpassthrough,id=3Dfsdev-fs0,path=3D/export/fs= 1 \ --device virtio-9p-pci,packed=3Don,id=3Dfs0,fsdev=3Dfsdev-fs0,mount_tag=3Df= s1,bus=3Dpci.0,addr=3D0x2 \ +-device '{"driver":"virtio-9p-pci","packed":true,"id":"fs0","fsdev":"fsdev= -fs0","mount_tag":"fs1","bus":"pci.0","addr":"0x2"}' \ -fsdev local,security_model=3Dpassthrough,id=3Dfsdev-fs1,path=3D/export/fs= 2 \ --device virtio-9p-pci,packed=3Doff,id=3Dfs1,fsdev=3Dfsdev-fs1,mount_tag=3D= fs2,bus=3Dpci.0,addr=3D0x3 \ +-device '{"driver":"virtio-9p-pci","packed":false,"id":"fs1","fsdev":"fsde= v-fs1","mount_tag":"fs2","bus":"pci.0","addr":"0x3"}' \ -audiodev id=3Daudio1,driver=3Dnone \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x4 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x4"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/virtio-options-input-ats.x86_64-latest.= args b/tests/qemuxml2argvdata/virtio-options-input-ats.x86_64-latest.args index 5997192c91..078ecf1bd8 100644 --- a/tests/qemuxml2argvdata/virtio-options-input-ats.x86_64-latest.args +++ b/tests/qemuxml2argvdata/virtio-options-input-ats.x86_64-latest.args @@ -26,10 +26,10 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ --device virtio-mouse-pci,ats=3Don,id=3Dinput0,bus=3Dpci.0,addr=3D0x2 \ --device virtio-keyboard-pci,ats=3Doff,id=3Dinput1,bus=3Dpci.0,addr=3D0x3 \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ +-device '{"driver":"virtio-mouse-pci","ats":true,"id":"input0","bus":"pci.= 0","addr":"0x2"}' \ +-device '{"driver":"virtio-keyboard-pci","ats":false,"id":"input1","bus":"= pci.0","addr":"0x3"}' \ -audiodev id=3Daudio1,driver=3Dnone \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x4 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x4"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/virtio-options-input-iommu.x86_64-lates= t.args b/tests/qemuxml2argvdata/virtio-options-input-iommu.x86_64-latest.ar= gs index a956781626..f97c5041c9 100644 --- a/tests/qemuxml2argvdata/virtio-options-input-iommu.x86_64-latest.args +++ b/tests/qemuxml2argvdata/virtio-options-input-iommu.x86_64-latest.args @@ -26,10 +26,10 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ --device virtio-mouse-pci,iommu_platform=3Don,id=3Dinput0,bus=3Dpci.0,addr= =3D0x2 \ --device virtio-keyboard-pci,iommu_platform=3Doff,id=3Dinput1,bus=3Dpci.0,a= ddr=3D0x3 \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ +-device '{"driver":"virtio-mouse-pci","iommu_platform":true,"id":"input0",= "bus":"pci.0","addr":"0x2"}' \ +-device '{"driver":"virtio-keyboard-pci","iommu_platform":false,"id":"inpu= t1","bus":"pci.0","addr":"0x3"}' \ -audiodev id=3Daudio1,driver=3Dnone \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x4 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x4"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/virtio-options-input-packed.x86_64-late= st.args b/tests/qemuxml2argvdata/virtio-options-input-packed.x86_64-latest.= args index 8a1be03de2..b2e57eaa40 100644 --- a/tests/qemuxml2argvdata/virtio-options-input-packed.x86_64-latest.args +++ b/tests/qemuxml2argvdata/virtio-options-input-packed.x86_64-latest.args @@ -26,10 +26,10 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ --device virtio-mouse-pci,packed=3Don,id=3Dinput0,bus=3Dpci.0,addr=3D0x2 \ --device virtio-keyboard-pci,packed=3Doff,id=3Dinput1,bus=3Dpci.0,addr=3D0x= 3 \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ +-device '{"driver":"virtio-mouse-pci","packed":true,"id":"input0","bus":"p= ci.0","addr":"0x2"}' \ +-device '{"driver":"virtio-keyboard-pci","packed":false,"id":"input1","bus= ":"pci.0","addr":"0x3"}' \ -audiodev id=3Daudio1,driver=3Dnone \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x4 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x4"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/virtio-options-memballoon-ats.x86_64-la= test.args b/tests/qemuxml2argvdata/virtio-options-memballoon-ats.x86_64-lat= est.args index 184b84ea39..ea8c351087 100644 --- a/tests/qemuxml2argvdata/virtio-options-memballoon-ats.x86_64-latest.ar= gs +++ b/tests/qemuxml2argvdata/virtio-options-memballoon-ats.x86_64-latest.ar= gs @@ -26,8 +26,8 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ -audiodev id=3Daudio1,driver=3Dnone \ --device virtio-balloon-pci,ats=3Don,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ +-device '{"driver":"virtio-balloon-pci","ats":true,"id":"balloon0","bus":"= pci.0","addr":"0x2"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/virtio-options-memballoon-freepage-repo= rting.x86_64-latest.args b/tests/qemuxml2argvdata/virtio-options-memballoon= -freepage-reporting.x86_64-latest.args index e6ac1e27f2..dd15ffd34a 100644 --- a/tests/qemuxml2argvdata/virtio-options-memballoon-freepage-reporting.x= 86_64-latest.args +++ b/tests/qemuxml2argvdata/virtio-options-memballoon-freepage-reporting.x= 86_64-latest.args @@ -26,8 +26,8 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ -audiodev id=3Daudio1,driver=3Dnone \ --device virtio-balloon-pci,id=3Dballoon0,free-page-reporting=3Don,bus=3Dpc= i.0,addr=3D0x2 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","free-page-reporti= ng":true,"bus":"pci.0","addr":"0x2"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/virtio-options-memballoon-iommu.x86_64-= latest.args b/tests/qemuxml2argvdata/virtio-options-memballoon-iommu.x86_64= -latest.args index 2b08aeee01..d3edca0fde 100644 --- a/tests/qemuxml2argvdata/virtio-options-memballoon-iommu.x86_64-latest.= args +++ b/tests/qemuxml2argvdata/virtio-options-memballoon-iommu.x86_64-latest.= args @@ -26,8 +26,8 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ -audiodev id=3Daudio1,driver=3Dnone \ --device virtio-balloon-pci,iommu_platform=3Don,id=3Dballoon0,bus=3Dpci.0,a= ddr=3D0x2 \ +-device '{"driver":"virtio-balloon-pci","iommu_platform":true,"id":"balloo= n0","bus":"pci.0","addr":"0x2"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/virtio-options-memballoon-packed.x86_64= -latest.args b/tests/qemuxml2argvdata/virtio-options-memballoon-packed.x86_= 64-latest.args index 865e81eb21..85d91105a0 100644 --- a/tests/qemuxml2argvdata/virtio-options-memballoon-packed.x86_64-latest= .args +++ b/tests/qemuxml2argvdata/virtio-options-memballoon-packed.x86_64-latest= .args @@ -26,8 +26,8 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ -audiodev id=3Daudio1,driver=3Dnone \ --device virtio-balloon-pci,packed=3Don,id=3Dballoon0,bus=3Dpci.0,addr=3D0x= 2 \ +-device '{"driver":"virtio-balloon-pci","packed":true,"id":"balloon0","bus= ":"pci.0","addr":"0x2"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don 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 8ec2387405..e0b8febae0 100644 --- a/tests/qemuxml2argvdata/virtio-options-net-ats.x86_64-latest.args +++ b/tests/qemuxml2argvdata/virtio-options-net-ats.x86_64-latest.args @@ -26,12 +26,12 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ -netdev user,id=3Dhostnet0 \ --device virtio-net-pci,ats=3Don,netdev=3Dhostnet0,id=3Dnet0,mac=3D52:54:56= :58:5a:5c,bus=3Dpci.0,addr=3D0x2 \ +-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 \ --device virtio-net-pci,ats=3Doff,netdev=3Dhostnet1,id=3Dnet1,mac=3D62:64:6= 6:68:6a:6c,bus=3Dpci.0,addr=3D0x3 \ +-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=3Daudio1,driver=3Dnone \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x4 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x4"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don 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 76a7944029..4772a2dcc8 100644 --- a/tests/qemuxml2argvdata/virtio-options-net-iommu.x86_64-latest.args +++ b/tests/qemuxml2argvdata/virtio-options-net-iommu.x86_64-latest.args @@ -26,12 +26,12 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ -netdev user,id=3Dhostnet0 \ --device virtio-net-pci,iommu_platform=3Don,netdev=3Dhostnet0,id=3Dnet0,mac= =3D52:54:56:58:5a:5c,bus=3Dpci.0,addr=3D0x2 \ +-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 \ --device virtio-net-pci,iommu_platform=3Doff,netdev=3Dhostnet1,id=3Dnet1,ma= c=3D62:64:66:68:6a:6c,bus=3Dpci.0,addr=3D0x3 \ +-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=3Daudio1,driver=3Dnone \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x4 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x4"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don 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 b8d7a971fa..d9e702a919 100644 --- a/tests/qemuxml2argvdata/virtio-options-net-packed.x86_64-latest.args +++ b/tests/qemuxml2argvdata/virtio-options-net-packed.x86_64-latest.args @@ -26,12 +26,12 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ -netdev user,id=3Dhostnet0 \ --device virtio-net-pci,packed=3Don,netdev=3Dhostnet0,id=3Dnet0,mac=3D52:54= :56:58:5a:5c,bus=3Dpci.0,addr=3D0x2 \ +-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 \ --device virtio-net-pci,packed=3Doff,netdev=3Dhostnet1,id=3Dnet1,mac=3D62:6= 4:66:68:6a:6c,bus=3Dpci.0,addr=3D0x3 \ +-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=3Daudio1,driver=3Dnone \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x4 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x4"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/virtio-options-rng-ats.x86_64-latest.ar= gs b/tests/qemuxml2argvdata/virtio-options-rng-ats.x86_64-latest.args index 936da98242..c023cee6fb 100644 --- a/tests/qemuxml2argvdata/virtio-options-rng-ats.x86_64-latest.args +++ b/tests/qemuxml2argvdata/virtio-options-rng-ats.x86_64-latest.args @@ -26,12 +26,12 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ -audiodev id=3Daudio1,driver=3Dnone \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x4 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x4"}' \ -object '{"qom-type":"rng-random","id":"objrng0","filename":"/dev/random"}= ' \ --device virtio-rng-pci,ats=3Don,rng=3Dobjrng0,id=3Drng0,bus=3Dpci.0,addr= =3D0x2 \ +-device '{"driver":"virtio-rng-pci","ats":true,"rng":"objrng0","id":"rng0"= ,"bus":"pci.0","addr":"0x2"}' \ -object '{"qom-type":"rng-random","id":"objrng1","filename":"/dev/random"}= ' \ --device virtio-rng-pci,ats=3Doff,rng=3Dobjrng1,id=3Drng1,bus=3Dpci.0,addr= =3D0x3 \ +-device '{"driver":"virtio-rng-pci","ats":false,"rng":"objrng1","id":"rng1= ","bus":"pci.0","addr":"0x3"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/virtio-options-rng-iommu.x86_64-latest.= args b/tests/qemuxml2argvdata/virtio-options-rng-iommu.x86_64-latest.args index ff52853bee..c1b252bacf 100644 --- a/tests/qemuxml2argvdata/virtio-options-rng-iommu.x86_64-latest.args +++ b/tests/qemuxml2argvdata/virtio-options-rng-iommu.x86_64-latest.args @@ -26,12 +26,12 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ -audiodev id=3Daudio1,driver=3Dnone \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x4 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x4"}' \ -object '{"qom-type":"rng-random","id":"objrng0","filename":"/dev/random"}= ' \ --device virtio-rng-pci,iommu_platform=3Don,rng=3Dobjrng0,id=3Drng0,bus=3Dp= ci.0,addr=3D0x2 \ +-device '{"driver":"virtio-rng-pci","iommu_platform":true,"rng":"objrng0",= "id":"rng0","bus":"pci.0","addr":"0x2"}' \ -object '{"qom-type":"rng-random","id":"objrng1","filename":"/dev/random"}= ' \ --device virtio-rng-pci,iommu_platform=3Doff,rng=3Dobjrng1,id=3Drng1,bus=3D= pci.0,addr=3D0x3 \ +-device '{"driver":"virtio-rng-pci","iommu_platform":false,"rng":"objrng1"= ,"id":"rng1","bus":"pci.0","addr":"0x3"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/virtio-options-rng-packed.x86_64-latest= .args b/tests/qemuxml2argvdata/virtio-options-rng-packed.x86_64-latest.args index 4c1a727ff8..7c4aa9444b 100644 --- a/tests/qemuxml2argvdata/virtio-options-rng-packed.x86_64-latest.args +++ b/tests/qemuxml2argvdata/virtio-options-rng-packed.x86_64-latest.args @@ -26,12 +26,12 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ -audiodev id=3Daudio1,driver=3Dnone \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x4 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x4"}' \ -object '{"qom-type":"rng-random","id":"objrng0","filename":"/dev/random"}= ' \ --device virtio-rng-pci,packed=3Don,rng=3Dobjrng0,id=3Drng0,bus=3Dpci.0,add= r=3D0x2 \ +-device '{"driver":"virtio-rng-pci","packed":true,"rng":"objrng0","id":"rn= g0","bus":"pci.0","addr":"0x2"}' \ -object '{"qom-type":"rng-random","id":"objrng1","filename":"/dev/random"}= ' \ --device virtio-rng-pci,packed=3Doff,rng=3Dobjrng1,id=3Drng1,bus=3Dpci.0,ad= dr=3D0x3 \ +-device '{"driver":"virtio-rng-pci","packed":false,"rng":"objrng1","id":"r= ng1","bus":"pci.0","addr":"0x3"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/virtio-options-video-ats.x86_64-latest.= args b/tests/qemuxml2argvdata/virtio-options-video-ats.x86_64-latest.args index b2a944bb34..0c9d65c1e9 100644 --- a/tests/qemuxml2argvdata/virtio-options-video-ats.x86_64-latest.args +++ b/tests/qemuxml2argvdata/virtio-options-video-ats.x86_64-latest.args @@ -26,12 +26,12 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ -audiodev id=3Daudio1,driver=3Dnone \ -chardev socket,id=3Dchr-vu-video0,fd=3D1729 \ -chardev socket,id=3Dchr-vu-video1,fd=3D1729 \ --device vhost-user-vga,id=3Dvideo0,max_outputs=3D1,chardev=3Dchr-vu-video0= ,bus=3Dpci.0,addr=3D0x2 \ --device vhost-user-gpu-pci,ats=3Doff,id=3Dvideo1,max_outputs=3D1,chardev= =3Dchr-vu-video1,bus=3Dpci.0,addr=3D0x3 \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x4 \ +-device '{"driver":"vhost-user-vga","id":"video0","max_outputs":1,"chardev= ":"chr-vu-video0","bus":"pci.0","addr":"0x2"}' \ +-device '{"driver":"vhost-user-gpu-pci","ats":false,"id":"video1","max_out= puts":1,"chardev":"chr-vu-video1","bus":"pci.0","addr":"0x3"}' \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x4"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/virtio-options-video-iommu.x86_64-lates= t.args b/tests/qemuxml2argvdata/virtio-options-video-iommu.x86_64-latest.ar= gs index 23808318cc..b49d81d5e5 100644 --- a/tests/qemuxml2argvdata/virtio-options-video-iommu.x86_64-latest.args +++ b/tests/qemuxml2argvdata/virtio-options-video-iommu.x86_64-latest.args @@ -26,12 +26,12 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ -audiodev id=3Daudio1,driver=3Dnone \ -chardev socket,id=3Dchr-vu-video0,fd=3D1729 \ -chardev socket,id=3Dchr-vu-video1,fd=3D1729 \ --device vhost-user-vga,id=3Dvideo0,max_outputs=3D1,chardev=3Dchr-vu-video0= ,bus=3Dpci.0,addr=3D0x2 \ --device vhost-user-gpu-pci,iommu_platform=3Doff,id=3Dvideo1,max_outputs=3D= 1,chardev=3Dchr-vu-video1,bus=3Dpci.0,addr=3D0x3 \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x4 \ +-device '{"driver":"vhost-user-vga","id":"video0","max_outputs":1,"chardev= ":"chr-vu-video0","bus":"pci.0","addr":"0x2"}' \ +-device '{"driver":"vhost-user-gpu-pci","iommu_platform":false,"id":"video= 1","max_outputs":1,"chardev":"chr-vu-video1","bus":"pci.0","addr":"0x3"}' \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x4"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/virtio-options-video-packed.x86_64-late= st.args b/tests/qemuxml2argvdata/virtio-options-video-packed.x86_64-latest.= args index f431df9062..d1f15167bb 100644 --- a/tests/qemuxml2argvdata/virtio-options-video-packed.x86_64-latest.args +++ b/tests/qemuxml2argvdata/virtio-options-video-packed.x86_64-latest.args @@ -26,12 +26,12 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ -audiodev id=3Daudio1,driver=3Dnone \ -chardev socket,id=3Dchr-vu-video0,fd=3D1729 \ -chardev socket,id=3Dchr-vu-video1,fd=3D1729 \ --device vhost-user-vga,id=3Dvideo0,max_outputs=3D1,chardev=3Dchr-vu-video0= ,bus=3Dpci.0,addr=3D0x2 \ --device vhost-user-gpu-pci,packed=3Doff,id=3Dvideo1,max_outputs=3D1,charde= v=3Dchr-vu-video1,bus=3Dpci.0,addr=3D0x3 \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x4 \ +-device '{"driver":"vhost-user-vga","id":"video0","max_outputs":1,"chardev= ":"chr-vu-video0","bus":"pci.0","addr":"0x2"}' \ +-device '{"driver":"vhost-user-gpu-pci","packed":false,"id":"video1","max_= outputs":1,"chardev":"chr-vu-video1","bus":"pci.0","addr":"0x3"}' \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x4"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/virtio-options.x86_64-latest.args b/tes= ts/qemuxml2argvdata/virtio-options.x86_64-latest.args index 6a55134ee8..78d34b77df 100644 --- a/tests/qemuxml2argvdata/virtio-options.x86_64-latest.args +++ b/tests/qemuxml2argvdata/virtio-options.x86_64-latest.args @@ -26,27 +26,27 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ --device virtio-scsi-pci,iommu_platform=3Don,ats=3Don,packed=3Don,page-per-= vq=3Don,id=3Dscsi0,bus=3Dpci.0,addr=3D0x8 \ --device virtio-serial-pci,iommu_platform=3Don,ats=3Don,packed=3Don,page-pe= r-vq=3Don,id=3Dvirtio-serial0,bus=3Dpci.0,addr=3D0x9 \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ +-device '{"driver":"virtio-scsi-pci","iommu_platform":true,"ats":true,"pac= ked":true,"page-per-vq":true,"id":"scsi0","bus":"pci.0","addr":"0x8"}' \ +-device '{"driver":"virtio-serial-pci","iommu_platform":true,"ats":true,"p= acked":true,"page-per-vq":true,"id":"virtio-serial0","bus":"pci.0","addr":"= 0x9"}' \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/img1","nod= e-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 virtio-blk-pci,iommu_platform=3Don,ats=3Don,packed=3Don,page-per-v= q=3Don,bus=3Dpci.0,addr=3D0xa,drive=3Dlibvirt-1-format,id=3Dvirtio-disk0,bo= otindex=3D1 \ +-device '{"driver":"virtio-blk-pci","iommu_platform":true,"ats":true,"pack= ed":true,"page-per-vq":true,"bus":"pci.0","addr":"0xa","drive":"libvirt-1-f= ormat","id":"virtio-disk0","bootindex":1}' \ -fsdev local,security_model=3Dpassthrough,id=3Dfsdev-fs0,path=3D/export/fs= 1 \ --device virtio-9p-pci,iommu_platform=3Don,ats=3Don,packed=3Don,page-per-vq= =3Don,id=3Dfs0,fsdev=3Dfsdev-fs0,mount_tag=3Dfs1,bus=3Dpci.0,addr=3D0x3 \ +-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 virtio-9p-pci,iommu_platform=3Don,ats=3Don,packed=3Don,page-per-vq= =3Don,id=3Dfs1,fsdev=3Dfsdev-fs1,mount_tag=3Dfs2,bus=3Dpci.0,addr=3D0x4 \ +-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 \ --device virtio-net-pci,iommu_platform=3Don,ats=3Don,packed=3Don,page-per-v= q=3Don,netdev=3Dhostnet0,id=3Dnet0,mac=3D52:54:56:58:5a:5c,bus=3Dpci.0,addr= =3D0x6 \ --device virtio-mouse-pci,iommu_platform=3Don,ats=3Don,packed=3Don,page-per= -vq=3Don,id=3Dinput0,bus=3Dpci.0,addr=3D0xe \ --device virtio-keyboard-pci,iommu_platform=3Don,ats=3Don,packed=3Don,page-= per-vq=3Don,id=3Dinput1,bus=3Dpci.0,addr=3D0x10 \ --device virtio-tablet-pci,iommu_platform=3Don,ats=3Don,packed=3Don,page-pe= r-vq=3Don,id=3Dinput2,bus=3Dpci.0,addr=3D0x11 \ --device virtio-input-host-pci,iommu_platform=3Don,ats=3Don,packed=3Don,pag= e-per-vq=3Don,id=3Dinput3,evdev=3D/dev/input/event1234,bus=3Dpci.0,addr=3D0= x12 \ +-device '{"driver":"virtio-net-pci","iommu_platform":true,"ats":true,"pack= ed":true,"page-per-vq":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"}= ' \ +-device '{"driver":"virtio-tablet-pci","iommu_platform":true,"ats":true,"p= acked":true,"page-per-vq":true,"id":"input2","bus":"pci.0","addr":"0x11"}' \ +-device '{"driver":"virtio-input-host-pci","iommu_platform":true,"ats":tru= e,"packed":true,"page-per-vq":true,"id":"input3","evdev":"/dev/input/event1= 234","bus":"pci.0","addr":"0x12"}' \ -audiodev id=3Daudio1,driver=3Dnone \ -chardev socket,id=3Dchr-vu-video0,fd=3D1729 \ --device vhost-user-vga,id=3Dvideo0,max_outputs=3D1,chardev=3Dchr-vu-video0= ,bus=3Dpci.0,addr=3D0x2 \ --device virtio-balloon-pci,iommu_platform=3Don,ats=3Don,packed=3Don,page-p= er-vq=3Don,id=3Dballoon0,bus=3Dpci.0,addr=3D0xc \ +-device '{"driver":"vhost-user-vga","id":"video0","max_outputs":1,"chardev= ":"chr-vu-video0","bus":"pci.0","addr":"0x2"}' \ +-device '{"driver":"virtio-balloon-pci","iommu_platform":true,"ats":true,"= packed":true,"page-per-vq":true,"id":"balloon0","bus":"pci.0","addr":"0xc"}= ' \ -object '{"qom-type":"rng-random","id":"objrng0","filename":"/dev/random"}= ' \ --device virtio-rng-pci,iommu_platform=3Don,ats=3Don,packed=3Don,page-per-v= q=3Don,rng=3Dobjrng0,id=3Drng0,bus=3Dpci.0,addr=3D0xd \ +-device '{"driver":"virtio-rng-pci","iommu_platform":true,"ats":true,"pack= ed":true,"page-per-vq":true,"rng":"objrng0","id":"rng0","bus":"pci.0","addr= ":"0xd"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/virtio-rng-builtin.x86_64-latest.args b= /tests/qemuxml2argvdata/virtio-rng-builtin.x86_64-latest.args index 0edb65a58a..d7bcb61eec 100644 --- a/tests/qemuxml2argvdata/virtio-rng-builtin.x86_64-latest.args +++ b/tests/qemuxml2argvdata/virtio-rng-builtin.x86_64-latest.args @@ -26,10 +26,10 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ -audiodev id=3Daudio1,driver=3Dnone \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ -object '{"qom-type":"rng-builtin","id":"objrng0"}' \ --device virtio-rng-pci,rng=3Dobjrng0,id=3Drng0,bus=3Dpci.0,addr=3D0x3 \ +-device '{"driver":"virtio-rng-pci","rng":"objrng0","id":"rng0","bus":"pci= .0","addr":"0x3"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/virtio-rng-egd-unix.x86_64-latest.args = b/tests/qemuxml2argvdata/virtio-rng-egd-unix.x86_64-latest.args index 36348e00e1..91489bb12f 100644 --- a/tests/qemuxml2argvdata/virtio-rng-egd-unix.x86_64-latest.args +++ b/tests/qemuxml2argvdata/virtio-rng-egd-unix.x86_64-latest.args @@ -26,11 +26,11 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ -audiodev id=3Daudio1,driver=3Dnone \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ -chardev socket,id=3Dcharrng0,fd=3D1729,server=3Don,wait=3Doff \ -object '{"qom-type":"rng-egd","id":"objrng0","chardev":"charrng0"}' \ --device virtio-rng-pci,rng=3Dobjrng0,id=3Drng0,bus=3Dpci.0,addr=3D0x3 \ +-device '{"driver":"virtio-rng-pci","rng":"objrng0","id":"rng0","bus":"pci= .0","addr":"0x3"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/virtio-transitional.x86_64-latest.args = b/tests/qemuxml2argvdata/virtio-transitional.x86_64-latest.args index 8c2dbfebd8..d2a5f38662 100644 --- a/tests/qemuxml2argvdata/virtio-transitional.x86_64-latest.args +++ b/tests/qemuxml2argvdata/virtio-transitional.x86_64-latest.args @@ -26,24 +26,24 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device pcie-root-port,port=3D8,chassis=3D1,id=3Dpci.1,bus=3Dpcie.0,multif= unction=3Don,addr=3D0x1 \ --device pcie-pci-bridge,id=3Dpci.2,bus=3Dpci.1,addr=3D0x0 \ --device pcie-root-port,port=3D9,chassis=3D3,id=3Dpci.3,bus=3Dpcie.0,addr= =3D0x1.0x1 \ --device virtio-scsi-pci-transitional,id=3Dscsi0,bus=3Dpci.2,addr=3D0x4 \ --device virtio-serial-pci-transitional,id=3Dvirtio-serial0,bus=3Dpci.2,add= r=3D0x3 \ +-device '{"driver":"pcie-root-port","port":8,"chassis":1,"id":"pci.1","bus= ":"pcie.0","multifunction":true,"addr":"0x1"}' \ +-device '{"driver":"pcie-pci-bridge","id":"pci.2","bus":"pci.1","addr":"0x= 0"}' \ +-device '{"driver":"pcie-root-port","port":9,"chassis":3,"id":"pci.3","bus= ":"pcie.0","addr":"0x1.0x1"}' \ +-device '{"driver":"virtio-scsi-pci-transitional","id":"scsi0","bus":"pci.= 2","addr":"0x4"}' \ +-device '{"driver":"virtio-serial-pci-transitional","id":"virtio-serial0",= "bus":"pci.2","addr":"0x3"}' \ -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 virtio-blk-pci-transitional,bus=3Dpci.2,addr=3D0x5,drive=3Dlibvirt= -1-format,id=3Dvirtio-disk0,bootindex=3D1 \ +-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 virtio-9p-pci-transitional,id=3Dfs0,fsdev=3Dfsdev-fs0,mount_tag=3D= fs1,bus=3Dpci.2,addr=3D0x1 \ +-device '{"driver":"virtio-9p-pci-transitional","id":"fs0","fsdev":"fsdev-= fs0","mount_tag":"fs1","bus":"pci.2","addr":"0x1"}' \ -netdev user,id=3Dhostnet0 \ --device virtio-net-pci-transitional,netdev=3Dhostnet0,id=3Dnet0,mac=3D00:1= 1:22:33:44:55,bus=3Dpci.2,addr=3D0x2 \ --device virtio-input-host-pci-transitional,id=3Dinput0,evdev=3D/dev/input/= event1234,bus=3Dpci.2,addr=3D0x9 \ +-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=3Daudio1,driver=3Dnone \ --device vhost-scsi-pci-transitional,wwpn=3Dnaa.5123456789abcde0,vhostfd=3D= 3,id=3Dhostdev0,bus=3Dpci.2,addr=3D0x6 \ --device virtio-balloon-pci-transitional,id=3Dballoon0,bus=3Dpci.2,addr=3D0= x7 \ +-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 virtio-rng-pci-transitional,rng=3Dobjrng0,id=3Drng0,bus=3Dpci.2,ad= dr=3D0x8 \ +-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 vhost-vsock-pci-transitional,id=3Dvsock0,guest-cid=3D4,vhostfd=3D6= 789,bus=3Dpci.2,addr=3D0xa \ +-device '{"driver":"vhost-vsock-pci-transitional","id":"vsock0","guest-cid= ":4,"vhostfd":"6789","bus":"pci.2","addr":"0xa"}' \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/watchdog-device.x86_64-latest.args b/te= sts/qemuxml2argvdata/watchdog-device.x86_64-latest.args index 78ac8227c3..70a9da5f37 100644 --- a/tests/qemuxml2argvdata/watchdog-device.x86_64-latest.args +++ b/tests/qemuxml2argvdata/watchdog-device.x86_64-latest.args @@ -26,13 +26,13 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ -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 ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-0-0= ,bootindex=3D1 \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ -audiodev id=3Daudio1,driver=3Dnone \ --device i6300esb,id=3Dwatchdog0,bus=3Dpci.0,addr=3D0x3 \ +-device '{"driver":"i6300esb","id":"watchdog0","bus":"pci.0","addr":"0x3"}= ' \ -watchdog-action poweroff \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/watchdog-dump.x86_64-latest.args b/test= s/qemuxml2argvdata/watchdog-dump.x86_64-latest.args index 439998dcd8..2e7324dd9a 100644 --- a/tests/qemuxml2argvdata/watchdog-dump.x86_64-latest.args +++ b/tests/qemuxml2argvdata/watchdog-dump.x86_64-latest.args @@ -26,13 +26,13 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ -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 ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-0-0= ,bootindex=3D1 \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ -audiodev id=3Daudio1,driver=3Dnone \ --device ib700,id=3Dwatchdog0 \ +-device '{"driver":"ib700","id":"watchdog0"}' \ -watchdog-action pause \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/watchdog-injectnmi.x86_64-latest.args b= /tests/qemuxml2argvdata/watchdog-injectnmi.x86_64-latest.args index 371e4c0162..d74b3576a4 100644 --- a/tests/qemuxml2argvdata/watchdog-injectnmi.x86_64-latest.args +++ b/tests/qemuxml2argvdata/watchdog-injectnmi.x86_64-latest.args @@ -26,13 +26,13 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ -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 ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-0-0= ,bootindex=3D1 \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ -audiodev id=3Daudio1,driver=3Dnone \ --device ib700,id=3Dwatchdog0 \ +-device '{"driver":"ib700","id":"watchdog0"}' \ -watchdog-action inject-nmi \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/watchdog.x86_64-latest.args b/tests/qem= uxml2argvdata/watchdog.x86_64-latest.args index 76a845c60f..d1ed230a00 100644 --- a/tests/qemuxml2argvdata/watchdog.x86_64-latest.args +++ b/tests/qemuxml2argvdata/watchdog.x86_64-latest.args @@ -26,12 +26,12 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ -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 ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-0-0= ,bootindex=3D1 \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ -audiodev id=3Daudio1,driver=3Dnone \ --device ib700,id=3Dwatchdog0 \ +-device '{"driver":"ib700","id":"watchdog0"}' \ -watchdog-action poweroff \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/x86_64-default-cpu-kvm-pc-4.2.x86_64-la= test.args b/tests/qemuxml2argvdata/x86_64-default-cpu-kvm-pc-4.2.x86_64-lat= est.args index a50eb6c286..9a4342153a 100644 --- a/tests/qemuxml2argvdata/x86_64-default-cpu-kvm-pc-4.2.x86_64-latest.ar= gs +++ b/tests/qemuxml2argvdata/x86_64-default-cpu-kvm-pc-4.2.x86_64-latest.ar= gs @@ -25,11 +25,11 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-guest/.config \ -rtc base=3Dutc \ -no-shutdown \ -boot strict=3Don \ --device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ -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 virtio-blk-pci,bus=3Dpci.0,addr=3D0x2,drive=3Dlibvirt-1-format,id= =3Dvirtio-disk0,bootindex=3D1 \ +-device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x2","drive":"li= bvirt-1-format","id":"virtio-disk0","bootindex":1}' \ -audiodev id=3Daudio1,driver=3Dnone \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x3 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x3"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/x86_64-default-cpu-kvm-q35-4.2.x86_64-l= atest.args b/tests/qemuxml2argvdata/x86_64-default-cpu-kvm-q35-4.2.x86_64-l= atest.args index c1501e6c0a..406a383f9b 100644 --- a/tests/qemuxml2argvdata/x86_64-default-cpu-kvm-q35-4.2.x86_64-latest.a= rgs +++ b/tests/qemuxml2argvdata/x86_64-default-cpu-kvm-q35-4.2.x86_64-latest.a= rgs @@ -25,15 +25,15 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-guest/.config \ -rtc base=3Dutc \ -no-shutdown \ -boot strict=3Don \ --device pcie-root-port,port=3D8,chassis=3D1,id=3Dpci.1,bus=3Dpcie.0,multif= unction=3Don,addr=3D0x1 \ --device pcie-root-port,port=3D9,chassis=3D2,id=3Dpci.2,bus=3Dpcie.0,addr= =3D0x1.0x1 \ --device pcie-root-port,port=3D10,chassis=3D3,id=3Dpci.3,bus=3Dpcie.0,addr= =3D0x1.0x2 \ --device pcie-root-port,port=3D11,chassis=3D4,id=3Dpci.4,bus=3Dpcie.0,addr= =3D0x1.0x3 \ --device qemu-xhci,id=3Dusb,bus=3Dpci.1,addr=3D0x0 \ +-device '{"driver":"pcie-root-port","port":8,"chassis":1,"id":"pci.1","bus= ":"pcie.0","multifunction":true,"addr":"0x1"}' \ +-device '{"driver":"pcie-root-port","port":9,"chassis":2,"id":"pci.2","bus= ":"pcie.0","addr":"0x1.0x1"}' \ +-device '{"driver":"pcie-root-port","port":10,"chassis":3,"id":"pci.3","bu= s":"pcie.0","addr":"0x1.0x2"}' \ +-device '{"driver":"pcie-root-port","port":11,"chassis":4,"id":"pci.4","bu= s":"pcie.0","addr":"0x1.0x3"}' \ +-device '{"driver":"qemu-xhci","id":"usb","bus":"pci.1","addr":"0x0"}' \ -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 virtio-blk-pci,bus=3Dpci.2,addr=3D0x0,drive=3Dlibvirt-1-format,id= =3Dvirtio-disk0,bootindex=3D1 \ +-device '{"driver":"virtio-blk-pci","bus":"pci.2","addr":"0x0","drive":"li= bvirt-1-format","id":"virtio-disk0","bootindex":1}' \ -audiodev id=3Daudio1,driver=3Dnone \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.3,addr=3D0x0 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.3","add= r":"0x0"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/x86_64-default-cpu-tcg-pc-4.2.x86_64-la= test.args b/tests/qemuxml2argvdata/x86_64-default-cpu-tcg-pc-4.2.x86_64-lat= est.args index 2718c65119..58477ff33e 100644 --- a/tests/qemuxml2argvdata/x86_64-default-cpu-tcg-pc-4.2.x86_64-latest.ar= gs +++ b/tests/qemuxml2argvdata/x86_64-default-cpu-tcg-pc-4.2.x86_64-latest.ar= gs @@ -25,11 +25,11 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-guest/.config \ -rtc base=3Dutc \ -no-shutdown \ -boot strict=3Don \ --device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ -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 virtio-blk-pci,bus=3Dpci.0,addr=3D0x2,drive=3Dlibvirt-1-format,id= =3Dvirtio-disk0,bootindex=3D1 \ +-device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x2","drive":"li= bvirt-1-format","id":"virtio-disk0","bootindex":1}' \ -audiodev id=3Daudio1,driver=3Dnone \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x3 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x3"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/x86_64-default-cpu-tcg-q35-4.2.x86_64-l= atest.args b/tests/qemuxml2argvdata/x86_64-default-cpu-tcg-q35-4.2.x86_64-l= atest.args index d4f7980e5d..60e415ffbd 100644 --- a/tests/qemuxml2argvdata/x86_64-default-cpu-tcg-q35-4.2.x86_64-latest.a= rgs +++ b/tests/qemuxml2argvdata/x86_64-default-cpu-tcg-q35-4.2.x86_64-latest.a= rgs @@ -25,15 +25,15 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-guest/.config \ -rtc base=3Dutc \ -no-shutdown \ -boot strict=3Don \ --device pcie-root-port,port=3D8,chassis=3D1,id=3Dpci.1,bus=3Dpcie.0,multif= unction=3Don,addr=3D0x1 \ --device pcie-root-port,port=3D9,chassis=3D2,id=3Dpci.2,bus=3Dpcie.0,addr= =3D0x1.0x1 \ --device pcie-root-port,port=3D10,chassis=3D3,id=3Dpci.3,bus=3Dpcie.0,addr= =3D0x1.0x2 \ --device pcie-root-port,port=3D11,chassis=3D4,id=3Dpci.4,bus=3Dpcie.0,addr= =3D0x1.0x3 \ --device qemu-xhci,id=3Dusb,bus=3Dpci.1,addr=3D0x0 \ +-device '{"driver":"pcie-root-port","port":8,"chassis":1,"id":"pci.1","bus= ":"pcie.0","multifunction":true,"addr":"0x1"}' \ +-device '{"driver":"pcie-root-port","port":9,"chassis":2,"id":"pci.2","bus= ":"pcie.0","addr":"0x1.0x1"}' \ +-device '{"driver":"pcie-root-port","port":10,"chassis":3,"id":"pci.3","bu= s":"pcie.0","addr":"0x1.0x2"}' \ +-device '{"driver":"pcie-root-port","port":11,"chassis":4,"id":"pci.4","bu= s":"pcie.0","addr":"0x1.0x3"}' \ +-device '{"driver":"qemu-xhci","id":"usb","bus":"pci.1","addr":"0x0"}' \ -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 virtio-blk-pci,bus=3Dpci.2,addr=3D0x0,drive=3Dlibvirt-1-format,id= =3Dvirtio-disk0,bootindex=3D1 \ +-device '{"driver":"virtio-blk-pci","bus":"pci.2","addr":"0x0","drive":"li= bvirt-1-format","id":"virtio-disk0","bootindex":1}' \ -audiodev id=3Daudio1,driver=3Dnone \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.3,addr=3D0x0 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.3","add= r":"0x0"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don 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 cff8cb3a7e..e3048603ba 100644 --- a/tests/qemuxml2argvdata/x86_64-pc-graphics.x86_64-latest.args +++ b/tests/qemuxml2argvdata/x86_64-pc-graphics.x86_64-latest.args @@ -28,23 +28,23 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-guest/.config \ -global PIIX4_PM.disable_s3=3D1 \ -global PIIX4_PM.disable_s4=3D1 \ -boot strict=3Don \ --device qemu-xhci,p2=3D15,p3=3D15,id=3Dusb,bus=3Dpci.0,addr=3D0x4 \ --device virtio-serial-pci,id=3Dvirtio-serial0,bus=3Dpci.0,addr=3D0x5 \ +-device '{"driver":"qemu-xhci","p2":15,"p3":15,"id":"usb","bus":"pci.0","a= ddr":"0x4"}' \ +-device '{"driver":"virtio-serial-pci","id":"virtio-serial0","bus":"pci.0"= ,"addr":"0x5"}' \ -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 virtio-blk-pci,bus=3Dpci.0,addr=3D0x6,drive=3Dlibvirt-1-format,id= =3Dvirtio-disk0,bootindex=3D1 \ +-device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x6","drive":"li= bvirt-1-format","id":"virtio-disk0","bootindex":1}' \ -netdev user,id=3Dhostnet0 \ --device virtio-net-pci,netdev=3Dhostnet0,id=3Dnet0,mac=3D52:54:00:4c:e3:86= ,bus=3Dpci.0,addr=3D0x3 \ +-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 isa-serial,chardev=3Dcharserial0,id=3Dserial0 \ +-device '{"driver":"isa-serial","chardev":"charserial0","id":"serial0"}' \ -chardev socket,id=3Dcharchannel0,fd=3D1729,server=3Don,wait=3Doff \ --device virtserialport,bus=3Dvirtio-serial0.0,nr=3D1,chardev=3Dcharchannel= 0,id=3Dchannel0,name=3Dorg.qemu.guest_agent.0 \ --device usb-tablet,id=3Dinput0,bus=3Dusb.0,port=3D1 \ +-device '{"driver":"virtserialport","bus":"virtio-serial0.0","nr":1,"chard= ev":"charchannel0","id":"channel0","name":"org.qemu.guest_agent.0"}' \ +-device '{"driver":"usb-tablet","id":"input0","bus":"usb.0","port":"1"}' \ -audiodev id=3Daudio1,driver=3Dnone \ -vnc 127.0.0.1:0,audiodev=3Daudio1 \ --device qxl-vga,id=3Dvideo0,ram_size=3D67108864,vram_size=3D67108864,vram6= 4_size_mb=3D0,vgamem_mb=3D16,max_outputs=3D1,bus=3Dpci.0,addr=3D0x2 \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x7 \ +-device '{"driver":"qxl-vga","id":"video0","ram_size":67108864,"vram_size"= :67108864,"vram64_size_mb":0,"vgamem_mb":16,"max_outputs":1,"bus":"pci.0","= addr":"0x2"}' \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x7"}' \ -object '{"qom-type":"rng-random","id":"objrng0","filename":"/dev/urandom"= }' \ --device virtio-rng-pci,rng=3Dobjrng0,id=3Drng0,bus=3Dpci.0,addr=3D0x8 \ +-device '{"driver":"virtio-rng-pci","rng":"objrng0","id":"rng0","bus":"pci= .0","addr":"0x8"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don 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 aaa2e313cf..e93b5f9100 100644 --- a/tests/qemuxml2argvdata/x86_64-pc-headless.x86_64-latest.args +++ b/tests/qemuxml2argvdata/x86_64-pc-headless.x86_64-latest.args @@ -29,20 +29,20 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-guest/.config \ -global PIIX4_PM.disable_s3=3D1 \ -global PIIX4_PM.disable_s4=3D1 \ -boot strict=3Don \ --device qemu-xhci,p2=3D15,p3=3D15,id=3Dusb,bus=3Dpci.0,addr=3D0x3 \ --device virtio-serial-pci,id=3Dvirtio-serial0,bus=3Dpci.0,addr=3D0x4 \ +-device '{"driver":"qemu-xhci","p2":15,"p3":15,"id":"usb","bus":"pci.0","a= ddr":"0x3"}' \ +-device '{"driver":"virtio-serial-pci","id":"virtio-serial0","bus":"pci.0"= ,"addr":"0x4"}' \ -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 virtio-blk-pci,bus=3Dpci.0,addr=3D0x5,drive=3Dlibvirt-1-format,id= =3Dvirtio-disk0,bootindex=3D1 \ +-device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x5","drive":"li= bvirt-1-format","id":"virtio-disk0","bootindex":1}' \ -netdev user,id=3Dhostnet0 \ --device virtio-net-pci,netdev=3Dhostnet0,id=3Dnet0,mac=3D52:54:00:09:a4:37= ,bus=3Dpci.0,addr=3D0x2 \ +-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 isa-serial,chardev=3Dcharserial0,id=3Dserial0 \ +-device '{"driver":"isa-serial","chardev":"charserial0","id":"serial0"}' \ -chardev socket,id=3Dcharchannel0,fd=3D1729,server=3Don,wait=3Doff \ --device virtserialport,bus=3Dvirtio-serial0.0,nr=3D1,chardev=3Dcharchannel= 0,id=3Dchannel0,name=3Dorg.qemu.guest_agent.0 \ +-device '{"driver":"virtserialport","bus":"virtio-serial0.0","nr":1,"chard= ev":"charchannel0","id":"channel0","name":"org.qemu.guest_agent.0"}' \ -audiodev id=3Daudio1,driver=3Dnone \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x6 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x6"}' \ -object '{"qom-type":"rng-random","id":"objrng0","filename":"/dev/urandom"= }' \ --device virtio-rng-pci,rng=3Dobjrng0,id=3Drng0,bus=3Dpci.0,addr=3D0x7 \ +-device '{"driver":"virtio-rng-pci","rng":"objrng0","id":"rng0","bus":"pci= .0","addr":"0x7"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don 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 4ba4567e86..ab3f5091dd 100644 --- a/tests/qemuxml2argvdata/x86_64-q35-graphics.x86_64-latest.args +++ b/tests/qemuxml2argvdata/x86_64-q35-graphics.x86_64-latest.args @@ -28,30 +28,30 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-guest/.config \ -global ICH9-LPC.disable_s3=3D1 \ -global ICH9-LPC.disable_s4=3D1 \ -boot strict=3Don \ --device pcie-root-port,port=3D16,chassis=3D1,id=3Dpci.1,bus=3Dpcie.0,multi= function=3Don,addr=3D0x2 \ --device pcie-root-port,port=3D17,chassis=3D2,id=3Dpci.2,bus=3Dpcie.0,addr= =3D0x2.0x1 \ --device pcie-root-port,port=3D18,chassis=3D3,id=3Dpci.3,bus=3Dpcie.0,addr= =3D0x2.0x2 \ --device pcie-root-port,port=3D19,chassis=3D4,id=3Dpci.4,bus=3Dpcie.0,addr= =3D0x2.0x3 \ --device pcie-root-port,port=3D20,chassis=3D5,id=3Dpci.5,bus=3Dpcie.0,addr= =3D0x2.0x4 \ --device pcie-root-port,port=3D21,chassis=3D6,id=3Dpci.6,bus=3Dpcie.0,addr= =3D0x2.0x5 \ --device pcie-root-port,port=3D22,chassis=3D7,id=3Dpci.7,bus=3Dpcie.0,addr= =3D0x2.0x6 \ --device qemu-xhci,p2=3D15,p3=3D15,id=3Dusb,bus=3Dpci.2,addr=3D0x0 \ --device virtio-serial-pci,id=3Dvirtio-serial0,bus=3Dpci.3,addr=3D0x0 \ +-device '{"driver":"pcie-root-port","port":16,"chassis":1,"id":"pci.1","bu= s":"pcie.0","multifunction":true,"addr":"0x2"}' \ +-device '{"driver":"pcie-root-port","port":17,"chassis":2,"id":"pci.2","bu= s":"pcie.0","addr":"0x2.0x1"}' \ +-device '{"driver":"pcie-root-port","port":18,"chassis":3,"id":"pci.3","bu= s":"pcie.0","addr":"0x2.0x2"}' \ +-device '{"driver":"pcie-root-port","port":19,"chassis":4,"id":"pci.4","bu= s":"pcie.0","addr":"0x2.0x3"}' \ +-device '{"driver":"pcie-root-port","port":20,"chassis":5,"id":"pci.5","bu= s":"pcie.0","addr":"0x2.0x4"}' \ +-device '{"driver":"pcie-root-port","port":21,"chassis":6,"id":"pci.6","bu= s":"pcie.0","addr":"0x2.0x5"}' \ +-device '{"driver":"pcie-root-port","port":22,"chassis":7,"id":"pci.7","bu= s":"pcie.0","addr":"0x2.0x6"}' \ +-device '{"driver":"qemu-xhci","p2":15,"p3":15,"id":"usb","bus":"pci.2","a= ddr":"0x0"}' \ +-device '{"driver":"virtio-serial-pci","id":"virtio-serial0","bus":"pci.3"= ,"addr":"0x0"}' \ -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 virtio-blk-pci,bus=3Dpci.4,addr=3D0x0,drive=3Dlibvirt-1-format,id= =3Dvirtio-disk0,bootindex=3D1 \ +-device '{"driver":"virtio-blk-pci","bus":"pci.4","addr":"0x0","drive":"li= bvirt-1-format","id":"virtio-disk0","bootindex":1}' \ -netdev user,id=3Dhostnet0 \ --device virtio-net-pci,netdev=3Dhostnet0,id=3Dnet0,mac=3D52:54:00:d2:70:0b= ,bus=3Dpci.1,addr=3D0x0 \ +-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 isa-serial,chardev=3Dcharserial0,id=3Dserial0 \ +-device '{"driver":"isa-serial","chardev":"charserial0","id":"serial0"}' \ -chardev socket,id=3Dcharchannel0,fd=3D1729,server=3Don,wait=3Doff \ --device virtserialport,bus=3Dvirtio-serial0.0,nr=3D1,chardev=3Dcharchannel= 0,id=3Dchannel0,name=3Dorg.qemu.guest_agent.0 \ --device usb-tablet,id=3Dinput0,bus=3Dusb.0,port=3D1 \ +-device '{"driver":"virtserialport","bus":"virtio-serial0.0","nr":1,"chard= ev":"charchannel0","id":"channel0","name":"org.qemu.guest_agent.0"}' \ +-device '{"driver":"usb-tablet","id":"input0","bus":"usb.0","port":"1"}' \ -audiodev id=3Daudio1,driver=3Dnone \ -vnc 127.0.0.1:0,audiodev=3Daudio1 \ --device qxl-vga,id=3Dvideo0,ram_size=3D67108864,vram_size=3D67108864,vram6= 4_size_mb=3D0,vgamem_mb=3D16,max_outputs=3D1,bus=3Dpcie.0,addr=3D0x1 \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.5,addr=3D0x0 \ +-device '{"driver":"qxl-vga","id":"video0","ram_size":67108864,"vram_size"= :67108864,"vram64_size_mb":0,"vgamem_mb":16,"max_outputs":1,"bus":"pcie.0",= "addr":"0x1"}' \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.5","add= r":"0x0"}' \ -object '{"qom-type":"rng-random","id":"objrng0","filename":"/dev/urandom"= }' \ --device virtio-rng-pci,rng=3Dobjrng0,id=3Drng0,bus=3Dpci.6,addr=3D0x0 \ +-device '{"driver":"virtio-rng-pci","rng":"objrng0","id":"rng0","bus":"pci= .6","addr":"0x0"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don 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 26fe95eac3..9801615c34 100644 --- a/tests/qemuxml2argvdata/x86_64-q35-headless.x86_64-latest.args +++ b/tests/qemuxml2argvdata/x86_64-q35-headless.x86_64-latest.args @@ -29,27 +29,27 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-guest/.config \ -global ICH9-LPC.disable_s3=3D1 \ -global ICH9-LPC.disable_s4=3D1 \ -boot strict=3Don \ --device pcie-root-port,port=3D8,chassis=3D1,id=3Dpci.1,bus=3Dpcie.0,multif= unction=3Don,addr=3D0x1 \ --device pcie-root-port,port=3D9,chassis=3D2,id=3Dpci.2,bus=3Dpcie.0,addr= =3D0x1.0x1 \ --device pcie-root-port,port=3D10,chassis=3D3,id=3Dpci.3,bus=3Dpcie.0,addr= =3D0x1.0x2 \ --device pcie-root-port,port=3D11,chassis=3D4,id=3Dpci.4,bus=3Dpcie.0,addr= =3D0x1.0x3 \ --device pcie-root-port,port=3D12,chassis=3D5,id=3Dpci.5,bus=3Dpcie.0,addr= =3D0x1.0x4 \ --device pcie-root-port,port=3D13,chassis=3D6,id=3Dpci.6,bus=3Dpcie.0,addr= =3D0x1.0x5 \ --device pcie-root-port,port=3D14,chassis=3D7,id=3Dpci.7,bus=3Dpcie.0,addr= =3D0x1.0x6 \ --device qemu-xhci,p2=3D15,p3=3D15,id=3Dusb,bus=3Dpci.2,addr=3D0x0 \ --device virtio-serial-pci,id=3Dvirtio-serial0,bus=3Dpci.3,addr=3D0x0 \ +-device '{"driver":"pcie-root-port","port":8,"chassis":1,"id":"pci.1","bus= ":"pcie.0","multifunction":true,"addr":"0x1"}' \ +-device '{"driver":"pcie-root-port","port":9,"chassis":2,"id":"pci.2","bus= ":"pcie.0","addr":"0x1.0x1"}' \ +-device '{"driver":"pcie-root-port","port":10,"chassis":3,"id":"pci.3","bu= s":"pcie.0","addr":"0x1.0x2"}' \ +-device '{"driver":"pcie-root-port","port":11,"chassis":4,"id":"pci.4","bu= s":"pcie.0","addr":"0x1.0x3"}' \ +-device '{"driver":"pcie-root-port","port":12,"chassis":5,"id":"pci.5","bu= s":"pcie.0","addr":"0x1.0x4"}' \ +-device '{"driver":"pcie-root-port","port":13,"chassis":6,"id":"pci.6","bu= s":"pcie.0","addr":"0x1.0x5"}' \ +-device '{"driver":"pcie-root-port","port":14,"chassis":7,"id":"pci.7","bu= s":"pcie.0","addr":"0x1.0x6"}' \ +-device '{"driver":"qemu-xhci","p2":15,"p3":15,"id":"usb","bus":"pci.2","a= ddr":"0x0"}' \ +-device '{"driver":"virtio-serial-pci","id":"virtio-serial0","bus":"pci.3"= ,"addr":"0x0"}' \ -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 virtio-blk-pci,bus=3Dpci.4,addr=3D0x0,drive=3Dlibvirt-1-format,id= =3Dvirtio-disk0,bootindex=3D1 \ +-device '{"driver":"virtio-blk-pci","bus":"pci.4","addr":"0x0","drive":"li= bvirt-1-format","id":"virtio-disk0","bootindex":1}' \ -netdev user,id=3Dhostnet0 \ --device virtio-net-pci,netdev=3Dhostnet0,id=3Dnet0,mac=3D52:54:00:09:a4:37= ,bus=3Dpci.1,addr=3D0x0 \ +-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 isa-serial,chardev=3Dcharserial0,id=3Dserial0 \ +-device '{"driver":"isa-serial","chardev":"charserial0","id":"serial0"}' \ -chardev socket,id=3Dcharchannel0,fd=3D1729,server=3Don,wait=3Doff \ --device virtserialport,bus=3Dvirtio-serial0.0,nr=3D1,chardev=3Dcharchannel= 0,id=3Dchannel0,name=3Dorg.qemu.guest_agent.0 \ +-device '{"driver":"virtserialport","bus":"virtio-serial0.0","nr":1,"chard= ev":"charchannel0","id":"channel0","name":"org.qemu.guest_agent.0"}' \ -audiodev id=3Daudio1,driver=3Dnone \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.5,addr=3D0x0 \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.5","add= r":"0x0"}' \ -object '{"qom-type":"rng-random","id":"objrng0","filename":"/dev/urandom"= }' \ --device virtio-rng-pci,rng=3Dobjrng0,id=3Drng0,bus=3Dpci.6,addr=3D0x0 \ +-device '{"driver":"virtio-rng-pci","rng":"objrng0","id":"rng0","bus":"pci= .6","addr":"0x0"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don --=20 2.31.1 From nobody Sun Apr 28 13:01:00 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=1634542743; cv=none; d=zohomail.com; s=zohoarc; b=EiJSM4/1PTTQ4GlSF2SUE3ioMF4sUPGP67AMWTzrRskfCa9RahMtg/4/R2a61KXsYVvXI4Xwlx+siO11UgKV8M+2FVRUcW4nVmDH+JIa/xHjvRKibPsNhqFhBmRRgV1yMYhP3JwpAS6/qK8SHiSitEidNm5n3nr62SmH8T9YC4E= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1634542743; 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=85J/a+XxXeD8rsN1P+g6WezMwby1wc0gJsjoEF5MK8k=; b=WcTyWfVSlKllDUjoH+oBDl9vQ1LVeUkhjZn1zkYgiHol7nwyQnwcruwPPX1RcpmBt2PkU3R2JreeAAPMq9m0Z7QcOz3EhRrUeedknyRZck/Iwf2FN0/waTTT5tseiP3qKHGTmrpblqwT9oahf0Y1ch+1EHk3iRfnFVOPdZK4fuE= 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 16345427431321006.0597330542874; Mon, 18 Oct 2021 00:39:03 -0700 (PDT) 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-575-928lIOgIMnyYQN52_ylqmQ-1; Mon, 18 Oct 2021 03:38:57 -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 6C67619057A0; Mon, 18 Oct 2021 07:38:52 +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 49483B854E; Mon, 18 Oct 2021 07:38:52 +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 147401832DD6; Mon, 18 Oct 2021 07:38:52 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 19I7bgMG016797 for ; Mon, 18 Oct 2021 03:37:42 -0400 Received: by smtp.corp.redhat.com (Postfix) id 5C61270886; Mon, 18 Oct 2021 07:37:42 +0000 (UTC) Received: from speedmetal.lan (unknown [10.40.208.20]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4FB817086D for ; Mon, 18 Oct 2021 07:37:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1634542742; 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=85J/a+XxXeD8rsN1P+g6WezMwby1wc0gJsjoEF5MK8k=; b=Ajhnr4DhMhEL4nx7xKeSDiV3MJE/SeGg+Q7dGt+r8jPai6g3xd5+Xq4yYUmbJtX1CC1a6C UrdVqDa68KFrJfV270kJykFZ2ADFPQgTm+uv1ZoHBu7f1EZ9AFQjiAa7HkE/jhTRGh7qIH 4m022AP0OHELkzWKIGQn0CAAMeFngP0= X-MC-Unique: 928lIOgIMnyYQN52_ylqmQ-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 5/6] testCompareXMLToArgvValidateSchemaCommand: Add validation for '-device' Date: Mon, 18 Oct 2021 09:37:11 +0200 Message-Id: <54913a7d9902931c4643be752126c9ff9fd80cc6.1634542402.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 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.16 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-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1634542744082100001 Content-Type: text/plain; charset="utf-8" Now that we use JSON with -device we can validate it at least partially (since the schema for 'device_add' is for now incomplete) against the QMP schema. Signed-off-by: Peter Krempa Reviewed-by: J=C3=A1n Tomko --- tests/qemuxml2argvtest.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index d6cc2a51c2..e209b48fce 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -490,13 +490,15 @@ testCompareXMLToArgvCreateArgs(virQEMUDriver *drv, struct testValidateSchemaCommandData { const char *name; const char *schema; + bool allowIncomplete; /* relax validator for commands with incomplete = schema */ }; static const struct testValidateSchemaCommandData commands[] =3D { - { "-blockdev", "blockdev-add" }, - { "-netdev", "netdev_add" }, - { "-object", "object-add" }, + { "-blockdev", "blockdev-add", false }, + { "-netdev", "netdev_add", false }, + { "-object", "object-add", false }, + { "-device", "device_add", true }, }; static int @@ -535,7 +537,9 @@ testCompareXMLToArgvValidateSchemaCommand(GStrv args, return -1; if (testQEMUSchemaValidateCommand(command->schema, jsonargs, - schema, false, false, false,= &debug) < 0) { + schema, false, false, + command->allowIncomplete, + &debug) < 0) { VIR_TEST_VERBOSE("failed to validate '%s %s' against QAPI = schema: %s", command->name, curargs, virBufferCurrentC= ontent(&debug)); return -1; --=20 2.31.1 From nobody Sun Apr 28 13:01:00 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=1634542725; cv=none; d=zohomail.com; s=zohoarc; b=WvF0X3ei/BxYJVvIqKgAiZ193qxJalawxwx5Hba1T5KMQ+gzUtb/fLq2Ebrcd19DtExmlE7Bbk9ymk1O9wE8122gjSPPfo16L/LNB9HOdCLdVybMeRlaJf8rGhNu295NNGIW8VZLetCkFv0FwvezZ+1fY9YIed8pup2+PVfades= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1634542725; 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=yT+lW/H5vtZLdgsEhT5gjVyw5/qUE+NFDIzdwMo1pUw=; b=CKUHpg3WlgpZavYVRHY/9A7CuSDczeneXvZXXWAJXX0jBxpjXwSktdotNp6JD9nv4LbPfua7ACNAIo2SyrB4zp9Uppys/YYWEu/h04gjsBhuTTuZO8fvgoB6KIcs+Gzpiybk4Dai96TyhqmtPBuVbcolVYUFAX2bZowMPXPtCwQ= 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 163454272575620.122647995976422; Mon, 18 Oct 2021 00:38:45 -0700 (PDT) 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-146-HjVc8R4EO3Gjl4Vg3BvljA-1; Mon, 18 Oct 2021 03:38:40 -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 4365010A8E01; Mon, 18 Oct 2021 07:38:36 +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 D40A05BB0D; Mon, 18 Oct 2021 07:38:35 +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 4C6FB181A1CF; Mon, 18 Oct 2021 07:38:35 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 19I7bhRG016807 for ; Mon, 18 Oct 2021 03:37:43 -0400 Received: by smtp.corp.redhat.com (Postfix) id 6E4EA70886; Mon, 18 Oct 2021 07:37:43 +0000 (UTC) Received: from speedmetal.lan (unknown [10.40.208.20]) by smtp.corp.redhat.com (Postfix) with ESMTP id C85127086D for ; Mon, 18 Oct 2021 07:37:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1634542724; 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=yT+lW/H5vtZLdgsEhT5gjVyw5/qUE+NFDIzdwMo1pUw=; b=cmglrihtJMWpn0/EzR0diDItgQ2ySwpXXvWfDX0Aa2QXWQJB+Fu3lJI3hVSv/t5ZOgMPxx 6JLxFTXiCMaqwPYQfZADmO3xNYbAZfH6Cua9G/MB0oKL2OFEnPRx9ItzaPanGtMbINwI4Y 6uqWHfT8pCMXj16gZASnwSsXAXY3qPE= X-MC-Unique: HjVc8R4EO3Gjl4Vg3BvljA-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 6/6] NEWS: Mention conversion of '-device' to JSON starting with QEMU-6.2 Date: Mon, 18 Oct 2021 09:37:12 +0200 Message-Id: <3120d6008a480dafba052593ade7e83d56fe4bcd.1634542402.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 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.13 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-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1634542726948100001 Content-Type: text/plain; charset="utf-8" Normally this would be considered an internal detail which we don't document in the news, but in this case I'd like to make people aware of the change so that they preferrably report them ASAP. Signed-off-by: Peter Krempa Reviewed-by: J=C3=A1n Tomko --- NEWS.rst | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/NEWS.rst b/NEWS.rst index ae678bffc4..32f876c1ea 100644 --- a/NEWS.rst +++ b/NEWS.rst @@ -42,6 +42,13 @@ v7.9.0 (unreleased) * **Improvements** + * Use of JSON syntax with ``-device`` with upcoming QEMU-6.2 + + Libvirt started using JSON directly with the ``-device`` commandline + parameter as it's considered the preferred stable syntax for further Q= EMU + releases. If any problems with the conversion are encoutered please + report them as soon as possible. + * **Bug fixes** --=20 2.31.1