From nobody Wed May 15 18:25:23 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.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 216.205.24.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=1636986154; cv=none; d=zohomail.com; s=zohoarc; b=XxvNToaL3FVE0jM6Bh5ooTrmM+8YRkNhKUL+aJ81mYfJhQpT6Og1GGC3a6wmUzc8/Tq/sUUNQ5q1gfXlwcKAFekm24zt9F/ndnyccNRrrlO+vmxV+3PuIqkfghxInZ59YwPJN5m99cq5W1y4a8mCsrn/AwFXM9I6h3+aWlMiRgg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1636986154; 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=nYHoGqb9FvsIo1XYmfJEIvpwqxwkSerzcYPXh3n6hUE=; b=LcdDAF7qtwHig2Kk9iVPcloFTqOG6lfU3C55TETJWh1FQiO+Iyh5jjEWaxlkv6Cdd7yhDbnkA4m6MIdxCoFLFCXWeaJqepuFSylPmzJOTAvV7c9ZEua+HJF3GFttHZik/Xs8E/cMDehcyUHKBOt9zeTDANn/phtByxhusH8pSXc= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.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 [216.205.24.124]) by mx.zohomail.com with SMTPS id 1636986154221752.0559063152213; Mon, 15 Nov 2021 06:22:34 -0800 (PST) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-525-0TG6qb16M1-UpaDMKh9Q7g-1; Mon, 15 Nov 2021 09:22:30 -0500 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 3CBA087D541; Mon, 15 Nov 2021 14:22:24 +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 DE42E5D9CA; Mon, 15 Nov 2021 14:22:23 +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 906C44A704; Mon, 15 Nov 2021 14:22:21 +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 1AFEMKGQ009669 for ; Mon, 15 Nov 2021 09:22:20 -0500 Received: by smtp.corp.redhat.com (Postfix) id 966CA5BB0D; Mon, 15 Nov 2021 14:22:20 +0000 (UTC) Received: from speedmetal.lan (unknown [10.40.208.20]) by smtp.corp.redhat.com (Postfix) with ESMTP id BF09622719 for ; Mon, 15 Nov 2021 14:22:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1636986153; 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=nYHoGqb9FvsIo1XYmfJEIvpwqxwkSerzcYPXh3n6hUE=; b=bSXPO3gfPIbVDN8+kVUKJya3g9bzcn4Z8wXGo1Z9tOBfI0T8kT9OLLxov1m4myC3HMqn+P 8DG6N3KSs1YNCZ8XSwQxwNcec4JOPoHPo5KamCzgwMfi20ANdRWXjjbu6Jgqn/trg1x7tA JqZl1b/l0SrEcjkJSAMUarcsjo8s9FM= X-MC-Unique: 0TG6qb16M1-UpaDMKh9Q7g-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 01/18] virJSONValueObjectAdd: Convert @obj argument to double pointer Date: Mon, 15 Nov 2021 15:22:00 +0100 Message-Id: <453979cfafa6af4ed46271f06491aa6bf6899cbf.1636986086.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.14 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: 1636986242892100003 Content-Type: text/plain; charset="utf-8" Change the first argument to a double pointer so that later the function can be unified with virJSONValueObjectCreate and fix all callers. Signed-off-by: Peter Krempa Reviewed-by: J=C3=A1n Tomko --- src/qemu/qemu_block.c | 36 +++++----- src/qemu/qemu_command.c | 124 +++++++++++++++++------------------ src/qemu/qemu_monitor_json.c | 6 +- src/util/virjson.c | 6 +- src/util/virjson.h | 2 +- 5 files changed, 87 insertions(+), 87 deletions(-) diff --git a/src/qemu/qemu_block.c b/src/qemu/qemu_block.c index b8e70f6a83..a1adef0c5d 100644 --- a/src/qemu/qemu_block.c +++ b/src/qemu/qemu_block.c @@ -636,7 +636,7 @@ qemuBlockStorageSourceGetGlusterProps(virStorageSource = *src, if (!onlytarget && src->debug && - virJSONValueObjectAdd(props, "u:debug", src->debugLevel, NULL) < 0) + virJSONValueObjectAdd(&props, "u:debug", src->debugLevel, NULL) < = 0) return NULL; return g_steal_pointer(&props); @@ -700,11 +700,11 @@ qemuBlockStorageSourceGetNFSProps(virStorageSource *s= rc) return NULL; if (src->nfs_uid !=3D -1 && - virJSONValueObjectAdd(ret, "i:user", src->nfs_uid, NULL) < 0) + virJSONValueObjectAdd(&ret, "i:user", src->nfs_uid, NULL) < 0) return NULL; if (src->nfs_gid !=3D -1 && - virJSONValueObjectAdd(ret, "i:group", src->nfs_gid, NULL) < 0) + virJSONValueObjectAdd(&ret, "i:group", src->nfs_gid, NULL) < 0) return NULL; return ret; @@ -1060,7 +1060,7 @@ qemuBlockStorageSourceGetVvfatProps(virStorageSource = *src, return NULL; if (!onlytarget && - virJSONValueObjectAdd(ret, "b:rw", !src->readonly, NULL) < 0) + virJSONValueObjectAdd(&ret, "b:rw", !src->readonly, NULL) < 0) return NULL; return g_steal_pointer(&ret); @@ -1270,21 +1270,21 @@ qemuBlockStorageSourceGetBackendProps(virStorageSou= rce *src, if (!onlytarget) { if (qemuBlockNodeNameValidate(src->nodestorage) < 0 || - virJSONValueObjectAdd(fileprops, "S:node-name", src->nodestora= ge, NULL) < 0) + virJSONValueObjectAdd(&fileprops, "S:node-name", src->nodestor= age, NULL) < 0) return NULL; if (!legacy) { if (qemuBlockStorageSourceGetBlockdevGetCacheProps(src, filepr= ops) < 0) return NULL; - if (virJSONValueObjectAdd(fileprops, + if (virJSONValueObjectAdd(&fileprops, "T:read-only", ro, "T:auto-read-only", aro, NULL) < 0) return NULL; if (!(flags & QEMU_BLOCK_STORAGE_SOURCE_BACKEND_PROPS_SKIP_UNM= AP) && - virJSONValueObjectAdd(fileprops, + virJSONValueObjectAdd(&fileprops, "s:discard", "unmap", NULL) < 0) return NULL; @@ -1307,7 +1307,7 @@ qemuBlockStorageSourceGetFormatLUKSProps(virStorageSo= urce *src, return -1; } - if (virJSONValueObjectAdd(props, + if (virJSONValueObjectAdd(&props, "s:driver", "luks", "s:key-secret", srcPriv->encinfo->alias, NULL) < 0) @@ -1321,14 +1321,14 @@ static int qemuBlockStorageSourceGetFormatRawProps(virStorageSource *src, virJSONValue *props) { - if (virJSONValueObjectAdd(props, "s:driver", "raw", NULL) < 0) + if (virJSONValueObjectAdd(&props, "s:driver", "raw", NULL) < 0) return -1; /* Currently only storage slices are supported. We'll have to calculate * the union of the slices here if we don't want to be adding needless * 'raw' nodes. */ if (src->sliceStorage && - virJSONValueObjectAdd(props, + virJSONValueObjectAdd(&props, "U:offset", src->sliceStorage->offset, "U:size", src->sliceStorage->size, NULL) < 0) @@ -1392,7 +1392,7 @@ qemuBlockStorageSourceGetFormatQcowGenericProps(virSt= orageSource *src, if (qemuBlockStorageSourceGetCryptoProps(src, &encprops) < 0) return -1; - if (virJSONValueObjectAdd(props, + if (virJSONValueObjectAdd(&props, "s:driver", format, "A:encrypt", &encprops, NULL) < 0) return -1; @@ -1426,7 +1426,7 @@ qemuBlockStorageSourceGetFormatQcow2Props(virStorageS= ource *src, * https://git.qemu.org/?p=3Dqemu.git;a=3Dblob;f=3Ddocs/qcow2-cache.txt */ if (src->metadataCacheMaxSize > 0) { - if (virJSONValueObjectAdd(props, + if (virJSONValueObjectAdd(&props, "U:cache-size", src->metadataCacheMaxSiz= e, NULL) < 0) return -1; @@ -1545,7 +1545,7 @@ qemuBlockStorageSourceGetBlockdevFormatProps(virStora= geSource *src) } if (driver && - virJSONValueObjectAdd(props, "s:driver", driver, NULL) < 0) + virJSONValueObjectAdd(&props, "s:driver", driver, NULL) < 0) return NULL; return g_steal_pointer(&props); @@ -2311,7 +2311,7 @@ qemuBlockStorageSourceCreateAddBacking(virStorageSour= ce *backing, if (!(backingFileStr =3D qemuBlockGetBackingStoreString(backing, false= ))) return -1; - if (virJSONValueObjectAdd(props, + if (virJSONValueObjectAdd(&props, "S:backing-file", backingFileStr, "S:backing-fmt", backingFormatStr, NULL) < 0) @@ -2370,7 +2370,7 @@ qemuBlockStorageSourceCreateGetEncryptionLUKS(virStor= ageSource *src, src->encryption->encinfo.cipher_si= ze); } - if (virJSONValueObjectAdd(props, + if (virJSONValueObjectAdd(&props, "S:cipher-alg", cipheralg, "S:cipher-mode", src->encryption->encinf= o.cipher_mode, "S:hash-alg", src->encryption->encinfo.c= ipher_hash, @@ -2394,7 +2394,7 @@ qemuBlockStorageSourceCreateGetFormatPropsLUKS(virSto= rageSource *src, if (qemuBlockStorageSourceCreateGetEncryptionLUKS(src, &luksprops) < 0) return -1; - if (virJSONValueObjectAdd(luksprops, + if (virJSONValueObjectAdd(&luksprops, "s:driver", "luks", "s:file", src->nodestorage, "U:size", src->capacity, @@ -2424,10 +2424,10 @@ qemuBlockStorageSourceCreateAddEncryptionQcow(virSt= orageSource *src, if (qemuBlockStorageSourceCreateGetEncryptionLUKS(src, &encryptProps) = < 0) return -1; - if (virJSONValueObjectAdd(encryptProps, "s:format", "luks", NULL) < 0) + if (virJSONValueObjectAdd(&encryptProps, "s:format", "luks", NULL) < 0) return -1; - if (virJSONValueObjectAdd(props, "a:encrypt", &encryptProps, NULL) < 0) + if (virJSONValueObjectAdd(&props, "a:encrypt", &encryptProps, NULL) < = 0) return -1; return 0; diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 9bd7258b1d..17ff7a5fe2 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -449,7 +449,7 @@ qemuBuildDeviceAddresDriveProps(virJSONValue *props, bus =3D g_strdup_printf("%s.%u", controllerAlias, info->addr.drive= .bus); - if (virJSONValueObjectAdd(props, + if (virJSONValueObjectAdd(&props, "s:bus", bus, "u:unit", info->addr.drive.unit, NULL) < 0) @@ -473,7 +473,7 @@ qemuBuildDeviceAddresDriveProps(virJSONValue *props, bus =3D g_strdup_printf("%s.%u", controllerAlias, info->addr.drive= .unit); - if (virJSONValueObjectAdd(props, + if (virJSONValueObjectAdd(&props, "s:bus", bus, NULL) < 0) return -1; @@ -481,7 +481,7 @@ qemuBuildDeviceAddresDriveProps(virJSONValue *props, break; case VIR_DOMAIN_DISK_BUS_FDC: - if (virJSONValueObjectAdd(props, + if (virJSONValueObjectAdd(&props, "u:unit", info->addr.drive.unit, NULL) < 0) return -1; @@ -503,7 +503,7 @@ qemuBuildDeviceAddresDriveProps(virJSONValue *props, case VIR_DOMAIN_CONTROLLER_MODEL_SCSI_AM53C974: bus =3D g_strdup_printf("%s.%u", controller->info.alias, info-= >addr.drive.bus); - if (virJSONValueObjectAdd(props, + if (virJSONValueObjectAdd(&props, "s:bus", bus, "u:scsi-id", info->addr.drive.unit, NULL) < 0) @@ -522,7 +522,7 @@ qemuBuildDeviceAddresDriveProps(virJSONValue *props, case VIR_DOMAIN_CONTROLLER_MODEL_SCSI_VIRTIO_NON_TRANSITIONAL: bus =3D g_strdup_printf("%s.0", controller->info.alias); - if (virJSONValueObjectAdd(props, + if (virJSONValueObjectAdd(&props, "s:bus", bus, "u:channel", info->addr.drive.bus, "u:scsi-id", info->addr.drive.target, @@ -578,7 +578,7 @@ qemuBuildDeviceAddressProps(virJSONValue *props, else pciaddr =3D g_strdup_printf("0x%x", info->addr.pci.slot); - if (virJSONValueObjectAdd(props, + if (virJSONValueObjectAdd(&props, "s:bus", bus, "T:multifunction", info->addr.pci.multi, "s:addr", pciaddr, @@ -604,7 +604,7 @@ qemuBuildDeviceAddressProps(virJSONValue *props, virDomainUSBAddressPortFormatBuf(&port, info->addr.usb.port); - if (virJSONValueObjectAdd(props, + if (virJSONValueObjectAdd(&props, "s:bus", bus, "S:port", virBufferCurrentContent(&port), NULL) < 0) @@ -615,7 +615,7 @@ qemuBuildDeviceAddressProps(virJSONValue *props, case VIR_DOMAIN_DEVICE_ADDRESS_TYPE_SPAPRVIO: if (info->addr.spaprvio.has_reg) { - if (virJSONValueObjectAdd(props, + if (virJSONValueObjectAdd(&props, "P:reg", info->addr.spaprvio.reg, NULL) < 0) return -1; @@ -628,14 +628,14 @@ qemuBuildDeviceAddressProps(virJSONValue *props, info->addr.ccw.ssid, info->addr.ccw.devno); - if (virJSONValueObjectAdd(props, "s:devno", devno, NULL) < 0) + if (virJSONValueObjectAdd(&props, "s:devno", devno, NULL) < 0) return -1; return 0; } case VIR_DOMAIN_DEVICE_ADDRESS_TYPE_ISA: - if (virJSONValueObjectAdd(props, + if (virJSONValueObjectAdd(&props, "u:iobase", info->addr.isa.iobase, "p:irq", info->addr.isa.irq, NULL) < 0) @@ -644,7 +644,7 @@ qemuBuildDeviceAddressProps(virJSONValue *props, return 0; case VIR_DOMAIN_DEVICE_ADDRESS_TYPE_DIMM: - if (virJSONValueObjectAdd(props, + if (virJSONValueObjectAdd(&props, "u:slot", info->addr.dimm.slot, "P:addr", info->addr.dimm.base, NULL) < 0) @@ -666,7 +666,7 @@ qemuBuildDeviceAddressProps(virJSONValue *props, bus =3D g_strdup_printf("%s.%d", contAlias, info->addr.vioserial.b= us); - if (virJSONValueObjectAdd(props, + if (virJSONValueObjectAdd(&props, "s:bus", bus, "i:nr", info->addr.vioserial.port, NULL) < 0) @@ -1122,7 +1122,7 @@ qemuBuildVirtioDevProps(virDomainDeviceType devtype, return NULL; if (virtioOptions) { - if (virJSONValueObjectAdd(props, + if (virJSONValueObjectAdd(&props, "T:iommu_platform", virtioOptions->iommu, "T:ats", virtioOptions->ats, "T:packed", virtioOptions->packed, @@ -1165,7 +1165,7 @@ qemuBuildRomProps(virJSONValue *props, } } - if (virJSONValueObjectAdd(props, + if (virJSONValueObjectAdd(&props, "k:rombar", rombar, "S:romfile", romfile, NULL) < 0) @@ -1975,7 +1975,7 @@ qemuBuildDiskDeviceProps(const virDomainDef *def, if (!(props =3D qemuBuildVirtioDevProps(VIR_DOMAIN_DEVICE_DISK, di= sk, qemuCaps))) return NULL; - if (virJSONValueObjectAdd(props, + if (virJSONValueObjectAdd(&props, "S:iothread", iothread, "T:ioeventfd", disk->ioeventfd, "T:event_idx", disk->event_idx, @@ -2088,7 +2088,7 @@ qemuBuildDiskDeviceProps(const virDomainDef *def, if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_STORAGE_WERROR)) qemuBuildDiskGetErrorPolicy(disk, &wpolicy, &rpolicy); - if (virJSONValueObjectAdd(props, + if (virJSONValueObjectAdd(&props, "S:device_id", scsiVPDDeviceId, "T:share-rw", shareRW, "S:drive", drive, @@ -2480,7 +2480,7 @@ qemuBuildVHostUserFsDevProps(virDomainFSDef *fs, if (!(props =3D qemuBuildVirtioDevProps(VIR_DOMAIN_DEVICE_FS, fs, priv= ->qemuCaps))) return NULL; - if (virJSONValueObjectAdd(props, + if (virJSONValueObjectAdd(&props, "s:id", fs->info.alias, "s:chardev", chardev_alias, "P:queue-size", fs->queue_size, @@ -2585,7 +2585,7 @@ qemuBuildFSDevCmd(virCommand *cmd, if (!(devprops =3D qemuBuildVirtioDevProps(VIR_DOMAIN_DEVICE_FS, fs, q= emuCaps))) return -1; - if (virJSONValueObjectAdd(devprops, + if (virJSONValueObjectAdd(&devprops, "s:id", fs->info.alias, "s:fsdev", fsdev, "s:mount_tag", fs->dst, @@ -2776,13 +2776,13 @@ qemuBuildUSBControllerDevProps(const virDomainDef *= domainDef, masterbus =3D g_strdup_printf("%s.0", alias); - if (virJSONValueObjectAdd(props, + if (virJSONValueObjectAdd(&props, "s:masterbus", masterbus, "i:firstport", def->info.master.usb.star= tport, NULL) < 0) return NULL; } else { - if (virJSONValueObjectAdd(props, + if (virJSONValueObjectAdd(&props, "s:id", def->info.alias, NULL) < 0) return NULL; @@ -2811,7 +2811,7 @@ qemuBuildControllerSCSIDevProps(virDomainControllerDe= f *def, if (def->iothread > 0) iothread =3D g_strdup_printf("iothread%u", def->iothread); - if (virJSONValueObjectAdd(props, + if (virJSONValueObjectAdd(&props, "S:iothread", iothread, "s:id", def->info.alias, "p:num_queues", def->queues, @@ -2915,7 +2915,7 @@ qemuBuildControllerPCIDevProps(virDomainControllerDef= *def, return -1; if (pciopts->numaNode !=3D -1 && - virJSONValueObjectAdd(props, "i:numa_node", pciopts->numaNode,= NULL) < 0) + virJSONValueObjectAdd(&props, "i:numa_node", pciopts->numaNode= , NULL) < 0) return -1; break; @@ -2952,7 +2952,7 @@ qemuBuildControllerPCIDevProps(virDomainControllerDef= *def, return -1; if (pciopts->numaNode !=3D -1 && - virJSONValueObjectAdd(props, "i:numa_node", pciopts->numaNode,= NULL) < 0) + virJSONValueObjectAdd(&props, "i:numa_node", pciopts->numaNode= , NULL) < 0) return -1; break; @@ -3015,7 +3015,7 @@ qemuBuildControllerDevProps(const virDomainDef *domai= nDef, qemuCaps))) return -1; - if (virJSONValueObjectAdd(props, + if (virJSONValueObjectAdd(&props, "s:id", def->info.alias, "k:max_ports", def->opts.vioserial.ports, "k:vectors", def->opts.vioserial.vectors, @@ -3305,10 +3305,10 @@ qemuBuildMemoryBackendPropsShare(virJSONValue *prop= s, { switch (memAccess) { case VIR_DOMAIN_MEMORY_ACCESS_SHARED: - return virJSONValueObjectAdd(props, "b:share", true, NULL); + return virJSONValueObjectAdd(&props, "b:share", true, NULL); case VIR_DOMAIN_MEMORY_ACCESS_PRIVATE: - return virJSONValueObjectAdd(props, "b:share", false, NULL); + return virJSONValueObjectAdd(&props, "b:share", false, NULL); case VIR_DOMAIN_MEMORY_ACCESS_DEFAULT: case VIR_DOMAIN_MEMORY_ACCESS_LAST: @@ -3498,8 +3498,8 @@ qemuBuildMemoryBackendProps(virJSONValue **backendPro= ps, backendType =3D "memory-backend-memfd"; if (useHugepage) { - if (virJSONValueObjectAdd(props, "b:hugetlb", useHugepage, NUL= L) < 0 || - virJSONValueObjectAdd(props, "U:hugetlbsize", pagesize << = 10, NULL) < 0) { + if (virJSONValueObjectAdd(&props, "b:hugetlb", useHugepage, NU= LL) < 0 || + virJSONValueObjectAdd(&props, "U:hugetlbsize", pagesize <<= 10, NULL) < 0) { return -1; } @@ -3533,7 +3533,7 @@ qemuBuildMemoryBackendProps(virJSONValue **backendPro= ps, return -1; } - if (virJSONValueObjectAdd(props, + if (virJSONValueObjectAdd(&props, "s:mem-path", memPath, NULL) < 0) return -1; @@ -3546,7 +3546,7 @@ qemuBuildMemoryBackendProps(virJSONValue **backendPro= ps, return -1; } - if (virJSONValueObjectAdd(props, + if (virJSONValueObjectAdd(&props, "B:discard-data", true, NULL) < 0) return -1; @@ -3574,7 +3574,7 @@ qemuBuildMemoryBackendProps(virJSONValue **backendPro= ps, */ if (disableCanonicalPath && virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_X_USE_CANONICAL_PATH_FOR_= RAMBLOCK_ID) && - virJSONValueObjectAdd(props, "b:x-use-canonical-path-for-ramblock-= id", false, NULL) < 0) + virJSONValueObjectAdd(&props, "b:x-use-canonical-path-for-ramblock= -id", false, NULL) < 0) return -1; if (mem->model =3D=3D VIR_DOMAIN_MEMORY_MODEL_VIRTIO_MEM) { @@ -3591,11 +3591,11 @@ qemuBuildMemoryBackendProps(virJSONValue **backendP= rops, return -1; } else { if (!priv->memPrealloc && - virJSONValueObjectAdd(props, "B:prealloc", prealloc, NULL) < 0) + virJSONValueObjectAdd(&props, "B:prealloc", prealloc, NULL) < = 0) return -1; } - if (virJSONValueObjectAdd(props, "U:size", mem->size * 1024, NULL) < 0) + if (virJSONValueObjectAdd(&props, "U:size", mem->size * 1024, NULL) < = 0) return -1; if (mem->alignsize) { @@ -3605,7 +3605,7 @@ qemuBuildMemoryBackendProps(virJSONValue **backendPro= ps, "with this QEMU binary")); return -1; } - if (virJSONValueObjectAdd(props, "U:align", mem->alignsize * 1024,= NULL) < 0) + if (virJSONValueObjectAdd(&props, "U:align", mem->alignsize * 1024= , NULL) < 0) return -1; } @@ -3616,7 +3616,7 @@ qemuBuildMemoryBackendProps(virJSONValue **backendPro= ps, "with this QEMU binary")); return -1; } - if (virJSONValueObjectAdd(props, "b:pmem", true, NULL) < 0) + if (virJSONValueObjectAdd(&props, "b:pmem", true, NULL) < 0) return -1; } @@ -3635,7 +3635,7 @@ qemuBuildMemoryBackendProps(virJSONValue **backendPro= ps, mode !=3D VIR_DOMAIN_NUMATUNE_MEM_RESTRICTIVE) { if (!virNumaNodesetIsAvailable(nodemask)) return -1; - if (virJSONValueObjectAdd(props, + if (virJSONValueObjectAdd(&props, "m:host-nodes", nodemask, "S:policy", qemuNumaPolicyTypeToString(m= ode), NULL) < 0) @@ -3884,7 +3884,7 @@ qemuBuildNicDevProps(virDomainDef *def, if (!(props =3D qemuBuildVirtioDevProps(VIR_DOMAIN_DEVICE_NET, net= , qemuCaps))) return NULL; - if (virJSONValueObjectAdd(props, + if (virJSONValueObjectAdd(&props, "S:tx", tx, "T:ioeventfd", net->driver.virtio.ioeven= tfd, "T:event_idx", net->driver.virtio.event_= idx, @@ -3917,7 +3917,7 @@ qemuBuildNicDevProps(virDomainDef *def, virMacAddrFormat(&net->mac, macaddr); - if (virJSONValueObjectAdd(props, + if (virJSONValueObjectAdd(&props, "s:netdev", netdev, "s:id", net->info.alias, "s:mac", macaddr, @@ -3973,7 +3973,7 @@ qemuBuildHostNetStr(virDomainNetDef *net, /* for one tapfd 'fd=3D' shall be used, * for more than one 'fds=3D' is the right choice */ if (tapfdSize =3D=3D 1) { - if (virJSONValueObjectAdd(netprops, "s:fd", tapfd[0], NULL) < = 0) + if (virJSONValueObjectAdd(&netprops, "s:fd", tapfd[0], NULL) <= 0) return NULL; } else { g_auto(virBuffer) fdsbuf =3D VIR_BUFFER_INITIALIZER; @@ -3983,7 +3983,7 @@ qemuBuildHostNetStr(virDomainNetDef *net, virBufferTrim(&fdsbuf, ":"); - if (virJSONValueObjectAdd(netprops, + if (virJSONValueObjectAdd(&netprops, "s:fds", virBufferCurrentContent(&fd= sbuf), NULL) < 0) return NULL; @@ -4102,7 +4102,7 @@ qemuBuildHostNetStr(virDomainNetDef *net, return NULL; if (vhostfdSize =3D=3D 1) { - if (virJSONValueObjectAdd(netprops, "s:vhostfd", vhostfd[0= ], NULL) < 0) + if (virJSONValueObjectAdd(&netprops, "s:vhostfd", vhostfd[= 0], NULL) < 0) return NULL; } else { g_auto(virBuffer) fdsbuf =3D VIR_BUFFER_INITIALIZER; @@ -4112,7 +4112,7 @@ qemuBuildHostNetStr(virDomainNetDef *net, virBufferTrim(&fdsbuf, ":"); - if (virJSONValueObjectAdd(netprops, + if (virJSONValueObjectAdd(&netprops, "s:vhostfds", virBufferCurrentCo= ntent(&fdsbuf), NULL) < 0) return NULL; @@ -4202,7 +4202,7 @@ qemuBuildMemballoonCommandLine(virCommand *cmd, def->memballoon, qemuCaps))) return -1; - if (virJSONValueObjectAdd(props, + if (virJSONValueObjectAdd(&props, "s:id", def->memballoon->info.alias, "T:deflate-on-oom", def->memballoon->autodef= late, "T:free-page-reporting", def->memballoon->fr= ee_page_reporting, @@ -4281,7 +4281,7 @@ qemuBuildInputVirtioDevProps(const virDomainDef *def, if (!(props =3D qemuBuildVirtioDevProps(VIR_DOMAIN_DEVICE_INPUT, dev, = qemuCaps))) return NULL; - if (virJSONValueObjectAdd(props, + if (virJSONValueObjectAdd(&props, "s:id", dev->info.alias, "S:evdev", evdev, NULL) < 0) @@ -4338,11 +4338,11 @@ qemuBuildInputEvdevProps(virDomainInputDef *dev) return NULL; if (dev->source.grab =3D=3D VIR_DOMAIN_INPUT_SOURCE_GRAB_ALL && - virJSONValueObjectAdd(props, "b:grab_all", true, NULL) < 0) + virJSONValueObjectAdd(&props, "b:grab_all", true, NULL) < 0) return NULL; if (dev->source.grabToggle !=3D VIR_DOMAIN_INPUT_SOURCE_GRAB_TOGGLE_DE= FAULT && - virJSONValueObjectAdd(props, "s:grab-toggle", + virJSONValueObjectAdd(&props, "s:grab-toggle", virDomainInputSourceGrabToggleTypeToString(d= ev->source.grabToggle), NULL) < 0) return NULL; @@ -4580,35 +4580,35 @@ qemuBuildDeviceVideoCmd(virCommand *cmd, } } - if (virJSONValueObjectAdd(props, + if (virJSONValueObjectAdd(&props, "s:id", video->info.alias, "T:virgl", virgl, NULL) < 0) return -1; if (video->type =3D=3D VIR_DOMAIN_VIDEO_TYPE_QXL) { - if (virJSONValueObjectAdd(props, + if (virJSONValueObjectAdd(&props, "p:ram_size", video->ram * 1024, "p:vram_size", video->vram * 1024, NULL) < 0) return -1; if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_QXL_VRAM64)) { - if (virJSONValueObjectAdd(props, + if (virJSONValueObjectAdd(&props, "u:vram64_size_mb", video->vram64 / = 1024, NULL) < 0) return -1; } if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_QXL_VGAMEM)) { - if (virJSONValueObjectAdd(props, + if (virJSONValueObjectAdd(&props, "u:vgamem_mb", video->vgamem / 1024, NULL) < 0) return -1; } if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_QXL_MAX_OUTPUTS)) { - if (virJSONValueObjectAdd(props, + if (virJSONValueObjectAdd(&props, "p:max_outputs", video->heads, NULL) < 0) return -1; @@ -4616,7 +4616,7 @@ qemuBuildDeviceVideoCmd(virCommand *cmd, } else if (video->backend =3D=3D VIR_DOMAIN_VIDEO_BACKEND_TYPE_VHOSTUS= ER) { g_autofree char *alias =3D qemuDomainGetVhostUserChrAlias(video->i= nfo.alias); - if (virJSONValueObjectAdd(props, + if (virJSONValueObjectAdd(&props, "p:max_outputs", video->heads, "s:chardev", alias, NULL) < 0) @@ -4627,7 +4627,7 @@ qemuBuildDeviceVideoCmd(virCommand *cmd, if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_VIRTIO_GPU_MAX_OUTPUTS)) heads =3D video->heads; - if (virJSONValueObjectAdd(props, + if (virJSONValueObjectAdd(&props, "p:max_outputs", heads, NULL) < 0) return -1; @@ -4635,19 +4635,19 @@ qemuBuildDeviceVideoCmd(virCommand *cmd, virQEMUCapsGet(qemuCaps, QEMU_CAPS_VGA_VGAMEM)) || (video->type =3D=3D VIR_DOMAIN_VIDEO_TYPE_VMVGA && virQEMUCapsGet(qemuCaps, QEMU_CAPS_VMWARE_SVGA_VGAMEM))) { - if (virJSONValueObjectAdd(props, + if (virJSONValueObjectAdd(&props, "p:vgamem_mb", video->vram / 1024, NULL) < 0) return -1; } else if (video->type =3D=3D VIR_DOMAIN_VIDEO_TYPE_BOCHS) { - if (virJSONValueObjectAdd(props, + if (virJSONValueObjectAdd(&props, "p:vgamem", video->vram * 1024, NULL) < 0) return -1; } if (video->res) { - if (virJSONValueObjectAdd(props, + if (virJSONValueObjectAdd(&props, "p:xres", video->res->x, "p:yres", video->res->y, NULL) < 0) @@ -4900,7 +4900,7 @@ qemuBuildSCSIVHostHostdevDevProps(const virDomainDef = *def, if (!(props =3D qemuBuildVirtioDevProps(VIR_DOMAIN_DEVICE_HOSTDEV, dev= , qemuCaps))) return NULL; - if (virJSONValueObjectAdd(props, + if (virJSONValueObjectAdd(&props, "s:wwpn", hostsrc->wwpn, "s:vhostfd", vhostfdName, "s:id", dev->info->alias, @@ -5664,7 +5664,7 @@ qemuBuildVirtioSerialPortDevProps(const virDomainDef = *def, targetname =3D "com.redhat.spice.0"; } - if (virJSONValueObjectAdd(props, + if (virJSONValueObjectAdd(&props, "s:chardev", chardev, "s:id", dev->info.alias, "S:name", targetname, @@ -5811,7 +5811,7 @@ qemuBuildRNGDevProps(const virDomainDef *def, period =3D 1000; } - if (virJSONValueObjectAdd(props, + if (virJSONValueObjectAdd(&props, "s:rng", rng, "s:id", dev->info.alias, "p:max-bytes", dev->rate, @@ -9150,7 +9150,7 @@ qemuBuildSmartcardCommandLine(virLogManager *logManag= er, bus =3D g_strdup_printf("%s.0", contAlias); - if (virJSONValueObjectAdd(props, + if (virJSONValueObjectAdd(&props, "s:id", smartcard->info.alias, "s:bus", bus, NULL) < 0) @@ -10166,7 +10166,7 @@ qemuBuildPanicCommandLine(virCommand *cmd, /* pvpanic uses 'ioport' instead of 'iobase' so * qemuBuildDeviceAddressProps can't be used */ if (def->panics[i]->info.type =3D=3D VIR_DOMAIN_DEVICE_ADDRESS= _TYPE_ISA) { - if (virJSONValueObjectAdd(props, + if (virJSONValueObjectAdd(&props, "u:ioport", def->panics[i]->info= .addr.isa.iobase, NULL) < 0) return -1; @@ -10472,7 +10472,7 @@ qemuBuildVsockDevProps(virDomainDef *def, if (!(props =3D qemuBuildVirtioDevProps(VIR_DOMAIN_DEVICE_VSOCK, vsock= , qemuCaps))) return NULL; - if (virJSONValueObjectAdd(props, + if (virJSONValueObjectAdd(&props, "s:id", vsock->info.alias, "u:guest-cid", vsock->guest_cid, "s:vhostfd", vhostfd, diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c index 4669b9135d..8105b40ffb 100644 --- a/src/qemu/qemu_monitor_json.c +++ b/src/qemu/qemu_monitor_json.c @@ -3612,7 +3612,7 @@ int qemuMonitorJSONAddFileHandleToSet(qemuMonitor *mo= n, return -1; if (fdset >=3D 0 && - virJSONValueObjectAdd(args, "j:fdset-id", fdset, NULL) < 0) { + virJSONValueObjectAdd(&args, "j:fdset-id", fdset, NULL) < 0) { return -1; } @@ -6636,7 +6636,7 @@ qemuMonitorJSONAttachCharDevCommand(const char *chrID, backend_type =3D "file"; if (virJSONValueObjectAppendString(data, "out", chr->data.file.pat= h) < 0) return NULL; - if (virJSONValueObjectAdd(data, + if (virJSONValueObjectAdd(&data, "T:append", chr->data.file.append, NULL) < 0) return NULL; @@ -6748,7 +6748,7 @@ qemuMonitorJSONAttachCharDevCommand(const char *chrID, } if (chr->logfile && - virJSONValueObjectAdd(data, + virJSONValueObjectAdd(&data, "s:logfile", chr->logfile, "T:logappend", chr->logappend, NULL) < 0) diff --git a/src/util/virjson.c b/src/util/virjson.c index 4aabad15ef..446b675309 100644 --- a/src/util/virjson.c +++ b/src/util/virjson.c @@ -348,13 +348,13 @@ virJSONValueObjectAddVArgs(virJSONValue *obj, int -virJSONValueObjectAdd(virJSONValue *obj, ...) +virJSONValueObjectAdd(virJSONValue **objptr, ...) { va_list args; int ret; - va_start(args, obj); - ret =3D virJSONValueObjectAddVArgs(obj, args); + va_start(args, objptr); + ret =3D virJSONValueObjectAddVArgs(*objptr, args); va_end(args); return ret; diff --git a/src/util/virjson.h b/src/util/virjson.h index 7b9fcbf99b..c5d969f0fc 100644 --- a/src/util/virjson.h +++ b/src/util/virjson.h @@ -48,7 +48,7 @@ int virJSONValueObjectCreate(virJSONValue **obj, ...) ATTRIBUTE_NONNULL(1) G_GNUC_NULL_TERMINATED; int virJSONValueObjectCreateVArgs(virJSONValue **obj, va_list args) ATTRIBUTE_NONNULL(1); -int virJSONValueObjectAdd(virJSONValue *obj, ...) +int virJSONValueObjectAdd(virJSONValue **obj, ...) ATTRIBUTE_NONNULL(1) G_GNUC_NULL_TERMINATED; int virJSONValueObjectAddVArgs(virJSONValue *obj, va_list args) ATTRIBUTE_NONNULL(1); --=20 2.31.1 From nobody Wed May 15 18:25:23 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=1636986238; cv=none; d=zohomail.com; s=zohoarc; b=bVRubpzrDQKqalzdrjRcytuwtm9uAga/lA021/qK82QK9T5ZBu5oGEPqXrhtVpfRC9CfDHfsFlHseOmWBB/13XP527oAzHOv4wU8K3ryZXdiZH5fZCZTGGs3Wq/C8AoCSJkQ1fGVcW71v+4TulzCOvsNyqH033bfeqEORV4IAaI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1636986238; 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=BKBdYRLuLhFbKnnIGuJd7AGeL+dwdXkRgrMF/GPMdkc=; b=EMoXXICPbnkNDZftAQGBKs2Pbho3+0jdm10LCMiwSraZ7I4Z3vqRr79paTGV82uoUJf5z/Zj6E1KG8FlVJOj/zs+bVr7ky1NHZtY/voCv7QwXDTtgfqFx/sGwmly/sJ0lBOICKPgZh2tpd+1rRcY2Ki0KCg9+P+QXHnKhaGzqfM= 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 1636986238991186.85331303492387; Mon, 15 Nov 2021 06:23:58 -0800 (PST) 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-454-r05QoOk-OVOnSuPJfmcJrw-1; Mon, 15 Nov 2021 09:23:56 -0500 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 9198A8144EE; Mon, 15 Nov 2021 14:23:50 +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 755F5101E58D; Mon, 15 Nov 2021 14:23:50 +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 3E2BD1832DD5; Mon, 15 Nov 2021 14:23:49 +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 1AFEMLoK009676 for ; Mon, 15 Nov 2021 09:22:21 -0500 Received: by smtp.corp.redhat.com (Postfix) id A90A122719; Mon, 15 Nov 2021 14:22:21 +0000 (UTC) Received: from speedmetal.lan (unknown [10.40.208.20]) by smtp.corp.redhat.com (Postfix) with ESMTP id 08F985BAE5 for ; Mon, 15 Nov 2021 14:22:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1636986238; 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=BKBdYRLuLhFbKnnIGuJd7AGeL+dwdXkRgrMF/GPMdkc=; b=VxPVaUe0KwF9pwrDAqnvjMk49C4kf+uwx0Op+Q8/ozlvJrKUrAP2uHZeBTynxT83Qg7NaX zM+PdX70yF9HiNLHZmfUkuo2vfDqWPw0sQsRUuNBSIXLULDZu3RYZVJNWyORiY0jiMi4R/ UAmj+7t68KyH6SRZQZGNi2OR7R75PpM= X-MC-Unique: r05QoOk-OVOnSuPJfmcJrw-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 02/18] virJSONValueObjectAddVArgs: Take double pointer Date: Mon, 15 Nov 2021 15:22:01 +0100 Message-Id: <6d96e9e701d2369c4b6c51bcd62bb034604cee9d.1636986086.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: 1636986311617100001 Content-Type: text/plain; charset="utf-8" Pass in the double pointer from the wrappers directly to virJSONValueObjectAddVArgs, which will allow us to directly allocate the new objects inside the function. Signed-off-by: Peter Krempa Reviewed-by: J=C3=A1n Tomko --- src/qemu/qemu_monitor.c | 2 +- src/util/virjson.c | 9 +++++---- src/util/virjson.h | 2 +- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c index 810dac209d..398bef2e96 100644 --- a/src/qemu/qemu_monitor.c +++ b/src/qemu/qemu_monitor.c @@ -2889,7 +2889,7 @@ qemuMonitorCreateObjectProps(virJSONValue **propsret, va_start(args, alias); - rc =3D virJSONValueObjectAddVArgs(props, args); + rc =3D virJSONValueObjectAddVArgs(&props, args); va_end(args); diff --git a/src/util/virjson.c b/src/util/virjson.c index 446b675309..bd71b84960 100644 --- a/src/util/virjson.c +++ b/src/util/virjson.c @@ -103,7 +103,7 @@ virJSONValueGetType(const virJSONValue *value) /** * virJSONValueObjectAddVArgs: - * @obj: JSON object to add the values to + * @objptr: pointer to a pointer to a JSON object to add the values to * @args: a key-value argument pairs, terminated by NULL * * Adds the key-value pairs supplied as variable argument list to @obj. @@ -152,9 +152,10 @@ virJSONValueGetType(const virJSONValue *value) * in case of no error but nothing was filled. */ int -virJSONValueObjectAddVArgs(virJSONValue *obj, +virJSONValueObjectAddVArgs(virJSONValue **objptr, va_list args) { + virJSONValue *obj =3D *objptr; char type; char *key; int rc; @@ -354,7 +355,7 @@ virJSONValueObjectAdd(virJSONValue **objptr, ...) int ret; va_start(args, objptr); - ret =3D virJSONValueObjectAddVArgs(*objptr, args); + ret =3D virJSONValueObjectAddVArgs(objptr, args); va_end(args); return ret; @@ -370,7 +371,7 @@ virJSONValueObjectCreateVArgs(virJSONValue **obj, *obj =3D virJSONValueNewObject(); /* free the object on error, or if no value objects were added */ - if ((ret =3D virJSONValueObjectAddVArgs(*obj, args)) <=3D 0) { + if ((ret =3D virJSONValueObjectAddVArgs(obj, args)) <=3D 0) { virJSONValueFree(*obj); *obj =3D NULL; } diff --git a/src/util/virjson.h b/src/util/virjson.h index c5d969f0fc..0d8dad754d 100644 --- a/src/util/virjson.h +++ b/src/util/virjson.h @@ -50,7 +50,7 @@ int virJSONValueObjectCreateVArgs(virJSONValue **obj, va_= list args) ATTRIBUTE_NONNULL(1); int virJSONValueObjectAdd(virJSONValue **obj, ...) ATTRIBUTE_NONNULL(1) G_GNUC_NULL_TERMINATED; -int virJSONValueObjectAddVArgs(virJSONValue *obj, va_list args) +int virJSONValueObjectAddVArgs(virJSONValue **objptr, va_list args) ATTRIBUTE_NONNULL(1); --=20 2.31.1 From nobody Wed May 15 18:25:23 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=1636986170; cv=none; d=zohomail.com; s=zohoarc; b=Ufm8TN6qraShubktogCZ8cSKkc2ZZv439My6Q8ACs+jOxY3hU68FNUU2lRuNeDgSg5GIWADAGIn3WXgRBQDD3pOtqRCl6mj9P45BJ7ETnklFRHz97MzXXrSz00riKjt8oRHUFCCjR1wuJBu8v7kxZ8uIvr0CWi1U0X9SkCWIGQw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1636986170; 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=SAFIifibjLHH7NJl69VCtyIpsdkH8vo0lJbQBvU6GtQ=; b=i5PtBPGGuCgCtU1F0mf1dP9ITXyCmuBGify7gA2r8G7X8Br5dhkx+OYrMnVu5B6AVpA407SKB7xnqDTpyGEu68lOk7bD8oaRAt4fprjanAD0K9uVLqcIzksojSp2vwZ17Pdt6tzsiXHoEMbLtrnpPV9CoApU+d9dz8TY5xmAaZU= 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 16369861698301023.8120981027366; Mon, 15 Nov 2021 06:22:49 -0800 (PST) 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-244-Iuf3AvhROsKwdCBcZrlCaw-1; Mon, 15 Nov 2021 09:22:47 -0500 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 8A235106C0F1; Mon, 15 Nov 2021 14:22: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 6B1D518A45; Mon, 15 Nov 2021 14:22: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 3E81F1806D03; Mon, 15 Nov 2021 14:22: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 1AFEMMIR009686 for ; Mon, 15 Nov 2021 09:22:22 -0500 Received: by smtp.corp.redhat.com (Postfix) id B6FCC22719; Mon, 15 Nov 2021 14:22:22 +0000 (UTC) Received: from speedmetal.lan (unknown [10.40.208.20]) by smtp.corp.redhat.com (Postfix) with ESMTP id 220035BB06 for ; Mon, 15 Nov 2021 14:22:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1636986168; 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=SAFIifibjLHH7NJl69VCtyIpsdkH8vo0lJbQBvU6GtQ=; b=ixTCgjmOfvSBSNx+FeAjNoU16JhPVOfP17iBR9naxdlmDaMmvYJkX9NwTTII3mSkGh+nbq UHDJhUt/YhUvyIuGJdabXxkygbdM6Xg1gtJLtmJJbng1SH2+k0gaRecDMSEbqu0tuCzIZd +Lam6gnM78uo3YmEaT11VjKlF/VJP28= X-MC-Unique: Iuf3AvhROsKwdCBcZrlCaw-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 03/18] virJSONValueObjectAddVArgs: Allocate new object if passed pointer is NULL Date: Mon, 15 Nov 2021 15:22:02 +0100 Message-Id: <19e667351b0ece79fada1007b7c2153b19827471.1636986086.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.14 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: 1636986254853100001 Content-Type: text/plain; charset="utf-8" Until now the code would crash if virJSONValueObjectAdd is used without a valid object. Adding the functionality of allocating it if it's NULL will allow us to replace all uses of virJSONValueObjectCreate with this single function. Signed-off-by: Peter Krempa Reviewed-by: J=C3=A1n Tomko --- src/util/virjson.c | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/src/util/virjson.c b/src/util/virjson.c index bd71b84960..8b3599e94f 100644 --- a/src/util/virjson.c +++ b/src/util/virjson.c @@ -155,11 +155,15 @@ int virJSONValueObjectAddVArgs(virJSONValue **objptr, va_list args) { + g_autoptr(virJSONValue) newobj =3D NULL; virJSONValue *obj =3D *objptr; char type; char *key; int rc; + if (obj =3D=3D NULL) + newobj =3D obj =3D virJSONValueNewObject(); + while ((key =3D va_arg(args, char *)) !=3D NULL) { if (strlen(key) < 3 || key[1] !=3D ':') { @@ -344,6 +348,9 @@ virJSONValueObjectAddVArgs(virJSONValue **objptr, if (virJSONValueObjectKeysNumber(obj) =3D=3D 0) return 0; + if (newobj) + *objptr =3D g_steal_pointer(&newobj); + return 1; } @@ -366,17 +373,9 @@ int virJSONValueObjectCreateVArgs(virJSONValue **obj, va_list args) { - int ret; - - *obj =3D virJSONValueNewObject(); + *obj =3D NULL; - /* free the object on error, or if no value objects were added */ - if ((ret =3D virJSONValueObjectAddVArgs(obj, args)) <=3D 0) { - virJSONValueFree(*obj); - *obj =3D NULL; - } - - return ret; + return virJSONValueObjectAddVArgs(obj, args); } --=20 2.31.1 From nobody Wed May 15 18:25:23 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=1636986174; cv=none; d=zohomail.com; s=zohoarc; b=dz4TuBpHoAzZw3kG0O11DB3WSZXtZcbAYFaVt9PEVNY5tkFi9iJ+ciCAtzt0UH29rLzq6YGyyfVb3X2WWwLDJl6vkJPlOZL+KtOC0djrhkgw9JAQvU21jkzMyK/x62eCi07sZFl8ZKYNGdfeOByrIf6BNOxkgYGS1Owq0a8sVjY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1636986174; 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=y1ABHfgdUFxxrQO6EAt5v5bZeeMB5duo990IQyV+4tU=; b=FxoRwiq1Cko/iHWbm0jH2lCv1N34Rzmb5zDSWORWbTnntmfqGRSyXv0JUKRUNgTCIPmmOd3hHjvy9fwov/glhYbZZNtcrpJzNhjt3T9H7yTg9bNBAqATtIEoj9hiiA5PhkZb99kaIgtW/JDSzqxxhdraFu+7YjdVfoyXPGZJbKc= 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 1636986174203401.1781921050274; Mon, 15 Nov 2021 06:22:54 -0800 (PST) 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-584-j0xtKy7APgWWBjeFBgTgew-1; Mon, 15 Nov 2021 09:22:50 -0500 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 4E95F425C9; Mon, 15 Nov 2021 14:22:45 +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 02D7C5D9CA; Mon, 15 Nov 2021 14:22:45 +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 B4C6F4EA37; Mon, 15 Nov 2021 14:22:44 +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 1AFEMNec009696 for ; Mon, 15 Nov 2021 09:22:23 -0500 Received: by smtp.corp.redhat.com (Postfix) id C522C2AF6D; Mon, 15 Nov 2021 14:22:23 +0000 (UTC) Received: from speedmetal.lan (unknown [10.40.208.20]) by smtp.corp.redhat.com (Postfix) with ESMTP id 2554722719 for ; Mon, 15 Nov 2021 14:22:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1636986173; 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=y1ABHfgdUFxxrQO6EAt5v5bZeeMB5duo990IQyV+4tU=; b=GzDsMBYqEXu/fQjFyxpvQ/VKxf+v40YHIckIc3tyM2hrzgBYcYYdvjxI7vavXQLK/ZMFuf ysDZULqcQT4jD9111qhFdXLLafDorUBdY/NaEhNEAZdp36JuTWUxp0soolalUqJ6e78nev zRTqueomLEFDUq9dnYyBoCmBbi+gVik= X-MC-Unique: j0xtKy7APgWWBjeFBgTgew-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 04/18] qemu: block: Replace virJSONValueObjectCreate by virJSONValueObjectAdd Date: Mon, 15 Nov 2021 15:22:03 +0100 Message-Id: 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.14 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: 1636986258618100007 Content-Type: text/plain; charset="utf-8" virJSONValueObjectAdd now works identically to virJSONValueObjectCreate when used with a NULL argument. Replace all callers. Signed-off-by: Peter Krempa Reviewed-by: J=C3=A1n Tomko --- src/qemu/qemu_block.c | 342 +++++++++++++++++++++--------------------- 1 file changed, 171 insertions(+), 171 deletions(-) diff --git a/src/qemu/qemu_block.c b/src/qemu/qemu_block.c index a1adef0c5d..53a0b919f9 100644 --- a/src/qemu/qemu_block.c +++ b/src/qemu/qemu_block.c @@ -459,11 +459,11 @@ qemuBlockStorageSourceBuildJSONSocketAddress(virStora= geNetHostDef *host, port =3D g_strdup_printf("%u", host->port); - if (virJSONValueObjectCreate(&server, - "s:type", transport, - "s:host", host->name, - "s:port", port, - NULL) < 0) + if (virJSONValueObjectAdd(&server, + "s:type", transport, + "s:host", host->name, + "s:port", port, + NULL) < 0) return NULL; break; @@ -473,10 +473,10 @@ qemuBlockStorageSourceBuildJSONSocketAddress(virStora= geNetHostDef *host, else field =3D "s:path"; - if (virJSONValueObjectCreate(&server, - "s:type", "unix", - field, host->socket, - NULL) < 0) + if (virJSONValueObjectAdd(&server, + "s:type", "unix", + field, host->socket, + NULL) < 0) return NULL; break; @@ -548,10 +548,10 @@ qemuBlockStorageSourceBuildJSONInetSocketAddress(virS= torageNetHostDef *host) port =3D g_strdup_printf("%u", host->port); - ignore_value(virJSONValueObjectCreate(&ret, - "s:host", host->name, - "s:port", port, - NULL)); + ignore_value(virJSONValueObjectAdd(&ret, + "s:host", host->name, + "s:port", port, + NULL)); return ret; } @@ -571,10 +571,10 @@ qemuBlockStorageSourceBuildJSONNFSServer(virStorageNe= tHostDef *host) { virJSONValue *ret =3D NULL; - ignore_value(virJSONValueObjectCreate(&ret, - "s:host", host->name, - "s:type", "inet", - NULL)); + ignore_value(virJSONValueObjectAdd(&ret, + "s:host", host->name, + "s:type", "inet", + NULL)); return ret; } @@ -628,10 +628,10 @@ qemuBlockStorageSourceGetGlusterProps(virStorageSourc= e *src, * server :[{type:"tcp", host:"1.2.3.4", port:24007}, * {type:"unix", socket:"/tmp/glusterd.socket"}, ...]} */ - if (virJSONValueObjectCreate(&props, - "s:volume", src->volume, - "s:path", src->path, - "a:server", &servers, NULL) < 0) + if (virJSONValueObjectAdd(&props, + "s:volume", src->volume, + "s:path", src->path, + "a:server", &servers, NULL) < 0) return NULL; if (!onlytarget && @@ -669,10 +669,10 @@ qemuBlockStorageSourceGetVxHSProps(virStorageSource *= src, * vdisk-id:"eb90327c-8302-4725-4e85ed4dc251", * server:{type:"tcp", host:"1.2.3.4", port:9999}} */ - ignore_value(virJSONValueObjectCreate(&ret, - "S:tls-creds", tlsAlias, - "s:vdisk-id", src->path, - "a:server", &server, NULL)); + ignore_value(virJSONValueObjectAdd(&ret, + "S:tls-creds", tlsAlias, + "s:vdisk-id", src->path, + "a:server", &server, NULL)); return ret; } @@ -694,9 +694,9 @@ qemuBlockStorageSourceGetNFSProps(virStorageSource *src) * path: "/foo/bar/baz", * server: {type:"tcp", host:"1.2.3.4"}} */ - if (virJSONValueObjectCreate(&ret, - "a:server", &server, - "S:path", src->path, NULL) < 0) + if (virJSONValueObjectAdd(&ret, + "a:server", &server, + "S:path", src->path, NULL) < 0) return NULL; if (src->nfs_uid !=3D -1 && @@ -757,16 +757,16 @@ qemuBlockStorageSourceGetCURLProps(virStorageSource *= src, cookiestr =3D qemuBlockStorageSourceGetCookieString(src); } - ignore_value(virJSONValueObjectCreate(&ret, - "s:url", uristr, - "S:username", username, - "S:password-secret", passwordali= as, - "T:sslverify", src->sslverify, - "S:cookie", cookiestr, - "S:cookie-secret", cookiealias, - "P:timeout", src->timeout, - "P:readahead", src->readahead, - NULL)); + ignore_value(virJSONValueObjectAdd(&ret, + "s:url", uristr, + "S:username", username, + "S:password-secret", passwordalias, + "T:sslverify", src->sslverify, + "S:cookie", cookiestr, + "S:cookie-secret", cookiealias, + "P:timeout", src->timeout, + "P:readahead", src->readahead, + NULL)); return ret; } @@ -822,15 +822,15 @@ qemuBlockStorageSourceGetISCSIProps(virStorageSource = *src, objalias =3D srcPriv->secinfo->alias; } - ignore_value(virJSONValueObjectCreate(&ret, - "s:portal", portal, - "s:target", target, - "u:lun", lun, - "s:transport", "tcp", - "S:user", username, - "S:password-secret", objalias, - "S:initiator-name", src->initiat= or.iqn, - NULL)); + ignore_value(virJSONValueObjectAdd(&ret, + "s:portal", portal, + "s:target", target, + "u:lun", lun, + "s:transport", "tcp", + "S:user", username, + "S:password-secret", objalias, + "S:initiator-name", src->initiator.= iqn, + NULL)); return ret; } @@ -857,11 +857,11 @@ qemuBlockStorageSourceGetNBDProps(virStorageSource *s= rc, if (onlytarget) tlsAlias =3D NULL; - if (virJSONValueObjectCreate(&ret, - "a:server", &serverprops, - "S:export", src->path, - "S:tls-creds", tlsAlias, - NULL) < 0) + if (virJSONValueObjectAdd(&ret, + "a:server", &serverprops, + "S:export", src->path, + "S:tls-creds", tlsAlias, + NULL) < 0) return NULL; return ret; @@ -925,24 +925,24 @@ qemuBlockStorageSourceGetRBDProps(virStorageSource *s= rc, return NULL; } - if (virJSONValueObjectCreate(&encrypt, - "s:format", encformat, - "s:key-secret", srcPriv->encinfo->ali= as, - NULL) < 0) + if (virJSONValueObjectAdd(&encrypt, + "s:format", encformat, + "s:key-secret", srcPriv->encinfo->alias, + NULL) < 0) return NULL; } - if (virJSONValueObjectCreate(&ret, - "s:pool", src->volume, - "s:image", src->path, - "S:snapshot", src->snapshot, - "S:conf", src->configFile, - "A:server", &servers, - "A:encrypt", &encrypt, - "S:user", username, - "A:auth-client-required", &authmodes, - "S:key-secret", keysecret, - NULL) < 0) + if (virJSONValueObjectAdd(&ret, + "s:pool", src->volume, + "s:image", src->path, + "S:snapshot", src->snapshot, + "S:conf", src->configFile, + "A:server", &servers, + "A:encrypt", &encrypt, + "S:user", username, + "A:auth-client-required", &authmodes, + "S:key-secret", keysecret, + NULL) < 0) return NULL; return ret; @@ -967,10 +967,10 @@ qemuBlockStorageSourceGetSheepdogProps(virStorageSour= ce *src) return NULL; /* libvirt does not support the 'snap-id' and 'tag' properties */ - if (virJSONValueObjectCreate(&ret, - "a:server", &serverprops, - "s:vdi", src->path, - NULL) < 0) + if (virJSONValueObjectAdd(&ret, + "a:server", &serverprops, + "s:vdi", src->path, + NULL) < 0) return NULL; return ret; @@ -1001,17 +1001,17 @@ qemuBlockStorageSourceGetSshProps(virStorageSource = *src) username =3D src->ssh_user; if (src->ssh_host_key_check_disabled && - virJSONValueObjectCreate(&host_key_check, - "s:mode", "none", - NULL) < 0) + virJSONValueObjectAdd(&host_key_check, + "s:mode", "none", + NULL) < 0) return NULL; - if (virJSONValueObjectCreate(&ret, - "s:path", src->path, - "a:server", &serverprops, - "S:user", username, - "A:host-key-check", &host_key_check, - NULL) < 0) + if (virJSONValueObjectAdd(&ret, + "s:path", src->path, + "a:server", &serverprops, + "S:user", username, + "A:host-key-check", &host_key_check, + NULL) < 0) return NULL; return ret; @@ -1034,11 +1034,11 @@ qemuBlockStorageSourceGetFileProps(virStorageSource= *src, iomode =3D virDomainDiskIoTypeToString(src->iomode); } - ignore_value(virJSONValueObjectCreate(&ret, - "s:filename", src->path, - "S:aio", iomode, - "S:pr-manager", prManagerAlias, - NULL) < 0); + ignore_value(virJSONValueObjectAdd(&ret, + "s:filename", src->path, + "S:aio", iomode, + "S:pr-manager", prManagerAlias, + NULL) < 0); return ret; } @@ -1053,10 +1053,10 @@ qemuBlockStorageSourceGetVvfatProps(virStorageSourc= e *src, * '*fat-type': 'int' * '*label': 'str' */ - if (virJSONValueObjectCreate(&ret, - "s:driver", "vvfat", - "s:dir", src->path, - "b:floppy", src->floppyimg, NULL) < 0) + if (virJSONValueObjectAdd(&ret, + "s:driver", "vvfat", + "s:dir", src->path, + "b:floppy", src->floppyimg, NULL) < 0) return NULL; if (!onlytarget && @@ -1077,11 +1077,11 @@ qemuBlockStorageSourceGetNVMeProps(virStorageSource= *src) if (!(pciAddr =3D virPCIDeviceAddressAsString(&nvme->pciAddr))) return NULL; - ignore_value(virJSONValueObjectCreate(&ret, - "s:driver", "nvme", - "s:device", pciAddr, - "U:namespace", nvme->namespc, - NULL)); + ignore_value(virJSONValueObjectAdd(&ret, + "s:driver", "nvme", + "s:device", pciAddr, + "U:namespace", nvme->namespc, + NULL)); return ret; } @@ -1100,10 +1100,10 @@ qemuBlockStorageSourceGetBlockdevGetCacheProps(virS= torageSource *src, if (qemuDomainDiskCachemodeFlags(src->cachemode, NULL, &direct, &noflu= sh) < 0) return -1; - if (virJSONValueObjectCreate(&cacheobj, - "b:direct", direct, - "b:no-flush", noflush, - NULL) < 0) + if (virJSONValueObjectAdd(&cacheobj, + "b:direct", direct, + "b:no-flush", noflush, + NULL) < 0) return -1; if (virJSONValueObjectAppend(props, "cache", &cacheobj) < 0) @@ -1375,10 +1375,10 @@ qemuBlockStorageSourceGetCryptoProps(virStorageSour= ce *src, return -1; } - return virJSONValueObjectCreate(encprops, - "s:format", encformat, - "s:key-secret", srcpriv->encinfo->alia= s, - NULL); + return virJSONValueObjectAdd(encprops, + "s:format", encformat, + "s:key-secret", srcpriv->encinfo->alias, + NULL); } @@ -1458,12 +1458,12 @@ qemuBlockStorageSourceGetBlockdevFormatCommonProps(= virStorageSource *src) * '*force-share': 'bool' */ - if (virJSONValueObjectCreate(&props, - "s:node-name", src->nodeformat, - "b:read-only", src->readonly, - "S:discard", discard, - "S:detect-zeroes", detectZeroes, - NULL) < 0) + if (virJSONValueObjectAdd(&props, + "s:node-name", src->nodeformat, + "b:read-only", src->readonly, + "S:discard", discard, + "S:detect-zeroes", detectZeroes, + NULL) < 0) return NULL; if (qemuBlockStorageSourceGetBlockdevGetCacheProps(src, props) < 0) @@ -1612,15 +1612,15 @@ qemuBlockStorageSourceGetBlockdevStorageSliceProps(= virStorageSource *src) if (qemuBlockNodeNameValidate(src->sliceStorage->nodename) < 0) return NULL; - if (virJSONValueObjectCreate(&props, - "s:driver", "raw", - "s:node-name", src->sliceStorage->nodenam= e, - "U:offset", src->sliceStorage->offset, - "U:size", src->sliceStorage->size, - "s:file", src->nodestorage, - "b:auto-read-only", true, - "s:discard", "unmap", - NULL) < 0) + if (virJSONValueObjectAdd(&props, + "s:driver", "raw", + "s:node-name", src->sliceStorage->nodename, + "U:offset", src->sliceStorage->offset, + "U:size", src->sliceStorage->size, + "s:file", src->nodestorage, + "b:auto-read-only", true, + "s:discard", "unmap", + NULL) < 0) return NULL; if (qemuBlockStorageSourceGetBlockdevGetCacheProps(src, props) < 0) @@ -2186,12 +2186,12 @@ qemuBlockStorageGetCopyOnReadProps(virDomainDiskDef= *disk) qemuDomainDiskPrivate *priv =3D QEMU_DOMAIN_DISK_PRIVATE(disk); virJSONValue *ret =3D NULL; - ignore_value(virJSONValueObjectCreate(&ret, - "s:driver", "copy-on-read", - "s:node-name", priv->nodeCopyOnR= ead, - "s:file", disk->src->nodeformat, - "s:discard", "unmap", - NULL)); + ignore_value(virJSONValueObjectAdd(&ret, + "s:driver", "copy-on-read", + "s:node-name", priv->nodeCopyOnRead, + "s:file", disk->src->nodeformat, + "s:discard", "unmap", + NULL)); return ret; } @@ -2270,12 +2270,12 @@ qemuBlockGetBackingStoreString(virStorageSource *sr= c, props =3D backingProps; if (src->sliceStorage) { - if (virJSONValueObjectCreate(&sliceProps, - "s:driver", "raw", - "U:offset", src->sliceStorage->offset, - "U:size", src->sliceStorage->size, - "a:file", &backingProps, - NULL) < 0) + if (virJSONValueObjectAdd(&sliceProps, + "s:driver", "raw", + "U:offset", src->sliceStorage->offset, + "U:size", src->sliceStorage->size, + "a:file", &backingProps, + NULL) < 0) return NULL; props =3D sliceProps; @@ -2329,11 +2329,11 @@ qemuBlockStorageSourceCreateGetFormatPropsGeneric(v= irStorageSource *src, { g_autoptr(virJSONValue) props =3D NULL; - if (virJSONValueObjectCreate(&props, - "s:driver", driver, - "s:file", src->nodestorage, - "U:size", src->capacity, - NULL) < 0) + if (virJSONValueObjectAdd(&props, + "s:driver", driver, + "s:file", src->nodestorage, + "U:size", src->capacity, + NULL) < 0) return -1; if (backing && @@ -2358,9 +2358,9 @@ qemuBlockStorageSourceCreateGetEncryptionLUKS(virStor= ageSource *src, srcpriv->encinfo) keysecret =3D srcpriv->encinfo->alias; - if (virJSONValueObjectCreate(&props, - "s:key-secret", keysecret, - NULL) < 0) + if (virJSONValueObjectAdd(&props, + "s:key-secret", keysecret, + NULL) < 0) return -1; if (src->encryption) { @@ -2447,13 +2447,13 @@ qemuBlockStorageSourceCreateGetFormatPropsQcow2(vir= StorageSource *src, else if (STREQ_NULLABLE(src->compat, "1.1")) qcow2version =3D "v3"; - if (virJSONValueObjectCreate(&qcow2props, - "s:driver", "qcow2", - "s:file", src->nodestorage, - "U:size", src->capacity, - "S:version", qcow2version, - "P:cluster-size", src->clusterSize, - NULL) < 0) + if (virJSONValueObjectAdd(&qcow2props, + "s:driver", "qcow2", + "s:file", src->nodestorage, + "U:size", src->capacity, + "S:version", qcow2version, + "P:cluster-size", src->clusterSize, + NULL) < 0) return -1; if (qemuBlockStorageSourceCreateAddBacking(backing, qcow2props, true) = < 0 || @@ -2472,11 +2472,11 @@ qemuBlockStorageSourceCreateGetFormatPropsQcow(virS= torageSource *src, { g_autoptr(virJSONValue) qcowprops =3D NULL; - if (virJSONValueObjectCreate(&qcowprops, - "s:driver", "qcow", - "s:file", src->nodestorage, - "U:size", src->capacity, - NULL) < 0) + if (virJSONValueObjectAdd(&qcowprops, + "s:driver", "qcow", + "s:file", src->nodestorage, + "U:size", src->capacity, + NULL) < 0) return -1; if (qemuBlockStorageSourceCreateAddBacking(backing, qcowprops, false) = < 0 || @@ -2495,11 +2495,11 @@ qemuBlockStorageSourceCreateGetFormatPropsQed(virSt= orageSource *src, { g_autoptr(virJSONValue) qedprops =3D NULL; - if (virJSONValueObjectCreate(&qedprops, - "s:driver", "qed", - "s:file", src->nodestorage, - "U:size", src->capacity, - NULL) < 0) + if (virJSONValueObjectAdd(&qedprops, + "s:driver", "qed", + "s:file", src->nodestorage, + "U:size", src->capacity, + NULL) < 0) return -1; if (qemuBlockStorageSourceCreateAddBacking(backing, qedprops, true) < = 0) @@ -2675,12 +2675,12 @@ qemuBlockStorageSourceCreateGetStorageProps(virStor= ageSource *src, return -1; } - if (virJSONValueObjectCreate(props, - "s:driver", driver, - "S:filename", filename, - "A:location", &location, - "U:size", src->physical, - NULL) < 0) + if (virJSONValueObjectAdd(props, + "s:driver", driver, + "S:filename", filename, + "A:location", &location, + "U:size", src->physical, + NULL) < 0) return -1; return 0; @@ -3334,9 +3334,9 @@ qemuBlockReopenFormatMon(qemuMonitor *mon, if (virJSONValueArrayAppend(reopenoptions, &srcprops) < 0) return -1; - if (virJSONValueObjectCreate(&reopenprops, - "a:options", &reopenoptions, - NULL) < 0) + if (virJSONValueObjectAdd(&reopenprops, + "a:options", &reopenoptions, + NULL) < 0) return -1; if (qemuMonitorBlockdevReopen(mon, &reopenprops) < 0) @@ -3554,14 +3554,14 @@ qemuBlockExportGetNBDProps(const char *nodename, } } - if (virJSONValueObjectCreate(&ret, - "s:type", "nbd", - "s:id", exportid, - "s:node-name", nodename, - "b:writable", writable, - "s:name", exportname, - "A:bitmaps", &bitmapsarr, - NULL) < 0) + if (virJSONValueObjectAdd(&ret, + "s:type", "nbd", + "s:id", exportid, + "s:node-name", nodename, + "b:writable", writable, + "s:name", exportname, + "A:bitmaps", &bitmapsarr, + NULL) < 0) return NULL; return ret; --=20 2.31.1 From nobody Wed May 15 18:25:23 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) client-ip=170.10.129.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1636986171; cv=none; d=zohomail.com; s=zohoarc; b=jOoUUB7Gh7IIsz9jZv+eHv/Y/30ZZm0twUYa0xbWV0iU6WURtB1csNknU6ebtU8VWVZHX0ZX5GM5UKxyXpyvquZTACbHmXf/jvThkgOUv8jRhJljnWabj5ahulbxAPvDgXsLb1ZG9vVincBAa1AQFWP6LWqS/7PLKGmiNuJFYcc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1636986171; 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=6nX5XTZvPFvdSyrPPii2ASCZy64+5wJ8v3VqifU5kME=; b=JjHmV6rkzorg+mKx00k0mHTL6QC8TuioVZ6tgfogQcIpDsSjDfcorHqLftkgzSi44d2t+457ebSe7tQl04lZvLoI3VSN8jLWsz/y5Mvy76oRBcsoyZPK5yFZhoH5vJihIbMPeX5vGDcd9mveYQ/SaVc4Oo69rKwyt0hCQqJbNdY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mx.zohomail.com with SMTPS id 1636986171227381.95303134323376; Mon, 15 Nov 2021 06:22:51 -0800 (PST) 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-53-SszC1mhaM-S_G0iMxNrlWg-1; Mon, 15 Nov 2021 09:22:47 -0500 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 C96C7824F9D; Mon, 15 Nov 2021 14:22:41 +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 8E0D86FEED; Mon, 15 Nov 2021 14:22: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 5BB0D4EA2A; Mon, 15 Nov 2021 14:22: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 1AFEMOsE009706 for ; Mon, 15 Nov 2021 09:22:24 -0500 Received: by smtp.corp.redhat.com (Postfix) id D710D22719; Mon, 15 Nov 2021 14:22:24 +0000 (UTC) Received: from speedmetal.lan (unknown [10.40.208.20]) by smtp.corp.redhat.com (Postfix) with ESMTP id 43136694B5 for ; Mon, 15 Nov 2021 14:22:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1636986170; 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=6nX5XTZvPFvdSyrPPii2ASCZy64+5wJ8v3VqifU5kME=; b=SoXvkUXi/c0kjraRsofXmvLinzod7s0O1XIxpj/aTt+DQBkq5Goq2qzcDnxSgB1rWfqsZY Yq8AFkEqYK0twmmVxm1za/QLyDX1/1IQyE79roGOswegc2wU8fwlrCiE6l/fIDmDM50Yk+ YP/S9WTq2/KglZeCqkpfvC52qiBHVvQ= X-MC-Unique: SszC1mhaM-S_G0iMxNrlWg-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 05/18] qemu: agent: Replace virJSONValueObjectCreate by virJSONValueObjectAdd Date: Mon, 15 Nov 2021 15:22:04 +0100 Message-Id: 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: 1636986255898100003 Content-Type: text/plain; charset="utf-8" virJSONValueObjectAdd now works identically to virJSONValueObjectCreate when used with a NULL argument. Replace all callers. Signed-off-by: Peter Krempa Reviewed-by: J=C3=A1n Tomko --- src/qemu/qemu_agent.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/qemu/qemu_agent.c b/src/qemu/qemu_agent.c index e6d9e7ac50..8d470b090c 100644 --- a/src/qemu/qemu_agent.c +++ b/src/qemu/qemu_agent.c @@ -1134,10 +1134,10 @@ qemuAgentMakeCommand(const char *cmdname, va_end(args); - if (virJSONValueObjectCreate(&obj, - "s:execute", cmdname, - "A:arguments", &jargs, - NULL) < 0) + if (virJSONValueObjectAdd(&obj, + "s:execute", cmdname, + "A:arguments", &jargs, + NULL) < 0) return NULL; return g_steal_pointer(&obj); --=20 2.31.1 From nobody Wed May 15 18:25:23 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=1636986184; cv=none; d=zohomail.com; s=zohoarc; b=PAPf2AIJTMq9wyk4ixLNU2JO0qD2rDVcxep5DfLyadC9e8NcPyUBupssO+ZLC6VcWFqps7RqYa33dMZi3NxEFHG6xbqM7aY1yYiavuypFYM4uBVK7EzmoRd5QjBlXV4WfaxCl6K5OCA4jceIOgjx7U1XnAzJWISDciOtMeSvzRE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1636986184; 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=OO+LRkC4wA4CATLqjR+oEyaue3PeDw0A85jZ+hrTBkY=; b=iB15Y/5gsv7nd7g8GMszjvMMjEuKOLkfRMV/VL1jQf3XYP4gKPBWLCFJ3ygi2CbPTtL0GkyS4tbwP6J6KnMkP9wzk6jVWBt5apIK9K/HcV1pm3v6sa6U2FtvoKbfAfdr+dfLddVIwSum1l01bC7NvZxenHZD9VO+ccgKdx0d3m0= 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 1636986184144559.1962053143434; Mon, 15 Nov 2021 06:23:04 -0800 (PST) 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-435-x2PQeuNSMrmBrnUO_TfmlQ-1; Mon, 15 Nov 2021 09:22:51 -0500 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 6FEED19200C0; Mon, 15 Nov 2021 14:22:45 +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 4FC7A5C1BB; Mon, 15 Nov 2021 14:22:45 +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 B39C14EA31; Mon, 15 Nov 2021 14:22:44 +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 1AFEMQok009715 for ; Mon, 15 Nov 2021 09:22:26 -0500 Received: by smtp.corp.redhat.com (Postfix) id F3C8C22719; Mon, 15 Nov 2021 14:22:25 +0000 (UTC) Received: from speedmetal.lan (unknown [10.40.208.20]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4F8065BAE5 for ; Mon, 15 Nov 2021 14:22:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1636986183; 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=OO+LRkC4wA4CATLqjR+oEyaue3PeDw0A85jZ+hrTBkY=; b=JrN7Wl0bW0br5iaolkwdMEfFWu19smUIc/ReBWPbANVw4bPqZ71w6Xs+MLj2x11uZuVUlP JH0xOjzfvOKbfnXVP3KzNkRibsX3z7Dlwk9WTfWvlN3pmwtVW4o3Ci4XD5u/ZFtFfcqLc4 A8xvdEY3olUhORSqMANKIBk0Auw2Bfk= X-MC-Unique: x2PQeuNSMrmBrnUO_TfmlQ-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 06/18] qemu: monitor_json: Replace virJSONValueObjectCreate by virJSONValueObjectAdd Date: Mon, 15 Nov 2021 15:22:05 +0100 Message-Id: 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: 1636986265605100005 Content-Type: text/plain; charset="utf-8" virJSONValueObjectAdd now works identically to virJSONValueObjectCreate when used with a NULL argument. Replace all callers. Signed-off-by: Peter Krempa Reviewed-by: J=C3=A1n Tomko --- src/qemu/qemu_monitor_json.c | 41 ++++++++++++++++++++---------------- 1 file changed, 23 insertions(+), 18 deletions(-) diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c index 8105b40ffb..24b6c29aca 100644 --- a/src/qemu/qemu_monitor_json.c +++ b/src/qemu/qemu_monitor_json.c @@ -511,9 +511,9 @@ qemuMonitorJSONTransactionAdd(virJSONValue *actions, va_end(args); - if (virJSONValueObjectCreate(&entry, - "s:type", cmdname, - "A:data", &data, NULL) < 0) + if (virJSONValueObjectAdd(&entry, + "s:type", cmdname, + "A:data", &data, NULL) < 0) return -1; if (virJSONValueArrayAppend(actions, &entry) < 0) @@ -538,9 +538,9 @@ qemuMonitorJSONMakeCommandInternal(const char *cmdname, { virJSONValue *ret =3D NULL; - ignore_value(virJSONValueObjectCreate(&ret, - "s:execute", cmdname, - "A:arguments", arguments, NULL)); + ignore_value(virJSONValueObjectAdd(&ret, + "s:execute", cmdname, + "A:arguments", arguments, NULL)); return ret; } @@ -3608,7 +3608,7 @@ int qemuMonitorJSONAddFileHandleToSet(qemuMonitor *mo= n, g_autoptr(virJSONValue) reply =3D NULL; g_autoptr(virJSONValue) cmd =3D NULL; - if (virJSONValueObjectCreate(&args, "S:opaque", opaque, NULL) < 0) + if (virJSONValueObjectAdd(&args, "S:opaque", opaque, NULL) < 0) return -1; if (fdset >=3D 0 && @@ -6418,12 +6418,16 @@ qemuMonitorJSONBuildInetSocketAddress(const char *h= ost, g_autoptr(virJSONValue) addr =3D NULL; g_autoptr(virJSONValue) data =3D NULL; - if (virJSONValueObjectCreate(&data, "s:host", host, - "s:port", port, NULL) < 0) + if (virJSONValueObjectAdd(&data, + "s:host", host, + "s:port", port, + NULL) < 0) return NULL; - if (virJSONValueObjectCreate(&addr, "s:type", "inet", - "a:data", &data, NULL) < 0) + if (virJSONValueObjectAdd(&addr, + "s:type", "inet", + "a:data", &data, + NULL) < 0) return NULL; return g_steal_pointer(&addr); @@ -6435,11 +6439,12 @@ qemuMonitorJSONBuildUnixSocketAddress(const char *p= ath) g_autoptr(virJSONValue) addr =3D NULL; g_autoptr(virJSONValue) data =3D NULL; - if (virJSONValueObjectCreate(&data, "s:path", path, NULL) < 0) + if (virJSONValueObjectAdd(&data, "s:path", path, NULL) < 0) return NULL; - if (virJSONValueObjectCreate(&addr, "s:type", "unix", - "a:data", &data, NULL) < 0) + if (virJSONValueObjectAdd(&addr, + "s:type", "unix", + "a:data", &data, NULL) < 0) return NULL; return g_steal_pointer(&addr); @@ -8340,10 +8345,10 @@ qemuMonitorJSONTransactionBitmapMergeSourceAddBitma= p(virJSONValue *sources, { g_autoptr(virJSONValue) sourceobj =3D NULL; - if (virJSONValueObjectCreate(&sourceobj, - "s:node", sourcenode, - "s:name", sourcebitmap, - NULL) < 0) + if (virJSONValueObjectAdd(&sourceobj, + "s:node", sourcenode, + "s:name", sourcebitmap, + NULL) < 0) return -1; if (virJSONValueArrayAppend(sources, &sourceobj) < 0) --=20 2.31.1 From nobody Wed May 15 18:25:23 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=1636986179; cv=none; d=zohomail.com; s=zohoarc; b=R0JFJWCjEBqDsAKMp0YHawLoLKsDbdPvf9M4+fkLcjFo+3iW6KTYFMH2+W5dAptLnGVGcfLcMAIO5CftYVdOPARSRXSTapqAiPiKl17XNOuYaLZ2O8ckYRT2pSSjLeeSO7mLNU587CxfYRX5lakO7+mM//6mreSGRf1Ci4rF7SA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1636986179; 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=fdg4e10Kb3vdsy+6v4+kylj2gyjZMEuG1bmjtACq2yM=; b=gK4tRsqmeDDYmNgA8S2GjuiNdU8AP8mj11L3vCSxUqH16HOLowW/DAEPVKL0R+cwxYde/K50xOyrJPUVmlwbjrhaLdWz+CzJ4BoJz3jPh44wsazJlmf7sjQOjQtdHqyGdSYI1KQDB+aCkq4I/Z6mJMhJlDc5Y088s1CggmznaQ4= 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 1636986179562433.4452659264492; Mon, 15 Nov 2021 06:22:59 -0800 (PST) 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-258-tUNUaEGVPDOTKbxJvM8zPw-1; Mon, 15 Nov 2021 09:22:54 -0500 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 11B061015DBF; Mon, 15 Nov 2021 14:22:48 +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 DF51B196E6; Mon, 15 Nov 2021 14:22:47 +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 AFB164EA39; Mon, 15 Nov 2021 14:22:47 +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 1AFEMRlx009723 for ; Mon, 15 Nov 2021 09:22:27 -0500 Received: by smtp.corp.redhat.com (Postfix) id 14276509FF; Mon, 15 Nov 2021 14:22:27 +0000 (UTC) Received: from speedmetal.lan (unknown [10.40.208.20]) by smtp.corp.redhat.com (Postfix) with ESMTP id 735A97A8E2 for ; Mon, 15 Nov 2021 14:22:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1636986178; 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=fdg4e10Kb3vdsy+6v4+kylj2gyjZMEuG1bmjtACq2yM=; b=g04dNKox2NpnFnAxgqj00Z4O2Nwp30VLUvHSSQ248nXuH8LhhQYcUljY3GdJWKC3D69DR/ wsqVWdlNFjk+UIMkU9yYArbjQAddrRP+/GijDlL2CRkVErmAPRgmSQtVoK1YicKYNlBbAJ FOY5OgyL81A3BL6+Eq+Ih02OwBCj+Wk= X-MC-Unique: tUNUaEGVPDOTKbxJvM8zPw-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 07/18] qemu: monitor: Replace virJSONValueObjectCreate by virJSONValueObjectAdd Date: Mon, 15 Nov 2021 15:22:06 +0100 Message-Id: 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: 1636986262939100001 Content-Type: text/plain; charset="utf-8" virJSONValueObjectAdd now works identically to virJSONValueObjectCreate when used with a NULL argument. Replace all callers. Signed-off-by: Peter Krempa Reviewed-by: J=C3=A1n Tomko --- src/qemu/qemu_monitor.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c index 398bef2e96..ac988e063b 100644 --- a/src/qemu/qemu_monitor.c +++ b/src/qemu/qemu_monitor.c @@ -2880,10 +2880,10 @@ qemuMonitorCreateObjectProps(virJSONValue **propsre= t, int rc; va_list args; - if (virJSONValueObjectCreate(&props, - "s:qom-type", type, - "s:id", alias, - NULL) < 0) + if (virJSONValueObjectAdd(&props, + "s:qom-type", type, + "s:id", alias, + NULL) < 0) return -1; @@ -2961,11 +2961,11 @@ qemuMonitorAddObject(qemuMonitor *mon, *props =3D NULL; } - if (virJSONValueObjectCreate(&pr, - "s:qom-type", type, - "s:id", id, - "A:props", props, - NULL) < 0) + if (virJSONValueObjectAdd(&pr, + "s:qom-type", type, + "s:id", id, + "A:props", props, + NULL) < 0) return -1; } --=20 2.31.1 From nobody Wed May 15 18:25:23 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.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 216.205.24.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=1636986181; cv=none; d=zohomail.com; s=zohoarc; b=DBZtM+4yrdEFmGR239EOE80q1zL3E39kb2UlIXMww47I0nP3e5KOYMeC+SSGLwpkYbkQZWjz64VEiI4tvDxHJro5ts5yGpHIEm9YdI1tFM8PUZ8d0hXc37m/B89djKtsNJJj0zpfZPoPcrKAYb8tq+Fn+UhAAP+Od1RCjUca1LU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1636986181; 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=Ttt6jn2A1tNBoYpe5FTgSqf8J6fp5DWa4ypm0P4lqxE=; b=eFkerSg2L2ggLaRlv+P50uUNj+pgGrQ38ThdDERmrBxC9j+pLo4IXAZL5vlF0A1jyK1Jq//8Vn5/uubhVdBJz4KML62VlEFg+n7zPULzgKwr0M79zPG+7cf845tP2KZ2U6My8x89RylxdQHZaFKKJgN89jov4TBEFjIabkwoOa8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.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 [216.205.24.124]) by mx.zohomail.com with SMTPS id 1636986181746440.45395778735394; Mon, 15 Nov 2021 06:23:01 -0800 (PST) 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-409-7EAtX77mM26cjiYY2LagxA-1; Mon, 15 Nov 2021 09:22:58 -0500 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 4FA5719200C0; Mon, 15 Nov 2021 14:22:52 +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 330785C1BB; Mon, 15 Nov 2021 14:22: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 D0E374EA39; Mon, 15 Nov 2021 14:22:51 +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 1AFEMS2w009739 for ; Mon, 15 Nov 2021 09:22:28 -0500 Received: by smtp.corp.redhat.com (Postfix) id 3376076E36; Mon, 15 Nov 2021 14:22:28 +0000 (UTC) Received: from speedmetal.lan (unknown [10.40.208.20]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7D06778B37 for ; Mon, 15 Nov 2021 14:22:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1636986180; 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=Ttt6jn2A1tNBoYpe5FTgSqf8J6fp5DWa4ypm0P4lqxE=; b=KM+ZN+DIQZWCVNA6PSCi/Y6wNbP/0ABVUdJYZzChme//+tl5IuvmldiPZOaMY68olaAW1l +3LUxPQxArAJBhPEaxPJjdRa1Mcng+bQMAr8xoKfM63SpqDi6IOIHCD9uUeafLs1qW0gfU n/ST9d5cJ7D73+MbqZ3Y2JDedEHHitQ= X-MC-Unique: 7EAtX77mM26cjiYY2LagxA-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 08/18] qemu: migration_cookie: Replace virJSONValueObjectCreate by virJSONValueObjectAdd Date: Mon, 15 Nov 2021 15:22:07 +0100 Message-Id: <3b39bb40ccdf6fc861971d1da6f8b448cbd2f905.1636986086.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: 1636986264436100003 Content-Type: text/plain; charset="utf-8" virJSONValueObjectAdd now works identically to virJSONValueObjectCreate when used with a NULL argument. Replace all callers. Signed-off-by: Peter Krempa Reviewed-by: J=C3=A1n Tomko --- src/qemu/qemu_migration_cookie.c | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/src/qemu/qemu_migration_cookie.c b/src/qemu/qemu_migration_coo= kie.c index cc4cc39b32..eaf360932d 100644 --- a/src/qemu/qemu_migration_cookie.c +++ b/src/qemu/qemu_migration_cookie.c @@ -1623,16 +1623,17 @@ qemuMigrationCookieBlockDirtyBitmapsToParams(GSList= *disks, bitmapname =3D bitmap->bitmapname; if (bitmap->persistent =3D=3D VIR_TRISTATE_BOOL_YES) { - if (virJSONValueObjectCreate(&transform, - "b:persistent", true, NULL) <= 0) + if (virJSONValueObjectAdd(&transform, + "b:persistent", true, + NULL) < 0) return -1; } - if (virJSONValueObjectCreate(&jsonbitmap, - "s:name", bitmapname, - "s:alias", bitmap->alias, - "A:transform", &transform, - NULL) < 0) + if (virJSONValueObjectAdd(&jsonbitmap, + "s:name", bitmapname, + "s:alias", bitmap->alias, + "A:transform", &transform, + NULL) < 0) return -1; if (virJSONValueArrayAppend(jsonbitmaps, &jsonbitmap) < 0) @@ -1644,11 +1645,11 @@ qemuMigrationCookieBlockDirtyBitmapsToParams(GSList= *disks, if (!hasBitmaps) continue; - if (virJSONValueObjectCreate(&jsondisk, - "s:node-name", disk->nodename, - "s:alias", disk->target, - "a:bitmaps", &jsonbitmaps, - NULL) < 0) + if (virJSONValueObjectAdd(&jsondisk, + "s:node-name", disk->nodename, + "s:alias", disk->target, + "a:bitmaps", &jsonbitmaps, + NULL) < 0) return -1; if (virJSONValueArrayAppend(map, &jsondisk) < 0) --=20 2.31.1 From nobody Wed May 15 18:25:23 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=1636986253; cv=none; d=zohomail.com; s=zohoarc; b=fZH9GCmCRflGyvfH7+aKrH9EaihNy5Ty1Kt4HxYpD4Y64Zj3t59G1CLXhndBmHdEESyDlx1w/jpN93WeqYNhGbjWGaYaCW+EkWmUijJt3PJ/2OLBkv/QG1Pt+FOjxBJRGDwvOznYIhpOIC+2O+OKQSCNBz9vE44LM8CjuEgCCos= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1636986253; 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=CGdSsnP45VzQrQ53lGOk+PmCzwikxcVDG+ah8WhSKv4=; b=LjvNHdMzmsMYsrsSgujRqHMjDgH52hY2TeQDgH+mlnrdlIhk2KY83gKYR5RLaeLXXiR8tOCYgIN23SjPBa3kbCTTOBdBujmxXESCKS7b8yEkNexvwzHb+M6RvfUp7j6fm8p/qtL2BGT861vEWpMoH4HlqJx/FjhRi8U0+viIrhs= 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 1636986253330943.654504708774; Mon, 15 Nov 2021 06:24:13 -0800 (PST) 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-500-Nd6ilrtjPFmA9IN_nPMQXA-1; Mon, 15 Nov 2021 09:22:56 -0500 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id CE67B19200D0; Mon, 15 Nov 2021 14:22:50 +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 ACBFB1972D; Mon, 15 Nov 2021 14:22:50 +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 82964181A1D1; Mon, 15 Nov 2021 14:22:50 +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 1AFEMT1o009746 for ; Mon, 15 Nov 2021 09:22:29 -0500 Received: by smtp.corp.redhat.com (Postfix) id 396115BB06; Mon, 15 Nov 2021 14:22:29 +0000 (UTC) Received: from speedmetal.lan (unknown [10.40.208.20]) by smtp.corp.redhat.com (Postfix) with ESMTP id 9D40E78B20 for ; Mon, 15 Nov 2021 14:22:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1636986252; 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=CGdSsnP45VzQrQ53lGOk+PmCzwikxcVDG+ah8WhSKv4=; b=KmVLw4O/wYQrgSieRAhN4hdZRnq9sORJNJxWP3Af73FCZjx0q5gtYzhwVrVtaAQlbJ7ZVK QsmMr7tXZwFklNgsFTA8PH+jpmZ7YnRw7LeXA4/mhaAxSPlYMyTICX1FhpCwfUVACgMI47 PQEpXNQ8OBYf0+t677srsstFL1+kAPw= X-MC-Unique: Nd6ilrtjPFmA9IN_nPMQXA-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 09/18] qemuDiskSourceGetProps: Initialize 'ret' Date: Mon, 15 Nov 2021 15:22:08 +0100 Message-Id: <389ee67a12f90714b0284f2ade817c31eefc172e.1636986086.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: 1636986325155100001 Content-Type: text/plain; charset="utf-8" Upcomming patch will convert virJSONValueObjectCreate which didn't check the value of the passed argument to virJSONValueObjectAdd which will and this would lead to crashes. Signed-off-by: Peter Krempa Reviewed-by: J=C3=A1n Tomko --- src/qemu/qemu_command.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 17ff7a5fe2..e63e82e261 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -1616,7 +1616,7 @@ static virJSONValue * qemuDiskSourceGetProps(virStorageSource *src) { g_autoptr(virJSONValue) props =3D NULL; - virJSONValue *ret; + virJSONValue *ret =3D NULL; if (!(props =3D qemuBlockStorageSourceGetBackendProps(src, QEMU_BLOCK_STORAGE= _SOURCE_BACKEND_PROPS_LEGACY))) --=20 2.31.1 From nobody Wed May 15 18:25:23 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.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 216.205.24.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=1636986242; cv=none; d=zohomail.com; s=zohoarc; b=iNDk9wC9AnxYR9KhyEpKD6yBHtd9GOBeZD7O66HUAMiwjA7mwI6a6n9z7z/DB9VwCm+DBlDcI0vpqz8fwaqfgCFcjSf5KaVtBHKdwU7uqJJc9Ef+ouZPt8na5efTUbmK1VVpg3Gu6zj2MD9+KMoMxZl+hV6ancSZunKSm3t2ILM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1636986242; 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=yDc/g0Oddgjqmstljf23d8RaWGNGH2HILUUGz1YXvTE=; b=LZKqS8NVAJo80JASxHD8CKwWV7Ylpfni2xkyAs3syV2LJFLaQB6yKRkOUraQJNc0Qkt0nEosgmT/kGpvmboZJWLPIQEIQqPBmu6heLrc5GV978Q3MWIdySKMOdhqECJMzyzw6BHY7Sxjeuuur5CHLqobemBwqQYKtVALAgOns74= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.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 [216.205.24.124]) by mx.zohomail.com with SMTPS id 1636986242357282.8519211622188; Mon, 15 Nov 2021 06:24:02 -0800 (PST) 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-571-fK7hVBqIOVqwSFKwjh6z-w-1; Mon, 15 Nov 2021 09:23:59 -0500 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 2E5641922964; Mon, 15 Nov 2021 14:23:54 +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 117DA57CB9; Mon, 15 Nov 2021 14:23:54 +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 DBA581832DD5; Mon, 15 Nov 2021 14:23:53 +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 1AFEMUuE009762 for ; Mon, 15 Nov 2021 09:22:30 -0500 Received: by smtp.corp.redhat.com (Postfix) id 8218A22719; Mon, 15 Nov 2021 14:22:30 +0000 (UTC) Received: from speedmetal.lan (unknown [10.40.208.20]) by smtp.corp.redhat.com (Postfix) with ESMTP id A979D5BAE5 for ; Mon, 15 Nov 2021 14:22:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1636986241; 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=yDc/g0Oddgjqmstljf23d8RaWGNGH2HILUUGz1YXvTE=; b=gpJD53yV1Jh/B0km/zy2e3Tv82n1lTB7fW31czKUr+nE7I3SQKBDmyT91IutqOrGUFhDJd tC046EEJgOPUirWiuLrNyWPXLEnzBnMhj33l14bgRnQoAIln3Q2JRz9IH1IjtEtfQxRhm1 ygGqPpfy/Pt/rdXVzIHDk+kUNseW7ro= X-MC-Unique: fK7hVBqIOVqwSFKwjh6z-w-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 10/18] qemu: command: Replace virJSONValueObjectCreate by virJSONValueObjectAdd Date: Mon, 15 Nov 2021 15:22:09 +0100 Message-Id: <5c85bd439cce31cdd2c7cf44341ecd1ac6b9b45b.1636986086.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.11 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: 1636986314560100001 Content-Type: text/plain; charset="utf-8" virJSONValueObjectAdd now works identically to virJSONValueObjectCreate when used with a NULL argument. Replace all callers. Signed-off-by: Peter Krempa Reviewed-by: J=C3=A1n Tomko --- src/qemu/qemu_command.c | 480 ++++++++++++++++++++-------------------- 1 file changed, 240 insertions(+), 240 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index e63e82e261..292335cc62 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -1114,11 +1114,11 @@ qemuBuildVirtioDevProps(virDomainDeviceType devtype, &disableLegacy, &disableModern) < 0) return NULL; - if (virJSONValueObjectCreate(&props, - "s:driver", model, - "S:disable-legacy", qemuOnOffAuto(disable= Legacy), - "T:disable-modern", disableModern, - NULL) < 0) + if (virJSONValueObjectAdd(&props, + "s:driver", model, + "S:disable-legacy", qemuOnOffAuto(disableLeg= acy), + "T:disable-modern", disableModern, + NULL) < 0) return NULL; if (virtioOptions) { @@ -1622,7 +1622,7 @@ qemuDiskSourceGetProps(virStorageSource *src) QEMU_BLOCK_STORAGE= _SOURCE_BACKEND_PROPS_LEGACY))) return NULL; - if (virJSONValueObjectCreate(&ret, "a:file", &props, NULL) < 0) + if (virJSONValueObjectAdd(&ret, "a:file", &props, NULL) < 0) return NULL; return ret; @@ -2016,9 +2016,9 @@ qemuBuildDiskDeviceProps(const virDomainDef *def, } if (driver) { - if (virJSONValueObjectCreate(&props, - "s:driver", driver, - NULL) < 0) + if (virJSONValueObjectAdd(&props, + "s:driver", driver, + NULL) < 0) return NULL; } @@ -2123,13 +2123,13 @@ qemuBuildZPCIDevProps(virDomainDeviceInfo *dev) virJSONValue *props =3D NULL; g_autofree char *alias =3D g_strdup_printf("zpci%u", dev->addr.pci.zpc= i.uid.value); - virJSONValueObjectCreate(&props, - "s:driver", "zpci", - "u:uid", dev->addr.pci.zpci.uid.value, - "u:fid", dev->addr.pci.zpci.fid.value, - "s:target", dev->alias, - "s:id", alias, - NULL); + virJSONValueObjectAdd(&props, + "s:driver", "zpci", + "u:uid", dev->addr.pci.zpci.uid.value, + "u:fid", dev->addr.pci.zpci.fid.value, + "s:target", dev->alias, + "s:id", alias, + NULL); return props; } @@ -2198,13 +2198,13 @@ qemuBuildFloppyCommandLineControllerOptionsExplicit= (virCommand *cmd, { g_autoptr(virJSONValue) props =3D NULL; - if (virJSONValueObjectCreate(&props, - "s:driver", "isa-fdc", - "S:driveA", backendA, - "p:bootindexA", bootindexA, - "S:driveB", backendB, - "p:bootindexB", bootindexB, - NULL) < 0) + if (virJSONValueObjectAdd(&props, + "s:driver", "isa-fdc", + "S:driveA", backendA, + "p:bootindexA", bootindexA, + "S:driveB", backendB, + "p:bootindexB", bootindexB, + NULL) < 0) return -1; if (qemuBuildDeviceCommandlineFromJSON(cmd, props, qemuCaps) < 0) @@ -2757,11 +2757,11 @@ qemuBuildUSBControllerDevProps(const virDomainDef *= domainDef, if (qemuValidateDomainDeviceDefControllerUSB(def, qemuCaps) < 0) return NULL; - if (virJSONValueObjectCreate(&props, - "s:driver", qemuControllerModelUSBTypeToS= tring(def->model), - "k:p2", def->opts.usbopts.ports, - "k:p3", def->opts.usbopts.ports, - NULL) < 0) + if (virJSONValueObjectAdd(&props, + "s:driver", qemuControllerModelUSBTypeToStri= ng(def->model), + "k:p2", def->opts.usbopts.ports, + "k:p3", def->opts.usbopts.ports, + NULL) < 0) return NULL; if (def->info.mastertype =3D=3D VIR_DOMAIN_CONTROLLER_MASTER_USB) { @@ -2859,10 +2859,10 @@ qemuBuildControllerSCSIDevProps(virDomainController= Def *def, } if (driver) { - if (virJSONValueObjectCreate(&props, - "s:driver", driver, - "s:id", def->info.alias, - NULL) < 0) + if (virJSONValueObjectAdd(&props, + "s:driver", driver, + "s:id", def->info.alias, + NULL) < 0) return NULL; } @@ -2896,22 +2896,22 @@ qemuBuildControllerPCIDevProps(virDomainControllerD= ef *def, switch ((virDomainControllerModelPCI) def->model) { case VIR_DOMAIN_CONTROLLER_MODEL_PCI_BRIDGE: - if (virJSONValueObjectCreate(&props, - "s:driver", modelName, - "i:chassis_nr", pciopts->chassisNr, - "s:id", def->info.alias, - NULL) < 0) + if (virJSONValueObjectAdd(&props, + "s:driver", modelName, + "i:chassis_nr", pciopts->chassisNr, + "s:id", def->info.alias, + NULL) < 0) return -1; break; case VIR_DOMAIN_CONTROLLER_MODEL_PCI_EXPANDER_BUS: case VIR_DOMAIN_CONTROLLER_MODEL_PCIE_EXPANDER_BUS: - if (virJSONValueObjectCreate(&props, - "s:driver", modelName, - "i:bus_nr", pciopts->busNr, - "s:id", def->info.alias, - NULL) < 0) + if (virJSONValueObjectAdd(&props, + "s:driver", modelName, + "i:bus_nr", pciopts->busNr, + "s:id", def->info.alias, + NULL) < 0) return -1; if (pciopts->numaNode !=3D -1 && @@ -2923,32 +2923,32 @@ qemuBuildControllerPCIDevProps(virDomainControllerD= ef *def, case VIR_DOMAIN_CONTROLLER_MODEL_DMI_TO_PCI_BRIDGE: case VIR_DOMAIN_CONTROLLER_MODEL_PCIE_SWITCH_UPSTREAM_PORT: case VIR_DOMAIN_CONTROLLER_MODEL_PCIE_TO_PCI_BRIDGE: - if (virJSONValueObjectCreate(&props, - "s:driver", modelName, - "s:id", def->info.alias, - NULL) < 0) + if (virJSONValueObjectAdd(&props, + "s:driver", modelName, + "s:id", def->info.alias, + NULL) < 0) return -1; break; case VIR_DOMAIN_CONTROLLER_MODEL_PCIE_ROOT_PORT: case VIR_DOMAIN_CONTROLLER_MODEL_PCIE_SWITCH_DOWNSTREAM_PORT: - if (virJSONValueObjectCreate(&props, - "s:driver", modelName, - "i:port", pciopts->port, - "i:chassis", pciopts->chassis, - "s:id", def->info.alias, - "T:hotplug", pciopts->hotplug, - NULL) < 0) + if (virJSONValueObjectAdd(&props, + "s:driver", modelName, + "i:port", pciopts->port, + "i:chassis", pciopts->chassis, + "s:id", def->info.alias, + "T:hotplug", pciopts->hotplug, + NULL) < 0) return -1; break; case VIR_DOMAIN_CONTROLLER_MODEL_PCI_ROOT: - if (virJSONValueObjectCreate(&props, - "s:driver", modelName, - "i:index", pciopts->targetIndex, - "s:id", def->info.alias, - NULL) < 0) + if (virJSONValueObjectAdd(&props, + "s:driver", modelName, + "i:index", pciopts->targetIndex, + "s:id", def->info.alias, + NULL) < 0) return -1; if (pciopts->numaNode !=3D -1 && @@ -3025,19 +3025,19 @@ qemuBuildControllerDevProps(const virDomainDef *dom= ainDef, break; case VIR_DOMAIN_CONTROLLER_TYPE_CCID: - if (virJSONValueObjectCreate(&props, - "s:driver", "usb-ccid", - "s:id", def->info.alias, - NULL) < 0) + if (virJSONValueObjectAdd(&props, + "s:driver", "usb-ccid", + "s:id", def->info.alias, + NULL) < 0) return -1; break; case VIR_DOMAIN_CONTROLLER_TYPE_SATA: - if (virJSONValueObjectCreate(&props, - "s:driver", "ahci", - "s:id", def->info.alias, - NULL) < 0) + if (virJSONValueObjectAdd(&props, + "s:driver", "ahci", + "s:id", def->info.alias, + NULL) < 0) return -1; break; @@ -3788,17 +3788,17 @@ qemuBuildMemoryDeviceProps(const virDomainDef *def, virUUIDFormat(mem->uuid, uuidstr); } - if (virJSONValueObjectCreate(&props, - "s:driver", device, - "k:node", mem->targetNode, - "P:label-size", mem->labelsize * 1024, - "P:block-size", mem->blocksize * 1024, - "P:requested-size", mem->requestedsize * = 1024, - "S:uuid", uuidstr, - "T:unarmed", unarmed, - "s:memdev", memdev, - "s:id", mem->info.alias, - NULL) < 0) + if (virJSONValueObjectAdd(&props, + "s:driver", device, + "k:node", mem->targetNode, + "P:label-size", mem->labelsize * 1024, + "P:block-size", mem->blocksize * 1024, + "P:requested-size", mem->requestedsize * 102= 4, + "S:uuid", uuidstr, + "T:unarmed", unarmed, + "s:memdev", memdev, + "s:id", mem->info.alias, + NULL) < 0) return NULL; if (qemuBuildDeviceAddressProps(props, def, &mem->info) < 0) @@ -3909,9 +3909,9 @@ qemuBuildNicDevProps(virDomainDef *def, NULL) < 0) return NULL; } else { - if (virJSONValueObjectCreate(&props, - "s:driver", virDomainNetGetModelStrin= g(net), - NULL) < 0) + if (virJSONValueObjectAdd(&props, + "s:driver", virDomainNetGetModelString(n= et), + NULL) < 0) return NULL; } @@ -3967,7 +3967,7 @@ qemuBuildHostNetStr(virDomainNetDef *net, case VIR_DOMAIN_NET_TYPE_NETWORK: case VIR_DOMAIN_NET_TYPE_DIRECT: case VIR_DOMAIN_NET_TYPE_ETHERNET: - if (virJSONValueObjectCreate(&netprops, "s:type", "tap", NULL) < 0) + if (virJSONValueObjectAdd(&netprops, "s:type", "tap", NULL) < 0) return NULL; /* for one tapfd 'fd=3D' shall be used, @@ -3993,7 +3993,7 @@ qemuBuildHostNetStr(virDomainNetDef *net, break; case VIR_DOMAIN_NET_TYPE_CLIENT: - if (virJSONValueObjectCreate(&netprops, "s:type", "socket", NULL) = < 0 || + if (virJSONValueObjectAdd(&netprops, "s:type", "socket", NULL) < 0= || virJSONValueObjectAppendStringPrintf(netprops, "connect", "%s:= %d", net->data.socket.address, net->data.socket.port) < = 0) @@ -4001,7 +4001,7 @@ qemuBuildHostNetStr(virDomainNetDef *net, break; case VIR_DOMAIN_NET_TYPE_SERVER: - if (virJSONValueObjectCreate(&netprops, "s:type", "socket", NULL) = < 0 || + if (virJSONValueObjectAdd(&netprops, "s:type", "socket", NULL) < 0= || virJSONValueObjectAppendStringPrintf(netprops, "listen", "%s:%= d", NULLSTR_EMPTY(net->data.s= ocket.address), net->data.socket.port) < = 0) @@ -4009,7 +4009,7 @@ qemuBuildHostNetStr(virDomainNetDef *net, break; case VIR_DOMAIN_NET_TYPE_MCAST: - if (virJSONValueObjectCreate(&netprops, "s:type", "socket", NULL) = < 0 || + if (virJSONValueObjectAdd(&netprops, "s:type", "socket", NULL) < 0= || virJSONValueObjectAppendStringPrintf(netprops, "mcast", "%s:%d= ", net->data.socket.address, net->data.socket.port) < = 0) @@ -4017,7 +4017,7 @@ qemuBuildHostNetStr(virDomainNetDef *net, break; case VIR_DOMAIN_NET_TYPE_UDP: - if (virJSONValueObjectCreate(&netprops, "s:type", "socket", NULL) = < 0 || + if (virJSONValueObjectAdd(&netprops, "s:type", "socket", NULL) < 0= || virJSONValueObjectAppendStringPrintf(netprops, "udp", "%s:%d", net->data.socket.address, net->data.socket.port) < = 0 || @@ -4029,11 +4029,11 @@ qemuBuildHostNetStr(virDomainNetDef *net, case VIR_DOMAIN_NET_TYPE_USER: if (slirpfd) { - if (virJSONValueObjectCreate(&netprops, "s:type", "socket", NU= LL) < 0 || + if (virJSONValueObjectAdd(&netprops, "s:type", "socket", NULL)= < 0 || virJSONValueObjectAppendString(netprops, "fd", slirpfd) < = 0) return NULL; } else { - if (virJSONValueObjectCreate(&netprops, "s:type", "user", NULL= ) < 0) + if (virJSONValueObjectAdd(&netprops, "s:type", "user", NULL) <= 0) return NULL; for (i =3D 0; i < net->guestIP.nips; i++) { @@ -4066,12 +4066,12 @@ qemuBuildHostNetStr(virDomainNetDef *net, break; case VIR_DOMAIN_NET_TYPE_INTERNAL: - if (virJSONValueObjectCreate(&netprops, "s:type", "user", NULL) < = 0) + if (virJSONValueObjectAdd(&netprops, "s:type", "user", NULL) < 0) return NULL; break; case VIR_DOMAIN_NET_TYPE_VHOSTUSER: - if (virJSONValueObjectCreate(&netprops, "s:type", "vhost-user", NU= LL) < 0 || + if (virJSONValueObjectAdd(&netprops, "s:type", "vhost-user", NULL)= < 0 || virJSONValueObjectAppendStringPrintf(netprops, "chardev", "cha= r%s", net->info.alias) < 0) return NULL; @@ -4082,7 +4082,7 @@ qemuBuildHostNetStr(virDomainNetDef *net, case VIR_DOMAIN_NET_TYPE_VDPA: /* Caller will pass the fd to qemu with add-fd */ - if (virJSONValueObjectCreate(&netprops, "s:type", "vhost-vdpa", NU= LL) < 0 || + if (virJSONValueObjectAdd(&netprops, "s:type", "vhost-vdpa", NULL)= < 0 || virJSONValueObjectAppendString(netprops, "vhostdev", vdpadev) = < 0) return NULL; break; @@ -4134,10 +4134,10 @@ qemuBuildWatchdogDevProps(const virDomainDef *def, { g_autoptr(virJSONValue) props =3D NULL; - if (virJSONValueObjectCreate(&props, - "s:driver", virDomainWatchdogModelTypeToS= tring(dev->model), - "s:id", dev->info.alias, - NULL) < 0) + if (virJSONValueObjectAdd(&props, + "s:driver", virDomainWatchdogModelTypeToStri= ng(dev->model), + "s:id", dev->info.alias, + NULL) < 0) return NULL; if (qemuBuildDeviceAddressProps(props, def, &dev->info) < 0) @@ -4313,10 +4313,10 @@ qemuBuildInputUSBDevProps(const virDomainDef *def, break; } - if (virJSONValueObjectCreate(&props, - "s:driver", driver, - "s:id", dev->info.alias, - NULL) < 0) + if (virJSONValueObjectAdd(&props, + "s:driver", driver, + "s:id", dev->info.alias, + NULL) < 0) return NULL; if (qemuBuildDeviceAddressProps(props, def, &dev->info) < 0) @@ -4455,11 +4455,11 @@ qemuBuildSoundDevCmd(virCommand *cmd, return -1; } - if (virJSONValueObjectCreate(&props, - "s:driver", model, - "s:id", sound->info.alias, - "S:audiodev", audioid, - NULL) < 0) + if (virJSONValueObjectAdd(&props, + "s:driver", model, + "s:id", sound->info.alias, + "S:audiodev", audioid, + NULL) < 0) return -1; if (qemuBuildDeviceAddressProps(props, def, &sound->info) < 0) @@ -4489,13 +4489,13 @@ qemuBuildSoundCodecCmd(virCommand *cmd, return -1; } - if (virJSONValueObjectCreate(&props, - "s:driver", qemuSoundCodecTypeToString(co= dec->type), - "s:id", alias, - "s:bus", bus, - "i:cad", codec->cad, - "S:audiodev", audioid, - NULL) < 0) + if (virJSONValueObjectAdd(&props, + "s:driver", qemuSoundCodecTypeToString(codec= ->type), + "s:id", alias, + "s:bus", bus, + "i:cad", codec->cad, + "S:audiodev", audioid, + NULL) < 0) return -1; if (qemuBuildDeviceCommandlineFromJSON(cmd, props, qemuCaps) < 0) @@ -4566,9 +4566,9 @@ qemuBuildDeviceVideoCmd(virCommand *cmd, if (!(props =3D qemuBuildVirtioDevProps(VIR_DOMAIN_DEVICE_VIDEO, v= ideo, qemuCaps))) return -1; } else { - if (virJSONValueObjectCreate(&props, - "s:driver", model, - NULL) < 0) + if (virJSONValueObjectAdd(&props, + "s:driver", model, + NULL) < 0) return -1; } @@ -4764,13 +4764,13 @@ qemuBuildPCIHostdevDevProps(const virDomainDef *def, teaming->persistent) failover_pair_id =3D teaming->persistent; - if (virJSONValueObjectCreate(&props, - "s:driver", "vfio-pci", - "s:host", host, - "s:id", dev->info->alias, - "p:bootindex", dev->info->effectiveBootIn= dex, - "S:failover_pair_id", failover_pair_id, - NULL) < 0) + if (virJSONValueObjectAdd(&props, + "s:driver", "vfio-pci", + "s:host", host, + "s:id", dev->info->alias, + "p:bootindex", dev->info->effectiveBootIndex, + "S:failover_pair_id", failover_pair_id, + NULL) < 0) return NULL; if (qemuBuildDeviceAddressProps(props, def, dev->info) < 0) @@ -4810,14 +4810,14 @@ qemuBuildUSBHostdevDevProps(const virDomainDef *def, } } - if (virJSONValueObjectCreate(&props, - "s:driver", "usb-host", - "S:hostdevice", hostdevice, - "p:hostbus", hostbus, - "p:hostaddr", hostaddr, - "s:id", dev->info->alias, - "p:bootindex", dev->info->bootIndex, - NULL) < 0) + if (virJSONValueObjectAdd(&props, + "s:driver", "usb-host", + "S:hostdevice", hostdevice, + "p:hostbus", hostbus, + "p:hostaddr", hostaddr, + "s:id", dev->info->alias, + "p:bootindex", dev->info->bootIndex, + NULL) < 0) return NULL; if (qemuBuildDeviceAddressProps(props, def, dev->info) < 0) @@ -4835,10 +4835,10 @@ qemuBuildHubDevCmd(virCommand *cmd, { g_autoptr(virJSONValue) props =3D NULL; - if (virJSONValueObjectCreate(&props, - "s:driver", "usb-hub", - "s:id", dev->info.alias, - NULL) < 0) + if (virJSONValueObjectAdd(&props, + "s:driver", "usb-hub", + "s:id", dev->info.alias, + NULL) < 0) return -1; if (qemuBuildDeviceAddressProps(props, def, &dev->info) < 0) @@ -4947,12 +4947,12 @@ qemuBuildSCSIHostdevDevProps(const virDomainDef *de= f, { g_autoptr(virJSONValue) props =3D NULL; - if (virJSONValueObjectCreate(&props, - "s:driver", "scsi-generic", - "s:drive", backendAlias, - "s:id", dev->info->alias, - "p:bootindex", dev->info->bootIndex, - NULL) < 0) + if (virJSONValueObjectAdd(&props, + "s:driver", "scsi-generic", + "s:drive", backendAlias, + "s:id", dev->info->alias, + "p:bootindex", dev->info->bootIndex, + NULL) < 0) return NULL; if (qemuBuildDeviceAddressProps(props, def, dev->info) < 0) @@ -5332,14 +5332,14 @@ qemuBuildHostdevMediatedDevProps(const virDomainDef= *def, mdevPath =3D virMediatedDeviceGetSysfsPath(mdevsrc->uuidstr); - if (virJSONValueObjectCreate(&props, - "s:driver", qemuBuildHostdevMdevModelType= String(mdevsrc), - "s:id", dev->info->alias, - "s:sysfsdev", mdevPath, - "S:display", qemuOnOffAuto(mdevsrc->displ= ay), - "T:ramfb", mdevsrc->ramfb, - "p:bootindex", dev->info->bootIndex, - NULL) < 0) + if (virJSONValueObjectAdd(&props, + "s:driver", qemuBuildHostdevMdevModelTypeStr= ing(mdevsrc), + "s:id", dev->info->alias, + "s:sysfsdev", mdevPath, + "S:display", qemuOnOffAuto(mdevsrc->display), + "T:ramfb", mdevsrc->ramfb, + "p:bootindex", dev->info->bootIndex, + NULL) < 0) return NULL; if (qemuBuildDeviceAddressProps(props, def, dev->info) < 0) @@ -5645,9 +5645,9 @@ qemuBuildVirtioSerialPortDevProps(const virDomainDef = *def, return NULL; } - if (virJSONValueObjectCreate(&props, - "s:driver", driver, - NULL) < 0) + if (virJSONValueObjectAdd(&props, + "s:driver", driver, + NULL) < 0) return NULL; if (qemuBuildDeviceAddressProps(props, def, &dev->info) < 0) @@ -5697,11 +5697,11 @@ qemuBuildSclpDevProps(virDomainChrDef *dev) return NULL; } - if (virJSONValueObjectCreate(&props, - "s:driver", driver, - "s:chardev", chardev, - "s:id", dev->info.alias, - NULL) < 0) + if (virJSONValueObjectAdd(&props, + "s:driver", driver, + "s:chardev", chardev, + "s:id", dev->info.alias, + NULL) < 0) return NULL; return g_steal_pointer(&props); @@ -6204,11 +6204,11 @@ qemuBuildVMGenIDCommandLine(virCommand *cmd, virUUIDFormat(def->genid, guid); - if (virJSONValueObjectCreate(&props, - "s:driver", "vmgenid", - "s:guid", guid, - "s:id", "vmgenid0", - NULL) < 0) + if (virJSONValueObjectAdd(&props, + "s:driver", "vmgenid", + "s:guid", guid, + "s:id", "vmgenid0", + NULL) < 0) return -1; if (qemuBuildDeviceCommandlineFromJSON(cmd, props, qemuCaps) < 0) @@ -6528,14 +6528,14 @@ qemuBuildIOMMUCommandLine(virCommand *cmd, case VIR_DOMAIN_IOMMU_MODEL_INTEL: { g_autoptr(virJSONValue) props =3D NULL; - if (virJSONValueObjectCreate(&props, - "s:driver", "intel-iommu", - "S:intremap", qemuOnOffAuto(iommu->in= tremap), - "T:caching-mode", iommu->caching_mode, - "S:eim", qemuOnOffAuto(iommu->eim), - "T:device-iotlb", iommu->iotlb, - "z:aw-bits", iommu->aw_bits, - NULL) < 0) + if (virJSONValueObjectAdd(&props, + "s:driver", "intel-iommu", + "S:intremap", qemuOnOffAuto(iommu->intre= map), + "T:caching-mode", iommu->caching_mode, + "S:eim", qemuOnOffAuto(iommu->eim), + "T:device-iotlb", iommu->iotlb, + "z:aw-bits", iommu->aw_bits, + NULL) < 0) return -1; if (qemuBuildDeviceCommandlineFromJSON(cmd, props, qemuCaps) < 0) @@ -9085,10 +9085,10 @@ qemuBuildSmartcardCommandLine(virLogManager *logMan= ager, switch (smartcard->type) { case VIR_DOMAIN_SMARTCARD_TYPE_HOST: - if (virJSONValueObjectCreate(&props, - "s:driver", "ccid-card-emulated", - "s:backend", "nss-emulated", - NULL) < 0) + if (virJSONValueObjectAdd(&props, + "s:driver", "ccid-card-emulated", + "s:backend", "nss-emulated", + NULL) < 0) return -1; break; @@ -9099,14 +9099,14 @@ qemuBuildSmartcardCommandLine(virLogManager *logMan= ager, if (smartcard->data.cert.database) database =3D smartcard->data.cert.database; - if (virJSONValueObjectCreate(&props, - "s:driver", "ccid-card-emulated", - "s:backend", "certificates", - "s:cert1", smartcard->data.cert.file[= 0], - "s:cert2", smartcard->data.cert.file[= 1], - "s:cert3", smartcard->data.cert.file[= 2], - "s:db", database, - NULL) < 0) + if (virJSONValueObjectAdd(&props, + "s:driver", "ccid-card-emulated", + "s:backend", "certificates", + "s:cert1", smartcard->data.cert.file[0], + "s:cert2", smartcard->data.cert.file[1], + "s:cert3", smartcard->data.cert.file[2], + "s:db", database, + NULL) < 0) return -1; } break; @@ -9129,10 +9129,10 @@ qemuBuildSmartcardCommandLine(virLogManager *logMan= ager, virCommandAddArgList(cmd, "-chardev", chardevstr, NULL); - if (virJSONValueObjectCreate(&props, - "s:driver", "ccid-card-passthru", - "s:chardev", chardevalias, - NULL) < 0) + if (virJSONValueObjectAdd(&props, + "s:driver", "ccid-card-passthru", + "s:chardev", chardevalias, + NULL) < 0) return -1; } break; @@ -9182,16 +9182,16 @@ qemuBuildShmemDevLegacyProps(virDomainDef *def, else shm =3D shmem->name; - if (virJSONValueObjectCreate(&props, - "s:driver", "ivshmem", - "s:id", shmem->info.alias, - "s:size", size, - "S:shm", shm, - "S:chardev", chardev, - "B:msi", shmem->msi.enabled, - "p:vectors", shmem->msi.vectors, - "T:ioeventfd", shmem->msi.ioeventfd, - NULL) < 0) + if (virJSONValueObjectAdd(&props, + "s:driver", "ivshmem", + "s:id", shmem->info.alias, + "s:size", size, + "S:shm", shm, + "S:chardev", chardev, + "B:msi", shmem->msi.enabled, + "p:vectors", shmem->msi.vectors, + "T:ioeventfd", shmem->msi.ioeventfd, + NULL) < 0) return NULL; if (qemuBuildDeviceAddressProps(props, def, &shmem->info) < 0) @@ -9228,15 +9228,15 @@ qemuBuildShmemDevProps(virDomainDef *def, } } - if (virJSONValueObjectCreate(&props, - "s:driver", virDomainShmemModelTypeToStri= ng(shmem->model), - "s:id", shmem->info.alias, - "S:chardev", chardev, - "S:memdev", memdev, - "S:master", qemuOnOffAuto(master), - "p:vectors", shmem->msi.vectors, - "T:ioeventfd", shmem->msi.ioeventfd, - NULL) < 0) + if (virJSONValueObjectAdd(&props, + "s:driver", virDomainShmemModelTypeToString(= shmem->model), + "s:id", shmem->info.alias, + "S:chardev", chardev, + "S:memdev", memdev, + "S:master", qemuOnOffAuto(master), + "p:vectors", shmem->msi.vectors, + "T:ioeventfd", shmem->msi.ioeventfd, + NULL) < 0) return NULL; if (qemuBuildDeviceAddressProps(props, def, &shmem->info) < 0) @@ -9717,13 +9717,13 @@ qemuBuildRedirdevDevProps(const virDomainDef *def, filter =3D virBufferContentAndReset(&buf); } - if (virJSONValueObjectCreate(&props, - "s:driver", "usb-redir", - "s:chardev", chardev, - "s:id", dev->info.alias, - "S:filter", filter, - "p:bootindex", dev->info.bootIndex, - NULL) < 0) + if (virJSONValueObjectAdd(&props, + "s:driver", "usb-redir", + "s:chardev", chardev, + "s:id", dev->info.alias, + "S:filter", filter, + "p:bootindex", dev->info.bootIndex, + NULL) < 0) return NULL; if (qemuBuildDeviceAddressProps(props, def, &dev->info) < 0) @@ -9860,11 +9860,11 @@ qemuBuildTPMDevCmd(virCommand *cmd, if (tpm->model =3D=3D VIR_DOMAIN_TPM_MODEL_TIS && def->os.arch =3D=3D = VIR_ARCH_AARCH64) model =3D "tpm-tis-device"; - if (virJSONValueObjectCreate(&props, - "s:driver", model, - "s:tpmdev", tpmdev, - "s:id", tpm->info.alias, - NULL) < 0) + if (virJSONValueObjectAdd(&props, + "s:driver", model, + "s:tpmdev", tpmdev, + "s:id", tpm->info.alias, + NULL) < 0) return -1; if (qemuBuildDeviceAddressProps(props, def, &tpm->info) < 0) @@ -10014,11 +10014,11 @@ qemuBuildTPMProxyCommandLine(virCommand *cmd, { g_autoptr(virJSONValue) props =3D NULL; - if (virJSONValueObjectCreate(&props, - "s:driver", virDomainTPMModelTypeToString= (tpm->model), - "s:id", tpm->info.alias, - "s:host-path", tpm->data.passthrough.sour= ce.data.file.path, - NULL) < 0) + if (virJSONValueObjectAdd(&props, + "s:driver", virDomainTPMModelTypeToString(tp= m->model), + "s:id", tpm->info.alias, + "s:host-path", tpm->data.passthrough.source.= data.file.path, + NULL) < 0) return -1; if (qemuBuildDeviceCommandlineFromJSON(cmd, props, qemuCaps) < 0) @@ -10134,9 +10134,9 @@ qemuBuildVMCoreInfoCommandLine(virCommand *cmd, if (def->features[VIR_DOMAIN_FEATURE_VMCOREINFO] !=3D VIR_TRISTATE_SWI= TCH_ON) return 0; - if (virJSONValueObjectCreate(&props, - "s:driver", "vmcoreinfo", - NULL) < 0) + if (virJSONValueObjectAdd(&props, + "s:driver", "vmcoreinfo", + NULL) < 0) return -1; if (qemuBuildDeviceCommandlineFromJSON(cmd, props, qemuCaps) < 0) @@ -10158,9 +10158,9 @@ qemuBuildPanicCommandLine(virCommand *cmd, case VIR_DOMAIN_PANIC_MODEL_ISA: { g_autoptr(virJSONValue) props =3D NULL; - if (virJSONValueObjectCreate(&props, - "s:driver", "pvpanic", - NULL) < 0) + if (virJSONValueObjectAdd(&props, + "s:driver", "pvpanic", + NULL) < 0) return -1; /* pvpanic uses 'ioport' instead of 'iobase' so @@ -10907,11 +10907,11 @@ qemuBuildSerialChrDeviceProps(const virDomainDef = *def, return NULL; } - if (virJSONValueObjectCreate(&props, - "s:driver", virDomainChrSerialTargetModel= TypeToString(serial->targetModel), - "s:chardev", chardev, - "s:id", serial->info.alias, - NULL) < 0) + if (virJSONValueObjectAdd(&props, + "s:driver", virDomainChrSerialTargetModelTyp= eToString(serial->targetModel), + "s:chardev", chardev, + "s:id", serial->info.alias, + NULL) < 0) return NULL; if (qemuBuildDeviceAddressProps(props, def, &serial->info) < 0) @@ -10927,11 +10927,11 @@ qemuBuildParallelChrDeviceProps(virDomainChrDef *= chr) g_autoptr(virJSONValue) props =3D NULL; g_autofree char *chardev =3D g_strdup_printf("char%s", chr->info.alias= ); - if (virJSONValueObjectCreate(&props, - "s:driver", "isa-parallel", - "s:chardev", chardev, - "s:id", chr->info.alias, - NULL) < 0) + if (virJSONValueObjectAdd(&props, + "s:driver", "isa-parallel", + "s:chardev", chardev, + "s:id", chr->info.alias, + NULL) < 0) return NULL; return g_steal_pointer(&props); @@ -10962,11 +10962,11 @@ qemuBuildChannelGuestfwdNetdevProps(virDomainChrD= ef *chr) if (virJSONValueArrayAppend(guestfwdarr, &guestfwdstrobj) < 0) return NULL; - if (virJSONValueObjectCreate(&ret, - "s:type", "user", - "a:guestfwd", &guestfwdarr, - "s:id", chr->info.alias, - NULL) < 0) + if (virJSONValueObjectAdd(&ret, + "s:type", "user", + "a:guestfwd", &guestfwdarr, + "s:id", chr->info.alias, + NULL) < 0) return NULL; return ret; --=20 2.31.1 From nobody Wed May 15 18:25:23 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.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 216.205.24.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=1636986245; cv=none; d=zohomail.com; s=zohoarc; b=F0povGBKRJcdkBHaK9hfguRc8CcW3mu3veu1hcIkYQM+F6oJUoamQeWq8B936PsZUnZdgxnkF00oa1MTvKDUs6Hs/ux4UwKBuk116nz7mtHwcO8PM0zWvFHPMuyScc65PuqduAcKCB0ZjVXgO7bz9My/ew5uwBOUXbMokoq8a64= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1636986245; 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=RI6ic8xl+eDu52/c2BnIFRRtXkOak5IRWWC1dO3r4HI=; b=YZO1pA3HvUDOFxzm3lJ1rL/+kgzgewXsSKhNRmbSkoyvDYkczzWEvYb2JoJKcQ74mvQBqigndBwBexz9qNoLV4QUgcVzosU+YDurn7tTMm8VizqI3vAs92qCJN5wQ/dIDt1ERjO3P4Snz2djj0A2pHFgyg6twZamDacdNlptkR0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.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 [216.205.24.124]) by mx.zohomail.com with SMTPS id 1636986245735837.299635115583; Mon, 15 Nov 2021 06:24:05 -0800 (PST) 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-559-Aoz87q-2NjOzP0BJCQbkHQ-1; Mon, 15 Nov 2021 09:24:03 -0500 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 E00B3100C67E; Mon, 15 Nov 2021 14:23:56 +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 C7F96100763D; Mon, 15 Nov 2021 14:23:56 +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 95A724EA31; Mon, 15 Nov 2021 14:23:56 +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 1AFEMVFS009770 for ; Mon, 15 Nov 2021 09:22:31 -0500 Received: by smtp.corp.redhat.com (Postfix) id 9556822719; Mon, 15 Nov 2021 14:22:31 +0000 (UTC) Received: from speedmetal.lan (unknown [10.40.208.20]) by smtp.corp.redhat.com (Postfix) with ESMTP id E62A4509FF for ; Mon, 15 Nov 2021 14:22:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1636986244; 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=RI6ic8xl+eDu52/c2BnIFRRtXkOak5IRWWC1dO3r4HI=; b=WW0dpoxbrmY9y+OjJhsoiCx/261DnplWVwRkMG3RjUTHxCiI50WJBBwCycR8R1j6tz8WOq UYHzKLyXe8kvrfFWgz2csDxWMdUjEIosEy5JTfn7FZiWiFq37eXX/JhJPJZ5DQrnFR4CxV ltZM2yLbHX9SmYPi0AaMuOnPGVpL3Wk= X-MC-Unique: Aoz87q-2NjOzP0BJCQbkHQ-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 11/18] qemublocktest: Replace virJSONValueObjectCreate by virJSONValueObjectAdd Date: Mon, 15 Nov 2021 15:22:10 +0100 Message-Id: <98a6c4e2e208a6d34dd8644e257cfbbfc509b2cf.1636986086.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: 1636986317395100001 Content-Type: text/plain; charset="utf-8" virJSONValueObjectAdd now works identically to virJSONValueObjectCreate when used with a NULL argument. Replace all callers. Signed-off-by: Peter Krempa Reviewed-by: J=C3=A1n Tomko --- tests/qemublocktest.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/qemublocktest.c b/tests/qemublocktest.c index 9d3c2fe6b0..6329096a68 100644 --- a/tests/qemublocktest.c +++ b/tests/qemublocktest.c @@ -98,7 +98,7 @@ testBackingXMLjsonXML(const void *args) } } - if (virJSONValueObjectCreate(&wrapper, "a:file", &backendprops, NULL) = < 0) + if (virJSONValueObjectAdd(&wrapper, "a:file", &backendprops, NULL) < 0) return -1; if (!(propsstr =3D virJSONValueToString(wrapper, false))) --=20 2.31.1 From nobody Wed May 15 18:25:23 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) client-ip=170.10.129.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1636986185; cv=none; d=zohomail.com; s=zohoarc; b=H7ww1GAjrtmDxyJMsQWVmP5WuuczeB0mhl7JwwrYdMH1O1dyqLep3zs+MfppIVyeRFW8JJapRh0vU7Jzbj3QhJyKsKyrC5R7m2KX3RJrafAxY9Bb/QowXORCCqZNe8Z0u1ERt5map0FSniS8SUEr+Z9+oGMHaMfGn8m7BXjdV8o= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1636986185; 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=LCpM+CyFw0CJ+PiirEABwZfg0T29JEwjbMrm6HIfwUI=; b=Ko/k3UMJYKn368W9IqEK9wzug9EhNAiwa957ANNkrdMnXlYXGV+Bbtb9Bywq+yCUahHM8GNqnXF8KSXSVxgAM+qJjcNESkVwWKouXINwyVxRfq0EHeChRG+7NTDQ/JF8/oBDfXzBYOnT/laaZo6FuGCEkDxmznVfRJNbyuEqcvM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mx.zohomail.com with SMTPS id 1636986185200424.4359218901625; Mon, 15 Nov 2021 06:23:05 -0800 (PST) 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-139-KuTgdgjEMIKH3o_RkwWqcw-1; Mon, 15 Nov 2021 09:23:02 -0500 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 5EECB5703E; Mon, 15 Nov 2021 14:22:55 +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 D61F7794B0; Mon, 15 Nov 2021 14:22:54 +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 95D454EA3B; Mon, 15 Nov 2021 14:22:54 +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 1AFEMWE6009782 for ; Mon, 15 Nov 2021 09:22:32 -0500 Received: by smtp.corp.redhat.com (Postfix) id AC31722719; Mon, 15 Nov 2021 14:22:32 +0000 (UTC) Received: from speedmetal.lan (unknown [10.40.208.20]) by smtp.corp.redhat.com (Postfix) with ESMTP id 0EF275BAE5 for ; Mon, 15 Nov 2021 14:22:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1636986184; 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=LCpM+CyFw0CJ+PiirEABwZfg0T29JEwjbMrm6HIfwUI=; b=HlJ/AtIjBqx99RqKJymY/d0IO2Cqu6DH3PAKUI8IPk+XkPXRV32iEmj8r/Nv6Xtju4g03n QQc0MNfg/tkNhivcDYK5nEGWJ0qt33lAJMSS/6T1r/jOSBjII6Gu8GotyRP2tBSLrt/eFE BUMsftqKtgnY5fvVQ+ec3MC+8D1iW+g= X-MC-Unique: KuTgdgjEMIKH3o_RkwWqcw-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 12/18] virjsontest: Replace virJSONValueObjectCreate by virJSONValueObjectAdd Date: Mon, 15 Nov 2021 15:22:11 +0100 Message-Id: <4801b979c4d147a2710465ad94e2ccdb081e65b1.1636986086.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: 1636986266503100007 Content-Type: text/plain; charset="utf-8" virJSONValueObjectAdd now works identically to virJSONValueObjectCreate when used with a NULL argument. Replace all callers. Signed-off-by: Peter Krempa Reviewed-by: J=C3=A1n Tomko --- tests/virjsontest.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/tests/virjsontest.c b/tests/virjsontest.c index 5e26de1f22..ddb93803b7 100644 --- a/tests/virjsontest.c +++ b/tests/virjsontest.c @@ -391,10 +391,10 @@ testJSONEscapeObj(const void *data G_GNUC_UNUSED) g_autofree char *result =3D NULL; const char *parsednestedstr; - if (virJSONValueObjectCreate(&nestjson, - "s:stringkey", "stringvalue", - "i:numberkey", 1234, - "b:booleankey", false, NULL) < 0) { + if (virJSONValueObjectAdd(&nestjson, + "s:stringkey", "stringvalue", + "i:numberkey", 1234, + "b:booleankey", false, NULL) < 0) { VIR_TEST_VERBOSE("failed to create nested json object"); return -1; } @@ -404,7 +404,7 @@ testJSONEscapeObj(const void *data G_GNUC_UNUSED) return -1; } - if (virJSONValueObjectCreate(&json, "s:test", neststr, NULL) < 0) { + if (virJSONValueObjectAdd(&json, "s:test", neststr, NULL) < 0) { VIR_TEST_VERBOSE("Failed to create json object"); return -1; } @@ -446,8 +446,8 @@ testJSONObjectFormatSteal(const void *opaque G_GNUC_UNU= SED) VIR_TEST_VERBOSE("Failed to create json object"); } - if (virJSONValueObjectCreate(&t1, "a:t", &a1, "s:f", NULL, NULL) !=3D = -1) { - VIR_TEST_VERBOSE("virJSONValueObjectCreate(t1) should have failed"= ); + if (virJSONValueObjectAdd(&t1, "a:t", &a1, "s:f", NULL, NULL) !=3D -1)= { + VIR_TEST_VERBOSE("virJSONValueObjectAdd(t1) should have failed"); return -1; } @@ -456,8 +456,8 @@ testJSONObjectFormatSteal(const void *opaque G_GNUC_UNU= SED) return -1; } - if (virJSONValueObjectCreate(&t2, "s:f", NULL, "a:t", &a1, NULL) !=3D = -1) { - VIR_TEST_VERBOSE("virJSONValueObjectCreate(t2) should have failed"= ); + if (virJSONValueObjectAdd(&t2, "s:f", NULL, "a:t", &a1, NULL) !=3D -1)= { + VIR_TEST_VERBOSE("virJSONValueObjectAdd(t2) should have failed"); return -1; } --=20 2.31.1 From nobody Wed May 15 18:25:23 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=1636986249; cv=none; d=zohomail.com; s=zohoarc; b=fuSBqVA2dsdt9hB16LUes0v5yMEgxnlJNQQp+hV2nk8pkdiLbmIZymyKIEgltiEEJV5LvVKoaPIY9U+4ck38MN8LklyW9guMnnwzEWuvA+XzUyuWksDAq0JTxVI1FNNwb4pYrYKEc52HXkKJsroB1e0gMQBRVpHxEpbqsFdCkA0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1636986249; 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=WvdneA6QaRSYu7x5Vn5TNa6whNWg1Eh553La0/U+aiM=; b=Twp1AQVOFi6brWMUB9jBzuSwNf0BwQHozU7/gLxL8kSp3IMujivBLkDEu0mZgeJ9be+ne2Ze8n6KWmsQ5agcZrViVgcNXF/KpD0Ybt/jaP3xl4+AKDjGSr1t5F0nIj+5zKry+aXz8kYE40LPNIjAfDVDZXziTe6Dm0tghdrAcOs= 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 1636986249316510.4741930363123; Mon, 15 Nov 2021 06:24:09 -0800 (PST) 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-544-RzbRkmsANl-rqlKYcfecvQ-1; Mon, 15 Nov 2021 09:24:04 -0500 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 A1F42100F960; Mon, 15 Nov 2021 14:23:59 +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 8A979101E592; Mon, 15 Nov 2021 14:23:59 +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 321471832DD5; Mon, 15 Nov 2021 14:23:59 +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 1AFEMXMs009787 for ; Mon, 15 Nov 2021 09:22:33 -0500 Received: by smtp.corp.redhat.com (Postfix) id C91622AF6D; Mon, 15 Nov 2021 14:22:33 +0000 (UTC) Received: from speedmetal.lan (unknown [10.40.208.20]) by smtp.corp.redhat.com (Postfix) with ESMTP id 24DCC694B4 for ; Mon, 15 Nov 2021 14:22:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1636986248; 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=WvdneA6QaRSYu7x5Vn5TNa6whNWg1Eh553La0/U+aiM=; b=If54YrBqguzNaniL6YcUpxZGLaxmkYCdCpTlhpSKFlEuqdwud1Nyu/jaKV2ygkbqfIMKZr O2zm14UhjWb7V7ag0SK9Q/HiOMRQHX3nutBlQY/Ri04YZwkcgNP7MTkv2AKYetP2MMHbsW IxMot3bjz77OocqcMUPgK9GZ4SM2Fgc= X-MC-Unique: RzbRkmsANl-rqlKYcfecvQ-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 13/18] qemu: migration_params: Replace virJSONValueObjectCreate by virJSONValueObjectAdd Date: Mon, 15 Nov 2021 15:22:12 +0100 Message-Id: <79f0873898e5c17aa9e7073b9bcac202c46a7b38.1636986086.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: 1636986321663100001 Content-Type: text/plain; charset="utf-8" virJSONValueObjectAdd now works identically to virJSONValueObjectCreate when used with a NULL argument. Replace all callers. Signed-off-by: Peter Krempa Reviewed-by: J=C3=A1n Tomko --- src/qemu/qemu_migration_params.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/qemu/qemu_migration_params.c b/src/qemu/qemu_migration_par= ams.c index b6c582aaca..8df7aac93a 100644 --- a/src/qemu/qemu_migration_params.c +++ b/src/qemu/qemu_migration_params.c @@ -790,10 +790,10 @@ qemuMigrationCapsToJSON(virBitmap *caps, if (!virBitmapIsBitSet(caps, bit)) continue; - if (virJSONValueObjectCreate(&cap, - "s:capability", qemuMigrationCapabili= tyTypeToString(bit), - "b:state", virBitmapIsBitSet(states, = bit), - NULL) < 0) + if (virJSONValueObjectAdd(&cap, + "s:capability", qemuMigrationCapabilityT= ypeToString(bit), + "b:state", virBitmapIsBitSet(states, bit= ), + NULL) < 0) return NULL; if (virJSONValueArrayAppend(json, &cap) < 0) --=20 2.31.1 From nobody Wed May 15 18:25:23 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=1636986193; cv=none; d=zohomail.com; s=zohoarc; b=RbsXoOKHyw38y9IgXIwQfrjh7miAUNuA1N4xqkucZZCSBj3MRMiNfojhuAWHDC/Cb/FdrdcQKFjM6n5FidmWbS6kViYdXXP78A7hz8Kjn8r0GxN8tOR2G0DVWqIThxy6teQfFutj2ZMTwxvDtjNUKG8uWpMiqzyoWwlNe477IvU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1636986193; 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=ZmKCd8sQPGhVFd//LxH1/R0l6TVh9rlPWuRYPsDBj7Y=; b=N4rVgZ6r+ISYsahVvhtOKuZe8UL2JK6cSO4JiDNTidxkVZAygvhfgBbBOXcx0ztVwr1khv92eqWitIVU88HWpjGJpci9XyUYHUR9eor5dXNGVtCXk1oiS+KJBhAkIsjwarxUqW7YIyxraNP33301di53wS4lkOZXIZz6BLYF3mU= 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 1636986193199182.91210923018298; Mon, 15 Nov 2021 06:23:13 -0800 (PST) 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-442-W9P07QvoMWmmp9YJOtQr7w-1; Mon, 15 Nov 2021 09:23:07 -0500 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 F23C010B744C; Mon, 15 Nov 2021 14:22:59 +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 D23035C1A1; Mon, 15 Nov 2021 14:22:59 +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 A29EF1832DD2; Mon, 15 Nov 2021 14:22:59 +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 1AFEMwV7009947 for ; Mon, 15 Nov 2021 09:22:58 -0500 Received: by smtp.corp.redhat.com (Postfix) id 734F922719; Mon, 15 Nov 2021 14:22:58 +0000 (UTC) Received: from speedmetal.lan (unknown [10.40.208.20]) by smtp.corp.redhat.com (Postfix) with ESMTP id C3A2F5BB0D for ; Mon, 15 Nov 2021 14:22:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1636986192; 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=ZmKCd8sQPGhVFd//LxH1/R0l6TVh9rlPWuRYPsDBj7Y=; b=KkXIbIcCg1Kwd9CPYzhaToeKfM13sb0mAmH9M8QJX36YEqZpxkfrvLRXIoevXIynFybsCM dyB+snkqL0UmiK1r+bVJ4HMKjmGfQyBclZiKnZUCUclYYG03Jshk0tAVE6XTjF9wgRfC7r FtRPc7LtvaXxgj3Xe74JgOZj05sJVYE= X-MC-Unique: W9P07QvoMWmmp9YJOtQr7w-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 14/18] virsh: domain: Replace virJSONValueObjectCreate by virJSONValueObjectAdd Date: Mon, 15 Nov 2021 15:22:13 +0100 Message-Id: <53dbb3281bbd894629a762bae3876c183ebdc55a.1636986086.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: 1636986273934100001 Content-Type: text/plain; charset="utf-8" virJSONValueObjectAdd now works identically to virJSONValueObjectCreate when used with a NULL argument. Replace all callers. Signed-off-by: Peter Krempa Reviewed-by: J=C3=A1n Tomko --- tools/virsh-domain.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index 22f428f702..e9b49307db 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -9623,10 +9623,10 @@ cmdQemuMonitorCommandQMPWrap(vshControl *ctl, } } - if (virJSONValueObjectCreate(&command, - "s:execute", commandname, - "A:arguments", &arguments, - NULL) < 0) + if (virJSONValueObjectAdd(&command, + "s:execute", commandname, + "A:arguments", &arguments, + NULL) < 0) return NULL; return virJSONValueToString(command, false); --=20 2.31.1 From nobody Wed May 15 18:25:23 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.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 216.205.24.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=1636986194; cv=none; d=zohomail.com; s=zohoarc; b=mziTLCH0UyTBDPgmjyfF80KBVghGk6r6+pUPQmZCOA8AEniFTJWkeoM0M86MHP2OxZ1owVZsOPm8OoHDVV2p2Ep6hBjHsrw6EY2K54MbRX7vR91TCks/+1Q8Rg5BLR7R7aNF0JPnSHOH0dao+Ycn7R2a0pI3C3tgV13XSTIJhf0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1636986194; 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=UvXO+peRwi/wYhmF2ZJw++rUFMwf/H7G1TzW4pl657o=; b=CNQwpZnBp3x4U218eVbJMhbW7sdljd1o6LwA5CwgDghOCzANkeiDsT9yxOVnmb9SvSe/tVA/5VeJOy8djW4X1kpmJ5q6nbz0MhqTMKe5p8nZDNREaZW1XaPH6qbYFglwGzU/Khp7HFm7VLFfDnB/lHZqgZr9c22UDn4/FerHTgg= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.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 [216.205.24.124]) by mx.zohomail.com with SMTPS id 1636986194589233.20102292040838; Mon, 15 Nov 2021 06:23:14 -0800 (PST) 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-405-yBWmmp-KP1ChoVMX6_DLsA-1; Mon, 15 Nov 2021 09:23:12 -0500 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 134BC10B744E; Mon, 15 Nov 2021 14:23:07 +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 E726E5C1A1; Mon, 15 Nov 2021 14:23:06 +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 AF52D4EA3B; Mon, 15 Nov 2021 14:23:06 +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 1AFEN6vo010085 for ; Mon, 15 Nov 2021 09:23:06 -0500 Received: by smtp.corp.redhat.com (Postfix) id 2AF4822719; Mon, 15 Nov 2021 14:23:06 +0000 (UTC) Received: from speedmetal.lan (unknown [10.40.208.20]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7E8A7707B6 for ; Mon, 15 Nov 2021 14:22:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1636986193; 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=UvXO+peRwi/wYhmF2ZJw++rUFMwf/H7G1TzW4pl657o=; b=Hr8UQbNf32cjF5hcJHgYXMg81zKbc0NLTIhXQSJtCDr7Sazpl6iDILIHSWJmajOD9CiI4f 6ULFjJ4Y4wn5S2w+QugNc3tYIOr//1ufpE9keiq5Q8n23RjORjJZSKrwGsvD6sS6O8Xp1U qV8XiXHomGe8r7pch9i8Fks9R6hzl0M= X-MC-Unique: yBWmmp-KP1ChoVMX6_DLsA-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 15/18] Replace virJSONValueObjectCreateVArgs with virJSONValueObjectAddVArgs Date: Mon, 15 Nov 2021 15:22:14 +0100 Message-Id: <72be1eda69c0e7b619267bf52288cfabcb6733ce.1636986086.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: 1636986274934100003 Content-Type: text/plain; charset="utf-8" Signed-off-by: Peter Krempa Reviewed-by: J=C3=A1n Tomko --- src/qemu/qemu_agent.c | 2 +- src/qemu/qemu_monitor_json.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/qemu/qemu_agent.c b/src/qemu/qemu_agent.c index 8d470b090c..c3b02569cd 100644 --- a/src/qemu/qemu_agent.c +++ b/src/qemu/qemu_agent.c @@ -1127,7 +1127,7 @@ qemuAgentMakeCommand(const char *cmdname, va_start(args, cmdname); - if (virJSONValueObjectCreateVArgs(&jargs, args) < 0) { + if (virJSONValueObjectAddVArgs(&jargs, args) < 0) { va_end(args); return NULL; } diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c index 24b6c29aca..a3bdfaaf0d 100644 --- a/src/qemu/qemu_monitor_json.c +++ b/src/qemu/qemu_monitor_json.c @@ -504,7 +504,7 @@ qemuMonitorJSONTransactionAdd(virJSONValue *actions, va_start(args, cmdname); - if (virJSONValueObjectCreateVArgs(&data, args) < 0) { + if (virJSONValueObjectAddVArgs(&data, args) < 0) { va_end(args); return -1; } @@ -556,7 +556,7 @@ qemuMonitorJSONMakeCommand(const char *cmdname, va_start(args, cmdname); - if (virJSONValueObjectCreateVArgs(&jargs, args) < 0) + if (virJSONValueObjectAddVArgs(&jargs, args) < 0) goto cleanup; obj =3D qemuMonitorJSONMakeCommandInternal(cmdname, &jargs); --=20 2.31.1 From nobody Wed May 15 18:25:23 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) client-ip=170.10.129.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1636986201; cv=none; d=zohomail.com; s=zohoarc; b=CxeB5pKd5zGC+CPbo5Gazjf29nFA6XgBoFkJHWZ80X6eUCdgkJwzSvEm2EOljARTvQ3hJ4ZtDKwpKSnIMloy3+rvdTmH6cjrMgcxEocHcDyNyMxG9+bNxE0cu/i5qZIuLIYgDMEu6SJyVVTsknw0nWfST1jF9OCJooUV/fZjybw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1636986201; 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=XaQf6OPeh+80J4gS+2VTbU0fvr961Vk3LSxoshxGzts=; b=jNYapyZFN+TcFJwteSNDWOMrfI51qJoOdmBILQVODGPgQT6i8bKCmrUt+qZXa0zBvoheJn571Ig19BBItMI0WzkPgLpX7jQp2x0MK7Q03sninprrKvXi4Ka+otBQ+B7r6wekDVVWXJlL+DxHaB/sGE8RQdiyGxnObH1udjsCNiM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mx.zohomail.com with SMTPS id 1636986201434296.18210375864146; Mon, 15 Nov 2021 06:23:21 -0800 (PST) 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-201-euwcOEJ6NRCrdSObMOg05Q-1; Mon, 15 Nov 2021 09:23:16 -0500 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 D03E510B7466; Mon, 15 Nov 2021 14:23:09 +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 B11106788C; Mon, 15 Nov 2021 14:23:09 +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 874F61832DD2; Mon, 15 Nov 2021 14:23:09 +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 1AFEN7DG010106 for ; Mon, 15 Nov 2021 09:23:07 -0500 Received: by smtp.corp.redhat.com (Postfix) id 4605A5BB06; Mon, 15 Nov 2021 14:23:07 +0000 (UTC) Received: from speedmetal.lan (unknown [10.40.208.20]) by smtp.corp.redhat.com (Postfix) with ESMTP id 9EF6D22719 for ; Mon, 15 Nov 2021 14:23:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1636986200; 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=XaQf6OPeh+80J4gS+2VTbU0fvr961Vk3LSxoshxGzts=; b=DsS1LAOF3AMLTn4oKcMIKEqQY628DxICavcKSi+/tr+Pt9xDKEvojsuB7+EtEXMC0R4fla kuQww9hG0cceFRCDp5qX9JZtmHW8TKi4DaLOe5Hjf9BwawUAcKBJmxd5MHf8hL0LHzGH2e 7zxQOUuMbOkwDmSOAt2R+mnN07EqgRg= X-MC-Unique: euwcOEJ6NRCrdSObMOg05Q-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 16/18] util: json: Remove virJSONValueObjectCreate(VArgs) Date: Mon, 15 Nov 2021 15:22:15 +0100 Message-Id: <2ff47dd66d42aa69ebc64d8d561b47db3e181608.1636986086.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: 1636986280461100001 Content-Type: text/plain; charset="utf-8" The functions were obsoleted by virJSONValueObjectAdd(VArgs) Signed-off-by: Peter Krempa Reviewed-by: J=C3=A1n Tomko --- src/libvirt_private.syms | 2 -- src/util/virjson.c | 24 ------------------------ src/util/virjson.h | 4 ---- 3 files changed, 30 deletions(-) diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 9ee8fda25f..a7bc50a4d1 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -2561,8 +2561,6 @@ virJSONValueObjectAppendNumberUint; virJSONValueObjectAppendNumberUlong; virJSONValueObjectAppendString; virJSONValueObjectAppendStringPrintf; -virJSONValueObjectCreate; -virJSONValueObjectCreateVArgs; virJSONValueObjectDeflatten; virJSONValueObjectForeachKeyValue; virJSONValueObjectGet; diff --git a/src/util/virjson.c b/src/util/virjson.c index 8b3599e94f..dbc5b7840c 100644 --- a/src/util/virjson.c +++ b/src/util/virjson.c @@ -369,30 +369,6 @@ virJSONValueObjectAdd(virJSONValue **objptr, ...) } -int -virJSONValueObjectCreateVArgs(virJSONValue **obj, - va_list args) -{ - *obj =3D NULL; - - return virJSONValueObjectAddVArgs(obj, args); -} - - -int -virJSONValueObjectCreate(virJSONValue **obj, ...) -{ - va_list args; - int ret; - - va_start(args, obj); - ret =3D virJSONValueObjectCreateVArgs(obj, args); - va_end(args); - - return ret; -} - - void virJSONValueFree(virJSONValue *value) { diff --git a/src/util/virjson.h b/src/util/virjson.h index 0d8dad754d..361b0190e8 100644 --- a/src/util/virjson.h +++ b/src/util/virjson.h @@ -44,10 +44,6 @@ void virJSONValueHashFree(void *opaque); virJSONType virJSONValueGetType(const virJSONValue *value); -int virJSONValueObjectCreate(virJSONValue **obj, ...) - ATTRIBUTE_NONNULL(1) G_GNUC_NULL_TERMINATED; -int virJSONValueObjectCreateVArgs(virJSONValue **obj, va_list args) - ATTRIBUTE_NONNULL(1); int virJSONValueObjectAdd(virJSONValue **obj, ...) ATTRIBUTE_NONNULL(1) G_GNUC_NULL_TERMINATED; int virJSONValueObjectAddVArgs(virJSONValue **objptr, va_list args) --=20 2.31.1 From nobody Wed May 15 18:25:23 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=1636986201; cv=none; d=zohomail.com; s=zohoarc; b=hFn+UwJKn6g2zxd/X/MkNySMgVEpfOxhoSsr/64xidUUEZck6+8CPn8KS+1LePoGqTCSdgyBYDThH+X1yKQmL2nT9Rm1GMjWDKWsBfxD0jm8/T+Zg9PmGd54xPH+C5f8/nM8bXRvME+NdPs2lhxGd54j42CNK8GH2noJySt8SkA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1636986201; 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=sp5CG7HAueCqowqP92ODMbkv8q5S42JzmMtT4wLANC0=; b=JbfzVKLFbPp0HkvDguF3r3QG+Smy4toBgq/U0Rv0VFhVGO45tqekM5XQgHdHU5HqP4Wf1ktfwWaftvZadTYNkzDoyrB+UWBkP2Sad3DHpntLroQTqr5nS13ICtkitQtO2szMzWOQwEwvYOIiLzj1ZtQ+jJoYRCrtpbhHaQn3JM4= 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 1636986201848697.5205955426335; Mon, 15 Nov 2021 06:23:21 -0800 (PST) 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-122-9ScPzNWBP0C3UOvzLIvTJQ-1; Mon, 15 Nov 2021 09:23:18 -0500 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 A3B5119200C5; Mon, 15 Nov 2021 14:23:12 +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 7D42E79449; Mon, 15 Nov 2021 14:23:12 +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 4624F4EA3A; Mon, 15 Nov 2021 14:23:12 +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 1AFEN8c6010126 for ; Mon, 15 Nov 2021 09:23:08 -0500 Received: by smtp.corp.redhat.com (Postfix) id 4584D5BB06; Mon, 15 Nov 2021 14:23:08 +0000 (UTC) Received: from speedmetal.lan (unknown [10.40.208.20]) by smtp.corp.redhat.com (Postfix) with ESMTP id A8E5C22719 for ; Mon, 15 Nov 2021 14:23:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1636986200; 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=sp5CG7HAueCqowqP92ODMbkv8q5S42JzmMtT4wLANC0=; b=CGrP8Q/p/zUPJMCV01kHgy9YlZqv41DXUfmG1u/KjUPh+l4AZp92QwfNEsOfG3EOmxww+h SnFH2qcddJNOQaZ/2cZjGmWIibD41DPE6OX4q/4n7iahbBUTFV0EUPq6f/3muLsM4rJHuB GyIfEgNq6nlUk1dYqiyxwARbH34B6/0= X-MC-Unique: 9ScPzNWBP0C3UOvzLIvTJQ-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 17/18] qemu: command: Use JSON for parameters of -compat Date: Mon, 15 Nov 2021 15:22:16 +0100 Message-Id: <616f4dd5b215a4481a2aba228099a3924171644d.1636986086.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: 1636986280995100003 Content-Type: text/plain; charset="utf-8" '-compat' as a modern implementation based on QAPI already takes JSON as the argument. Convert our code to use it directly. QEMU declares the ised QAPI types as: { 'enum': 'CompatPolicyInput', 'data': [ 'accept', 'reject', 'crash' ] } { 'enum': 'CompatPolicyOutput', 'data': [ 'accept', 'hide' ] } { 'struct': 'CompatPolicy', 'data': { '*deprecated-input': 'CompatPolicyInput', '*deprecated-output': 'CompatPolicyOutput' } } Signed-off-by: Peter Krempa Reviewed-by: J=C3=A1n Tomko --- src/qemu/qemu_command.c | 28 ++++++++++++------- .../qemu-ns.x86_64-latest.args | 2 +- 2 files changed, 19 insertions(+), 11 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 292335cc62..2c02aa41ef 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -10535,11 +10535,14 @@ qemuBuildCompatDeprecatedCommandLine(virCommand *= cmd, virDomainDef *def, virQEMUCaps *qemuCaps) { - g_auto(virBuffer) buf =3D VIR_BUFFER_INITIALIZER; + g_autoptr(virJSONValue) props =3D NULL; + g_autofree char *propsstr =3D NULL; qemuDomainXmlNsDef *nsdata =3D def->namespaceData; qemuCommnadDeprecationBehavior behavior =3D QEMU_COMMAND_DEPRECATION_B= EHAVIOR_NONE; const char *behaviorStr =3D cfg->deprecationBehavior; int tmp; + const char *deprecatedOutput =3D "hide"; + const char *deprecatedInput =3D NULL; if (nsdata && nsdata->deprecationBehavior) behaviorStr =3D nsdata->deprecationBehavior; @@ -10562,30 +10565,35 @@ qemuBuildCompatDeprecatedCommandLine(virCommand *= cmd, return; } - /* all active options hide output fields from qemu */ - virBufferAddLit(&buf, "deprecated-output=3Dhide,"); - switch (behavior) { case QEMU_COMMAND_DEPRECATION_BEHAVIOR_OMIT: case QEMU_COMMAND_DEPRECATION_BEHAVIOR_NONE: case QEMU_COMMAND_DEPRECATION_BEHAVIOR_LAST: default: - /* output field hiding is default for all cases */ + deprecatedOutput =3D "hide"; break; case QEMU_COMMAND_DEPRECATION_BEHAVIOR_REJECT: - virBufferAddLit(&buf, "deprecated-input=3Dreject,"); + deprecatedOutput =3D "hide"; + deprecatedInput =3D "reject"; break; case QEMU_COMMAND_DEPRECATION_BEHAVIOR_CRASH: - virBufferAddLit(&buf, "deprecated-input=3Dcrash,"); + deprecatedOutput =3D "hide"; + deprecatedInput =3D "crash"; break; } - virBufferTrim(&buf, ","); + if (virJSONValueObjectAdd(&props, + "S:deprecated-output", deprecatedOutput, + "S:deprecated-input", deprecatedInput, + NULL) < 0) + return; - virCommandAddArg(cmd, "-compat"); - virCommandAddArgBuffer(cmd, &buf); + if (!(propsstr =3D virJSONValueToString(props, false))) + return; + + virCommandAddArgList(cmd, "-compat", propsstr, NULL); } diff --git a/tests/qemuxml2argvdata/qemu-ns.x86_64-latest.args b/tests/qemu= xml2argvdata/qemu-ns.x86_64-latest.args index 34688dbcf4..4e9d1c0133 100644 --- a/tests/qemuxml2argvdata/qemu-ns.x86_64-latest.args +++ b/tests/qemuxml2argvdata/qemu-ns.x86_64-latest.args @@ -10,7 +10,7 @@ NS=3Dns \ BAR=3D'' \ /usr/bin/qemu-system-i386 \ -name guest=3DQEMUGuest1,debug-threads=3Don \ --compat deprecated-output=3Dhide,deprecated-input=3Dcrash \ +-compat '{"deprecated-output":"hide","deprecated-input":"crash"}' \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tm= p/lib/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pc,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dp= c.ram \ --=20 2.31.1 From nobody Wed May 15 18:25:23 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=1636986255; cv=none; d=zohomail.com; s=zohoarc; b=km5XXckumvFsVc/yy5hlZh0cSUgW5ASND2eCIBgInKfrNgZhoGXoUkaUtlplEDGzNA0URrs8e+h+xB2hA81EnYl1aqmRucLVXyXC5DEoIDECGG9UhbmdEgzBZhY+5ksikfMFw+wsd4zmXu2SftBmGPHXECty9w+vGeDgXoPxIyc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1636986255; 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=PLgsWrjETvoJy3yAoHKIQJbIRmy6Z4pDG9nyBelV//g=; b=KUmeRZnZh3Lhk3qSjp5QO/bgLzz3GFOeNPgzRf8p+q3p7mb9CzIZRDcZp0/aAPHVqKXIi75M78X8bz46YOlcIQI+GLxw75+VioPLPfXXyMw2NPtZuvDteISXMNzhgaP67wkcDZyb38mYN2/O85f+yYCOrmzti36m7LfavJER+PY= 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 1636986255132594.0020849205896; Mon, 15 Nov 2021 06:24:15 -0800 (PST) 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-590-eEAuuhdnM620-aI2Sx8hNw-1; Mon, 15 Nov 2021 09:24:07 -0500 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 517A1100C667; Mon, 15 Nov 2021 14:24:02 +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 31C731017CF5; Mon, 15 Nov 2021 14:24:02 +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 DA1931832DD7; Mon, 15 Nov 2021 14:24:01 +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 1AFENeN2010528 for ; Mon, 15 Nov 2021 09:23:40 -0500 Received: by smtp.corp.redhat.com (Postfix) id 130755BB0D; Mon, 15 Nov 2021 14:23:40 +0000 (UTC) Received: from speedmetal.lan (unknown [10.40.208.20]) by smtp.corp.redhat.com (Postfix) with ESMTP id D1C0D5BB06 for ; Mon, 15 Nov 2021 14:23:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1636986253; 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=PLgsWrjETvoJy3yAoHKIQJbIRmy6Z4pDG9nyBelV//g=; b=e7MPB/iDuw0Nn1ObBSPTtUFH/8lTYWdUhYSiIdi3q59sPlMb8eoeIGOq6XDCue/MoIvir8 yrbwcvdMAyUkl2z4OebQ4d584vM0teHG9VUBPlCFHOWljIOxQacP/qXDZA3+dRm3ywc9VA NrDvy5iN4TF59GTGdGTW1D4a5tCm6sQ= X-MC-Unique: eEAuuhdnM620-aI2Sx8hNw-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 18/18] qemu: command: Use JSON for parameters of -audiodev Date: Mon, 15 Nov 2021 15:22:17 +0100 Message-Id: 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: 1636986327808100001 Content-Type: text/plain; charset="utf-8" '-audiodev' as a modern implementation based on QAPI already takes JSON as the argument. Convert our code to use it directly. The (lenghty) declaration of the QAPI types can be found in 'qemu.git/qapi/audio.json'. Signed-off-by: Peter Krempa Reviewed-by: J=C3=A1n Tomko --- src/qemu/qemu_command.c | 254 ++++++++++-------- ...fault-cpu-kvm-virt-4.2.aarch64-latest.args | 2 +- ...fault-cpu-tcg-virt-4.2.aarch64-latest.args | 2 +- .../aarch64-features-sve.aarch64-latest.args | 2 +- ...arch64-os-firmware-efi.aarch64-latest.args | 2 +- .../aarch64-tpm.aarch64-latest.args | 2 +- .../aarch64-virt-graphics.aarch64-latest.args | 2 +- .../aarch64-virt-headless.aarch64-latest.args | 2 +- .../audio-alsa-best.x86_64-latest.args | 2 +- .../audio-alsa-full.x86_64-latest.args | 2 +- .../audio-alsa-minimal.x86_64-latest.args | 2 +- .../audio-coreaudio-best.x86_64-latest.args | 2 +- .../audio-coreaudio-full.x86_64-latest.args | 2 +- ...audio-coreaudio-minimal.x86_64-latest.args | 2 +- ...udio-default-nographics.x86_64-latest.args | 2 +- .../audio-default-sdl.x86_64-latest.args | 2 +- .../audio-default-spice.x86_64-latest.args | 2 +- .../audio-default-vnc.x86_64-latest.args | 2 +- .../audio-file-best.x86_64-latest.args | 2 +- .../audio-file-full.x86_64-latest.args | 2 +- .../audio-file-minimal.x86_64-latest.args | 2 +- .../audio-jack-full.x86_64-latest.args | 2 +- .../audio-jack-minimal.x86_64-latest.args | 2 +- .../audio-many-backends.x86_64-latest.args | 6 +- .../audio-none-best.x86_64-latest.args | 2 +- .../audio-none-full.x86_64-latest.args | 2 +- .../audio-none-minimal.x86_64-latest.args | 2 +- .../audio-oss-best.x86_64-latest.args | 2 +- .../audio-oss-full.x86_64-latest.args | 2 +- .../audio-oss-minimal.x86_64-latest.args | 2 +- .../audio-pulseaudio-best.x86_64-latest.args | 2 +- .../audio-pulseaudio-full.x86_64-latest.args | 2 +- ...udio-pulseaudio-minimal.x86_64-latest.args | 2 +- .../audio-sdl-best.x86_64-latest.args | 2 +- .../audio-sdl-full.x86_64-latest.args | 2 +- .../audio-sdl-minimal.x86_64-latest.args | 2 +- .../audio-spice-best.x86_64-latest.args | 2 +- .../audio-spice-full.x86_64-latest.args | 2 +- .../audio-spice-minimal.x86_64-latest.args | 2 +- .../blkdeviotune-group-num.x86_64-latest.args | 2 +- ...blkdeviotune-max-length.x86_64-latest.args | 2 +- .../blkdeviotune-max.x86_64-latest.args | 2 +- .../channel-unix-guestfwd.x86_64-latest.args | 2 +- .../clock-timer-armvtimer.aarch64-latest.args | 2 +- .../console-sclp.s390x-latest.args | 2 +- .../console-virtio-unix.x86_64-latest.args | 2 +- .../controller-virtio-scsi.x86_64-latest.args | 2 +- ...-Icelake-Server-pconfig.x86_64-latest.args | 2 +- .../cpu-host-model.x86_64-4.2.0.args | 2 +- .../cpu-host-model.x86_64-5.0.0.args | 2 +- .../cpu-host-model.x86_64-5.1.0.args | 2 +- .../cpu-host-model.x86_64-5.2.0.args | 2 +- .../cpu-host-model.x86_64-6.0.0.args | 2 +- .../cpu-host-model.x86_64-6.1.0.args | 2 +- .../cpu-host-model.x86_64-latest.args | 2 +- .../cpu-translation.x86_64-latest.args | 2 +- .../cputune-cpuset-big-id.x86_64-latest.args | 2 +- ...ult-video-type-aarch64.aarch64-latest.args | 2 +- ...default-video-type-ppc64.ppc64-latest.args | 2 +- ...ult-video-type-riscv64.riscv64-latest.args | 2 +- ...default-video-type-s390x.s390x-latest.args | 2 +- .../devices-acpi-index.x86_64-latest.args | 2 +- .../disk-aio-io_uring.x86_64-latest.args | 2 +- .../disk-aio.x86_64-latest.args | 2 +- .../disk-arm-virtio-sd.aarch64-latest.args | 2 +- ...-backing-chains-noindex.x86_64-latest.args | 2 +- .../disk-blockio.x86_64-latest.args | 2 +- .../disk-boot-cdrom.x86_64-latest.args | 2 +- .../disk-boot-disk.x86_64-latest.args | 2 +- .../disk-cache.x86_64-latest.args | 2 +- .../disk-cdrom-bus-other.x86_64-latest.args | 2 +- ...m-empty-network-invalid.x86_64-latest.args | 2 +- .../disk-cdrom-network.x86_64-latest.args | 2 +- .../disk-cdrom-tray.x86_64-latest.args | 2 +- .../disk-cdrom.x86_64-latest.args | 2 +- .../disk-copy_on_read.x86_64-latest.args | 2 +- .../disk-detect-zeroes.x86_64-latest.args | 2 +- .../disk-discard.x86_64-latest.args | 2 +- .../disk-error-policy-s390x.s390x-latest.args | 2 +- .../disk-error-policy.x86_64-latest.args | 2 +- .../disk-floppy-q35-2_11.x86_64-latest.args | 2 +- .../disk-floppy-q35-2_9.x86_64-latest.args | 2 +- .../disk-floppy-tray.x86_64-latest.args | 2 +- .../disk-floppy.x86_64-latest.args | 2 +- .../disk-fmt-qcow.x86_64-latest.args | 2 +- .../disk-geometry.x86_64-latest.args | 2 +- .../disk-ide-split.x86_64-latest.args | 2 +- .../disk-ide-wwn.x86_64-latest.args | 2 +- .../disk-ioeventfd.x86_64-latest.args | 2 +- .../disk-metadata-cache.x86_64-latest.args | 2 +- .../disk-network-gluster.x86_64-latest.args | 2 +- .../disk-network-http.x86_64-latest.args | 2 +- .../disk-network-iscsi.x86_64-latest.args | 2 +- .../disk-network-nbd.x86_64-latest.args | 2 +- .../disk-network-nfs.x86_64-latest.args | 2 +- ...-network-rbd-encryption.x86_64-latest.args | 2 +- ...sk-network-rbd-no-colon.x86_64-latest.args | 2 +- .../disk-network-rbd.x86_64-latest.args | 2 +- .../disk-network-sheepdog.x86_64-6.0.0.args | 2 +- ...isk-network-source-auth.x86_64-latest.args | 2 +- ...disk-network-tlsx509-nbd.x86_64-5.2.0.args | 2 +- ...isk-network-tlsx509-nbd.x86_64-latest.args | 2 +- ...isk-network-tlsx509-vxhs.x86_64-5.0.0.args | 2 +- .../disk-no-boot.x86_64-latest.args | 2 +- .../disk-nvme.x86_64-latest.args | 2 +- .../disk-order.x86_64-latest.args | 2 +- .../disk-readonly-disk.x86_64-latest.args | 2 +- .../disk-rotation.x86_64-latest.args | 2 +- .../disk-sata-device.x86_64-latest.args | 2 +- .../disk-scsi-device-auto.x86_64-latest.args | 2 +- .../disk-scsi-disk-split.x86_64-latest.args | 2 +- .../disk-scsi-disk-vpd.x86_64-latest.args | 2 +- .../disk-scsi-disk-wwn.x86_64-latest.args | 2 +- ...sk-scsi-lun-passthrough.x86_64-latest.args | 2 +- .../disk-scsi.x86_64-latest.args | 2 +- .../disk-serial.x86_64-latest.args | 2 +- .../disk-shared.x86_64-latest.args | 2 +- .../disk-slices.x86_64-latest.args | 2 +- .../disk-snapshot.x86_64-latest.args | 2 +- .../disk-source-pool-mode.x86_64-latest.args | 2 +- .../disk-source-pool.x86_64-latest.args | 2 +- .../disk-transient.x86_64-latest.args | 2 +- ...sk-usb-device-removable.x86_64-latest.args | 2 +- .../disk-usb-device.x86_64-latest.args | 2 +- .../disk-vhostuser.x86_64-latest.args | 2 +- .../disk-virtio-ccw-many.s390x-latest.args | 2 +- .../disk-virtio-ccw.s390x-latest.args | 2 +- .../disk-virtio-queues.x86_64-latest.args | 2 +- .../disk-virtio-s390-zpci.s390x-latest.args | 2 +- ...virtio-scsi-reservations.x86_64-5.2.0.args | 2 +- ...irtio-scsi-reservations.x86_64-latest.args | 2 +- .../disk-virtio.x86_64-latest.args | 2 +- .../encrypted-disk-usage.x86_64-latest.args | 2 +- .../encrypted-disk.x86_64-latest.args | 2 +- .../eoi-disabled.x86_64-latest.args | 2 +- .../eoi-enabled.x86_64-latest.args | 2 +- .../event_idx.x86_64-latest.args | 2 +- .../fips-enabled.x86_64-5.1.0.args | 2 +- .../fips-enabled.x86_64-latest.args | 2 +- .../floppy-drive-fat.x86_64-latest.args | 2 +- .../fs9p-ccw.s390x-latest.args | 2 +- .../qemuxml2argvdata/fs9p.x86_64-latest.args | 2 +- .../genid-auto.x86_64-latest.args | 2 +- .../qemuxml2argvdata/genid.x86_64-latest.args | 2 +- ...s-spice-agent-file-xfer.x86_64-latest.args | 2 +- ...aphics-spice-agentmouse.x86_64-latest.args | 2 +- ...s-spice-auto-socket-cfg.x86_64-latest.args | 2 +- ...phics-spice-auto-socket.x86_64-latest.args | 2 +- ...phics-spice-compression.x86_64-latest.args | 2 +- ...hics-spice-egl-headless.x86_64-latest.args | 2 +- ...pice-gl-auto-rendernode.x86_64-latest.args | 2 +- .../graphics-spice-no-args.x86_64-latest.args | 2 +- .../graphics-spice-qxl-vga.x86_64-latest.args | 2 +- .../graphics-spice-sasl.x86_64-latest.args | 2 +- .../graphics-spice-socket.x86_64-latest.args | 2 +- .../graphics-spice-timeout.x86_64-latest.args | 2 +- ...raphics-spice-usb-redir.x86_64-latest.args | 2 +- .../graphics-spice.x86_64-latest.args | 2 +- ...ics-vnc-auto-socket-cfg.x86_64-latest.args | 2 +- ...raphics-vnc-auto-socket.x86_64-latest.args | 2 +- ...aphics-vnc-egl-headless.x86_64-latest.args | 2 +- ...hics-vnc-no-listen-attr.x86_64-latest.args | 2 +- .../graphics-vnc-none.x86_64-latest.args | 2 +- .../graphics-vnc-policy.x86_64-latest.args | 2 +- .../graphics-vnc-power.x86_64-latest.args | 2 +- ...remove-generated-socket.x86_64-latest.args | 2 +- .../graphics-vnc-sasl.x86_64-latest.args | 2 +- ...-vnc-socket-new-cmdline.x86_64-latest.args | 2 +- .../graphics-vnc-socket.x86_64-latest.args | 2 +- .../graphics-vnc-tls-secret.x86_64-5.2.0.args | 2 +- ...graphics-vnc-tls-secret.x86_64-latest.args | 2 +- .../graphics-vnc-tls.x86_64-latest.args | 2 +- .../graphics-vnc-websocket.x86_64-latest.args | 2 +- .../graphics-vnc.x86_64-latest.args | 2 +- ...tdev-mdev-display-ramfb.x86_64-latest.args | 2 +- ...play-spice-egl-headless.x86_64-latest.args | 2 +- ...ev-display-spice-opengl.x86_64-latest.args | 2 +- ...isplay-vnc-egl-headless.x86_64-latest.args | 2 +- ...ostdev-mdev-display-vnc.x86_64-latest.args | 2 +- .../hostdev-scsi-lsi.x86_64-latest.args | 2 +- ...ostdev-scsi-virtio-scsi.x86_64-latest.args | 2 +- ...tdev-subsys-mdev-vfio-ap.s390x-latest.args | 2 +- ...ubsys-mdev-vfio-ccw-boot.s390x-latest.args | 2 +- .../hugepages-memaccess3.x86_64-latest.args | 2 +- .../hugepages-nvdimm.x86_64-latest.args | 2 +- .../hyperv-off.x86_64-latest.args | 2 +- .../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 | 2 +- .../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 +- .../iommu-smmuv3.aarch64-latest.args | 2 +- ...othreads-virtio-scsi-ccw.s390x-latest.args | 2 +- ...othreads-virtio-scsi-pci.x86_64-5.2.0.args | 2 +- ...threads-virtio-scsi-pci.x86_64-latest.args | 2 +- .../kvmclock+eoi-disabled.x86_64-latest.args | 2 +- .../launch-security-s390-pv.s390x-latest.args | 2 +- .../launch-security-sev.x86_64-6.0.0.args | 2 +- .../luks-disks-source-qcow2.x86_64-5.2.0.args | 2 +- ...luks-disks-source-qcow2.x86_64-latest.args | 2 +- .../luks-disks-source.x86_64-latest.args | 2 +- .../luks-disks.x86_64-latest.args | 2 +- ...memory-default-hugepage.x86_64-latest.args | 2 +- .../memfd-memory-numa.x86_64-latest.args | 2 +- ...y-hotplug-nvdimm-access.x86_64-latest.args | 2 +- ...ory-hotplug-nvdimm-align.x86_64-5.2.0.args | 2 +- ...ry-hotplug-nvdimm-align.x86_64-latest.args | 2 +- ...ory-hotplug-nvdimm-label.x86_64-5.2.0.args | 2 +- ...ry-hotplug-nvdimm-label.x86_64-latest.args | 2 +- ...mory-hotplug-nvdimm-pmem.x86_64-5.2.0.args | 2 +- ...ory-hotplug-nvdimm-pmem.x86_64-latest.args | 2 +- ...-hotplug-nvdimm-readonly.x86_64-5.2.0.args | 2 +- ...hotplug-nvdimm-readonly.x86_64-latest.args | 2 +- .../memory-hotplug-nvdimm.x86_64-latest.args | 2 +- ...mory-hotplug-virtio-mem.x86_64-latest.args | 2 +- ...mory-hotplug-virtio-pmem.x86_64-5.2.0.args | 2 +- ...ory-hotplug-virtio-pmem.x86_64-latest.args | 2 +- .../misc-no-reboot.x86_64-5.2.0.args | 2 +- .../misc-no-reboot.x86_64-latest.args | 2 +- .../mlock-off.x86_64-latest.args | 2 +- .../mlock-on.x86_64-latest.args | 2 +- .../net-vdpa.x86_64-latest.args | 2 +- .../net-vhostuser.x86_64-latest.args | 2 +- .../numatune-hmat.x86_64-latest.args | 2 +- ...emnode-restrictive-mode.x86_64-latest.args | 2 +- .../numatune-memnode.x86_64-5.2.0.args | 2 +- .../numatune-memnode.x86_64-latest.args | 2 +- .../numatune-system-memory.x86_64-latest.args | 2 +- .../os-firmware-bios.x86_64-latest.args | 2 +- ...re-efi-no-enrolled-keys.x86_64-latest.args | 2 +- ...os-firmware-efi-secboot.x86_64-latest.args | 2 +- .../os-firmware-efi.x86_64-latest.args | 2 +- .../panic-double.x86_64-latest.args | 2 +- .../panic-no-address.x86_64-latest.args | 2 +- .../qemuxml2argvdata/panic.x86_64-latest.args | 2 +- .../parallel-unix-chardev.x86_64-latest.args | 2 +- ...pi-root-hotplug-disable.x86_64-latest.args | 2 +- ...cpi-root-hotplug-enable.x86_64-latest.args | 2 +- ...e-expander-bus-aarch64.aarch64-latest.args | 2 +- ...cie-root-port-nohotplug.x86_64-latest.args | 2 +- ...ault-cpu-kvm-pseries-2.7.ppc64-latest.args | 2 +- ...ault-cpu-kvm-pseries-3.1.ppc64-latest.args | 2 +- ...ault-cpu-kvm-pseries-4.2.ppc64-latest.args | 2 +- ...ault-cpu-tcg-pseries-2.7.ppc64-latest.args | 2 +- ...ault-cpu-tcg-pseries-3.1.ppc64-latest.args | 2 +- ...ault-cpu-tcg-pseries-4.2.ppc64-latest.args | 2 +- .../ppc64-pseries-graphics.ppc64-latest.args | 2 +- .../ppc64-pseries-headless.ppc64-latest.args | 2 +- .../ppc64-tpmproxy-single.ppc64-latest.args | 2 +- .../ppc64-tpmproxy-with-tpm.ppc64-latest.args | 2 +- .../pv-spinlock-disabled.x86_64-latest.args | 2 +- .../pv-spinlock-enabled.x86_64-latest.args | 2 +- .../qemu-ns.x86_64-latest.args | 2 +- .../riscv64-virt-graphics.riscv64-latest.args | 2 +- .../riscv64-virt-headless.riscv64-latest.args | 2 +- ...low-bogus-usb-controller.s390x-latest.args | 2 +- ...390-allow-bogus-usb-none.s390x-latest.args | 2 +- ...t-cpu-kvm-ccw-virtio-2.7.s390x-latest.args | 2 +- ...t-cpu-kvm-ccw-virtio-4.2.s390x-latest.args | 2 +- ...t-cpu-tcg-ccw-virtio-2.7.s390x-latest.args | 2 +- ...t-cpu-tcg-ccw-virtio-4.2.s390x-latest.args | 2 +- .../s390x-ccw-graphics.s390x-latest.args | 2 +- .../s390x-ccw-headless.s390x-latest.args | 2 +- .../serial-unix-chardev.x86_64-latest.args | 2 +- ...rtcard-passthrough-unix.x86_64-latest.args | 2 +- .../tpm-emulator-spapr.ppc64-latest.args | 2 +- .../tpm-emulator-tpm2-enc.x86_64-latest.args | 2 +- ...pm-emulator-tpm2-pstate.x86_64-latest.args | 2 +- .../tpm-emulator-tpm2.x86_64-latest.args | 2 +- .../tpm-emulator.x86_64-latest.args | 2 +- .../tpm-passthrough-crb.x86_64-latest.args | 2 +- .../tpm-passthrough.x86_64-latest.args | 2 +- .../tseg-explicit-size.x86_64-latest.args | 2 +- .../usb-redir-unix.x86_64-latest.args | 2 +- ...vhost-user-fs-fd-memory.x86_64-latest.args | 2 +- ...vhost-user-fs-hugepages.x86_64-latest.args | 2 +- ...host-user-gpu-secondary.x86_64-latest.args | 2 +- .../vhost-user-vga.x86_64-latest.args | 2 +- .../vhost-vsock-auto.x86_64-latest.args | 2 +- .../vhost-vsock-ccw-auto.s390x-latest.args | 2 +- .../vhost-vsock-ccw-iommu.s390x-latest.args | 2 +- .../vhost-vsock-ccw.s390x-latest.args | 2 +- .../vhost-vsock.x86_64-latest.args | 2 +- ...eo-bochs-display-device.x86_64-latest.args | 2 +- ...video-qxl-device-vram64.x86_64-latest.args | 2 +- ...o-qxl-sec-device-vram64.x86_64-latest.args | 2 +- ...eo-ramfb-display-device.x86_64-latest.args | 2 +- ...video-virtio-vga-gpu-gl.x86_64-latest.args | 2 +- .../virtio-9p-createmode.x86_64-latest.args | 2 +- .../virtio-9p-multidevs.x86_64-latest.args | 2 +- .../virtio-lun.x86_64-latest.args | 2 +- ...virtio-non-transitional.x86_64-latest.args | 2 +- ...-options-controller-ats.x86_64-latest.args | 2 +- ...ptions-controller-iommu.x86_64-latest.args | 2 +- ...tions-controller-packed.x86_64-latest.args | 2 +- ...virtio-options-disk-ats.x86_64-latest.args | 2 +- ...rtio-options-disk-iommu.x86_64-latest.args | 2 +- ...tio-options-disk-packed.x86_64-latest.args | 2 +- .../virtio-options-fs-ats.x86_64-latest.args | 2 +- ...virtio-options-fs-iommu.x86_64-latest.args | 2 +- ...irtio-options-fs-packed.x86_64-latest.args | 2 +- ...irtio-options-input-ats.x86_64-latest.args | 2 +- ...tio-options-input-iommu.x86_64-latest.args | 2 +- ...io-options-input-packed.x86_64-latest.args | 2 +- ...-options-memballoon-ats.x86_64-latest.args | 2 +- ...loon-freepage-reporting.x86_64-latest.args | 2 +- ...ptions-memballoon-iommu.x86_64-latest.args | 2 +- ...tions-memballoon-packed.x86_64-latest.args | 2 +- .../virtio-options-net-ats.x86_64-latest.args | 2 +- ...irtio-options-net-iommu.x86_64-latest.args | 2 +- ...rtio-options-net-packed.x86_64-latest.args | 2 +- .../virtio-options-rng-ats.x86_64-latest.args | 2 +- ...irtio-options-rng-iommu.x86_64-latest.args | 2 +- ...rtio-options-rng-packed.x86_64-latest.args | 2 +- ...irtio-options-video-ats.x86_64-latest.args | 2 +- ...tio-options-video-iommu.x86_64-latest.args | 2 +- ...io-options-video-packed.x86_64-latest.args | 2 +- .../virtio-options.x86_64-latest.args | 2 +- .../virtio-rng-builtin.x86_64-5.2.0.args | 2 +- .../virtio-rng-builtin.x86_64-latest.args | 2 +- .../virtio-rng-egd-unix.x86_64-5.2.0.args | 2 +- .../virtio-rng-egd-unix.x86_64-latest.args | 2 +- .../virtio-transitional.x86_64-latest.args | 2 +- .../watchdog-device.x86_64-latest.args | 2 +- .../watchdog-diag288.s390x-latest.args | 2 +- .../watchdog-dump.x86_64-latest.args | 2 +- .../watchdog-injectnmi.x86_64-latest.args | 2 +- .../watchdog.x86_64-latest.args | 2 +- ...-default-cpu-kvm-pc-4.2.x86_64-latest.args | 2 +- ...default-cpu-kvm-q35-4.2.x86_64-latest.args | 2 +- ...-default-cpu-tcg-pc-4.2.x86_64-latest.args | 2 +- ...default-cpu-tcg-q35-4.2.x86_64-latest.args | 2 +- .../x86_64-pc-graphics.x86_64-latest.args | 2 +- .../x86_64-pc-headless.x86_64-latest.args | 2 +- .../x86_64-q35-graphics.x86_64-latest.args | 2 +- .../x86_64-q35-headless.x86_64-latest.args | 2 +- 340 files changed, 479 insertions(+), 457 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 2c02aa41ef..bc46b19959 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -7827,167 +7827,178 @@ qemuBuildMemoryDeviceCommandLine(virCommand *cmd, return 0; } -static void -qemuBuildAudioCommonArg(virBuffer *buf, - const char *prefix, - virDomainAudioIOCommon *def) -{ - if (def->mixingEngine) - virBufferAsprintf(buf, ",%s.mixing-engine=3D%s", prefix, - virTristateSwitchTypeToString(def->mixingEngine)= ); - if (def->fixedSettings) - virBufferAsprintf(buf, ",%s.fixed-settings=3D%s", prefix, - virTristateSwitchTypeToString(def->fixedSettings= )); - if (def->voices) - virBufferAsprintf(buf, ",%s.voices=3D%u", prefix, def->voices); - if (def->bufferLength) - virBufferAsprintf(buf, ",%s.buffer-length=3D%u", prefix, def->buff= erLength); - - if (def->fixedSettings) { - if (def->frequency) - virBufferAsprintf(buf, ",%s.frequency=3D%u", prefix, def->freq= uency); - if (def->channels) - virBufferAsprintf(buf, ",%s.channels=3D%u", prefix, def->chann= els); - if (def->format) - virBufferAsprintf(buf, ",%s.format=3D%s", prefix, - virDomainAudioFormatTypeToString(def->format= )); - } +static int +qemuBuildAudioCommonProps(virDomainAudioIOCommon *def, + virJSONValue **props) +{ + unsigned int frequency =3D 0; + unsigned int channels =3D 0; + const char *format =3D NULL; + + if (def->fixedSettings =3D=3D VIR_TRISTATE_BOOL_YES) { + frequency =3D def->frequency; + channels =3D def->channels; + if (def->format !=3D VIR_DOMAIN_AUDIO_FORMAT_DEFAULT) + format =3D virDomainAudioFormatTypeToString(def->format); + } + + return virJSONValueObjectAdd(props, + "T:mixing-engine", def->mixingEngine, + "T:fixed-settings", def->fixedSettings, + "p:voices", def->voices, + "p:buffer-length", def->bufferLength, + "p:frequency", frequency, + "p:channels", channels, + "S:format", format, + NULL); } -static void -qemuBuildAudioALSAArg(virBuffer *buf, - const char *prefix, - virDomainAudioIOALSA *def) + +static int +qemuBuildAudioALSAProps(virDomainAudioIOALSA *def, + virJSONValue **props) { - if (def->dev) - virBufferAsprintf(buf, ",%s.dev=3D%s", prefix, def->dev); + return virJSONValueObjectAdd(props, + "S:dev", def->dev, + NULL); } -static void -qemuBuildAudioCoreAudioArg(virBuffer *buf, - const char *prefix, - virDomainAudioIOCoreAudio *def) + +static int +qemuBuildAudioCoreAudioProps(virDomainAudioIOCoreAudio *def, + virJSONValue **props) { - if (def->bufferCount) - virBufferAsprintf(buf, ",%s.buffer-count=3D%u", prefix, def->buffe= rCount); + return virJSONValueObjectAdd(props, + "p:buffer-count", def->bufferCount, + NULL); } -static void -qemuBuildAudioJackArg(virBuffer *buf, - const char *prefix, - virDomainAudioIOJack *def) -{ - if (def->serverName) - virBufferAsprintf(buf, ",%s.server-name=3D%s", prefix, def->server= Name); - if (def->clientName) - virBufferAsprintf(buf, ",%s.client-name=3D%s", prefix, def->client= Name); - if (def->connectPorts) - virBufferAsprintf(buf, ",%s.connect-ports=3D%s", prefix, def->conn= ectPorts); - if (def->exactName) - virBufferAsprintf(buf, ",%s.exact-name=3D%s", prefix, - virTristateSwitchTypeToString(def->exactName)); + +static int +qemuBuildAudioJackProps(virDomainAudioIOJack *def, + virJSONValue **props) +{ + return virJSONValueObjectAdd(props, + "S:server-name", def->serverName, + "S:client-name", def->clientName, + "S:connect-ports", def->connectPorts, + "T:exact-name", def->exactName, + NULL); } -static void -qemuBuildAudioOSSArg(virBuffer *buf, - const char *prefix, - virDomainAudioIOOSS *def) + +static int +qemuBuildAudioOSSProps(virDomainAudioIOOSS *def, + virJSONValue **props) { - if (def->dev) - virBufferAsprintf(buf, ",%s.dev=3D%s", prefix, def->dev); - if (def->bufferCount) - virBufferAsprintf(buf, ",%s.buffer-count=3D%u", prefix, def->buffe= rCount); - if (def->tryPoll) - virBufferAsprintf(buf, ",%s.try-poll=3D%s", prefix, - virTristateSwitchTypeToString(def->tryPoll)); + return virJSONValueObjectAdd(props, + "S:dev", def->dev, + "p:buffer-count", def->bufferCount, + "T:try-poll", def->tryPoll, + NULL); } -static void -qemuBuildAudioPulseAudioArg(virBuffer *buf, - const char *prefix, - virDomainAudioIOPulseAudio *def) + +static int +qemuBuildAudioPulseAudioProps(virDomainAudioIOPulseAudio *def, + virJSONValue **props) { - if (def->name) - virBufferAsprintf(buf, ",%s.name=3D%s", prefix, def->name); - if (def->streamName) - virBufferAsprintf(buf, ",%s.stream-name=3D%s", prefix, def->stream= Name); - if (def->latency) - virBufferAsprintf(buf, ",%s.latency=3D%u", prefix, def->latency); + return virJSONValueObjectAdd(props, + "S:name", def->name, + "S:stream-name", def->streamName, + "p:latency", def->latency, + NULL); } -static void -qemuBuildAudioSDLArg(virBuffer *buf, - const char *prefix, - virDomainAudioIOSDL *def) + +static int +qemuBuildAudioSDLProps(virDomainAudioIOSDL *def, + virJSONValue **props) { - if (def->bufferCount) - virBufferAsprintf(buf, ",%s.buffer-count=3D%u", prefix, def->buffe= rCount); + return virJSONValueObjectAdd(props, + "p:buffer-count", def->bufferCount, + NULL); } + static int qemuBuildAudioCommandLineArg(virCommand *cmd, virDomainAudioDef *def) { - g_auto(virBuffer) buf =3D VIR_BUFFER_INITIALIZER; - - virCommandAddArg(cmd, "-audiodev"); - - virBufferAsprintf(&buf, "id=3Daudio%d,driver=3D%s", - def->id, - qemuAudioDriverTypeToString(def->type)); + g_autoptr(virJSONValue) props =3D NULL; + g_autoptr(virJSONValue) in =3D NULL; + g_autoptr(virJSONValue) out =3D NULL; + g_autofree char *propsstr =3D NULL; + g_autofree char *alias =3D g_strdup_printf("audio%d", def->id); - if (def->timerPeriod) - virBufferAsprintf(&buf, ",timer-period=3D%u", - def->timerPeriod); + if (virJSONValueObjectAdd(&props, + "s:id", alias, + "s:driver", qemuAudioDriverTypeToString(def-= >type), + "p:timer-period", def->timerPeriod, + NULL) < 0) + return -1; - qemuBuildAudioCommonArg(&buf, "in", &def->input); - qemuBuildAudioCommonArg(&buf, "out", &def->output); + if (qemuBuildAudioCommonProps(&def->input, &in) < 0 || + qemuBuildAudioCommonProps(&def->output, &out) < 0) + return -1; switch (def->type) { case VIR_DOMAIN_AUDIO_TYPE_NONE: break; case VIR_DOMAIN_AUDIO_TYPE_ALSA: - qemuBuildAudioALSAArg(&buf, "in", &def->backend.alsa.input); - qemuBuildAudioALSAArg(&buf, "out", &def->backend.alsa.output); + if (qemuBuildAudioALSAProps(&def->backend.alsa.input, &in) < 0 || + qemuBuildAudioALSAProps(&def->backend.alsa.output, &out) < 0) + return -1; break; case VIR_DOMAIN_AUDIO_TYPE_COREAUDIO: - qemuBuildAudioCoreAudioArg(&buf, "in", &def->backend.coreaudio.inp= ut); - qemuBuildAudioCoreAudioArg(&buf, "out", &def->backend.coreaudio.ou= tput); + if (qemuBuildAudioCoreAudioProps(&def->backend.coreaudio.input, &i= n) < 0 || + qemuBuildAudioCoreAudioProps(&def->backend.coreaudio.output, &= out) < 0) + return -1; break; case VIR_DOMAIN_AUDIO_TYPE_JACK: - qemuBuildAudioJackArg(&buf, "in", &def->backend.jack.input); - qemuBuildAudioJackArg(&buf, "out", &def->backend.jack.output); + if (qemuBuildAudioJackProps(&def->backend.jack.input, &in) < 0 || + qemuBuildAudioJackProps(&def->backend.jack.output, &out) < 0) + return -1; break; - case VIR_DOMAIN_AUDIO_TYPE_OSS: - qemuBuildAudioOSSArg(&buf, "in", &def->backend.oss.input); - qemuBuildAudioOSSArg(&buf, "out", &def->backend.oss.output); - - if (def->backend.oss.tryMMap) - virBufferAsprintf(&buf, ",try-mmap=3D%s", - virTristateSwitchTypeToString(def->backend.o= ss.tryMMap)); - if (def->backend.oss.exclusive) - virBufferAsprintf(&buf, ",exclusive=3D%s", - virTristateSwitchTypeToString(def->backend.o= ss.exclusive)); + case VIR_DOMAIN_AUDIO_TYPE_OSS: { + g_autoptr(virJSONValue) dspPolicy =3D NULL; + if (def->backend.oss.dspPolicySet) - virBufferAsprintf(&buf, ",dsp-policy=3D%d", def->backend.oss.d= spPolicy); + dspPolicy =3D virJSONValueNewNumberInt(def->backend.oss.dspPol= icy); + + if (qemuBuildAudioOSSProps(&def->backend.oss.input, &in) < 0 || + qemuBuildAudioOSSProps(&def->backend.oss.output, &out) < 0) + return -1; + + if (virJSONValueObjectAdd(&props, + "T:try-mmap", def->backend.oss.tryMMap, + "T:exclusive", def->backend.oss.exclusiv= e, + "A:dsp-policy", &dspPolicy, + NULL) < 0) + return -1; break; + } case VIR_DOMAIN_AUDIO_TYPE_PULSEAUDIO: - qemuBuildAudioPulseAudioArg(&buf, "in", &def->backend.pulseaudio.i= nput); - qemuBuildAudioPulseAudioArg(&buf, "out", &def->backend.pulseaudio.= output); + if (qemuBuildAudioPulseAudioProps(&def->backend.pulseaudio.input, = &in) < 0 || + qemuBuildAudioPulseAudioProps(&def->backend.pulseaudio.output,= &out) < 0) + return -1; - if (def->backend.pulseaudio.serverName) - virBufferAsprintf(&buf, ",server=3D%s", def->backend.pulseaudi= o.serverName); + if (virJSONValueObjectAdd(&props, + "S:server", def->backend.pulseaudio.serv= erName, + NULL) < 0) + return -1; break; case VIR_DOMAIN_AUDIO_TYPE_SDL: - qemuBuildAudioSDLArg(&buf, "in", &def->backend.sdl.input); - qemuBuildAudioSDLArg(&buf, "out", &def->backend.sdl.output); + if (qemuBuildAudioSDLProps(&def->backend.sdl.input, &in) < 0 || + qemuBuildAudioSDLProps(&def->backend.sdl.output, &out) < 0) + return -1; if (def->backend.sdl.driver) { /* @@ -8007,8 +8018,10 @@ qemuBuildAudioCommandLineArg(virCommand *cmd, break; case VIR_DOMAIN_AUDIO_TYPE_FILE: - if (def->backend.file.path) - virBufferEscapeString(&buf, ",path=3D%s", def->backend.file.pa= th); + if (virJSONValueObjectAdd(&props, + "S:path", def->backend.file.path, + NULL) < 0) + return -1; break; case VIR_DOMAIN_AUDIO_TYPE_LAST: @@ -8017,7 +8030,16 @@ qemuBuildAudioCommandLineArg(virCommand *cmd, return -1; } - virCommandAddArgBuffer(cmd, &buf); + if (virJSONValueObjectAdd(&props, + "A:in", &in, + "A:out", &out, + NULL) < 0) + return -1; + + if (!(propsstr =3D virJSONValueToString(props, false))) + return -1; + + virCommandAddArgList(cmd, "-audiodev", propsstr, NULL); return 0; } diff --git a/tests/qemuxml2argvdata/aarch64-default-cpu-kvm-virt-4.2.aarch6= 4-latest.args b/tests/qemuxml2argvdata/aarch64-default-cpu-kvm-virt-4.2.aar= ch64-latest.args index 3b38e779f8..0a21ce9493 100644 --- a/tests/qemuxml2argvdata/aarch64-default-cpu-kvm-virt-4.2.aarch64-lates= t.args +++ b/tests/qemuxml2argvdata/aarch64-default-cpu-kvm-virt-4.2.aarch64-lates= t.args @@ -30,6 +30,6 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-guest/.config \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/guest.qcow= 2","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}= ' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"qco= w2","file":"libvirt-1-storage"}' \ -device '{"driver":"virtio-blk-pci","bus":"pci.1","addr":"0x0","drive":"li= bvirt-1-format","id":"virtio-disk0","bootindex":1}' \ --audiodev id=3Daudio1,driver=3Dnone \ +-audiodev '{"id":"audio1","driver":"none"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/aarch64-default-cpu-tcg-virt-4.2.aarch6= 4-latest.args b/tests/qemuxml2argvdata/aarch64-default-cpu-tcg-virt-4.2.aar= ch64-latest.args index d4c2cb03f3..a6683fe87c 100644 --- a/tests/qemuxml2argvdata/aarch64-default-cpu-tcg-virt-4.2.aarch64-lates= t.args +++ b/tests/qemuxml2argvdata/aarch64-default-cpu-tcg-virt-4.2.aarch64-lates= t.args @@ -31,6 +31,6 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-guest/.config \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/guest.qcow= 2","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}= ' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"qco= w2","file":"libvirt-1-storage"}' \ -device '{"driver":"virtio-blk-pci","bus":"pci.1","addr":"0x0","drive":"li= bvirt-1-format","id":"virtio-disk0","bootindex":1}' \ --audiodev id=3Daudio1,driver=3Dnone \ +-audiodev '{"id":"audio1","driver":"none"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/aarch64-features-sve.aarch64-latest.arg= s b/tests/qemuxml2argvdata/aarch64-features-sve.aarch64-latest.args index a3aa061dbd..9acd9b4081 100644 --- a/tests/qemuxml2argvdata/aarch64-features-sve.aarch64-latest.args +++ b/tests/qemuxml2argvdata/aarch64-features-sve.aarch64-latest.args @@ -26,6 +26,6 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-guest/.config \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --audiodev id=3Daudio1,driver=3Dnone \ +-audiodev '{"id":"audio1","driver":"none"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/aarch64-os-firmware-efi.aarch64-latest.= args b/tests/qemuxml2argvdata/aarch64-os-firmware-efi.aarch64-latest.args index 48734f0975..d611db8628 100644 --- a/tests/qemuxml2argvdata/aarch64-os-firmware-efi.aarch64-latest.args +++ b/tests/qemuxml2argvdata/aarch64-os-firmware-efi.aarch64-latest.args @@ -33,6 +33,6 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-aarch64test/.config \ -initrd /aarch64.initrd \ -append 'earlyprintk console=3DttyAMA0,115200n8 rw root=3D/dev/vda rootwai= t' \ -dtb /aarch64.dtb \ --audiodev id=3Daudio1,driver=3Dnone \ +-audiodev '{"id":"audio1","driver":"none"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/aarch64-tpm.aarch64-latest.args b/tests= /qemuxml2argvdata/aarch64-tpm.aarch64-latest.args index 1ea17a32f7..62eb27c06b 100644 --- a/tests/qemuxml2argvdata/aarch64-tpm.aarch64-latest.args +++ b/tests/qemuxml2argvdata/aarch64-tpm.aarch64-latest.args @@ -29,6 +29,6 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-aarch64test/.config \ -tpmdev emulator,id=3Dtpm-tpm0,chardev=3Dchrtpm \ -chardev socket,id=3Dchrtpm,path=3D/dev/test \ -device '{"driver":"tpm-tis-device","tpmdev":"tpm-tpm0","id":"tpm0"}' \ --audiodev id=3Daudio1,driver=3Dnone \ +-audiodev '{"id":"audio1","driver":"none"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/aarch64-virt-graphics.aarch64-latest.ar= gs b/tests/qemuxml2argvdata/aarch64-virt-graphics.aarch64-latest.args index 3c8ebf3155..84a0172ccc 100644 --- a/tests/qemuxml2argvdata/aarch64-virt-graphics.aarch64-latest.args +++ b/tests/qemuxml2argvdata/aarch64-virt-graphics.aarch64-latest.args @@ -49,7 +49,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-guest/.config \ -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"}' \ -device '{"driver":"usb-kbd","id":"input1","bus":"usb.0","port":"2"}' \ --audiodev id=3Daudio1,driver=3Dnone \ +-audiodev '{"id":"audio1","driver":"none"}' \ -vnc 127.0.0.1:0,audiodev=3Daudio1 \ -device '{"driver":"virtio-gpu-pci","id":"video0","max_outputs":1,"bus":"p= ci.7","addr":"0x0"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.5","add= r":"0x0"}' \ diff --git a/tests/qemuxml2argvdata/aarch64-virt-headless.aarch64-latest.ar= gs b/tests/qemuxml2argvdata/aarch64-virt-headless.aarch64-latest.args index b8052fa967..19de582bf0 100644 --- a/tests/qemuxml2argvdata/aarch64-virt-headless.aarch64-latest.args +++ b/tests/qemuxml2argvdata/aarch64-virt-headless.aarch64-latest.args @@ -47,7 +47,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-guest/.config \ -serial chardev:charserial0 \ -chardev socket,id=3Dcharchannel0,fd=3D1729,server=3Don,wait=3Doff \ -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 \ +-audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.5","add= r":"0x0"}' \ -object '{"qom-type":"rng-random","id":"objrng0","filename":"/dev/urandom"= }' \ -device '{"driver":"virtio-rng-pci","rng":"objrng0","id":"rng0","bus":"pci= .6","addr":"0x0"}' \ diff --git a/tests/qemuxml2argvdata/audio-alsa-best.x86_64-latest.args b/te= sts/qemuxml2argvdata/audio-alsa-best.x86_64-latest.args index 46350b9c01..6ddf47aa92 100644 --- a/tests/qemuxml2argvdata/audio-alsa-best.x86_64-latest.args +++ b/tests/qemuxml2argvdata/audio-alsa-best.x86_64-latest.args @@ -30,6 +30,6 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -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 '{"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 \ +-audiodev '{"id":"audio1","driver":"alsa","timer-period":50,"in":{"mixing-= engine":true,"fixed-settings":true,"voices":1,"frequency":44100,"channels":= 2,"format":"s16","dev":"/dev/dsp0"},"out":{"mixing-engine":true,"fixed-sett= ings":true,"voices":2,"frequency":22050,"channels":4,"format":"f32","dev":"= /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 186cc0db0c..3c3ded7c73 100644 --- a/tests/qemuxml2argvdata/audio-alsa-full.x86_64-latest.args +++ b/tests/qemuxml2argvdata/audio-alsa-full.x86_64-latest.args @@ -30,6 +30,6 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -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 '{"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 \ +-audiodev '{"id":"audio1","driver":"alsa","in":{"mixing-engine":true,"fixe= d-settings":true,"voices":1,"buffer-length":100,"frequency":44100,"channels= ":2,"format":"s16","dev":"/dev/dsp0"},"out":{"mixing-engine":true,"fixed-se= ttings":true,"voices":2,"buffer-length":200,"frequency":22050,"channels":4,= "format":"f32","dev":"/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 905f4d6c52..a3ee874139 100644 --- a/tests/qemuxml2argvdata/audio-alsa-minimal.x86_64-latest.args +++ b/tests/qemuxml2argvdata/audio-alsa-minimal.x86_64-latest.args @@ -30,6 +30,6 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -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 '{"driver":"ide-cd","bus":"ide.1","unit":0,"drive":"libvirt-1-form= at","id":"ide0-1-0","bootindex":1}' \ --audiodev id=3Daudio1,driver=3Dalsa \ +-audiodev '{"id":"audio1","driver":"alsa"}' \ -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 b375409aed..aa3a183063 100644 --- a/tests/qemuxml2argvdata/audio-coreaudio-best.x86_64-latest.args +++ b/tests/qemuxml2argvdata/audio-coreaudio-best.x86_64-latest.args @@ -30,6 +30,6 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -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 '{"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 \ +-audiodev '{"id":"audio1","driver":"coreaudio","timer-period":50,"in":{"mi= xing-engine":true,"fixed-settings":true,"voices":1,"frequency":44100,"chann= els":2,"format":"s16"},"out":{"mixing-engine":true,"fixed-settings":true,"v= oices":2,"buffer-length":200,"frequency":22050,"channels":4,"format":"f32",= "buffer-count":42}}' \ -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 dd1ef1a405..63931403fc 100644 --- a/tests/qemuxml2argvdata/audio-coreaudio-full.x86_64-latest.args +++ b/tests/qemuxml2argvdata/audio-coreaudio-full.x86_64-latest.args @@ -30,6 +30,6 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -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 '{"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 \ +-audiodev '{"id":"audio1","driver":"coreaudio","in":{"mixing-engine":true,= "fixed-settings":true,"voices":1,"buffer-length":100,"frequency":44100,"cha= nnels":2,"format":"s16","buffer-count":50},"out":{"mixing-engine":true,"fix= ed-settings":true,"voices":2,"buffer-length":200,"frequency":22050,"channel= s":4,"format":"f32","buffer-count":42}}' \ -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 7fa4539a18..b64f715778 100644 --- a/tests/qemuxml2argvdata/audio-coreaudio-minimal.x86_64-latest.args +++ b/tests/qemuxml2argvdata/audio-coreaudio-minimal.x86_64-latest.args @@ -30,6 +30,6 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -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 '{"driver":"ide-cd","bus":"ide.1","unit":0,"drive":"libvirt-1-form= at","id":"ide0-1-0","bootindex":1}' \ --audiodev id=3Daudio1,driver=3Dcoreaudio \ +-audiodev '{"id":"audio1","driver":"coreaudio"}' \ -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 905f4d6c52..a3ee874139 100644 --- a/tests/qemuxml2argvdata/audio-default-nographics.x86_64-latest.args +++ b/tests/qemuxml2argvdata/audio-default-nographics.x86_64-latest.args @@ -30,6 +30,6 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -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 '{"driver":"ide-cd","bus":"ide.1","unit":0,"drive":"libvirt-1-form= at","id":"ide0-1-0","bootindex":1}' \ --audiodev id=3Daudio1,driver=3Dalsa \ +-audiodev '{"id":"audio1","driver":"alsa"}' \ -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 3ecf1657f9..742e090458 100644 --- a/tests/qemuxml2argvdata/audio-default-sdl.x86_64-latest.args +++ b/tests/qemuxml2argvdata/audio-default-sdl.x86_64-latest.args @@ -30,7 +30,7 @@ SDL_AUDIODRIVER=3Desd \ -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 '{"driver":"ide-cd","bus":"ide.1","unit":0,"drive":"libvirt-1-form= at","id":"ide0-1-0","bootindex":1}' \ --audiodev id=3Daudio1,driver=3Dsdl \ +-audiodev '{"id":"audio1","driver":"sdl"}' \ -display sdl \ -device '{"driver":"cirrus-vga","id":"video0","bus":"pci.0","addr":"0x2"}'= \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ diff --git a/tests/qemuxml2argvdata/audio-default-spice.x86_64-latest.args = b/tests/qemuxml2argvdata/audio-default-spice.x86_64-latest.args index 70b5b35091..485ea4d0ec 100644 --- a/tests/qemuxml2argvdata/audio-default-spice.x86_64-latest.args +++ b/tests/qemuxml2argvdata/audio-default-spice.x86_64-latest.args @@ -29,7 +29,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -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 '{"driver":"ide-cd","bus":"ide.1","unit":0,"drive":"libvirt-1-form= at","id":"ide0-1-0","bootindex":1}' \ --audiodev id=3Daudio1,driver=3Dspice \ +-audiodev '{"id":"audio1","driver":"spice"}' \ -spice port=3D0,seamless-migration=3Don \ -device '{"driver":"cirrus-vga","id":"video0","bus":"pci.0","addr":"0x2"}'= \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ diff --git a/tests/qemuxml2argvdata/audio-default-vnc.x86_64-latest.args b/= tests/qemuxml2argvdata/audio-default-vnc.x86_64-latest.args index b8ec56100e..d3f6814de6 100644 --- a/tests/qemuxml2argvdata/audio-default-vnc.x86_64-latest.args +++ b/tests/qemuxml2argvdata/audio-default-vnc.x86_64-latest.args @@ -29,7 +29,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -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 '{"driver":"ide-cd","bus":"ide.1","unit":0,"drive":"libvirt-1-form= at","id":"ide0-1-0","bootindex":1}' \ --audiodev id=3Daudio1,driver=3Dalsa \ +-audiodev '{"id":"audio1","driver":"alsa"}' \ -vnc 127.0.0.1:0,audiodev=3Daudio1 \ -device '{"driver":"cirrus-vga","id":"video0","bus":"pci.0","addr":"0x2"}'= \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ diff --git a/tests/qemuxml2argvdata/audio-file-best.x86_64-latest.args b/te= sts/qemuxml2argvdata/audio-file-best.x86_64-latest.args index 8327031d4a..fd12be1cec 100644 --- a/tests/qemuxml2argvdata/audio-file-best.x86_64-latest.args +++ b/tests/qemuxml2argvdata/audio-file-best.x86_64-latest.args @@ -30,6 +30,6 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -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 '{"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 \ +-audiodev '{"id":"audio1","driver":"wav","timer-period":50,"path":"audio.w= av","in":{"mixing-engine":true,"fixed-settings":true,"voices":1,"frequency"= :44100,"channels":2,"format":"s16"},"out":{"mixing-engine":true,"fixed-sett= ings":true,"voices":2,"frequency":22050,"channels":4,"format":"f32"}}' \ -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 ca6e579382..3708c6ee28 100644 --- a/tests/qemuxml2argvdata/audio-file-full.x86_64-latest.args +++ b/tests/qemuxml2argvdata/audio-file-full.x86_64-latest.args @@ -30,6 +30,6 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -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 '{"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 \ +-audiodev '{"id":"audio1","driver":"wav","path":"audio.wav","in":{"mixing-= engine":true,"fixed-settings":true,"voices":1,"buffer-length":100,"frequenc= y":44100,"channels":2,"format":"s16"},"out":{"mixing-engine":true,"fixed-se= ttings":true,"voices":2,"buffer-length":200,"frequency":22050,"channels":4,= "format":"f32"}}' \ -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 c06c8cf7ea..60c0734a7a 100644 --- a/tests/qemuxml2argvdata/audio-file-minimal.x86_64-latest.args +++ b/tests/qemuxml2argvdata/audio-file-minimal.x86_64-latest.args @@ -30,6 +30,6 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -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 '{"driver":"ide-cd","bus":"ide.1","unit":0,"drive":"libvirt-1-form= at","id":"ide0-1-0","bootindex":1}' \ --audiodev id=3Daudio1,driver=3Dwav \ +-audiodev '{"id":"audio1","driver":"wav"}' \ -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 c77fd0ca5e..168495ecbe 100644 --- a/tests/qemuxml2argvdata/audio-jack-full.x86_64-latest.args +++ b/tests/qemuxml2argvdata/audio-jack-full.x86_64-latest.args @@ -30,6 +30,6 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -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 '{"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 \ +-audiodev '{"id":"audio1","driver":"jack","in":{"mixing-engine":true,"fixe= d-settings":true,"voices":1,"buffer-length":100,"frequency":44100,"channels= ":2,"format":"s16","server-name":"fish","client-name":"food","connect-ports= ":"yum"},"out":{"mixing-engine":true,"fixed-settings":true,"voices":2,"buff= er-length":200,"frequency":22050,"channels":4,"format":"f32","server-name":= "fish","client-name":"food","connect-ports":"yum"}}' \ -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 3ddbfc967b..dc60afcbb3 100644 --- a/tests/qemuxml2argvdata/audio-jack-minimal.x86_64-latest.args +++ b/tests/qemuxml2argvdata/audio-jack-minimal.x86_64-latest.args @@ -30,6 +30,6 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -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 '{"driver":"ide-cd","bus":"ide.1","unit":0,"drive":"libvirt-1-form= at","id":"ide0-1-0","bootindex":1}' \ --audiodev id=3Daudio1,driver=3Djack \ +-audiodev '{"id":"audio1","driver":"jack"}' \ -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 4117eb9e7f..cc7014e6cc 100644 --- a/tests/qemuxml2argvdata/audio-many-backends.x86_64-latest.args +++ b/tests/qemuxml2argvdata/audio-many-backends.x86_64-latest.args @@ -29,9 +29,9 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -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 '{"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 \ +-audiodev '{"id":"audio1","driver":"none"}' \ +-audiodev '{"id":"audio2","driver":"alsa"}' \ +-audiodev '{"id":"audio3","driver":"pa"}' \ -vnc 127.0.0.1:0,audiodev=3Daudio2 \ -device '{"driver":"cirrus-vga","id":"video0","bus":"pci.0","addr":"0x2"}'= \ -device '{"driver":"AC97","id":"sound0","audiodev":"audio1","bus":"pci.0",= "addr":"0x3"}' \ diff --git a/tests/qemuxml2argvdata/audio-none-best.x86_64-latest.args b/te= sts/qemuxml2argvdata/audio-none-best.x86_64-latest.args index 4c26196c34..af2fbf4047 100644 --- a/tests/qemuxml2argvdata/audio-none-best.x86_64-latest.args +++ b/tests/qemuxml2argvdata/audio-none-best.x86_64-latest.args @@ -30,6 +30,6 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -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 '{"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 \ +-audiodev '{"id":"audio1","driver":"none","timer-period":50,"in":{"mixing-= engine":true,"fixed-settings":true,"voices":1,"frequency":44100,"channels":= 2,"format":"s16"},"out":{"mixing-engine":true,"fixed-settings":true,"voices= ":2,"frequency":22050,"channels":4,"format":"f32"}}' \ -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 9296201865..26e903a2fa 100644 --- a/tests/qemuxml2argvdata/audio-none-full.x86_64-latest.args +++ b/tests/qemuxml2argvdata/audio-none-full.x86_64-latest.args @@ -30,6 +30,6 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -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 '{"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 \ +-audiodev '{"id":"audio1","driver":"none","in":{"mixing-engine":true,"fixe= d-settings":true,"voices":1,"buffer-length":100,"frequency":44100,"channels= ":2,"format":"s16"},"out":{"mixing-engine":true,"fixed-settings":true,"voic= es":2,"buffer-length":200,"frequency":22050,"channels":4,"format":"f32"}}' \ -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 b85e774e50..83eeb16805 100644 --- a/tests/qemuxml2argvdata/audio-none-minimal.x86_64-latest.args +++ b/tests/qemuxml2argvdata/audio-none-minimal.x86_64-latest.args @@ -30,6 +30,6 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -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 '{"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":"audio1","driver":"none"}' \ -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 b20f939d05..bdf1c6e3b0 100644 --- a/tests/qemuxml2argvdata/audio-oss-best.x86_64-latest.args +++ b/tests/qemuxml2argvdata/audio-oss-best.x86_64-latest.args @@ -30,6 +30,6 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -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 '{"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 \ +-audiodev '{"id":"audio1","driver":"oss","timer-period":50,"in":{"mixing-e= ngine":true,"fixed-settings":true,"voices":1,"frequency":44100,"channels":2= ,"format":"s16","dev":"/dev/dsp0","buffer-count":30,"try-poll":true},"out":= {"mixing-engine":true,"fixed-settings":true,"voices":2,"frequency":22050,"c= hannels":4,"format":"f32","dev":"/dev/dsp1","buffer-count":30,"try-poll":fa= lse}}' \ -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 2c1812a339..4d78a46b84 100644 --- a/tests/qemuxml2argvdata/audio-oss-full.x86_64-latest.args +++ b/tests/qemuxml2argvdata/audio-oss-full.x86_64-latest.args @@ -30,6 +30,6 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -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 '{"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 \ +-audiodev '{"id":"audio1","driver":"oss","try-mmap":true,"exclusive":true,= "dsp-policy":3,"in":{"mixing-engine":true,"fixed-settings":true,"voices":1,= "buffer-length":100,"frequency":44100,"channels":2,"format":"s16","dev":"/d= ev/dsp0","buffer-count":50,"try-poll":true},"out":{"mixing-engine":true,"fi= xed-settings":true,"voices":2,"buffer-length":200,"frequency":22050,"channe= ls":4,"format":"f32","dev":"/dev/dsp1","buffer-count":30,"try-poll":false}}= ' \ -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 a7bb979766..dcf8f441cd 100644 --- a/tests/qemuxml2argvdata/audio-oss-minimal.x86_64-latest.args +++ b/tests/qemuxml2argvdata/audio-oss-minimal.x86_64-latest.args @@ -30,6 +30,6 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -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 '{"driver":"ide-cd","bus":"ide.1","unit":0,"drive":"libvirt-1-form= at","id":"ide0-1-0","bootindex":1}' \ --audiodev id=3Daudio1,driver=3Doss \ +-audiodev '{"id":"audio1","driver":"oss"}' \ -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 f8250a3922..2ead82e9b5 100644 --- a/tests/qemuxml2argvdata/audio-pulseaudio-best.x86_64-latest.args +++ b/tests/qemuxml2argvdata/audio-pulseaudio-best.x86_64-latest.args @@ -30,6 +30,6 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -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 '{"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 \ +-audiodev '{"id":"audio1","driver":"pa","timer-period":50,"server":"acme.e= xample.org","in":{"mixing-engine":true,"fixed-settings":true,"voices":1,"bu= ffer-length":200,"frequency":44100,"channels":2,"format":"s16","name":"fish= "},"out":{"mixing-engine":true,"fixed-settings":true,"voices":2,"buffer-len= gth":200,"frequency":22050,"channels":4,"format":"f32","name":"fish"}}' \ -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 3a753e1b1b..fba2ed8a20 100644 --- a/tests/qemuxml2argvdata/audio-pulseaudio-full.x86_64-latest.args +++ b/tests/qemuxml2argvdata/audio-pulseaudio-full.x86_64-latest.args @@ -30,6 +30,6 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -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 '{"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 \ +-audiodev '{"id":"audio1","driver":"pa","server":"acme.example.org","in":{= "mixing-engine":true,"fixed-settings":true,"voices":1,"buffer-length":100,"= frequency":44100,"channels":2,"format":"s16","name":"fish","stream-name":"f= ood","latency":100},"out":{"mixing-engine":true,"fixed-settings":true,"voic= es":2,"buffer-length":200,"frequency":22050,"channels":4,"format":"f32","na= me":"fish","stream-name":"food","latency":200}}' \ -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 1919e51148..ced37934fa 100644 --- a/tests/qemuxml2argvdata/audio-pulseaudio-minimal.x86_64-latest.args +++ b/tests/qemuxml2argvdata/audio-pulseaudio-minimal.x86_64-latest.args @@ -30,6 +30,6 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -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 '{"driver":"ide-cd","bus":"ide.1","unit":0,"drive":"libvirt-1-form= at","id":"ide0-1-0","bootindex":1}' \ --audiodev id=3Daudio1,driver=3Dpa \ +-audiodev '{"id":"audio1","driver":"pa"}' \ -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 fdadf1451e..d78f79a536 100644 --- a/tests/qemuxml2argvdata/audio-sdl-best.x86_64-latest.args +++ b/tests/qemuxml2argvdata/audio-sdl-best.x86_64-latest.args @@ -31,6 +31,6 @@ SDL_AUDIODRIVER=3Dpulseaudio \ -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 '{"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 \ +-audiodev '{"id":"audio1","driver":"sdl","timer-period":50,"in":{"mixing-e= ngine":true,"fixed-settings":true,"voices":1,"frequency":44100,"channels":2= ,"format":"s16"},"out":{"mixing-engine":true,"fixed-settings":true,"voices"= :2,"buffer-length":200,"frequency":22050,"channels":4,"format":"f32"}}' \ -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 ee14fb9ad6..79b54f3327 100644 --- a/tests/qemuxml2argvdata/audio-sdl-full.x86_64-latest.args +++ b/tests/qemuxml2argvdata/audio-sdl-full.x86_64-latest.args @@ -31,6 +31,6 @@ SDL_AUDIODRIVER=3Dpulseaudio \ -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 '{"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 \ +-audiodev '{"id":"audio1","driver":"sdl","in":{"mixing-engine":true,"fixed= -settings":true,"voices":1,"buffer-length":100,"frequency":44100,"channels"= :2,"format":"s16","buffer-count":40},"out":{"mixing-engine":true,"fixed-set= tings":true,"voices":2,"buffer-length":200,"frequency":22050,"channels":4,"= format":"f32","buffer-count":50}}' \ -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 2582248400..e9e2c6ec6e 100644 --- a/tests/qemuxml2argvdata/audio-sdl-minimal.x86_64-latest.args +++ b/tests/qemuxml2argvdata/audio-sdl-minimal.x86_64-latest.args @@ -30,6 +30,6 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -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 '{"driver":"ide-cd","bus":"ide.1","unit":0,"drive":"libvirt-1-form= at","id":"ide0-1-0","bootindex":1}' \ --audiodev id=3Daudio1,driver=3Dsdl \ +-audiodev '{"id":"audio1","driver":"sdl"}' \ -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 76a655c645..048a98440b 100644 --- a/tests/qemuxml2argvdata/audio-spice-best.x86_64-latest.args +++ b/tests/qemuxml2argvdata/audio-spice-best.x86_64-latest.args @@ -30,6 +30,6 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -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 '{"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 \ +-audiodev '{"id":"audio1","driver":"spice","timer-period":50,"in":{"mixing= -engine":true,"fixed-settings":true,"voices":1,"frequency":44100,"channels"= :2,"format":"s16"},"out":{"mixing-engine":true,"fixed-settings":true,"voice= s":2,"frequency":22050,"channels":4,"format":"f32"}}' \ -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 e961ad0fc9..0eee98c724 100644 --- a/tests/qemuxml2argvdata/audio-spice-full.x86_64-latest.args +++ b/tests/qemuxml2argvdata/audio-spice-full.x86_64-latest.args @@ -30,6 +30,6 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -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 '{"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 \ +-audiodev '{"id":"audio1","driver":"spice","in":{"mixing-engine":true,"fix= ed-settings":true,"voices":1,"buffer-length":100,"frequency":44100,"channel= s":2,"format":"s16"},"out":{"mixing-engine":true,"fixed-settings":true,"voi= ces":2,"buffer-length":200,"frequency":22050,"channels":4,"format":"f32"}}'= \ -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 615297edd6..fcea1eb2d3 100644 --- a/tests/qemuxml2argvdata/audio-spice-minimal.x86_64-latest.args +++ b/tests/qemuxml2argvdata/audio-spice-minimal.x86_64-latest.args @@ -30,6 +30,6 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -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 '{"driver":"ide-cd","bus":"ide.1","unit":0,"drive":"libvirt-1-form= at","id":"ide0-1-0","bootindex":1}' \ --audiodev id=3Daudio1,driver=3Dspice \ +-audiodev '{"id":"audio1","driver":"spice"}' \ -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 bf817f8f05..66a5fd2cad 100644 --- a/tests/qemuxml2argvdata/blkdeviotune-group-num.x86_64-latest.args +++ b/tests/qemuxml2argvdata/blkdeviotune-group-num.x86_64-latest.args @@ -33,7 +33,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -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 '{"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 \ +-audiodev '{"id":"audio1","driver":"none"}' \ -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 bf817f8f05..66a5fd2cad 100644 --- a/tests/qemuxml2argvdata/blkdeviotune-max-length.x86_64-latest.args +++ b/tests/qemuxml2argvdata/blkdeviotune-max-length.x86_64-latest.args @@ -33,7 +33,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -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 '{"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 \ +-audiodev '{"id":"audio1","driver":"none"}' \ -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 bf817f8f05..66a5fd2cad 100644 --- a/tests/qemuxml2argvdata/blkdeviotune-max.x86_64-latest.args +++ b/tests/qemuxml2argvdata/blkdeviotune-max.x86_64-latest.args @@ -33,7 +33,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -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 '{"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 \ +-audiodev '{"id":"audio1","driver":"none"}' \ -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 6a9e00a4a3..f43ddb9627 100644 --- a/tests/qemuxml2argvdata/channel-unix-guestfwd.x86_64-latest.args +++ b/tests/qemuxml2argvdata/channel-unix-guestfwd.x86_64-latest.args @@ -31,7 +31,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -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 \ +-audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/clock-timer-armvtimer.aarch64-latest.ar= gs b/tests/qemuxml2argvdata/clock-timer-armvtimer.aarch64-latest.args index a6a2553508..0c3d73acaf 100644 --- a/tests/qemuxml2argvdata/clock-timer-armvtimer.aarch64-latest.args +++ b/tests/qemuxml2argvdata/clock-timer-armvtimer.aarch64-latest.args @@ -26,6 +26,6 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-guest/.config \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --audiodev id=3Daudio1,driver=3Dnone \ +-audiodev '{"id":"audio1","driver":"none"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/console-sclp.s390x-latest.args b/tests/= qemuxml2argvdata/console-sclp.s390x-latest.args index 7dca2191c5..975c493141 100644 --- a/tests/qemuxml2argvdata/console-sclp.s390x-latest.args +++ b/tests/qemuxml2argvdata/console-sclp.s390x-latest.args @@ -30,7 +30,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -device virtio-blk-ccw,devno=3Dfe.0.0000,drive=3Dlibvirt-1-format,id=3Dvir= tio-disk0,bootindex=3D1 \ -chardev pty,id=3Dcharconsole0 \ -device sclpconsole,chardev=3Dcharconsole0,id=3Dconsole0 \ --audiodev id=3Daudio1,driver=3Dnone \ +-audiodev '{"id":"audio1","driver":"none"}' \ -device virtio-balloon-ccw,id=3Dballoon0,devno=3Dfe.0.0001 \ -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 6f5e7d0690..4765ae6fb5 100644 --- a/tests/qemuxml2argvdata/console-virtio-unix.x86_64-latest.args +++ b/tests/qemuxml2argvdata/console-virtio-unix.x86_64-latest.args @@ -32,7 +32,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -device '{"driver":"virtconsole","chardev":"charconsole0","id":"console0"}= ' \ -chardev socket,id=3Dcharconsole1,path=3D/tmp/connect.socket \ -device '{"driver":"virtconsole","chardev":"charconsole1","id":"console1"}= ' \ --audiodev id=3Daudio1,driver=3Dnone \ +-audiodev '{"id":"audio1","driver":"none"}' \ -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 5a277bccbe..7bf03736f0 100644 --- a/tests/qemuxml2argvdata/controller-virtio-scsi.x86_64-latest.args +++ b/tests/qemuxml2argvdata/controller-virtio-scsi.x86_64-latest.args @@ -47,7 +47,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -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 '{"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 \ +-audiodev '{"id":"audio1","driver":"none"}' \ -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 27b5c2c2d0..612b77581b 100644 --- a/tests/qemuxml2argvdata/cpu-Icelake-Server-pconfig.x86_64-latest.args +++ b/tests/qemuxml2argvdata/cpu-Icelake-Server-pconfig.x86_64-latest.args @@ -27,7 +27,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-test/.config \ -no-acpi \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --audiodev id=3Daudio1,driver=3Dnone \ +-audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/cpu-host-model.x86_64-4.2.0.args b/test= s/qemuxml2argvdata/cpu-host-model.x86_64-4.2.0.args index 59f22d1e54..3bb4c35894 100644 --- a/tests/qemuxml2argvdata/cpu-host-model.x86_64-4.2.0.args +++ b/tests/qemuxml2argvdata/cpu-host-model.x86_64-4.2.0.args @@ -29,7 +29,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -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 \ --audiodev id=3Daudio1,driver=3Dnone \ +-audiodev '{"id":"audio1","driver":"none"}' \ -device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.2,addr=3D0x0 \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/cpu-host-model.x86_64-5.0.0.args b/test= s/qemuxml2argvdata/cpu-host-model.x86_64-5.0.0.args index 0c6ec3fe64..3c4f006566 100644 --- a/tests/qemuxml2argvdata/cpu-host-model.x86_64-5.0.0.args +++ b/tests/qemuxml2argvdata/cpu-host-model.x86_64-5.0.0.args @@ -29,7 +29,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -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 \ --audiodev id=3Daudio1,driver=3Dnone \ +-audiodev '{"id":"audio1","driver":"none"}' \ -device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.2,addr=3D0x0 \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/cpu-host-model.x86_64-5.1.0.args b/test= s/qemuxml2argvdata/cpu-host-model.x86_64-5.1.0.args index dfc31cd4c2..43f857cfff 100644 --- a/tests/qemuxml2argvdata/cpu-host-model.x86_64-5.1.0.args +++ b/tests/qemuxml2argvdata/cpu-host-model.x86_64-5.1.0.args @@ -29,7 +29,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -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 \ --audiodev id=3Daudio1,driver=3Dnone \ +-audiodev '{"id":"audio1","driver":"none"}' \ -device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.2,addr=3D0x0 \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/cpu-host-model.x86_64-5.2.0.args b/test= s/qemuxml2argvdata/cpu-host-model.x86_64-5.2.0.args index c9aab8533f..91aa8d12f2 100644 --- a/tests/qemuxml2argvdata/cpu-host-model.x86_64-5.2.0.args +++ b/tests/qemuxml2argvdata/cpu-host-model.x86_64-5.2.0.args @@ -30,7 +30,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -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 \ --audiodev id=3Daudio1,driver=3Dnone \ +-audiodev '{"id":"audio1","driver":"none"}' \ -device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.2,addr=3D0x0 \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/cpu-host-model.x86_64-6.0.0.args b/test= s/qemuxml2argvdata/cpu-host-model.x86_64-6.0.0.args index dd8182c8de..82039f466a 100644 --- a/tests/qemuxml2argvdata/cpu-host-model.x86_64-6.0.0.args +++ b/tests/qemuxml2argvdata/cpu-host-model.x86_64-6.0.0.args @@ -30,7 +30,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -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 \ --audiodev id=3Daudio1,driver=3Dnone \ +-audiodev '{"id":"audio1","driver":"none"}' \ -device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.2,addr=3D0x0 \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/cpu-host-model.x86_64-6.1.0.args b/test= s/qemuxml2argvdata/cpu-host-model.x86_64-6.1.0.args index d43200523c..e17f959809 100644 --- a/tests/qemuxml2argvdata/cpu-host-model.x86_64-6.1.0.args +++ b/tests/qemuxml2argvdata/cpu-host-model.x86_64-6.1.0.args @@ -30,7 +30,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -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 \ --audiodev id=3Daudio1,driver=3Dnone \ +-audiodev '{"id":"audio1","driver":"none"}' \ -device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.2,addr=3D0x0 \ -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 95b5e4a50b..c2bf0d9834 100644 --- a/tests/qemuxml2argvdata/cpu-host-model.x86_64-latest.args +++ b/tests/qemuxml2argvdata/cpu-host-model.x86_64-latest.args @@ -30,7 +30,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -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 \ +-audiodev '{"id":"audio1","driver":"none"}' \ -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 c24d8ec201..bd2d29d54e 100644 --- a/tests/qemuxml2argvdata/cpu-translation.x86_64-latest.args +++ b/tests/qemuxml2argvdata/cpu-translation.x86_64-latest.args @@ -27,7 +27,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -no-acpi \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --audiodev id=3Daudio1,driver=3Dnone \ +-audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -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 ad189c76fa..8b3c6902bb 100644 --- a/tests/qemuxml2argvdata/cputune-cpuset-big-id.x86_64-latest.args +++ b/tests/qemuxml2argvdata/cputune-cpuset-big-id.x86_64-latest.args @@ -30,7 +30,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ -device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ --audiodev id=3Daudio1,driver=3Dnone \ +-audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/default-video-type-aarch64.aarch64-late= st.args b/tests/qemuxml2argvdata/default-video-type-aarch64.aarch64-latest.= args index 7d5655e966..46d1b14535 100644 --- a/tests/qemuxml2argvdata/default-video-type-aarch64.aarch64-latest.args +++ b/tests/qemuxml2argvdata/default-video-type-aarch64.aarch64-latest.args @@ -26,7 +26,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-default-video-type-a= /.config \ -boot strict=3Don \ -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"}' \ --audiodev id=3Daudio1,driver=3Dnone \ +-audiodev '{"id":"audio1","driver":"none"}' \ -vnc 127.0.0.1:0,audiodev=3Daudio1 \ -device '{"driver":"virtio-gpu-pci","id":"video0","max_outputs":1,"bus":"p= ci.1","addr":"0x0"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ diff --git a/tests/qemuxml2argvdata/default-video-type-ppc64.ppc64-latest.a= rgs b/tests/qemuxml2argvdata/default-video-type-ppc64.ppc64-latest.args index 6c41def586..baefa66718 100644 --- a/tests/qemuxml2argvdata/default-video-type-ppc64.ppc64-latest.args +++ b/tests/qemuxml2argvdata/default-video-type-ppc64.ppc64-latest.args @@ -27,7 +27,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-default-video-type-p= /.config \ -device '{"driver":"pci-ohci","id":"usb","bus":"pci.0","addr":"0x1"}' \ -device '{"driver":"usb-kbd","id":"input0","bus":"usb.0","port":"1"}' \ -device '{"driver":"usb-mouse","id":"input1","bus":"usb.0","port":"2"}' \ --audiodev id=3Daudio1,driver=3Dnone \ +-audiodev '{"id":"audio1","driver":"none"}' \ -vnc 127.0.0.1:0,audiodev=3Daudio1 \ -device '{"driver":"VGA","id":"video0","vgamem_mb":16,"bus":"pci.0","addr"= :"0x2"}' \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/default-video-type-riscv64.riscv64-late= st.args b/tests/qemuxml2argvdata/default-video-type-riscv64.riscv64-latest.= args index f2d54056d7..065c786e0d 100644 --- a/tests/qemuxml2argvdata/default-video-type-riscv64.riscv64-latest.args +++ b/tests/qemuxml2argvdata/default-video-type-riscv64.riscv64-latest.args @@ -24,7 +24,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-default-video-type-r= /.config \ -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 \ --audiodev id=3Daudio1,driver=3Dspice \ +-audiodev '{"id":"audio1","driver":"spice"}' \ -spice port=3D0,seamless-migration=3Don \ -device virtio-gpu-pci,id=3Dvideo0,max_outputs=3D1,bus=3Dpci.1,addr=3D0x0 \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ diff --git a/tests/qemuxml2argvdata/default-video-type-s390x.s390x-latest.a= rgs b/tests/qemuxml2argvdata/default-video-type-s390x.s390x-latest.args index 5bb9353745..5fee246959 100644 --- a/tests/qemuxml2argvdata/default-video-type-s390x.s390x-latest.args +++ b/tests/qemuxml2argvdata/default-video-type-s390x.s390x-latest.args @@ -24,7 +24,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-default-video-type-s= /.config \ -rtc base=3Dutc \ -no-shutdown \ -boot strict=3Don \ --audiodev id=3Daudio1,driver=3Dnone \ +-audiodev '{"id":"audio1","driver":"none"}' \ -vnc 127.0.0.1:0,audiodev=3Daudio1 \ -device virtio-gpu-ccw,id=3Dvideo0,max_outputs=3D1,devno=3Dfe.0.0000 \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ diff --git a/tests/qemuxml2argvdata/devices-acpi-index.x86_64-latest.args b= /tests/qemuxml2argvdata/devices-acpi-index.x86_64-latest.args index 9fecc94299..c9a5ea4392 100644 --- a/tests/qemuxml2argvdata/devices-acpi-index.x86_64-latest.args +++ b/tests/qemuxml2argvdata/devices-acpi-index.x86_64-latest.args @@ -38,7 +38,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-fdr-br/.config \ -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 '{"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 \ +-audiodev '{"id":"audio1","driver":"none"}' \ -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 \ 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 8c6943bc93..848ad71274 100644 --- a/tests/qemuxml2argvdata/disk-aio-io_uring.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-aio-io_uring.x86_64-latest.args @@ -30,7 +30,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -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 '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x9","drive":"li= bvirt-1-format","id":"virtio-disk0","bootindex":1}' \ --audiodev id=3Daudio1,driver=3Dnone \ +-audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -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 3d291c49f9..e0f725eb8f 100644 --- a/tests/qemuxml2argvdata/disk-aio.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-aio.x86_64-latest.args @@ -33,7 +33,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -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 '{"driver":"ide-cd","bus":"ide.1","unit":0,"drive":"libvirt-1-form= at","id":"ide0-1-0"}' \ --audiodev id=3Daudio1,driver=3Dnone \ +-audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/disk-arm-virtio-sd.aarch64-latest.args = b/tests/qemuxml2argvdata/disk-arm-virtio-sd.aarch64-latest.args index 3bf3da3c26..d98ff19eb4 100644 --- a/tests/qemuxml2argvdata/disk-arm-virtio-sd.aarch64-latest.args +++ b/tests/qemuxml2argvdata/disk-arm-virtio-sd.aarch64-latest.args @@ -34,6 +34,6 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-armtest/.config \ -blockdev '{"driver":"file","filename":"/arm-virtio.qcow2","node-name":"li= bvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"qco= w2","file":"libvirt-1-storage"}' \ -device '{"driver":"virtio-blk-device","drive":"libvirt-1-format","id":"vi= rtio-disk0"}' \ --audiodev id=3Daudio1,driver=3Dnone \ +-audiodev '{"id":"audio1","driver":"none"}' \ -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 a71b7b6e97..b7483420a7 100644 --- a/tests/qemuxml2argvdata/disk-backing-chains-noindex.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-backing-chains-noindex.x86_64-latest.args @@ -84,7 +84,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -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 '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x7","drive":"li= bvirt-1-format","id":"virtio-disk5"}' \ --audiodev id=3Daudio1,driver=3Dnone \ +-audiodev '{"id":"audio1","driver":"none"}' \ -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 20c34e12a8..cf3beca368 100644 --- a/tests/qemuxml2argvdata/disk-blockio.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-blockio.x86_64-latest.args @@ -33,7 +33,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -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 '{"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 \ +-audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -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 ec23a0be13..85578ea6f5 100644 --- a/tests/qemuxml2argvdata/disk-boot-cdrom.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-boot-cdrom.x86_64-latest.args @@ -33,6 +33,6 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -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 '{"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":"audio1","driver":"none"}' \ -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 07f43e5762..219105e79f 100644 --- a/tests/qemuxml2argvdata/disk-boot-disk.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-boot-disk.x86_64-latest.args @@ -33,6 +33,6 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -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 '{"driver":"ide-cd","bus":"ide.1","unit":0,"drive":"libvirt-1-form= at","id":"ide0-1-0"}' \ --audiodev id=3Daudio1,driver=3Dnone \ +-audiodev '{"id":"audio1","driver":"none"}' \ -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 59c4f7932a..2b77325fc5 100644 --- a/tests/qemuxml2argvdata/disk-cache.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-cache.x86_64-latest.args @@ -43,6 +43,6 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -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 '{"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 \ +-audiodev '{"id":"audio1","driver":"none"}' \ -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 f14011e68d..392d6f9468 100644 --- a/tests/qemuxml2argvdata/disk-cdrom-bus-other.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-cdrom-bus-other.x86_64-latest.args @@ -31,6 +31,6 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -blockdev '{"node-name":"libvirt-2-format","read-only":true,"driver":"raw"= ,"file":"libvirt-2-storage"}' \ -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 \ +-audiodev '{"id":"audio1","driver":"none"}' \ -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 f488cdf5f3..f77429b478 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 @@ -28,6 +28,6 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ -device '{"driver":"ide-cd","bus":"ide.1","unit":1,"id":"ide0-1-1"}' \ --audiodev id=3Daudio1,driver=3Dnone \ +-audiodev '{"id":"audio1","driver":"none"}' \ -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 d898d6d648..437d8c210e 100644 --- a/tests/qemuxml2argvdata/disk-cdrom-network.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-cdrom-network.x86_64-latest.args @@ -35,7 +35,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -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 '{"driver":"ide-cd","bus":"ide.1","unit":0,"drive":"libvirt-1-form= at","id":"ide0-1-0"}' \ --audiodev id=3Daudio1,driver=3Dnone \ +-audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -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 a6709016ac..300d9b7aa8 100644 --- a/tests/qemuxml2argvdata/disk-cdrom-tray.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-cdrom-tray.x86_64-latest.args @@ -36,7 +36,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-test/.config \ -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 '{"driver":"ide-cd","bus":"ide.1","unit":1,"drive":"libvirt-1-form= at","id":"ide0-1-1"}' \ --audiodev id=3Daudio1,driver=3Dnone \ +-audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -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 7352a42059..93e5134c26 100644 --- a/tests/qemuxml2argvdata/disk-cdrom.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-cdrom.x86_64-latest.args @@ -35,6 +35,6 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -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 \ +-audiodev '{"id":"audio1","driver":"none"}' \ -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 12755d9a9b..edd51d0c6a 100644 --- a/tests/qemuxml2argvdata/disk-copy_on_read.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-copy_on_read.x86_64-latest.args @@ -37,7 +37,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-test/.config \ -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 '{"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 \ +-audiodev '{"id":"audio1","driver":"none"}' \ -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 7f63bd536f..9b01c27e54 100644 --- a/tests/qemuxml2argvdata/disk-detect-zeroes.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-detect-zeroes.x86_64-latest.args @@ -33,7 +33,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-test/.config \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/Fedora-14-x86_64-= Live-KDE.iso","node-name":"libvirt-1-storage","auto-read-only":true,"discar= d":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":true,"discard":"ign= ore","detect-zeroes":"on","driver":"raw","file":"libvirt-1-storage"}' \ -device '{"driver":"ide-cd","bus":"ide.1","unit":0,"drive":"libvirt-1-form= at","id":"ide0-1-0","bootindex":1}' \ --audiodev id=3Daudio1,driver=3Dnone \ +-audiodev '{"id":"audio1","driver":"none"}' \ -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 0f762b9edd..2152e9c5d8 100644 --- a/tests/qemuxml2argvdata/disk-discard.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-discard.x86_64-latest.args @@ -33,7 +33,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-test/.config \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/Fedora-14-x86_64-= Live-KDE.iso","node-name":"libvirt-1-storage","auto-read-only":true,"discar= d":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":true,"discard":"ign= ore","driver":"raw","file":"libvirt-1-storage"}' \ -device '{"driver":"ide-cd","bus":"ide.1","unit":0,"drive":"libvirt-1-form= at","id":"ide0-1-0","bootindex":1}' \ --audiodev id=3Daudio1,driver=3Dnone \ +-audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/disk-error-policy-s390x.s390x-latest.ar= gs b/tests/qemuxml2argvdata/disk-error-policy-s390x.s390x-latest.args index d8101b8bbd..a98990a285 100644 --- a/tests/qemuxml2argvdata/disk-error-policy-s390x.s390x-latest.args +++ b/tests/qemuxml2argvdata/disk-error-policy-s390x.s390x-latest.args @@ -34,6 +34,6 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-guest/.config \ -blockdev '{"driver":"file","filename":"/var/images/image3","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":"qcow2","file":"libvirt-1-storage"}' \ -device virtio-blk-ccw,devno=3Dfe.0.0002,drive=3Dlibvirt-1-format,id=3Dvir= tio-disk2,write-cache=3Don,werror=3Dreport,rerror=3Dignore \ --audiodev id=3Daudio1,driver=3Dnone \ +-audiodev '{"id":"audio1","driver":"none"}' \ -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 6fc2250ca5..602e19a035 100644 --- a/tests/qemuxml2argvdata/disk-error-policy.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-error-policy.x86_64-latest.args @@ -36,6 +36,6 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -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 '{"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 \ +-audiodev '{"id":"audio1","driver":"none"}' \ -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 3f99c56a87..079d2fbc83 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 @@ -36,6 +36,6 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -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 '{"driver":"floppy","unit":1,"drive":"libvirt-1-format","id":"fdc0= -0-1"}' \ --audiodev id=3Daudio1,driver=3Dnone \ +-audiodev '{"id":"audio1","driver":"none"}' \ -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 21a990305b..ba877a4a58 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 @@ -36,6 +36,6 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -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 '{"driver":"floppy","unit":1,"drive":"libvirt-1-format","id":"fdc0= -0-1"}' \ --audiodev id=3Daudio1,driver=3Dnone \ +-audiodev '{"id":"audio1","driver":"none"}' \ -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 f1d647e55e..f82b738a75 100644 --- a/tests/qemuxml2argvdata/disk-floppy-tray.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-floppy-tray.x86_64-latest.args @@ -36,7 +36,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -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 '{"driver":"floppy","unit":1,"drive":"libvirt-1-format","id":"fdc0= -0-1"}' \ --audiodev id=3Daudio1,driver=3Dnone \ +-audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/disk-floppy.x86_64-latest.args b/tests/= qemuxml2argvdata/disk-floppy.x86_64-latest.args index 3992169f54..8847b1ed95 100644 --- a/tests/qemuxml2argvdata/disk-floppy.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-floppy.x86_64-latest.args @@ -36,6 +36,6 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -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 '{"driver":"floppy","unit":1,"drive":"libvirt-1-format","id":"fdc0= -0-1"}' \ --audiodev id=3Daudio1,driver=3Dnone \ +-audiodev '{"id":"audio1","driver":"none"}' \ -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 c3b1303031..656352bd7d 100644 --- a/tests/qemuxml2argvdata/disk-fmt-qcow.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-fmt-qcow.x86_64-latest.args @@ -33,6 +33,6 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -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 '{"driver":"ide-cd","bus":"ide.1","unit":0,"drive":"libvirt-1-form= at","id":"ide0-1-0"}' \ --audiodev id=3Daudio1,driver=3Dnone \ +-audiodev '{"id":"audio1","driver":"none"}' \ -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 f75bc09249..03b3c512d5 100644 --- a/tests/qemuxml2argvdata/disk-geometry.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-geometry.x86_64-latest.args @@ -30,7 +30,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ -device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1,"cyls":16383,"heads":16,"secs":63,"bios-c= hs-trans":"lba"}' \ --audiodev id=3Daudio1,driver=3Dnone \ +-audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -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 0fe9d9e71f..bb223c286f 100644 --- a/tests/qemuxml2argvdata/disk-ide-split.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-ide-split.x86_64-latest.args @@ -33,7 +33,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -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 '{"driver":"ide-hd","bus":"ide.0","unit":2,"drive":"libvirt-1-form= at","id":"ide0-0-2","bootindex":1}' \ --audiodev id=3Daudio1,driver=3Dnone \ +-audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -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 82143b4853..e6c64292d2 100644 --- a/tests/qemuxml2argvdata/disk-ide-wwn.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-ide-wwn.x86_64-latest.args @@ -30,7 +30,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ -device '{"driver":"ide-hd","bus":"ide.0","unit":1,"drive":"libvirt-1-form= at","id":"ide0-0-1","bootindex":1,"wwn":5764824127192592813,"serial":"WD-WM= AP9A966149"}' \ --audiodev id=3Daudio1,driver=3Dnone \ +-audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -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 000a361b1c..bd3b7ef933 100644 --- a/tests/qemuxml2argvdata/disk-ioeventfd.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-ioeventfd.x86_64-latest.args @@ -36,7 +36,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-test/.config \ -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 '{"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 \ +-audiodev '{"id":"audio1","driver":"none"}' \ -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 59201284e6..527765ede3 100644 --- a/tests/qemuxml2argvdata/disk-metadata-cache.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-metadata-cache.x86_64-latest.args @@ -35,7 +35,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -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 '{"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 \ +-audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -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 a54d3e2e38..e2e00754e3 100644 --- a/tests/qemuxml2argvdata/disk-network-gluster.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-network-gluster.x86_64-latest.args @@ -36,6 +36,6 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -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 '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x4","drive":"li= bvirt-1-format","id":"virtio-disk2"}' \ --audiodev id=3Daudio1,driver=3Dnone \ +-audiodev '{"id":"audio1","driver":"none"}' \ -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 91b7a2aee1..fbd979139b 100644 --- a/tests/qemuxml2argvdata/disk-network-http.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-network-http.x86_64-latest.args @@ -41,6 +41,6 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -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 '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x5","drive":"li= bvirt-1-format","id":"virtio-disk3"}' \ --audiodev id=3Daudio1,driver=3Dnone \ +-audiodev '{"id":"audio1","driver":"none"}' \ -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 2aaa3d87b0..03a66abbfe 100644 --- a/tests/qemuxml2argvdata/disk-network-iscsi.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-network-iscsi.x86_64-latest.args @@ -52,6 +52,6 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -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 '{"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 \ +-audiodev '{"id":"audio1","driver":"none"}' \ -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 f2700ff336..50cdb97b7c 100644 --- a/tests/qemuxml2argvdata/disk-network-nbd.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-network-nbd.x86_64-latest.args @@ -42,6 +42,6 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -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 '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x6","drive":"li= bvirt-1-format","id":"virtio-disk4"}' \ --audiodev id=3Daudio1,driver=3Dnone \ +-audiodev '{"id":"audio1","driver":"none"}' \ -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 a2a617b5db..2bce70d294 100644 --- a/tests/qemuxml2argvdata/disk-network-nfs.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-network-nfs.x86_64-latest.args @@ -35,6 +35,6 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -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 '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x2","drive":"li= bvirt-1-format","id":"virtio-disk1"}' \ --audiodev id=3Daudio1,driver=3Dnone \ +-audiodev '{"id":"audio1","driver":"none"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/disk-network-rbd-encryption.x86_64-late= st.args b/tests/qemuxml2argvdata/disk-network-rbd-encryption.x86_64-latest.= args index 00f6168e96..cd85253046 100644 --- a/tests/qemuxml2argvdata/disk-network-rbd-encryption.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-network-rbd-encryption.x86_64-latest.args @@ -43,7 +43,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-encryptdisk/.config \ -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"}],"encrypt":{"format":"luks2","= key-secret":"libvirt-1-format-encryption-secret0"},"node-name":"libvirt-1-s= torage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ -device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x6","drive":"li= bvirt-1-format","id":"virtio-disk3"}' \ --audiodev id=3Daudio1,driver=3Dnone \ +-audiodev '{"id":"audio1","driver":"none"}' \ -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-no-colon.x86_64-latest= .args b/tests/qemuxml2argvdata/disk-network-rbd-no-colon.x86_64-latest.args index b39bc64393..6502a950fa 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 @@ -33,7 +33,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -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 '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x2","drive":"li= bvirt-1-format","id":"virtio-disk0"}' \ --audiodev id=3Daudio1,driver=3Dnone \ +-audiodev '{"id":"audio1","driver":"none"}' \ -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 2ce7637ae6..a81cfcac6d 100644 --- a/tests/qemuxml2argvdata/disk-network-rbd.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-network-rbd.x86_64-latest.args @@ -46,6 +46,6 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -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 '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x7","drive":"li= bvirt-1-format","id":"virtio-disk5"}' \ --audiodev id=3Daudio1,driver=3Dnone \ +-audiodev '{"id":"audio1","driver":"none"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/disk-network-sheepdog.x86_64-6.0.0.args= b/tests/qemuxml2argvdata/disk-network-sheepdog.x86_64-6.0.0.args index 078ad6be09..2d1ae018f9 100644 --- a/tests/qemuxml2argvdata/disk-network-sheepdog.x86_64-6.0.0.args +++ b/tests/qemuxml2argvdata/disk-network-sheepdog.x86_64-6.0.0.args @@ -33,6 +33,6 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -blockdev '{"driver":"sheepdog","server":{"type":"inet","host":"example.or= g","port":"6000"},"vdi":"image,with,commas","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 \ --audiodev id=3Daudio1,driver=3Dnone \ +-audiodev '{"id":"audio1","driver":"none"}' \ -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 5241ff3475..f7c5b72022 100644 --- a/tests/qemuxml2argvdata/disk-network-source-auth.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-network-source-auth.x86_64-latest.args @@ -39,6 +39,6 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -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 '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x4","drive":"li= bvirt-1-format","id":"virtio-disk2"}' \ --audiodev id=3Daudio1,driver=3Dnone \ +-audiodev '{"id":"audio1","driver":"none"}' \ -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-5.2.0.a= rgs b/tests/qemuxml2argvdata/disk-network-tlsx509-nbd.x86_64-5.2.0.args index 1e126fcd4e..ec4d6d7346 100644 --- a/tests/qemuxml2argvdata/disk-network-tlsx509-nbd.x86_64-5.2.0.args +++ b/tests/qemuxml2argvdata/disk-network-tlsx509-nbd.x86_64-5.2.0.args @@ -32,6 +32,6 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -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 \ --audiodev id=3Daudio1,driver=3Dnone \ +-audiodev '{"id":"audio1","driver":"none"}' \ -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 ae8e6e10f5..b2fa660043 100644 --- a/tests/qemuxml2argvdata/disk-network-tlsx509-nbd.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-network-tlsx509-nbd.x86_64-latest.args @@ -32,6 +32,6 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -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 '{"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 \ +-audiodev '{"id":"audio1","driver":"none"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/disk-network-tlsx509-vxhs.x86_64-5.0.0.= args b/tests/qemuxml2argvdata/disk-network-tlsx509-vxhs.x86_64-5.0.0.args index c4ce45bf6f..fd9d323b2d 100644 --- a/tests/qemuxml2argvdata/disk-network-tlsx509-vxhs.x86_64-5.0.0.args +++ b/tests/qemuxml2argvdata/disk-network-tlsx509-vxhs.x86_64-5.0.0.args @@ -39,6 +39,6 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -blockdev '{"driver":"vxhs","vdisk-id":"eb90327c-8302-4725-9e1b-4e85ed4dc2= 53","server":{"host":"192.168.0.3","port":"9999"},"node-name":"libvirt-1-st= orage","cache":{"direct":true,"no-flush":false},"auto-read-only":true,"disc= ard":"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=3D0x6,drive=3Dlibvirt-1-format,id= =3Dvirtio-disk2,write-cache=3Don,serial=3Deb90327c-8302-4725-9e1b-4e85ed4dc= 252 \ --audiodev id=3Daudio1,driver=3Dnone \ +-audiodev '{"id":"audio1","driver":"none"}' \ -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 2094d7e722..22be7e5a00 100644 --- a/tests/qemuxml2argvdata/disk-no-boot.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-no-boot.x86_64-latest.args @@ -37,6 +37,6 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -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 '{"driver":"floppy","unit":0,"drive":"libvirt-1-format","id":"fdc0= -0-0"}' \ --audiodev id=3Daudio1,driver=3Dnone \ +-audiodev '{"id":"audio1","driver":"none"}' \ -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 d97994b56e..16631c5cba 100644 --- a/tests/qemuxml2argvdata/disk-nvme.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-nvme.x86_64-latest.args @@ -41,6 +41,6 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -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 '{"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 \ +-audiodev '{"id":"audio1","driver":"none"}' \ -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 970b25f429..1ab65f3b2c 100644 --- a/tests/qemuxml2argvdata/disk-order.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-order.x86_64-latest.args @@ -39,7 +39,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -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 '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x3","drive":"li= bvirt-1-format","id":"virtio-disk1"}' \ --audiodev id=3Daudio1,driver=3Dnone \ +-audiodev '{"id":"audio1","driver":"none"}' \ -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 5006d5cea2..e7862c401f 100644 --- a/tests/qemuxml2argvdata/disk-readonly-disk.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-readonly-disk.x86_64-latest.args @@ -33,7 +33,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -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 '{"driver":"ide-cd","bus":"ide.1","unit":0,"drive":"libvirt-1-form= at","id":"ide0-1-0"}' \ --audiodev id=3Daudio1,driver=3Dnone \ +-audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -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 fe117c43f5..8312be6ba7 100644 --- a/tests/qemuxml2argvdata/disk-rotation.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-rotation.x86_64-latest.args @@ -37,7 +37,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -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 '{"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 \ +-audiodev '{"id":"audio1","driver":"none"}' \ -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 2ce3938869..5da2905a91 100644 --- a/tests/qemuxml2argvdata/disk-sata-device.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-sata-device.x86_64-latest.args @@ -31,7 +31,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ -device '{"driver":"ide-hd","bus":"sata0.0","drive":"libvirt-1-format","id= ":"sata0-0-0","bootindex":1}' \ --audiodev id=3Daudio1,driver=3Dnone \ +-audiodev '{"id":"audio1","driver":"none"}' \ -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 d6b70b28fc..faf26d5713 100644 --- a/tests/qemuxml2argvdata/disk-scsi-device-auto.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-scsi-device-auto.x86_64-latest.args @@ -34,7 +34,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -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 '{"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 \ +-audiodev '{"id":"audio1","driver":"none"}' \ -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 1eeebe3497..01ec3b65f1 100644 --- a/tests/qemuxml2argvdata/disk-scsi-disk-split.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-scsi-disk-split.x86_64-latest.args @@ -43,7 +43,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -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 '{"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 \ +-audiodev '{"id":"audio1","driver":"none"}' \ -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 b8f8dd8d4d..74d51260ff 100644 --- a/tests/qemuxml2argvdata/disk-scsi-disk-vpd.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-scsi-disk-vpd.x86_64-latest.args @@ -35,7 +35,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -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 '{"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 \ +-audiodev '{"id":"audio1","driver":"none"}' \ -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 6eaa3fdc37..9b6eb1d28b 100644 --- a/tests/qemuxml2argvdata/disk-scsi-disk-wwn.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-scsi-disk-wwn.x86_64-latest.args @@ -35,7 +35,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -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 '{"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 \ +-audiodev '{"id":"audio1","driver":"none"}' \ -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 7f8332f429..5985ecab7c 100644 --- a/tests/qemuxml2argvdata/disk-scsi-lun-passthrough.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-scsi-lun-passthrough.x86_64-latest.args @@ -35,7 +35,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -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 '{"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 \ +-audiodev '{"id":"audio1","driver":"none"}' \ -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 c564a1592e..2f87696079 100644 --- a/tests/qemuxml2argvdata/disk-scsi.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-scsi.x86_64-latest.args @@ -50,7 +50,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -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 '{"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 \ +-audiodev '{"id":"audio1","driver":"none"}' \ -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 e51cc87ffb..6ae7245743 100644 --- a/tests/qemuxml2argvdata/disk-serial.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-serial.x86_64-latest.args @@ -34,7 +34,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ -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 \ +-audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/disk-shared.x86_64-latest.args b/tests/= qemuxml2argvdata/disk-shared.x86_64-latest.args index 7780de7730..bff4f0b047 100644 --- a/tests/qemuxml2argvdata/disk-shared.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-shared.x86_64-latest.args @@ -40,7 +40,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -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 '{"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 \ +-audiodev '{"id":"audio1","driver":"none"}' \ -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 1394b7144f..4b4a937488 100644 --- a/tests/qemuxml2argvdata/disk-slices.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-slices.x86_64-latest.args @@ -49,7 +49,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -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 '{"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 \ +-audiodev '{"id":"audio1","driver":"none"}' \ -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 c674f70c79..5e96d8a95a 100644 --- a/tests/qemuxml2argvdata/disk-snapshot.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-snapshot.x86_64-latest.args @@ -36,7 +36,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -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 '{"driver":"ide-cd","bus":"ide.1","unit":0,"drive":"libvirt-1-form= at","id":"ide0-1-0"}' \ --audiodev id=3Daudio1,driver=3Dnone \ +-audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -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 94fd9d25fc..acd6286bbb 100644 --- a/tests/qemuxml2argvdata/disk-source-pool-mode.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-source-pool-mode.x86_64-latest.args @@ -39,7 +39,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -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 '{"driver":"ide-cd","bus":"ide.0","unit":4,"drive":"libvirt-1-form= at","id":"ide0-0-4"}' \ --audiodev id=3Daudio1,driver=3Dnone \ +-audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -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 a9498f0682..679b162744 100644 --- a/tests/qemuxml2argvdata/disk-source-pool.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-source-pool.x86_64-latest.args @@ -40,7 +40,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -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 '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x4","drive":"li= bvirt-1-format","id":"virtio-disk1"}' \ --audiodev id=3Daudio1,driver=3Dnone \ +-audiodev '{"id":"audio1","driver":"none"}' \ -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 7cbdc8d0bf..aed36bb4c3 100644 --- a/tests/qemuxml2argvdata/disk-transient.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-transient.x86_64-latest.args @@ -30,7 +30,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -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 '{"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 \ +-audiodev '{"id":"audio1","driver":"none"}' \ -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 01016b429e..9ceffb897c 100644 --- a/tests/qemuxml2argvdata/disk-usb-device-removable.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-usb-device-removable.x86_64-latest.args @@ -33,7 +33,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -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 '{"driver":"usb-storage","bus":"usb.0","port":"1","drive":"libvirt= -1-format","id":"usb-disk0","removable":true}' \ --audiodev id=3Daudio1,driver=3Dnone \ +-audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -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 0e65a0e429..9e224e60bf 100644 --- a/tests/qemuxml2argvdata/disk-usb-device.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-usb-device.x86_64-latest.args @@ -33,7 +33,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -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 '{"driver":"usb-storage","bus":"usb.0","port":"1","drive":"libvirt= -1-format","id":"usb-disk0","removable":false}' \ --audiodev id=3Daudio1,driver=3Dnone \ +-audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -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 070d17ac98..9ad4ab5938 100644 --- a/tests/qemuxml2argvdata/disk-vhostuser.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-vhostuser.x86_64-latest.args @@ -31,7 +31,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -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 '{"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 \ +-audiodev '{"id":"audio1","driver":"none"}' \ -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-ccw-many.s390x-latest.args = b/tests/qemuxml2argvdata/disk-virtio-ccw-many.s390x-latest.args index d509d6e536..84cb70c38b 100644 --- a/tests/qemuxml2argvdata/disk-virtio-ccw-many.s390x-latest.args +++ b/tests/qemuxml2argvdata/disk-virtio-ccw-many.s390x-latest.args @@ -37,7 +37,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -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 virtio-blk-ccw,devno=3Dfe.2.f00f,drive=3Dlibvirt-1-format,id=3Dvir= tio-disk3 \ --audiodev id=3Daudio1,driver=3Dnone \ +-audiodev '{"id":"audio1","driver":"none"}' \ -device virtio-balloon-ccw,id=3Dballoon0,devno=3Dfe.0.000a \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/disk-virtio-ccw.s390x-latest.args b/tes= ts/qemuxml2argvdata/disk-virtio-ccw.s390x-latest.args index 414dd053d5..950ef0e5d8 100644 --- a/tests/qemuxml2argvdata/disk-virtio-ccw.s390x-latest.args +++ b/tests/qemuxml2argvdata/disk-virtio-ccw.s390x-latest.args @@ -31,7 +31,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -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 virtio-blk-ccw,devno=3D0.0.0007,drive=3Dlibvirt-1-format,id=3Dvirt= io-disk1 \ --audiodev id=3Daudio1,driver=3Dnone \ +-audiodev '{"id":"audio1","driver":"none"}' \ -device virtio-balloon-ccw,id=3Dballoon0,devno=3Dfe.0.000a \ -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 662f6ab858..84aef4154e 100644 --- a/tests/qemuxml2argvdata/disk-virtio-queues.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-virtio-queues.x86_64-latest.args @@ -36,6 +36,6 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -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 '{"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 \ +-audiodev '{"id":"audio1","driver":"none"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/disk-virtio-s390-zpci.s390x-latest.args= b/tests/qemuxml2argvdata/disk-virtio-s390-zpci.s390x-latest.args index 8e58542d50..f257017f7c 100644 --- a/tests/qemuxml2argvdata/disk-virtio-s390-zpci.s390x-latest.args +++ b/tests/qemuxml2argvdata/disk-virtio-s390-zpci.s390x-latest.args @@ -29,7 +29,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ -device zpci,uid=3D25,fid=3D31,target=3Dvirtio-disk0,id=3Dzpci25 \ -device virtio-blk-pci,bus=3Dpci.0,addr=3D0x8,drive=3Dlibvirt-1-format,id= =3Dvirtio-disk0,bootindex=3D1 \ --audiodev id=3Daudio1,driver=3Dnone \ +-audiodev '{"id":"audio1","driver":"none"}' \ -device virtio-balloon-ccw,id=3Dballoon0,devno=3Dfe.0.0000 \ -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-5.= 2.0.args b/tests/qemuxml2argvdata/disk-virtio-scsi-reservations.x86_64-5.2.= 0.args index ae947769d1..30ccf2f3fa 100644 --- a/tests/qemuxml2argvdata/disk-virtio-scsi-reservations.x86_64-5.2.0.args +++ b/tests/qemuxml2argvdata/disk-virtio-scsi-reservations.x86_64-5.2.0.args @@ -36,7 +36,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -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 \ --audiodev id=3Daudio1,driver=3Dnone \ +-audiodev '{"id":"audio1","driver":"none"}' \ -device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x4 \ -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 a80c207027..9711e48212 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 @@ -36,7 +36,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -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 '{"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 \ +-audiodev '{"id":"audio1","driver":"none"}' \ -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 bb159103f9..ce0c33b1b1 100644 --- a/tests/qemuxml2argvdata/disk-virtio.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-virtio.x86_64-latest.args @@ -39,6 +39,6 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -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 '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x3","drive":"li= bvirt-1-format","id":"virtio-disk1"}' \ --audiodev id=3Daudio1,driver=3Dnone \ +-audiodev '{"id":"audio1","driver":"none"}' \ -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 db702af164..e0a592906e 100644 --- a/tests/qemuxml2argvdata/encrypted-disk-usage.x86_64-latest.args +++ b/tests/qemuxml2argvdata/encrypted-disk-usage.x86_64-latest.args @@ -31,7 +31,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-encryptdisk/.config \ -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 '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x4","drive":"li= bvirt-1-format","id":"virtio-disk0","bootindex":1}' \ --audiodev id=3Daudio1,driver=3Dnone \ +-audiodev '{"id":"audio1","driver":"none"}' \ -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 c5e3184b35..a0aa9bf6b1 100644 --- a/tests/qemuxml2argvdata/encrypted-disk.x86_64-latest.args +++ b/tests/qemuxml2argvdata/encrypted-disk.x86_64-latest.args @@ -31,7 +31,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-encryptdisk/.config \ -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 '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x4","drive":"li= bvirt-1-format","id":"virtio-disk0","bootindex":1}' \ --audiodev id=3Daudio1,driver=3Dnone \ +-audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/eoi-disabled.x86_64-latest.args b/tests= /qemuxml2argvdata/eoi-disabled.x86_64-latest.args index 46df7331f7..af10667d5e 100644 --- a/tests/qemuxml2argvdata/eoi-disabled.x86_64-latest.args +++ b/tests/qemuxml2argvdata/eoi-disabled.x86_64-latest.args @@ -26,7 +26,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -no-shutdown \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --audiodev id=3Daudio1,driver=3Dnone \ +-audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/eoi-enabled.x86_64-latest.args b/tests/= qemuxml2argvdata/eoi-enabled.x86_64-latest.args index 454d745dfa..79a2e1e841 100644 --- a/tests/qemuxml2argvdata/eoi-enabled.x86_64-latest.args +++ b/tests/qemuxml2argvdata/eoi-enabled.x86_64-latest.args @@ -26,7 +26,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -no-shutdown \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --audiodev id=3Daudio1,driver=3Dnone \ +-audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -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 600ab691d2..29a87bfcd2 100644 --- a/tests/qemuxml2argvdata/event_idx.x86_64-latest.args +++ b/tests/qemuxml2argvdata/event_idx.x86_64-latest.args @@ -36,7 +36,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-test/.config \ -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 '{"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 \ +-audiodev '{"id":"audio1","driver":"none"}' \ -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-5.1.0.args b/tests/= qemuxml2argvdata/fips-enabled.x86_64-5.1.0.args index 3c2ee0f96c..ed013f1c61 100644 --- a/tests/qemuxml2argvdata/fips-enabled.x86_64-5.1.0.args +++ b/tests/qemuxml2argvdata/fips-enabled.x86_64-5.1.0.args @@ -30,7 +30,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ -device ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-0-0= ,bootindex=3D1 \ --audiodev id=3Daudio1,driver=3Dnone \ +-audiodev '{"id":"audio1","driver":"none"}' \ -device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ -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 5cfc5607d2..370bf4702e 100644 --- a/tests/qemuxml2argvdata/fips-enabled.x86_64-latest.args +++ b/tests/qemuxml2argvdata/fips-enabled.x86_64-latest.args @@ -30,7 +30,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ -device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ --audiodev id=3Daudio1,driver=3Dnone \ +-audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -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 3c6b524e0e..015c459edb 100644 --- a/tests/qemuxml2argvdata/floppy-drive-fat.x86_64-latest.args +++ b/tests/qemuxml2argvdata/floppy-drive-fat.x86_64-latest.args @@ -31,7 +31,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -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 '{"driver":"floppy","unit":0,"drive":"libvirt-1-format","id":"fdc0= -0-0"}' \ --audiodev id=3Daudio1,driver=3Dnone \ +-audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/fs9p-ccw.s390x-latest.args b/tests/qemu= xml2argvdata/fs9p-ccw.s390x-latest.args index 38da926e84..61b41e074c 100644 --- a/tests/qemuxml2argvdata/fs9p-ccw.s390x-latest.args +++ b/tests/qemuxml2argvdata/fs9p-ccw.s390x-latest.args @@ -34,7 +34,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -device virtio-9p-ccw,id=3Dfs1,fsdev=3Dfsdev-fs1,mount_tag=3D/import/from/= host2,devno=3Dfe.0.0002 \ -fsdev handle,writeout=3Dimmediate,id=3Dfsdev-fs2,path=3D/export/to/guest3= \ -device virtio-9p-ccw,id=3Dfs2,fsdev=3Dfsdev-fs2,mount_tag=3D/import/from/= host3,devno=3Dfe.0.0003 \ --audiodev id=3Daudio1,driver=3Dnone \ +-audiodev '{"id":"audio1","driver":"none"}' \ -device virtio-balloon-ccw,id=3Dballoon0,devno=3Dfe.0.0004 \ -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 ee440aad87..52722276ca 100644 --- a/tests/qemuxml2argvdata/fs9p.x86_64-latest.args +++ b/tests/qemuxml2argvdata/fs9p.x86_64-latest.args @@ -32,6 +32,6 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -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 '{"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 \ +-audiodev '{"id":"audio1","driver":"none"}' \ -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 71daf8f4c9..9925ad549b 100644 --- a/tests/qemuxml2argvdata/genid-auto.x86_64-latest.args +++ b/tests/qemuxml2argvdata/genid-auto.x86_64-latest.args @@ -27,6 +27,6 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -no-shutdown \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --audiodev id=3Daudio1,driver=3Dnone \ +-audiodev '{"id":"audio1","driver":"none"}' \ -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 dba094376f..4be79574de 100644 --- a/tests/qemuxml2argvdata/genid.x86_64-latest.args +++ b/tests/qemuxml2argvdata/genid.x86_64-latest.args @@ -27,6 +27,6 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -no-shutdown \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --audiodev id=3Daudio1,driver=3Dnone \ +-audiodev '{"id":"audio1","driver":"none"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/graphics-spice-agent-file-xfer.x86_64-l= atest.args b/tests/qemuxml2argvdata/graphics-spice-agent-file-xfer.x86_64-l= atest.args index 3bcfd55dae..e6228a7e9f 100644 --- a/tests/qemuxml2argvdata/graphics-spice-agent-file-xfer.x86_64-latest.a= rgs +++ b/tests/qemuxml2argvdata/graphics-spice-agent-file-xfer.x86_64-latest.a= rgs @@ -26,7 +26,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -no-acpi \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --audiodev id=3Daudio1,driver=3Dspice \ +-audiodev '{"id":"audio1","driver":"spice"}' \ -spice port=3D5903,tls-port=3D5904,addr=3D127.0.0.1,x509-dir=3D/etc/pki/li= bvirt-spice,tls-channel=3Dmain,plaintext-channel=3Dinputs,disable-agent-fil= e-xfer=3Don,seamless-migration=3Don \ -device '{"driver":"qxl-vga","id":"video0","ram_size":67108864,"vram_size"= :33554432,"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":0,"vgamem_mb":16,"max_outputs":1,"bus":"pci.0","addr= ":"0x4"}' \ diff --git a/tests/qemuxml2argvdata/graphics-spice-agentmouse.x86_64-latest= .args b/tests/qemuxml2argvdata/graphics-spice-agentmouse.x86_64-latest.args index 44d401da5b..31f42b8657 100644 --- a/tests/qemuxml2argvdata/graphics-spice-agentmouse.x86_64-latest.args +++ b/tests/qemuxml2argvdata/graphics-spice-agentmouse.x86_64-latest.args @@ -29,7 +29,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -device '{"driver":"virtio-serial-pci","id":"virtio-serial1","bus":"pci.0"= ,"addr":"0xa"}' \ -chardev spicevmc,id=3Dcharchannel0,name=3Dvdagent \ -device '{"driver":"virtserialport","bus":"virtio-serial1.0","nr":3,"chard= ev":"charchannel0","id":"channel0","name":"com.redhat.spice.0"}' \ --audiodev id=3Daudio1,driver=3Dspice \ +-audiodev '{"id":"audio1","driver":"spice"}' \ -spice port=3D5903,tls-port=3D5904,addr=3D127.0.0.1,agent-mouse=3Doff,x509= -dir=3D/etc/pki/libvirt-spice,tls-channel=3Dmain,seamless-migration=3Don \ -device '{"driver":"cirrus-vga","id":"video0","bus":"pci.0","addr":"0x2"}'= \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x3"}' \ diff --git a/tests/qemuxml2argvdata/graphics-spice-auto-socket-cfg.x86_64-l= atest.args b/tests/qemuxml2argvdata/graphics-spice-auto-socket-cfg.x86_64-l= atest.args index 8cb5ffa4c3..c33a42bd78 100644 --- a/tests/qemuxml2argvdata/graphics-spice-auto-socket-cfg.x86_64-latest.a= rgs +++ b/tests/qemuxml2argvdata/graphics-spice-auto-socket-cfg.x86_64-latest.a= rgs @@ -26,7 +26,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -no-acpi \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --audiodev id=3Daudio1,driver=3Dspice \ +-audiodev '{"id":"audio1","driver":"spice"}' \ -spice unix,addr=3D/tmp/lib/domain--1-QEMUGuest1/spice.sock,seamless-migra= tion=3Don \ -device '{"driver":"cirrus-vga","id":"video0","bus":"pci.0","addr":"0x2"}'= \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ diff --git a/tests/qemuxml2argvdata/graphics-spice-auto-socket.x86_64-lates= t.args b/tests/qemuxml2argvdata/graphics-spice-auto-socket.x86_64-latest.ar= gs index 8cb5ffa4c3..c33a42bd78 100644 --- a/tests/qemuxml2argvdata/graphics-spice-auto-socket.x86_64-latest.args +++ b/tests/qemuxml2argvdata/graphics-spice-auto-socket.x86_64-latest.args @@ -26,7 +26,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -no-acpi \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --audiodev id=3Daudio1,driver=3Dspice \ +-audiodev '{"id":"audio1","driver":"spice"}' \ -spice unix,addr=3D/tmp/lib/domain--1-QEMUGuest1/spice.sock,seamless-migra= tion=3Don \ -device '{"driver":"cirrus-vga","id":"video0","bus":"pci.0","addr":"0x2"}'= \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ diff --git a/tests/qemuxml2argvdata/graphics-spice-compression.x86_64-lates= t.args b/tests/qemuxml2argvdata/graphics-spice-compression.x86_64-latest.ar= gs index a73d882164..fb38c07a6e 100644 --- a/tests/qemuxml2argvdata/graphics-spice-compression.x86_64-latest.args +++ b/tests/qemuxml2argvdata/graphics-spice-compression.x86_64-latest.args @@ -26,7 +26,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -no-acpi \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --audiodev id=3Daudio1,driver=3Dspice \ +-audiodev '{"id":"audio1","driver":"spice"}' \ -spice port=3D5903,tls-port=3D5904,addr=3D127.0.0.1,x509-dir=3D/etc/pki/li= bvirt-spice,image-compression=3Dauto_glz,jpeg-wan-compression=3Dauto,zlib-g= lz-wan-compression=3Dauto,playback-compression=3Don,streaming-video=3Dfilte= r,seamless-migration=3Don \ -device '{"driver":"qxl-vga","id":"video0","ram_size":67108864,"vram_size"= :33554432,"vram64_size_mb":0,"vgamem_mb":8,"max_outputs":1,"bus":"pci.0","a= ddr":"0x2"}' \ -device '{"driver":"qxl","id":"video1","ram_size":67108864,"vram_size":335= 54432,"vram64_size_mb":0,"vgamem_mb":8,"max_outputs":1,"bus":"pci.0","addr"= :"0x4"}' \ diff --git a/tests/qemuxml2argvdata/graphics-spice-egl-headless.x86_64-late= st.args b/tests/qemuxml2argvdata/graphics-spice-egl-headless.x86_64-latest.= args index 74f39e9e10..4b9cc3c6b7 100644 --- a/tests/qemuxml2argvdata/graphics-spice-egl-headless.x86_64-latest.args +++ b/tests/qemuxml2argvdata/graphics-spice-egl-headless.x86_64-latest.args @@ -26,7 +26,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -no-acpi \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --audiodev id=3Daudio1,driver=3Dspice \ +-audiodev '{"id":"audio1","driver":"spice"}' \ -spice port=3D5903,addr=3D127.0.0.1,seamless-migration=3Don \ -display egl-headless,rendernode=3D/dev/dri/foo \ -device '{"driver":"qxl-vga","id":"video0","ram_size":67108864,"vram_size"= :33554432,"vram64_size_mb":0,"vgamem_mb":8,"max_outputs":1,"bus":"pci.0","a= ddr":"0x2"}' \ 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 b4404eb70b..bacedb3aea 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 @@ -26,7 +26,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -no-acpi \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --audiodev id=3Daudio1,driver=3Dspice \ +-audiodev '{"id":"audio1","driver":"spice"}' \ -spice port=3D0,gl=3Don,rendernode=3D/dev/dri/foo,seamless-migration=3Don \ -device '{"driver":"cirrus-vga","id":"video0","bus":"pci.0","addr":"0x2"}'= \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x3"}' \ diff --git a/tests/qemuxml2argvdata/graphics-spice-no-args.x86_64-latest.ar= gs b/tests/qemuxml2argvdata/graphics-spice-no-args.x86_64-latest.args index 19e18162fc..cfe6f4577e 100644 --- a/tests/qemuxml2argvdata/graphics-spice-no-args.x86_64-latest.args +++ b/tests/qemuxml2argvdata/graphics-spice-no-args.x86_64-latest.args @@ -26,7 +26,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -no-acpi \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --audiodev id=3Daudio1,driver=3Dspice \ +-audiodev '{"id":"audio1","driver":"spice"}' \ -spice port=3D0,seamless-migration=3Don \ -device '{"driver":"cirrus-vga","id":"video0","bus":"pci.0","addr":"0x2"}'= \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x3"}' \ diff --git a/tests/qemuxml2argvdata/graphics-spice-qxl-vga.x86_64-latest.ar= gs b/tests/qemuxml2argvdata/graphics-spice-qxl-vga.x86_64-latest.args index 8503eb36cb..f9a6aa38eb 100644 --- a/tests/qemuxml2argvdata/graphics-spice-qxl-vga.x86_64-latest.args +++ b/tests/qemuxml2argvdata/graphics-spice-qxl-vga.x86_64-latest.args @@ -26,7 +26,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -no-acpi \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --audiodev id=3Daudio1,driver=3Dspice \ +-audiodev '{"id":"audio1","driver":"spice"}' \ -spice port=3D5903,tls-port=3D5904,addr=3D127.0.0.1,x509-dir=3D/etc/pki/li= bvirt-spice,tls-channel=3Dmain,plaintext-channel=3Dinputs,seamless-migratio= n=3Don \ -device '{"driver":"qxl-vga","id":"video0","ram_size":67108864,"vram_size"= :33554432,"vram64_size_mb":0,"vgamem_mb":8,"max_outputs":1,"bus":"pci.0","a= ddr":"0x2"}' \ -device '{"driver":"qxl","id":"video1","ram_size":67108864,"vram_size":671= 08864,"vram64_size_mb":0,"vgamem_mb":8,"max_outputs":1,"bus":"pci.0","addr"= :"0x4"}' \ diff --git a/tests/qemuxml2argvdata/graphics-spice-sasl.x86_64-latest.args = b/tests/qemuxml2argvdata/graphics-spice-sasl.x86_64-latest.args index 78dc8d3c8d..611dbfad52 100644 --- a/tests/qemuxml2argvdata/graphics-spice-sasl.x86_64-latest.args +++ b/tests/qemuxml2argvdata/graphics-spice-sasl.x86_64-latest.args @@ -27,7 +27,7 @@ SASL_CONF_PATH=3D/root/.sasl2 \ -no-acpi \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --audiodev id=3Daudio1,driver=3Dspice \ +-audiodev '{"id":"audio1","driver":"spice"}' \ -spice port=3D5903,tls-port=3D5904,addr=3D127.0.0.1,sasl=3Don,x509-dir=3D/= etc/pki/libvirt-spice,tls-channel=3Ddefault,seamless-migration=3Don \ -device '{"driver":"qxl-vga","id":"video0","ram_size":67108864,"vram_size"= :33554432,"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":"0x3"}' \ diff --git a/tests/qemuxml2argvdata/graphics-spice-socket.x86_64-latest.arg= s b/tests/qemuxml2argvdata/graphics-spice-socket.x86_64-latest.args index 4f04e1e86f..83770704ac 100644 --- a/tests/qemuxml2argvdata/graphics-spice-socket.x86_64-latest.args +++ b/tests/qemuxml2argvdata/graphics-spice-socket.x86_64-latest.args @@ -26,7 +26,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -no-acpi \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --audiodev id=3Daudio1,driver=3Dspice \ +-audiodev '{"id":"audio1","driver":"spice"}' \ -spice unix,addr=3D/tmp/spice.sock,seamless-migration=3Don \ -device '{"driver":"cirrus-vga","id":"video0","bus":"pci.0","addr":"0x2"}'= \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ diff --git a/tests/qemuxml2argvdata/graphics-spice-timeout.x86_64-latest.ar= gs b/tests/qemuxml2argvdata/graphics-spice-timeout.x86_64-latest.args index 3a97fefc99..538bff2583 100644 --- a/tests/qemuxml2argvdata/graphics-spice-timeout.x86_64-latest.args +++ b/tests/qemuxml2argvdata/graphics-spice-timeout.x86_64-latest.args @@ -29,7 +29,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-f14/.config \ -netdev tap,fd=3D3,id=3Dhostnet0 \ -device '{"driver":"rtl8139","netdev":"hostnet0","id":"net0","mac":"52:54:= 00:71:70:89","bus":"pci.0","addr":"0x7"}' \ -device '{"driver":"usb-tablet","id":"input0","bus":"usb.0","port":"1"}' \ --audiodev id=3Daudio1,driver=3Dspice \ +-audiodev '{"id":"audio1","driver":"spice"}' \ -spice port=3D5900,addr=3D127.0.0.1,seamless-migration=3Don \ -device '{"driver":"VGA","id":"video0","vgamem_mb":16,"bus":"pci.0","addr"= :"0x2"}' \ -device '{"driver":"AC97","id":"sound0","audiodev":"audio1","bus":"pci.0",= "addr":"0x3"}' \ diff --git a/tests/qemuxml2argvdata/graphics-spice-usb-redir.x86_64-latest.= args b/tests/qemuxml2argvdata/graphics-spice-usb-redir.x86_64-latest.args index 32e555a129..5377297e85 100644 --- a/tests/qemuxml2argvdata/graphics-spice-usb-redir.x86_64-latest.args +++ b/tests/qemuxml2argvdata/graphics-spice-usb-redir.x86_64-latest.args @@ -29,7 +29,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -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=3Dspice \ +-audiodev '{"id":"audio1","driver":"spice"}' \ -spice port=3D5903,tls-port=3D5904,addr=3D127.0.0.1,x509-dir=3D/etc/pki/li= bvirt-spice,tls-channel=3Dmain,plaintext-channel=3Dinputs,tls-channel=3Dusb= redir,image-compression=3Dauto_glz,jpeg-wan-compression=3Dauto,zlib-glz-wan= -compression=3Dauto,playback-compression=3Don,streaming-video=3Dfilter,disa= ble-copy-paste=3Don,seamless-migration=3Don \ -device '{"driver":"cirrus-vga","id":"video0","bus":"pci.0","addr":"0x2"}'= \ -chardev socket,id=3Dcharredir0,host=3Dlocalhost,port=3D4000 \ diff --git a/tests/qemuxml2argvdata/graphics-spice.x86_64-latest.args b/tes= ts/qemuxml2argvdata/graphics-spice.x86_64-latest.args index 58355bd0af..3a44adbe62 100644 --- a/tests/qemuxml2argvdata/graphics-spice.x86_64-latest.args +++ b/tests/qemuxml2argvdata/graphics-spice.x86_64-latest.args @@ -26,7 +26,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -no-acpi \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --audiodev id=3Daudio1,driver=3Dspice \ +-audiodev '{"id":"audio1","driver":"spice"}' \ -spice port=3D5903,tls-port=3D5904,addr=3D127.0.0.1,x509-dir=3D/etc/pki/li= bvirt-spice,tls-channel=3Ddefault,tls-channel=3Dmain,plaintext-channel=3Din= puts,image-compression=3Dauto_glz,jpeg-wan-compression=3Dauto,zlib-glz-wan-= compression=3Dauto,playback-compression=3Don,streaming-video=3Dfilter,disab= le-copy-paste=3Don,disable-agent-file-xfer=3Don,seamless-migration=3Don \ -device '{"driver":"qxl-vga","id":"video0","ram_size":67108864,"vram_size"= :33554432,"vram64_size_mb":0,"vgamem_mb":8,"max_outputs":1,"bus":"pci.0","a= ddr":"0x2"}' \ -device '{"driver":"qxl","id":"video1","ram_size":67108864,"vram_size":335= 54432,"vram64_size_mb":0,"vgamem_mb":8,"max_outputs":1,"bus":"pci.0","addr"= :"0x4"}' \ 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 81ed944499..f73ead0dcc 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 @@ -29,7 +29,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ -device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ --audiodev id=3Daudio1,driver=3Dnone \ +-audiodev '{"id":"audio1","driver":"none"}' \ -vnc vnc=3Dunix:/tmp/lib/domain--1-QEMUGuest1/vnc.sock,audiodev=3Daudio1 \ -device '{"driver":"cirrus-vga","id":"video0","bus":"pci.0","addr":"0x2"}'= \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ 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 036469af15..2d570fcdd7 100644 --- a/tests/qemuxml2argvdata/graphics-vnc-auto-socket.x86_64-latest.args +++ b/tests/qemuxml2argvdata/graphics-vnc-auto-socket.x86_64-latest.args @@ -26,7 +26,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -no-acpi \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --audiodev id=3Daudio1,driver=3Dnone \ +-audiodev '{"id":"audio1","driver":"none"}' \ -vnc vnc=3Dunix:/tmp/lib/domain--1-QEMUGuest1/vnc.sock,audiodev=3Daudio1 \ -device '{"driver":"cirrus-vga","id":"video0","bus":"pci.0","addr":"0x2"}'= \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ 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 8c03254a9f..f53e577c24 100644 --- a/tests/qemuxml2argvdata/graphics-vnc-egl-headless.x86_64-latest.args +++ b/tests/qemuxml2argvdata/graphics-vnc-egl-headless.x86_64-latest.args @@ -29,7 +29,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ -device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ --audiodev id=3Daudio1,driver=3Dnone \ +-audiodev '{"id":"audio1","driver":"none"}' \ -vnc '[2001:1:2:3:4:5:1234:1234]:3,audiodev=3Daudio1' \ -display egl-headless,rendernode=3D/dev/dri/foo \ -device '{"driver":"cirrus-vga","id":"video0","bus":"pci.0","addr":"0x2"}'= \ 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 94848500f8..d28dcaafad 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 @@ -29,7 +29,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ -device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ --audiodev id=3Daudio1,driver=3Dnone \ +-audiodev '{"id":"audio1","driver":"none"}' \ -vnc '[2001:1:2:3:4:5:1234:1234]:3,audiodev=3Daudio1' \ -device '{"driver":"cirrus-vga","id":"video0","bus":"pci.0","addr":"0x2"}'= \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ diff --git a/tests/qemuxml2argvdata/graphics-vnc-none.x86_64-latest.args b/= tests/qemuxml2argvdata/graphics-vnc-none.x86_64-latest.args index ecd928c727..1c3736d78c 100644 --- a/tests/qemuxml2argvdata/graphics-vnc-none.x86_64-latest.args +++ b/tests/qemuxml2argvdata/graphics-vnc-none.x86_64-latest.args @@ -26,7 +26,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -no-acpi \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --audiodev id=3Daudio1,driver=3Dnone \ +-audiodev '{"id":"audio1","driver":"none"}' \ -vnc none,audiodev=3Daudio1 \ -device '{"driver":"cirrus-vga","id":"video0","bus":"pci.0","addr":"0x2"}'= \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ diff --git a/tests/qemuxml2argvdata/graphics-vnc-policy.x86_64-latest.args = b/tests/qemuxml2argvdata/graphics-vnc-policy.x86_64-latest.args index fef983571c..4fe684b404 100644 --- a/tests/qemuxml2argvdata/graphics-vnc-policy.x86_64-latest.args +++ b/tests/qemuxml2argvdata/graphics-vnc-policy.x86_64-latest.args @@ -29,7 +29,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ -device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ --audiodev id=3Daudio1,driver=3Dnone \ +-audiodev '{"id":"audio1","driver":"none"}' \ -vnc '[::]:59630,share=3Dallow-exclusive,audiodev=3Daudio1' \ -device '{"driver":"cirrus-vga","id":"video0","bus":"pci.0","addr":"0x2"}'= \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ diff --git a/tests/qemuxml2argvdata/graphics-vnc-power.x86_64-latest.args b= /tests/qemuxml2argvdata/graphics-vnc-power.x86_64-latest.args index 24ceb9a7ab..b5d2df64aa 100644 --- a/tests/qemuxml2argvdata/graphics-vnc-power.x86_64-latest.args +++ b/tests/qemuxml2argvdata/graphics-vnc-power.x86_64-latest.args @@ -29,7 +29,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ -device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ --audiodev id=3Daudio1,driver=3Dnone \ +-audiodev '{"id":"audio1","driver":"none"}' \ -vnc '[::]:59630,power-control=3Don,audiodev=3Daudio1' \ -device '{"driver":"cirrus-vga","id":"video0","bus":"pci.0","addr":"0x2"}'= \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ 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 06477d5ece..fd65334cc8 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 @@ -29,7 +29,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ -device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ --audiodev id=3Daudio1,driver=3Dnone \ +-audiodev '{"id":"audio1","driver":"none"}' \ -vnc 127.0.0.1:0,audiodev=3Daudio1 \ -device '{"driver":"cirrus-vga","id":"video0","bus":"pci.0","addr":"0x2"}'= \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ diff --git a/tests/qemuxml2argvdata/graphics-vnc-sasl.x86_64-latest.args b/= tests/qemuxml2argvdata/graphics-vnc-sasl.x86_64-latest.args index d687ae0e0a..70fa61d167 100644 --- a/tests/qemuxml2argvdata/graphics-vnc-sasl.x86_64-latest.args +++ b/tests/qemuxml2argvdata/graphics-vnc-sasl.x86_64-latest.args @@ -30,7 +30,7 @@ SASL_CONF_PATH=3D/root/.sasl2 \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ -device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ --audiodev id=3Daudio1,driver=3Dnone \ +-audiodev '{"id":"audio1","driver":"none"}' \ -vnc 127.0.0.1:3,sasl=3Don,audiodev=3Daudio1 \ -device '{"driver":"cirrus-vga","id":"video0","bus":"pci.0","addr":"0x2"}'= \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ 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 9b7d0aff9e..92fb6d6527 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 @@ -26,7 +26,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -no-acpi \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --audiodev id=3Daudio1,driver=3Dnone \ +-audiodev '{"id":"audio1","driver":"none"}' \ -vnc vnc=3Dunix:/tmp/foo=3Dbar.sock,audiodev=3Daudio1 \ -device '{"driver":"cirrus-vga","id":"video0","bus":"pci.0","addr":"0x2"}'= \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ diff --git a/tests/qemuxml2argvdata/graphics-vnc-socket.x86_64-latest.args = b/tests/qemuxml2argvdata/graphics-vnc-socket.x86_64-latest.args index 40dc3a1770..87d9780d19 100644 --- a/tests/qemuxml2argvdata/graphics-vnc-socket.x86_64-latest.args +++ b/tests/qemuxml2argvdata/graphics-vnc-socket.x86_64-latest.args @@ -26,7 +26,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -no-acpi \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --audiodev id=3Daudio1,driver=3Dnone \ +-audiodev '{"id":"audio1","driver":"none"}' \ -vnc vnc=3Dunix:/tmp/vnc.sock,audiodev=3Daudio1 \ -device '{"driver":"cirrus-vga","id":"video0","bus":"pci.0","addr":"0x2"}'= \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ diff --git a/tests/qemuxml2argvdata/graphics-vnc-tls-secret.x86_64-5.2.0.ar= gs b/tests/qemuxml2argvdata/graphics-vnc-tls-secret.x86_64-5.2.0.args index d5208f5e14..42c4a3f84b 100644 --- a/tests/qemuxml2argvdata/graphics-vnc-tls-secret.x86_64-5.2.0.args +++ b/tests/qemuxml2argvdata/graphics-vnc-tls-secret.x86_64-5.2.0.args @@ -27,7 +27,7 @@ SASL_CONF_PATH=3D/root/.sasl2 \ -no-acpi \ -boot strict=3Don \ -device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ --audiodev id=3Daudio1,driver=3Dnone \ +-audiodev '{"id":"audio1","driver":"none"}' \ -object secret,id=3Dvnc-tls-creds0-secret0,data=3D9eao5F8qtkGt+seB1HYivWIx= btwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1,keyid=3DmasterKey0,iv=3DAAECAwQFBg= cICQoLDA0ODw=3D=3D,format=3Dbase64 \ -object tls-creds-x509,id=3Dvnc-tls-creds0,dir=3D/etc/pki/libvirt-vnc,endp= oint=3Dserver,verify-peer=3Don,passwordid=3Dvnc-tls-creds0-secret0 \ -vnc 127.0.0.1:3,tls-creds=3Dvnc-tls-creds0,sasl=3Don,audiodev=3Daudio1 \ 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 150ee86763..b2efa5252f 100644 --- a/tests/qemuxml2argvdata/graphics-vnc-tls-secret.x86_64-latest.args +++ b/tests/qemuxml2argvdata/graphics-vnc-tls-secret.x86_64-latest.args @@ -27,7 +27,7 @@ SASL_CONF_PATH=3D/root/.sasl2 \ -no-acpi \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --audiodev id=3Daudio1,driver=3Dnone \ +-audiodev '{"id":"audio1","driver":"none"}' \ -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 \ diff --git a/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-latest.args b/t= ests/qemuxml2argvdata/graphics-vnc-tls.x86_64-latest.args index 99dc77e23f..622f6538b4 100644 --- a/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-latest.args +++ b/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-latest.args @@ -27,7 +27,7 @@ SASL_CONF_PATH=3D/root/.sasl2 \ -no-acpi \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --audiodev id=3Daudio1,driver=3Dnone \ +-audiodev '{"id":"audio1","driver":"none"}' \ -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 '{"driver":"cirrus-vga","id":"video0","bus":"pci.0","addr":"0x2"}'= \ diff --git a/tests/qemuxml2argvdata/graphics-vnc-websocket.x86_64-latest.ar= gs b/tests/qemuxml2argvdata/graphics-vnc-websocket.x86_64-latest.args index 458634ead0..fac799e142 100644 --- a/tests/qemuxml2argvdata/graphics-vnc-websocket.x86_64-latest.args +++ b/tests/qemuxml2argvdata/graphics-vnc-websocket.x86_64-latest.args @@ -26,7 +26,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -no-acpi \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --audiodev id=3Daudio1,driver=3Dnone \ +-audiodev '{"id":"audio1","driver":"none"}' \ -vnc 127.0.0.1:0,websocket=3D5700,audiodev=3Daudio1 \ -device '{"driver":"cirrus-vga","id":"video0","bus":"pci.0","addr":"0x2"}'= \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ diff --git a/tests/qemuxml2argvdata/graphics-vnc.x86_64-latest.args b/tests= /qemuxml2argvdata/graphics-vnc.x86_64-latest.args index 94848500f8..d28dcaafad 100644 --- a/tests/qemuxml2argvdata/graphics-vnc.x86_64-latest.args +++ b/tests/qemuxml2argvdata/graphics-vnc.x86_64-latest.args @@ -29,7 +29,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ -device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ --audiodev id=3Daudio1,driver=3Dnone \ +-audiodev '{"id":"audio1","driver":"none"}' \ -vnc '[2001:1:2:3:4:5:1234:1234]:3,audiodev=3Daudio1' \ -device '{"driver":"cirrus-vga","id":"video0","bus":"pci.0","addr":"0x2"}'= \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ 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 c47a7dea2d..7ab67b3029 100644 --- a/tests/qemuxml2argvdata/hostdev-mdev-display-ramfb.x86_64-latest.args +++ b/tests/qemuxml2argvdata/hostdev-mdev-display-ramfb.x86_64-latest.args @@ -26,7 +26,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest2/.config \ -no-acpi \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --audiodev id=3Daudio1,driver=3Dnone \ +-audiodev '{"id":"audio1","driver":"none"}' \ -vnc 127.0.0.1:0,audiodev=3Daudio1 \ -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"}' \ 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 c659ad10e1..069c3e54c7 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 @@ -26,7 +26,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest2/.config \ -no-acpi \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --audiodev id=3Daudio1,driver=3Dspice \ +-audiodev '{"id":"audio1","driver":"spice"}' \ -spice port=3D0,seamless-migration=3Don \ -display egl-headless,rendernode=3D/dev/dri/foo \ -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"}' \ 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 43d1ab2f2b..0936edc4e4 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 @@ -26,7 +26,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest2/.config \ -no-acpi \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --audiodev id=3Daudio1,driver=3Dspice \ +-audiodev '{"id":"audio1","driver":"spice"}' \ -spice port=3D0,gl=3Don,rendernode=3D/dev/dri/foo,seamless-migration=3Don \ -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"}' \ 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 90e2d7ffae..34dacfedb3 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 @@ -26,7 +26,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest2/.config \ -no-acpi \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --audiodev id=3Daudio1,driver=3Dnone \ +-audiodev '{"id":"audio1","driver":"none"}' \ -vnc 127.0.0.1:0,audiodev=3Daudio1 \ -display egl-headless,rendernode=3D/dev/dri/foo \ -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"}' \ 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 9911c79452..a3485e0d8b 100644 --- a/tests/qemuxml2argvdata/hostdev-mdev-display-vnc.x86_64-latest.args +++ b/tests/qemuxml2argvdata/hostdev-mdev-display-vnc.x86_64-latest.args @@ -26,7 +26,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest2/.config \ -no-acpi \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --audiodev id=3Daudio1,driver=3Dnone \ +-audiodev '{"id":"audio1","driver":"none"}' \ -vnc 127.0.0.1:0,audiodev=3Daudio1 \ -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"}' \ diff --git a/tests/qemuxml2argvdata/hostdev-scsi-lsi.x86_64-latest.args b/t= ests/qemuxml2argvdata/hostdev-scsi-lsi.x86_64-latest.args index 347940df86..9421b714eb 100644 --- a/tests/qemuxml2argvdata/hostdev-scsi-lsi.x86_64-latest.args +++ b/tests/qemuxml2argvdata/hostdev-scsi-lsi.x86_64-latest.args @@ -31,7 +31,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest2/.config \ -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 '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ --audiodev id=3Daudio1,driver=3Dnone \ +-audiodev '{"id":"audio1","driver":"none"}' \ -blockdev '{"driver":"host_device","filename":"/dev/sg0","node-name":"libv= irt-2-backend","read-only":false}' \ -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}' \ 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 e51cc0cd77..b36b1438ac 100644 --- a/tests/qemuxml2argvdata/hostdev-scsi-virtio-scsi.x86_64-latest.args +++ b/tests/qemuxml2argvdata/hostdev-scsi-virtio-scsi.x86_64-latest.args @@ -31,7 +31,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest2/.config \ -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 '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ --audiodev id=3Daudio1,driver=3Dnone \ +-audiodev '{"id":"audio1","driver":"none"}' \ -blockdev '{"driver":"host_device","filename":"/dev/sg0","node-name":"libv= irt-2-backend","read-only":false}' \ -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}' \ diff --git a/tests/qemuxml2argvdata/hostdev-subsys-mdev-vfio-ap.s390x-lates= t.args b/tests/qemuxml2argvdata/hostdev-subsys-mdev-vfio-ap.s390x-latest.ar= gs index 7300a4bd07..bbaf72f3b9 100644 --- a/tests/qemuxml2argvdata/hostdev-subsys-mdev-vfio-ap.s390x-latest.args +++ b/tests/qemuxml2argvdata/hostdev-subsys-mdev-vfio-ap.s390x-latest.args @@ -25,7 +25,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -rtc base=3Dutc \ -no-shutdown \ -boot strict=3Don \ --audiodev id=3Daudio1,driver=3Dnone \ +-audiodev '{"id":"audio1","driver":"none"}' \ -device vfio-ap,id=3Dhostdev0,sysfsdev=3D/sys/bus/mdev/devices/90c6c135-ad= 44-41d0-b1b7-bae47de48627 \ -device virtio-balloon-ccw,id=3Dballoon0,devno=3Dfe.0.0000 \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ diff --git a/tests/qemuxml2argvdata/hostdev-subsys-mdev-vfio-ccw-boot.s390x= -latest.args b/tests/qemuxml2argvdata/hostdev-subsys-mdev-vfio-ccw-boot.s39= 0x-latest.args index ca90ef6c55..c8eeb70a62 100644 --- a/tests/qemuxml2argvdata/hostdev-subsys-mdev-vfio-ccw-boot.s390x-latest= .args +++ b/tests/qemuxml2argvdata/hostdev-subsys-mdev-vfio-ccw-boot.s390x-latest= .args @@ -25,7 +25,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -rtc base=3Dutc \ -no-shutdown \ -boot strict=3Don \ --audiodev id=3Daudio1,driver=3Dnone \ +-audiodev '{"id":"audio1","driver":"none"}' \ -device vfio-ccw,id=3Dhostdev0,sysfsdev=3D/sys/bus/mdev/devices/90c6c135-a= d44-41d0-b1b7-bae47de48627,bootindex=3D1,devno=3Dfe.0.0000 \ -device virtio-balloon-ccw,id=3Dballoon0,devno=3Dfe.0.0001 \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ diff --git a/tests/qemuxml2argvdata/hugepages-memaccess3.x86_64-latest.args= b/tests/qemuxml2argvdata/hugepages-memaccess3.x86_64-latest.args index 1ddf8536f5..db70baf028 100644 --- a/tests/qemuxml2argvdata/hugepages-memaccess3.x86_64-latest.args +++ b/tests/qemuxml2argvdata/hugepages-memaccess3.x86_64-latest.args @@ -27,6 +27,6 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-fedora/.config \ -no-acpi \ -boot menu=3Don,strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --audiodev id=3Daudio1,driver=3Dnone \ +-audiodev '{"id":"audio1","driver":"none"}' \ -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 94eea13977..8ad4fa7c39 100644 --- a/tests/qemuxml2argvdata/hugepages-nvdimm.x86_64-latest.args +++ b/tests/qemuxml2argvdata/hugepages-nvdimm.x86_64-latest.args @@ -30,6 +30,6 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -no-acpi \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --audiodev id=3Daudio1,driver=3Dnone \ +-audiodev '{"id":"audio1","driver":"none"}' \ -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 283c4930c0..d258ea8710 100644 --- a/tests/qemuxml2argvdata/hyperv-off.x86_64-latest.args +++ b/tests/qemuxml2argvdata/hyperv-off.x86_64-latest.args @@ -26,7 +26,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -no-shutdown \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --audiodev id=3Daudio1,driver=3Dnone \ +-audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/hyperv-panic.x86_64-latest.args b/tests= /qemuxml2argvdata/hyperv-panic.x86_64-latest.args index 70059fdf57..a3545a577b 100644 --- a/tests/qemuxml2argvdata/hyperv-panic.x86_64-latest.args +++ b/tests/qemuxml2argvdata/hyperv-panic.x86_64-latest.args @@ -26,6 +26,6 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -no-shutdown \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --audiodev id=3Daudio1,driver=3Dnone \ +-audiodev '{"id":"audio1","driver":"none"}' \ -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 64a343cf79..7279d19007 100644 --- a/tests/qemuxml2argvdata/hyperv-stimer-direct.x86_64-latest.args +++ b/tests/qemuxml2argvdata/hyperv-stimer-direct.x86_64-latest.args @@ -26,6 +26,6 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -no-shutdown \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --audiodev id=3Daudio1,driver=3Dnone \ +-audiodev '{"id":"audio1","driver":"none"}' \ -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 ea8fea0b96..99b791bf41 100644 --- a/tests/qemuxml2argvdata/hyperv.x86_64-latest.args +++ b/tests/qemuxml2argvdata/hyperv.x86_64-latest.args @@ -26,6 +26,6 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -no-shutdown \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --audiodev id=3Daudio1,driver=3Dnone \ +-audiodev '{"id":"audio1","driver":"none"}' \ -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 98f534750c..de4db47e6d 100644 --- a/tests/qemuxml2argvdata/input-linux.x86_64-latest.args +++ b/tests/qemuxml2argvdata/input-linux.x86_64-latest.args @@ -28,7 +28,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ -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 \ +-audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -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 081c9e46be..b45f94a40c 100644 --- a/tests/qemuxml2argvdata/intel-iommu-aw-bits.x86_64-latest.args +++ b/tests/qemuxml2argvdata/intel-iommu-aw-bits.x86_64-latest.args @@ -27,6 +27,6 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -no-acpi \ -boot strict=3Don \ -device '{"driver":"intel-iommu","intremap":"on","aw-bits":48}' \ --audiodev id=3Daudio1,driver=3Dnone \ +-audiodev '{"id":"audio1","driver":"none"}' \ -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 9a4d11e03c..c5a2c995d5 100644 --- a/tests/qemuxml2argvdata/intel-iommu-caching-mode.x86_64-latest.args +++ b/tests/qemuxml2argvdata/intel-iommu-caching-mode.x86_64-latest.args @@ -27,6 +27,6 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -no-acpi \ -boot strict=3Don \ -device '{"driver":"intel-iommu","intremap":"on","caching-mode":true}' \ --audiodev id=3Daudio1,driver=3Dnone \ +-audiodev '{"id":"audio1","driver":"none"}' \ -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 eeecbb67b5..b138ff2dc5 100644 --- a/tests/qemuxml2argvdata/intel-iommu-device-iotlb.x86_64-latest.args +++ b/tests/qemuxml2argvdata/intel-iommu-device-iotlb.x86_64-latest.args @@ -27,6 +27,6 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -no-acpi \ -boot strict=3Don \ -device '{"driver":"intel-iommu","intremap":"on","device-iotlb":true}' \ --audiodev id=3Daudio1,driver=3Dnone \ +-audiodev '{"id":"audio1","driver":"none"}' \ -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 5dd52f10bc..6068549126 100644 --- a/tests/qemuxml2argvdata/intel-iommu-eim.x86_64-latest.args +++ b/tests/qemuxml2argvdata/intel-iommu-eim.x86_64-latest.args @@ -27,6 +27,6 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -no-acpi \ -boot strict=3Don \ -device '{"driver":"intel-iommu","intremap":"on","eim":"on"}' \ --audiodev id=3Daudio1,driver=3Dnone \ +-audiodev '{"id":"audio1","driver":"none"}' \ -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 bea1b72f24..dcff51f375 100644 --- a/tests/qemuxml2argvdata/intel-iommu.x86_64-latest.args +++ b/tests/qemuxml2argvdata/intel-iommu.x86_64-latest.args @@ -27,6 +27,6 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -no-acpi \ -boot strict=3Don \ -device '{"driver":"intel-iommu"}' \ --audiodev id=3Daudio1,driver=3Dnone \ +-audiodev '{"id":"audio1","driver":"none"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/iommu-smmuv3.aarch64-latest.args b/test= s/qemuxml2argvdata/iommu-smmuv3.aarch64-latest.args index 2208523c84..709339dc69 100644 --- a/tests/qemuxml2argvdata/iommu-smmuv3.aarch64-latest.args +++ b/tests/qemuxml2argvdata/iommu-smmuv3.aarch64-latest.args @@ -26,6 +26,6 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-guest/.config \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --audiodev id=3Daudio1,driver=3Dnone \ +-audiodev '{"id":"audio1","driver":"none"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/iothreads-virtio-scsi-ccw.s390x-latest.= args b/tests/qemuxml2argvdata/iothreads-virtio-scsi-ccw.s390x-latest.args index 4d35ed57bd..3ab66bc991 100644 --- a/tests/qemuxml2argvdata/iothreads-virtio-scsi-ccw.s390x-latest.args +++ b/tests/qemuxml2argvdata/iothreads-virtio-scsi-ccw.s390x-latest.args @@ -34,7 +34,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -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=3D2,lun=3D0,device_id=3D= drive-scsi0-0-2-0,drive=3Dlibvirt-1-format,id=3Dscsi0-0-2-0 \ --audiodev id=3Daudio1,driver=3Dnone \ +-audiodev '{"id":"audio1","driver":"none"}' \ -device virtio-balloon-ccw,id=3Dballoon0,devno=3Dfe.0.000a \ -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-5.2.0.= args b/tests/qemuxml2argvdata/iothreads-virtio-scsi-pci.x86_64-5.2.0.args index d2da8066c2..274a5fc75f 100644 --- a/tests/qemuxml2argvdata/iothreads-virtio-scsi-pci.x86_64-5.2.0.args +++ b/tests/qemuxml2argvdata/iothreads-virtio-scsi-pci.x86_64-5.2.0.args @@ -39,6 +39,6 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -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 \ --audiodev id=3Daudio1,driver=3Dnone \ +-audiodev '{"id":"audio1","driver":"none"}' \ -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 94963bd7a4..256288dda3 100644 --- a/tests/qemuxml2argvdata/iothreads-virtio-scsi-pci.x86_64-latest.args +++ b/tests/qemuxml2argvdata/iothreads-virtio-scsi-pci.x86_64-latest.args @@ -39,6 +39,6 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -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 '{"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 \ +-audiodev '{"id":"audio1","driver":"none"}' \ -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 764a22d0d4..ddeaca2a50 100644 --- a/tests/qemuxml2argvdata/kvmclock+eoi-disabled.x86_64-latest.args +++ b/tests/qemuxml2argvdata/kvmclock+eoi-disabled.x86_64-latest.args @@ -26,7 +26,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -no-shutdown \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --audiodev id=3Daudio1,driver=3Dnone \ +-audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/launch-security-s390-pv.s390x-latest.ar= gs b/tests/qemuxml2argvdata/launch-security-s390-pv.s390x-latest.args index cb0dac0149..5f18bd7174 100644 --- a/tests/qemuxml2argvdata/launch-security-s390-pv.s390x-latest.args +++ b/tests/qemuxml2argvdata/launch-security-s390-pv.s390x-latest.args @@ -28,7 +28,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ -device virtio-blk-ccw,devno=3Dfe.0.0000,drive=3Dlibvirt-1-format,id=3Dvir= tio-disk0,bootindex=3D1 \ --audiodev id=3Daudio1,driver=3Dnone \ +-audiodev '{"id":"audio1","driver":"none"}' \ -device virtio-balloon-ccw,id=3Dballoon0,devno=3Dfe.0.0001 \ -object '{"qom-type":"s390-pv-guest","id":"lsec0"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ diff --git a/tests/qemuxml2argvdata/launch-security-sev.x86_64-6.0.0.args b= /tests/qemuxml2argvdata/launch-security-sev.x86_64-6.0.0.args index f2bb147a14..812a8f5637 100644 --- a/tests/qemuxml2argvdata/launch-security-sev.x86_64-6.0.0.args +++ b/tests/qemuxml2argvdata/launch-security-sev.x86_64-6.0.0.args @@ -30,7 +30,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ -device ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-0-0= ,bootindex=3D1 \ --audiodev id=3Daudio1,driver=3Dnone \ +-audiodev '{"id":"audio1","driver":"none"}' \ -object '{"qom-type":"sev-guest","id":"lsec0","cbitpos":47,"reduced-phys-b= its":1,"policy":1,"dh-cert-file":"/tmp/lib/domain--1-QEMUGuest1/dh_cert.bas= e64","session-file":"/tmp/lib/domain--1-QEMUGuest1/session.base64"}' \ -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-5.2.0.ar= gs b/tests/qemuxml2argvdata/luks-disks-source-qcow2.x86_64-5.2.0.args index 709b6ce352..d49f50970d 100644 --- a/tests/qemuxml2argvdata/luks-disks-source-qcow2.x86_64-5.2.0.args +++ b/tests/qemuxml2argvdata/luks-disks-source-qcow2.x86_64-5.2.0.args @@ -55,7 +55,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-encryptdisk/.config \ -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 \ --audiodev id=3Daudio1,driver=3Dnone \ +-audiodev '{"id":"audio1","driver":"none"}' \ -device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x3 \ -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 9608620467..57bedac8ac 100644 --- a/tests/qemuxml2argvdata/luks-disks-source-qcow2.x86_64-latest.args +++ b/tests/qemuxml2argvdata/luks-disks-source-qcow2.x86_64-latest.args @@ -55,7 +55,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-encryptdisk/.config \ -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 '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x8","drive":"li= bvirt-1-format","id":"virtio-disk5"}' \ --audiodev id=3Daudio1,driver=3Dnone \ +-audiodev '{"id":"audio1","driver":"none"}' \ -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 31726ba9f3..44f7813a91 100644 --- a/tests/qemuxml2argvdata/luks-disks-source.x86_64-latest.args +++ b/tests/qemuxml2argvdata/luks-disks-source.x86_64-latest.args @@ -48,7 +48,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-encryptdisk/.config \ -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 '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x7","drive":"li= bvirt-1-format","id":"virtio-disk4"}' \ --audiodev id=3Daudio1,driver=3Dnone \ +-audiodev '{"id":"audio1","driver":"none"}' \ -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 d285f09cc8..e44edba94e 100644 --- a/tests/qemuxml2argvdata/luks-disks.x86_64-latest.args +++ b/tests/qemuxml2argvdata/luks-disks.x86_64-latest.args @@ -35,7 +35,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-encryptdisk/.config \ -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 '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x5","drive":"li= bvirt-1-format","id":"virtio-disk1"}' \ --audiodev id=3Daudio1,driver=3Dnone \ +-audiodev '{"id":"audio1","driver":"none"}' \ -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 f3d1c6c5f4..cbbcbbd9c0 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 @@ -28,7 +28,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-instance-00000092/.c= onfig \ -no-acpi \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --audiodev id=3Daudio1,driver=3Dnone \ +-audiodev '{"id":"audio1","driver":"none"}' \ -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 4b6468001a..1d6bd50458 100644 --- a/tests/qemuxml2argvdata/memfd-memory-numa.x86_64-latest.args +++ b/tests/qemuxml2argvdata/memfd-memory-numa.x86_64-latest.args @@ -30,7 +30,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-instance-00000092/.c= onfig \ -no-acpi \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --audiodev id=3Daudio1,driver=3Dnone \ +-audiodev '{"id":"audio1","driver":"none"}' \ -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 9bd4038381..1270e383b2 100644 --- a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-access.x86_64-latest.args +++ b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-access.x86_64-latest.args @@ -33,7 +33,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ -device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ --audiodev id=3Daudio1,driver=3Dnone \ +-audiodev '{"id":"audio1","driver":"none"}' \ -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-5.2.= 0.args b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-align.x86_64-5.2.0.ar= gs index 0c1b9a6de6..c190628e0b 100644 --- a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-align.x86_64-5.2.0.args +++ b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-align.x86_64-5.2.0.args @@ -33,7 +33,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ -device ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-0-0= ,bootindex=3D1 \ --audiodev id=3Daudio1,driver=3Dnone \ +-audiodev '{"id":"audio1","driver":"none"}' \ -device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x3 \ -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 87d48b1bb8..f9cef50582 100644 --- a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-align.x86_64-latest.args +++ b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-align.x86_64-latest.args @@ -33,7 +33,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ -device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ --audiodev id=3Daudio1,driver=3Dnone \ +-audiodev '{"id":"audio1","driver":"none"}' \ -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-5.2.= 0.args b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-label.x86_64-5.2.0.ar= gs index d7c61b88a4..61510f3185 100644 --- a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-label.x86_64-5.2.0.args +++ b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-label.x86_64-5.2.0.args @@ -33,7 +33,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ -device ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-0-0= ,bootindex=3D1 \ --audiodev id=3Daudio1,driver=3Dnone \ +-audiodev '{"id":"audio1","driver":"none"}' \ -device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x3 \ -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 37ccab931a..09b86155c2 100644 --- a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-label.x86_64-latest.args +++ b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-label.x86_64-latest.args @@ -33,7 +33,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ -device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ --audiodev id=3Daudio1,driver=3Dnone \ +-audiodev '{"id":"audio1","driver":"none"}' \ -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-5.2.0= .args b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-pmem.x86_64-5.2.0.args index 42fb1c9acb..161674fd3d 100644 --- a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-pmem.x86_64-5.2.0.args +++ b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-pmem.x86_64-5.2.0.args @@ -33,7 +33,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ -device ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-0-0= ,bootindex=3D1 \ --audiodev id=3Daudio1,driver=3Dnone \ +-audiodev '{"id":"audio1","driver":"none"}' \ -device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x3 \ -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 772c63cbc9..b85546b0c0 100644 --- a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-pmem.x86_64-latest.args +++ b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-pmem.x86_64-latest.args @@ -33,7 +33,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ -device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ --audiodev id=3Daudio1,driver=3Dnone \ +-audiodev '{"id":"audio1","driver":"none"}' \ -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-5= .2.0.args b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-readonly.x86_64-5.= 2.0.args index 15e1ee8b6c..902379cd53 100644 --- a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-readonly.x86_64-5.2.0.ar= gs +++ b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-readonly.x86_64-5.2.0.ar= gs @@ -33,7 +33,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ -device ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-0-0= ,bootindex=3D1 \ --audiodev id=3Daudio1,driver=3Dnone \ +-audiodev '{"id":"audio1","driver":"none"}' \ -device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x3 \ -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 e1c57c2d03..3dc41b42f6 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 @@ -33,7 +33,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ -device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ --audiodev id=3Daudio1,driver=3Dnone \ +-audiodev '{"id":"audio1","driver":"none"}' \ -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 671af859aa..c46b51d27e 100644 --- a/tests/qemuxml2argvdata/memory-hotplug-nvdimm.x86_64-latest.args +++ b/tests/qemuxml2argvdata/memory-hotplug-nvdimm.x86_64-latest.args @@ -33,7 +33,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ -device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ --audiodev id=3Daudio1,driver=3Dnone \ +-audiodev '{"id":"audio1","driver":"none"}' \ -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 069206173b..8aedc9a8f8 100644 --- a/tests/qemuxml2argvdata/memory-hotplug-virtio-mem.x86_64-latest.args +++ b/tests/qemuxml2argvdata/memory-hotplug-virtio-mem.x86_64-latest.args @@ -35,7 +35,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ -device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ --audiodev id=3Daudio1,driver=3Dnone \ +-audiodev '{"id":"audio1","driver":"none"}' \ -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-5.2.0= .args b/tests/qemuxml2argvdata/memory-hotplug-virtio-pmem.x86_64-5.2.0.args index 969e2dbd7d..fe30e39a7f 100644 --- a/tests/qemuxml2argvdata/memory-hotplug-virtio-pmem.x86_64-5.2.0.args +++ b/tests/qemuxml2argvdata/memory-hotplug-virtio-pmem.x86_64-5.2.0.args @@ -33,7 +33,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ -device ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-0-0= ,bootindex=3D1 \ --audiodev id=3Daudio1,driver=3Dnone \ +-audiodev '{"id":"audio1","driver":"none"}' \ -device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x3 \ -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 882a08b84d..7f2f3e7daf 100644 --- a/tests/qemuxml2argvdata/memory-hotplug-virtio-pmem.x86_64-latest.args +++ b/tests/qemuxml2argvdata/memory-hotplug-virtio-pmem.x86_64-latest.args @@ -33,7 +33,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ -device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ --audiodev id=3Daudio1,driver=3Dnone \ +-audiodev '{"id":"audio1","driver":"none"}' \ -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-5.2.0.args b/test= s/qemuxml2argvdata/misc-no-reboot.x86_64-5.2.0.args index db6fff54db..69f8592ef7 100644 --- a/tests/qemuxml2argvdata/misc-no-reboot.x86_64-5.2.0.args +++ b/tests/qemuxml2argvdata/misc-no-reboot.x86_64-5.2.0.args @@ -30,6 +30,6 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ -device ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-0-0= ,bootindex=3D1 \ --audiodev id=3Daudio1,driver=3Dnone \ +-audiodev '{"id":"audio1","driver":"none"}' \ -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 3041af6a59..934cebb7eb 100644 --- a/tests/qemuxml2argvdata/misc-no-reboot.x86_64-latest.args +++ b/tests/qemuxml2argvdata/misc-no-reboot.x86_64-latest.args @@ -30,6 +30,6 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ -device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ --audiodev id=3Daudio1,driver=3Dnone \ +-audiodev '{"id":"audio1","driver":"none"}' \ -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 0c0064e1d3..e6b30c0dc7 100644 --- a/tests/qemuxml2argvdata/mlock-off.x86_64-latest.args +++ b/tests/qemuxml2argvdata/mlock-off.x86_64-latest.args @@ -27,6 +27,6 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -no-acpi \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --audiodev id=3Daudio1,driver=3Dnone \ +-audiodev '{"id":"audio1","driver":"none"}' \ -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 949913a4c1..da01620638 100644 --- a/tests/qemuxml2argvdata/mlock-on.x86_64-latest.args +++ b/tests/qemuxml2argvdata/mlock-on.x86_64-latest.args @@ -27,6 +27,6 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -no-acpi \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --audiodev id=3Daudio1,driver=3Dnone \ +-audiodev '{"id":"audio1","driver":"none"}' \ -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 cb27a2a7be..08f0aea368 100644 --- a/tests/qemuxml2argvdata/net-vdpa.x86_64-latest.args +++ b/tests/qemuxml2argvdata/net-vdpa.x86_64-latest.args @@ -30,6 +30,6 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -add-fd set=3D0,fd=3D1732,opaque=3D/dev/vhost-vdpa-0 \ -netdev vhost-vdpa,vhostdev=3D/dev/fdset/0,id=3Dhostnet0 \ -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 \ +-audiodev '{"id":"audio1","driver":"none"}' \ -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 03f56ef81a..21edf50eb8 100644 --- a/tests/qemuxml2argvdata/net-vhostuser.x86_64-latest.args +++ b/tests/qemuxml2argvdata/net-vhostuser.x86_64-latest.args @@ -35,6 +35,6 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -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 '{"driver":"rtl8139","netdev":"hostnet2","id":"net2","mac":"52:54:= 00:95:db:c0","bus":"pci.0","addr":"0x4"}' \ --audiodev id=3Daudio1,driver=3Dnone \ +-audiodev '{"id":"audio1","driver":"none"}' \ -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 fc4756fcc2..0c58090d38 100644 --- a/tests/qemuxml2argvdata/numatune-hmat.x86_64-latest.args +++ b/tests/qemuxml2argvdata/numatune-hmat.x86_64-latest.args @@ -42,7 +42,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest/.config \ -no-shutdown \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --audiodev id=3Daudio1,driver=3Dnone \ +-audiodev '{"id":"audio1","driver":"none"}' \ -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 b547b0b3d6..776bfaeed7 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 @@ -32,7 +32,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest/.config \ -no-acpi \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --audiodev id=3Daudio1,driver=3Dnone \ +-audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/numatune-memnode.x86_64-5.2.0.args b/te= sts/qemuxml2argvdata/numatune-memnode.x86_64-5.2.0.args index 23bab6fca4..c6613059e3 100644 --- a/tests/qemuxml2argvdata/numatune-memnode.x86_64-5.2.0.args +++ b/tests/qemuxml2argvdata/numatune-memnode.x86_64-5.2.0.args @@ -32,7 +32,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest/.config \ -no-acpi \ -boot strict=3Don \ -device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ --audiodev id=3Daudio1,driver=3Dnone \ +-audiodev '{"id":"audio1","driver":"none"}' \ -device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ -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 6a08a7efbd..09c0b4eed3 100644 --- a/tests/qemuxml2argvdata/numatune-memnode.x86_64-latest.args +++ b/tests/qemuxml2argvdata/numatune-memnode.x86_64-latest.args @@ -32,7 +32,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest/.config \ -no-acpi \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --audiodev id=3Daudio1,driver=3Dnone \ +-audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/numatune-system-memory.x86_64-latest.ar= gs b/tests/qemuxml2argvdata/numatune-system-memory.x86_64-latest.args index aee9b2ce76..fa1c4f53a5 100644 --- a/tests/qemuxml2argvdata/numatune-system-memory.x86_64-latest.args +++ b/tests/qemuxml2argvdata/numatune-system-memory.x86_64-latest.args @@ -27,6 +27,6 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -no-acpi \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --audiodev id=3Daudio1,driver=3Dnone \ +-audiodev '{"id":"audio1","driver":"none"}' \ -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 18e9f0d3ea..6e359db564 100644 --- a/tests/qemuxml2argvdata/os-firmware-bios.x86_64-latest.args +++ b/tests/qemuxml2argvdata/os-firmware-bios.x86_64-latest.args @@ -35,7 +35,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-fedora/.config \ -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 \ +-audiodev '{"id":"audio1","driver":"none"}' \ -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 9a1f6a0ebf..647dc632d6 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 @@ -32,6 +32,6 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-fedora/.config \ -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 \ +-audiodev '{"id":"audio1","driver":"none"}' \ -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 7aca5f5ea3..e5d5886569 100644 --- a/tests/qemuxml2argvdata/os-firmware-efi-secboot.x86_64-latest.args +++ b/tests/qemuxml2argvdata/os-firmware-efi-secboot.x86_64-latest.args @@ -39,7 +39,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-fedora/.config \ -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 \ +-audiodev '{"id":"audio1","driver":"none"}' \ -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 dcf2455461..a8bd9a2fe1 100644 --- a/tests/qemuxml2argvdata/os-firmware-efi.x86_64-latest.args +++ b/tests/qemuxml2argvdata/os-firmware-efi.x86_64-latest.args @@ -38,7 +38,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-fedora/.config \ -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 \ +-audiodev '{"id":"audio1","driver":"none"}' \ -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 9e54f2f990..325b83a21c 100644 --- a/tests/qemuxml2argvdata/panic-double.x86_64-latest.args +++ b/tests/qemuxml2argvdata/panic-double.x86_64-latest.args @@ -26,7 +26,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -no-shutdown \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --audiodev id=3Daudio1,driver=3Dnone \ +-audiodev '{"id":"audio1","driver":"none"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -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 1e63fde002..77e52de26d 100644 --- a/tests/qemuxml2argvdata/panic-no-address.x86_64-latest.args +++ b/tests/qemuxml2argvdata/panic-no-address.x86_64-latest.args @@ -30,7 +30,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ -device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ --audiodev id=3Daudio1,driver=3Dnone \ +-audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -device '{"driver":"pvpanic"}' \ diff --git a/tests/qemuxml2argvdata/panic.x86_64-latest.args b/tests/qemuxm= l2argvdata/panic.x86_64-latest.args index 782d252cde..4720a1d5e1 100644 --- a/tests/qemuxml2argvdata/panic.x86_64-latest.args +++ b/tests/qemuxml2argvdata/panic.x86_64-latest.args @@ -30,7 +30,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ -device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ --audiodev id=3Daudio1,driver=3Dnone \ +-audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -device '{"driver":"pvpanic","ioport":1285}' \ diff --git a/tests/qemuxml2argvdata/parallel-unix-chardev.x86_64-latest.arg= s b/tests/qemuxml2argvdata/parallel-unix-chardev.x86_64-latest.args index 3c15fc9910..98c8c4c985 100644 --- a/tests/qemuxml2argvdata/parallel-unix-chardev.x86_64-latest.args +++ b/tests/qemuxml2argvdata/parallel-unix-chardev.x86_64-latest.args @@ -31,7 +31,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -device '{"driver":"isa-parallel","chardev":"charparallel0","id":"parallel= 0"}' \ -chardev socket,id=3Dcharparallel1,path=3D/tmp/parport1.socket \ -device '{"driver":"isa-parallel","chardev":"charparallel1","id":"parallel= 1"}' \ --audiodev id=3Daudio1,driver=3Dnone \ +-audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -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 9e19078aa3..7eb14441a4 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 @@ -28,7 +28,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-i440fx/.config \ -boot strict=3Don \ -global PIIX4_PM.acpi-root-pci-hotplug=3Doff \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --audiodev id=3Daudio1,driver=3Dnone \ +-audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -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 7cd8d4a05f..40081dc6c9 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 @@ -28,7 +28,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-i440fx/.config \ -boot strict=3Don \ -global PIIX4_PM.acpi-root-pci-hotplug=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --audiodev id=3Daudio1,driver=3Dnone \ +-audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/pcie-expander-bus-aarch64.aarch64-lates= t.args b/tests/qemuxml2argvdata/pcie-expander-bus-aarch64.aarch64-latest.ar= gs index fe027f4e63..da905cd9fd 100644 --- a/tests/qemuxml2argvdata/pcie-expander-bus-aarch64.aarch64-latest.args +++ b/tests/qemuxml2argvdata/pcie-expander-bus-aarch64.aarch64-latest.args @@ -27,6 +27,6 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-pcie-expander-bus-te= /.config \ -no-acpi \ -boot strict=3Don \ -device '{"driver":"pxb-pcie","bus_nr":254,"id":"pci.1","bus":"pcie.0","ad= dr":"0x1"}' \ --audiodev id=3Daudio1,driver=3Dnone \ +-audiodev '{"id":"audio1","driver":"none"}' \ -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 e75054b80d..8c7ceb4ab0 100644 --- a/tests/qemuxml2argvdata/pcie-root-port-nohotplug.x86_64-latest.args +++ b/tests/qemuxml2argvdata/pcie-root-port-nohotplug.x86_64-latest.args @@ -35,6 +35,6 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-guest/.config \ -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 \ +-audiodev '{"id":"audio1","driver":"none"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/ppc64-default-cpu-kvm-pseries-2.7.ppc64= -latest.args b/tests/qemuxml2argvdata/ppc64-default-cpu-kvm-pseries-2.7.ppc= 64-latest.args index ef0e85468c..d9e1d24f65 100644 --- a/tests/qemuxml2argvdata/ppc64-default-cpu-kvm-pseries-2.7.ppc64-latest= .args +++ b/tests/qemuxml2argvdata/ppc64-default-cpu-kvm-pseries-2.7.ppc64-latest= .args @@ -31,6 +31,6 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-guest/.config \ -device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x2","drive":"li= bvirt-1-format","id":"virtio-disk0","bootindex":1}' \ -chardev pty,id=3Dcharserial0 \ -device '{"driver":"spapr-vty","chardev":"charserial0","id":"serial0","reg= ":805306368}' \ --audiodev id=3Daudio1,driver=3Dnone \ +-audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x3"}' \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/ppc64-default-cpu-kvm-pseries-3.1.ppc64= -latest.args b/tests/qemuxml2argvdata/ppc64-default-cpu-kvm-pseries-3.1.ppc= 64-latest.args index 5fb29b801f..4ca2cfb960 100644 --- a/tests/qemuxml2argvdata/ppc64-default-cpu-kvm-pseries-3.1.ppc64-latest= .args +++ b/tests/qemuxml2argvdata/ppc64-default-cpu-kvm-pseries-3.1.ppc64-latest= .args @@ -31,6 +31,6 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-guest/.config \ -device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x2","drive":"li= bvirt-1-format","id":"virtio-disk0","bootindex":1}' \ -chardev pty,id=3Dcharserial0 \ -device '{"driver":"spapr-vty","chardev":"charserial0","id":"serial0","reg= ":805306368}' \ --audiodev id=3Daudio1,driver=3Dnone \ +-audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x3"}' \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/ppc64-default-cpu-kvm-pseries-4.2.ppc64= -latest.args b/tests/qemuxml2argvdata/ppc64-default-cpu-kvm-pseries-4.2.ppc= 64-latest.args index 70e0ebc457..edb5806e9e 100644 --- a/tests/qemuxml2argvdata/ppc64-default-cpu-kvm-pseries-4.2.ppc64-latest= .args +++ b/tests/qemuxml2argvdata/ppc64-default-cpu-kvm-pseries-4.2.ppc64-latest= .args @@ -31,6 +31,6 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-guest/.config \ -device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x2","drive":"li= bvirt-1-format","id":"virtio-disk0","bootindex":1}' \ -chardev pty,id=3Dcharserial0 \ -device '{"driver":"spapr-vty","chardev":"charserial0","id":"serial0","reg= ":805306368}' \ --audiodev id=3Daudio1,driver=3Dnone \ +-audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x3"}' \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/ppc64-default-cpu-tcg-pseries-2.7.ppc64= -latest.args b/tests/qemuxml2argvdata/ppc64-default-cpu-tcg-pseries-2.7.ppc= 64-latest.args index 61e89f8739..056aaa447f 100644 --- a/tests/qemuxml2argvdata/ppc64-default-cpu-tcg-pseries-2.7.ppc64-latest= .args +++ b/tests/qemuxml2argvdata/ppc64-default-cpu-tcg-pseries-2.7.ppc64-latest= .args @@ -31,6 +31,6 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-guest/.config \ -device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x2","drive":"li= bvirt-1-format","id":"virtio-disk0","bootindex":1}' \ -chardev pty,id=3Dcharserial0 \ -device '{"driver":"spapr-vty","chardev":"charserial0","id":"serial0","reg= ":805306368}' \ --audiodev id=3Daudio1,driver=3Dnone \ +-audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x3"}' \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/ppc64-default-cpu-tcg-pseries-3.1.ppc64= -latest.args b/tests/qemuxml2argvdata/ppc64-default-cpu-tcg-pseries-3.1.ppc= 64-latest.args index d71e002112..88d35414b8 100644 --- a/tests/qemuxml2argvdata/ppc64-default-cpu-tcg-pseries-3.1.ppc64-latest= .args +++ b/tests/qemuxml2argvdata/ppc64-default-cpu-tcg-pseries-3.1.ppc64-latest= .args @@ -31,6 +31,6 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-guest/.config \ -device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x2","drive":"li= bvirt-1-format","id":"virtio-disk0","bootindex":1}' \ -chardev pty,id=3Dcharserial0 \ -device '{"driver":"spapr-vty","chardev":"charserial0","id":"serial0","reg= ":805306368}' \ --audiodev id=3Daudio1,driver=3Dnone \ +-audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x3"}' \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/ppc64-default-cpu-tcg-pseries-4.2.ppc64= -latest.args b/tests/qemuxml2argvdata/ppc64-default-cpu-tcg-pseries-4.2.ppc= 64-latest.args index 1d44dace80..d6ad7bd172 100644 --- a/tests/qemuxml2argvdata/ppc64-default-cpu-tcg-pseries-4.2.ppc64-latest= .args +++ b/tests/qemuxml2argvdata/ppc64-default-cpu-tcg-pseries-4.2.ppc64-latest= .args @@ -31,6 +31,6 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-guest/.config \ -device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x2","drive":"li= bvirt-1-format","id":"virtio-disk0","bootindex":1}' \ -chardev pty,id=3Dcharserial0 \ -device '{"driver":"spapr-vty","chardev":"charserial0","id":"serial0","reg= ":805306368}' \ --audiodev id=3Daudio1,driver=3Dnone \ +-audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x3"}' \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/ppc64-pseries-graphics.ppc64-latest.arg= s b/tests/qemuxml2argvdata/ppc64-pseries-graphics.ppc64-latest.args index ed5466756c..4ae12e7e3e 100644 --- a/tests/qemuxml2argvdata/ppc64-pseries-graphics.ppc64-latest.args +++ b/tests/qemuxml2argvdata/ppc64-pseries-graphics.ppc64-latest.args @@ -37,7 +37,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-guest/.config \ -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"}' \ -device '{"driver":"usb-kbd","id":"input1","bus":"usb.0","port":"2"}' \ --audiodev id=3Daudio1,driver=3Dnone \ +-audiodev '{"id":"audio1","driver":"none"}' \ -vnc 127.0.0.1:0,audiodev=3Daudio1 \ -device '{"driver":"VGA","id":"video0","vgamem_mb":16,"bus":"pci.0","addr"= :"0x7"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x5"}' \ diff --git a/tests/qemuxml2argvdata/ppc64-pseries-headless.ppc64-latest.arg= s b/tests/qemuxml2argvdata/ppc64-pseries-headless.ppc64-latest.args index 567b0cbb9c..c148ee65d3 100644 --- a/tests/qemuxml2argvdata/ppc64-pseries-headless.ppc64-latest.args +++ b/tests/qemuxml2argvdata/ppc64-pseries-headless.ppc64-latest.args @@ -36,7 +36,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-guest/.config \ -device '{"driver":"spapr-vty","chardev":"charserial0","id":"serial0","reg= ":805306368}' \ -chardev socket,id=3Dcharchannel0,fd=3D1729,server=3Don,wait=3Doff \ -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 \ +-audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x5"}' \ -object '{"qom-type":"rng-random","id":"objrng0","filename":"/dev/urandom"= }' \ -device '{"driver":"virtio-rng-pci","rng":"objrng0","id":"rng0","bus":"pci= .0","addr":"0x6"}' \ diff --git a/tests/qemuxml2argvdata/ppc64-tpmproxy-single.ppc64-latest.args= b/tests/qemuxml2argvdata/ppc64-tpmproxy-single.ppc64-latest.args index 9b3a543189..eb387cc1d1 100644 --- a/tests/qemuxml2argvdata/ppc64-tpmproxy-single.ppc64-latest.args +++ b/tests/qemuxml2argvdata/ppc64-tpmproxy-single.ppc64-latest.args @@ -27,6 +27,6 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -boot strict=3Don \ -device '{"driver":"pci-ohci","id":"usb","bus":"pci.0","addr":"0x1"}' \ -device '{"driver":"spapr-tpm-proxy","id":"tpm0","host-path":"/dev/tpmrm0"= }' \ --audiodev id=3Daudio1,driver=3Dnone \ +-audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x6"}' \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/ppc64-tpmproxy-with-tpm.ppc64-latest.ar= gs b/tests/qemuxml2argvdata/ppc64-tpmproxy-with-tpm.ppc64-latest.args index 276ec93b89..06a2d96530 100644 --- a/tests/qemuxml2argvdata/ppc64-tpmproxy-with-tpm.ppc64-latest.args +++ b/tests/qemuxml2argvdata/ppc64-tpmproxy-with-tpm.ppc64-latest.args @@ -30,6 +30,6 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -tpmdev emulator,id=3Dtpm-tpm1,chardev=3Dchrtpm \ -chardev socket,id=3Dchrtpm,path=3D/dev/test \ -device '{"driver":"tpm-spapr","tpmdev":"tpm-tpm1","id":"tpm1","reg":16384= }' \ --audiodev id=3Daudio1,driver=3Dnone \ +-audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x6"}' \ -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 d728d3e110..f3665357c8 100644 --- a/tests/qemuxml2argvdata/pv-spinlock-disabled.x86_64-latest.args +++ b/tests/qemuxml2argvdata/pv-spinlock-disabled.x86_64-latest.args @@ -26,7 +26,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -no-shutdown \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --audiodev id=3Daudio1,driver=3Dnone \ +-audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -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 bdf07ba921..7ea93f3b36 100644 --- a/tests/qemuxml2argvdata/pv-spinlock-enabled.x86_64-latest.args +++ b/tests/qemuxml2argvdata/pv-spinlock-enabled.x86_64-latest.args @@ -26,7 +26,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -no-shutdown \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --audiodev id=3Daudio1,driver=3Dnone \ +-audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -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 4e9d1c0133..8b6de4a1d5 100644 --- a/tests/qemuxml2argvdata/qemu-ns.x86_64-latest.args +++ b/tests/qemuxml2argvdata/qemu-ns.x86_64-latest.args @@ -33,7 +33,7 @@ BAR=3D'' \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ -device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ --audiodev id=3Daudio1,driver=3Dnone \ +-audiodev '{"id":"audio1","driver":"none"}' \ -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 \ diff --git a/tests/qemuxml2argvdata/riscv64-virt-graphics.riscv64-latest.ar= gs b/tests/qemuxml2argvdata/riscv64-virt-graphics.riscv64-latest.args index 7aeca86674..95e080a7a6 100644 --- a/tests/qemuxml2argvdata/riscv64-virt-graphics.riscv64-latest.args +++ b/tests/qemuxml2argvdata/riscv64-virt-graphics.riscv64-latest.args @@ -43,7 +43,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-guest/.config \ -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 usb-kbd,id=3Dinput1,bus=3Dusb.0,port=3D2 \ --audiodev id=3Daudio1,driver=3Dnone \ +-audiodev '{"id":"audio1","driver":"none"}' \ -vnc 127.0.0.1:0,audiodev=3Daudio1 \ -device virtio-gpu-pci,id=3Dvideo0,max_outputs=3D1,bus=3Dpci.7,addr=3D0x0 \ -device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.5,addr=3D0x0 \ diff --git a/tests/qemuxml2argvdata/riscv64-virt-headless.riscv64-latest.ar= gs b/tests/qemuxml2argvdata/riscv64-virt-headless.riscv64-latest.args index 0e5609f158..f90cb7520a 100644 --- a/tests/qemuxml2argvdata/riscv64-virt-headless.riscv64-latest.args +++ b/tests/qemuxml2argvdata/riscv64-virt-headless.riscv64-latest.args @@ -41,7 +41,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-guest/.config \ -serial chardev:charserial0 \ -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 \ --audiodev id=3Daudio1,driver=3Dnone \ +-audiodev '{"id":"audio1","driver":"none"}' \ -device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.5,addr=3D0x0 \ -object rng-random,id=3Dobjrng0,filename=3D/dev/urandom \ -device virtio-rng-pci,rng=3Dobjrng0,id=3Drng0,bus=3Dpci.6,addr=3D0x0 \ diff --git a/tests/qemuxml2argvdata/s390-allow-bogus-usb-controller.s390x-l= atest.args b/tests/qemuxml2argvdata/s390-allow-bogus-usb-controller.s390x-l= atest.args index 527141d70a..1acfdf9172 100644 --- a/tests/qemuxml2argvdata/s390-allow-bogus-usb-controller.s390x-latest.a= rgs +++ b/tests/qemuxml2argvdata/s390-allow-bogus-usb-controller.s390x-latest.a= rgs @@ -31,7 +31,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-test/.config \ -device virtio-blk-ccw,devno=3Dfe.0.0000,drive=3Dlibvirt-1-format,id=3Dvir= tio-disk0,bootindex=3D1 \ -chardev pty,id=3Dcharconsole0 \ -device virtconsole,chardev=3Dcharconsole0,id=3Dconsole0 \ --audiodev id=3Daudio1,driver=3Dnone \ +-audiodev '{"id":"audio1","driver":"none"}' \ -device virtio-balloon-ccw,id=3Dballoon0,devno=3Dfe.0.0002 \ -object '{"qom-type":"rng-random","id":"objrng0","filename":"/dev/hwrng"}'= \ -device virtio-rng-ccw,rng=3Dobjrng0,id=3Drng0,devno=3Dfe.0.0003 \ diff --git a/tests/qemuxml2argvdata/s390-allow-bogus-usb-none.s390x-latest.= args b/tests/qemuxml2argvdata/s390-allow-bogus-usb-none.s390x-latest.args index 527141d70a..1acfdf9172 100644 --- a/tests/qemuxml2argvdata/s390-allow-bogus-usb-none.s390x-latest.args +++ b/tests/qemuxml2argvdata/s390-allow-bogus-usb-none.s390x-latest.args @@ -31,7 +31,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-test/.config \ -device virtio-blk-ccw,devno=3Dfe.0.0000,drive=3Dlibvirt-1-format,id=3Dvir= tio-disk0,bootindex=3D1 \ -chardev pty,id=3Dcharconsole0 \ -device virtconsole,chardev=3Dcharconsole0,id=3Dconsole0 \ --audiodev id=3Daudio1,driver=3Dnone \ +-audiodev '{"id":"audio1","driver":"none"}' \ -device virtio-balloon-ccw,id=3Dballoon0,devno=3Dfe.0.0002 \ -object '{"qom-type":"rng-random","id":"objrng0","filename":"/dev/hwrng"}'= \ -device virtio-rng-ccw,rng=3Dobjrng0,id=3Drng0,devno=3Dfe.0.0003 \ diff --git a/tests/qemuxml2argvdata/s390-default-cpu-kvm-ccw-virtio-2.7.s39= 0x-latest.args b/tests/qemuxml2argvdata/s390-default-cpu-kvm-ccw-virtio-2.7= .s390x-latest.args index 6eefbb892f..97983b2bc1 100644 --- a/tests/qemuxml2argvdata/s390-default-cpu-kvm-ccw-virtio-2.7.s390x-late= st.args +++ b/tests/qemuxml2argvdata/s390-default-cpu-kvm-ccw-virtio-2.7.s390x-late= st.args @@ -25,7 +25,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-test/.config \ -rtc base=3Dutc \ -no-shutdown \ -boot strict=3Don \ --audiodev id=3Daudio1,driver=3Dnone \ +-audiodev '{"id":"audio1","driver":"none"}' \ -device virtio-balloon-ccw,id=3Dballoon0,devno=3Dfe.0.0000 \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/s390-default-cpu-kvm-ccw-virtio-4.2.s39= 0x-latest.args b/tests/qemuxml2argvdata/s390-default-cpu-kvm-ccw-virtio-4.2= .s390x-latest.args index e20ff871ad..3eb4b4e793 100644 --- a/tests/qemuxml2argvdata/s390-default-cpu-kvm-ccw-virtio-4.2.s390x-late= st.args +++ b/tests/qemuxml2argvdata/s390-default-cpu-kvm-ccw-virtio-4.2.s390x-late= st.args @@ -25,7 +25,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-test/.config \ -rtc base=3Dutc \ -no-shutdown \ -boot strict=3Don \ --audiodev id=3Daudio1,driver=3Dnone \ +-audiodev '{"id":"audio1","driver":"none"}' \ -device virtio-balloon-ccw,id=3Dballoon0,devno=3Dfe.0.0000 \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/s390-default-cpu-tcg-ccw-virtio-2.7.s39= 0x-latest.args b/tests/qemuxml2argvdata/s390-default-cpu-tcg-ccw-virtio-2.7= .s390x-latest.args index 730e75bb51..319a28bbc8 100644 --- a/tests/qemuxml2argvdata/s390-default-cpu-tcg-ccw-virtio-2.7.s390x-late= st.args +++ b/tests/qemuxml2argvdata/s390-default-cpu-tcg-ccw-virtio-2.7.s390x-late= st.args @@ -25,7 +25,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-test/.config \ -rtc base=3Dutc \ -no-shutdown \ -boot strict=3Don \ --audiodev id=3Daudio1,driver=3Dnone \ +-audiodev '{"id":"audio1","driver":"none"}' \ -device virtio-balloon-ccw,id=3Dballoon0,devno=3Dfe.0.0000 \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/s390-default-cpu-tcg-ccw-virtio-4.2.s39= 0x-latest.args b/tests/qemuxml2argvdata/s390-default-cpu-tcg-ccw-virtio-4.2= .s390x-latest.args index 3bfef9c573..67192179ae 100644 --- a/tests/qemuxml2argvdata/s390-default-cpu-tcg-ccw-virtio-4.2.s390x-late= st.args +++ b/tests/qemuxml2argvdata/s390-default-cpu-tcg-ccw-virtio-4.2.s390x-late= st.args @@ -25,7 +25,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-test/.config \ -rtc base=3Dutc \ -no-shutdown \ -boot strict=3Don \ --audiodev id=3Daudio1,driver=3Dnone \ +-audiodev '{"id":"audio1","driver":"none"}' \ -device virtio-balloon-ccw,id=3Dballoon0,devno=3Dfe.0.0000 \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/s390x-ccw-graphics.s390x-latest.args b/= tests/qemuxml2argvdata/s390x-ccw-graphics.s390x-latest.args index 090399aa70..670c994c8d 100644 --- a/tests/qemuxml2argvdata/s390x-ccw-graphics.s390x-latest.args +++ b/tests/qemuxml2argvdata/s390x-ccw-graphics.s390x-latest.args @@ -36,7 +36,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-guest/.config \ -device sclpconsole,chardev=3Dcharconsole0,id=3Dconsole0 \ -device virtio-tablet-ccw,id=3Dinput0,devno=3Dfe.0.0004 \ -device virtio-keyboard-ccw,id=3Dinput1,devno=3Dfe.0.0005 \ --audiodev id=3Daudio1,driver=3Dnone \ +-audiodev '{"id":"audio1","driver":"none"}' \ -vnc 127.0.0.1:0,audiodev=3Daudio1 \ -device virtio-gpu-ccw,id=3Dvideo0,max_outputs=3D1,devno=3Dfe.0.0002 \ -device virtio-balloon-ccw,id=3Dballoon0,devno=3Dfe.0.0006 \ diff --git a/tests/qemuxml2argvdata/s390x-ccw-headless.s390x-latest.args b/= tests/qemuxml2argvdata/s390x-ccw-headless.s390x-latest.args index 3a196d8ba3..66278cdb53 100644 --- a/tests/qemuxml2argvdata/s390x-ccw-headless.s390x-latest.args +++ b/tests/qemuxml2argvdata/s390x-ccw-headless.s390x-latest.args @@ -35,7 +35,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-guest/.config \ -device virtserialport,bus=3Dvirtio-serial0.0,nr=3D1,chardev=3Dcharchannel= 0,id=3Dchannel0,name=3Dorg.qemu.guest_agent.0 \ -chardev pty,id=3Dcharconsole0 \ -device sclpconsole,chardev=3Dcharconsole0,id=3Dconsole0 \ --audiodev id=3Daudio1,driver=3Dnone \ +-audiodev '{"id":"audio1","driver":"none"}' \ -device virtio-balloon-ccw,id=3Dballoon0,devno=3Dfe.0.0003 \ -object '{"qom-type":"rng-random","id":"objrng0","filename":"/dev/urandom"= }' \ -device virtio-rng-ccw,rng=3Dobjrng0,id=3Drng0,devno=3Dfe.0.0004 \ diff --git a/tests/qemuxml2argvdata/serial-unix-chardev.x86_64-latest.args = b/tests/qemuxml2argvdata/serial-unix-chardev.x86_64-latest.args index 64ad0be640..ba2773d0d3 100644 --- a/tests/qemuxml2argvdata/serial-unix-chardev.x86_64-latest.args +++ b/tests/qemuxml2argvdata/serial-unix-chardev.x86_64-latest.args @@ -31,7 +31,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -device '{"driver":"isa-serial","chardev":"charserial0","id":"serial0"}' \ -chardev socket,id=3Dcharserial1,fd=3D1729,server=3Don,wait=3Doff \ -device '{"driver":"isa-serial","chardev":"charserial1","id":"serial1"}' \ --audiodev id=3Daudio1,driver=3Dnone \ +-audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -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 6e88026146..9ce09ff962 100644 --- a/tests/qemuxml2argvdata/smartcard-passthrough-unix.x86_64-latest.args +++ b/tests/qemuxml2argvdata/smartcard-passthrough-unix.x86_64-latest.args @@ -30,7 +30,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -device '{"driver":"usb-ccid","id":"ccid0","bus":"usb.0","port":"1"}' \ -chardev socket,id=3Dcharsmartcard0,fd=3D1729,server=3Don,wait=3Doff \ -device '{"driver":"ccid-card-passthru","chardev":"charsmartcard0","id":"s= martcard0","bus":"ccid0.0"}' \ --audiodev id=3Daudio1,driver=3Dnone \ +-audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/tpm-emulator-spapr.ppc64-latest.args b/= tests/qemuxml2argvdata/tpm-emulator-spapr.ppc64-latest.args index 8a5e1cb287..5d3fecc065 100644 --- a/tests/qemuxml2argvdata/tpm-emulator-spapr.ppc64-latest.args +++ b/tests/qemuxml2argvdata/tpm-emulator-spapr.ppc64-latest.args @@ -38,6 +38,6 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-TPM-VM/.config \ -tpmdev emulator,id=3Dtpm-tpm0,chardev=3Dchrtpm \ -chardev socket,id=3Dchrtpm,path=3D/dev/test \ -device '{"driver":"tpm-spapr","tpmdev":"tpm-tpm0","id":"tpm0","reg":20480= }' \ --audiodev id=3Daudio1,driver=3Dnone \ +-audiodev '{"id":"audio1","driver":"none"}' \ -global spapr-nvram.reg=3D0x4000 \ -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 ff96260bf0..761eb37e9f 100644 --- a/tests/qemuxml2argvdata/tpm-emulator-tpm2-enc.x86_64-latest.args +++ b/tests/qemuxml2argvdata/tpm-emulator-tpm2-enc.x86_64-latest.args @@ -29,7 +29,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-TPM-VM/.config \ -tpmdev emulator,id=3Dtpm-tpm0,chardev=3Dchrtpm \ -chardev socket,id=3Dchrtpm,path=3D/dev/test \ -device '{"driver":"tpm-tis","tpmdev":"tpm-tpm0","id":"tpm0"}' \ --audiodev id=3Daudio1,driver=3Dnone \ +-audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -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 ff96260bf0..761eb37e9f 100644 --- a/tests/qemuxml2argvdata/tpm-emulator-tpm2-pstate.x86_64-latest.args +++ b/tests/qemuxml2argvdata/tpm-emulator-tpm2-pstate.x86_64-latest.args @@ -29,7 +29,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-TPM-VM/.config \ -tpmdev emulator,id=3Dtpm-tpm0,chardev=3Dchrtpm \ -chardev socket,id=3Dchrtpm,path=3D/dev/test \ -device '{"driver":"tpm-tis","tpmdev":"tpm-tpm0","id":"tpm0"}' \ --audiodev id=3Daudio1,driver=3Dnone \ +-audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -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 ff96260bf0..761eb37e9f 100644 --- a/tests/qemuxml2argvdata/tpm-emulator-tpm2.x86_64-latest.args +++ b/tests/qemuxml2argvdata/tpm-emulator-tpm2.x86_64-latest.args @@ -29,7 +29,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-TPM-VM/.config \ -tpmdev emulator,id=3Dtpm-tpm0,chardev=3Dchrtpm \ -chardev socket,id=3Dchrtpm,path=3D/dev/test \ -device '{"driver":"tpm-tis","tpmdev":"tpm-tpm0","id":"tpm0"}' \ --audiodev id=3Daudio1,driver=3Dnone \ +-audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/tpm-emulator.x86_64-latest.args b/tests= /qemuxml2argvdata/tpm-emulator.x86_64-latest.args index ff96260bf0..761eb37e9f 100644 --- a/tests/qemuxml2argvdata/tpm-emulator.x86_64-latest.args +++ b/tests/qemuxml2argvdata/tpm-emulator.x86_64-latest.args @@ -29,7 +29,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-TPM-VM/.config \ -tpmdev emulator,id=3Dtpm-tpm0,chardev=3Dchrtpm \ -chardev socket,id=3Dchrtpm,path=3D/dev/test \ -device '{"driver":"tpm-tis","tpmdev":"tpm-tpm0","id":"tpm0"}' \ --audiodev id=3Daudio1,driver=3Dnone \ +-audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -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 6f60c4b710..3c765f212a 100644 --- a/tests/qemuxml2argvdata/tpm-passthrough-crb.x86_64-latest.args +++ b/tests/qemuxml2argvdata/tpm-passthrough-crb.x86_64-latest.args @@ -30,7 +30,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-TPM-VM/.config \ -add-fd set=3D0,fd=3D1730 \ -add-fd set=3D1,fd=3D1731 \ -device '{"driver":"tpm-crb","tpmdev":"tpm-tpm0","id":"tpm0"}' \ --audiodev id=3Daudio1,driver=3Dnone \ +-audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -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 f5a69821e9..0c5f6fa0a6 100644 --- a/tests/qemuxml2argvdata/tpm-passthrough.x86_64-latest.args +++ b/tests/qemuxml2argvdata/tpm-passthrough.x86_64-latest.args @@ -30,7 +30,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-TPM-VM/.config \ -add-fd set=3D0,fd=3D1730 \ -add-fd set=3D1,fd=3D1731 \ -device '{"driver":"tpm-tis","tpmdev":"tpm-tpm0","id":"tpm0"}' \ --audiodev id=3Daudio1,driver=3Dnone \ +-audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -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 1a73a35eb3..6fef86555a 100644 --- a/tests/qemuxml2argvdata/tseg-explicit-size.x86_64-latest.args +++ b/tests/qemuxml2argvdata/tseg-explicit-size.x86_64-latest.args @@ -31,7 +31,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -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 \ +-audiodev '{"id":"audio1","driver":"none"}' \ -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 bb3c26dbd4..266d92b309 100644 --- a/tests/qemuxml2argvdata/usb-redir-unix.x86_64-latest.args +++ b/tests/qemuxml2argvdata/usb-redir-unix.x86_64-latest.args @@ -30,7 +30,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -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 \ +-audiodev '{"id":"audio1","driver":"none"}' \ -chardev socket,id=3Dcharredir0,path=3D/tmp/connect.socket \ -device '{"driver":"usb-redir","chardev":"charredir0","id":"redir0","bus":= "usb.0","port":"1"}' \ -chardev socket,id=3Dcharredir1,fd=3D1729,server=3Don,wait=3Doff \ 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 699d82cdca..7c4d2fe34d 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 @@ -29,6 +29,6 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-guest/.config \ -boot strict=3Don \ -chardev socket,id=3Dchr-vu-fs0,path=3D/tmp/lib/domain--1-guest/fs0-fs.soc= k \ -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 \ +-audiodev '{"id":"audio1","driver":"none"}' \ -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 3892b034f2..74914dbd50 100644 --- a/tests/qemuxml2argvdata/vhost-user-fs-hugepages.x86_64-latest.args +++ b/tests/qemuxml2argvdata/vhost-user-fs-hugepages.x86_64-latest.args @@ -35,6 +35,6 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-guest/.config \ -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 '{"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 \ +-audiodev '{"id":"audio1","driver":"none"}' \ -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 d35f120018..23530f79fc 100644 --- a/tests/qemuxml2argvdata/vhost-user-gpu-secondary.x86_64-latest.args +++ b/tests/qemuxml2argvdata/vhost-user-gpu-secondary.x86_64-latest.args @@ -31,7 +31,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ -device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ --audiodev id=3Daudio1,driver=3Dnone \ +-audiodev '{"id":"audio1","driver":"none"}' \ -chardev socket,id=3Dchr-vu-video0,fd=3D1729 \ -chardev socket,id=3Dchr-vu-video1,fd=3D1729 \ -device '{"driver":"vhost-user-vga","id":"video0","max_outputs":1,"chardev= ":"chr-vu-video0","bus":"pci.0","addr":"0x2"}' \ diff --git a/tests/qemuxml2argvdata/vhost-user-vga.x86_64-latest.args b/tes= ts/qemuxml2argvdata/vhost-user-vga.x86_64-latest.args index 7710a5b5a6..51a8180bbd 100644 --- a/tests/qemuxml2argvdata/vhost-user-vga.x86_64-latest.args +++ b/tests/qemuxml2argvdata/vhost-user-vga.x86_64-latest.args @@ -31,7 +31,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ -device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ --audiodev id=3Daudio1,driver=3Dnone \ +-audiodev '{"id":"audio1","driver":"none"}' \ -chardev socket,id=3Dchr-vu-video0,fd=3D1729 \ -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"}' \ diff --git a/tests/qemuxml2argvdata/vhost-vsock-auto.x86_64-latest.args b/t= ests/qemuxml2argvdata/vhost-vsock-auto.x86_64-latest.args index 4002a47898..c01fc4e1d7 100644 --- a/tests/qemuxml2argvdata/vhost-vsock-auto.x86_64-latest.args +++ b/tests/qemuxml2argvdata/vhost-vsock-auto.x86_64-latest.args @@ -28,7 +28,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-test/.config \ -boot menu=3Don,strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ -device '{"driver":"virtio-serial-pci","id":"virtio-serial0","bus":"pci.0"= ,"addr":"0x6"}' \ --audiodev id=3Daudio1,driver=3Dnone \ +-audiodev '{"id":"audio1","driver":"none"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -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-ccw-auto.s390x-latest.args = b/tests/qemuxml2argvdata/vhost-vsock-ccw-auto.s390x-latest.args index e770d3d773..d5034e06eb 100644 --- a/tests/qemuxml2argvdata/vhost-vsock-ccw-auto.s390x-latest.args +++ b/tests/qemuxml2argvdata/vhost-vsock-ccw-auto.s390x-latest.args @@ -28,7 +28,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ -device virtio-blk-ccw,devno=3Dfe.0.0000,drive=3Dlibvirt-1-format,id=3Dvir= tio-disk0,bootindex=3D1 \ --audiodev id=3Daudio1,driver=3Dnone \ +-audiodev '{"id":"audio1","driver":"none"}' \ -device virtio-balloon-ccw,id=3Dballoon0,devno=3Dfe.0.0001 \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -device vhost-vsock-ccw,id=3Dvsock0,guest-cid=3D42,vhostfd=3D6789,devno=3D= fe.0.0002 \ diff --git a/tests/qemuxml2argvdata/vhost-vsock-ccw-iommu.s390x-latest.args= b/tests/qemuxml2argvdata/vhost-vsock-ccw-iommu.s390x-latest.args index 84baab8570..68f3982509 100644 --- a/tests/qemuxml2argvdata/vhost-vsock-ccw-iommu.s390x-latest.args +++ b/tests/qemuxml2argvdata/vhost-vsock-ccw-iommu.s390x-latest.args @@ -28,7 +28,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ -device virtio-blk-ccw,devno=3Dfe.0.0000,drive=3Dlibvirt-1-format,id=3Dvir= tio-disk0,bootindex=3D1 \ --audiodev id=3Daudio1,driver=3Dnone \ +-audiodev '{"id":"audio1","driver":"none"}' \ -device virtio-balloon-ccw,id=3Dballoon0,devno=3Dfe.0.0001 \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -device vhost-vsock-ccw,iommu_platform=3Don,id=3Dvsock0,guest-cid=3D4,vhos= tfd=3D6789,devno=3Dfe.0.0002 \ diff --git a/tests/qemuxml2argvdata/vhost-vsock-ccw.s390x-latest.args b/tes= ts/qemuxml2argvdata/vhost-vsock-ccw.s390x-latest.args index 2a4c7d7d41..96446d8fd9 100644 --- a/tests/qemuxml2argvdata/vhost-vsock-ccw.s390x-latest.args +++ b/tests/qemuxml2argvdata/vhost-vsock-ccw.s390x-latest.args @@ -28,7 +28,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ -device virtio-blk-ccw,devno=3Dfe.0.0000,drive=3Dlibvirt-1-format,id=3Dvir= tio-disk0,bootindex=3D1 \ --audiodev id=3Daudio1,driver=3Dnone \ +-audiodev '{"id":"audio1","driver":"none"}' \ -device virtio-balloon-ccw,id=3Dballoon0,devno=3Dfe.0.0001 \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -device vhost-vsock-ccw,id=3Dvsock0,guest-cid=3D4,vhostfd=3D6789,devno=3Df= e.0.0003 \ diff --git a/tests/qemuxml2argvdata/vhost-vsock.x86_64-latest.args b/tests/= qemuxml2argvdata/vhost-vsock.x86_64-latest.args index 5388bbf748..81a10ee2a4 100644 --- a/tests/qemuxml2argvdata/vhost-vsock.x86_64-latest.args +++ b/tests/qemuxml2argvdata/vhost-vsock.x86_64-latest.args @@ -28,7 +28,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-test/.config \ -boot menu=3Don,strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ -device '{"driver":"virtio-serial-pci","id":"virtio-serial0","bus":"pci.0"= ,"addr":"0x6"}' \ --audiodev id=3Daudio1,driver=3Dnone \ +-audiodev '{"id":"audio1","driver":"none"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -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 b21f56d93a..c870303bab 100644 --- a/tests/qemuxml2argvdata/video-bochs-display-device.x86_64-latest.args +++ b/tests/qemuxml2argvdata/video-bochs-display-device.x86_64-latest.args @@ -30,7 +30,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -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 '{"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 \ +-audiodev '{"id":"audio1","driver":"none"}' \ -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 \ 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 b3a8db9729..94574d18be 100644 --- a/tests/qemuxml2argvdata/video-qxl-device-vram64.x86_64-latest.args +++ b/tests/qemuxml2argvdata/video-qxl-device-vram64.x86_64-latest.args @@ -27,7 +27,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -no-acpi \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --audiodev id=3Daudio1,driver=3Dnone \ +-audiodev '{"id":"audio1","driver":"none"}' \ -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 \ 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 7533e7446c..7acb9602e4 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 @@ -27,7 +27,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -no-acpi \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --audiodev id=3Daudio1,driver=3Dnone \ +-audiodev '{"id":"audio1","driver":"none"}' \ -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"}' \ 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 b4dd773957..bcc8f9a275 100644 --- a/tests/qemuxml2argvdata/video-ramfb-display-device.x86_64-latest.args +++ b/tests/qemuxml2argvdata/video-ramfb-display-device.x86_64-latest.args @@ -30,7 +30,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -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 '{"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 \ +-audiodev '{"id":"audio1","driver":"none"}' \ -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 \ 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 43433428ad..647ab7fc79 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 @@ -27,7 +27,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -no-acpi \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --audiodev id=3Daudio1,driver=3Dnone \ +-audiodev '{"id":"audio1","driver":"none"}' \ -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"}' \ diff --git a/tests/qemuxml2argvdata/virtio-9p-createmode.x86_64-latest.args= b/tests/qemuxml2argvdata/virtio-9p-createmode.x86_64-latest.args index 505123d073..69851359a9 100644 --- a/tests/qemuxml2argvdata/virtio-9p-createmode.x86_64-latest.args +++ b/tests/qemuxml2argvdata/virtio-9p-createmode.x86_64-latest.args @@ -37,7 +37,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -device '{"driver":"virtio-9p-pci","id":"fs3","fsdev":"fsdev-fs3","mount_t= ag":"fs3","bus":"pci.0","addr":"0x5"}' \ -chardev pty,id=3Dcharserial0 \ -device '{"driver":"isa-serial","chardev":"charserial0","id":"serial0"}' \ --audiodev id=3Daudio1,driver=3Dnone \ +-audiodev '{"id":"audio1","driver":"none"}' \ -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 47c036406c..a805cd8ebd 100644 --- a/tests/qemuxml2argvdata/virtio-9p-multidevs.x86_64-latest.args +++ b/tests/qemuxml2argvdata/virtio-9p-multidevs.x86_64-latest.args @@ -35,7 +35,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -device '{"driver":"virtio-9p-pci","id":"fs2","fsdev":"fsdev-fs2","mount_t= ag":"fs2","bus":"pci.0","addr":"0x4"}' \ -chardev pty,id=3Dcharserial0 \ -device '{"driver":"isa-serial","chardev":"charserial0","id":"serial0"}' \ --audiodev id=3Daudio1,driver=3Dnone \ +-audiodev '{"id":"audio1","driver":"none"}' \ -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 c973a9acbf..c088db2602 100644 --- a/tests/qemuxml2argvdata/virtio-lun.x86_64-latest.args +++ b/tests/qemuxml2argvdata/virtio-lun.x86_64-latest.args @@ -36,7 +36,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-test/.config \ -device '{"driver":"virtio-blk-pci","scsi":true,"bus":"pci.0","addr":"0x5"= ,"drive":"libvirt-1-format","id":"virtio-disk1"}' \ -netdev user,id=3Dhostnet0 \ -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 \ +-audiodev '{"id":"audio1","driver":"none"}' \ -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 cf53746120..79939c616e 100644 --- a/tests/qemuxml2argvdata/virtio-non-transitional.x86_64-latest.args +++ b/tests/qemuxml2argvdata/virtio-non-transitional.x86_64-latest.args @@ -47,7 +47,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -netdev user,id=3Dhostnet0 \ -device '{"driver":"virtio-net-pci-non-transitional","netdev":"hostnet0","= id":"net0","mac":"00:11:22:33:44:55","bus":"pci.2","addr":"0x0"}' \ -device '{"driver":"virtio-input-host-pci-non-transitional","id":"input0",= "evdev":"/dev/input/event1234","bus":"pci.9","addr":"0x0"}' \ --audiodev id=3Daudio1,driver=3Dnone \ +-audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"vhost-scsi-pci-non-transitional","wwpn":"naa.512345678= 9abcde0","vhostfd":"3","id":"hostdev0","bus":"pci.6","addr":"0x0"}' \ -device '{"driver":"virtio-balloon-pci-non-transitional","id":"balloon0","= bus":"pci.7","addr":"0x0"}' \ -object '{"qom-type":"rng-random","id":"objrng0","filename":"/dev/urandom"= }' \ 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 8738acd381..d95ea69c3d 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 @@ -31,7 +31,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -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 \ +-audiodev '{"id":"audio1","driver":"none"}' \ -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 8ae33d9c8c..37988c0bb4 100644 --- a/tests/qemuxml2argvdata/virtio-options-controller-iommu.x86_64-latest.= args +++ b/tests/qemuxml2argvdata/virtio-options-controller-iommu.x86_64-latest.= args @@ -31,7 +31,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -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 \ +-audiodev '{"id":"audio1","driver":"none"}' \ -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 fbe579b1ea..0432f120df 100644 --- a/tests/qemuxml2argvdata/virtio-options-controller-packed.x86_64-latest= .args +++ b/tests/qemuxml2argvdata/virtio-options-controller-packed.x86_64-latest= .args @@ -31,7 +31,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -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 \ +-audiodev '{"id":"audio1","driver":"none"}' \ -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 5641054ce2..64b78b2836 100644 --- a/tests/qemuxml2argvdata/virtio-options-disk-ats.x86_64-latest.args +++ b/tests/qemuxml2argvdata/virtio-options-disk-ats.x86_64-latest.args @@ -33,7 +33,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -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 '{"driver":"virtio-blk-pci","ats":false,"bus":"pci.0","addr":"0x3"= ,"drive":"libvirt-1-format","id":"virtio-disk1"}' \ --audiodev id=3Daudio1,driver=3Dnone \ +-audiodev '{"id":"audio1","driver":"none"}' \ -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 373c61e121..a0f61462d9 100644 --- a/tests/qemuxml2argvdata/virtio-options-disk-iommu.x86_64-latest.args +++ b/tests/qemuxml2argvdata/virtio-options-disk-iommu.x86_64-latest.args @@ -33,7 +33,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -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 '{"driver":"virtio-blk-pci","iommu_platform":false,"bus":"pci.0","= addr":"0x3","drive":"libvirt-1-format","id":"virtio-disk1"}' \ --audiodev id=3Daudio1,driver=3Dnone \ +-audiodev '{"id":"audio1","driver":"none"}' \ -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 1ace1dde87..319785e312 100644 --- a/tests/qemuxml2argvdata/virtio-options-disk-packed.x86_64-latest.args +++ b/tests/qemuxml2argvdata/virtio-options-disk-packed.x86_64-latest.args @@ -33,7 +33,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -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 '{"driver":"virtio-blk-pci","packed":false,"bus":"pci.0","addr":"0= x3","drive":"libvirt-1-format","id":"virtio-disk1"}' \ --audiodev id=3Daudio1,driver=3Dnone \ +-audiodev '{"id":"audio1","driver":"none"}' \ -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 781818908c..2c81b468c4 100644 --- a/tests/qemuxml2argvdata/virtio-options-fs-ats.x86_64-latest.args +++ b/tests/qemuxml2argvdata/virtio-options-fs-ats.x86_64-latest.args @@ -31,7 +31,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -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 '{"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 \ +-audiodev '{"id":"audio1","driver":"none"}' \ -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 5c71c9e72e..2a8e0f7a66 100644 --- a/tests/qemuxml2argvdata/virtio-options-fs-iommu.x86_64-latest.args +++ b/tests/qemuxml2argvdata/virtio-options-fs-iommu.x86_64-latest.args @@ -31,7 +31,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -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 '{"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 \ +-audiodev '{"id":"audio1","driver":"none"}' \ -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 39a6bff451..3b476c0029 100644 --- a/tests/qemuxml2argvdata/virtio-options-fs-packed.x86_64-latest.args +++ b/tests/qemuxml2argvdata/virtio-options-fs-packed.x86_64-latest.args @@ -31,7 +31,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -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 '{"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 \ +-audiodev '{"id":"audio1","driver":"none"}' \ -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 078ecf1bd8..bdf97c4fe0 100644 --- a/tests/qemuxml2argvdata/virtio-options-input-ats.x86_64-latest.args +++ b/tests/qemuxml2argvdata/virtio-options-input-ats.x86_64-latest.args @@ -29,7 +29,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -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 \ +-audiodev '{"id":"audio1","driver":"none"}' \ -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 f97c5041c9..7c1a08c484 100644 --- a/tests/qemuxml2argvdata/virtio-options-input-iommu.x86_64-latest.args +++ b/tests/qemuxml2argvdata/virtio-options-input-iommu.x86_64-latest.args @@ -29,7 +29,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -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 \ +-audiodev '{"id":"audio1","driver":"none"}' \ -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 b2e57eaa40..92fa626590 100644 --- a/tests/qemuxml2argvdata/virtio-options-input-packed.x86_64-latest.args +++ b/tests/qemuxml2argvdata/virtio-options-input-packed.x86_64-latest.args @@ -29,7 +29,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -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 \ +-audiodev '{"id":"audio1","driver":"none"}' \ -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 ea8c351087..0be5d44a93 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 @@ -27,7 +27,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -no-acpi \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --audiodev id=3Daudio1,driver=3Dnone \ +-audiodev '{"id":"audio1","driver":"none"}' \ -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 dd15ffd34a..293302ea1a 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 @@ -27,7 +27,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -no-acpi \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --audiodev id=3Daudio1,driver=3Dnone \ +-audiodev '{"id":"audio1","driver":"none"}' \ -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 d3edca0fde..06696c05d8 100644 --- a/tests/qemuxml2argvdata/virtio-options-memballoon-iommu.x86_64-latest.= args +++ b/tests/qemuxml2argvdata/virtio-options-memballoon-iommu.x86_64-latest.= args @@ -27,7 +27,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -no-acpi \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --audiodev id=3Daudio1,driver=3Dnone \ +-audiodev '{"id":"audio1","driver":"none"}' \ -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 85d91105a0..06d605f9e2 100644 --- a/tests/qemuxml2argvdata/virtio-options-memballoon-packed.x86_64-latest= .args +++ b/tests/qemuxml2argvdata/virtio-options-memballoon-packed.x86_64-latest= .args @@ -27,7 +27,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -no-acpi \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --audiodev id=3Daudio1,driver=3Dnone \ +-audiodev '{"id":"audio1","driver":"none"}' \ -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 e0b8febae0..d812cd8458 100644 --- a/tests/qemuxml2argvdata/virtio-options-net-ats.x86_64-latest.args +++ b/tests/qemuxml2argvdata/virtio-options-net-ats.x86_64-latest.args @@ -31,7 +31,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -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 '{"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 \ +-audiodev '{"id":"audio1","driver":"none"}' \ -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 4772a2dcc8..969c5b1054 100644 --- a/tests/qemuxml2argvdata/virtio-options-net-iommu.x86_64-latest.args +++ b/tests/qemuxml2argvdata/virtio-options-net-iommu.x86_64-latest.args @@ -31,7 +31,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -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 '{"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 \ +-audiodev '{"id":"audio1","driver":"none"}' \ -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 d9e702a919..3827867856 100644 --- a/tests/qemuxml2argvdata/virtio-options-net-packed.x86_64-latest.args +++ b/tests/qemuxml2argvdata/virtio-options-net-packed.x86_64-latest.args @@ -31,7 +31,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -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 '{"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 \ +-audiodev '{"id":"audio1","driver":"none"}' \ -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 c023cee6fb..43bd0bd394 100644 --- a/tests/qemuxml2argvdata/virtio-options-rng-ats.x86_64-latest.args +++ b/tests/qemuxml2argvdata/virtio-options-rng-ats.x86_64-latest.args @@ -27,7 +27,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -no-acpi \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --audiodev id=3Daudio1,driver=3Dnone \ +-audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x4"}' \ -object '{"qom-type":"rng-random","id":"objrng0","filename":"/dev/random"}= ' \ -device '{"driver":"virtio-rng-pci","ats":true,"rng":"objrng0","id":"rng0"= ,"bus":"pci.0","addr":"0x2"}' \ 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 c1b252bacf..399a7977bb 100644 --- a/tests/qemuxml2argvdata/virtio-options-rng-iommu.x86_64-latest.args +++ b/tests/qemuxml2argvdata/virtio-options-rng-iommu.x86_64-latest.args @@ -27,7 +27,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -no-acpi \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --audiodev id=3Daudio1,driver=3Dnone \ +-audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x4"}' \ -object '{"qom-type":"rng-random","id":"objrng0","filename":"/dev/random"}= ' \ -device '{"driver":"virtio-rng-pci","iommu_platform":true,"rng":"objrng0",= "id":"rng0","bus":"pci.0","addr":"0x2"}' \ 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 7c4aa9444b..40ce440fb3 100644 --- a/tests/qemuxml2argvdata/virtio-options-rng-packed.x86_64-latest.args +++ b/tests/qemuxml2argvdata/virtio-options-rng-packed.x86_64-latest.args @@ -27,7 +27,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -no-acpi \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --audiodev id=3Daudio1,driver=3Dnone \ +-audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x4"}' \ -object '{"qom-type":"rng-random","id":"objrng0","filename":"/dev/random"}= ' \ -device '{"driver":"virtio-rng-pci","packed":true,"rng":"objrng0","id":"rn= g0","bus":"pci.0","addr":"0x2"}' \ 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 0c9d65c1e9..425140b20d 100644 --- a/tests/qemuxml2argvdata/virtio-options-video-ats.x86_64-latest.args +++ b/tests/qemuxml2argvdata/virtio-options-video-ats.x86_64-latest.args @@ -27,7 +27,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -no-acpi \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --audiodev id=3Daudio1,driver=3Dnone \ +-audiodev '{"id":"audio1","driver":"none"}' \ -chardev socket,id=3Dchr-vu-video0,fd=3D1729 \ -chardev socket,id=3Dchr-vu-video1,fd=3D1729 \ -device '{"driver":"vhost-user-vga","id":"video0","max_outputs":1,"chardev= ":"chr-vu-video0","bus":"pci.0","addr":"0x2"}' \ 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 b49d81d5e5..721cb6848f 100644 --- a/tests/qemuxml2argvdata/virtio-options-video-iommu.x86_64-latest.args +++ b/tests/qemuxml2argvdata/virtio-options-video-iommu.x86_64-latest.args @@ -27,7 +27,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -no-acpi \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --audiodev id=3Daudio1,driver=3Dnone \ +-audiodev '{"id":"audio1","driver":"none"}' \ -chardev socket,id=3Dchr-vu-video0,fd=3D1729 \ -chardev socket,id=3Dchr-vu-video1,fd=3D1729 \ -device '{"driver":"vhost-user-vga","id":"video0","max_outputs":1,"chardev= ":"chr-vu-video0","bus":"pci.0","addr":"0x2"}' \ 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 d1f15167bb..6b49e19d85 100644 --- a/tests/qemuxml2argvdata/virtio-options-video-packed.x86_64-latest.args +++ b/tests/qemuxml2argvdata/virtio-options-video-packed.x86_64-latest.args @@ -27,7 +27,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -no-acpi \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --audiodev id=3Daudio1,driver=3Dnone \ +-audiodev '{"id":"audio1","driver":"none"}' \ -chardev socket,id=3Dchr-vu-video0,fd=3D1729 \ -chardev socket,id=3Dchr-vu-video1,fd=3D1729 \ -device '{"driver":"vhost-user-vga","id":"video0","max_outputs":1,"chardev= ":"chr-vu-video0","bus":"pci.0","addr":"0x2"}' \ diff --git a/tests/qemuxml2argvdata/virtio-options.x86_64-latest.args b/tes= ts/qemuxml2argvdata/virtio-options.x86_64-latest.args index 78d34b77df..a0ae3f5d40 100644 --- a/tests/qemuxml2argvdata/virtio-options.x86_64-latest.args +++ b/tests/qemuxml2argvdata/virtio-options.x86_64-latest.args @@ -42,7 +42,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -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 \ +-audiodev '{"id":"audio1","driver":"none"}' \ -chardev socket,id=3Dchr-vu-video0,fd=3D1729 \ -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"}= ' \ diff --git a/tests/qemuxml2argvdata/virtio-rng-builtin.x86_64-5.2.0.args b/= tests/qemuxml2argvdata/virtio-rng-builtin.x86_64-5.2.0.args index af071dfce5..11cf01cd30 100644 --- a/tests/qemuxml2argvdata/virtio-rng-builtin.x86_64-5.2.0.args +++ b/tests/qemuxml2argvdata/virtio-rng-builtin.x86_64-5.2.0.args @@ -27,7 +27,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -no-acpi \ -boot strict=3Don \ -device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ --audiodev id=3Daudio1,driver=3Dnone \ +-audiodev '{"id":"audio1","driver":"none"}' \ -device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ -object rng-builtin,id=3Dobjrng0 \ -device virtio-rng-pci,rng=3Dobjrng0,id=3Drng0,bus=3Dpci.0,addr=3D0x3 \ diff --git a/tests/qemuxml2argvdata/virtio-rng-builtin.x86_64-latest.args b= /tests/qemuxml2argvdata/virtio-rng-builtin.x86_64-latest.args index d7bcb61eec..a3eff223b3 100644 --- a/tests/qemuxml2argvdata/virtio-rng-builtin.x86_64-latest.args +++ b/tests/qemuxml2argvdata/virtio-rng-builtin.x86_64-latest.args @@ -27,7 +27,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -no-acpi \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --audiodev id=3Daudio1,driver=3Dnone \ +-audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ -object '{"qom-type":"rng-builtin","id":"objrng0"}' \ -device '{"driver":"virtio-rng-pci","rng":"objrng0","id":"rng0","bus":"pci= .0","addr":"0x3"}' \ diff --git a/tests/qemuxml2argvdata/virtio-rng-egd-unix.x86_64-5.2.0.args b= /tests/qemuxml2argvdata/virtio-rng-egd-unix.x86_64-5.2.0.args index 1f6da63063..bc23c6838b 100644 --- a/tests/qemuxml2argvdata/virtio-rng-egd-unix.x86_64-5.2.0.args +++ b/tests/qemuxml2argvdata/virtio-rng-egd-unix.x86_64-5.2.0.args @@ -27,7 +27,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -no-acpi \ -boot strict=3Don \ -device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ --audiodev id=3Daudio1,driver=3Dnone \ +-audiodev '{"id":"audio1","driver":"none"}' \ -device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ -chardev socket,id=3Dcharrng0,fd=3D1729,server=3Don,wait=3Doff \ -object rng-egd,id=3Dobjrng0,chardev=3Dcharrng0 \ 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 91489bb12f..51f6c22d0e 100644 --- a/tests/qemuxml2argvdata/virtio-rng-egd-unix.x86_64-latest.args +++ b/tests/qemuxml2argvdata/virtio-rng-egd-unix.x86_64-latest.args @@ -27,7 +27,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -no-acpi \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --audiodev id=3Daudio1,driver=3Dnone \ +-audiodev '{"id":"audio1","driver":"none"}' \ -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"}' \ diff --git a/tests/qemuxml2argvdata/virtio-transitional.x86_64-latest.args = b/tests/qemuxml2argvdata/virtio-transitional.x86_64-latest.args index d2a5f38662..442257f122 100644 --- a/tests/qemuxml2argvdata/virtio-transitional.x86_64-latest.args +++ b/tests/qemuxml2argvdata/virtio-transitional.x86_64-latest.args @@ -39,7 +39,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -netdev user,id=3Dhostnet0 \ -device '{"driver":"virtio-net-pci-transitional","netdev":"hostnet0","id":= "net0","mac":"00:11:22:33:44:55","bus":"pci.2","addr":"0x2"}' \ -device '{"driver":"virtio-input-host-pci-transitional","id":"input0","evd= ev":"/dev/input/event1234","bus":"pci.2","addr":"0x9"}' \ --audiodev id=3Daudio1,driver=3Dnone \ +-audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"vhost-scsi-pci-transitional","wwpn":"naa.5123456789abc= de0","vhostfd":"3","id":"hostdev0","bus":"pci.2","addr":"0x6"}' \ -device '{"driver":"virtio-balloon-pci-transitional","id":"balloon0","bus"= :"pci.2","addr":"0x7"}' \ -object '{"qom-type":"rng-random","id":"objrng0","filename":"/dev/urandom"= }' \ diff --git a/tests/qemuxml2argvdata/watchdog-device.x86_64-latest.args b/te= sts/qemuxml2argvdata/watchdog-device.x86_64-latest.args index 70a9da5f37..ba7d7140d7 100644 --- a/tests/qemuxml2argvdata/watchdog-device.x86_64-latest.args +++ b/tests/qemuxml2argvdata/watchdog-device.x86_64-latest.args @@ -30,7 +30,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ -device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ --audiodev id=3Daudio1,driver=3Dnone \ +-audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"i6300esb","id":"watchdog0","bus":"pci.0","addr":"0x3"}= ' \ -watchdog-action poweroff \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ diff --git a/tests/qemuxml2argvdata/watchdog-diag288.s390x-latest.args b/te= sts/qemuxml2argvdata/watchdog-diag288.s390x-latest.args index b6ed866918..b933bc54ca 100644 --- a/tests/qemuxml2argvdata/watchdog-diag288.s390x-latest.args +++ b/tests/qemuxml2argvdata/watchdog-diag288.s390x-latest.args @@ -28,7 +28,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ -device virtio-blk-ccw,devno=3Dfe.0.0000,drive=3Dlibvirt-1-format,id=3Dvir= tio-disk0,bootindex=3D1 \ --audiodev id=3Daudio1,driver=3Dnone \ +-audiodev '{"id":"audio1","driver":"none"}' \ -device diag288,id=3Dwatchdog0 \ -watchdog-action inject-nmi \ -device virtio-balloon-ccw,id=3Dballoon0,devno=3Dfe.0.0001 \ diff --git a/tests/qemuxml2argvdata/watchdog-dump.x86_64-latest.args b/test= s/qemuxml2argvdata/watchdog-dump.x86_64-latest.args index 2e7324dd9a..e93d0543cd 100644 --- a/tests/qemuxml2argvdata/watchdog-dump.x86_64-latest.args +++ b/tests/qemuxml2argvdata/watchdog-dump.x86_64-latest.args @@ -30,7 +30,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ -device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ --audiodev id=3Daudio1,driver=3Dnone \ +-audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"ib700","id":"watchdog0"}' \ -watchdog-action pause \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ diff --git a/tests/qemuxml2argvdata/watchdog-injectnmi.x86_64-latest.args b= /tests/qemuxml2argvdata/watchdog-injectnmi.x86_64-latest.args index d74b3576a4..c7a0524b59 100644 --- a/tests/qemuxml2argvdata/watchdog-injectnmi.x86_64-latest.args +++ b/tests/qemuxml2argvdata/watchdog-injectnmi.x86_64-latest.args @@ -30,7 +30,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ -device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ --audiodev id=3Daudio1,driver=3Dnone \ +-audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"ib700","id":"watchdog0"}' \ -watchdog-action inject-nmi \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ diff --git a/tests/qemuxml2argvdata/watchdog.x86_64-latest.args b/tests/qem= uxml2argvdata/watchdog.x86_64-latest.args index d1ed230a00..7ed728addd 100644 --- a/tests/qemuxml2argvdata/watchdog.x86_64-latest.args +++ b/tests/qemuxml2argvdata/watchdog.x86_64-latest.args @@ -30,7 +30,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ -device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ --audiodev id=3Daudio1,driver=3Dnone \ +-audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"ib700","id":"watchdog0"}' \ -watchdog-action poweroff \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ 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 9a4342153a..bbbd0ad05c 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 @@ -29,7 +29,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-guest/.config \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/guest.qcow= 2","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}= ' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"qco= w2","file":"libvirt-1-storage"}' \ -device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x2","drive":"li= bvirt-1-format","id":"virtio-disk0","bootindex":1}' \ --audiodev id=3Daudio1,driver=3Dnone \ +-audiodev '{"id":"audio1","driver":"none"}' \ -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 406a383f9b..dbeb0c87a6 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 @@ -33,7 +33,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-guest/.config \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/guest.qcow= 2","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}= ' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"qco= w2","file":"libvirt-1-storage"}' \ -device '{"driver":"virtio-blk-pci","bus":"pci.2","addr":"0x0","drive":"li= bvirt-1-format","id":"virtio-disk0","bootindex":1}' \ --audiodev id=3Daudio1,driver=3Dnone \ +-audiodev '{"id":"audio1","driver":"none"}' \ -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 58477ff33e..fdf04e6b4f 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 @@ -29,7 +29,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-guest/.config \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/guest.qcow= 2","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}= ' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"qco= w2","file":"libvirt-1-storage"}' \ -device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x2","drive":"li= bvirt-1-format","id":"virtio-disk0","bootindex":1}' \ --audiodev id=3Daudio1,driver=3Dnone \ +-audiodev '{"id":"audio1","driver":"none"}' \ -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 60e415ffbd..bc8b6d24e7 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 @@ -33,7 +33,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-guest/.config \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/guest.qcow= 2","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}= ' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"qco= w2","file":"libvirt-1-storage"}' \ -device '{"driver":"virtio-blk-pci","bus":"pci.2","addr":"0x0","drive":"li= bvirt-1-format","id":"virtio-disk0","bootindex":1}' \ --audiodev id=3Daudio1,driver=3Dnone \ +-audiodev '{"id":"audio1","driver":"none"}' \ -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 e3048603ba..cd34f0328a 100644 --- a/tests/qemuxml2argvdata/x86_64-pc-graphics.x86_64-latest.args +++ b/tests/qemuxml2argvdata/x86_64-pc-graphics.x86_64-latest.args @@ -40,7 +40,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-guest/.config \ -chardev socket,id=3Dcharchannel0,fd=3D1729,server=3Don,wait=3Doff \ -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 \ +-audiodev '{"id":"audio1","driver":"none"}' \ -vnc 127.0.0.1:0,audiodev=3Daudio1 \ -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"}' \ 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 e93b5f9100..78812b71ac 100644 --- a/tests/qemuxml2argvdata/x86_64-pc-headless.x86_64-latest.args +++ b/tests/qemuxml2argvdata/x86_64-pc-headless.x86_64-latest.args @@ -40,7 +40,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-guest/.config \ -device '{"driver":"isa-serial","chardev":"charserial0","id":"serial0"}' \ -chardev socket,id=3Dcharchannel0,fd=3D1729,server=3Don,wait=3Doff \ -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 \ +-audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x6"}' \ -object '{"qom-type":"rng-random","id":"objrng0","filename":"/dev/urandom"= }' \ -device '{"driver":"virtio-rng-pci","rng":"objrng0","id":"rng0","bus":"pci= .0","addr":"0x7"}' \ 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 ab3f5091dd..e72eb43a93 100644 --- a/tests/qemuxml2argvdata/x86_64-q35-graphics.x86_64-latest.args +++ b/tests/qemuxml2argvdata/x86_64-q35-graphics.x86_64-latest.args @@ -47,7 +47,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-guest/.config \ -chardev socket,id=3Dcharchannel0,fd=3D1729,server=3Don,wait=3Doff \ -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 \ +-audiodev '{"id":"audio1","driver":"none"}' \ -vnc 127.0.0.1:0,audiodev=3Daudio1 \ -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"}' \ 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 9801615c34..d0aab1478d 100644 --- a/tests/qemuxml2argvdata/x86_64-q35-headless.x86_64-latest.args +++ b/tests/qemuxml2argvdata/x86_64-q35-headless.x86_64-latest.args @@ -47,7 +47,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-guest/.config \ -device '{"driver":"isa-serial","chardev":"charserial0","id":"serial0"}' \ -chardev socket,id=3Dcharchannel0,fd=3D1729,server=3Don,wait=3Doff \ -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 \ +-audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.5","add= r":"0x0"}' \ -object '{"qom-type":"rng-random","id":"objrng0","filename":"/dev/urandom"= }' \ -device '{"driver":"virtio-rng-pci","rng":"objrng0","id":"rng0","bus":"pci= .6","addr":"0x0"}' \ --=20 2.31.1