From nobody Sat May 30 15:28:30 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.libvirt.org designates 38.145.34.151 as permitted sender) client-ip=38.145.34.151; envelope-from=devel-bounces@lists.libvirt.org; helo=lists.libvirt.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.libvirt.org designates 38.145.34.151 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=pass(p=reject dis=none) header.from=lists.libvirt.org ARC-Seal: i=1; a=rsa-sha256; t=1779381216; cv=none; d=zohomail.com; s=zohoarc; b=WD9eYTZlosnw8IWHW57SrLfopBONp7IHXdXhxMMS05Aa9geBAEuDDtIF2K5RLkXgJi9Ts7R9hj2CV+qLV4cmCN6oIh6thAUybgNFqLk0pDK1fmko+bfLjgvE+/BsM192lJkRHl6AN/AOLU5UM7C2ALEIvV0hgRB5T8zP0nPWjS4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1779381216; h=Content-Type:Content-Transfer-Encoding:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Owner:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:Reply-To:References:Subject:Subject:To:To:Message-Id:Cc; bh=AQkaS3DLeqC6AJPCGMMiptyXyNzDb2l7gD22uyTKbG4=; b=EfZSAUAwXLsAHF+eCl3ROBQSPVVYYRTNhTA4G6+JEdxFsWGb3oBlvZ5rTSD8a+8az2vynNBAexpzyJUls7MMiGOAPbshkua7MwAXdXUCBkvSSXefeJjkmJaCRuCj6ewFnoWcA3z6a+44DSxi6t5uI4TCykgUAPpnS/qIeKRJMCU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.libvirt.org designates 38.145.34.151 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=pass header.from= (p=reject dis=none) Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [38.145.34.151]) by mx.zohomail.com with SMTPS id 1779381216391913.9760271873273; Thu, 21 May 2026 09:33:36 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 993) id BB86A41B1B; Thu, 21 May 2026 12:33:35 -0400 (EDT) Received: from [172.19.199.4] (unknown [10.16.107.18]) by lists.libvirt.org (Postfix) with ESMTP id AE6D141BCC; Thu, 21 May 2026 12:24:14 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 993) id 283804199E; Thu, 21 May 2026 12:23:52 -0400 (EDT) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (3072 bits) server-digest SHA256) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id 737504199E for ; Thu, 21 May 2026 12:23:51 -0400 (EDT) Received: from mx-prod-mc-03.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-616-l8YLeAPSMKKpvojXdoCF9w-1; Thu, 21 May 2026 12:23:44 -0400 Received: from mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.17]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 891AA195605E for ; Thu, 21 May 2026 16:23:43 +0000 (UTC) Received: from speedmetal.openshiftapps.com (unknown [10.44.22.3]) by mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 66BFF1956056 for ; Thu, 21 May 2026 16:23:42 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 4.0.1 (2024-03-26) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=0.6 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H5, RCVD_IN_MSPIKE_WL,RCVD_IN_SBL_CSS,SPF_HELO_PASS autolearn=no autolearn_force=no version=4.0.1 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1779380631; h=from:from: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; bh=AQkaS3DLeqC6AJPCGMMiptyXyNzDb2l7gD22uyTKbG4=; b=eyoYEeSxyFDNjBiURKZvgt80Z5Bob1PXf7wOhfrxbZLzBDLIOwEIKRehak3CsFXB7JQIni r3fIwcYaJCOKiJYATpn1Mrs055g7uyZKv1onciPa0HQibK3aNF08pna/5t/ga+UrGGs4yT PVGmKFAeb82VPX2uyI/bbtBdRt4+Ra8= X-MC-Unique: l8YLeAPSMKKpvojXdoCF9w-1 X-Mimecast-MFC-AGG-ID: l8YLeAPSMKKpvojXdoCF9w_1779380623 To: devel@lists.libvirt.org Subject: [PATCH 01/30] qemuxmlconftest: Remove unused 'monitor_chr' from testCompareXMLToArgv Date: Thu, 21 May 2026 18:23:10 +0200 Message-ID: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.17 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: 5x7431cFwaFZtP5LVk2xWNkPH5Xbxi0gKNQNcMGj4XE_1779380623 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: WBNFRG2WEH6LA3NEF5LIAGDW47CLT5UN X-Message-ID-Hash: WBNFRG2WEH6LA3NEF5LIAGDW47CLT5UN X-MailFrom: pkrempa@redhat.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; header-match-devel.lists.libvirt.org-0; emergency; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.10 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: From: Peter Krempa via Devel Reply-To: Peter Krempa X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1779381221880154101 Content-Type: text/plain; charset="utf-8" From: Peter Krempa Signed-off-by: Peter Krempa Reviewed-by: Michal Privoznik --- tests/qemuxmlconftest.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/tests/qemuxmlconftest.c b/tests/qemuxmlconftest.c index b64bbd6ccb..ff27bed740 100644 --- a/tests/qemuxmlconftest.c +++ b/tests/qemuxmlconftest.c @@ -659,7 +659,6 @@ testCompareXMLToArgv(const void *data) unsigned int flags =3D info->flags; int ret =3D -1; virDomainObj *vm =3D NULL; - virDomainChrSourceDef monitor_chr =3D { 0 }; virError *err =3D NULL; g_autofree char *log =3D NULL; g_autoptr(virCommand) cmd =3D NULL; @@ -707,9 +706,6 @@ testCompareXMLToArgv(const void *data) vm->def->id =3D -1; - if (qemuProcessPrepareMonitorChr(&monitor_chr, priv->libDir) < 0) - goto cleanup; - virResetLastError(); if (!(cmd =3D testCompareXMLToArgvCreateArgs(&driver, vm, migrateURI, = info, @@ -765,7 +761,6 @@ testCompareXMLToArgv(const void *data) /* clear overriden host cpu */ if (info->args.capsHostCPUModel) qemuTestSetHostCPU(&driver, driver.hostarch, NULL); - virDomainChrSourceDefClear(&monitor_chr); if (vm) { vm->def =3D NULL; virObjectUnref(vm); --=20 2.54.0 From nobody Sat May 30 15:28:30 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.libvirt.org designates 38.145.34.151 as permitted sender) client-ip=38.145.34.151; envelope-from=devel-bounces@lists.libvirt.org; helo=lists.libvirt.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.libvirt.org designates 38.145.34.151 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=pass(p=reject dis=none) header.from=lists.libvirt.org ARC-Seal: i=1; a=rsa-sha256; t=1779380703; cv=none; d=zohomail.com; s=zohoarc; b=WJszs0VhmWR0M5N1SprJgnb0v0siKn3jf+eQvYwHI5QaK/s52R/caw8/6ki9Na2G2vJ2sRBSIoZT6cV+dHOAX9oMJ/g9aNAmF/gqxgilJqUOhROCjN3znHk6kz8/KWHDgfK+8whF8sFVWBMdNgNdBiOcyoGMjUVa06vaZwIDF7Q= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1779380703; h=Content-Type:Content-Transfer-Encoding:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Owner:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:Reply-To:References:Subject:Subject:To:To:Message-Id:Cc; bh=wc9ZNgkIh/oxOymkIkypOruM3BL2hZKZDhMzvWnEukA=; b=cF+5SlWn1EJ1zv0QqZlZD35pBMeANahcDsaci70ZjojCGucGyo+F5QQj70OE56h6SwVEqkwwedJ+CioMDOD9y9nqPzZ7oALFaoP1ZR+yX+Q6y0hJr+8Up0k3MzsrZQm32VhNF0ISF+SEmQAQWW5eZykQuOeeQxsui5v8jxP7UGA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.libvirt.org designates 38.145.34.151 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=pass header.from= (p=reject dis=none) Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [38.145.34.151]) by mx.zohomail.com with SMTPS id 1779380703793757.9376063962286; Thu, 21 May 2026 09:25:03 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 993) id 63ABF41B11; Thu, 21 May 2026 12:25:02 -0400 (EDT) Received: from [172.19.199.4] (unknown [10.16.107.18]) by lists.libvirt.org (Postfix) with ESMTP id 664E141B6A; Thu, 21 May 2026 12:24:00 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 993) id 4F9C2419C8; Thu, 21 May 2026 12:23:48 -0400 (EDT) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (3072 bits) server-digest SHA256) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id 9D5ED419CA for ; Thu, 21 May 2026 12:23:47 -0400 (EDT) Received: from mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-493-AKew1oTXNhyN545ygreK8g-1; Thu, 21 May 2026 12:23:45 -0400 Received: from mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.17]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id B2970195609F for ; Thu, 21 May 2026 16:23:44 +0000 (UTC) Received: from speedmetal.openshiftapps.com (unknown [10.44.22.3]) by mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 0700F1956056 for ; Thu, 21 May 2026 16:23:43 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 4.0.1 (2024-03-26) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=0.6 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H4, RCVD_IN_MSPIKE_WL,RCVD_IN_SBL_CSS,SPF_HELO_PASS autolearn=no autolearn_force=no version=4.0.1 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1779380627; h=from:from: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; bh=wc9ZNgkIh/oxOymkIkypOruM3BL2hZKZDhMzvWnEukA=; b=im4mTkL7vO2+/cyFm4LzSnpvevBNrF++tcUJbT4i+e//EtZmMiLxiNRPc/HbcPa8xsYco9 89nIdeZo0E4WZkXyJYlgDGCsOYBG40sM9JgtIxUN4h2Ohp8sz7RhqEfOxYTR8GkZKGmrpC k/nSA8jQul064h5PdT0oKe6GdkRx1Es= X-MC-Unique: AKew1oTXNhyN545ygreK8g-1 X-Mimecast-MFC-AGG-ID: AKew1oTXNhyN545ygreK8g_1779380624 To: devel@lists.libvirt.org Subject: [PATCH 02/30] qemu: Stop mocking 'qemuOpenChrChardevUNIXSocket' Date: Thu, 21 May 2026 18:23:11 +0200 Message-ID: <2587ee59aea8a1bb82e1781f27da52a6b6029de2.1779380461.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.17 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: 5L7p-9eDl0S1lKCD9vKE6DNb1SFh5uLw7CrilG7qB5I_1779380624 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: BB23VPPEY4LDXIUDTBH3GRGIOPYKRJ2Z X-Message-ID-Hash: BB23VPPEY4LDXIUDTBH3GRGIOPYKRJ2Z X-MailFrom: pkrempa@redhat.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; header-match-devel.lists.libvirt.org-0; emergency; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.10 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: From: Peter Krempa via Devel Reply-To: Peter Krempa X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1779380713264154100 Content-Type: text/plain; charset="utf-8" From: Peter Krempa The tests now use 'testQemuPrepareHostBackendChardevOne' which replaces 'qemuProcessPrepareHostBackendChardevOne' which is skipped as it is a host setup step. Signed-off-by: Peter Krempa Reviewed-by: Michal Privoznik --- src/qemu/qemu_command.h | 3 +-- tests/qemuxml2argvmock.c | 17 ----------------- 2 files changed, 1 insertion(+), 19 deletions(-) diff --git a/src/qemu/qemu_command.h b/src/qemu/qemu_command.h index 028d002ef9..e34172fbff 100644 --- a/src/qemu/qemu_command.h +++ b/src/qemu/qemu_command.h @@ -74,8 +74,7 @@ qemuBuildTLSx509BackendProps(const char *tlspath, /* Open a UNIX socket for chardev FD passing */ int -qemuOpenChrChardevUNIXSocket(const virDomainChrSourceDef *dev) - ATTRIBUTE_MOCKABLE; +qemuOpenChrChardevUNIXSocket(const virDomainChrSourceDef *dev); virJSONValue * qemuBuildChrDeviceProps(const virDomainDef *vmdef, diff --git a/tests/qemuxml2argvmock.c b/tests/qemuxml2argvmock.c index 9d10b5655f..b4ebf1a172 100644 --- a/tests/qemuxml2argvmock.c +++ b/tests/qemuxml2argvmock.c @@ -236,23 +236,6 @@ qemuInterfaceOpenVhostNet(virDomainObj *vm G_GNUC_UNUS= ED, } -int -qemuOpenChrChardevUNIXSocket(const virDomainChrSourceDef *dev G_GNUC_UNUSE= D) - -{ - /* We need to return an FD number for a UNIX listener socket, - * which will be given to QEMU via a CLI arg. We need a fixed - * number to get stable tests. This is obviously not a real - * FD number, so when virCommand closes the FD in the parent - * it will get EINVAL, but that's (hopefully) not going to - * be a problem.... - */ - if (fcntl(1729, F_GETFD) !=3D -1) - abort(); - return 1729; -} - - int qemuBuildTPMOpenBackendFDs(const char *tpmdev G_GNUC_UNUSED, int *tpmfd, --=20 2.54.0 From nobody Sat May 30 15:28:30 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.libvirt.org designates 38.145.34.151 as permitted sender) client-ip=38.145.34.151; envelope-from=devel-bounces@lists.libvirt.org; helo=lists.libvirt.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.libvirt.org designates 38.145.34.151 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=pass(p=reject dis=none) header.from=lists.libvirt.org ARC-Seal: i=1; a=rsa-sha256; t=1779381998; cv=none; d=zohomail.com; s=zohoarc; b=eaJl+biJ/uCiXOMMTZ1FSPcQRcNlF33UkXqDlNHIayOlG719Qu+UA+317ijBZxGOUDUruyqM6eOXnfCRemU87TjSYN8UP2bgBwuZcBvTMYMKZWSMxcIoE92D/2sGnzO/ta6u8nS+grBtYkMk4wpuQQdC4tfQ8mAEJaD4wC2YE8o= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1779381998; h=Content-Type:Content-Transfer-Encoding:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Owner:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:Reply-To:References:Subject:Subject:To:To:Message-Id:Cc; bh=755s2IWo7ZqUnOyPP643sXleLhfuuow0wTnAZWx0yfk=; b=jUSzjNDRO1ORpUhi9isysbqxjPDvK9Sk/J27LoaSt6jHJH8VbAgPMKtcPjqE/xJUOpI0k3EoT/qRJE6t/k8xKpvmq7T1z7NmuZvZJFR5Jp5e+2ug/LnugbgXwAVvNTyvgH52Kpr91NauGP+WITbpITcckPIp642U2DiaGFhS3uE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.libvirt.org designates 38.145.34.151 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=pass header.from= (p=reject dis=none) Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [38.145.34.151]) by mx.zohomail.com with SMTPS id 1779381998727664.5143252928193; Thu, 21 May 2026 09:46:38 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 993) id C3A3741B30; Thu, 21 May 2026 12:46:37 -0400 (EDT) Received: from [172.19.199.4] (unknown [10.16.107.18]) by lists.libvirt.org (Postfix) with ESMTP id 6C82341D80; Thu, 21 May 2026 12:25:06 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 993) id 914D041D22; Thu, 21 May 2026 12:24:32 -0400 (EDT) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (3072 bits) server-digest SHA256) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id CE6A641B54 for ; Thu, 21 May 2026 12:23:58 -0400 (EDT) Received: from mx-prod-mc-03.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-133-uN1BvG1EPE6g1EsQfW0sqw-1; Thu, 21 May 2026 12:23:46 -0400 Received: from mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.17]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id CAF971956053 for ; Thu, 21 May 2026 16:23:45 +0000 (UTC) Received: from speedmetal.openshiftapps.com (unknown [10.44.22.3]) by mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 251241955F19 for ; Thu, 21 May 2026 16:23:44 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 4.0.1 (2024-03-26) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=0.6 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H4, RCVD_IN_MSPIKE_WL,RCVD_IN_SBL_CSS,SPF_HELO_PASS autolearn=no autolearn_force=no version=4.0.1 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1779380638; h=from:from: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; bh=755s2IWo7ZqUnOyPP643sXleLhfuuow0wTnAZWx0yfk=; b=FP/M0O+69i+lEPpSsv5dfePLXN1pdyddpdszvkTnRy0fIfaPpR8NC4n7qCuD+Gk3o9DBcA xukvs5yJohjytt21AFQlqRG7jiiPUBMg+hyXXbRCpNR+v3hKn3E4YPOSiZod3CzlYjrjxH Z8Yy2BFX9f3OYLsEbX9I4Qs+TYfUz9Q= X-MC-Unique: uN1BvG1EPE6g1EsQfW0sqw-1 X-Mimecast-MFC-AGG-ID: uN1BvG1EPE6g1EsQfW0sqw_1779380625 To: devel@lists.libvirt.org Subject: [PATCH 03/30] util: command: Extract common parts of FD closing to virCommandMassClose Date: Thu, 21 May 2026 18:23:12 +0200 Message-ID: <91b3b746321c7960528efbd7820104e4c76fc0a0.1779380461.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.17 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: oWgGxX-CqJkvYtuP-QJKxc2PmltuJHJnlIS9X9nwGW4_1779380625 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: 7H72HEVOL6LHL7N5SMD2QT33J546GCHF X-Message-ID-Hash: 7H72HEVOL6LHL7N5SMD2QT33J546GCHF X-MailFrom: pkrempa@redhat.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; header-match-devel.lists.libvirt.org-0; emergency; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.10 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: From: Peter Krempa via Devel Reply-To: Peter Krempa X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1779382001858154100 Content-Type: text/plain; charset="utf-8" From: Peter Krempa Extract the lookup of used FDs and their setup to virCommandMassClose rather than duplicate it in the two functions we have for using different modes of FD closing. Signed-off-by: Peter Krempa Reviewed-by: Michal Privoznik --- src/util/vircommand.c | 85 ++++++++++++++++++++----------------------- 1 file changed, 39 insertions(+), 46 deletions(-) diff --git a/src/util/vircommand.c b/src/util/vircommand.c index e871d572a6..2d13cf629c 100644 --- a/src/util/vircommand.c +++ b/src/util/vircommand.c @@ -520,16 +520,12 @@ virCommandMassCloseGetFDs(virBitmap *fds) } static int -virCommandMassCloseFrom(virCommand *cmd, - int childin, - int childout, - int childerr) +virCommandMassCloseFrom(virBitmap *keep) { g_autoptr(virBitmap) fds =3D NULL; int openmax =3D sysconf(_SC_OPEN_MAX); - int lastfd =3D -1; + int lastfd =3D virBitmapLastSetBit(keep); int fd =3D -1; - size_t i; /* In general, it is not safe to call malloc() between fork() and exec= () * because the child might have forked at the worst possible time, i.e. @@ -551,24 +547,14 @@ virCommandMassCloseFrom(virCommand *cmd, if (virCommandMassCloseGetFDs(fds) < 0) return -1; - lastfd =3D MAX(lastfd, childin); - lastfd =3D MAX(lastfd, childout); - lastfd =3D MAX(lastfd, childerr); - - for (i =3D 0; i < cmd->npassfd; i++) - lastfd =3D MAX(lastfd, cmd->passfd[i].fd); - fd =3D virBitmapNextSetBit(fds, 2); for (; fd >=3D 0 && fd <=3D lastfd; fd =3D virBitmapNextSetBit(fds, fd= )) { - if (fd =3D=3D childin || fd =3D=3D childout || fd =3D=3D childerr) + int tmpfd =3D fd; + + if (virBitmapIsBitSet(keep, fd)) continue; - if (!virCommandFDIsSet(cmd, fd)) { - int tmpfd =3D fd; - VIR_MASS_CLOSE(tmpfd); - } else if (virSetInherit(fd, true) < 0) { - virReportSystemError(errno, _("failed to preserve fd %1$d"), f= d); - return -1; - } + + VIR_MASS_CLOSE(tmpfd); } if (virCloseFrom(lastfd + 1) < 0) { @@ -588,33 +574,13 @@ virCommandMassCloseFrom(virCommand *cmd, static int -virCommandMassCloseRange(virCommand *cmd, - int childin, - int childout, - int childerr) +virCommandMassCloseRange(virBitmap *keep) { - g_autoptr(virBitmap) fds =3D virBitmapNew(0); ssize_t first; ssize_t last; - size_t i; - - virBitmapSetBitExpand(fds, childin); - virBitmapSetBitExpand(fds, childout); - virBitmapSetBitExpand(fds, childerr); - - for (i =3D 0; i < cmd->npassfd; i++) { - int fd =3D cmd->passfd[i].fd; - - virBitmapSetBitExpand(fds, fd); - - if (virSetInherit(fd, true) < 0) { - virReportSystemError(errno, _("failed to preserve fd %1$d"), f= d); - return -1; - } - } first =3D 2; - while ((last =3D virBitmapNextSetBit(fds, first)) >=3D 0) { + while ((last =3D virBitmapNextSetBit(keep, first)) >=3D 0) { if (first + 1 =3D=3D last) { first =3D last; continue; @@ -642,17 +608,44 @@ virCommandMassCloseRange(virCommand *cmd, } - +/** + * virCommandMassClose: + * @cmd: command structure + * @childin: fd passed to child as stdin + * @childout: fd passed to child as stdout + * @childerr: fd passed to child as stderr + * + * Prepares FDs to be passed to the child process spawned by @cmd and clos= es + * every other FD. + */ static int virCommandMassClose(virCommand *cmd, int childin, int childout, int childerr) { + g_autoptr(virBitmap) fds =3D virBitmapNew(0); + size_t i; + + virBitmapSetBitExpand(fds, childin); + virBitmapSetBitExpand(fds, childout); + virBitmapSetBitExpand(fds, childerr); + + for (i =3D 0; i < cmd->npassfd; i++) { + int fd =3D cmd->passfd[i].fd; + + virBitmapSetBitExpand(fds, fd); + + if (virSetInherit(fd, true) < 0) { + virReportSystemError(errno, _("failed to preserve fd %1$d"), f= d); + return -1; + } + } + if (virCloseRangeIsSupported()) - return virCommandMassCloseRange(cmd, childin, childout, childerr); + return virCommandMassCloseRange(fds); - return virCommandMassCloseFrom(cmd, childin, childout, childerr); + return virCommandMassCloseFrom(fds); } --=20 2.54.0 From nobody Sat May 30 15:28:30 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.libvirt.org designates 38.145.34.151 as permitted sender) client-ip=38.145.34.151; envelope-from=devel-bounces@lists.libvirt.org; helo=lists.libvirt.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.libvirt.org designates 38.145.34.151 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=pass(p=reject dis=none) header.from=lists.libvirt.org ARC-Seal: i=1; a=rsa-sha256; t=1779381489; cv=none; d=zohomail.com; s=zohoarc; b=EDGwHxrK47UWgTA2qUYzfydoLcENgTyJyn7Cl45ORUZkDbLq/Ei7vt4OdibAlc1SAdhfm69q1FlyiUEP0I72bHg4BWgO4JX2Kq0T+6adr90D5bOuAWvsxLGn+YsitfaKDlEwXqXeT2jPsO6n1ke7odT+00PGkDYQpzP1sjRwosM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1779381489; h=Content-Type:Content-Transfer-Encoding:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Owner:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:Reply-To:References:Subject:Subject:To:To:Message-Id:Cc; bh=PrmJ00A5C166IP+x0+ntYGDtMe+B8pRKlzaMyzfuyK4=; b=ddRSDOCPw8yoX2Hugxg3pULbb7U0S0ArGWPZLTRmQfgNwVkjQqmzwy+md8/BCu5AI/wTlUdC++kDiDVbOzH4J7fsGhZaQr4CFylGRCe2zkklKzVmxY6PZeqcgyh8IfXfU0aTfV08X1hLLHZG4gCtNlT1kNHWpjH18TfKXYaPm2c= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.libvirt.org designates 38.145.34.151 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=pass header.from= (p=reject dis=none) Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [38.145.34.151]) by mx.zohomail.com with SMTPS id 1779381489813165.74264977256803; Thu, 21 May 2026 09:38:09 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 993) id 80F9C41B19; Thu, 21 May 2026 12:38:08 -0400 (EDT) Received: from [172.19.199.4] (unknown [10.16.107.18]) by lists.libvirt.org (Postfix) with ESMTP id 72AED41D3C; Thu, 21 May 2026 12:24:35 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 993) id 0EB6141AC4; Thu, 21 May 2026 12:24:07 -0400 (EDT) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (3072 bits) server-digest SHA256) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id B25AC41AC4 for ; Thu, 21 May 2026 12:23:54 -0400 (EDT) Received: from mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-248-_6EH9xqoPTaI4hQxuqIFCw-1; Thu, 21 May 2026 12:23:47 -0400 Received: from mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.17]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 157A519560AE for ; Thu, 21 May 2026 16:23:47 +0000 (UTC) Received: from speedmetal.openshiftapps.com (unknown [10.44.22.3]) by mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 48F651956053 for ; Thu, 21 May 2026 16:23:46 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 4.0.1 (2024-03-26) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=0.6 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H5, RCVD_IN_MSPIKE_WL,RCVD_IN_SBL_CSS,SPF_HELO_PASS autolearn=no autolearn_force=no version=4.0.1 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1779380634; h=from:from: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; bh=PrmJ00A5C166IP+x0+ntYGDtMe+B8pRKlzaMyzfuyK4=; b=RWeu1j/t1/iCL0oOw3AIhWYpmTyzjBghkXkU0vvqVnoLN8GcB7MncWrSeZSv/NRlK5f6xZ AHjcpPGgHZPgTrmdPKq7Uc5wSKzaaN3NXwyXpi9EfswYI4Plmyum6KR3WBwuuplucsUSBQ NNbxUhJLTFZBnQg+CoSxoZjov7wuPQM= X-MC-Unique: _6EH9xqoPTaI4hQxuqIFCw-1 X-Mimecast-MFC-AGG-ID: _6EH9xqoPTaI4hQxuqIFCw_1779380627 To: devel@lists.libvirt.org Subject: [PATCH 04/30] qemuFDPassLogFDInfo: Check if FD is valid before 'fstat'-ing it Date: Thu, 21 May 2026 18:23:13 +0200 Message-ID: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.17 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: ZxbDBwO7g6bLWS9cVmIAdPA-YzTf8A_We25rXgQqvyU_1779380627 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: Z7RT4HLE6BXVN4FUHVCARIACNZT7MJW5 X-Message-ID-Hash: Z7RT4HLE6BXVN4FUHVCARIACNZT7MJW5 X-MailFrom: pkrempa@redhat.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; header-match-devel.lists.libvirt.org-0; emergency; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.10 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: From: Peter Krempa via Devel Reply-To: Peter Krempa X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1779381491612158501 Content-Type: text/plain; charset="utf-8" From: Peter Krempa Some test cases (qemuxmlconftest) currently use made up descriptors, which cause e.g. valgrind to be unhappy: =3D=3D831186=3D=3D File descriptor 1729 Invalid file descriptor =3D=3D831186=3D=3D at 0x531042E: fgetxattr (in /usr/lib64/libc.so.6) =3D=3D831186=3D=3D by 0x5AE2846: ??? (in /usr/lib64/libselinux.so.1) =3D=3D831186=3D=3D by 0x5AE7093: fgetfilecon_raw (in /usr/lib64/libseli= nux.so.1) =3D=3D831186=3D=3D by 0x4EB736F: qemuFDPassLogFDInfo (qemu_fd.c:92) =3D=3D831186=3D=3D by 0x4EB7B8E: qemuFDPassDirectTransferCommand (qemu_= fd.c:443) when tracking FDs. Since 'qemuFDPassLogFDInfo' just logs information about the FD we can simply not query the FD if it's made up. Signed-off-by: Peter Krempa Reviewed-by: Michal Privoznik --- src/qemu/qemu_fd.c | 65 +++++++++++++++++++++++++--------------------- 1 file changed, 35 insertions(+), 30 deletions(-) diff --git a/src/qemu/qemu_fd.c b/src/qemu/qemu_fd.c index ef0a8d8127..8c8b6afcfd 100644 --- a/src/qemu/qemu_fd.c +++ b/src/qemu/qemu_fd.c @@ -25,6 +25,8 @@ #include "virfile.h" #include "virlog.h" +#include + /* Used strictly for logging selinux context of passed FD */ #ifdef WITH_SECDRIVER_SELINUX # include @@ -59,40 +61,43 @@ qemuFDPassLogFDInfo(const char *name, g_autofree char *selinux =3D NULL; g_autofree char *tmp =3D NULL; - if (fstat(fd, &st) =3D=3D 0) { - switch (st.st_mode & S_IFMT) { - case S_IFBLK: - type =3D "block"; - break; - case S_IFCHR: - type =3D "char"; - break; - case S_IFDIR: - type =3D "directory"; - break; - case S_IFIFO: - type =3D "pipe"; - break; - case S_IFLNK: - type =3D "symlink"; - break; - case S_IFREG: - type =3D "file"; - break; - case S_IFSOCK: - type =3D "socket"; - break; - default: - type =3D tmp =3D g_strdup_printf("unknown:'0x%x')", st.st_m= ode & S_IFMT); - break; + if (fcntl(fd, F_GETFD) !=3D -1) { + if (fstat(fd, &st) =3D=3D 0) { + switch (st.st_mode & S_IFMT) { + case S_IFBLK: + type =3D "block"; + break; + case S_IFCHR: + type =3D "char"; + break; + case S_IFDIR: + type =3D "directory"; + break; + case S_IFIFO: + type =3D "pipe"; + break; + case S_IFLNK: + type =3D "symlink"; + break; + case S_IFREG: + type =3D "file"; + break; + case S_IFSOCK: + type =3D "socket"; + break; + default: + type =3D tmp =3D g_strdup_printf("unknown:'0x%x')", st.st_= mode & S_IFMT); + break; + } } - } #ifdef WITH_SECDRIVER_SELINUX - ignore_value(fgetfilecon_raw(fd, &selinux)); -#else - selinux =3D g_strdup("N/A"); + ignore_value(fgetfilecon_raw(fd, &selinux)); #endif + } + + if (!selinux) + selinux =3D g_strdup("N/A"); VIR_DEBUG("passing fd:'%i', name:'%s'(%zu) type:'%s' selinux:'%s'", fd, name, idx, type, selinux); --=20 2.54.0 From nobody Sat May 30 15:28:30 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.libvirt.org designates 38.145.34.151 as permitted sender) client-ip=38.145.34.151; envelope-from=devel-bounces@lists.libvirt.org; helo=lists.libvirt.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.libvirt.org designates 38.145.34.151 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=pass(p=reject dis=none) header.from=lists.libvirt.org ARC-Seal: i=1; a=rsa-sha256; t=1779381352; cv=none; d=zohomail.com; s=zohoarc; b=LB0MkOYiyRuhC+lRb7Z5g6RQQyEGvN8GqgE+NnWvsBOVU4k8locsnUr/9J+xz7OhojO0hvOTfXmEWa8el13LeiaDJjdvl4/c38WJnyC9cppYwttSYKjYqlP6Txjltpf5682LZ/jp/GCwVeFew7aAS0Xt359dkjAry7jxDL84vAE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1779381352; h=Content-Type:Content-Transfer-Encoding:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Owner:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:Reply-To:References:Subject:Subject:To:To:Message-Id:Cc; bh=u0G7Ox9CRwIMsiPgEZiOz1OjKv2Nu/v4Clmg7jj7cyA=; b=itY9vRencNrhGDtVabxRiAqfbMxVFpZODPjXL382dh1ZncNF7Jpj5uoVIUGEEsYMcLPZXfHihlsQ3tfmyvxOMLTX3BgmUEhe0asvcQyltM11WNtRous07IkW7nwtXB/z/jQWADL3YRFZ+kk+J6mb5HW3wNL0y5ZrMApb1XUYm4Q= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.libvirt.org designates 38.145.34.151 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=pass header.from= (p=reject dis=none) Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [38.145.34.151]) by mx.zohomail.com with SMTPS id 1779381352384849.5644448979048; Thu, 21 May 2026 09:35:52 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 993) id 48D8441A0A; Thu, 21 May 2026 12:35:51 -0400 (EDT) Received: from [172.19.199.4] (unknown [10.16.107.18]) by lists.libvirt.org (Postfix) with ESMTP id CD91341CBC; Thu, 21 May 2026 12:24:23 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 993) id BF558419D2; Thu, 21 May 2026 12:23:52 -0400 (EDT) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (3072 bits) server-digest SHA256) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id 11F49419C7 for ; Thu, 21 May 2026 12:23:52 -0400 (EDT) Received: from mx-prod-mc-05.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-214-fIbn0rcZMrymllvxBoQu2g-1; Thu, 21 May 2026 12:23:49 -0400 Received: from mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.17]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 5624B19560AA for ; Thu, 21 May 2026 16:23:48 +0000 (UTC) Received: from speedmetal.openshiftapps.com (unknown [10.44.22.3]) by mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 898AF1956056 for ; Thu, 21 May 2026 16:23:47 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 4.0.1 (2024-03-26) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=0.6 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H5, RCVD_IN_MSPIKE_WL,RCVD_IN_SBL_CSS,SPF_HELO_PASS autolearn=no autolearn_force=no version=4.0.1 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1779380631; h=from:from: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; bh=u0G7Ox9CRwIMsiPgEZiOz1OjKv2Nu/v4Clmg7jj7cyA=; b=BfuQVD46kBnsy303AbqmiKWzswIEHuqu/nXnuw4qmm4z5PelwPWKFIrVyFuEtfguQTokMB aZ5+F+ngvRKpIPVSZonYnxvpOmy4FXR/cHY10+w3km7jS9SpSTHgT36y6MQQK4hs8FwZGJ fCgn7KJKU3vA3shYBIRrOCK/Zj6faGo= X-MC-Unique: fIbn0rcZMrymllvxBoQu2g-1 X-Mimecast-MFC-AGG-ID: fIbn0rcZMrymllvxBoQu2g_1779380628 To: devel@lists.libvirt.org Subject: [PATCH 05/30] qemuxml2argvmock: Fix behaviour of 'virCommandPass' mock Date: Thu, 21 May 2026 18:23:14 +0200 Message-ID: <33b9eadced507c63ac4c5f0fb0778f73d3787da2.1779380461.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.17 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: UBSdhfEuSXyQ5bqzf1XwV9_j22xh0vR__QaJx2FnsQo_1779380628 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: JCNFN5YE5H54LROCNJIZBMEHM4LRH7QN X-Message-ID-Hash: JCNFN5YE5H54LROCNJIZBMEHM4LRH7QN X-MailFrom: pkrempa@redhat.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; header-match-devel.lists.libvirt.org-0; emergency; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.10 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: From: Peter Krempa via Devel Reply-To: Peter Krempa X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1779381354470158500 Content-Type: text/plain; charset="utf-8" From: Peter Krempa The 'virCommandPass' mock in 'qemuxml2argvmock.so' skipped passing most FDs to the real implementation of 'virCommandPass', except for few fake FDs that were hardcoded. This meant that if a test case had an valid FD that it used for testing that FD would be leaked. At the same time fake fds 1730, 1731, 1732 would be actually passed to the virCommand itself although the FD was invalid. Since neither of the above makes sense fix the implementation the following way: - refuse to pass any STDIO fds They are real and they would break test program output. Some tests do try to use them errorneously; they will be addressed later. - pass real FDs to virCommand Real FDs can be properly handled by virCommand. Especially they will be closed once the virCommand object is disposed of. - don't pass fake FDs They create extra noise e.g. in valgrind. Skip those as it makes no sense to handle those. This patch addresses most failures that valgrind reports with --track-fds=3Dall. Signed-off-by: Peter Krempa Reviewed-by: Michal Privoznik --- tests/qemuxml2argvmock.c | 28 ++++++++++++++++++---------- 1 file changed, 18 insertions(+), 10 deletions(-) diff --git a/tests/qemuxml2argvmock.c b/tests/qemuxml2argvmock.c index b4ebf1a172..d24319638b 100644 --- a/tests/qemuxml2argvmock.c +++ b/tests/qemuxml2argvmock.c @@ -180,24 +180,32 @@ virHostGetDRMRenderNode(void) static void (*real_virCommandPassFD)(virCommand *cmd, int fd, unsigned int= flags); -static const int testCommandPassSafeFDs[] =3D { 1730, 1731, 1732 }; void virCommandPassFD(virCommand *cmd, int fd, unsigned int flags) { - size_t i; - - for (i =3D 0; i < G_N_ELEMENTS(testCommandPassSafeFDs); i++) { - if (testCommandPassSafeFDs[i] =3D=3D fd) { - if (!real_virCommandPassFD) - VIR_MOCK_REAL_INIT(virCommandPassFD); + /* Test cases run in the context of the test program, so attempting to= use + * the STDIO fds with virCommand could break/close them and thus break + * output of the test itself. */ + if (fd =3D=3D STDIN_FILENO || + fd =3D=3D STDOUT_FILENO || + fd =3D=3D STDERR_FILENO) { + return; + } - real_virCommandPassFD(cmd, fd, flags); - return; - } + /* Some test scenarios pass invalid FDs to virCommand. We want to skip + * operations on those since they cause errors in e.g. valgrind. + */ + if (fcntl(fd, F_GETFD) =3D=3D -1) { + return; } + + if (!real_virCommandPassFD) + VIR_MOCK_REAL_INIT(virCommandPassFD); + + real_virCommandPassFD(cmd, fd, flags); } int --=20 2.54.0 From nobody Sat May 30 15:28:30 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.libvirt.org designates 38.145.34.151 as permitted sender) client-ip=38.145.34.151; envelope-from=devel-bounces@lists.libvirt.org; helo=lists.libvirt.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.libvirt.org designates 38.145.34.151 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=pass(p=reject dis=none) header.from=lists.libvirt.org ARC-Seal: i=1; a=rsa-sha256; t=1779381420; cv=none; d=zohomail.com; s=zohoarc; b=jbJWfPBTA4MfhftnhMRhpRZMA36KxJ7e+Vv3IoC7d7SwRIuSrEeNknNknSo3TZ+3zvYN/ZNn140ufGiuy9puHepkYzk8pF3uxV9n9l7RKEMmRBI08CSV/VDX4EL3aj6SHZKfaT0KoZZ1nu4tIPTpZcOaSVYrUY2VruSv0l9t6Zk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1779381420; h=Content-Type:Content-Transfer-Encoding:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Owner:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:Reply-To:References:Subject:Subject:To:To:Message-Id:Cc; bh=mDXSY9qsCdOqsPlaKwimkdB1gpaeVSBCrme3tK2KT4k=; b=nepRm9ZtN2hUUhiGgWCpzHg9KFusxr6p/VMyZ4dUIi+l1DLmf6kz9lhqXGQQtLKosuTFUGAYZXd5VwJDwBrjoZLSOmWEy4JSdROc+rs+ncoJEEH3l8+6XSpPNQ4N+dYcBka86Gw6SEY7KcEf/wnkP17VcoVfFIZ1MaWlbt78OVM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.libvirt.org designates 38.145.34.151 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=pass header.from= (p=reject dis=none) Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [38.145.34.151]) by mx.zohomail.com with SMTPS id 1779381420670632.1563514121283; Thu, 21 May 2026 09:37:00 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 993) id CF5C441CC4; Thu, 21 May 2026 12:36:59 -0400 (EDT) Received: from [172.19.199.4] (unknown [10.16.107.18]) by lists.libvirt.org (Postfix) with ESMTP id 0AAAC41CE8; Thu, 21 May 2026 12:24:29 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 993) id C3049419C7; Thu, 21 May 2026 12:24:00 -0400 (EDT) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (3072 bits) server-digest SHA256) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id 7940F41A86 for ; Thu, 21 May 2026 12:23:53 -0400 (EDT) Received: from mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-260-I5HQBtSzNdabXdtIJVg0lg-1; Thu, 21 May 2026 12:23:50 -0400 Received: from mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.17]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 760D818005B5 for ; Thu, 21 May 2026 16:23:49 +0000 (UTC) Received: from speedmetal.openshiftapps.com (unknown [10.44.22.3]) by mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id BFE241956053 for ; Thu, 21 May 2026 16:23:48 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 4.0.1 (2024-03-26) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H5, RCVD_IN_MSPIKE_WL,SPF_HELO_PASS autolearn=unavailable autolearn_force=no version=4.0.1 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1779380632; h=from:from: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; bh=mDXSY9qsCdOqsPlaKwimkdB1gpaeVSBCrme3tK2KT4k=; b=E+m2s4oUby5hsTxpoxBKYoFYE5JY2fAw5GSeG0VkfRjs/aTerNJ5UlJdx0qHzj+jGu9Xwr JAQprah54u8FxS2HFflIDHeLvN1MRPKfy/UTA2egr3t+W1dW0RbKFWl1XvqYtVMqsvrA9P 8RNtHhlxn/1nYOojRGnmc51VpE9R1Yc= X-MC-Unique: I5HQBtSzNdabXdtIJVg0lg-1 X-Mimecast-MFC-AGG-ID: I5HQBtSzNdabXdtIJVg0lg_1779380629 To: devel@lists.libvirt.org Subject: [PATCH 06/30] util: vircommand: Add direct accessor for 'args' array for tests Date: Thu, 21 May 2026 18:23:15 +0200 Message-ID: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.17 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: ZWMz7cJIUQP8xSIuGTkcFoVdig0BF_5OmUAsx4m6RMw_1779380629 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: IPDPNPL6YFJNTXKSXRSNWU5OZW4B53RV X-Message-ID-Hash: IPDPNPL6YFJNTXKSXRSNWU5OZW4B53RV X-MailFrom: pkrempa@redhat.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; header-match-devel.lists.libvirt.org-0; emergency; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.10 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: From: Peter Krempa via Devel Reply-To: Peter Krempa X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1779381423232154100 Content-Type: text/plain; charset="utf-8" From: Peter Krempa Introduce virCommandArgListAccess which returns 'args' and 'nargs' Upcoming patches will add code which censores/stabilizes FD numbers in test outputs. This will be done by rewriting the argument of the command before comparing it with test output. Add a test-only function to directly access 'args' and 'nargs' of a virCommand to do this modification. This accessor will also be used instead of 'virCommandGetArgList' in 'testCompareXMLToArgvValidateSchema' to avoid needles copy of all arguments. Signed-off-by: Peter Krempa Reviewed-by: Michal Privoznik --- src/libvirt_private.syms | 1 + src/util/vircommand.c | 20 ++++++++++++++++++++ src/util/vircommandpriv.h | 4 ++++ 3 files changed, 25 insertions(+) diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 7232b7c663..d2fc35505b 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -2208,6 +2208,7 @@ virCommandAddEnvPassCommon; virCommandAddEnvString; virCommandAddEnvXDG; virCommandAllowCap; +virCommandArgListAccess; virCommandClearCaps; virCommandDaemonize; virCommandDoAsyncIO; diff --git a/src/util/vircommand.c b/src/util/vircommand.c index 2d13cf629c..00d0b58ee1 100644 --- a/src/util/vircommand.c +++ b/src/util/vircommand.c @@ -2172,6 +2172,26 @@ virCommandGetArgList(virCommand *cmd, } +/** + * virCommandGetArgList: + * @cmd: command struct + * @args: filled with pointer to list of args of @cmd + * @nargs: filled with number of arguments + * + * For use only in tests. + * + * Allows access to the arguments, including modification. + */ +void +virCommandArgListAccess(virCommand *cmd, + char ***args, + size_t *nargs) +{ + *args =3D cmd->args; + *nargs =3D cmd->nargs; +} + + /* * virCommandGetBinaryPath: * @cmd: virCommand* containing all information about the program diff --git a/src/util/vircommandpriv.h b/src/util/vircommandpriv.h index d579810bb5..ca58269afa 100644 --- a/src/util/vircommandpriv.h +++ b/src/util/vircommandpriv.h @@ -51,3 +51,7 @@ void virCommandSetDryRun(virCommandDryRunToken *tok, void virCommandPeekSendBuffers(virCommand *cmd, virCommandSendBuffer **buffers, int *nbuffers); + +void virCommandArgListAccess(virCommand *cmd, + char ***args, + size_t *nargs); --=20 2.54.0 From nobody Sat May 30 15:28:30 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.libvirt.org designates 38.145.34.151 as permitted sender) client-ip=38.145.34.151; envelope-from=devel-bounces@lists.libvirt.org; helo=lists.libvirt.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.libvirt.org designates 38.145.34.151 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=pass(p=reject dis=none) header.from=lists.libvirt.org ARC-Seal: i=1; a=rsa-sha256; t=1779382376; cv=none; d=zohomail.com; s=zohoarc; b=by18U2gBfJLAh9MAtsE/9zyrVgNBqywxMg9Lj25n/nkr9wEgAqsGiSUFPK8WaJcCF7gFxbxbwAwKaFRqJOWMJGx1rlg5fvR8yiiYdyi6Efgc8LueAb4V16kSdkJnEG1eqmOpHV9GlQQjeZRAcDhUk05DK8aBayUf4KeMQ6InvM8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1779382376; h=Content-Type:Content-Transfer-Encoding:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Owner:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:Reply-To:References:Subject:Subject:To:To:Message-Id:Cc; bh=9Njm+TXaH4utYZWSeqof1f5G23JCunX7gUIwa04Y/fM=; b=TCCb386M/mYUedWaj1RnOOTw2kfrjv7cxcms/dgn02KJC0Q6A1o28YUJGe3pQkrA0/uuYB8Ko416HQiSbByBgg9BBeXEkpOdqydiprtqW6xQ9lnB1i/Vrf24z/OqjbQmpmMu6uGkXQsnVD+Q/GTHkQujIZ81U8Kw+8u2Drkzfe4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.libvirt.org designates 38.145.34.151 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=pass header.from= (p=reject dis=none) Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [38.145.34.151]) by mx.zohomail.com with SMTPS id 1779382376264389.12796474643335; Thu, 21 May 2026 09:52:56 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 993) id 45C8641B10; Thu, 21 May 2026 12:52:55 -0400 (EDT) Received: from [172.19.199.4] (unknown [10.16.107.18]) by lists.libvirt.org (Postfix) with ESMTP id 2899441A83; Thu, 21 May 2026 12:25:27 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 993) id 16BD541A7E; Thu, 21 May 2026 12:25:19 -0400 (EDT) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (3072 bits) server-digest SHA256) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id 10D9C41A7E for ; Thu, 21 May 2026 12:24:01 -0400 (EDT) Received: from mx-prod-mc-08.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-473-UjVljjKMPPiYumLkr5eU6Q-1; Thu, 21 May 2026 12:23:51 -0400 Received: from mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.17]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 8FC3018002D7 for ; Thu, 21 May 2026 16:23:50 +0000 (UTC) Received: from speedmetal.openshiftapps.com (unknown [10.44.22.3]) by mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id DCF051956056 for ; Thu, 21 May 2026 16:23:49 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 4.0.1 (2024-03-26) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H4, RCVD_IN_MSPIKE_WL,SPF_HELO_PASS autolearn=unavailable autolearn_force=no version=4.0.1 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1779380640; h=from:from: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; bh=9Njm+TXaH4utYZWSeqof1f5G23JCunX7gUIwa04Y/fM=; b=iitI1/Yvth8LKpx5S5JlCkEYEatNzdLNVjMBggKAuS4qPT0p1HPj3Rfshsjq6MCo2F3CV/ LGSBP3jaCOTC3B8t6ALZqybKAxg/Spi5rp52Z+ErPyePuo+pxkN/XY2erha7xhGxALk9iz ogZh/2I3+oZ30aQERA2/ifXt19qEjsE= X-MC-Unique: UjVljjKMPPiYumLkr5eU6Q-1 X-Mimecast-MFC-AGG-ID: UjVljjKMPPiYumLkr5eU6Q_1779380630 To: devel@lists.libvirt.org Subject: [PATCH 07/30] qemuxmlconftest: Use virCommandArgListAccess in testCompareXMLToArgvValidateSchema Date: Thu, 21 May 2026 18:23:16 +0200 Message-ID: <5254d8922199cf9807559e86c78d280c1b4c36eb.1779380461.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.17 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: jgpyzql9oLE5Us7WXKZ5is8hpQnlF8WPF28ng1rExJo_1779380630 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: ZU4CDYOFDO5FWOJTE23CWOCXJDHUPZUS X-Message-ID-Hash: ZU4CDYOFDO5FWOJTE23CWOCXJDHUPZUS X-MailFrom: pkrempa@redhat.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; header-match-devel.lists.libvirt.org-0; emergency; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.10 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: From: Peter Krempa via Devel Reply-To: Peter Krempa X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1779382379702154100 Content-Type: text/plain; charset="utf-8" From: Peter Krempa Access the args directly rather than fetching a copy since we have a new helper now. Signed-off-by: Peter Krempa Reviewed-by: Michal Privoznik --- tests/qemuxmlconftest.c | 50 ++++++++++++++++++----------------------- 1 file changed, 22 insertions(+), 28 deletions(-) diff --git a/tests/qemuxmlconftest.c b/tests/qemuxmlconftest.c index ff27bed740..ab62748013 100644 --- a/tests/qemuxmlconftest.c +++ b/tests/qemuxmlconftest.c @@ -31,6 +31,9 @@ #define LIBVIRT_QEMU_PROCESSPRIV_H_ALLOW #include "qemu/qemu_processpriv.h" +#define LIBVIRT_VIRCOMMANDPRIV_H_ALLOW +#include "util/vircommandpriv.h" + #include "testutilsqemu.h" #define VIR_FROM_THIS VIR_FROM_QEMU @@ -282,16 +285,26 @@ static const struct testValidateSchemaCommandData com= mands[] =3D { }; static int -testCompareXMLToArgvValidateSchemaCommand(GStrv args, - GHashTable *schema) +testCompareXMLToArgvValidateSchema(virCommand *cmd, + testQemuInfo *info) { - GStrv arg; + char **args; + size_t nargs; + size_t a; + + if (!info->qmpSchema) + return 0; - for (arg =3D args; *arg; arg++) { - const char *curcommand =3D *arg; - const char *curargs =3D *(arg + 1); + virCommandArgListAccess(cmd, &args, &nargs); + + for (a =3D 0; a < nargs; a++) { + const char *curcommand =3D args[a]; + const char *curargs =3D NULL; size_t i; + if (a + 1 < nargs) + curargs =3D args[a + 1]; + for (i =3D 0; i < G_N_ELEMENTS(commands); i++) { const struct testValidateSchemaCommandData *command =3D comman= ds + i; g_auto(virBuffer) debug =3D VIR_BUFFER_INITIALIZER; @@ -307,7 +320,7 @@ testCompareXMLToArgvValidateSchemaCommand(GStrv args, } if (*curargs !=3D '{') { - arg++; + a++; break; } @@ -315,7 +328,7 @@ testCompareXMLToArgvValidateSchemaCommand(GStrv args, return -1; if (testQEMUSchemaValidateCommand(command->schema, jsonargs, - schema, false, false, + info->qmpSchema, false, fals= e, command->allowIncomplete, &debug) < 0) { VIR_TEST_VERBOSE("failed to validate '%s %s' against QAPI = schema: %s", @@ -323,7 +336,7 @@ testCompareXMLToArgvValidateSchemaCommand(GStrv args, return -1; } - arg++; + a++; } } @@ -331,25 +344,6 @@ testCompareXMLToArgvValidateSchemaCommand(GStrv args, } -static int -testCompareXMLToArgvValidateSchema(virCommand *cmd, - testQemuInfo *info) -{ - g_auto(GStrv) args =3D NULL; - - if (!info->qmpSchema) - return 0; - - if (virCommandGetArgList(cmd, &args) < 0) - return -1; - - if (testCompareXMLToArgvValidateSchemaCommand(args, info->qmpSchema) <= 0) - return -1; - - return 0; -} - - static int testInfoCheckDuplicate(testQemuInfo *info) { --=20 2.54.0 From nobody Sat May 30 15:28:30 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.libvirt.org designates 38.145.34.151 as permitted sender) client-ip=38.145.34.151; envelope-from=devel-bounces@lists.libvirt.org; helo=lists.libvirt.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.libvirt.org designates 38.145.34.151 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=pass(p=reject dis=none) header.from=lists.libvirt.org ARC-Seal: i=1; a=rsa-sha256; t=1779381551; cv=none; d=zohomail.com; s=zohoarc; b=CIh4AS/WbPqEPBbuycAvUWw/ijln4xoMto/P8dT5nikAqqegCWgRqGFzGm6Eu1qG6oANWyuuhthLavd+gmn/IRyiSqUlxFfSFiudd1BTe5tWTexe4YXOuqd4TgmCx6q+/CS+7y6xtjxETlMHt2H6AY0fzY/JZK4T+awIuSecIsI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1779381551; h=Content-Type:Content-Transfer-Encoding:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Owner:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:Reply-To:References:Subject:Subject:To:To:Message-Id:Cc; bh=Pg85wKbAcjwC8UwxAtXlC3nRPkXVTIa8zLtpL6JtyBM=; b=RUR5+Fis4RAFuUNesHC1Bo4e/UG04qNlSQjnxhBYpNxiCXKyejQN2SgfYkIP7o19/mOhQAHtjsuwFj0rjhuz9ETX28tctYGHJ1a9CfPoLIivV+BU8gRAbfy/wrdHWKA1My19OiE1ahrm2kbe/ictYf/++R6j+PPV99kEzG1oUuI= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.libvirt.org designates 38.145.34.151 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=pass header.from= (p=reject dis=none) Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [38.145.34.151]) by mx.zohomail.com with SMTPS id 1779381551226596.7607363730973; Thu, 21 May 2026 09:39:11 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 993) id 11E2541AAD; Thu, 21 May 2026 12:39:09 -0400 (EDT) Received: from [172.19.199.4] (unknown [10.16.107.18]) by lists.libvirt.org (Postfix) with ESMTP id 610EC41B4A; Thu, 21 May 2026 12:24:43 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 993) id C2B9241C3B; Thu, 21 May 2026 12:24:13 -0400 (EDT) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (3072 bits) server-digest SHA256) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id D0DF741B07 for ; Thu, 21 May 2026 12:23:55 -0400 (EDT) Received: from mx-prod-mc-03.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-536-9IfFn-DkNj-YNF-GoxTH1A-1; Thu, 21 May 2026 12:23:52 -0400 Received: from mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.17]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id AE6271956068 for ; Thu, 21 May 2026 16:23:51 +0000 (UTC) Received: from speedmetal.openshiftapps.com (unknown [10.44.22.3]) by mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 049CF1956053 for ; Thu, 21 May 2026 16:23:50 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 4.0.1 (2024-03-26) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=0.6 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H5, RCVD_IN_MSPIKE_WL,RCVD_IN_SBL_CSS,SPF_HELO_PASS autolearn=no autolearn_force=no version=4.0.1 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1779380635; h=from:from: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; bh=Pg85wKbAcjwC8UwxAtXlC3nRPkXVTIa8zLtpL6JtyBM=; b=OlV/NCDxM1XVFQCSmJoDUW2oDySpn8rL7HhVXLF2Dy9LzVDT/Q3Ii5k5khBl6ciZzA1k7B PSmcRor3jQcb9rcTf2SEQ3XqRzrDFXkN4UUm1Q84gDBbJa03OUtzgOwMeHrkaXnP0CkYKK U/1I3TRjQ+OPzRoPeZ4Sn19nrY3SmdQ= X-MC-Unique: 9IfFn-DkNj-YNF-GoxTH1A-1 X-Mimecast-MFC-AGG-ID: 9IfFn-DkNj-YNF-GoxTH1A_1779380631 To: devel@lists.libvirt.org Subject: [PATCH 08/30] util: command: Remove virCommandGetArgList Date: Thu, 21 May 2026 18:23:17 +0200 Message-ID: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.17 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: EnuwrLX3URNKxffTrMfsrBAdgdUGI3FTKupzNPCe1TY_1779380631 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: QHYIGXK5YKM5GV542D2R6RNR2LO3YF7D X-Message-ID-Hash: QHYIGXK5YKM5GV542D2R6RNR2LO3YF7D X-MailFrom: pkrempa@redhat.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; header-match-devel.lists.libvirt.org-0; emergency; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.10 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: From: Peter Krempa via Devel Reply-To: Peter Krempa X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1779381553967158500 Content-Type: text/plain; charset="utf-8" From: Peter Krempa The function is now unused, remove it. Signed-off-by: Peter Krempa Reviewed-by: Michal Privoznik --- src/libvirt_private.syms | 1 - src/util/vircommand.c | 20 -------------------- src/util/vircommand.h | 1 - 3 files changed, 22 deletions(-) diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index d2fc35505b..50fe3a9218 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -2216,7 +2216,6 @@ virCommandDryRunTokenFree; virCommandDryRunTokenNew; virCommandExec; virCommandFree; -virCommandGetArgList; virCommandGetBinaryPath; virCommandGetGID; virCommandGetUID; diff --git a/src/util/vircommand.c b/src/util/vircommand.c index 00d0b58ee1..0fa9985f85 100644 --- a/src/util/vircommand.c +++ b/src/util/vircommand.c @@ -2152,26 +2152,6 @@ virCommandToString(virCommand *cmd, } -int -virCommandGetArgList(virCommand *cmd, - char ***args) -{ - size_t i; - - if (virCommandHasError(cmd)) { - virCommandRaiseError(cmd); - return -1; - } - - *args =3D g_new0(char *, cmd->nargs); - - for (i =3D 1; i < cmd->nargs; i++) - (*args)[i - 1] =3D g_strdup(cmd->args[i]); - - return 0; -} - - /** * virCommandGetArgList: * @cmd: command struct diff --git a/src/util/vircommand.h b/src/util/vircommand.h index a6e9a9a165..89c98e3c1a 100644 --- a/src/util/vircommand.h +++ b/src/util/vircommand.h @@ -179,7 +179,6 @@ int virCommandToStringBuf(virCommand *cmd, bool stripCommandPath); const char *virCommandGetBinaryPath(virCommand *cmd); -int virCommandGetArgList(virCommand *cmd, char ***args); int virCommandExec(virCommand *cmd, gid_t *groups, int ngroups) G_GNUC_WAR= N_UNUSED_RESULT; --=20 2.54.0 From nobody Sat May 30 15:28:30 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.libvirt.org designates 38.145.34.151 as permitted sender) client-ip=38.145.34.151; envelope-from=devel-bounces@lists.libvirt.org; helo=lists.libvirt.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.libvirt.org designates 38.145.34.151 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=pass(p=reject dis=none) header.from=lists.libvirt.org ARC-Seal: i=1; a=rsa-sha256; t=1779381638; cv=none; d=zohomail.com; s=zohoarc; b=Jc+4mjoK8A1f42Xgs3Uf0cyx2gdS9KuZ3muwKPlnf1ts9boIwWEpeUwoPPPQ65BUJis0Xk2hRPAhi4y8YcgYJMosNVL6W1eZqvyWXValfMaYxwtOVZ8eX/O/8A+LVMUnvty71PGJ09SKV8FeYqpXOwnnzv1+4Z/51ggSWGtUqSM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1779381638; h=Content-Type:Content-Transfer-Encoding:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Owner:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:Reply-To:References:Subject:Subject:To:To:Message-Id:Cc; bh=QmcU76u7MbUVOzMAaibvk8Q2y1jzqwO8n6U9dfNlfa8=; b=LkI73MI0bjpf+uLTuBta6M90dWD40IJ2X0+qF4K+rFJmS0Hb+vdEm5gYUb/OqdLY+mTu7++QQUwGActikyJ7S6C0zP4jB/228dMRVUJuGLQJzXNCBFS27wKDUyWnvhRukk4CLOv+ns8MWZc3+59xbg/dMDFEHM25wZ1jRoUQapU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.libvirt.org designates 38.145.34.151 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=pass header.from= (p=reject dis=none) Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [38.145.34.151]) by mx.zohomail.com with SMTPS id 1779381638141803.3181339592145; Thu, 21 May 2026 09:40:38 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 993) id 67AD541B10; Thu, 21 May 2026 12:40:37 -0400 (EDT) Received: from [172.19.199.4] (unknown [10.16.107.18]) by lists.libvirt.org (Postfix) with ESMTP id 7830441DB6; Thu, 21 May 2026 12:24:51 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 993) id 9C5E441C46; Thu, 21 May 2026 12:24:14 -0400 (EDT) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (3072 bits) server-digest SHA256) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id 1A32E419E4 for ; Thu, 21 May 2026 12:23:56 -0400 (EDT) Received: from mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-631-noLohCCOPaSzmxcI-ThcsA-1; Thu, 21 May 2026 12:23:53 -0400 Received: from mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.17]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id CB44A19560A3 for ; Thu, 21 May 2026 16:23:52 +0000 (UTC) Received: from speedmetal.openshiftapps.com (unknown [10.44.22.3]) by mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 1FF371956053 for ; Thu, 21 May 2026 16:23:51 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 4.0.1 (2024-03-26) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=0.6 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H4, RCVD_IN_MSPIKE_WL,RCVD_IN_SBL_CSS,SPF_HELO_PASS autolearn=no autolearn_force=no version=4.0.1 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1779380635; h=from:from: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; bh=QmcU76u7MbUVOzMAaibvk8Q2y1jzqwO8n6U9dfNlfa8=; b=Py1mlIvMsqEBkmyHX8Mo6leWac1yJAJsgoMl35RhW8nP7OXNQV4uEkEbh2L3vMKYA/HJIC pFDiOgtfahpvocnjJtODv1wGGqi4QMYFgGATzNoSqE0PF1gWGXD1/va6s7VtixpLyb3+AH vsEM+XBr+0kUvDfDaBbyfZ2I8dvh3sg= X-MC-Unique: noLohCCOPaSzmxcI-ThcsA-1 X-Mimecast-MFC-AGG-ID: noLohCCOPaSzmxcI-ThcsA_1779380632 To: devel@lists.libvirt.org Subject: [PATCH 09/30] util: json: Introduce 'virJSONValueObjectReplaceKey' Date: Thu, 21 May 2026 18:23:18 +0200 Message-ID: <3112466f77c56090d590ad3ef24aaffc06abb687.1779380461.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.17 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: k9jZu2Sa44-qoMtJDSNRS3G7gbmlKISsu0GPOZ0huOE_1779380632 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: 5ETISPHYTK6OJ6LU4FXMM6VO7PTUXS7N X-Message-ID-Hash: 5ETISPHYTK6OJ6LU4FXMM6VO7PTUXS7N X-MailFrom: pkrempa@redhat.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; header-match-devel.lists.libvirt.org-0; emergency; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.10 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: From: Peter Krempa via Devel Reply-To: Peter Krempa X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1779381639855154100 Content-Type: text/plain; charset="utf-8" From: Peter Krempa Add a helper which replaces the value part of a JSON object key. This will be helpful in tests where we'll want to rewrite some outputs (e.g. fds) to stabilize output files. Signed-off-by: Peter Krempa Reviewed-by: Michal Privoznik --- src/libvirt_private.syms | 1 + src/util/virjson.c | 24 ++++++++++++++++++++++++ src/util/virjson.h | 6 ++++++ 3 files changed, 31 insertions(+) diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 50fe3a9218..4816dff6dd 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -2772,6 +2772,7 @@ virJSONValueObjectHasKey; virJSONValueObjectKeysNumber; virJSONValueObjectPrependString; virJSONValueObjectRemoveKey; +virJSONValueObjectReplaceKey; virJSONValueObjectStealArray; virJSONValueObjectStealObject; virJSONValueToBuffer; diff --git a/src/util/virjson.c b/src/util/virjson.c index b751326154..403b86101d 100644 --- a/src/util/virjson.c +++ b/src/util/virjson.c @@ -905,6 +905,30 @@ virJSONValueObjectRemoveKey(virJSONValue *object, } +/* Replace value for key-value pair @key. + * Returns 1 on success, 0 if no key was found, and -1 on error. */ +int +virJSONValueObjectReplaceKey(virJSONValue *object, + const char *key, + virJSONValue **newvalue) +{ + size_t i; + + if (object->type !=3D VIR_JSON_TYPE_OBJECT) + return -1; + + for (i =3D 0; i < object->data.object.npairs; i++) { + if (STREQ(object->data.object.pairs[i].key, key)) { + virJSONValueFree(object->data.object.pairs[i].value); + object->data.object.pairs[i].value =3D g_steal_pointer(newvalu= e); + return 1; + } + } + + return 0; +} + + virJSONValue * virJSONValueObjectGetValue(virJSONValue *object, unsigned int n) diff --git a/src/util/virjson.h b/src/util/virjson.h index d8481e5890..a184dd104f 100644 --- a/src/util/virjson.h +++ b/src/util/virjson.h @@ -241,6 +241,12 @@ virJSONValueObjectRemoveKey(virJSONValue *object, virJSONValue **value) ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2); +int +virJSONValueObjectReplaceKey(virJSONValue *object, + const char *key, + virJSONValue **value) + ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(3); + int virJSONValueArrayAppendString(virJSONValue *object, const char *value); --=20 2.54.0 From nobody Sat May 30 15:28:30 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.libvirt.org designates 38.145.34.151 as permitted sender) client-ip=38.145.34.151; envelope-from=devel-bounces@lists.libvirt.org; helo=lists.libvirt.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.libvirt.org designates 38.145.34.151 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=pass(p=reject dis=none) header.from=lists.libvirt.org ARC-Seal: i=1; a=rsa-sha256; t=1779381713; cv=none; d=zohomail.com; s=zohoarc; b=ef7Bjj0RgTyqWzhy/64+3oD+U1B5qd13vOtBML9YzwbSl1rnmNAGb4xGuY33N0bcHNL+uFsi50nL3fDMQKkkW3pNc/gRm9oH4rLiAP4y8hcflKdQzpsGEObd3seqJQXIS0dycML2N4kEoDQCHoU95lSSDjP98qLZ/MSyhk/11lw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1779381713; h=Content-Type:Content-Transfer-Encoding:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Owner:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:Reply-To:References:Subject:Subject:To:To:Message-Id:Cc; bh=ZMi879qmSKjY7jfzoNLQc3OjEXOsepmSkiJetpAQeMU=; b=JScynqtajSXNyhGly2rmwMC9H5WFjSaFMoaOBXRd8b+06tD89kQIIrh/O5tEo75i32H9/zxXdSv+936ykBeBys35o9QhY8u1nYo17MScpcnuqTZOPCaUclvsSpnnLfbbvPDCpEyabe0oN9Qrg+I77t5kfXbztA+Uiso7kJtNv20= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.libvirt.org designates 38.145.34.151 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=pass header.from= (p=reject dis=none) Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [38.145.34.151]) by mx.zohomail.com with SMTPS id 177938171290868.66519662722123; Thu, 21 May 2026 09:41:52 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 993) id 3A09D41AAD; Thu, 21 May 2026 12:41:52 -0400 (EDT) Received: from [172.19.199.4] (unknown [10.16.107.18]) by lists.libvirt.org (Postfix) with ESMTP id 3EA4A41DE8; Thu, 21 May 2026 12:24:56 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 993) id 28A7241C87; Thu, 21 May 2026 12:24:18 -0400 (EDT) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (3072 bits) server-digest SHA256) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id 5F7D141B3A for ; Thu, 21 May 2026 12:23:57 -0400 (EDT) Received: from mx-prod-mc-03.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-46-pWa6m6MVPJuaDZrr1fYC5w-1; Thu, 21 May 2026 12:23:54 -0400 Received: from mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.17]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 052491956054 for ; Thu, 21 May 2026 16:23:54 +0000 (UTC) Received: from speedmetal.openshiftapps.com (unknown [10.44.22.3]) by mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 3B72E1956053 for ; Thu, 21 May 2026 16:23:53 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 4.0.1 (2024-03-26) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=0.6 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H5, RCVD_IN_MSPIKE_WL,RCVD_IN_SBL_CSS,SPF_HELO_PASS autolearn=no autolearn_force=no version=4.0.1 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1779380636; h=from:from: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; bh=ZMi879qmSKjY7jfzoNLQc3OjEXOsepmSkiJetpAQeMU=; b=MlTFlkMWKx1Vjg/edJY1jcLZoJOdofgXRGWPtMF9omv1Dq+nJqeiJZazLnnYtlkrbaLcfw VZz8Vym8imHSeYx2utapd6UPl2GKT2YKN0HDm7jTkM6TVj+iJFh19jgraLlr/TOyIf8plJ fX1bI1w9//KqbcdAdifpT+iEH7nqvOk= X-MC-Unique: pWa6m6MVPJuaDZrr1fYC5w-1 X-Mimecast-MFC-AGG-ID: pWa6m6MVPJuaDZrr1fYC5w_1779380634 To: devel@lists.libvirt.org Subject: [PATCH 10/30] testutils: Introduce virTestMakeDummyFD Date: Thu, 21 May 2026 18:23:19 +0200 Message-ID: <6d93ad24e5fa9b8d1cedd4308dc314c2e1160208.1779380461.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.17 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: RPzQVs71BvkjetuNpuqGwZi-DjwZ0tHAPgwLAM0ph-8_1779380634 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: TP3FFTDAEB7HH4IQ4IKBKFMDJRHPTYKL X-Message-ID-Hash: TP3FFTDAEB7HH4IQ4IKBKFMDJRHPTYKL X-MailFrom: pkrempa@redhat.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; header-match-devel.lists.libvirt.org-0; emergency; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.10 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: From: Peter Krempa via Devel Reply-To: Peter Krempa X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1779381715059154100 Content-Type: text/plain; charset="utf-8" From: Peter Krempa The helper makes a dummy (file) FD to be used as FD in tests which want to handle a FD but don't really use it. It also optionally records the FD number along with a hint in a hash table which can be later used to fetch the hint and stabilize test outputs. Signed-off-by: Peter Krempa Reviewed-by: Michal Privoznik --- tests/testutils.c | 113 ++++++++++++++++++++++++++++++++++++++++++++++ tests/testutils.h | 32 +++++++++++++ 2 files changed, 145 insertions(+) diff --git a/tests/testutils.c b/tests/testutils.c index 484852ecc2..5d6c918fd7 100644 --- a/tests/testutils.c +++ b/tests/testutils.c @@ -293,6 +293,119 @@ virTestLoadFileGetPath(const char *p, } +static virTestDummyFDContext *dummyFDContext; + +void +virTestDummyFDContextFree(virTestDummyFDContext *ctxt G_GNUC_UNUSED) +{ + g_clear_pointer(&dummyFDContext, g_hash_table_unref); +} + + +/** + * virTestDummyFDContextNew: + * + * Create a new context for marking dummy FDs so that they can be later + * cross-referenced and stripped from test output. Marked FDs are recorded + * in the returned GHashTable (virTestDummyFDContext type is a direct alias + * of GHashTable, allowing for registering custom autoptr cleanup function + * so that the context can be properly disposed), where keys are stringifi= ed + * FD numbers and the passed 'hint' strings are recorded as values. + * + * The context uses a global variable 'dummyFDContext' so that mocked func= tions + * which don't allow custom data can use this infrastructure. + * + * Note that in order to be able to track FDs across duplication via dup()= , any + * test program must install a mock for dup() which calls virTestMakeDummy= MarkDup. + * VIR_TEST_MAKE_DUMMY_FD_INSTALL_DUP_MOCK macro can be used to install on= e. + */ +virTestDummyFDContext * +virTestDummyFDContextNew(void) +{ + return dummyFDContext =3D virHashNew(g_free); +} + + +/** + * virTestDummyFDContextMarkFD: + * @fd: file descriptor to mark + * @hint: allocated buffer containing the name of @fd; the pointer is stol= en and freed later + * + * Records @hint as a reference to @fd in the global 'dummyFDContext' tabl= e. + */ +void +virTestDummyFDContextMarkFD(int fd, + char *hint) +{ + if (!dummyFDContext) { + g_free(hint); + return; + } + + g_hash_table_insert(dummyFDContext, g_strdup_printf("%d", fd), hint); +} + + +/** + * virTestMakeDummyMarkDup: + * @newfd: new fd number + * @oldfd: old fd number + * + * Mark @newfd as a duplicate of @oldfd, e.g. when dup() is mocked. Transf= ers + * the hint from @oldfd to @newfd with a suffix marking that it's a dup'd = fd. + */ +void +virTestMakeDummyMarkDup(int newfd, + int oldfd) +{ + const char *oldhint; + g_autofree char *oldlabel =3D NULL; + + if (!dummyFDContext) + return; + + oldlabel =3D g_strdup_printf("%d", oldfd); + + if (!(oldhint =3D g_hash_table_lookup(dummyFDContext, oldlabel))) + return; + + virTestDummyFDContextMarkFD(newfd, g_strdup_printf("%s-dup", oldhint)); +} + + +/** + * virTestMakeDummyFD: + * @hint: name for the FD to record into @hints + * + * Create a dummy file and return FD to it. The file is removed directly. = This + * is useful for code where FDs are needed but will not be actually used. + * + * If 'virTestMakeDummyFDContextNew' was called @hint is recorded in the h= ash + * table corresponding to the contex. @hint is used as-is, caller must pass + * an allocated string which will be onwned by the context, or NULL. + */ +int +virTestMakeDummyFD(char *hint) +{ + int fd =3D -1; + char path[] =3D abs_builddir "dummyfd.XXXXXXXX"; + + if ((fd =3D g_mkstemp_full(path, O_RDWR | O_CLOEXEC, S_IRUSR | S_IWUSR= )) < 0) { + VIR_TEST_VERBOSE("failed create dummy file/fd at '%s'", path); + abort(); + } + + if (unlink(path) < 0) { + VIR_TEST_VERBOSE("failed to unlink dummy file '%s' used for fd", p= ath); + abort(); + } + + virTestDummyFDContextMarkFD(fd, hint); + + return fd; +} + + /** * virTestLoadFilePath: * @...: file name components terminated with a NULL diff --git a/tests/testutils.h b/tests/testutils.h index ce348f1287..84003ba0ac 100644 --- a/tests/testutils.h +++ b/tests/testutils.h @@ -106,6 +106,38 @@ const char *virTestCounterNext(void); char *virTestFakeRootDirInit(void); void virTestFakeRootDirCleanup(char *fakerootdir); + +typedef GHashTable virTestDummyFDContext; + +void virTestDummyFDContextFree(virTestDummyFDContext *ctxt); +G_DEFINE_AUTOPTR_CLEANUP_FUNC(virTestDummyFDContext, virTestDummyFDContext= Free); + +virTestDummyFDContext *virTestDummyFDContextNew(void); + +void virTestDummyFDContextMarkFD(int fd, + char *hint); + +void virTestMakeDummyMarkDup(int newfd, + int oldfd); + +int virTestMakeDummyFD(char *hint); + +/* VIR_TEST_MAKE_DUMMY_FD_INSTALL_DUP_MOCK installs a mock for dup() that + * marks duplicated FDs via virTestMakeDummyFD */ +#define VIR_TEST_MAKE_DUMMY_FD_INSTALL_DUP_MOCK \ + static int (*real_dup)(int oldfd); \ + int \ + dup(int oldfd) \ + { \ + int newfd; \ + if (!real_dup) \ + VIR_MOCK_REAL_INIT(dup); \ + newfd =3D real_dup(oldfd); \ + virTestMakeDummyMarkDup(newfd, oldfd); \ + return newfd; \ + } + + /** * The @func shall return EXIT_FAILURE or EXIT_SUCCESS or * EXIT_AM_SKIP or EXIT_AM_HARDFAIL. --=20 2.54.0 From nobody Sat May 30 15:28:30 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.libvirt.org designates 38.145.34.151 as permitted sender) client-ip=38.145.34.151; envelope-from=devel-bounces@lists.libvirt.org; helo=lists.libvirt.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.libvirt.org designates 38.145.34.151 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=pass(p=reject dis=none) header.from=lists.libvirt.org ARC-Seal: i=1; a=rsa-sha256; t=1779381925; cv=none; d=zohomail.com; s=zohoarc; b=YfX4D8oXfMvPd8Kka+96X2/oIGHjJleViaKZw+aUFcgtFOFs24n0/c23LCMK0QBk1JRfybzwausyRl/Okl69UnTMCqPHD6ghwG3hSyDgi7Sm9oMjtDzGINVvm9M+98f/BvPIpAC1lkSJGKcs/pDbTYCOB4Rj70e/4npmanWJ6HI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1779381925; h=Content-Type:Content-Transfer-Encoding:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Owner:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:Reply-To:References:Subject:Subject:To:To:Message-Id:Cc; bh=XLHAKJ5tUTi8fkrLfeipfJrP1deCn4hZKBLHbYl6CNI=; b=JkjcaxBwckA68luNUYD2RTlUT1mV5l4vJ+ngsiQBJRxXYRV/rXMLcqDQWucrat7HnymVc8jRE1YNp+KcIgK3KRvs3jdjoTjni/FOnIm1+oghYpZNwULAWhfo9Spmkz3qHaetarZvGF7xgBqrCFHIPp9s5XRoEDkrkP3hp/DuciY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.libvirt.org designates 38.145.34.151 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=pass header.from= (p=reject dis=none) Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [38.145.34.151]) by mx.zohomail.com with SMTPS id 1779381925440325.56432424071374; Thu, 21 May 2026 09:45:25 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 993) id 913C641B3A; Thu, 21 May 2026 12:45:24 -0400 (EDT) Received: from [172.19.199.4] (unknown [10.16.107.18]) by lists.libvirt.org (Postfix) with ESMTP id 52C0141D6D; Thu, 21 May 2026 12:25:01 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 993) id CE24D41ACD; Thu, 21 May 2026 12:24:31 -0400 (EDT) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (3072 bits) server-digest SHA256) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id CEADD41B44 for ; Thu, 21 May 2026 12:23:57 -0400 (EDT) Received: from mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-548-uPoVKFzfNrSW3nLl0_i30w-1; Thu, 21 May 2026 12:23:55 -0400 Received: from mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.17]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 2EEFF19560BC for ; Thu, 21 May 2026 16:23:55 +0000 (UTC) Received: from speedmetal.openshiftapps.com (unknown [10.44.22.3]) by mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 60E641956053 for ; Thu, 21 May 2026 16:23:54 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 4.0.1 (2024-03-26) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=0.6 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H5, RCVD_IN_MSPIKE_WL,RCVD_IN_SBL_CSS,SPF_HELO_PASS autolearn=no autolearn_force=no version=4.0.1 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1779380637; h=from:from: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; bh=XLHAKJ5tUTi8fkrLfeipfJrP1deCn4hZKBLHbYl6CNI=; b=Gh4vPrBISBhz6xllukq/+3cemI74oE6xEFU219lgWb3ZfaTQzWXBWlVc2PPAxIyrRQHCJF xdXkdXmub3rUUkQMCPQV5x2JH/0wDov35aeTvAfpNpiFZ7xYj6+Hi+b6/pX3ewUVuzbxNm rO9mXxprc6IzwAu8HigEUFjke+VWpm4= X-MC-Unique: uPoVKFzfNrSW3nLl0_i30w-1 X-Mimecast-MFC-AGG-ID: uPoVKFzfNrSW3nLl0_i30w_1779380635 To: devel@lists.libvirt.org Subject: [PATCH 11/30] qemuxmlconftest: Move mock'd FDs further out Date: Thu, 21 May 2026 18:23:20 +0200 Message-ID: <29f3720576e3c4cac6b7f50735e33fe6b1efaa88.1779380461.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.17 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: os69npej0xPBOXhrVQBKeW83AHN3poOc5QVBwwjHw-E_1779380635 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: Y37P236FHF2HEJPW5OLZCEWR5J6SENF3 X-Message-ID-Hash: Y37P236FHF2HEJPW5OLZCEWR5J6SENF3 X-MailFrom: pkrempa@redhat.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; header-match-devel.lists.libvirt.org-0; emergency; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.10 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: From: Peter Krempa via Devel Reply-To: Peter Krempa X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1779381926605154100 Content-Type: text/plain; charset="utf-8" From: Peter Krempa Upcoming patches will introduce use of real FDs for tests. Since the test will go through many FDs they will collide with the fake ones allocated randomly in qemuxml2argvmock. Move them out for now until they are replaced and masked out from the tests. Signed-off-by: Peter Krempa Reviewed-by: Michal Privoznik --- tests/qemuxml2argvmock.c | 6 +++--- tests/qemuxmlconfdata/downscript.x86_64-latest.args | 2 +- .../graphics-spice-timeout.x86_64-latest.args | 2 +- tests/qemuxmlconfdata/net-bandwidth.x86_64-latest.args | 2 +- tests/qemuxmlconfdata/net-bandwidth2.x86_64-latest.args | 2 +- tests/qemuxmlconfdata/net-coalesce.x86_64-latest.args | 6 +++--- tests/qemuxmlconfdata/net-eth-hostip.x86_64-latest.args | 2 +- tests/qemuxmlconfdata/net-eth-ifname.x86_64-latest.args | 2 +- tests/qemuxmlconfdata/net-eth-names.x86_64-latest.args | 4 ++-- .../net-eth-unmanaged-tap.x86_64-latest.args | 2 +- tests/qemuxmlconfdata/net-eth.x86_64-latest.args | 2 +- tests/qemuxmlconfdata/net-isolated-port.x86_64-latest.args | 2 +- tests/qemuxmlconfdata/net-midonet.x86_64-latest.args | 2 +- tests/qemuxmlconfdata/net-mtu.x86_64-latest.args | 4 ++-- tests/qemuxmlconfdata/net-openvswitch.x86_64-latest.args | 2 +- .../net-virtio-network-portgroup.x86_64-latest.args | 6 +++--- .../net-virtio-teaming-network.x86_64-latest.args | 2 +- tests/qemuxmlconfdata/net-virtio-vhost.x86_64-latest.args | 6 +++--- .../qemuxmlconfdata/tap-vhost-incorrect.x86_64-latest.args | 4 ++-- tests/qemuxmlconfdata/tap-vhost.x86_64-latest.args | 2 +- tests/qemuxmlconfdata/user-aliases.x86_64-latest.args | 2 +- 21 files changed, 32 insertions(+), 32 deletions(-) diff --git a/tests/qemuxml2argvmock.c b/tests/qemuxml2argvmock.c index d24319638b..d9f9c8e278 100644 --- a/tests/qemuxml2argvmock.c +++ b/tests/qemuxml2argvmock.c @@ -104,7 +104,7 @@ virNetDevTapCreate(char **ifname, size_t i; for (i =3D 0; i < tapfdSize; i++) - tapfd[i] =3D STDERR_FILENO + 1 + i; + tapfd[i] =3D 2900 + i; if (STREQ_NULLABLE(*ifname, "mytap0")) { return 0; @@ -129,7 +129,7 @@ virDomainInterfaceBridgeConnect(virDomainDef *def G_GNU= C_UNUSED, size_t i; for (i =3D 0; i < *tapfdSize; i++) - tapfd[i] =3D STDERR_FILENO + 100 + i; + tapfd[i] =3D 2800 + i; return 0; } @@ -233,7 +233,7 @@ qemuInterfaceOpenVhostNet(virDomainObj *vm G_GNUC_UNUSE= D, for (i =3D 0; i < vhostfdSize; i++) { g_autofree char *name =3D g_strdup_printf("vhostfd-%s%zu", net->in= fo.alias, i); - int fd =3D STDERR_FILENO + 42 + i; + int fd =3D 2200 + i; netpriv->vhostfds =3D g_slist_prepend(netpriv->vhostfds, qemuFDPas= sDirectNew(name, &fd)); } diff --git a/tests/qemuxmlconfdata/downscript.x86_64-latest.args b/tests/qe= muxmlconfdata/downscript.x86_64-latest.args index 9fe2838b75..e9da65afe5 100644 --- a/tests/qemuxmlconfdata/downscript.x86_64-latest.args +++ b/tests/qemuxmlconfdata/downscript.x86_64-latest.args @@ -34,7 +34,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -device '{"driver":"virtio-9p-pci","id":"fs0","fsdev":"fsdev-fs0","mount_t= ag":"fs1","bus":"pci.0","addr":"0x3"}' \ -fsdev local,security_model=3Dmapped,id=3Dfsdev-fs1,path=3D/export/fs2 \ -device '{"driver":"virtio-9p-pci","id":"fs1","fsdev":"fsdev-fs1","mount_t= ag":"fs2","bus":"pci.0","addr":"0x4"}' \ --netdev '{"type":"tap","fd":"3","vhost":true,"vhostfd":"44","id":"hostnet0= "}' \ +-netdev '{"type":"tap","fd":"2900","vhost":true,"vhostfd":"2200","id":"hos= tnet0"}' \ -device '{"driver":"virtio-net-pci","netdev":"hostnet0","id":"net0","mac":= "52:54:00:f6:66:88","bus":"pci.0","addr":"0xb"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0xc"}' \ diff --git a/tests/qemuxmlconfdata/graphics-spice-timeout.x86_64-latest.arg= s b/tests/qemuxmlconfdata/graphics-spice-timeout.x86_64-latest.args index 40506328d4..30010a5a0c 100644 --- a/tests/qemuxmlconfdata/graphics-spice-timeout.x86_64-latest.args +++ b/tests/qemuxmlconfdata/graphics-spice-timeout.x86_64-latest.args @@ -27,7 +27,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-f14/.co= nfig \ -boot menu=3Don,strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ -device '{"driver":"virtio-serial-pci","id":"virtio-serial0","bus":"pci.0"= ,"addr":"0x6"}' \ --netdev '{"type":"tap","fd":"3","id":"hostnet0"}' \ +-netdev '{"type":"tap","fd":"2900","id":"hostnet0"}' \ -device '{"driver":"rtl8139","netdev":"hostnet0","id":"net0","mac":"52:54:= 00:71:70:89","bus":"pci.0","addr":"0x7"}' \ -device '{"driver":"usb-tablet","id":"input0","bus":"usb.0","port":"1"}' \ -audiodev '{"id":"audio1","driver":"spice"}' \ diff --git a/tests/qemuxmlconfdata/net-bandwidth.x86_64-latest.args b/tests= /qemuxmlconfdata/net-bandwidth.x86_64-latest.args index 5fbe15c64f..107b65b7c8 100644 --- a/tests/qemuxmlconfdata/net-bandwidth.x86_64-latest.args +++ b/tests/qemuxmlconfdata/net-bandwidth.x86_64-latest.args @@ -32,7 +32,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-f14-60/= .config \ -device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x4","drive":"li= bvirt-2-format","id":"virtio-disk0","bootindex":2}' \ -blockdev '{"driver":"file","filename":"/home/zippy/tmp/Fedora-14-x86_64-L= ive-KDE.iso","node-name":"libvirt-1-storage","read-only":true}' \ -device '{"driver":"ide-cd","bus":"ide.1","unit":0,"drive":"libvirt-1-stor= age","id":"ide0-1-0","bootindex":1}' \ --netdev '{"type":"tap","fd":"102","id":"hostnet0"}' \ +-netdev '{"type":"tap","fd":"2800","id":"hostnet0"}' \ -device '{"driver":"rtl8139","netdev":"hostnet0","id":"net0","mac":"52:54:= 00:24:a5:9f","bus":"pci.0","addr":"0x7"}' \ -chardev pty,id=3Dcharserial0 \ -device '{"driver":"isa-serial","chardev":"charserial0","id":"serial0","in= dex":0}' \ diff --git a/tests/qemuxmlconfdata/net-bandwidth2.x86_64-latest.args b/test= s/qemuxmlconfdata/net-bandwidth2.x86_64-latest.args index f3a6b80ec3..2cd65e8c85 100644 --- a/tests/qemuxmlconfdata/net-bandwidth2.x86_64-latest.args +++ b/tests/qemuxmlconfdata/net-bandwidth2.x86_64-latest.args @@ -30,7 +30,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-f14-60/= .config \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/f14-6.img"= ,"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-disk0","bootindex":2}' \ --netdev '{"type":"tap","fd":"102","id":"hostnet0"}' \ +-netdev '{"type":"tap","fd":"2800","id":"hostnet0"}' \ -device '{"driver":"rtl8139","netdev":"hostnet0","id":"net0","mac":"52:54:= 00:24:a5:9f","bus":"pci.0","addr":"0x7"}' \ -chardev pty,id=3Dcharserial0 \ -device '{"driver":"isa-serial","chardev":"charserial0","id":"serial0","in= dex":0}' \ diff --git a/tests/qemuxmlconfdata/net-coalesce.x86_64-latest.args b/tests/= qemuxmlconfdata/net-coalesce.x86_64-latest.args index dafd237ea4..c09d21576d 100644 --- a/tests/qemuxmlconfdata/net-coalesce.x86_64-latest.args +++ b/tests/qemuxmlconfdata/net-coalesce.x86_64-latest.args @@ -33,11 +33,11 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-test/= .config \ -device '{"driver":"virtio-blk-pci","event_idx":true,"bus":"pci.0","addr":= "0x4","drive":"libvirt-2-format","id":"virtio-disk0","bootindex":2}' \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/Fedora-14-x86_64-= Live-KDE.iso","node-name":"libvirt-1-storage","read-only":true}' \ -device '{"driver":"ide-cd","bus":"ide.1","unit":0,"drive":"libvirt-1-stor= age","id":"ide0-1-0","bootindex":1}' \ --netdev '{"type":"tap","fd":"102","vhost":true,"vhostfd":"44","id":"hostne= t0"}' \ +-netdev '{"type":"tap","fd":"2800","vhost":true,"vhostfd":"2200","id":"hos= tnet0"}' \ -device '{"driver":"virtio-net-pci","netdev":"hostnet0","id":"net0","mac":= "52:54:00:e5:48:58","bus":"pci.0","addr":"0x2"}' \ --netdev '{"type":"tap","fd":"102","vhost":true,"vhostfd":"44","id":"hostne= t1"}' \ +-netdev '{"type":"tap","fd":"2800","vhost":true,"vhostfd":"2200","id":"hos= tnet1"}' \ -device '{"driver":"virtio-net-pci","netdev":"hostnet1","id":"net1","mac":= "52:54:00:e5:48:59","bus":"pci.0","addr":"0x3"}' \ --netdev '{"type":"tap","fd":"102","vhost":true,"vhostfd":"44","id":"hostne= t2"}' \ +-netdev '{"type":"tap","fd":"2800","vhost":true,"vhostfd":"2200","id":"hos= tnet2"}' \ -device '{"driver":"virtio-net-pci","netdev":"hostnet2","id":"net2","mac":= "52:54:00:e5:48:60","bus":"pci.0","addr":"0x5"}' \ -chardev pty,id=3Dcharserial0 \ -device '{"driver":"isa-serial","chardev":"charserial0","id":"serial0","in= dex":0}' \ diff --git a/tests/qemuxmlconfdata/net-eth-hostip.x86_64-latest.args b/test= s/qemuxmlconfdata/net-eth-hostip.x86_64-latest.args index 6ffc956ab1..8105eaa55a 100644 --- a/tests/qemuxmlconfdata/net-eth-hostip.x86_64-latest.args +++ b/tests/qemuxmlconfdata/net-eth-hostip.x86_64-latest.args @@ -29,7 +29,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","read-only":false}' \ -device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-stor= age","id":"ide0-0-0","bootindex":1}' \ --netdev '{"type":"tap","fd":"3","id":"hostnet0"}' \ +-netdev '{"type":"tap","fd":"2900","id":"hostnet0"}' \ -device '{"driver":"rtl8139","netdev":"hostnet0","id":"net0","mac":"00:11:= 22:33:44:55","bus":"pci.0","addr":"0x2"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ diff --git a/tests/qemuxmlconfdata/net-eth-ifname.x86_64-latest.args b/test= s/qemuxmlconfdata/net-eth-ifname.x86_64-latest.args index 6ffc956ab1..8105eaa55a 100644 --- a/tests/qemuxmlconfdata/net-eth-ifname.x86_64-latest.args +++ b/tests/qemuxmlconfdata/net-eth-ifname.x86_64-latest.args @@ -29,7 +29,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","read-only":false}' \ -device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-stor= age","id":"ide0-0-0","bootindex":1}' \ --netdev '{"type":"tap","fd":"3","id":"hostnet0"}' \ +-netdev '{"type":"tap","fd":"2900","id":"hostnet0"}' \ -device '{"driver":"rtl8139","netdev":"hostnet0","id":"net0","mac":"00:11:= 22:33:44:55","bus":"pci.0","addr":"0x2"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ diff --git a/tests/qemuxmlconfdata/net-eth-names.x86_64-latest.args b/tests= /qemuxmlconfdata/net-eth-names.x86_64-latest.args index 44e9aa530f..73cd790c4b 100644 --- a/tests/qemuxmlconfdata/net-eth-names.x86_64-latest.args +++ b/tests/qemuxmlconfdata/net-eth-names.x86_64-latest.args @@ -29,9 +29,9 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","read-only":false}' \ -device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-stor= age","id":"ide0-0-0","bootindex":1}' \ --netdev '{"type":"tap","fd":"3","id":"hostnet0"}' \ +-netdev '{"type":"tap","fd":"2900","id":"hostnet0"}' \ -device '{"driver":"rtl8139","netdev":"hostnet0","id":"net0","mac":"00:11:= 22:33:44:55","bus":"pci.0","addr":"0x2"}' \ --netdev '{"type":"tap","fd":"3","id":"hostnet1"}' \ +-netdev '{"type":"tap","fd":"2900","id":"hostnet1"}' \ -device '{"driver":"e1000","netdev":"hostnet1","id":"net1","mac":"00:11:22= :33:44:56","bus":"pci.0","addr":"0x3"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x4"}' \ diff --git a/tests/qemuxmlconfdata/net-eth-unmanaged-tap.x86_64-latest.args= b/tests/qemuxmlconfdata/net-eth-unmanaged-tap.x86_64-latest.args index a7b163bcf5..ac96eb5928 100644 --- a/tests/qemuxmlconfdata/net-eth-unmanaged-tap.x86_64-latest.args +++ b/tests/qemuxmlconfdata/net-eth-unmanaged-tap.x86_64-latest.args @@ -29,7 +29,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","read-only":false}' \ -device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-stor= age","id":"ide0-0-0","bootindex":1}' \ --netdev '{"type":"tap","fd":"3","vhost":true,"vhostfd":"44","id":"hostnet0= "}' \ +-netdev '{"type":"tap","fd":"2900","vhost":true,"vhostfd":"2200","id":"hos= tnet0"}' \ -device '{"driver":"virtio-net-pci","netdev":"hostnet0","id":"net0","mac":= "fe:11:22:33:44:55","bus":"pci.0","addr":"0x2"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ diff --git a/tests/qemuxmlconfdata/net-eth.x86_64-latest.args b/tests/qemux= mlconfdata/net-eth.x86_64-latest.args index 6ffc956ab1..8105eaa55a 100644 --- a/tests/qemuxmlconfdata/net-eth.x86_64-latest.args +++ b/tests/qemuxmlconfdata/net-eth.x86_64-latest.args @@ -29,7 +29,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","read-only":false}' \ -device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-stor= age","id":"ide0-0-0","bootindex":1}' \ --netdev '{"type":"tap","fd":"3","id":"hostnet0"}' \ +-netdev '{"type":"tap","fd":"2900","id":"hostnet0"}' \ -device '{"driver":"rtl8139","netdev":"hostnet0","id":"net0","mac":"00:11:= 22:33:44:55","bus":"pci.0","addr":"0x2"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ diff --git a/tests/qemuxmlconfdata/net-isolated-port.x86_64-latest.args b/t= ests/qemuxmlconfdata/net-isolated-port.x86_64-latest.args index c9ebe3f515..186128635d 100644 --- a/tests/qemuxmlconfdata/net-isolated-port.x86_64-latest.args +++ b/tests/qemuxmlconfdata/net-isolated-port.x86_64-latest.args @@ -32,7 +32,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-q35-tes= t/.config \ -device '{"driver":"qemu-xhci","id":"usb","bus":"pci.2","addr":"0x0"}' \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","read-only":false}' \ -device '{"driver":"ide-hd","bus":"ide.0","drive":"libvirt-1-storage","id"= :"sata0-0-0","bootindex":1}' \ --netdev '{"type":"tap","fd":"102","vhost":true,"vhostfd":"44","id":"hostne= t0"}' \ +-netdev '{"type":"tap","fd":"2800","vhost":true,"vhostfd":"2200","id":"hos= tnet0"}' \ -device '{"driver":"virtio-net-pci","netdev":"hostnet0","id":"net0","mac":= "52:54:00:d6:c0:0b","bus":"pci.1","addr":"0x0"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"qxl-vga","id":"video0","max_outputs":1,"ram_size":6710= 8864,"vram_size":33554432,"vram64_size_mb":0,"vgamem_mb":8,"bus":"pcie.0","= addr":"0x1"}' \ diff --git a/tests/qemuxmlconfdata/net-midonet.x86_64-latest.args b/tests/q= emuxmlconfdata/net-midonet.x86_64-latest.args index b5124ac967..b07fd5779b 100644 --- a/tests/qemuxmlconfdata/net-midonet.x86_64-latest.args +++ b/tests/qemuxmlconfdata/net-midonet.x86_64-latest.args @@ -29,7 +29,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","read-only":false}' \ -device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-stor= age","id":"ide0-0-0","bootindex":1}' \ --netdev '{"type":"tap","fd":"102","vhost":true,"vhostfd":"44","id":"hostne= t0"}' \ +-netdev '{"type":"tap","fd":"2800","vhost":true,"vhostfd":"2200","id":"hos= tnet0"}' \ -device '{"driver":"virtio-net-pci","netdev":"hostnet0","id":"net0","mac":= "00:11:22:33:44:55","bus":"pci.0","addr":"0x2"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x3"}' \ diff --git a/tests/qemuxmlconfdata/net-mtu.x86_64-latest.args b/tests/qemux= mlconfdata/net-mtu.x86_64-latest.args index db4a20b36a..65e89e47d5 100644 --- a/tests/qemuxmlconfdata/net-mtu.x86_64-latest.args +++ b/tests/qemuxmlconfdata/net-mtu.x86_64-latest.args @@ -33,9 +33,9 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-test/.c= onfig \ -device '{"driver":"virtio-blk-pci","event_idx":true,"bus":"pci.0","addr":= "0x4","drive":"libvirt-2-format","id":"virtio-disk0","bootindex":2}' \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/Fedora-14-x86_64-= Live-KDE.iso","node-name":"libvirt-1-storage","read-only":true}' \ -device '{"driver":"ide-cd","bus":"ide.1","unit":0,"drive":"libvirt-1-stor= age","id":"ide0-1-0","bootindex":1}' \ --netdev '{"type":"tap","fd":"102","vhost":true,"vhostfd":"44","id":"hostne= t0"}' \ +-netdev '{"type":"tap","fd":"2800","vhost":true,"vhostfd":"2200","id":"hos= tnet0"}' \ -device '{"driver":"virtio-net-pci","host_mtu":1500,"netdev":"hostnet0","i= d":"net0","mac":"52:54:00:e5:48:58","bus":"pci.0","addr":"0x2"}' \ --netdev '{"type":"tap","fd":"102","vhost":true,"vhostfd":"44","sndbuf":160= 0,"id":"hostnet1"}' \ +-netdev '{"type":"tap","fd":"2800","vhost":true,"vhostfd":"2200","sndbuf":= 1600,"id":"hostnet1"}' \ -device '{"driver":"virtio-net-pci","host_mtu":9000,"netdev":"hostnet1","i= d":"net1","mac":"52:54:00:e5:48:59","bus":"pci.0","addr":"0x3"}' \ -chardev pty,id=3Dcharserial0 \ -device '{"driver":"isa-serial","chardev":"charserial0","id":"serial0","in= dex":0}' \ diff --git a/tests/qemuxmlconfdata/net-openvswitch.x86_64-latest.args b/tes= ts/qemuxmlconfdata/net-openvswitch.x86_64-latest.args index 95aaefd139..da792aeffd 100644 --- a/tests/qemuxmlconfdata/net-openvswitch.x86_64-latest.args +++ b/tests/qemuxmlconfdata/net-openvswitch.x86_64-latest.args @@ -29,7 +29,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","read-only":false}' \ -device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-stor= age","id":"ide0-0-0","bootindex":1}' \ --netdev '{"type":"tap","fd":"102","id":"hostnet0"}' \ +-netdev '{"type":"tap","fd":"2800","id":"hostnet0"}' \ -device '{"driver":"rtl8139","netdev":"hostnet0","id":"net0","mac":"00:11:= 22:33:44:55","bus":"pci.0","addr":"0x2"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x3"}' \ diff --git a/tests/qemuxmlconfdata/net-virtio-network-portgroup.x86_64-late= st.args b/tests/qemuxmlconfdata/net-virtio-network-portgroup.x86_64-latest.= args index d2ccde705b..f66cb6295d 100644 --- a/tests/qemuxmlconfdata/net-virtio-network-portgroup.x86_64-latest.args +++ b/tests/qemuxmlconfdata/net-virtio-network-portgroup.x86_64-latest.args @@ -29,11 +29,11 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUG= uest1/.config \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","read-only":false}' \ -device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-stor= age","id":"ide0-0-0","bootindex":1}' \ --netdev '{"type":"tap","fd":"102","vhost":true,"vhostfd":"44","id":"hostne= t0"}' \ +-netdev '{"type":"tap","fd":"2800","vhost":true,"vhostfd":"2200","id":"hos= tnet0"}' \ -device '{"driver":"virtio-net-pci","netdev":"hostnet0","id":"net0","mac":= "00:11:22:33:44:55","bus":"pci.0","addr":"0x2"}' \ --netdev '{"type":"tap","fd":"102","id":"hostnet1"}' \ +-netdev '{"type":"tap","fd":"2800","id":"hostnet1"}' \ -device '{"driver":"rtl8139","netdev":"hostnet1","id":"net1","mac":"10:11:= 22:33:44:55","bus":"pci.0","addr":"0x3"}' \ --netdev '{"type":"tap","fd":"102","id":"hostnet2"}' \ +-netdev '{"type":"tap","fd":"2800","id":"hostnet2"}' \ -device '{"driver":"rtl8139","netdev":"hostnet2","id":"net2","mac":"22:11:= 22:33:44:55","bus":"pci.0","addr":"0x4"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x5"}' \ diff --git a/tests/qemuxmlconfdata/net-virtio-teaming-network.x86_64-latest= .args b/tests/qemuxmlconfdata/net-virtio-teaming-network.x86_64-latest.args index a3dada0f07..f03ab5522d 100644 --- a/tests/qemuxmlconfdata/net-virtio-teaming-network.x86_64-latest.args +++ b/tests/qemuxmlconfdata/net-virtio-teaming-network.x86_64-latest.args @@ -29,7 +29,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","read-only":false}' \ -device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-stor= age","id":"ide0-0-0","bootindex":1}' \ --netdev '{"type":"tap","fd":"102","vhost":true,"vhostfd":"44","id":"hostua= -backup0"}' \ +-netdev '{"type":"tap","fd":"2800","vhost":true,"vhostfd":"2200","id":"hos= tua-backup0"}' \ -device '{"driver":"virtio-net-pci","failover":true,"netdev":"hostua-backu= p0","id":"ua-backup0","mac":"00:11:22:33:44:55","bus":"pci.0","addr":"0x2"}= ' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"vfio-pci","host":"0000:06:12.2","id":"hostdev0","failo= ver_pair_id":"ua-backup0","bus":"pci.0","addr":"0x3"}' \ diff --git a/tests/qemuxmlconfdata/net-virtio-vhost.x86_64-latest.args b/te= sts/qemuxmlconfdata/net-virtio-vhost.x86_64-latest.args index eabe768169..f1da987dbd 100644 --- a/tests/qemuxmlconfdata/net-virtio-vhost.x86_64-latest.args +++ b/tests/qemuxmlconfdata/net-virtio-vhost.x86_64-latest.args @@ -28,11 +28,11 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/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"}' \ --netdev '{"type":"tap","fds":"3:4:5:6:7","vhost":true,"vhostfds":"44:45:46= :47:48","id":"hostnet0"}' \ +-netdev '{"type":"tap","fds":"2900:2901:2902:2903:2904","vhost":true,"vhos= tfds":"2200:2201:2202:2203:2204","id":"hostnet0"}' \ -device '{"driver":"virtio-net-pci","mq":true,"vectors":12,"netdev":"hostn= et0","id":"net0","mac":"52:54:00:e5:48:58","bus":"pci.0","addr":"0x2"}' \ --netdev '{"type":"tap","fd":"3","vhost":true,"vhostfd":"44","id":"hostnet1= "}' \ +-netdev '{"type":"tap","fd":"2900","vhost":true,"vhostfd":"2200","id":"hos= tnet1"}' \ -device '{"driver":"virtio-net-pci","ioeventfd":true,"netdev":"hostnet1","= id":"net1","mac":"52:54:00:e5:48:59","bus":"pci.0","addr":"0x3"}' \ --netdev '{"type":"tap","fds":"3:4:5:6:7","vhost":true,"vhostfds":"44:45:46= :47:48","id":"hostnet2"}' \ +-netdev '{"type":"tap","fds":"2900:2901:2902:2903:2904","vhost":true,"vhos= tfds":"2200:2201:2202:2203:2204","id":"hostnet2"}' \ -device '{"driver":"virtio-net-pci","ioeventfd":true,"mq":true,"vectors":1= 2,"netdev":"hostnet2","id":"net2","mac":"52:54:00:e5:48:5a","bus":"pci.0","= addr":"0x4"}' \ -chardev pty,id=3Dcharserial0 \ -device '{"driver":"isa-serial","chardev":"charserial0","id":"serial0","in= dex":0}' \ diff --git a/tests/qemuxmlconfdata/tap-vhost-incorrect.x86_64-latest.args b= /tests/qemuxmlconfdata/tap-vhost-incorrect.x86_64-latest.args index f43f75d709..d140b1e09d 100644 --- a/tests/qemuxmlconfdata/tap-vhost-incorrect.x86_64-latest.args +++ b/tests/qemuxmlconfdata/tap-vhost-incorrect.x86_64-latest.args @@ -28,9 +28,9 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-test/.c= onfig \ -boot menu=3Don,strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ -device '{"driver":"virtio-serial-pci","id":"virtio-serial0","bus":"pci.0"= ,"addr":"0x6"}' \ --netdev '{"type":"tap","fd":"102","id":"hostnet0"}' \ +-netdev '{"type":"tap","fd":"2800","id":"hostnet0"}' \ -device '{"driver":"e1000","netdev":"hostnet0","id":"net0","mac":"52:54:00= :e5:48:58","bus":"pci.0","addr":"0x2"}' \ --netdev '{"type":"tap","fd":"102","vhost":true,"vhostfd":"44","id":"hostne= t1"}' \ +-netdev '{"type":"tap","fd":"2800","vhost":true,"vhostfd":"2200","id":"hos= tnet1"}' \ -device '{"driver":"virtio-net-pci","netdev":"hostnet1","id":"net1","mac":= "52:54:00:e5:48:59","bus":"pci.0","addr":"0x3"}' \ -chardev pty,id=3Dcharserial0 \ -device '{"driver":"isa-serial","chardev":"charserial0","id":"serial0","in= dex":0}' \ diff --git a/tests/qemuxmlconfdata/tap-vhost.x86_64-latest.args b/tests/qem= uxmlconfdata/tap-vhost.x86_64-latest.args index 8effdc5968..76a4b5c77b 100644 --- a/tests/qemuxmlconfdata/tap-vhost.x86_64-latest.args +++ b/tests/qemuxmlconfdata/tap-vhost.x86_64-latest.args @@ -33,7 +33,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-test/.c= onfig \ -device '{"driver":"virtio-blk-pci","event_idx":true,"bus":"pci.0","addr":= "0x4","drive":"libvirt-2-format","id":"virtio-disk0","bootindex":2}' \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/Fedora-14-x86_64-= Live-KDE.iso","node-name":"libvirt-1-storage","read-only":true}' \ -device '{"driver":"ide-cd","bus":"ide.1","unit":0,"drive":"libvirt-1-stor= age","id":"ide0-1-0","bootindex":1}' \ --netdev '{"type":"tap","fds":"102:103:104:105:106","vhost":true,"vhostfds"= :"44:45:46:47:48","id":"hostnet0"}' \ +-netdev '{"type":"tap","fds":"2800:2801:2802:2803:2804","vhost":true,"vhos= tfds":"2200:2201:2202:2203:2204","id":"hostnet0"}' \ -device '{"driver":"virtio-net-pci","mq":true,"vectors":12,"netdev":"hostn= et0","id":"net0","mac":"52:54:00:e5:48:58","bus":"pci.0","addr":"0x2"}' \ -chardev pty,id=3Dcharserial0 \ -device '{"driver":"isa-serial","chardev":"charserial0","id":"serial0","in= dex":0}' \ diff --git a/tests/qemuxmlconfdata/user-aliases.x86_64-latest.args b/tests/= qemuxmlconfdata/user-aliases.x86_64-latest.args index c07100ae54..03cbcab64a 100644 --- a/tests/qemuxmlconfdata/user-aliases.x86_64-latest.args +++ b/tests/qemuxmlconfdata/user-aliases.x86_64-latest.args @@ -49,7 +49,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-gentoo/= .config \ -device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x7","drive":"li= bvirt-2-format","id":"ua-myEncryptedDisk1"}' \ -blockdev '{"driver":"file","filename":"/home/zippy/tmp/install-amd64-mini= mal-20140619.iso","node-name":"libvirt-1-storage","read-only":true,"cache":= {"direct":true,"no-flush":false}}' \ -device '{"driver":"ide-cd","bus":"ide.1","unit":0,"share-rw":true,"drive"= :"libvirt-1-storage","id":"ua-WhatAnAwesomeCDROM","bootindex":2,"write-cach= e":"on"}' \ --netdev '{"type":"tap","fd":"3","vhost":true,"vhostfd":"44","id":"hostua-C= heckoutThisNIC"}' \ +-netdev '{"type":"tap","fd":"2900","vhost":true,"vhostfd":"2200","id":"hos= tua-CheckoutThisNIC"}' \ -device '{"driver":"virtio-net-pci","netdev":"hostua-CheckoutThisNIC","id"= :"ua-CheckoutThisNIC","mac":"52:54:00:d6:c0:0b","bus":"pci.0","addr":"0x3"}= ' \ -netdev '{"type":"socket","listen":"127.0.0.1:1234","id":"hostua-WeCanAlso= DoServerMode"}' \ -device '{"driver":"rtl8139","netdev":"hostua-WeCanAlsoDoServerMode","id":= "ua-WeCanAlsoDoServerMode","mac":"52:54:00:22:c9:42","bus":"pci.0","addr":"= 0x9"}' \ --=20 2.54.0 From nobody Sat May 30 15:28:30 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.libvirt.org designates 38.145.34.151 as permitted sender) client-ip=38.145.34.151; envelope-from=devel-bounces@lists.libvirt.org; helo=lists.libvirt.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.libvirt.org designates 38.145.34.151 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=pass(p=reject dis=none) header.from=lists.libvirt.org ARC-Seal: i=1; a=rsa-sha256; t=1779382274; cv=none; d=zohomail.com; s=zohoarc; b=fo0E8XQvdNGjeSQ/1XOx07bjODJ0xxloQ8Yfncm5rvJYxuC6zoD0/FDTlAgLoJNhLRoeRGeNuFv3+OI+4EHPP2iQDgaQXiGk6Hb2RvGBeg5GPAOUxEsI5gV23u7NVV5WSldb/6TxTStu69KcfVTs/GX31inVnRcbOoPz/w3Z70I= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1779382274; h=Content-Type:Content-Transfer-Encoding:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Owner:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:Reply-To:References:Subject:Subject:To:To:Message-Id:Cc; bh=Q8nAmuTMmHCODy9RxUOJ9AKbJapyX7hA+DisLeELkMU=; b=UujbHbbBtclbbWTxwOq+wnXyyIr6gUyxPIR9XnKPgWd2qpL3MiR7VUx6N9sId7Db40vRohCmqrSS2kQ0fXaK8F0IOandvesgZLFMqIZVWdHmPG4vy6QG5YC4LY1g+VxzDrJi7x7d+41PNTS14dPLS1MZboX1RamJJ7Urya8zlpY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.libvirt.org designates 38.145.34.151 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=pass header.from= (p=reject dis=none) Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [38.145.34.151]) by mx.zohomail.com with SMTPS id 1779382274007475.063446902229; Thu, 21 May 2026 09:51:14 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 993) id C584941B3B; Thu, 21 May 2026 12:51:12 -0400 (EDT) Received: from [172.19.199.4] (unknown [10.16.107.18]) by lists.libvirt.org (Postfix) with ESMTP id 1D12A41C8C; Thu, 21 May 2026 12:25:23 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 993) id F11574199E; Thu, 21 May 2026 12:25:11 -0400 (EDT) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (3072 bits) server-digest SHA256) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id 85E9541B6E for ; Thu, 21 May 2026 12:24:00 -0400 (EDT) Received: from mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-134-O4WKjRT1PH-YG3XueEx8dQ-1; Thu, 21 May 2026 12:23:57 -0400 Received: from mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.17]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 48CBF1956054 for ; Thu, 21 May 2026 16:23:56 +0000 (UTC) Received: from speedmetal.openshiftapps.com (unknown [10.44.22.3]) by mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 970651956053 for ; Thu, 21 May 2026 16:23:55 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 4.0.1 (2024-03-26) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=0.6 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H5, RCVD_IN_MSPIKE_WL,RCVD_IN_SBL_CSS,SPF_HELO_PASS autolearn=no autolearn_force=no version=4.0.1 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1779380640; h=from:from: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; bh=Q8nAmuTMmHCODy9RxUOJ9AKbJapyX7hA+DisLeELkMU=; b=Do1Ar0eRfHHBOo5bLMaTjMhU9A4FYEGwcm4kiSrorKY/ENr3XaJhDzfmfhNhqTmi3rGsJe CEG0wVpUXhWZ2Sx1JkH8hjLJbe0vbQI+jAsJY3qvqweoI9lEVPbNt8b/sZOY1pUOYtf0P8 AWCpV6PMQ5j2CJ7Dd0sjgA9O3FV5dfo= X-MC-Unique: O4WKjRT1PH-YG3XueEx8dQ-1 X-Mimecast-MFC-AGG-ID: O4WKjRT1PH-YG3XueEx8dQ_1779380636 To: devel@lists.libvirt.org Subject: [PATCH 12/30] qemuxmlconftest: Stablilize '-add-fd' arguments Date: Thu, 21 May 2026 18:23:21 +0200 Message-ID: <67dae0b50013736a636cd233dc22cdac959c8d43.1779380461.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.17 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: 1CM1QkaRKsoyHGkwznfbJT7LfKawJVDn83lqazlIP48_1779380636 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: EOSOJ7WVDDI447Y6PQ3CITS3TGORWD6I X-Message-ID-Hash: EOSOJ7WVDDI447Y6PQ3CITS3TGORWD6I X-MailFrom: pkrempa@redhat.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; header-match-devel.lists.libvirt.org-0; emergency; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.10 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: From: Peter Krempa via Devel Reply-To: Peter Krempa X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1779382274985158500 Content-Type: text/plain; charset="utf-8" From: Peter Krempa Add code which walks the generated argument list and allows to strip out and replace by a substitution any field in either JSON or legacy qemu argument string. Use it to stabilize 'fd' field of '-add-fd' This will allow us to rip out code which tries to allocate stable FD numbers, which doesn't work reliably (e.g. if the environment passes some FDs). Signed-off-by: Peter Krempa Reviewed-by: Michal Privoznik --- .../aarch64-pci-serial.aarch64-latest.args | 2 +- .../chardev-backends-json.x86_64-9.1.0.args | 6 +- .../chardev-backends-json.x86_64-latest.args | 6 +- .../chardev-backends.x86_64-9.1.0.args | 6 +- .../chardev-backends.x86_64-latest.args | 6 +- .../chardev-label.x86_64-latest.args | 2 +- .../disk-source-fd.x86_64-latest.args | 16 +- .../disk-vhostvdpa.x86_64-latest.args | 2 +- .../name-escape.x86_64-latest.args | 2 +- .../net-vdpa-multiqueue.x86_64-latest.args | 2 +- .../net-vdpa.x86_64-latest.args | 2 +- .../serial-file-chardev.x86_64-latest.args | 2 +- .../serial-file-log.x86_64-latest.args | 4 +- .../serial-many-chardev.x86_64-latest.args | 2 +- .../tpm-passthrough-crb.x86_64-latest.args | 4 +- .../tpm-passthrough.x86_64-latest.args | 4 +- tests/qemuxmlconftest.c | 193 ++++++++++++++++++ tests/testutilsqemu.h | 2 + 18 files changed, 229 insertions(+), 34 deletions(-) diff --git a/tests/qemuxmlconfdata/aarch64-pci-serial.aarch64-latest.args b= /tests/qemuxmlconfdata/aarch64-pci-serial.aarch64-latest.args index d90e4cba18..9d3cf39d6a 100644 --- a/tests/qemuxmlconfdata/aarch64-pci-serial.aarch64-latest.args +++ b/tests/qemuxmlconfdata/aarch64-pci-serial.aarch64-latest.args @@ -28,7 +28,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-aarch64= test/.config \ -device '{"driver":"pcie-root-port","port":8,"chassis":1,"id":"pci.1","bus= ":"pcie.0","multifunction":true,"addr":"0x1"}' \ -device '{"driver":"pcie-pci-bridge","id":"pci.2","bus":"pci.1","addr":"0x= 0"}' \ -device '{"driver":"pcie-root-port","port":9,"chassis":3,"id":"pci.3","bus= ":"pcie.0","addr":"0x1.0x1"}' \ --add-fd set=3D0,fd=3D1751,opaque=3Dserial0-log \ +-add-fd set=3D0,fd=3DXXXXXXX,opaque=3Dserial0-log \ -chardev pty,id=3Dcharserial0,logfile=3D/dev/fdset/0,logappend=3Don \ -device '{"driver":"pci-serial","chardev":"charserial0","id":"serial0","bu= s":"pci.2","addr":"0x1"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ diff --git a/tests/qemuxmlconfdata/chardev-backends-json.x86_64-9.1.0.args = b/tests/qemuxmlconfdata/chardev-backends-json.x86_64-9.1.0.args index dce4a582d2..a363549b81 100644 --- a/tests/qemuxmlconfdata/chardev-backends-json.x86_64-9.1.0.args +++ b/tests/qemuxmlconfdata/chardev-backends-json.x86_64-9.1.0.args @@ -29,17 +29,17 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUG= uest1/.config \ -device '{"driver":"virtio-serial-pci","id":"virtio-serial0","bus":"pci.0"= ,"addr":"0x3"}' \ -chardev '{"id":"charparallel0","backend":{"type":"parallel","data":{"devi= ce":"/dev/parport0"}}}' \ -device '{"driver":"isa-parallel","chardev":"charparallel0","id":"parallel= 0"}' \ --add-fd set=3D0,fd=3D1751,opaque=3Dchannel0-log \ +-add-fd set=3D0,fd=3DXXXXXXX,opaque=3Dchannel0-log \ -chardev '{"id":"charchannel0","backend":{"type":"null","data":{"logfile":= "/dev/fdset/0","logappend":true}}}' \ -device '{"driver":"virtserialport","bus":"virtio-serial0.0","nr":1,"chard= ev":"charchannel0","id":"channel0","name":"chardev-null"}' \ --add-fd set=3D1,fd=3D1751,opaque=3Dchannel1-log \ +-add-fd set=3D1,fd=3DXXXXXXX,opaque=3Dchannel1-log \ -chardev '{"id":"charchannel1","backend":{"type":"vc","data":{"logfile":"/= dev/fdset/1","logappend":true}}}' \ -device '{"driver":"virtserialport","bus":"virtio-serial0.0","nr":2,"chard= ev":"charchannel1","id":"channel1","name":"chardev-vc"}' \ -chardev '{"id":"charchannel2","backend":{"type":"pty","data":{}}}' \ -device '{"driver":"virtserialport","bus":"virtio-serial0.0","nr":3,"chard= ev":"charchannel2","id":"channel2","name":"chardev-pty"}' \ -chardev '{"id":"charchannel3","backend":{"type":"stdio","data":{}}}' \ -device '{"driver":"virtserialport","bus":"virtio-serial0.0","nr":4,"chard= ev":"charchannel3","id":"channel3","name":"chardev-stdio"}' \ --add-fd set=3D2,fd=3D1750,opaque=3Dchannel4-source \ +-add-fd set=3D2,fd=3DXXXXXXX,opaque=3Dchannel4-source \ -chardev '{"id":"charchannel4","backend":{"type":"file","data":{"out":"/de= v/fdset/2","append":true}}}' \ -device '{"driver":"virtserialport","bus":"virtio-serial0.0","nr":5,"chard= ev":"charchannel4","id":"channel4","name":"chardev-file"}' \ -chardev '{"id":"charchannel5","backend":{"type":"pipe","data":{"device":"= /path/to/pipe"}}}' \ diff --git a/tests/qemuxmlconfdata/chardev-backends-json.x86_64-latest.args= b/tests/qemuxmlconfdata/chardev-backends-json.x86_64-latest.args index 2b7e614e8b..43a56f7c22 100644 --- a/tests/qemuxmlconfdata/chardev-backends-json.x86_64-latest.args +++ b/tests/qemuxmlconfdata/chardev-backends-json.x86_64-latest.args @@ -29,17 +29,17 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUG= uest1/.config \ -device '{"driver":"virtio-serial-pci","id":"virtio-serial0","bus":"pci.0"= ,"addr":"0x3"}' \ -chardev '{"id":"charparallel0","backend":{"type":"parallel","data":{"devi= ce":"/dev/parport0"}}}' \ -device '{"driver":"isa-parallel","chardev":"charparallel0","id":"parallel= 0"}' \ --add-fd set=3D0,fd=3D1751,opaque=3Dchannel0-log \ +-add-fd set=3D0,fd=3DXXXXXXX,opaque=3Dchannel0-log \ -chardev '{"id":"charchannel0","backend":{"type":"null","data":{"logfile":= "/dev/fdset/0","logappend":true}}}' \ -device '{"driver":"virtserialport","bus":"virtio-serial0.0","nr":1,"chard= ev":"charchannel0","id":"channel0","name":"chardev-null"}' \ --add-fd set=3D1,fd=3D1751,opaque=3Dchannel1-log \ +-add-fd set=3D1,fd=3DXXXXXXX,opaque=3Dchannel1-log \ -chardev '{"id":"charchannel1","backend":{"type":"vc","data":{"logfile":"/= dev/fdset/1","logappend":true}}}' \ -device '{"driver":"virtserialport","bus":"virtio-serial0.0","nr":2,"chard= ev":"charchannel1","id":"channel1","name":"chardev-vc"}' \ -chardev '{"id":"charchannel2","backend":{"type":"pty","data":{}}}' \ -device '{"driver":"virtserialport","bus":"virtio-serial0.0","nr":3,"chard= ev":"charchannel2","id":"channel2","name":"chardev-pty"}' \ -chardev '{"id":"charchannel3","backend":{"type":"stdio","data":{}}}' \ -device '{"driver":"virtserialport","bus":"virtio-serial0.0","nr":4,"chard= ev":"charchannel3","id":"channel3","name":"chardev-stdio"}' \ --add-fd set=3D2,fd=3D1750,opaque=3Dchannel4-source \ +-add-fd set=3D2,fd=3DXXXXXXX,opaque=3Dchannel4-source \ -chardev '{"id":"charchannel4","backend":{"type":"file","data":{"out":"/de= v/fdset/2","append":true}}}' \ -device '{"driver":"virtserialport","bus":"virtio-serial0.0","nr":5,"chard= ev":"charchannel4","id":"channel4","name":"chardev-file"}' \ -chardev '{"id":"charchannel5","backend":{"type":"pipe","data":{"device":"= /path/to/pipe"}}}' \ diff --git a/tests/qemuxmlconfdata/chardev-backends.x86_64-9.1.0.args b/tes= ts/qemuxmlconfdata/chardev-backends.x86_64-9.1.0.args index 81773dcacd..4d8511a95f 100644 --- a/tests/qemuxmlconfdata/chardev-backends.x86_64-9.1.0.args +++ b/tests/qemuxmlconfdata/chardev-backends.x86_64-9.1.0.args @@ -29,17 +29,17 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUG= uest1/.config \ -device '{"driver":"virtio-serial-pci","id":"virtio-serial0","bus":"pci.0"= ,"addr":"0x3"}' \ -chardev parallel,id=3Dcharparallel0,path=3D/dev/parport0 \ -device '{"driver":"isa-parallel","chardev":"charparallel0","id":"parallel= 0"}' \ --add-fd set=3D0,fd=3D1751,opaque=3Dchannel0-log \ +-add-fd set=3D0,fd=3DXXXXXXX,opaque=3Dchannel0-log \ -chardev null,id=3Dcharchannel0,logfile=3D/dev/fdset/0,logappend=3Don \ -device '{"driver":"virtserialport","bus":"virtio-serial0.0","nr":1,"chard= ev":"charchannel0","id":"channel0","name":"chardev-null"}' \ --add-fd set=3D1,fd=3D1751,opaque=3Dchannel1-log \ +-add-fd set=3D1,fd=3DXXXXXXX,opaque=3Dchannel1-log \ -chardev vc,id=3Dcharchannel1,logfile=3D/dev/fdset/1,logappend=3Don \ -device '{"driver":"virtserialport","bus":"virtio-serial0.0","nr":2,"chard= ev":"charchannel1","id":"channel1","name":"chardev-vc"}' \ -chardev pty,id=3Dcharchannel2 \ -device '{"driver":"virtserialport","bus":"virtio-serial0.0","nr":3,"chard= ev":"charchannel2","id":"channel2","name":"chardev-pty"}' \ -chardev stdio,id=3Dcharchannel3 \ -device '{"driver":"virtserialport","bus":"virtio-serial0.0","nr":4,"chard= ev":"charchannel3","id":"channel3","name":"chardev-stdio"}' \ --add-fd set=3D2,fd=3D1750,opaque=3Dchannel4-source \ +-add-fd set=3D2,fd=3DXXXXXXX,opaque=3Dchannel4-source \ -chardev file,id=3Dcharchannel4,path=3D/dev/fdset/2,append=3Don \ -device '{"driver":"virtserialport","bus":"virtio-serial0.0","nr":5,"chard= ev":"charchannel4","id":"channel4","name":"chardev-file"}' \ -chardev pipe,id=3Dcharchannel5,path=3D/path/to/pipe \ diff --git a/tests/qemuxmlconfdata/chardev-backends.x86_64-latest.args b/te= sts/qemuxmlconfdata/chardev-backends.x86_64-latest.args index 9708b18735..bd5af10bb7 100644 --- a/tests/qemuxmlconfdata/chardev-backends.x86_64-latest.args +++ b/tests/qemuxmlconfdata/chardev-backends.x86_64-latest.args @@ -29,17 +29,17 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUG= uest1/.config \ -device '{"driver":"virtio-serial-pci","id":"virtio-serial0","bus":"pci.0"= ,"addr":"0x3"}' \ -chardev parallel,id=3Dcharparallel0,path=3D/dev/parport0 \ -device '{"driver":"isa-parallel","chardev":"charparallel0","id":"parallel= 0"}' \ --add-fd set=3D0,fd=3D1751,opaque=3Dchannel0-log \ +-add-fd set=3D0,fd=3DXXXXXXX,opaque=3Dchannel0-log \ -chardev null,id=3Dcharchannel0,logfile=3D/dev/fdset/0,logappend=3Don \ -device '{"driver":"virtserialport","bus":"virtio-serial0.0","nr":1,"chard= ev":"charchannel0","id":"channel0","name":"chardev-null"}' \ --add-fd set=3D1,fd=3D1751,opaque=3Dchannel1-log \ +-add-fd set=3D1,fd=3DXXXXXXX,opaque=3Dchannel1-log \ -chardev vc,id=3Dcharchannel1,logfile=3D/dev/fdset/1,logappend=3Don \ -device '{"driver":"virtserialport","bus":"virtio-serial0.0","nr":2,"chard= ev":"charchannel1","id":"channel1","name":"chardev-vc"}' \ -chardev pty,id=3Dcharchannel2 \ -device '{"driver":"virtserialport","bus":"virtio-serial0.0","nr":3,"chard= ev":"charchannel2","id":"channel2","name":"chardev-pty"}' \ -chardev stdio,id=3Dcharchannel3 \ -device '{"driver":"virtserialport","bus":"virtio-serial0.0","nr":4,"chard= ev":"charchannel3","id":"channel3","name":"chardev-stdio"}' \ --add-fd set=3D2,fd=3D1750,opaque=3Dchannel4-source \ +-add-fd set=3D2,fd=3DXXXXXXX,opaque=3Dchannel4-source \ -chardev file,id=3Dcharchannel4,path=3D/dev/fdset/2,append=3Don \ -device '{"driver":"virtserialport","bus":"virtio-serial0.0","nr":5,"chard= ev":"charchannel4","id":"channel4","name":"chardev-file"}' \ -chardev pipe,id=3Dcharchannel5,path=3D/path/to/pipe \ diff --git a/tests/qemuxmlconfdata/chardev-label.x86_64-latest.args b/tests= /qemuxmlconfdata/chardev-label.x86_64-latest.args index 9e54c0f7f3..b3c79cfd18 100644 --- a/tests/qemuxmlconfdata/chardev-label.x86_64-latest.args +++ b/tests/qemuxmlconfdata/chardev-label.x86_64-latest.args @@ -27,7 +27,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-machine= /.config \ -no-shutdown \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --add-fd set=3D0,fd=3D1750,opaque=3Dserial0-source \ +-add-fd set=3D0,fd=3DXXXXXXX,opaque=3Dserial0-source \ -chardev file,id=3Dcharserial0,path=3D/dev/fdset/0,append=3Don \ -device '{"driver":"isa-serial","chardev":"charserial0","id":"serial0","in= dex":0}' \ -chardev socket,id=3Dcharserial1,path=3D/tmp/serial.sock \ diff --git a/tests/qemuxmlconfdata/disk-source-fd.x86_64-latest.args b/test= s/qemuxmlconfdata/disk-source-fd.x86_64-latest.args index 27d852cf32..148fe74233 100644 --- a/tests/qemuxmlconfdata/disk-source-fd.x86_64-latest.args +++ b/tests/qemuxmlconfdata/disk-source-fd.x86_64-latest.args @@ -27,26 +27,26 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUG= uest1/.config \ -no-shutdown \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --add-fd set=3D5,fd=3D200,opaque=3Dlibvirt-6-storage0 \ --add-fd set=3D5,fd=3D205,opaque=3Dlibvirt-6-storage1 \ +-add-fd set=3D5,fd=3DXXXXXXX,opaque=3Dlibvirt-6-storage0 \ +-add-fd set=3D5,fd=3DXXXXXXX,opaque=3Dlibvirt-6-storage1 \ -blockdev '{"driver":"file","filename":"/dev/fdset/5","node-name":"libvirt= -6-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-6-format","read-only":false,"driver":"qco= w2","file":"libvirt-6-storage"}' \ -device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x2","drive":"li= bvirt-6-format","id":"virtio-disk4","bootindex":1}' \ --add-fd set=3D4,fd=3D209,opaque=3Dlibvirt-5-storage0 \ +-add-fd set=3D4,fd=3DXXXXXXX,opaque=3Dlibvirt-5-storage0 \ -blockdev '{"driver":"file","filename":"/dev/fdset/4","node-name":"libvirt= -5-storage","read-only":false,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-5-format","read-only":true,"driver":"raw"= ,"file":"libvirt-5-storage"}' \ --add-fd set=3D3,fd=3D247,opaque=3Dlibvirt-4-storage0 \ --add-fd set=3D3,fd=3D248,opaque=3Dlibvirt-4-storage1 \ +-add-fd set=3D3,fd=3DXXXXXXX,opaque=3Dlibvirt-4-storage0 \ +-add-fd set=3D3,fd=3DXXXXXXX,opaque=3Dlibvirt-4-storage1 \ -blockdev '{"driver":"file","filename":"/dev/fdset/3","node-name":"libvirt= -4-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-4-format","read-only":true,"driver":"qcow= 2","file":"libvirt-4-storage","backing":"libvirt-5-format"}' \ --add-fd set=3D2,fd=3D204,opaque=3Dlibvirt-3-storage0 \ +-add-fd set=3D2,fd=3DXXXXXXX,opaque=3Dlibvirt-3-storage0 \ -blockdev '{"driver":"file","filename":"/dev/fdset/2","node-name":"libvirt= -3-storage","read-only":false,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-3-format","read-only":false,"driver":"qco= w2","file":"libvirt-3-storage","backing":"libvirt-4-format"}' \ -device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x3","drive":"li= bvirt-3-format","id":"virtio-disk5"}' \ --add-fd set=3D1,fd=3D207,opaque=3Dlibvirt-2-storage0 \ +-add-fd set=3D1,fd=3DXXXXXXX,opaque=3Dlibvirt-2-storage0 \ -blockdev '{"driver":"file","filename":"/dev/fdset/1","node-name":"libvirt= -2-storage","read-only":true}' \ -device '{"driver":"ide-cd","bus":"ide.0","unit":0,"drive":"libvirt-2-stor= age","id":"ide0-0-0"}' \ --add-fd set=3D0,fd=3D208,opaque=3Dlibvirt-1-storage0 \ +-add-fd set=3D0,fd=3DXXXXXXX,opaque=3Dlibvirt-1-storage0 \ -blockdev '{"driver":"file","filename":"/dev/fdset/0","node-name":"libvirt= -1-storage","read-only":false,"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":1,"drive":"libvirt-1-form= at","id":"ide0-0-1"}' \ diff --git a/tests/qemuxmlconfdata/disk-vhostvdpa.x86_64-latest.args b/test= s/qemuxmlconfdata/disk-vhostvdpa.x86_64-latest.args index 93d2ef0d98..f52fcd2eb0 100644 --- a/tests/qemuxmlconfdata/disk-vhostvdpa.x86_64-latest.args +++ b/tests/qemuxmlconfdata/disk-vhostvdpa.x86_64-latest.args @@ -27,7 +27,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -no-shutdown \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --add-fd set=3D0,fd=3D201,opaque=3Dlibvirt-1-storage-vdpa \ +-add-fd set=3D0,fd=3DXXXXXXX,opaque=3Dlibvirt-1-storage-vdpa \ -blockdev '{"driver":"virtio-blk-vhost-vdpa","path":"/dev/fdset/0","node-n= ame":"libvirt-1-storage","read-only":false,"cache":{"direct":true,"no-flush= ":false}}' \ -device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x2","drive":"li= bvirt-1-storage","id":"virtio-disk0","bootindex":1,"write-cache":"on"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ diff --git a/tests/qemuxmlconfdata/name-escape.x86_64-latest.args b/tests/q= emuxmlconfdata/name-escape.x86_64-latest.args index 9eec8f5a9f..6a7032d99a 100644 --- a/tests/qemuxmlconfdata/name-escape.x86_64-latest.args +++ b/tests/qemuxmlconfdata/name-escape.x86_64-latest.args @@ -34,7 +34,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-foo=3D1= ,bar=3D2/.config \ -device '{"driver":"ccid-card-emulated","backend":"certificates","cert1":"= cert1,foo","cert2":"cert2","cert3":"cert3","db":"/etc/pki/nssdb,foo","id":"= smartcard0","bus":"ccid0.0"}' \ -chardev serial,id=3Dcharserial0,path=3D/dev/ttyS2,,foo \ -device '{"driver":"isa-serial","chardev":"charserial0","id":"serial0","in= dex":1}' \ --add-fd set=3D0,fd=3D1750,opaque=3Dserial1-source \ +-add-fd set=3D0,fd=3DXXXXXXX,opaque=3Dserial1-source \ -chardev file,id=3Dcharserial1,path=3D/dev/fdset/0,append=3Don \ -device '{"driver":"isa-serial","chardev":"charserial1","id":"serial1","in= dex":0}' \ -chardev pipe,id=3Dcharchannel0,path=3D/tmp/guestfwd,,foo \ diff --git a/tests/qemuxmlconfdata/net-vdpa-multiqueue.x86_64-latest.args b= /tests/qemuxmlconfdata/net-vdpa-multiqueue.x86_64-latest.args index e3aee785bf..313627eab0 100644 --- a/tests/qemuxmlconfdata/net-vdpa-multiqueue.x86_64-latest.args +++ b/tests/qemuxmlconfdata/net-vdpa-multiqueue.x86_64-latest.args @@ -27,7 +27,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -no-shutdown \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --add-fd set=3D0,fd=3D1732,opaque=3Dnet0-vdpa \ +-add-fd set=3D0,fd=3DXXXXXXX,opaque=3Dnet0-vdpa \ -netdev '{"type":"vhost-vdpa","vhostdev":"/dev/fdset/0","queues":2,"id":"h= ostnet0"}' \ -device '{"driver":"virtio-net-pci","mq":true,"vectors":6,"netdev":"hostne= t0","id":"net0","mac":"52:54:00:95:db:c0","bus":"pci.0","addr":"0x2"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ diff --git a/tests/qemuxmlconfdata/net-vdpa.x86_64-latest.args b/tests/qemu= xmlconfdata/net-vdpa.x86_64-latest.args index 1fccd80199..118dd5dcb8 100644 --- a/tests/qemuxmlconfdata/net-vdpa.x86_64-latest.args +++ b/tests/qemuxmlconfdata/net-vdpa.x86_64-latest.args @@ -27,7 +27,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -no-shutdown \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --add-fd set=3D0,fd=3D1732,opaque=3Dnet0-vdpa \ +-add-fd set=3D0,fd=3DXXXXXXX,opaque=3Dnet0-vdpa \ -netdev '{"type":"vhost-vdpa","vhostdev":"/dev/fdset/0","id":"hostnet0"}' \ -device '{"driver":"virtio-net-pci","netdev":"hostnet0","id":"net0","mac":= "52:54:00:95:db:c0","bus":"pci.0","addr":"0x2"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ diff --git a/tests/qemuxmlconfdata/serial-file-chardev.x86_64-latest.args b= /tests/qemuxmlconfdata/serial-file-chardev.x86_64-latest.args index ca1867c247..59021c4443 100644 --- a/tests/qemuxmlconfdata/serial-file-chardev.x86_64-latest.args +++ b/tests/qemuxmlconfdata/serial-file-chardev.x86_64-latest.args @@ -29,7 +29,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","read-only":false}' \ -device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-stor= age","id":"ide0-0-0","bootindex":1}' \ --add-fd set=3D0,fd=3D1750,opaque=3Dserial0-source \ +-add-fd set=3D0,fd=3DXXXXXXX,opaque=3Dserial0-source \ -chardev file,id=3Dcharserial0,path=3D/dev/fdset/0,append=3Don \ -device '{"driver":"isa-serial","chardev":"charserial0","id":"serial0","in= dex":0}' \ -audiodev '{"id":"audio1","driver":"none"}' \ diff --git a/tests/qemuxmlconfdata/serial-file-log.x86_64-latest.args b/tes= ts/qemuxmlconfdata/serial-file-log.x86_64-latest.args index 6cae9e89cd..260fb2f37a 100644 --- a/tests/qemuxmlconfdata/serial-file-log.x86_64-latest.args +++ b/tests/qemuxmlconfdata/serial-file-log.x86_64-latest.args @@ -29,8 +29,8 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","read-only":false}' \ -device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-stor= age","id":"ide0-0-0","bootindex":1}' \ --add-fd set=3D0,fd=3D1750,opaque=3Dserial0-source \ --add-fd set=3D1,fd=3D1751,opaque=3Dserial0-log \ +-add-fd set=3D0,fd=3DXXXXXXX,opaque=3Dserial0-source \ +-add-fd set=3D1,fd=3DXXXXXXX,opaque=3Dserial0-log \ -chardev file,id=3Dcharserial0,path=3D/dev/fdset/0,append=3Don,logfile=3D/= dev/fdset/1,logappend=3Don \ -device '{"driver":"isa-serial","chardev":"charserial0","id":"serial0","in= dex":0}' \ -audiodev '{"id":"audio1","driver":"none"}' \ diff --git a/tests/qemuxmlconfdata/serial-many-chardev.x86_64-latest.args b= /tests/qemuxmlconfdata/serial-many-chardev.x86_64-latest.args index 38d0033c9f..2841bbd3ba 100644 --- a/tests/qemuxmlconfdata/serial-many-chardev.x86_64-latest.args +++ b/tests/qemuxmlconfdata/serial-many-chardev.x86_64-latest.args @@ -31,7 +31,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-stor= age","id":"ide0-0-0","bootindex":1}' \ -chardev pty,id=3Dcharserial0 \ -device '{"driver":"isa-serial","chardev":"charserial0","id":"serial0","in= dex":0}' \ --add-fd set=3D0,fd=3D1750,opaque=3Dserial1-source \ +-add-fd set=3D0,fd=3DXXXXXXX,opaque=3Dserial1-source \ -chardev file,id=3Dcharserial1,path=3D/dev/fdset/0,append=3Don \ -device '{"driver":"isa-serial","chardev":"charserial1","id":"serial1","in= dex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ diff --git a/tests/qemuxmlconfdata/tpm-passthrough-crb.x86_64-latest.args b= /tests/qemuxmlconfdata/tpm-passthrough-crb.x86_64-latest.args index cd210b50a0..319bf9579c 100644 --- a/tests/qemuxmlconfdata/tpm-passthrough-crb.x86_64-latest.args +++ b/tests/qemuxmlconfdata/tpm-passthrough-crb.x86_64-latest.args @@ -27,8 +27,8 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-TPM-VM/= .config \ -no-shutdown \ -boot menu=3Don,strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --add-fd set=3D0,fd=3D1730,opaque=3Dtpm0-tpm \ --add-fd set=3D1,fd=3D1731,opaque=3Dtpm0-cancel \ +-add-fd set=3D0,fd=3DXXXXXXX,opaque=3Dtpm0-tpm \ +-add-fd set=3D1,fd=3DXXXXXXX,opaque=3Dtpm0-cancel \ -tpmdev passthrough,id=3Dtpm-tpm0,path=3D/dev/fdset/0,cancel-path=3D/dev/f= dset/1 \ -device '{"driver":"tpm-crb","tpmdev":"tpm-tpm0","id":"tpm0"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ diff --git a/tests/qemuxmlconfdata/tpm-passthrough.x86_64-latest.args b/tes= ts/qemuxmlconfdata/tpm-passthrough.x86_64-latest.args index cab016b666..896b6c3040 100644 --- a/tests/qemuxmlconfdata/tpm-passthrough.x86_64-latest.args +++ b/tests/qemuxmlconfdata/tpm-passthrough.x86_64-latest.args @@ -27,8 +27,8 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-TPM-VM/= .config \ -no-shutdown \ -boot menu=3Don,strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --add-fd set=3D0,fd=3D1730,opaque=3Dtpm0-tpm \ --add-fd set=3D1,fd=3D1731,opaque=3Dtpm0-cancel \ +-add-fd set=3D0,fd=3DXXXXXXX,opaque=3Dtpm0-tpm \ +-add-fd set=3D1,fd=3DXXXXXXX,opaque=3Dtpm0-cancel \ -tpmdev passthrough,id=3Dtpm-tpm0,path=3D/dev/fdset/0,cancel-path=3D/dev/f= dset/1 \ -device '{"driver":"tpm-tis","tpmdev":"tpm-tpm0","id":"tpm0"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ diff --git a/tests/qemuxmlconftest.c b/tests/qemuxmlconftest.c index ab62748013..6f5852657c 100644 --- a/tests/qemuxmlconftest.c +++ b/tests/qemuxmlconftest.c @@ -40,6 +40,10 @@ static virQEMUDriver driver; +/* this test case uses virTestDummyFDContextNew so we want to mock dup() to + * track FD hints properly */ +#include "virmock.h" +VIR_TEST_MAKE_DUMMY_FD_INSTALL_DUP_MOCK static void testQemuPrepareHostdevPCI(virDomainHostdevDef *hostdev) @@ -344,6 +348,191 @@ testCompareXMLToArgvValidateSchema(virCommand *cmd, } +struct testCompareXMLToArgvStabilizeOneFindJSONObjectIterData { + const char *field; + bool recurse; + virJSONValue *ret; +}; + +static int +testCompareXMLToArgvStabilizeOneFindJSONObjectIter(const char *key, + virJSONValue *value, + void *opaque) +{ + struct testCompareXMLToArgvStabilizeOneFindJSONObjectIterData *data = =3D opaque; + + /* negative value breaks iteration and returns specific return value */ + if (STREQ(data->field, key)) + return -1; + + if (!data->recurse) + return 0; + + if (!virJSONValueIsObject(value)) + return 0; + + if (virJSONValueObjectForeachKeyValue(value, + testCompareXMLToArgvStabilizeOne= FindJSONObjectIter, + data) =3D=3D -2) { + /* -2 means that the callback found something; now if it was the a= bove + * call that found the key we need to fill the pointer to what we'= ve + * called it with */ + if (data->ret =3D=3D NULL) + data->ret =3D value; + + return -1; + } + + return 0; +} + + +/** + * testCompareXMLToArgvStabilizeOne: + * @arg: argument to modify (may be replaced by other memory) + * @field: field to replace + * @substitutions: optional hash-table to look up value of @field and repl= ace + * it with the stored string + * + * Takes one qemu argument @arg and replaces the value of '@field' by a st= able + * string, either 'XXXXXXX' if @substitutions is NULL or the value of @fie= ld + * wasn't found in @substitutions, or with the string from @substitutions = if + * found. + * + * Works both on JSON and normal arguments. + */ +static void +testCompareXMLToArgvStabilizeOne(char **arg, + const char *field, + GHashTable *substitutions, + bool recurseJSON) +{ + g_autofree char *oldarg =3D g_steal_pointer(arg); + + if (*oldarg =3D=3D '{') { + g_autoptr(virJSONValue) j =3D virJSONValueFromString(oldarg); + struct testCompareXMLToArgvStabilizeOneFindJSONObjectIterData data= =3D { + .field =3D field, + .recurse =3D recurseJSON, + }; + const char *curstr =3D NULL; + + /* Any JSON args will be validated so this ought not to happen */ + if (!j) { + *arg =3D g_steal_pointer(&oldarg); + return; + } + + if (virJSONValueObjectForeachKeyValue(j, + testCompareXMLToArgvStabiliz= eOneFindJSONObjectIter, + &data) =3D=3D -2) { + /* -2 means that the callback found something; now if it was t= he above + * call that found the key we need to fill the pointer to what= we've + * called it with */ + if (data.ret =3D=3D NULL) + data.ret =3D j; + } + + if (data.ret) { + virJSONValue *cur =3D virJSONValueObjectGet(data.ret, field); + + if (cur) { + switch (virJSONValueGetType(cur)) { + case VIR_JSON_TYPE_STRING: + curstr =3D virJSONValueGetString(cur); + break; + + case VIR_JSON_TYPE_NUMBER: + curstr =3D virJSONValueGetNumberString(cur); + break; + + case VIR_JSON_TYPE_OBJECT: + case VIR_JSON_TYPE_ARRAY: + case VIR_JSON_TYPE_BOOLEAN: + case VIR_JSON_TYPE_NULL: + break; + } + } + } + + if (curstr) { + g_autoptr(virJSONValue) newval =3D NULL; + const char *subst =3D NULL; + + if (substitutions) + subst =3D g_hash_table_lookup(substitutions, curstr); + + if (!subst) + subst =3D "XXXXXXX"; + + newval =3D virJSONValueNewString(g_strdup(subst)); + + ignore_value(virJSONValueObjectReplaceKey(data.ret, field, &ne= wval)); + + *arg =3D virJSONValueToString(j, false); + return; + } else { + *arg =3D g_steal_pointer(&oldarg); + return; + } + } else { + g_autofree char *fieldmatch =3D g_strdup_printf("%s=3D", field); + char *match; + char *val; + char *rest; + const char *subst =3D NULL; + + if (!(match =3D strstr(oldarg, fieldmatch))) { + *arg =3D g_steal_pointer(&oldarg); + return; + } + + if ((rest =3D strchr(match, ','))) + *rest =3D '\0'; + + *match =3D '\0'; + + val =3D match + strlen(fieldmatch); + + if (substitutions) + subst =3D g_hash_table_lookup(substitutions, val); + + if (!subst) + subst =3D "XXXXXXX"; + + if (rest) + *rest =3D ','; + + *arg =3D g_strdup_printf("%s%s%s%s", oldarg, fieldmatch, subst, NU= LLSTR_EMPTY(rest)); + } +} + + +static void +testCompareXMLToArgvStabilizeArgs(virCommand *cmd, + GHashTable *fdsubsts) +{ + char **args; + size_t nargs; + size_t a; + + virCommandArgListAccess(cmd, &args, &nargs); + + for (a =3D 0; a < nargs; a++) { + /* Any following replacements want also an argument for an option = so + * so we guarantee that there's at least one extra arg */ + if (a + 1 >=3D nargs) + break; + + if (STREQ(args[a], "-add-fd")) { + testCompareXMLToArgvStabilizeOne(&args[a + 1], "fd", fdsubsts,= false); + + a++; + } + } +} + + static int testInfoCheckDuplicate(testQemuInfo *info) { @@ -724,6 +913,8 @@ testCompareXMLToArgv(const void *data) if (testCompareXMLToArgvValidateSchema(cmd, info) < 0) goto cleanup; + testCompareXMLToArgvStabilizeArgs(cmd, info->fdsubsts); + if (virCommandToStringBuf(cmd, &actualBuf, true, false) < 0) goto cleanup; @@ -801,10 +992,12 @@ testRun(const char *name, g_autofree char *name_argv =3D g_strdup_printf("QEMU XML def -> ARGV %= s%s", name, suffix); g_autoptr(testQemuInfo) info =3D g_new0(testQemuInfo, 1); va_list ap; + g_autoptr(virTestDummyFDContext) fdsubsts =3D virTestDummyFDContextNew= (); info->name =3D name; info->suffix =3D suffix; info->conf =3D testConf; + info->fdsubsts =3D fdsubsts; va_start(ap, testConf); testQemuInfoSetArgs(info, ap); diff --git a/tests/testutilsqemu.h b/tests/testutilsqemu.h index dbc8e2dbdf..a39f03518b 100644 --- a/tests/testutilsqemu.h +++ b/tests/testutilsqemu.h @@ -120,6 +120,8 @@ struct _testQemuInfo { struct testQemuArgs args; struct testQemuConf *conf; + + GHashTable *fdsubsts; }; typedef struct _testQemuInfo testQemuInfo; --=20 2.54.0 From nobody Sat May 30 15:28:30 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.libvirt.org designates 38.145.34.151 as permitted sender) client-ip=38.145.34.151; envelope-from=devel-bounces@lists.libvirt.org; helo=lists.libvirt.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.libvirt.org designates 38.145.34.151 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=pass(p=reject dis=none) header.from=lists.libvirt.org ARC-Seal: i=1; a=rsa-sha256; t=1779382814; cv=none; d=zohomail.com; s=zohoarc; b=HLMhRiMrfYZ/sDSqGo45Y8mE+mJD2TKeIFSjR+WUCqIfANuEysCV4cQA6Gw67QS2REIRC4DZ4Zlg0WImIg6MWxw4Pac3eOB9QPFSMbDEhhBixhMe0UO04lcew5byE+OF4S4Wi1kse7lL7qjDgjk915U1lXZvkHTJbfmhkIKwB9s= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1779382814; h=Content-Type:Content-Transfer-Encoding:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Owner:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:Reply-To:References:Subject:Subject:To:To:Message-Id:Cc; bh=YCJNBfJ5Cs4g6JBgRUFKK3JNk/DuWRdBpxyLrrCkPfw=; b=huznv5qrICFVQbGSAQEEVYBvzHKUu6HxSATlhGICK8AaFq2UWm06VlZgoRQzewZ9QTNz8E04iXqv+//7MaPDItEHMWQ973HaAOTi5mkfv94UAlMC7a+YtVsxGh5MXRIANefmftgT4Ffq6zXTDUGn4XCYh8DP9QZ6t+BJEwK1rD4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.libvirt.org designates 38.145.34.151 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=pass header.from= (p=reject dis=none) Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [38.145.34.151]) by mx.zohomail.com with SMTPS id 1779382814668990.6984269870924; Thu, 21 May 2026 10:00:14 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 993) id 7790041D48; Thu, 21 May 2026 12:59:41 -0400 (EDT) Received: from [172.19.199.4] (unknown [10.16.107.18]) by lists.libvirt.org (Postfix) with ESMTP id 7F7B243EDF; Thu, 21 May 2026 12:30:38 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 993) id 4564941B54; Thu, 21 May 2026 12:30:16 -0400 (EDT) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (3072 bits) server-digest SHA256) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id 938B841AE1 for ; Thu, 21 May 2026 12:24:08 -0400 (EDT) Received: from mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-607-yNDgxcPDMB2OEyJQeonIIg-1; Thu, 21 May 2026 12:24:00 -0400 Received: from mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.17]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id B492119560B3 for ; Thu, 21 May 2026 16:23:59 +0000 (UTC) Received: from speedmetal.openshiftapps.com (unknown [10.44.22.3]) by mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id B42451956053 for ; Thu, 21 May 2026 16:23:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1779380648; h=from:from: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; bh=YCJNBfJ5Cs4g6JBgRUFKK3JNk/DuWRdBpxyLrrCkPfw=; b=dUiwwzr38PLksVoB+d5AI7qoq9YKUfsIlMhisg9DFJrPVtyMM0TTsbpkR15OiOCkOsh1KP fDhrEtUqoGHx2agq7K3s3MtwNvcjSIkLrHK98PnOApcxR7k2WELgfCgZCyAN6bsOqHn3fW BBkqOme9foxvQbMz1zFaj5fVSp+VNaE= X-MC-Unique: yNDgxcPDMB2OEyJQeonIIg-1 X-Mimecast-MFC-AGG-ID: yNDgxcPDMB2OEyJQeonIIg_1779380639 To: devel@lists.libvirt.org Subject: [PATCH 13/30] qemumonitorjsontest: Stabilize FD names in '-chardev' Date: Thu, 21 May 2026 18:23:22 +0200 Message-ID: <1a43ce433c5f5c4d05294c042c44f40b26039e69.1779380461.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.17 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: 6t4KivGAHZH7cJEXGrSV3NxjJd2dcVDvAn26U3JKVYE_1779380639 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: 62EHIPYAU4T42EIK3QLZJWR7APFBYKPL X-Message-ID-Hash: 62EHIPYAU4T42EIK3QLZJWR7APFBYKPL X-MailFrom: pkrempa@redhat.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; header-match-devel.lists.libvirt.org-0; emergency; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.10 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: From: Peter Krempa via Devel Reply-To: Peter Krempa X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1779382818374154100 Content-Type: text/plain; charset="utf-8" From: Peter Krempa Use 'testCompareXMLToArgvStabilizeOne' to censor FD values in '-chardev' commands for stable test outputs without the need for fake FDs. For monitor sockets this also creates a hint '@mon-fd@' to be used as substitution to prevent any further churn on basically every .args file. The substitution is done by temporarily using another fake FD (1764) instead of 1729 so that it's unique. Signed-off-by: Peter Krempa Reviewed-by: Michal Privoznik --- ...arch64-cpu-passthrough.aarch64-latest.args | 2 +- ...ault-cpu-kvm-virt-10.0.aarch64-latest.args | 2 +- ...fault-cpu-kvm-virt-4.2.aarch64-10.0.0.args | 2 +- ...ault-cpu-tcg-virt-10.0.aarch64-latest.args | 2 +- ...fault-cpu-tcg-virt-4.2.aarch64-10.0.0.args | 2 +- ...aarch64-features-pauth.aarch64-latest.args | 2 +- .../aarch64-features-ras.aarch64-latest.args | 2 +- .../aarch64-features-sve.aarch64-latest.args | 2 +- ...rch64-gic-default-both.aarch64-latest.args | 2 +- ...aarch64-gic-default-v2.aarch64-latest.args | 2 +- ...aarch64-gic-default-v3.aarch64-latest.args | 2 +- .../aarch64-gic-default.aarch64-latest.args | 2 +- .../aarch64-gic-host.aarch64-latest.args | 2 +- .../aarch64-gic-none-both.aarch64-latest.args | 2 +- .../aarch64-gic-none-tcg.aarch64-latest.args | 2 +- .../aarch64-gic-none-v2.aarch64-latest.args | 2 +- .../aarch64-gic-none-v3.aarch64-latest.args | 2 +- .../aarch64-gic-none.aarch64-latest.args | 2 +- .../aarch64-gic-v2.aarch64-latest.args | 2 +- .../aarch64-gic-v3.aarch64-latest.args | 2 +- .../aarch64-kvm-32-on-64.aarch64-latest.args | 2 +- ...usb-minimal.aarch64-latest.abi-update.args | 2 +- .../aarch64-nousb-minimal.aarch64-latest.args | 2 +- .../aarch64-pci-serial.aarch64-latest.args | 2 +- ...iew-minimal.aarch64-latest.abi-update.args | 2 +- ...rch64-realview-minimal.aarch64-latest.args | 2 +- ...arch64-traditional-pci.aarch64-latest.args | 2 +- ...aarch64-usb-controller.aarch64-latest.args | 2 +- .../aarch64-video-default.aarch64-latest.args | 2 +- ...4-video-virtio-gpu-pci.aarch64-latest.args | 2 +- ...ault-models.aarch64-latest.abi-update.args | 2 +- ...64-virt-default-models.aarch64-latest.args | 2 +- ...rch64-virt-default-nic.aarch64-latest.args | 2 +- .../aarch64-virt-graphics.aarch64-latest.args | 4 ++-- ...h64-virt-headless-mmio.aarch64-latest.args | 4 ++-- .../aarch64-virt-headless.aarch64-latest.args | 4 ++-- ...irt-minimal.aarch64-latest.abi-update.args | 2 +- .../aarch64-virt-minimal.aarch64-latest.args | 2 +- .../aarch64-virt-virtio.aarch64-latest.args | 2 +- ...64-virt-virtualization.aarch64-latest.args | 2 +- ...o-pci-manual-addresses.aarch64-latest.args | 2 +- .../acpi-generic-initiator.x86_64-latest.args | 2 +- .../acpi-table-many.x86_64-latest.args | 2 +- .../acpi-table.x86_64-latest.args | 2 +- .../amd-iommu.x86_64-latest.args | 2 +- .../arm-vexpressa9-basic.aarch64-latest.args | 2 +- .../arm-vexpressa9-nodevs.aarch64-latest.args | 2 +- .../arm-vexpressa9-virtio.aarch64-latest.args | 2 +- ...lepb-minimal.armv7l-latest.abi-update.args | 2 +- ...v7l-versatilepb-minimal.armv7l-latest.args | 2 +- .../async-teardown.x86_64-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 | 2 +- .../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-pipewire-best.x86_64-latest.args | 2 +- .../audio-pipewire-full.x86_64-latest.args | 2 +- .../audio-pipewire-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 +- .../autoindex.x86_64-latest.args | 2 +- .../balloon-ccw-deflate.s390x-latest.args | 2 +- .../balloon-device-auto.x86_64-latest.args | 2 +- ...loon-device-deflate-off.x86_64-latest.args | 2 +- .../balloon-device-deflate.x86_64-latest.args | 2 +- .../balloon-device-period.x86_64-latest.args | 2 +- .../balloon-device.x86_64-latest.args | 2 +- .../balloon-mmio-deflate.aarch64-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 +- .../blkdeviotune.x86_64-latest.args | 2 +- .../blkiotune-device.x86_64-latest.args | 2 +- .../blkiotune.x86_64-latest.args | 2 +- .../boot-cdrom.x86_64-latest.args | 2 +- .../boot-complex.x86_64-latest.args | 2 +- .../boot-floppy-q35.x86_64-latest.args | 2 +- .../boot-floppy.x86_64-latest.args | 2 +- ...boot-menu-disable-drive.x86_64-latest.args | 2 +- ...nu-disable-with-timeout.x86_64-latest.args | 2 +- .../boot-menu-disable.x86_64-latest.args | 2 +- ...enu-enable-with-timeout.x86_64-latest.args | 2 +- .../boot-menu-enable.x86_64-latest.args | 2 +- .../boot-multi.x86_64-latest.args | 2 +- .../boot-network.x86_64-latest.args | 2 +- .../boot-order.x86_64-latest.args | 2 +- .../channel-guestfwd.x86_64-latest.args | 2 +- ...l-qemu-vdagent-features.x86_64-latest.args | 2 +- .../channel-qemu-vdagent.x86_64-latest.args | 2 +- .../channel-spicevmc.x86_64-latest.args | 2 +- .../channel-unix-guestfwd.x86_64-latest.args | 4 ++-- ...hannel-unix-source-path.x86_64-latest.args | 22 +++++++++---------- .../channel-virtio-auto.x86_64-latest.args | 2 +- .../channel-virtio-autoadd.x86_64-latest.args | 2 +- ...annel-virtio-autoassign.x86_64-latest.args | 2 +- .../channel-virtio-default.x86_64-latest.args | 2 +- .../channel-virtio-state.x86_64-latest.args | 2 +- .../channel-virtio-unix.x86_64-latest.args | 10 ++++----- .../channel-virtio.x86_64-latest.args | 2 +- .../chardev-backends-json.x86_64-9.1.0.args | 4 ++-- .../chardev-backends-json.x86_64-latest.args | 4 ++-- .../chardev-backends.x86_64-9.1.0.args | 4 ++-- .../chardev-backends.x86_64-latest.args | 4 ++-- .../chardev-label.x86_64-latest.args | 2 +- .../chardev-reconnect.x86_64-9.1.0.args | 2 +- .../chardev-reconnect.x86_64-latest.args | 2 +- .../clock-absolute.x86_64-latest.args | 2 +- .../clock-catchup.x86_64-latest.args | 2 +- .../clock-france.x86_64-latest.args | 2 +- .../clock-hpet-off.x86_64-7.2.0.args | 2 +- .../clock-hpet-off.x86_64-latest.args | 2 +- ...caltime-basis-localtime.x86_64-latest.args | 2 +- .../clock-localtime.x86_64-latest.args | 2 +- .../clock-realtime.x86_64-latest.args | 2 +- .../clock-timer-armvtimer.aarch64-latest.args | 2 +- .../clock-timer-hyperv-rtc.x86_64-latest.args | 2 +- .../clock-utc.x86_64-latest.args | 2 +- .../clock-variable.x86_64-latest.args | 2 +- .../console-compat-auto.x86_64-latest.args | 2 +- .../console-compat-chardev.x86_64-latest.args | 2 +- .../console-compat-crash.x86_64-latest.args | 2 +- .../console-compat.x86_64-latest.args | 2 +- .../console-compat2.x86_64-latest.args | 2 +- .../console-sclp.s390x-latest.args | 2 +- .../console-virtio-ccw.s390x-latest.args | 2 +- .../console-virtio-many.x86_64-latest.args | 2 +- ...rial-autoassign-address.x86_64-latest.args | 2 +- .../console-virtio-unix.x86_64-latest.args | 4 ++-- .../console-virtio.x86_64-latest.args | 2 +- .../controller-order.x86_64-latest.args | 2 +- .../controller-scsi-auto.x86_64-latest.args | 2 +- .../controller-usb-order.x86_64-latest.args | 2 +- .../controller-virtio-scsi.x86_64-latest.args | 2 +- .../cpu-Haswell-noTSX.x86_64-latest.args | 2 +- .../cpu-Haswell.x86_64-latest.args | 2 +- .../cpu-Haswell2.x86_64-latest.args | 2 +- .../cpu-Haswell3.x86_64-latest.args | 2 +- ...-Icelake-Server-pconfig.x86_64-latest.args | 2 +- .../cpu-cache-disable.x86_64-latest.args | 2 +- .../cpu-cache-disable3.x86_64-latest.args | 2 +- .../cpu-cache-emulate-l3.x86_64-latest.args | 2 +- .../cpu-cache-passthrough.x86_64-latest.args | 2 +- .../cpu-check-default-none.x86_64-latest.args | 2 +- ...cpu-check-default-none2.x86_64-latest.args | 2 +- ...u-check-default-partial.x86_64-latest.args | 2 +- ...-check-default-partial2.x86_64-latest.args | 2 +- .../cpu-check-none.x86_64-latest.args | 2 +- .../cpu-empty.x86_64-latest.args | 2 +- .../cpu-eoi-disabled.x86_64-latest.args | 2 +- .../cpu-eoi-enabled.x86_64-latest.args | 2 +- .../cpu-exact1.x86_64-latest.args | 2 +- .../cpu-exact2-nofallback.x86_64-latest.args | 2 +- .../cpu-exact2.x86_64-latest.args | 2 +- .../cpu-fallback.x86_64-8.0.0.args | 2 +- .../cpu-host-kvmclock.x86_64-latest.args | 2 +- .../cpu-host-model-cmt.x86_64-latest.args | 2 +- ...host-model-fallback-kvm.x86_64-10.0.0.args | 2 +- ...host-model-fallback-kvm.x86_64-10.1.0.args | 2 +- ...host-model-fallback-kvm.x86_64-10.2.0.args | 2 +- ...host-model-fallback-kvm.x86_64-11.0.0.args | 2 +- ...-host-model-fallback-kvm.x86_64-7.2.0.args | 2 +- ...-host-model-fallback-kvm.x86_64-8.0.0.args | 2 +- ...-host-model-fallback-kvm.x86_64-8.1.0.args | 2 +- ...-host-model-fallback-kvm.x86_64-8.2.0.args | 2 +- ...-host-model-fallback-kvm.x86_64-9.0.0.args | 2 +- ...-host-model-fallback-kvm.x86_64-9.1.0.args | 2 +- ...-host-model-fallback-kvm.x86_64-9.2.0.args | 2 +- ...host-model-fallback-kvm.x86_64-latest.args | 2 +- ...host-model-fallback-tcg.x86_64-10.0.0.args | 2 +- ...host-model-fallback-tcg.x86_64-10.1.0.args | 2 +- ...host-model-fallback-tcg.x86_64-10.2.0.args | 2 +- ...host-model-fallback-tcg.x86_64-11.0.0.args | 2 +- ...-host-model-fallback-tcg.x86_64-7.2.0.args | 2 +- ...-host-model-fallback-tcg.x86_64-8.0.0.args | 2 +- ...-host-model-fallback-tcg.x86_64-8.1.0.args | 2 +- ...-host-model-fallback-tcg.x86_64-8.2.0.args | 2 +- ...-host-model-fallback-tcg.x86_64-9.0.0.args | 2 +- ...-host-model-fallback-tcg.x86_64-9.1.0.args | 2 +- ...-host-model-fallback-tcg.x86_64-9.2.0.args | 2 +- ...host-model-fallback-tcg.x86_64-latest.args | 2 +- ...cpu-host-model-features.x86_64-latest.args | 2 +- .../cpu-host-model-kvm.x86_64-10.0.0.args | 2 +- .../cpu-host-model-kvm.x86_64-10.1.0.args | 2 +- .../cpu-host-model-kvm.x86_64-10.2.0.args | 2 +- .../cpu-host-model-kvm.x86_64-11.0.0.args | 2 +- .../cpu-host-model-kvm.x86_64-7.2.0.args | 2 +- .../cpu-host-model-kvm.x86_64-8.0.0.args | 2 +- .../cpu-host-model-kvm.x86_64-8.1.0.args | 2 +- .../cpu-host-model-kvm.x86_64-8.2.0.args | 2 +- .../cpu-host-model-kvm.x86_64-9.0.0.args | 2 +- .../cpu-host-model-kvm.x86_64-9.1.0.args | 2 +- .../cpu-host-model-kvm.x86_64-9.2.0.args | 2 +- .../cpu-host-model-kvm.x86_64-latest.args | 2 +- ...st-model-nofallback-kvm.x86_64-10.0.0.args | 2 +- ...st-model-nofallback-kvm.x86_64-10.1.0.args | 2 +- ...st-model-nofallback-kvm.x86_64-10.2.0.args | 2 +- ...st-model-nofallback-kvm.x86_64-11.0.0.args | 2 +- ...ost-model-nofallback-kvm.x86_64-7.2.0.args | 2 +- ...ost-model-nofallback-kvm.x86_64-8.0.0.args | 2 +- ...ost-model-nofallback-kvm.x86_64-8.1.0.args | 2 +- ...ost-model-nofallback-kvm.x86_64-8.2.0.args | 2 +- ...ost-model-nofallback-kvm.x86_64-9.0.0.args | 2 +- ...ost-model-nofallback-kvm.x86_64-9.1.0.args | 2 +- ...ost-model-nofallback-kvm.x86_64-9.2.0.args | 2 +- ...st-model-nofallback-kvm.x86_64-latest.args | 2 +- ...st-model-nofallback-tcg.x86_64-10.0.0.args | 2 +- ...st-model-nofallback-tcg.x86_64-10.1.0.args | 2 +- ...st-model-nofallback-tcg.x86_64-10.2.0.args | 2 +- ...st-model-nofallback-tcg.x86_64-11.0.0.args | 2 +- ...ost-model-nofallback-tcg.x86_64-7.2.0.args | 2 +- ...ost-model-nofallback-tcg.x86_64-8.0.0.args | 2 +- ...ost-model-nofallback-tcg.x86_64-8.1.0.args | 2 +- ...ost-model-nofallback-tcg.x86_64-8.2.0.args | 2 +- ...ost-model-nofallback-tcg.x86_64-9.0.0.args | 2 +- ...ost-model-nofallback-tcg.x86_64-9.1.0.args | 2 +- ...ost-model-nofallback-tcg.x86_64-9.2.0.args | 2 +- ...st-model-nofallback-tcg.x86_64-latest.args | 2 +- .../cpu-host-model-tcg.x86_64-10.0.0.args | 2 +- .../cpu-host-model-tcg.x86_64-10.1.0.args | 2 +- .../cpu-host-model-tcg.x86_64-10.2.0.args | 2 +- .../cpu-host-model-tcg.x86_64-11.0.0.args | 2 +- .../cpu-host-model-tcg.x86_64-7.2.0.args | 2 +- .../cpu-host-model-tcg.x86_64-8.0.0.args | 2 +- .../cpu-host-model-tcg.x86_64-8.1.0.args | 2 +- .../cpu-host-model-tcg.x86_64-8.2.0.args | 2 +- .../cpu-host-model-tcg.x86_64-9.0.0.args | 2 +- .../cpu-host-model-tcg.x86_64-9.1.0.args | 2 +- .../cpu-host-model-tcg.x86_64-9.2.0.args | 2 +- .../cpu-host-model-tcg.x86_64-latest.args | 2 +- .../cpu-host-model-vendor.x86_64-latest.args | 2 +- ...st-passthrough-features.x86_64-latest.args | 2 +- .../cpu-host-passthrough.x86_64-latest.args | 2 +- .../cpu-hotplug-startup.x86_64-latest.args | 2 +- .../cpu-kvmclock.x86_64-latest.args | 2 +- .../cpu-minimum1.x86_64-latest.args | 2 +- .../cpu-minimum2.x86_64-latest.args | 2 +- ...deprecated-features-none.s390x-latest.args | 2 +- ...-deprecated-features-off.s390x-latest.args | 2 +- ...l-deprecated-features-on.s390x-latest.args | 2 +- ...cpu-no-removed-features.x86_64-latest.args | 2 +- .../cpu-nofallback.x86_64-8.0.0.args | 2 +- .../cpu-numa-disjoint.x86_64-latest.args | 2 +- .../cpu-numa-disordered.x86_64-latest.args | 2 +- ...pu-numa-memory-oldstyle.x86_64-10.2.0.args | 2 +- .../cpu-numa-memshared.x86_64-latest.args | 2 +- ...-numa-no-memory-element.x86_64-latest.args | 2 +- .../cpu-numa1.x86_64-latest.args | 2 +- .../cpu-numa2.x86_64-latest.args | 2 +- ...-phys-bits-emulate-bare.x86_64-latest.args | 2 +- .../cpu-phys-bits-emulate.x86_64-latest.args | 2 +- .../cpu-phys-bits-emulate2.x86_64-latest.args | 2 +- .../cpu-phys-bits-limit.x86_64-latest.args | 2 +- ...u-phys-bits-passthrough.x86_64-latest.args | 2 +- .../cpu-s390-features.s390x-latest.args | 2 +- .../cpu-s390-zEC12.s390x-latest.args | 2 +- .../cpu-strict1.x86_64-latest.args | 2 +- .../cpu-topology1.x86_64-latest.args | 2 +- .../cpu-topology2.x86_64-latest.args | 2 +- .../cpu-topology3.x86_64-latest.args | 2 +- .../cpu-topology4.x86_64-latest.args | 2 +- .../cpu-topology5.aarch64-latest.args | 2 +- .../cpu-translation.x86_64-latest.args | 2 +- .../cpu-tsc-frequency.x86_64-latest.args | 2 +- .../cputune-cpuset-big-id.x86_64-latest.args | 2 +- .../cputune-numatune.x86_64-latest.args | 2 +- .../cputune-zero-shares.x86_64-latest.args | 2 +- .../cputune.x86_64-latest.args | 2 +- .../crypto-builtin.x86_64-latest.args | 2 +- .../default-kvm-host-arch.x86_64-latest.args | 2 +- .../default-qemu-host-arch.x86_64-latest.args | 2 +- ...ult-video-type-aarch64.aarch64-latest.args | 2 +- ...o-type-loongarch64.loongarch64-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 +- ...fault-video-type-x86_64.x86_64-latest.args | 2 +- .../devices-acpi-index.x86_64-latest.args | 2 +- .../disk-active-commit.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-no-discard.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 +- ...m-empty-network-invalid.x86_64-latest.args | 2 +- ...sk-cdrom-network-nbdkit.x86_64-latest.args | 2 +- .../disk-cdrom-network.x86_64-latest.args | 2 +- .../disk-cdrom-tray.x86_64-latest.args | 2 +- ...om-usb-empty.x86_64-latest.abi-update.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-discard_no_unref.x86_64-latest.args | 2 +- .../disk-error-policy-s390x.s390x-latest.args | 2 +- .../disk-error-policy.x86_64-latest.args | 2 +- .../disk-floppy-q35.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-mirror-old.x86_64-latest.args | 2 +- .../disk-mirror.x86_64-latest.args | 2 +- .../disk-network-gluster.x86_64-9.1.0.args | 2 +- ...isk-network-http-nbdkit.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 +- ...rbd-encryption-layering.x86_64-latest.args | 2 +- ...rbd-encryption-luks-any.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 +- ...isk-network-source-auth.x86_64-latest.args | 2 +- ...rce-curl-nbdkit-backing.x86_64-latest.args | 2 +- ...work-source-curl-nbdkit.x86_64-latest.args | 2 +- ...isk-network-source-curl.x86_64-latest.args | 2 +- .../disk-network-ssh-key.x86_64-latest.args | 2 +- ...disk-network-ssh-nbdkit.x86_64-latest.args | 2 +- ...sk-network-ssh-password.x86_64-latest.args | 2 +- .../disk-network-ssh.x86_64-latest.args | 2 +- ...rk-tlsx509-nbd-hostname.x86_64-latest.args | 2 +- ...isk-network-tlsx509-nbd.x86_64-latest.args | 2 +- .../disk-no-boot.x86_64-latest.args | 2 +- .../disk-nvme.x86_64-latest.args | 2 +- .../disk-order.x86_64-latest.args | 2 +- ...sk-qcow2-datafile-store.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-sata-product.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-fd.x86_64-latest.args | 2 +- .../disk-source-pool-mode.x86_64-latest.args | 2 +- .../disk-source-pool.x86_64-latest.args | 2 +- ...tuppolicy-optional-drop.x86_64-latest.args | 2 +- ...sk-statistics-intervals.x86_64-latest.args | 2 +- .../disk-target-nvme.x86_64-latest.args | 2 +- .../disk-transient.x86_64-latest.args | 2 +- .../disk-usb-device-model.x86_64-latest.args | 2 +- ...est.QEMU_CAPS_DEVICE_USB_BOT-disabled.args | 2 +- ...ate.QEMU_CAPS_DEVICE_USB_BOT-disabled.args | 2 +- ...k-usb-device.x86_64-latest.abi-update.args | 2 +- .../disk-usb-device.x86_64-latest.args | 2 +- .../disk-vhostuser-numa.x86_64-latest.args | 2 +- .../disk-vhostuser.x86_64-latest.args | 2 +- .../disk-vhostvdpa.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 +- ...irtio-scsi-reservations.x86_64-latest.args | 2 +- .../disk-virtio.x86_64-latest.args | 2 +- .../downscript.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 +- ...memory-no-numa-topology.x86_64-latest.args | 2 +- ...fd-memory-numa-topology.x86_64-latest.args | 2 +- ...d-memory-numa-topology2.x86_64-latest.args | 2 +- ...d-memory-numa-topology3.x86_64-latest.args | 2 +- ...a-topology4-old-machine.x86_64-10.2.0.args | 2 +- ...d-memory-numa-topology4.x86_64-latest.args | 2 +- .../fips-enabled.x86_64-latest.args | 2 +- ...are-auto-bios-stateless.x86_64-latest.args | 2 +- .../firmware-auto-bios.x86_64-latest.args | 2 +- ...efi-aarch64.aarch64-latest.abi-update.args | 2 +- ...mware-auto-efi-aarch64.aarch64-latest.args | 2 +- ...-enrolled-keys-aarch64.aarch64-latest.args | 2 +- ...-auto-efi-enrolled-keys.x86_64-latest.args | 2 +- ...loader-qcow2-nvram-path.x86_64-latest.args | 2 +- ...efi-format-loader-qcow2.x86_64-latest.args | 2 +- ...-loader-raw.aarch64-latest.abi-update.args | 2 +- ...-efi-format-loader-raw.aarch64-latest.args | 2 +- ...uto-efi-format-mismatch.x86_64-latest.args | 2 +- ...nvram-qcow2-network-nbd.x86_64-latest.args | 2 +- ...format-nvram-qcow2-path.x86_64-latest.args | 2 +- ...-efi-format-nvram-qcow2.x86_64-latest.args | 2 +- ...t-nvram-raw-loader-path.x86_64-latest.args | 2 +- ...-raw-nvramtemplate-path.x86_64-latest.args | 2 +- ...at-nvram-raw.x86_64-latest.abi-update.args | 2 +- ...to-efi-format-nvram-raw.x86_64-latest.args | 2 +- ...mat-nvramtemplate-qcow2.x86_64-latest.args | 2 +- ...uto-efi-loader-insecure.x86_64-latest.args | 2 +- ...re-auto-efi-loader-path.x86_64-latest.args | 2 +- ...oader-secure.x86_64-latest.abi-update.args | 2 +- ...-auto-efi-loader-secure.x86_64-latest.args | 2 +- ...garch64.loongarch64-latest.abi-update.args | 2 +- ...to-efi-loongarch64.loongarch64-latest.args | 2 +- ...to-efi-no-enrolled-keys.x86_64-latest.args | 2 +- ...are-auto-efi-no-secboot.x86_64-latest.args | 2 +- ...are-auto-efi-nvram-file.x86_64-latest.args | 2 +- ...efi-nvram-network-iscsi.x86_64-latest.args | 2 +- ...o-efi-nvram-network-nbd.x86_64-latest.args | 2 +- ...are-auto-efi-nvram-path.x86_64-latest.args | 2 +- ...auto-efi-nvram-template.x86_64-latest.args | 2 +- ...efi-riscv64.riscv64-latest.abi-update.args | 2 +- ...ware-auto-efi-rw-pflash.x86_64-latest.args | 2 +- .../firmware-auto-efi-rw.x86_64-latest.args | 2 +- ...rmware-auto-efi-secboot.x86_64-latest.args | 2 +- ...auto-efi-sev-snp.x86_64-latest+amdsev.args | 2 +- ...efi-sev-stateful.x86_64-latest+amdsev.args | 2 +- ...are-auto-efi-sev.x86_64-latest+amdsev.args | 2 +- ...rmware-auto-efi-smm-off.x86_64-latest.args | 2 +- ...ware-auto-efi-stateless.x86_64-latest.args | 2 +- ...o-efi-varstore-aarch64.aarch64-latest.args | 2 +- ...e-auto-efi-varstore-q35.x86_64-latest.args | 2 +- ...are-auto-efi.x86_64-latest.abi-update.args | 2 +- .../firmware-auto-efi.x86_64-latest.args | 2 +- ...nual-bios-not-stateless.x86_64-latest.args | 2 +- ...e-manual-bios-stateless.x86_64-latest.args | 2 +- .../firmware-manual-bios.x86_64-latest.args | 2 +- ...i-aarch64-legacy-paths.aarch64-latest.args | 2 +- ...anual-efi-acpi-aarch64.aarch64-latest.args | 2 +- ...are-manual-efi-acpi-q35.x86_64-latest.args | 2 +- ...are-manual-efi-features.x86_64-latest.args | 2 +- ...loader-path-nonstandard.x86_64-latest.args | 2 +- ...anual-efi-loader-secure.x86_64-latest.args | 2 +- ...olled-keys-legacy-paths.x86_64-latest.args | 2 +- ...al-efi-no-enrolled-keys.x86_64-latest.args | 2 +- ...no-secboot-legacy-paths.x86_64-latest.args | 2 +- ...e-manual-efi-no-secboot.x86_64-latest.args | 2 +- ...ual-efi-noacpi-aarch64.aarch64-latest.args | 2 +- ...e-manual-efi-nvram-file.x86_64-latest.args | 2 +- ...efi-nvram-network-iscsi.x86_64-latest.args | 2 +- ...l-efi-nvram-network-nbd.x86_64-latest.args | 2 +- ...late-nonstandard-format.x86_64-latest.args | 2 +- ...onstandard-legacy-paths.x86_64-latest.args | 2 +- ...am-template-nonstandard.x86_64-latest.args | 2 +- ...nual-efi-nvram-template.x86_64-latest.args | 2 +- ...-manual-efi-rw-implicit.x86_64-latest.args | 2 +- ...ual-efi-rw-legacy-paths.x86_64-latest.args | 2 +- ...ual-efi-rw-modern-paths.x86_64-latest.args | 2 +- .../firmware-manual-efi-rw.x86_64-latest.args | 2 +- ...fi-secboot-legacy-paths.x86_64-latest.args | 2 +- ...ware-manual-efi-secboot.x86_64-latest.args | 2 +- ...nual-efi-sev-snp.x86_64-latest+amdsev.args | 2 +- ...re-manual-efi-stateless.x86_64-latest.args | 2 +- ...manual-efi-tdx.x86_64-latest+inteltdx.args | 2 +- ...l-efi-varstore-aarch64.aarch64-latest.args | 2 +- ...manual-efi-varstore-q35.x86_64-latest.args | 2 +- .../firmware-manual-efi.x86_64-latest.args | 2 +- ...e-manual-noefi-acpi-q35.x86_64-latest.args | 2 +- ...l-noefi-noacpi-aarch64.aarch64-latest.args | 2 +- ...manual-noefi-noacpi-q35.x86_64-latest.args | 2 +- .../floppy-drive-fat.x86_64-latest.args | 2 +- .../fs9p-ccw.s390x-latest.args | 2 +- tests/qemuxmlconfdata/fs9p.x86_64-latest.args | 2 +- .../genid-auto.x86_64-latest.args | 2 +- .../qemuxmlconfdata/genid.x86_64-latest.args | 2 +- .../graphics-dbus-address.x86_64-latest.args | 2 +- .../graphics-dbus-audio.x86_64-latest.args | 2 +- .../graphics-dbus-chardev.x86_64-latest.args | 2 +- .../graphics-dbus-p2p.x86_64-latest.args | 2 +- .../graphics-dbus-usbredir.x86_64-latest.args | 2 +- .../graphics-dbus.x86_64-latest.args | 2 +- ...egl-headless-rendernode.x86_64-latest.args | 2 +- .../graphics-egl-headless.x86_64-latest.args | 2 +- ...graphics-listen-network.x86_64-latest.args | 2 +- .../graphics-rdp.x86_64-latest.args | 2 +- ...graphics-sdl-fullscreen.x86_64-latest.args | 2 +- .../graphics-sdl.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-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-mdev-display.x86_64-latest.args | 2 +- ...hostdev-mdev-precreated.x86_64-latest.args | 2 +- ...tdev-pci-address-device.x86_64-latest.args | 2 +- ...-pci-address-unassigned.x86_64-latest.args | 2 +- .../hostdev-pci-address.x86_64-latest.args | 2 +- ...stdev-pci-display-ramfb.x86_64-latest.args | 2 +- ...stdev-pci-multifunction.x86_64-latest.args | 2 +- ...ev-scsi-autogen-address.x86_64-latest.args | 2 +- ...hostdev-scsi-large-unit.x86_64-latest.args | 2 +- .../hostdev-scsi-lsi.x86_64-latest.args | 2 +- .../hostdev-scsi-shareable.x86_64-latest.args | 2 +- ...tdev-scsi-vhost-scsi-ccw.s390x-latest.args | 2 +- ...dev-scsi-vhost-scsi-pci.x86_64-latest.args | 2 +- ...ev-scsi-vhost-scsi-pcie.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 +- ...dev-subsys-mdev-vfio-ccw.s390x-latest.args | 2 +- ...usb-address-device-boot.x86_64-latest.args | 2 +- ...tdev-usb-address-device.x86_64-latest.args | 2 +- ...ostdev-usb-address-port.x86_64-latest.args | 2 +- .../hostdev-usb-address.x86_64-latest.args | 2 +- ...tdev-usb-vendor-product.x86_64-latest.args | 2 +- ...ostdev-vfio-multidomain.x86_64-latest.args | 2 +- ...o-zpci-autogenerate-fids.s390x-latest.args | 2 +- ...o-zpci-autogenerate-uids.s390x-latest.args | 2 +- ...v-vfio-zpci-autogenerate.s390x-latest.args | 2 +- ...dev-vfio-zpci-boundaries.s390x-latest.args | 2 +- ...vfio-zpci-ccw-memballoon.s390x-latest.args | 2 +- ...io-zpci-multidomain-many.s390x-latest.args | 2 +- .../hostdev-vfio-zpci.s390x-latest.args | 2 +- .../hostdev-vfio.x86_64-latest.args | 2 +- .../hotplug-base.x86_64-latest.args | 2 +- .../hugepages-default-2M.x86_64-latest.args | 2 +- ...ges-default-system-size.x86_64-latest.args | 2 +- .../hugepages-default.x86_64-latest.args | 2 +- .../hugepages-memaccess.x86_64-latest.args | 2 +- .../hugepages-memaccess2.x86_64-latest.args | 2 +- .../hugepages-memaccess3.x86_64-latest.args | 2 +- .../hugepages-nodeset.x86_64-latest.args | 2 +- ...gepages-numa-default-2M.x86_64-latest.args | 2 +- ...pages-numa-default-dimm.x86_64-latest.args | 2 +- .../hugepages-numa-default.x86_64-latest.args | 2 +- ...pages-numa-nodeset-part.x86_64-latest.args | 2 +- .../hugepages-numa-nodeset.x86_64-latest.args | 2 +- .../hugepages-nvdimm.x86_64-latest.args | 2 +- .../hugepages-shared.x86_64-latest.args | 2 +- ...ch64-virt-headless.aarch64-latest+hvf.args | 4 ++-- ...x86_64-q35-headless.x86_64-latest+hvf.args | 4 ++-- .../qemuxmlconfdata/hwuuid.x86_64-latest.args | 2 +- .../hyperv-host-model.x86_64-latest.args | 2 +- .../hyperv-off.x86_64-latest.args | 2 +- .../hyperv-panic.x86_64-latest.args | 2 +- .../hyperv-passthrough.x86_64-latest.args | 2 +- ...-spinlocks-never-notify.x86_64-latest.args | 2 +- .../hyperv-stimer-direct.x86_64-latest.args | 2 +- .../qemuxmlconfdata/hyperv.x86_64-latest.args | 2 +- .../input-linux.x86_64-latest.args | 2 +- .../input-usbmouse-addr.x86_64-latest.args | 2 +- .../input-usbmouse.x86_64-latest.args | 2 +- .../input-usbtablet.x86_64-latest.args | 2 +- .../input-virtio-ccw.s390x-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 +- ...l-iommu-dma-translation.x86_64-latest.args | 2 +- ...-eim-autoadd.x86_64-latest.abi-update.args | 2 +- .../intel-iommu-eim.x86_64-latest.args | 2 +- .../intel-iommu.x86_64-latest.args | 2 +- ...-smmuv3-pci-bus-single.aarch64-latest.args | 2 +- .../iommu-smmuv3-pci-bus.aarch64-latest.args | 2 +- .../iommu-smmuv3.aarch64-latest.args | 2 +- .../iommufd-q35-fd.x86_64-latest.args | 2 +- .../iommufd-q35.x86_64-latest.args | 2 +- ...fd-virt-pci-bus-single.aarch64-latest.args | 2 +- .../iommufd-virt.aarch64-latest.args | 2 +- .../iommufd.x86_64-latest.args | 2 +- .../iothreads-disk.x86_64-latest.args | 2 +- .../iothreads-ids-partial.x86_64-latest.args | 2 +- ...othreads-ids-pool-sizes.x86_64-latest.args | 2 +- .../iothreads-ids.x86_64-latest.args | 2 +- ...othreads-virtio-scsi-ccw.s390x-latest.args | 2 +- ...ads-virtio-scsi-mapping.x86_64-latest.args | 2 +- ...threads-virtio-scsi-pci.x86_64-latest.args | 2 +- .../kvm-features-off.x86_64-latest.args | 2 +- .../kvm-features.x86_64-latest.args | 2 +- .../kvm-pit-delay.x86_64-latest.args | 2 +- .../kvm-pit-discard.x86_64-latest.args | 2 +- .../kvmclock+eoi-disabled.x86_64-latest.args | 2 +- .../kvmclock.x86_64-latest.args | 2 +- .../launch-security-s390-pv.s390x-latest.args | 2 +- ...urity-sev-direct.x86_64-latest+amdsev.args | 2 +- ...nch-security-sev-direct.x86_64-latest.args | 2 +- ...ng-platform-info.x86_64-latest+amdsev.args | 2 +- ...security-sev-snp.x86_64-latest+amdsev.args | 2 +- ...launch-security-sev-snp.x86_64-latest.args | 2 +- ...nch-security-sev.x86_64-latest+amdsev.args | 2 +- ...h-security-tdx.x86_64-latest+inteltdx.args | 2 +- .../qemuxmlconfdata/lease.x86_64-latest.args | 2 +- ...-models.loongarch64-latest.abi-update.args | 2 +- ...irt-default-models.loongarch64-latest.args | 2 +- ...ch64-virt-graphics.loongarch64-latest.args | 4 ++-- ...ch64-virt-headless.loongarch64-latest.args | 4 ++-- ...minimal.loongarch64-latest.abi-update.args | 2 +- ...rch64-virt-minimal.loongarch64-latest.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 +- ...ch-virt-console-native.aarch64-latest.args | 2 +- ...ch-virt-console-virtio.aarch64-latest.args | 2 +- ...-serial+console-native.aarch64-latest.args | 2 +- ...ach-virt-serial-compat.aarch64-latest.args | 2 +- ...ach-virt-serial-native.aarch64-latest.args | 2 +- .../mach-virt-serial-pci.aarch64-latest.args | 2 +- .../mach-virt-serial-usb.aarch64-latest.args | 2 +- ...chine-aeskeywrap-off-cap.s390x-latest.args | 2 +- ...hine-aeskeywrap-off-caps.s390x-latest.args | 2 +- ...achine-aeskeywrap-on-cap.s390x-latest.args | 2 +- ...chine-aeskeywrap-on-caps.s390x-latest.args | 2 +- .../machine-aliases1.x86_64-latest.args | 2 +- .../machine-aliases2.x86_64-latest.args | 2 +- .../machine-core-off.x86_64-latest.args | 2 +- .../machine-core-on.x86_64-latest.args | 2 +- ...chine-deakeywrap-off-cap.s390x-latest.args | 2 +- ...hine-deakeywrap-off-caps.s390x-latest.args | 2 +- ...achine-deakeywrap-on-cap.s390x-latest.args | 2 +- ...chine-deakeywrap-on-caps.s390x-latest.args | 2 +- .../machine-i8042-off.x86_64-latest.args | 2 +- .../machine-i8042-on.x86_64-latest.args | 2 +- ...achine-keywrap-none-caps.s390x-latest.args | 2 +- .../machine-keywrap-none.s390x-latest.args | 2 +- .../machine-loadparm-hostdev.s390x-9.1.0.args | 2 +- ...machine-loadparm-hostdev.s390x-latest.args | 2 +- ...-multiple-disks-nets-s390.s390x-9.1.0.args | 2 +- ...multiple-disks-nets-s390.s390x-latest.args | 2 +- ...machine-loadparm-net-s390.s390x-9.1.0.args | 2 +- ...achine-loadparm-net-s390.s390x-latest.args | 2 +- .../machine-loadparm-s390.s390x-9.1.0.args | 2 +- .../machine-loadparm-s390.s390x-latest.args | 2 +- .../machine-smm-off.x86_64-latest.args | 2 +- .../machine-smm-on.x86_64-latest.args | 2 +- .../machine-vmport-opt.x86_64-latest.args | 2 +- ...memory-default-hugepage.x86_64-latest.args | 2 +- .../memfd-memory-numa.x86_64-latest.args | 2 +- ...emory-hotplug-dimm-addr.x86_64-latest.args | 2 +- .../memory-hotplug-dimm.x86_64-latest.args | 2 +- ...memory-hotplug-multiple.x86_64-latest.args | 2 +- ...-hotplug-numa-preferred.x86_64-latest.args | 2 +- ...y-hotplug-nvdimm-access.x86_64-latest.args | 2 +- ...ry-hotplug-nvdimm-align.x86_64-latest.args | 2 +- ...ry-hotplug-nvdimm-label.x86_64-latest.args | 2 +- ...-hotplug-nvdimm-overlap.x86_64-latest.args | 2 +- ...ory-hotplug-nvdimm-pmem.x86_64-latest.args | 2 +- ...-nvdimm-ppc64.ppc64-latest.abi-update.args | 2 +- ...ory-hotplug-nvdimm-ppc64.ppc64-latest.args | 2 +- ...hotplug-nvdimm-readonly.x86_64-latest.args | 2 +- .../memory-hotplug-nvdimm.x86_64-latest.args | 2 +- ...-ppc64-nonuma.ppc64-latest.abi-update.args | 2 +- ...ory-hotplug-ppc64-nonuma.ppc64-latest.args | 2 +- ...lug-virtio-mem-ccw-s390x.s390x-latest.args | 2 +- ...lug-virtio-mem-pci-s390x.s390x-latest.args | 2 +- ...mory-hotplug-virtio-mem.x86_64-latest.args | 2 +- ...ory-hotplug-virtio-pmem.x86_64-latest.args | 2 +- .../memory-hotplug.x86_64-latest.args | 2 +- .../memorybacking-set.x86_64-latest.args | 2 +- .../memorybacking-unset.x86_64-latest.args | 2 +- .../memtune-unlimited.x86_64-latest.args | 2 +- .../memtune.x86_64-latest.args | 2 +- .../metadata-duplicate.x86_64-latest.args | 2 +- .../metadata.x86_64-latest.args | 2 +- .../migrate-numa-unaligned.x86_64-latest.args | 2 +- .../migrate.x86_64-latest.args | 2 +- .../misc-disable-s3.x86_64-latest.args | 2 +- .../misc-disable-suspends.x86_64-latest.args | 2 +- .../misc-enable-s4.x86_64-latest.args | 2 +- .../misc-no-reboot.x86_64-latest.args | 2 +- .../misc-uuid.x86_64-latest.args | 2 +- .../mlock-off.x86_64-latest.args | 2 +- .../mlock-on.x86_64-latest.args | 2 +- ...86_64-q35-headless.x86_64-latest+mshv.args | 2 +- .../mtp-usb-device.x86_64-latest.args | 2 +- ...ultifunction-pci-device.x86_64-latest.args | 2 +- .../name-escape.x86_64-latest.args | 2 +- .../net-bandwidth.x86_64-latest.args | 2 +- .../net-bandwidth2.x86_64-latest.args | 2 +- .../net-client.x86_64-latest.args | 2 +- .../net-coalesce.x86_64-latest.args | 2 +- .../net-eth-hostip.x86_64-latest.args | 2 +- .../net-eth-ifname.x86_64-latest.args | 2 +- .../net-eth-names.x86_64-latest.args | 2 +- .../net-eth-unmanaged-tap.x86_64-latest.args | 2 +- .../net-eth.x86_64-latest.args | 2 +- .../net-hostdev-bootorder.x86_64-latest.args | 2 +- ...net-hostdev-multidomain.x86_64-latest.args | 2 +- ...ostdev-vfio-multidomain.x86_64-latest.args | 2 +- .../net-hostdev-vfio.x86_64-latest.args | 2 +- .../net-hostdev.x86_64-latest.args | 2 +- .../net-isolated-port.x86_64-latest.args | 2 +- .../net-linkstate.x86_64-latest.args | 2 +- .../net-many-models.x86_64-latest.args | 2 +- .../net-mcast.x86_64-latest.args | 2 +- .../net-midonet.x86_64-latest.args | 2 +- .../net-mtu.x86_64-latest.args | 2 +- .../net-openvswitch.x86_64-latest.args | 2 +- .../net-server.x86_64-latest.args | 2 +- .../net-udp.x86_64-latest.args | 2 +- .../net-usb.x86_64-latest.args | 2 +- .../net-user-addr.x86_64-latest.args | 2 +- .../net-user-passt.x86_64-7.2.0.args | 2 +- .../net-user-passt.x86_64-latest.args | 2 +- .../net-user.x86_64-latest.args | 2 +- .../net-vdpa-multiqueue.x86_64-latest.args | 2 +- .../net-vdpa.x86_64-latest.args | 2 +- .../net-vhostuser-multiq.x86_64-latest.args | 2 +- .../net-vhostuser-passt.x86_64-latest.args | 2 +- .../net-vhostuser.x86_64-latest.args | 2 +- .../net-virtio-ccw.s390x-latest.args | 2 +- .../net-virtio-device.x86_64-latest.args | 2 +- ...virtio-disable-offloads.x86_64-latest.args | 2 +- .../net-virtio-netdev.x86_64-latest.args | 2 +- ...irtio-network-portgroup.x86_64-latest.args | 2 +- .../net-virtio-rss.x86_64-latest.args | 2 +- ...et-virtio-rxtxqueuesize.x86_64-latest.args | 2 +- ...-virtio-teaming-hostdev.x86_64-latest.args | 2 +- ...-virtio-teaming-network.x86_64-latest.args | 2 +- .../net-virtio-teaming.x86_64-latest.args | 2 +- .../net-virtio-vhost.x86_64-latest.args | 2 +- .../net-virtio.x86_64-latest.args | 2 +- .../nosharepages.x86_64-latest.args | 2 +- ...auto-memory-vcpu-cpuset.x86_64-latest.args | 2 +- ...no-cpuset-and-placement.x86_64-latest.args | 2 +- ...d-auto-vcpu-no-numatune.x86_64-latest.args | 2 +- ...to-vcpu-static-numatune.x86_64-latest.args | 2 +- ...static-memory-auto-vcpu.x86_64-latest.args | 2 +- ...static-vcpu-no-numatune.x86_64-latest.args | 2 +- .../qemuxmlconfdata/numad.x86_64-latest.args | 2 +- ...ne-auto-nodeset-invalid.x86_64-latest.args | 2 +- .../numatune-auto-prefer.x86_64-latest.args | 2 +- .../numatune-distances.x86_64-latest.args | 2 +- .../numatune-hmat-none.x86_64-latest.args | 2 +- .../numatune-hmat.x86_64-latest.args | 2 +- ...atune-memnode-no-memory.x86_64-latest.args | 2 +- ...emnode-restrictive-mode.x86_64-latest.args | 2 +- .../numatune-memnode.x86_64-latest.args | 2 +- .../numatune-no-vcpu.x86_64-latest.args | 2 +- .../numatune-system-memory.x86_64-latest.args | 2 +- ...vcpus-topology-mismatch.x86_64-latest.args | 2 +- .../pages-dimm-discard.x86_64-latest.args | 2 +- ...pages-discard-hugepages.x86_64-latest.args | 2 +- .../pages-discard.x86_64-latest.args | 2 +- .../panic-double.x86_64-latest.args | 2 +- .../panic-no-address.x86_64-latest.args | 2 +- .../panic-pseries.ppc64-latest.args | 2 +- .../qemuxmlconfdata/panic.x86_64-latest.args | 2 +- ...arallel-parport-chardev.x86_64-latest.args | 2 +- .../parallel-tcp-chardev.x86_64-latest.args | 2 +- .../parallel-unix-chardev.x86_64-latest.args | 4 ++-- ...pi-root-hotplug-disable.x86_64-latest.args | 2 +- ...cpi-root-hotplug-enable.x86_64-latest.args | 2 +- .../pci-autoadd-addr.x86_64-latest.args | 2 +- .../pci-autoadd-idx.x86_64-latest.args | 2 +- .../pci-autofill-addr.x86_64-latest.args | 2 +- .../pci-bridge-many-disks.x86_64-latest.args | 2 +- .../pci-bridge.x86_64-latest.args | 2 +- .../pci-expander-bus.x86_64-latest.args | 2 +- .../pci-many.x86_64-latest.args | 2 +- .../pci-rom-disabled.x86_64-latest.args | 2 +- .../pci-rom.x86_64-latest.args | 2 +- .../pci-serial-dev-chardev.x86_64-latest.args | 2 +- ...e-expander-bus-aarch64.aarch64-latest.args | 2 +- .../pcie-expander-bus.x86_64-latest.args | 2 +- ...root-port-model-generic.x86_64-latest.args | 2 +- ...root-port-model-ioh3420.x86_64-latest.args | 2 +- ...cie-root-port-nohotplug.x86_64-latest.args | 2 +- .../pcie-root-port.x86_64-latest.args | 2 +- .../pcie-root.x86_64-latest.args | 2 +- ...-switch-downstream-port.x86_64-latest.args | 2 +- ...ie-switch-upstream-port.x86_64-latest.args | 2 +- .../pcihole64-gib.x86_64-latest.args | 2 +- .../pcihole64-q35.x86_64-latest.args | 2 +- .../pcihole64-virt.aarch64-latest.args | 2 +- .../pcihole64.x86_64-latest.args | 2 +- .../pmu-feature-off.x86_64-latest.args | 2 +- .../pmu-feature.x86_64-latest.args | 2 +- tests/qemuxmlconfdata/ppc-dtb.ppc-latest.args | 2 +- ...c-mac99-minimal.ppc-latest.abi-update.args | 2 +- .../ppc-mac99-minimal.ppc-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-3.1.ppc64-latest.args | 2 +- ...ault-cpu-tcg-pseries-4.2.ppc64-latest.args | 2 +- ...beige-minimal.ppc64-latest.abi-update.args | 2 +- .../ppc64-g3beige-minimal.ppc64-latest.args | 2 +- ...mac99-minimal.ppc64-latest.abi-update.args | 2 +- .../ppc64-mac99-minimal.ppc64-latest.args | 2 +- ...ernv9-minimal.ppc64-latest.abi-update.args | 2 +- .../ppc64-powernv9-minimal.ppc64-latest.args | 2 +- ...efault-models.ppc64-latest.abi-update.args | 2 +- ...4-pseries-default-models.ppc64-latest.args | 2 +- .../ppc64-pseries-graphics.ppc64-latest.args | 4 ++-- .../ppc64-pseries-headless.ppc64-latest.args | 4 ++-- ...eries-minimal.ppc64-latest.abi-update.args | 2 +- .../ppc64-pseries-minimal.ppc64-latest.args | 2 +- .../ppc64-tpmproxy-single.ppc64-latest.args | 2 +- .../ppc64-tpmproxy-with-tpm.ppc64-latest.args | 2 +- .../ppce500-serial.ppc-latest.args | 2 +- .../pseries-basic.ppc64-latest.args | 2 +- .../pseries-console-virtio.ppc64-latest.args | 2 +- ...eries-cpu-compat-power10.ppc64-latest.args | 2 +- ...eries-cpu-compat-power11.ppc64-latest.args | 2 +- ...series-cpu-compat-power9.ppc64-latest.args | 2 +- .../pseries-cpu-compat.ppc64-latest.args | 2 +- .../pseries-cpu-exact.ppc64-latest.args | 2 +- .../pseries-cpu-le.ppc64-latest.args | 2 +- .../pseries-features.ppc64-latest.args | 2 +- .../pseries-hostdevs-1.ppc64-latest.args | 2 +- .../pseries-hostdevs-2.ppc64-latest.args | 2 +- .../pseries-hostdevs-3.ppc64-latest.args | 2 +- .../pseries-many-buses-1.ppc64-latest.args | 2 +- .../pseries-many-buses-2.ppc64-latest.args | 2 +- .../pseries-many-devices.ppc64-latest.args | 2 +- .../pseries-nvram.ppc64-latest.args | 2 +- .../pseries-panic-missing.ppc64-latest.args | 2 +- ...pseries-panic-no-address.ppc64-latest.args | 2 +- ...ries-phb-default-missing.ppc64-latest.args | 2 +- .../pseries-phb-numa-node.ppc64-latest.args | 2 +- .../pseries-phb-simple.ppc64-latest.args | 2 +- .../pseries-phb-user-alias.ppc64-latest.args | 2 +- .../pseries-serial-native.ppc64-latest.args | 2 +- .../pseries-serial-pci.ppc64-latest.args | 2 +- .../pseries-serial-usb.ppc64-latest.args | 2 +- .../pseries-usb-default.ppc64-latest.args | 2 +- .../pseries-usb-kbd.ppc64-latest.args | 2 +- .../pseries-usb-multi.ppc64-latest.args | 2 +- ...series-vio-user-assigned.ppc64-latest.args | 2 +- .../pseries-vio.ppc64-latest.args | 2 +- .../pstore-acpi-erst.x86_64-latest.args | 2 +- .../pv-spinlock-disabled.x86_64-latest.args | 2 +- .../pv-spinlock-enabled.x86_64-latest.args | 2 +- .../pvpanic-pci-aarch64.aarch64-latest.args | 2 +- ...pci-no-address-aarch64.aarch64-latest.args | 2 +- .../pvpanic-pci-x86_64.x86_64-latest.args | 2 +- ...35-default-devices-only.x86_64-latest.args | 2 +- .../q35-multifunction.x86_64-latest.args | 2 +- .../q35-pci-force-address.x86_64-latest.args | 2 +- .../q35-pcie-autoadd.x86_64-latest.args | 2 +- .../q35-pcie.x86_64-latest.args | 2 +- .../q35-usb2-multi.x86_64-latest.args | 2 +- .../q35-usb2-reorder.x86_64-latest.args | 2 +- .../q35-usb2.x86_64-latest.args | 2 +- .../q35-virt-manager-basic.x86_64-latest.args | 4 ++-- tests/qemuxmlconfdata/q35.x86_64-latest.args | 2 +- .../qemu-ns-alt.x86_64-latest.args | 2 +- ...qemu-ns-commandline-ns0.x86_64-latest.args | 2 +- ...qemu-ns-commandline-ns1.x86_64-latest.args | 2 +- .../qemu-ns-commandline.x86_64-latest.args | 2 +- ...-domain-commandline-ns0.x86_64-latest.args | 2 +- ...u-ns-domain-commandline.x86_64-latest.args | 2 +- .../qemu-ns-domain-ns0.x86_64-latest.args | 2 +- .../qemu-ns-no-env.x86_64-latest.args | 2 +- .../qemu-ns.x86_64-latest.args | 2 +- ...reboot-timeout-disabled.x86_64-latest.args | 2 +- .../reboot-timeout-enabled.x86_64-latest.args | 2 +- .../restore-v2-fd.x86_64-latest.args | 2 +- .../restore-v2.x86_64-latest.args | 2 +- .../riscv64-virt-acpi.riscv64-latest.args | 2 +- ...ault-models.riscv64-latest.abi-update.args | 2 +- ...64-virt-default-models.riscv64-latest.args | 2 +- ...cv64-virt-features-aia.riscv64-latest.args | 2 +- .../riscv64-virt-graphics.riscv64-latest.args | 4 ++-- ...v64-virt-headless-mmio.riscv64-latest.args | 4 ++-- .../riscv64-virt-headless.riscv64-latest.args | 4 ++-- ...irt-minimal.riscv64-latest.abi-update.args | 2 +- .../riscv64-virt-minimal.riscv64-latest.args | 2 +- ...-async-teardown-disabled.s390x-latest.args | 2 +- ...async-teardown-no-attrib.s390x-latest.args | 2 +- .../s390-async-teardown.s390x-latest.args | 2 +- ...-cpu-kvm-ccw-virtio-10.0.s390x-latest.args | 2 +- ...t-cpu-kvm-ccw-virtio-4.2.s390x-10.0.0.args | 2 +- ...-cpu-tcg-ccw-virtio-10.0.s390x-latest.args | 2 +- ...t-cpu-tcg-ccw-virtio-4.2.s390x-10.0.0.args | 2 +- .../s390-defaultconsole.s390x-latest.args | 2 +- .../s390-panic-missing.s390x-latest.args | 2 +- .../s390-panic-no-address.s390x-latest.args | 2 +- .../s390-panic.s390x-latest.args | 2 +- .../s390-serial-2.s390x-latest.args | 2 +- .../s390-serial-console.s390x-latest.args | 2 +- .../s390-serial.s390x-latest.args | 2 +- .../s390-usb-address.s390x-latest.args | 2 +- .../s390-usb-model.s390x-latest.args | 2 +- .../s390-usb-none.s390x-latest.args | 2 +- .../s390x-ccw-acpi.s390x-latest.args | 2 +- ...efault-models.s390x-latest.abi-update.args | 2 +- ...s390x-ccw-default-models.s390x-latest.args | 2 +- .../s390x-ccw-graphics.s390x-latest.args | 4 ++-- .../s390x-ccw-headless.s390x-latest.args | 4 ++-- ...x-ccw-minimal.s390x-latest.abi-update.args | 2 +- .../s390x-ccw-minimal.s390x-latest.args | 2 +- ...rder-domain-subelements.x86_64-latest.args | 2 +- .../seclabel-dac-none.x86_64-latest.args | 2 +- ...eclabel-device-multiple.x86_64-latest.args | 2 +- ...label-dynamic-baselabel.x86_64-latest.args | 2 +- ...label-dynamic-labelskip.x86_64-latest.args | 2 +- ...el-dynamic-none-relabel.x86_64-latest.args | 2 +- .../seclabel-dynamic-none.x86_64-latest.args | 2 +- ...clabel-dynamic-override.x86_64-latest.args | 2 +- ...eclabel-dynamic-relabel.x86_64-latest.args | 2 +- .../seclabel-dynamic.x86_64-latest.args | 2 +- .../seclabel-none.x86_64-latest.args | 2 +- ...l-selinux-none-override.x86_64-latest.args | 2 +- ...clabel-static-labelskip.x86_64-latest.args | 2 +- ...seclabel-static-relabel.x86_64-latest.args | 2 +- .../seclabel-static.x86_64-latest.args | 2 +- .../serial-debugcon.x86_64-latest.args | 2 +- ...rial-dev-chardev-iobase.x86_64-latest.args | 2 +- .../serial-dev-chardev.x86_64-latest.args | 2 +- .../serial-file-chardev.x86_64-latest.args | 2 +- .../serial-file-log.x86_64-latest.args | 2 +- .../serial-many-chardev.x86_64-latest.args | 2 +- .../serial-pty-chardev.x86_64-latest.args | 2 +- .../serial-spiceport.x86_64-latest.args | 2 +- ...serial-target-port-auto.x86_64-latest.args | 2 +- .../serial-tcp-chardev.x86_64-latest.args | 2 +- ...rial-tcp-telnet-chardev.x86_64-latest.args | 2 +- ...p-tlsx509-chardev-notls.x86_64-latest.args | 2 +- ...-tlsx509-chardev-verify.x86_64-latest.args | 2 +- ...ial-tcp-tlsx509-chardev.x86_64-latest.args | 2 +- ...-tlsx509-secret-chardev.x86_64-latest.args | 2 +- .../serial-udp-chardev.x86_64-latest.args | 2 +- .../serial-unix-chardev.x86_64-latest.args | 4 ++-- .../serial-vc-chardev.x86_64-latest.args | 2 +- .../sgx-epc.x86_64-latest+sgx.args | 2 +- .../shmem-plain-doorbell.x86_64-latest.args | 2 +- .../smartcard-controller.x86_64-latest.args | 2 +- ...t-certificates-database.x86_64-latest.args | 2 +- ...tcard-host-certificates.x86_64-latest.args | 2 +- .../smartcard-host.x86_64-latest.args | 2 +- ...rd-passthrough-spicevmc.x86_64-latest.args | 2 +- ...artcard-passthrough-tcp.x86_64-latest.args | 2 +- ...rtcard-passthrough-unix.x86_64-latest.args | 4 ++-- .../smbios-type-fwcfg.x86_64-latest.args | 2 +- .../qemuxmlconfdata/smbios.x86_64-latest.args | 2 +- .../sound-device-virtio.x86_64-latest.args | 2 +- .../sound-device.x86_64-latest.args | 2 +- .../sparc-minimal.sparc-latest.args | 2 +- .../tap-vhost-incorrect.x86_64-latest.args | 2 +- .../tap-vhost.x86_64-latest.args | 2 +- .../throttlefilter.x86_64-latest.args | 2 +- ...pm-emulator-crb-profile.x86_64-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-external.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 +- ...roller-automatic-i440fx.x86_64-latest.args | 2 +- ...troller-automatic-isapc.x86_64-latest.args | 2 +- ...oller-automatic-microvm.x86_64-latest.args | 2 +- ...matic-pseries.ppc64-latest.abi-update.args | 2 +- ...roller-automatic-pseries.ppc64-latest.args | 2 +- ...ontroller-automatic-q35.x86_64-latest.args | 2 +- ...ler-automatic-realview.aarch64-latest.args | 2 +- ...ntroller-automatic-s390x.s390x-latest.args | 2 +- ...tomatic-unavailable-q35.x86_64-latest.args | 2 +- ...r-automatic-versatilepb.armv7l-latest.args | 2 +- ...automatic-virt-aarch64.aarch64-latest.args | 2 +- ...c-virt-loongarch64.loongarch64-latest.args | 2 +- ...automatic-virt-riscv64.riscv64-latest.args | 2 +- ...default-fallback-g3beige.ppc64-latest.args | 2 +- ...r-default-fallback-mac99.ppc64-latest.args | 2 +- ...-default-fallback-mac99ppc.ppc-latest.args | 2 +- ...efault-fallback-powernv9.ppc64-latest.args | 2 +- ...ault-fallback-realview.aarch64-latest.args | 2 +- ...lt-fallback-versatilepb.armv7l-latest.args | 2 +- ...-fallback-virt-aarch64.aarch64-latest.args | 2 +- ...ntroller-default-g3beige.ppc64-latest.args | 2 +- ...ntroller-default-i440fx.x86_64-latest.args | 2 +- ...controller-default-mac99.ppc64-latest.args | 2 +- ...ontroller-default-mac99ppc.ppc-latest.args | 2 +- ...troller-default-powernv9.ppc64-latest.args | 2 +- ...fault-pseries.ppc64-latest.abi-update.args | 2 +- ...ntroller-default-pseries.ppc64-latest.args | 2 +- ...-controller-default-q35.x86_64-latest.args | 2 +- ...oller-default-realview.aarch64-latest.args | 2 +- ...controller-default-s390x.s390x-latest.args | 2 +- ...ler-default-versatilepb.armv7l-latest.args | 2 +- ...r-default-virt-aarch64.aarch64-latest.args | 2 +- ...t-virt-loongarch64.loongarch64-latest.args | 2 +- ...r-default-virt-riscv64.riscv64-latest.args | 2 +- ...troller-ich9-autoassign.x86_64-latest.args | 2 +- ...ntroller-ich9-companion.x86_64-latest.args | 2 +- ...ntroller-ich9-ehci-addr.x86_64-latest.args | 2 +- ...ler-nec-xhci-autoassign.x86_64-latest.args | 2 +- ...usb-controller-nec-xhci.x86_64-latest.args | 2 +- .../usb-controller-piix3.x86_64-latest.args | 2 +- ...sb-controller-qemu-xhci.x86_64-latest.args | 2 +- .../usb-hub-autoadd-deluxe.x86_64-latest.args | 2 +- .../usb-hub-autoadd.x86_64-latest.args | 2 +- .../usb-hub.x86_64-latest.args | 2 +- .../usb-long-port-path.x86_64-latest.args | 2 +- .../usb-none.x86_64-latest.args | 2 +- .../usb-port-autoassign.x86_64-latest.args | 2 +- .../usb-port-missing.x86_64-latest.args | 2 +- .../usb-ports.x86_64-latest.args | 2 +- .../usb-redir-boot.x86_64-latest.args | 2 +- ...sb-redir-filter-version.x86_64-latest.args | 2 +- .../usb-redir-filter.x86_64-latest.args | 2 +- .../usb-redir-unix.x86_64-latest.args | 4 ++-- .../usb-redir.x86_64-latest.args | 2 +- .../usb1-usb2.x86_64-latest.args | 2 +- .../user-aliases-usb.x86_64-latest.args | 2 +- .../user-aliases.x86_64-latest.args | 4 ++-- .../user-aliases2.x86_64-latest.args | 2 +- .../vcpu-placement-static.x86_64-latest.args | 2 +- .../vhost-user-fs-ccw.s390x-latest.args | 2 +- ...vhost-user-fs-fd-memory.x86_64-latest.args | 2 +- ...st-user-fs-fd-openfiles.x86_64-latest.args | 2 +- ...vhost-user-fs-hugepages.x86_64-latest.args | 2 +- .../vhost-user-fs-locking.x86_64-7.2.0.args | 2 +- .../vhost-user-fs-readonly.x86_64-latest.args | 2 +- .../vhost-user-fs-sock.x86_64-latest.args | 2 +- ...host-user-gpu-secondary.x86_64-latest.args | 6 ++--- .../vhost-user-vga.x86_64-latest.args | 4 ++-- .../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-bochs-edid-none.x86_64-latest.args | 2 +- .../video-bochs-edid-off.x86_64-latest.args | 2 +- .../video-bochs-edid-on.x86_64-latest.args | 2 +- ...-device-pciaddr-default.x86_64-latest.args | 2 +- .../video-none-device.x86_64-latest.args | 2 +- ...video-qxl-device-vgamem.x86_64-latest.args | 2 +- ...video-qxl-device-vram64.x86_64-latest.args | 2 +- .../video-qxl-device.x86_64-latest.args | 2 +- .../video-qxl-heads.x86_64-latest.args | 2 +- .../video-qxl-noheads.x86_64-latest.args | 2 +- .../video-qxl-resolution.x86_64-latest.args | 2 +- ...o-qxl-sec-device-vgamem.x86_64-latest.args | 2 +- ...o-qxl-sec-device-vram64.x86_64-latest.args | 2 +- .../video-qxl-sec-device.x86_64-latest.args | 2 +- ...eo-ramfb-display-device.x86_64-latest.args | 2 +- ...video-vga-device-vgamem.x86_64-latest.args | 2 +- .../video-vga-device.x86_64-latest.args | 2 +- .../video-vga-edid-none.x86_64-latest.args | 2 +- .../video-vga-edid-off.x86_64-latest.args | 2 +- .../video-vga-edid-on.x86_64-latest.args | 2 +- .../video-vga-qxl-heads.x86_64-latest.args | 2 +- .../video-virtio-blob-off.x86_64-latest.args | 2 +- .../video-virtio-blob-on.x86_64-latest.args | 2 +- .../video-virtio-edid-none.x86_64-latest.args | 2 +- .../video-virtio-edid-off.x86_64-latest.args | 2 +- .../video-virtio-edid-on.x86_64-latest.args | 2 +- ...ideo-virtio-gpu-ccw-auto.s390x-latest.args | 2 +- .../video-virtio-gpu-ccw.s390x-latest.args | 2 +- ...video-virtio-gpu-device.x86_64-latest.args | 2 +- ...video-virtio-gpu-sdl-gl.x86_64-latest.args | 2 +- ...eo-virtio-gpu-secondary.x86_64-latest.args | 2 +- ...deo-virtio-gpu-spice-gl.x86_64-latest.args | 2 +- .../video-virtio-gpu-virgl.x86_64-latest.args | 2 +- ...video-virtio-vga-gpu-gl.x86_64-latest.args | 2 +- .../video-virtio-vga.x86_64-latest.args | 2 +- .../virtio-9p-createmode.x86_64-latest.args | 2 +- .../virtio-9p-multidevs.x86_64-latest.args | 2 +- ...irtio-input-passthrough.x86_64-latest.args | 2 +- .../virtio-input.x86_64-latest.args | 2 +- .../virtio-iommu-aarch64.aarch64-latest.args | 2 +- .../virtio-iommu-x86_64.x86_64-latest.args | 2 +- .../virtio-lun.x86_64-9.0.0.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 | 6 ++--- ...tio-options-video-iommu.x86_64-latest.args | 6 ++--- ...io-options-video-packed.x86_64-latest.args | 6 ++--- .../virtio-options.x86_64-latest.args | 4 ++-- .../virtio-rng-builtin.x86_64-latest.args | 2 +- .../virtio-rng-ccw.s390x-latest.args | 2 +- .../virtio-rng-default.x86_64-latest.args | 2 +- .../virtio-rng-egd-unix.x86_64-latest.args | 4 ++-- .../virtio-rng-egd.x86_64-latest.args | 2 +- .../virtio-rng-multiple.x86_64-latest.args | 2 +- .../virtio-rng-random.x86_64-latest.args | 2 +- .../virtio-transitional.x86_64-latest.args | 2 +- .../vmcoreinfo.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-q35-multiple.x86_64-latest.args | 2 +- .../watchdog.x86_64-latest.args | 2 +- .../x86-kvm-32-on-64.x86_64-latest.args | 2 +- ...6_64-default-cpu-kvm-pc.x86_64-latest.args | 2 +- ..._64-default-cpu-kvm-q35.x86_64-latest.args | 2 +- ...efault-cpu-tcg-features.x86_64-latest.args | 2 +- ...6_64-default-cpu-tcg-pc.x86_64-latest.args | 2 +- ..._64-default-cpu-tcg-q35.x86_64-latest.args | 2 +- ...fault-models.x86_64-latest.abi-update.args | 2 +- ...86_64-pc-default-models.x86_64-latest.args | 2 +- .../x86_64-pc-graphics.x86_64-latest.args | 4 ++-- .../x86_64-pc-headless.x86_64-latest.args | 4 ++-- ...4-pc-minimal.x86_64-latest.abi-update.args | 2 +- .../x86_64-pc-minimal.x86_64-latest.args | 2 +- ...fault-models.x86_64-latest.abi-update.args | 2 +- ...6_64-q35-default-models.x86_64-latest.args | 2 +- .../x86_64-q35-graphics.x86_64-latest.args | 4 ++-- .../x86_64-q35-headless.x86_64-latest.args | 4 ++-- ...-q35-minimal.x86_64-latest.abi-update.args | 2 +- .../x86_64-q35-minimal.x86_64-latest.args | 2 +- tests/qemuxmlconftest.c | 10 ++++++++- tests/testutilsqemu.c | 5 ++++- 1175 files changed, 1241 insertions(+), 1230 deletions(-) diff --git a/tests/qemuxmlconfdata/aarch64-cpu-passthrough.aarch64-latest.a= rgs b/tests/qemuxmlconfdata/aarch64-cpu-passthrough.aarch64-latest.args index 35f6b089a4..65dba77871 100644 --- a/tests/qemuxmlconfdata/aarch64-cpu-passthrough.aarch64-latest.args +++ b/tests/qemuxmlconfdata/aarch64-cpu-passthrough.aarch64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-aarch64= test/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/aarch64-default-cpu-kvm-virt-10.0.aarch6= 4-latest.args b/tests/qemuxmlconfdata/aarch64-default-cpu-kvm-virt-10.0.aar= ch64-latest.args index eb2d771554..787390a7a4 100644 --- a/tests/qemuxmlconfdata/aarch64-default-cpu-kvm-virt-10.0.aarch64-lates= t.args +++ b/tests/qemuxmlconfdata/aarch64-default-cpu-kvm-virt-10.0.aarch64-lates= t.args @@ -20,7 +20,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/aarch64-default-cpu-kvm-virt-4.2.aarch64= -10.0.0.args b/tests/qemuxmlconfdata/aarch64-default-cpu-kvm-virt-4.2.aarch= 64-10.0.0.args index 7e2921a4c5..973d71d1fb 100644 --- a/tests/qemuxmlconfdata/aarch64-default-cpu-kvm-virt-4.2.aarch64-10.0.0= .args +++ b/tests/qemuxmlconfdata/aarch64-default-cpu-kvm-virt-4.2.aarch64-10.0.0= .args @@ -20,7 +20,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/aarch64-default-cpu-tcg-virt-10.0.aarch6= 4-latest.args b/tests/qemuxmlconfdata/aarch64-default-cpu-tcg-virt-10.0.aar= ch64-latest.args index ee5c19140a..76f08e3203 100644 --- a/tests/qemuxmlconfdata/aarch64-default-cpu-tcg-virt-10.0.aarch64-lates= t.args +++ b/tests/qemuxmlconfdata/aarch64-default-cpu-tcg-virt-10.0.aarch64-lates= t.args @@ -20,7 +20,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/aarch64-default-cpu-tcg-virt-4.2.aarch64= -10.0.0.args b/tests/qemuxmlconfdata/aarch64-default-cpu-tcg-virt-4.2.aarch= 64-10.0.0.args index dc8ff2e5d9..d526055b90 100644 --- a/tests/qemuxmlconfdata/aarch64-default-cpu-tcg-virt-4.2.aarch64-10.0.0= .args +++ b/tests/qemuxmlconfdata/aarch64-default-cpu-tcg-virt-4.2.aarch64-10.0.0= .args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/aarch64-features-pauth.aarch64-latest.ar= gs b/tests/qemuxmlconfdata/aarch64-features-pauth.aarch64-latest.args index 7db66f359b..fd0c111302 100644 --- a/tests/qemuxmlconfdata/aarch64-features-pauth.aarch64-latest.args +++ b/tests/qemuxmlconfdata/aarch64-features-pauth.aarch64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/aarch64-features-ras.aarch64-latest.args= b/tests/qemuxmlconfdata/aarch64-features-ras.aarch64-latest.args index f903d7152f..91adc8bf19 100644 --- a/tests/qemuxmlconfdata/aarch64-features-ras.aarch64-latest.args +++ b/tests/qemuxmlconfdata/aarch64-features-ras.aarch64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-aarch64= test/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/aarch64-features-sve.aarch64-latest.args= b/tests/qemuxmlconfdata/aarch64-features-sve.aarch64-latest.args index 99a931dcd2..96e355a29d 100644 --- a/tests/qemuxmlconfdata/aarch64-features-sve.aarch64-latest.args +++ b/tests/qemuxmlconfdata/aarch64-features-sve.aarch64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/aarch64-gic-default-both.aarch64-latest.= args b/tests/qemuxmlconfdata/aarch64-gic-default-both.aarch64-latest.args index f291d8e1c4..17a90ae740 100644 --- a/tests/qemuxmlconfdata/aarch64-gic-default-both.aarch64-latest.args +++ b/tests/qemuxmlconfdata/aarch64-gic-default-both.aarch64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-aarch64= test/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/aarch64-gic-default-v2.aarch64-latest.ar= gs b/tests/qemuxmlconfdata/aarch64-gic-default-v2.aarch64-latest.args index fdf3e4f10e..95ff3baeec 100644 --- a/tests/qemuxmlconfdata/aarch64-gic-default-v2.aarch64-latest.args +++ b/tests/qemuxmlconfdata/aarch64-gic-default-v2.aarch64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-aarch64= test/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/aarch64-gic-default-v3.aarch64-latest.ar= gs b/tests/qemuxmlconfdata/aarch64-gic-default-v3.aarch64-latest.args index f291d8e1c4..17a90ae740 100644 --- a/tests/qemuxmlconfdata/aarch64-gic-default-v3.aarch64-latest.args +++ b/tests/qemuxmlconfdata/aarch64-gic-default-v3.aarch64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-aarch64= test/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/aarch64-gic-default.aarch64-latest.args = b/tests/qemuxmlconfdata/aarch64-gic-default.aarch64-latest.args index fdf3e4f10e..95ff3baeec 100644 --- a/tests/qemuxmlconfdata/aarch64-gic-default.aarch64-latest.args +++ b/tests/qemuxmlconfdata/aarch64-gic-default.aarch64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-aarch64= test/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/aarch64-gic-host.aarch64-latest.args b/t= ests/qemuxmlconfdata/aarch64-gic-host.aarch64-latest.args index ba9177c4ff..19cd177f1e 100644 --- a/tests/qemuxmlconfdata/aarch64-gic-host.aarch64-latest.args +++ b/tests/qemuxmlconfdata/aarch64-gic-host.aarch64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-aarch64= test/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/aarch64-gic-none-both.aarch64-latest.arg= s b/tests/qemuxmlconfdata/aarch64-gic-none-both.aarch64-latest.args index f291d8e1c4..17a90ae740 100644 --- a/tests/qemuxmlconfdata/aarch64-gic-none-both.aarch64-latest.args +++ b/tests/qemuxmlconfdata/aarch64-gic-none-both.aarch64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-aarch64= test/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/aarch64-gic-none-tcg.aarch64-latest.args= b/tests/qemuxmlconfdata/aarch64-gic-none-tcg.aarch64-latest.args index 583eaa0c03..8f5150844d 100644 --- a/tests/qemuxmlconfdata/aarch64-gic-none-tcg.aarch64-latest.args +++ b/tests/qemuxmlconfdata/aarch64-gic-none-tcg.aarch64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/aarch64-gic-none-v2.aarch64-latest.args = b/tests/qemuxmlconfdata/aarch64-gic-none-v2.aarch64-latest.args index fdf3e4f10e..95ff3baeec 100644 --- a/tests/qemuxmlconfdata/aarch64-gic-none-v2.aarch64-latest.args +++ b/tests/qemuxmlconfdata/aarch64-gic-none-v2.aarch64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-aarch64= test/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/aarch64-gic-none-v3.aarch64-latest.args = b/tests/qemuxmlconfdata/aarch64-gic-none-v3.aarch64-latest.args index f291d8e1c4..17a90ae740 100644 --- a/tests/qemuxmlconfdata/aarch64-gic-none-v3.aarch64-latest.args +++ b/tests/qemuxmlconfdata/aarch64-gic-none-v3.aarch64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-aarch64= test/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/aarch64-gic-none.aarch64-latest.args b/t= ests/qemuxmlconfdata/aarch64-gic-none.aarch64-latest.args index fdf3e4f10e..95ff3baeec 100644 --- a/tests/qemuxmlconfdata/aarch64-gic-none.aarch64-latest.args +++ b/tests/qemuxmlconfdata/aarch64-gic-none.aarch64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-aarch64= test/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/aarch64-gic-v2.aarch64-latest.args b/tes= ts/qemuxmlconfdata/aarch64-gic-v2.aarch64-latest.args index fdf3e4f10e..95ff3baeec 100644 --- a/tests/qemuxmlconfdata/aarch64-gic-v2.aarch64-latest.args +++ b/tests/qemuxmlconfdata/aarch64-gic-v2.aarch64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-aarch64= test/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/aarch64-gic-v3.aarch64-latest.args b/tes= ts/qemuxmlconfdata/aarch64-gic-v3.aarch64-latest.args index f291d8e1c4..17a90ae740 100644 --- a/tests/qemuxmlconfdata/aarch64-gic-v3.aarch64-latest.args +++ b/tests/qemuxmlconfdata/aarch64-gic-v3.aarch64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-aarch64= test/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/aarch64-kvm-32-on-64.aarch64-latest.args= b/tests/qemuxmlconfdata/aarch64-kvm-32-on-64.aarch64-latest.args index 1efc68c506..e0d0e5cab0 100644 --- a/tests/qemuxmlconfdata/aarch64-kvm-32-on-64.aarch64-latest.args +++ b/tests/qemuxmlconfdata/aarch64-kvm-32-on-64.aarch64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-armtest= /.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/aarch64-nousb-minimal.aarch64-latest.abi= -update.args b/tests/qemuxmlconfdata/aarch64-nousb-minimal.aarch64-latest.a= bi-update.args index 9a1c6fd276..8b2b3292c1 100644 --- a/tests/qemuxmlconfdata/aarch64-nousb-minimal.aarch64-latest.abi-update= .args +++ b/tests/qemuxmlconfdata/aarch64-nousb-minimal.aarch64-latest.abi-update= .args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-aarch64= test/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/aarch64-nousb-minimal.aarch64-latest.arg= s b/tests/qemuxmlconfdata/aarch64-nousb-minimal.aarch64-latest.args index 9a1c6fd276..8b2b3292c1 100644 --- a/tests/qemuxmlconfdata/aarch64-nousb-minimal.aarch64-latest.args +++ b/tests/qemuxmlconfdata/aarch64-nousb-minimal.aarch64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-aarch64= test/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/aarch64-pci-serial.aarch64-latest.args b= /tests/qemuxmlconfdata/aarch64-pci-serial.aarch64-latest.args index 9d3cf39d6a..504f401021 100644 --- a/tests/qemuxmlconfdata/aarch64-pci-serial.aarch64-latest.args +++ b/tests/qemuxmlconfdata/aarch64-pci-serial.aarch64-latest.args @@ -20,7 +20,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-aarch64= test/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/aarch64-realview-minimal.aarch64-latest.= abi-update.args b/tests/qemuxmlconfdata/aarch64-realview-minimal.aarch64-la= test.abi-update.args index ccbff79f35..41cd0da428 100644 --- a/tests/qemuxmlconfdata/aarch64-realview-minimal.aarch64-latest.abi-upd= ate.args +++ b/tests/qemuxmlconfdata/aarch64-realview-minimal.aarch64-latest.abi-upd= ate.args @@ -20,7 +20,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-aarch64= test/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/aarch64-realview-minimal.aarch64-latest.= args b/tests/qemuxmlconfdata/aarch64-realview-minimal.aarch64-latest.args index ccbff79f35..41cd0da428 100644 --- a/tests/qemuxmlconfdata/aarch64-realview-minimal.aarch64-latest.args +++ b/tests/qemuxmlconfdata/aarch64-realview-minimal.aarch64-latest.args @@ -20,7 +20,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-aarch64= test/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/aarch64-traditional-pci.aarch64-latest.a= rgs b/tests/qemuxmlconfdata/aarch64-traditional-pci.aarch64-latest.args index 1f9d5db559..1514bbe8f7 100644 --- a/tests/qemuxmlconfdata/aarch64-traditional-pci.aarch64-latest.args +++ b/tests/qemuxmlconfdata/aarch64-traditional-pci.aarch64-latest.args @@ -20,7 +20,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/aarch64-usb-controller.aarch64-latest.ar= gs b/tests/qemuxmlconfdata/aarch64-usb-controller.aarch64-latest.args index a34499c6fb..1c76089bb6 100644 --- a/tests/qemuxmlconfdata/aarch64-usb-controller.aarch64-latest.args +++ b/tests/qemuxmlconfdata/aarch64-usb-controller.aarch64-latest.args @@ -20,7 +20,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/aarch64-video-default.aarch64-latest.arg= s b/tests/qemuxmlconfdata/aarch64-video-default.aarch64-latest.args index 26261cae09..3aa7008ec8 100644 --- a/tests/qemuxmlconfdata/aarch64-video-default.aarch64-latest.args +++ b/tests/qemuxmlconfdata/aarch64-video-default.aarch64-latest.args @@ -20,7 +20,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-aarch64= -vgpu/.config \ -uuid f3197c89-6457-44fe-b26d-897090ba6541 \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/aarch64-video-virtio-gpu-pci.aarch64-lat= est.args b/tests/qemuxmlconfdata/aarch64-video-virtio-gpu-pci.aarch64-lates= t.args index 31f3907acc..9bdd329040 100644 --- a/tests/qemuxmlconfdata/aarch64-video-virtio-gpu-pci.aarch64-latest.args +++ b/tests/qemuxmlconfdata/aarch64-video-virtio-gpu-pci.aarch64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-aarch64= -vgpu/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/aarch64-virt-default-models.aarch64-late= st.abi-update.args b/tests/qemuxmlconfdata/aarch64-virt-default-models.aarc= h64-latest.abi-update.args index 7088fd7c69..37eb559ac3 100644 --- a/tests/qemuxmlconfdata/aarch64-virt-default-models.aarch64-latest.abi-= update.args +++ b/tests/qemuxmlconfdata/aarch64-virt-default-models.aarch64-latest.abi-= update.args @@ -20,7 +20,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/aarch64-virt-default-models.aarch64-late= st.args b/tests/qemuxmlconfdata/aarch64-virt-default-models.aarch64-latest.= args index 7088fd7c69..37eb559ac3 100644 --- a/tests/qemuxmlconfdata/aarch64-virt-default-models.aarch64-latest.args +++ b/tests/qemuxmlconfdata/aarch64-virt-default-models.aarch64-latest.args @@ -20,7 +20,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/aarch64-virt-default-nic.aarch64-latest.= args b/tests/qemuxmlconfdata/aarch64-virt-default-nic.aarch64-latest.args index 0a8dd3e1fb..0701041c99 100644 --- a/tests/qemuxmlconfdata/aarch64-virt-default-nic.aarch64-latest.args +++ b/tests/qemuxmlconfdata/aarch64-virt-default-nic.aarch64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-aarch64= -virt-default/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/aarch64-virt-graphics.aarch64-latest.arg= s b/tests/qemuxmlconfdata/aarch64-virt-graphics.aarch64-latest.args index 3c9c0327ef..b987772672 100644 --- a/tests/qemuxmlconfdata/aarch64-virt-graphics.aarch64-latest.args +++ b/tests/qemuxmlconfdata/aarch64-virt-graphics.aarch64-latest.args @@ -22,7 +22,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -uuid 33844184-97c0-4cc0-aa7d-206f5803530b \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ @@ -44,7 +44,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -device '{"driver":"virtio-net-pci","netdev":"hostnet0","id":"net0","mac":= "52:54:00:53:45:a5","bus":"pci.1","addr":"0x0"}' \ -chardev pty,id=3Dcharserial0 \ -serial chardev:charserial0 \ --chardev socket,id=3Dcharchannel0,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharchannel0,fd=3DXXXXXXX,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"}' \ -device '{"driver":"usb-kbd","id":"input1","bus":"usb.0","port":"2"}' \ diff --git a/tests/qemuxmlconfdata/aarch64-virt-headless-mmio.aarch64-lates= t.args b/tests/qemuxmlconfdata/aarch64-virt-headless-mmio.aarch64-latest.ar= gs index 70fee9a933..aa5ee67f34 100644 --- a/tests/qemuxmlconfdata/aarch64-virt-headless-mmio.aarch64-latest.args +++ b/tests/qemuxmlconfdata/aarch64-virt-headless-mmio.aarch64-latest.args @@ -23,7 +23,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ @@ -36,7 +36,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -device '{"driver":"virtio-net-device","netdev":"hostnet0","id":"net0","ma= c":"52:54:00:09:a4:37"}' \ -chardev pty,id=3Dcharserial0 \ -serial chardev:charserial0 \ --chardev socket,id=3Dcharchannel0,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharchannel0,fd=3DXXXXXXX,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":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-device","id":"balloon0"}' \ diff --git a/tests/qemuxmlconfdata/aarch64-virt-headless.aarch64-latest.arg= s b/tests/qemuxmlconfdata/aarch64-virt-headless.aarch64-latest.args index 76858f376d..8d046cb2b8 100644 --- a/tests/qemuxmlconfdata/aarch64-virt-headless.aarch64-latest.args +++ b/tests/qemuxmlconfdata/aarch64-virt-headless.aarch64-latest.args @@ -23,7 +23,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ @@ -44,7 +44,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -device '{"driver":"virtio-net-pci","netdev":"hostnet0","id":"net0","mac":= "52:54:00:09:a4:37","bus":"pci.1","addr":"0x0"}' \ -chardev pty,id=3Dcharserial0 \ -serial chardev:charserial0 \ --chardev socket,id=3Dcharchannel0,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharchannel0,fd=3DXXXXXXX,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":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.5","add= r":"0x0"}' \ diff --git a/tests/qemuxmlconfdata/aarch64-virt-minimal.aarch64-latest.abi-= update.args b/tests/qemuxmlconfdata/aarch64-virt-minimal.aarch64-latest.abi= -update.args index 9c5534b8d1..6cf80f825b 100644 --- a/tests/qemuxmlconfdata/aarch64-virt-minimal.aarch64-latest.abi-update.= args +++ b/tests/qemuxmlconfdata/aarch64-virt-minimal.aarch64-latest.abi-update.= args @@ -20,7 +20,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/aarch64-virt-minimal.aarch64-latest.args= b/tests/qemuxmlconfdata/aarch64-virt-minimal.aarch64-latest.args index 9c5534b8d1..6cf80f825b 100644 --- a/tests/qemuxmlconfdata/aarch64-virt-minimal.aarch64-latest.args +++ b/tests/qemuxmlconfdata/aarch64-virt-minimal.aarch64-latest.args @@ -20,7 +20,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/aarch64-virt-virtio.aarch64-latest.args = b/tests/qemuxmlconfdata/aarch64-virt-virtio.aarch64-latest.args index daf71112b5..47a612a85d 100644 --- a/tests/qemuxmlconfdata/aarch64-virt-virtio.aarch64-latest.args +++ b/tests/qemuxmlconfdata/aarch64-virt-virtio.aarch64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-aarch64= test/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/aarch64-virt-virtualization.aarch64-late= st.args b/tests/qemuxmlconfdata/aarch64-virt-virtualization.aarch64-latest.= args index be04ecc641..45c47a7be5 100644 --- a/tests/qemuxmlconfdata/aarch64-virt-virtualization.aarch64-latest.args +++ b/tests/qemuxmlconfdata/aarch64-virt-virtualization.aarch64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-aarch64= -virt-default/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/aarch64-virtio-pci-manual-addresses.aarc= h64-latest.args b/tests/qemuxmlconfdata/aarch64-virtio-pci-manual-addresses= .aarch64-latest.args index 459f90e542..0be791ec21 100644 --- a/tests/qemuxmlconfdata/aarch64-virtio-pci-manual-addresses.aarch64-lat= est.args +++ b/tests/qemuxmlconfdata/aarch64-virtio-pci-manual-addresses.aarch64-lat= est.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-aarch64= test/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/acpi-generic-initiator.x86_64-latest.arg= s b/tests/qemuxmlconfdata/acpi-generic-initiator.x86_64-latest.args index 87de002afd..0e69fab7e9 100644 --- a/tests/qemuxmlconfdata/acpi-generic-initiator.x86_64-latest.args +++ b/tests/qemuxmlconfdata/acpi-generic-initiator.x86_64-latest.args @@ -30,7 +30,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st2/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/acpi-table-many.x86_64-latest.args b/tes= ts/qemuxmlconfdata/acpi-table-many.x86_64-latest.args index 2b0b433258..e7ae567768 100644 --- a/tests/qemuxmlconfdata/acpi-table-many.x86_64-latest.args +++ b/tests/qemuxmlconfdata/acpi-table-many.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/acpi-table.x86_64-latest.args b/tests/qe= muxmlconfdata/acpi-table.x86_64-latest.args index 78cb1c90ee..69180eb330 100644 --- a/tests/qemuxmlconfdata/acpi-table.x86_64-latest.args +++ b/tests/qemuxmlconfdata/acpi-table.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/amd-iommu.x86_64-latest.args b/tests/qem= uxmlconfdata/amd-iommu.x86_64-latest.args index 20d7e379e6..041b6695d3 100644 --- a/tests/qemuxmlconfdata/amd-iommu.x86_64-latest.args +++ b/tests/qemuxmlconfdata/amd-iommu.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/arm-vexpressa9-basic.aarch64-latest.args= b/tests/qemuxmlconfdata/arm-vexpressa9-basic.aarch64-latest.args index 72d10a732e..ea11dd0fae 100644 --- a/tests/qemuxmlconfdata/arm-vexpressa9-basic.aarch64-latest.args +++ b/tests/qemuxmlconfdata/arm-vexpressa9-basic.aarch64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-armtest= /.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/arm-vexpressa9-nodevs.aarch64-latest.arg= s b/tests/qemuxmlconfdata/arm-vexpressa9-nodevs.aarch64-latest.args index de96ada570..5e3aeb1157 100644 --- a/tests/qemuxmlconfdata/arm-vexpressa9-nodevs.aarch64-latest.args +++ b/tests/qemuxmlconfdata/arm-vexpressa9-nodevs.aarch64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-armtest= /.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/arm-vexpressa9-virtio.aarch64-latest.arg= s b/tests/qemuxmlconfdata/arm-vexpressa9-virtio.aarch64-latest.args index 9ead325c95..259ef258fa 100644 --- a/tests/qemuxmlconfdata/arm-vexpressa9-virtio.aarch64-latest.args +++ b/tests/qemuxmlconfdata/arm-vexpressa9-virtio.aarch64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-armtest= /.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/armv7l-versatilepb-minimal.armv7l-latest= .abi-update.args b/tests/qemuxmlconfdata/armv7l-versatilepb-minimal.armv7l-= latest.abi-update.args index 88fe2b62e8..50f5ca6c94 100644 --- a/tests/qemuxmlconfdata/armv7l-versatilepb-minimal.armv7l-latest.abi-up= date.args +++ b/tests/qemuxmlconfdata/armv7l-versatilepb-minimal.armv7l-latest.abi-up= date.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-armv7lt= est/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/armv7l-versatilepb-minimal.armv7l-latest= .args b/tests/qemuxmlconfdata/armv7l-versatilepb-minimal.armv7l-latest.args index 88fe2b62e8..50f5ca6c94 100644 --- a/tests/qemuxmlconfdata/armv7l-versatilepb-minimal.armv7l-latest.args +++ b/tests/qemuxmlconfdata/armv7l-versatilepb-minimal.armv7l-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-armv7lt= est/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/async-teardown.x86_64-latest.args b/test= s/qemuxmlconfdata/async-teardown.x86_64-latest.args index 406617d2f3..481352318c 100644 --- a/tests/qemuxmlconfdata/async-teardown.x86_64-latest.args +++ b/tests/qemuxmlconfdata/async-teardown.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/audio-alsa-best.x86_64-latest.args b/tes= ts/qemuxmlconfdata/audio-alsa-best.x86_64-latest.args index 6c4d890220..2e01b7f804 100644 --- a/tests/qemuxmlconfdata/audio-alsa-best.x86_64-latest.args +++ b/tests/qemuxmlconfdata/audio-alsa-best.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/audio-alsa-full.x86_64-latest.args b/tes= ts/qemuxmlconfdata/audio-alsa-full.x86_64-latest.args index 64bf9e72ff..6a14e8c3ed 100644 --- a/tests/qemuxmlconfdata/audio-alsa-full.x86_64-latest.args +++ b/tests/qemuxmlconfdata/audio-alsa-full.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/audio-alsa-minimal.x86_64-latest.args b/= tests/qemuxmlconfdata/audio-alsa-minimal.x86_64-latest.args index 2968f01550..bf3559e919 100644 --- a/tests/qemuxmlconfdata/audio-alsa-minimal.x86_64-latest.args +++ b/tests/qemuxmlconfdata/audio-alsa-minimal.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/audio-coreaudio-best.x86_64-latest.args = b/tests/qemuxmlconfdata/audio-coreaudio-best.x86_64-latest.args index abb15b5f42..bbff4cdc1f 100644 --- a/tests/qemuxmlconfdata/audio-coreaudio-best.x86_64-latest.args +++ b/tests/qemuxmlconfdata/audio-coreaudio-best.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/audio-coreaudio-full.x86_64-latest.args = b/tests/qemuxmlconfdata/audio-coreaudio-full.x86_64-latest.args index 5d3297951d..81a405d0fb 100644 --- a/tests/qemuxmlconfdata/audio-coreaudio-full.x86_64-latest.args +++ b/tests/qemuxmlconfdata/audio-coreaudio-full.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/audio-coreaudio-minimal.x86_64-latest.ar= gs b/tests/qemuxmlconfdata/audio-coreaudio-minimal.x86_64-latest.args index 6ae129ed23..67f04ffde1 100644 --- a/tests/qemuxmlconfdata/audio-coreaudio-minimal.x86_64-latest.args +++ b/tests/qemuxmlconfdata/audio-coreaudio-minimal.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/audio-default-nographics.x86_64-latest.a= rgs b/tests/qemuxmlconfdata/audio-default-nographics.x86_64-latest.args index 2968f01550..bf3559e919 100644 --- a/tests/qemuxmlconfdata/audio-default-nographics.x86_64-latest.args +++ b/tests/qemuxmlconfdata/audio-default-nographics.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/audio-default-sdl.x86_64-latest.args b/t= ests/qemuxmlconfdata/audio-default-sdl.x86_64-latest.args index 07f3bcfce8..005a02aec8 100644 --- a/tests/qemuxmlconfdata/audio-default-sdl.x86_64-latest.args +++ b/tests/qemuxmlconfdata/audio-default-sdl.x86_64-latest.args @@ -21,7 +21,7 @@ SDL_AUDIODRIVER=3Desd \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/audio-default-spice.x86_64-latest.args b= /tests/qemuxmlconfdata/audio-default-spice.x86_64-latest.args index 5aef24f473..cf9cbae6f6 100644 --- a/tests/qemuxmlconfdata/audio-default-spice.x86_64-latest.args +++ b/tests/qemuxmlconfdata/audio-default-spice.x86_64-latest.args @@ -20,7 +20,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/audio-default-vnc.x86_64-latest.args b/t= ests/qemuxmlconfdata/audio-default-vnc.x86_64-latest.args index 2c43d097e5..288cc08655 100644 --- a/tests/qemuxmlconfdata/audio-default-vnc.x86_64-latest.args +++ b/tests/qemuxmlconfdata/audio-default-vnc.x86_64-latest.args @@ -20,7 +20,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/audio-file-best.x86_64-latest.args b/tes= ts/qemuxmlconfdata/audio-file-best.x86_64-latest.args index 2ac8073b4d..25f1d02971 100644 --- a/tests/qemuxmlconfdata/audio-file-best.x86_64-latest.args +++ b/tests/qemuxmlconfdata/audio-file-best.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/audio-file-full.x86_64-latest.args b/tes= ts/qemuxmlconfdata/audio-file-full.x86_64-latest.args index b51662bb63..4c1f5ecab8 100644 --- a/tests/qemuxmlconfdata/audio-file-full.x86_64-latest.args +++ b/tests/qemuxmlconfdata/audio-file-full.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/audio-file-minimal.x86_64-latest.args b/= tests/qemuxmlconfdata/audio-file-minimal.x86_64-latest.args index 499cf08c52..6ace7f8b0a 100644 --- a/tests/qemuxmlconfdata/audio-file-minimal.x86_64-latest.args +++ b/tests/qemuxmlconfdata/audio-file-minimal.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/audio-jack-full.x86_64-latest.args b/tes= ts/qemuxmlconfdata/audio-jack-full.x86_64-latest.args index a68e5fa7f7..0beed3b7fc 100644 --- a/tests/qemuxmlconfdata/audio-jack-full.x86_64-latest.args +++ b/tests/qemuxmlconfdata/audio-jack-full.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/audio-jack-minimal.x86_64-latest.args b/= tests/qemuxmlconfdata/audio-jack-minimal.x86_64-latest.args index 5b5f887f6e..d00cb57391 100644 --- a/tests/qemuxmlconfdata/audio-jack-minimal.x86_64-latest.args +++ b/tests/qemuxmlconfdata/audio-jack-minimal.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/audio-many-backends.x86_64-latest.args b= /tests/qemuxmlconfdata/audio-many-backends.x86_64-latest.args index bedbbac483..2d0c1301fe 100644 --- a/tests/qemuxmlconfdata/audio-many-backends.x86_64-latest.args +++ b/tests/qemuxmlconfdata/audio-many-backends.x86_64-latest.args @@ -21,7 +21,7 @@ PIPEWIRE_RUNTIME_DIR=3D/run/user/1000 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/audio-none-best.x86_64-latest.args b/tes= ts/qemuxmlconfdata/audio-none-best.x86_64-latest.args index deaad5cbd8..ec31a2e37e 100644 --- a/tests/qemuxmlconfdata/audio-none-best.x86_64-latest.args +++ b/tests/qemuxmlconfdata/audio-none-best.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/audio-none-full.x86_64-latest.args b/tes= ts/qemuxmlconfdata/audio-none-full.x86_64-latest.args index c0f069cb15..f378102bc3 100644 --- a/tests/qemuxmlconfdata/audio-none-full.x86_64-latest.args +++ b/tests/qemuxmlconfdata/audio-none-full.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/audio-none-minimal.x86_64-latest.args b/= tests/qemuxmlconfdata/audio-none-minimal.x86_64-latest.args index 9e0524bbd8..e527f1a552 100644 --- a/tests/qemuxmlconfdata/audio-none-minimal.x86_64-latest.args +++ b/tests/qemuxmlconfdata/audio-none-minimal.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/audio-oss-best.x86_64-latest.args b/test= s/qemuxmlconfdata/audio-oss-best.x86_64-latest.args index 6ab36ccd1f..40359165d4 100644 --- a/tests/qemuxmlconfdata/audio-oss-best.x86_64-latest.args +++ b/tests/qemuxmlconfdata/audio-oss-best.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/audio-oss-full.x86_64-latest.args b/test= s/qemuxmlconfdata/audio-oss-full.x86_64-latest.args index eb2b12400c..928c2ffd6e 100644 --- a/tests/qemuxmlconfdata/audio-oss-full.x86_64-latest.args +++ b/tests/qemuxmlconfdata/audio-oss-full.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/audio-oss-minimal.x86_64-latest.args b/t= ests/qemuxmlconfdata/audio-oss-minimal.x86_64-latest.args index 9f1fa67875..832dd9fdcd 100644 --- a/tests/qemuxmlconfdata/audio-oss-minimal.x86_64-latest.args +++ b/tests/qemuxmlconfdata/audio-oss-minimal.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/audio-pipewire-best.x86_64-latest.args b= /tests/qemuxmlconfdata/audio-pipewire-best.x86_64-latest.args index f4a2ac2f57..cff31a2f38 100644 --- a/tests/qemuxmlconfdata/audio-pipewire-best.x86_64-latest.args +++ b/tests/qemuxmlconfdata/audio-pipewire-best.x86_64-latest.args @@ -22,7 +22,7 @@ PIPEWIRE_RUNTIME_DIR=3D/run/user/1000 \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/audio-pipewire-full.x86_64-latest.args b= /tests/qemuxmlconfdata/audio-pipewire-full.x86_64-latest.args index fb6d4d7f00..7999952c85 100644 --- a/tests/qemuxmlconfdata/audio-pipewire-full.x86_64-latest.args +++ b/tests/qemuxmlconfdata/audio-pipewire-full.x86_64-latest.args @@ -22,7 +22,7 @@ PIPEWIRE_RUNTIME_DIR=3D/run/user/1000 \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/audio-pipewire-minimal.x86_64-latest.arg= s b/tests/qemuxmlconfdata/audio-pipewire-minimal.x86_64-latest.args index f88def88df..327383b1be 100644 --- a/tests/qemuxmlconfdata/audio-pipewire-minimal.x86_64-latest.args +++ b/tests/qemuxmlconfdata/audio-pipewire-minimal.x86_64-latest.args @@ -22,7 +22,7 @@ PIPEWIRE_RUNTIME_DIR=3D/run/user/1000 \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/audio-pulseaudio-best.x86_64-latest.args= b/tests/qemuxmlconfdata/audio-pulseaudio-best.x86_64-latest.args index 7d58af65d4..969e18ba3d 100644 --- a/tests/qemuxmlconfdata/audio-pulseaudio-best.x86_64-latest.args +++ b/tests/qemuxmlconfdata/audio-pulseaudio-best.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/audio-pulseaudio-full.x86_64-latest.args= b/tests/qemuxmlconfdata/audio-pulseaudio-full.x86_64-latest.args index 818d071aa6..403a593a7b 100644 --- a/tests/qemuxmlconfdata/audio-pulseaudio-full.x86_64-latest.args +++ b/tests/qemuxmlconfdata/audio-pulseaudio-full.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/audio-pulseaudio-minimal.x86_64-latest.a= rgs b/tests/qemuxmlconfdata/audio-pulseaudio-minimal.x86_64-latest.args index 6e70e93ee8..8612c04541 100644 --- a/tests/qemuxmlconfdata/audio-pulseaudio-minimal.x86_64-latest.args +++ b/tests/qemuxmlconfdata/audio-pulseaudio-minimal.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/audio-sdl-best.x86_64-latest.args b/test= s/qemuxmlconfdata/audio-sdl-best.x86_64-latest.args index be566e7a14..f41654ada4 100644 --- a/tests/qemuxmlconfdata/audio-sdl-best.x86_64-latest.args +++ b/tests/qemuxmlconfdata/audio-sdl-best.x86_64-latest.args @@ -22,7 +22,7 @@ SDL_AUDIODRIVER=3Dpulseaudio \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/audio-sdl-full.x86_64-latest.args b/test= s/qemuxmlconfdata/audio-sdl-full.x86_64-latest.args index 8c18ece7f9..35f479e9a9 100644 --- a/tests/qemuxmlconfdata/audio-sdl-full.x86_64-latest.args +++ b/tests/qemuxmlconfdata/audio-sdl-full.x86_64-latest.args @@ -22,7 +22,7 @@ SDL_AUDIODRIVER=3Dpulseaudio \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/audio-sdl-minimal.x86_64-latest.args b/t= ests/qemuxmlconfdata/audio-sdl-minimal.x86_64-latest.args index 55fc86f9f4..b088f51b24 100644 --- a/tests/qemuxmlconfdata/audio-sdl-minimal.x86_64-latest.args +++ b/tests/qemuxmlconfdata/audio-sdl-minimal.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/audio-spice-best.x86_64-latest.args b/te= sts/qemuxmlconfdata/audio-spice-best.x86_64-latest.args index 20c47c9111..889e246ff1 100644 --- a/tests/qemuxmlconfdata/audio-spice-best.x86_64-latest.args +++ b/tests/qemuxmlconfdata/audio-spice-best.x86_64-latest.args @@ -20,7 +20,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/audio-spice-full.x86_64-latest.args b/te= sts/qemuxmlconfdata/audio-spice-full.x86_64-latest.args index 73382c6a74..e7da40575c 100644 --- a/tests/qemuxmlconfdata/audio-spice-full.x86_64-latest.args +++ b/tests/qemuxmlconfdata/audio-spice-full.x86_64-latest.args @@ -20,7 +20,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/audio-spice-minimal.x86_64-latest.args b= /tests/qemuxmlconfdata/audio-spice-minimal.x86_64-latest.args index 5aef24f473..cf9cbae6f6 100644 --- a/tests/qemuxmlconfdata/audio-spice-minimal.x86_64-latest.args +++ b/tests/qemuxmlconfdata/audio-spice-minimal.x86_64-latest.args @@ -20,7 +20,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/autoindex.x86_64-latest.args b/tests/qem= uxmlconfdata/autoindex.x86_64-latest.args index af45ce005a..97427c3683 100644 --- a/tests/qemuxmlconfdata/autoindex.x86_64-latest.args +++ b/tests/qemuxmlconfdata/autoindex.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-q35-tes= t/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/balloon-ccw-deflate.s390x-latest.args b/= tests/qemuxmlconfdata/balloon-ccw-deflate.s390x-latest.args index 8a993c1d64..1a4d6ddef0 100644 --- a/tests/qemuxmlconfdata/balloon-ccw-deflate.s390x-latest.args +++ b/tests/qemuxmlconfdata/balloon-ccw-deflate.s390x-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/balloon-device-auto.x86_64-latest.args b= /tests/qemuxmlconfdata/balloon-device-auto.x86_64-latest.args index 23beb54806..689b636c57 100644 --- a/tests/qemuxmlconfdata/balloon-device-auto.x86_64-latest.args +++ b/tests/qemuxmlconfdata/balloon-device-auto.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/balloon-device-deflate-off.x86_64-latest= .args b/tests/qemuxmlconfdata/balloon-device-deflate-off.x86_64-latest.args index 023a29f22e..b7129922f5 100644 --- a/tests/qemuxmlconfdata/balloon-device-deflate-off.x86_64-latest.args +++ b/tests/qemuxmlconfdata/balloon-device-deflate-off.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/balloon-device-deflate.x86_64-latest.arg= s b/tests/qemuxmlconfdata/balloon-device-deflate.x86_64-latest.args index 32de9a4a85..524f48ed18 100644 --- a/tests/qemuxmlconfdata/balloon-device-deflate.x86_64-latest.args +++ b/tests/qemuxmlconfdata/balloon-device-deflate.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/balloon-device-period.x86_64-latest.args= b/tests/qemuxmlconfdata/balloon-device-period.x86_64-latest.args index 0763a63f3c..2c7a068980 100644 --- a/tests/qemuxmlconfdata/balloon-device-period.x86_64-latest.args +++ b/tests/qemuxmlconfdata/balloon-device-period.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/balloon-device.x86_64-latest.args b/test= s/qemuxmlconfdata/balloon-device.x86_64-latest.args index 0763a63f3c..2c7a068980 100644 --- a/tests/qemuxmlconfdata/balloon-device.x86_64-latest.args +++ b/tests/qemuxmlconfdata/balloon-device.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/balloon-mmio-deflate.aarch64-latest.args= b/tests/qemuxmlconfdata/balloon-mmio-deflate.aarch64-latest.args index 89089c9d6b..527f6cc445 100644 --- a/tests/qemuxmlconfdata/balloon-mmio-deflate.aarch64-latest.args +++ b/tests/qemuxmlconfdata/balloon-mmio-deflate.aarch64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-aarch64= test/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/blkdeviotune-group-num.x86_64-latest.arg= s b/tests/qemuxmlconfdata/blkdeviotune-group-num.x86_64-latest.args index 38d38734f5..d550d0254e 100644 --- a/tests/qemuxmlconfdata/blkdeviotune-group-num.x86_64-latest.args +++ b/tests/qemuxmlconfdata/blkdeviotune-group-num.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/blkdeviotune-max-length.x86_64-latest.ar= gs b/tests/qemuxmlconfdata/blkdeviotune-max-length.x86_64-latest.args index 38d38734f5..d550d0254e 100644 --- a/tests/qemuxmlconfdata/blkdeviotune-max-length.x86_64-latest.args +++ b/tests/qemuxmlconfdata/blkdeviotune-max-length.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/blkdeviotune-max.x86_64-latest.args b/te= sts/qemuxmlconfdata/blkdeviotune-max.x86_64-latest.args index 38d38734f5..d550d0254e 100644 --- a/tests/qemuxmlconfdata/blkdeviotune-max.x86_64-latest.args +++ b/tests/qemuxmlconfdata/blkdeviotune-max.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/blkdeviotune.x86_64-latest.args b/tests/= qemuxmlconfdata/blkdeviotune.x86_64-latest.args index 7a2f740309..d08e842de5 100644 --- a/tests/qemuxmlconfdata/blkdeviotune.x86_64-latest.args +++ b/tests/qemuxmlconfdata/blkdeviotune.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/blkiotune-device.x86_64-latest.args b/te= sts/qemuxmlconfdata/blkiotune-device.x86_64-latest.args index 23beb54806..689b636c57 100644 --- a/tests/qemuxmlconfdata/blkiotune-device.x86_64-latest.args +++ b/tests/qemuxmlconfdata/blkiotune-device.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/blkiotune.x86_64-latest.args b/tests/qem= uxmlconfdata/blkiotune.x86_64-latest.args index 23beb54806..689b636c57 100644 --- a/tests/qemuxmlconfdata/blkiotune.x86_64-latest.args +++ b/tests/qemuxmlconfdata/blkiotune.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/boot-cdrom.x86_64-latest.args b/tests/qe= muxmlconfdata/boot-cdrom.x86_64-latest.args index 9e0524bbd8..e527f1a552 100644 --- a/tests/qemuxmlconfdata/boot-cdrom.x86_64-latest.args +++ b/tests/qemuxmlconfdata/boot-cdrom.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/boot-complex.x86_64-latest.args b/tests/= qemuxmlconfdata/boot-complex.x86_64-latest.args index 447897a657..560256f817 100644 --- a/tests/qemuxmlconfdata/boot-complex.x86_64-latest.args +++ b/tests/qemuxmlconfdata/boot-complex.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/boot-floppy-q35.x86_64-latest.args b/tes= ts/qemuxmlconfdata/boot-floppy-q35.x86_64-latest.args index 3c7c21c22f..139df16e0c 100644 --- a/tests/qemuxmlconfdata/boot-floppy-q35.x86_64-latest.args +++ b/tests/qemuxmlconfdata/boot-floppy-q35.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/boot-floppy.x86_64-latest.args b/tests/q= emuxmlconfdata/boot-floppy.x86_64-latest.args index 7233a55760..bb2c61d848 100644 --- a/tests/qemuxmlconfdata/boot-floppy.x86_64-latest.args +++ b/tests/qemuxmlconfdata/boot-floppy.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/boot-menu-disable-drive.x86_64-latest.ar= gs b/tests/qemuxmlconfdata/boot-menu-disable-drive.x86_64-latest.args index 75241ab120..1c395e692b 100644 --- a/tests/qemuxmlconfdata/boot-menu-disable-drive.x86_64-latest.args +++ b/tests/qemuxmlconfdata/boot-menu-disable-drive.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/boot-menu-disable-with-timeout.x86_64-la= test.args b/tests/qemuxmlconfdata/boot-menu-disable-with-timeout.x86_64-lat= est.args index 75241ab120..1c395e692b 100644 --- a/tests/qemuxmlconfdata/boot-menu-disable-with-timeout.x86_64-latest.ar= gs +++ b/tests/qemuxmlconfdata/boot-menu-disable-with-timeout.x86_64-latest.ar= gs @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/boot-menu-disable.x86_64-latest.args b/t= ests/qemuxmlconfdata/boot-menu-disable.x86_64-latest.args index 75241ab120..1c395e692b 100644 --- a/tests/qemuxmlconfdata/boot-menu-disable.x86_64-latest.args +++ b/tests/qemuxmlconfdata/boot-menu-disable.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/boot-menu-enable-with-timeout.x86_64-lat= est.args b/tests/qemuxmlconfdata/boot-menu-enable-with-timeout.x86_64-lates= t.args index fddb55c66c..dbbb870316 100644 --- a/tests/qemuxmlconfdata/boot-menu-enable-with-timeout.x86_64-latest.args +++ b/tests/qemuxmlconfdata/boot-menu-enable-with-timeout.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/boot-menu-enable.x86_64-latest.args b/te= sts/qemuxmlconfdata/boot-menu-enable.x86_64-latest.args index c84c68f76e..0bd2b840d5 100644 --- a/tests/qemuxmlconfdata/boot-menu-enable.x86_64-latest.args +++ b/tests/qemuxmlconfdata/boot-menu-enable.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/boot-multi.x86_64-latest.args b/tests/qe= muxmlconfdata/boot-multi.x86_64-latest.args index c84c68f76e..0bd2b840d5 100644 --- a/tests/qemuxmlconfdata/boot-multi.x86_64-latest.args +++ b/tests/qemuxmlconfdata/boot-multi.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/boot-network.x86_64-latest.args b/tests/= qemuxmlconfdata/boot-network.x86_64-latest.args index 4c83ca3ee4..437ea6705b 100644 --- a/tests/qemuxmlconfdata/boot-network.x86_64-latest.args +++ b/tests/qemuxmlconfdata/boot-network.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/boot-order.x86_64-latest.args b/tests/qe= muxmlconfdata/boot-order.x86_64-latest.args index 0dfff1924f..4dd2a967ee 100644 --- a/tests/qemuxmlconfdata/boot-order.x86_64-latest.args +++ b/tests/qemuxmlconfdata/boot-order.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/channel-guestfwd.x86_64-latest.args b/te= sts/qemuxmlconfdata/channel-guestfwd.x86_64-latest.args index 03533b358b..5ae6012019 100644 --- a/tests/qemuxmlconfdata/channel-guestfwd.x86_64-latest.args +++ b/tests/qemuxmlconfdata/channel-guestfwd.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/channel-qemu-vdagent-features.x86_64-lat= est.args b/tests/qemuxmlconfdata/channel-qemu-vdagent-features.x86_64-lates= t.args index cd81e6989d..0b5d84a6d2 100644 --- a/tests/qemuxmlconfdata/channel-qemu-vdagent-features.x86_64-latest.args +++ b/tests/qemuxmlconfdata/channel-qemu-vdagent-features.x86_64-latest.args @@ -20,7 +20,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/channel-qemu-vdagent.x86_64-latest.args = b/tests/qemuxmlconfdata/channel-qemu-vdagent.x86_64-latest.args index 3edcb4c9f8..7934e9e496 100644 --- a/tests/qemuxmlconfdata/channel-qemu-vdagent.x86_64-latest.args +++ b/tests/qemuxmlconfdata/channel-qemu-vdagent.x86_64-latest.args @@ -20,7 +20,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/channel-spicevmc.x86_64-latest.args b/te= sts/qemuxmlconfdata/channel-spicevmc.x86_64-latest.args index 78ace7047a..0057c8ea39 100644 --- a/tests/qemuxmlconfdata/channel-spicevmc.x86_64-latest.args +++ b/tests/qemuxmlconfdata/channel-spicevmc.x86_64-latest.args @@ -20,7 +20,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/channel-unix-guestfwd.x86_64-latest.args= b/tests/qemuxmlconfdata/channel-unix-guestfwd.x86_64-latest.args index cec97c4e66..5c631f35ea 100644 --- a/tests/qemuxmlconfdata/channel-unix-guestfwd.x86_64-latest.args +++ b/tests/qemuxmlconfdata/channel-unix-guestfwd.x86_64-latest.args @@ -21,13 +21,13 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUG= uest1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --chardev socket,id=3Dcharchannel0,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharchannel0,fd=3DXXXXXXX,server=3Don,wait=3Doff \ -netdev '{"type":"user","guestfwd":[{"str":"tcp:10.0.2.1:4600-chardev:char= channel0"}],"id":"channel0"}' \ -chardev socket,id=3Dcharchannel1,path=3D/tmp/guestfwd-connect.socket \ -netdev '{"type":"user","guestfwd":[{"str":"tcp:10.0.2.1:4601-chardev:char= channel1"}],"id":"channel1"}' \ diff --git a/tests/qemuxmlconfdata/channel-unix-source-path.x86_64-latest.a= rgs b/tests/qemuxmlconfdata/channel-unix-source-path.x86_64-latest.args index 845236d286..c6247fbad1 100644 --- a/tests/qemuxmlconfdata/channel-unix-source-path.x86_64-latest.args +++ b/tests/qemuxmlconfdata/channel-unix-source-path.x86_64-latest.args @@ -21,32 +21,32 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUG= uest1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ -boot 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":"0x2"}' \ --chardev socket,id=3Dcharchannel0,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharchannel0,fd=3DXXXXXXX,server=3Don,wait=3Doff \ -device '{"driver":"virtserialport","bus":"virtio-serial0.0","nr":1,"chard= ev":"charchannel0","id":"channel0","name":"org.qemu.guest_agent.0"}' \ --chardev socket,id=3Dcharchannel1,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharchannel1,fd=3DXXXXXXX,server=3Don,wait=3Doff \ -device '{"driver":"virtserialport","bus":"virtio-serial0.0","nr":2,"chard= ev":"charchannel1","id":"channel1","name":"org.qemu.guest_agent.1"}' \ --chardev socket,id=3Dcharchannel2,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharchannel2,fd=3DXXXXXXX,server=3Don,wait=3Doff \ -device '{"driver":"virtserialport","bus":"virtio-serial0.0","nr":3,"chard= ev":"charchannel2","id":"channel2","name":"org.qemu.guest_agent.2"}' \ --chardev socket,id=3Dcharchannel3,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharchannel3,fd=3DXXXXXXX,server=3Don,wait=3Doff \ -device '{"driver":"virtserialport","bus":"virtio-serial0.0","nr":4,"chard= ev":"charchannel3","id":"channel3","name":"org.qemu.guest_agent.3"}' \ --chardev socket,id=3Dcharchannel4,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharchannel4,fd=3DXXXXXXX,server=3Don,wait=3Doff \ -device '{"driver":"virtserialport","bus":"virtio-serial0.0","nr":5,"chard= ev":"charchannel4","id":"channel4","name":"org.qemu.guest_agent.4"}' \ --chardev socket,id=3Dcharchannel5,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharchannel5,fd=3DXXXXXXX,server=3Don,wait=3Doff \ -device '{"driver":"virtserialport","bus":"virtio-serial0.0","nr":6,"chard= ev":"charchannel5","id":"channel5","name":"org.qemu.guest_agent.5"}' \ --chardev socket,id=3Dcharchannel6,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharchannel6,fd=3DXXXXXXX,server=3Don,wait=3Doff \ -device '{"driver":"virtserialport","bus":"virtio-serial0.0","nr":7,"chard= ev":"charchannel6","id":"channel6","name":"org.qemu.guest_agent.6"}' \ --chardev socket,id=3Dcharchannel7,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharchannel7,fd=3DXXXXXXX,server=3Don,wait=3Doff \ -device '{"driver":"virtserialport","bus":"virtio-serial0.0","nr":8,"chard= ev":"charchannel7","id":"channel7","name":"org.qemu.guest_agent.7"}' \ --chardev socket,id=3Dcharchannel8,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharchannel8,fd=3DXXXXXXX,server=3Don,wait=3Doff \ -device '{"driver":"virtserialport","bus":"virtio-serial0.0","nr":9,"chard= ev":"charchannel8","id":"channel8","name":"org.qemu.guest_agent.8"}' \ --chardev socket,id=3Dcharchannel9,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharchannel9,fd=3DXXXXXXX,server=3Don,wait=3Doff \ -device '{"driver":"virtserialport","bus":"virtio-serial0.0","nr":10,"char= dev":"charchannel9","id":"channel9","name":"org.qemu.guest_agent.9"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ diff --git a/tests/qemuxmlconfdata/channel-virtio-auto.x86_64-latest.args b= /tests/qemuxmlconfdata/channel-virtio-auto.x86_64-latest.args index 1b223fe845..522c135e1e 100644 --- a/tests/qemuxmlconfdata/channel-virtio-auto.x86_64-latest.args +++ b/tests/qemuxmlconfdata/channel-virtio-auto.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/channel-virtio-autoadd.x86_64-latest.arg= s b/tests/qemuxmlconfdata/channel-virtio-autoadd.x86_64-latest.args index 2e6b1d9dbc..30f65ade74 100644 --- a/tests/qemuxmlconfdata/channel-virtio-autoadd.x86_64-latest.args +++ b/tests/qemuxmlconfdata/channel-virtio-autoadd.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/channel-virtio-autoassign.x86_64-latest.= args b/tests/qemuxmlconfdata/channel-virtio-autoassign.x86_64-latest.args index ad1a195275..1d01bb5791 100644 --- a/tests/qemuxmlconfdata/channel-virtio-autoassign.x86_64-latest.args +++ b/tests/qemuxmlconfdata/channel-virtio-autoassign.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/channel-virtio-default.x86_64-latest.arg= s b/tests/qemuxmlconfdata/channel-virtio-default.x86_64-latest.args index d952e629f2..4fb74a595d 100644 --- a/tests/qemuxmlconfdata/channel-virtio-default.x86_64-latest.args +++ b/tests/qemuxmlconfdata/channel-virtio-default.x86_64-latest.args @@ -20,7 +20,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/channel-virtio-state.x86_64-latest.args = b/tests/qemuxmlconfdata/channel-virtio-state.x86_64-latest.args index e3dd3add7d..c655cb04a8 100644 --- a/tests/qemuxmlconfdata/channel-virtio-state.x86_64-latest.args +++ b/tests/qemuxmlconfdata/channel-virtio-state.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/channel-virtio-unix.x86_64-latest.args b= /tests/qemuxmlconfdata/channel-virtio-unix.x86_64-latest.args index 2f8c4b6a55..70d4e0cfc5 100644 --- a/tests/qemuxmlconfdata/channel-virtio-unix.x86_64-latest.args +++ b/tests/qemuxmlconfdata/channel-virtio-unix.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ @@ -31,13 +31,13 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUG= uest1/.config \ -device '{"driver":"virtio-serial-pci","id":"virtio-serial1","bus":"pci.0"= ,"addr":"0xa"}' \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","read-only":false}' \ -device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-stor= age","id":"ide0-0-0","bootindex":1}' \ --chardev socket,id=3Dcharchannel0,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharchannel0,fd=3DXXXXXXX,server=3Don,wait=3Doff \ -device '{"driver":"virtserialport","bus":"virtio-serial0.0","nr":1,"chard= ev":"charchannel0","id":"channel0","name":"org.qemu.guest_agent.0"}' \ --chardev socket,id=3Dcharchannel1,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharchannel1,fd=3DXXXXXXX,server=3Don,wait=3Doff \ -device '{"driver":"virtserialport","bus":"virtio-serial0.0","nr":2,"chard= ev":"charchannel1","id":"channel1"}' \ --chardev socket,id=3Dcharchannel2,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharchannel2,fd=3DXXXXXXX,server=3Don,wait=3Doff \ -device '{"driver":"virtserialport","bus":"virtio-serial0.0","nr":3,"chard= ev":"charchannel2","id":"channel2","name":"ble"}' \ --chardev socket,id=3Dcharchannel3,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharchannel3,fd=3DXXXXXXX,server=3Don,wait=3Doff \ -device '{"driver":"virtserialport","bus":"virtio-serial0.0","nr":4,"chard= ev":"charchannel3","id":"channel3","name":"fdsa"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ diff --git a/tests/qemuxmlconfdata/channel-virtio.x86_64-latest.args b/test= s/qemuxmlconfdata/channel-virtio.x86_64-latest.args index c402b515dd..8e4aa1c5cc 100644 --- a/tests/qemuxmlconfdata/channel-virtio.x86_64-latest.args +++ b/tests/qemuxmlconfdata/channel-virtio.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/chardev-backends-json.x86_64-9.1.0.args = b/tests/qemuxmlconfdata/chardev-backends-json.x86_64-9.1.0.args index a363549b81..ea08a0b651 100644 --- a/tests/qemuxmlconfdata/chardev-backends-json.x86_64-9.1.0.args +++ b/tests/qemuxmlconfdata/chardev-backends-json.x86_64-9.1.0.args @@ -20,7 +20,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -no-user-config \ -nodefaults \ --chardev '{"id":"charmonitor","backend":{"type":"socket","data":{"addr":{"= type":"fd","data":{"str":"1729"}},"server":true,"wait":false}}}' \ +-chardev '{"id":"charmonitor","backend":{"type":"socket","data":{"addr":{"= type":"fd","data":{"str":"@mon-fd@"}},"server":true,"wait":false}}}' \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ @@ -46,7 +46,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -device '{"driver":"virtserialport","bus":"virtio-serial0.0","nr":6,"chard= ev":"charchannel5","id":"channel5","name":"chardev-pipe"}' \ -chardev '{"id":"charchannel6","backend":{"type":"serial","data":{"device"= :"/path/to/device"}}}' \ -device '{"driver":"virtserialport","bus":"virtio-serial0.0","nr":7,"chard= ev":"charchannel6","id":"channel6","name":"chardev-dev"}' \ --chardev '{"id":"charchannel7","backend":{"type":"socket","data":{"addr":{= "type":"fd","data":{"str":"1729"}},"server":true,"wait":false}}}' \ +-chardev '{"id":"charchannel7","backend":{"type":"socket","data":{"addr":{= "type":"fd","data":{"str":"XXXXXXX"}},"server":true,"wait":false}}}' \ -device '{"driver":"virtserialport","bus":"virtio-serial0.0","nr":8,"chard= ev":"charchannel7","id":"channel7","name":"chardev-unix-listen"}' \ -chardev '{"id":"charchannel8","backend":{"type":"socket","data":{"addr":{= "type":"unix","data":{"path":"/path/to/unix-listen"}},"server":false,"recon= nect":2}}}' \ -device '{"driver":"virtserialport","bus":"virtio-serial0.0","nr":9,"chard= ev":"charchannel8","id":"channel8","name":"chardev-unix-connect"}' \ diff --git a/tests/qemuxmlconfdata/chardev-backends-json.x86_64-latest.args= b/tests/qemuxmlconfdata/chardev-backends-json.x86_64-latest.args index 43a56f7c22..b52e836f1f 100644 --- a/tests/qemuxmlconfdata/chardev-backends-json.x86_64-latest.args +++ b/tests/qemuxmlconfdata/chardev-backends-json.x86_64-latest.args @@ -20,7 +20,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -no-user-config \ -nodefaults \ --chardev '{"id":"charmonitor","backend":{"type":"socket","data":{"addr":{"= type":"fd","data":{"str":"1729"}},"server":true,"wait":false}}}' \ +-chardev '{"id":"charmonitor","backend":{"type":"socket","data":{"addr":{"= type":"fd","data":{"str":"@mon-fd@"}},"server":true,"wait":false}}}' \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ @@ -46,7 +46,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -device '{"driver":"virtserialport","bus":"virtio-serial0.0","nr":6,"chard= ev":"charchannel5","id":"channel5","name":"chardev-pipe"}' \ -chardev '{"id":"charchannel6","backend":{"type":"serial","data":{"device"= :"/path/to/device"}}}' \ -device '{"driver":"virtserialport","bus":"virtio-serial0.0","nr":7,"chard= ev":"charchannel6","id":"channel6","name":"chardev-dev"}' \ --chardev '{"id":"charchannel7","backend":{"type":"socket","data":{"addr":{= "type":"fd","data":{"str":"1729"}},"server":true,"wait":false}}}' \ +-chardev '{"id":"charchannel7","backend":{"type":"socket","data":{"addr":{= "type":"fd","data":{"str":"XXXXXXX"}},"server":true,"wait":false}}}' \ -device '{"driver":"virtserialport","bus":"virtio-serial0.0","nr":8,"chard= ev":"charchannel7","id":"channel7","name":"chardev-unix-listen"}' \ -chardev '{"id":"charchannel8","backend":{"type":"socket","data":{"addr":{= "type":"unix","data":{"path":"/path/to/unix-listen"}},"server":false,"recon= nect-ms":2000}}}' \ -device '{"driver":"virtserialport","bus":"virtio-serial0.0","nr":9,"chard= ev":"charchannel8","id":"channel8","name":"chardev-unix-connect"}' \ diff --git a/tests/qemuxmlconfdata/chardev-backends.x86_64-9.1.0.args b/tes= ts/qemuxmlconfdata/chardev-backends.x86_64-9.1.0.args index 4d8511a95f..578fbc5d96 100644 --- a/tests/qemuxmlconfdata/chardev-backends.x86_64-9.1.0.args +++ b/tests/qemuxmlconfdata/chardev-backends.x86_64-9.1.0.args @@ -20,7 +20,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ @@ -46,7 +46,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -device '{"driver":"virtserialport","bus":"virtio-serial0.0","nr":6,"chard= ev":"charchannel5","id":"channel5","name":"chardev-pipe"}' \ -chardev serial,id=3Dcharchannel6,path=3D/path/to/device \ -device '{"driver":"virtserialport","bus":"virtio-serial0.0","nr":7,"chard= ev":"charchannel6","id":"channel6","name":"chardev-dev"}' \ --chardev socket,id=3Dcharchannel7,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharchannel7,fd=3DXXXXXXX,server=3Don,wait=3Doff \ -device '{"driver":"virtserialport","bus":"virtio-serial0.0","nr":8,"chard= ev":"charchannel7","id":"channel7","name":"chardev-unix-listen"}' \ -chardev socket,id=3Dcharchannel8,path=3D/path/to/unix-listen,reconnect=3D= 2 \ -device '{"driver":"virtserialport","bus":"virtio-serial0.0","nr":9,"chard= ev":"charchannel8","id":"channel8","name":"chardev-unix-connect"}' \ diff --git a/tests/qemuxmlconfdata/chardev-backends.x86_64-latest.args b/te= sts/qemuxmlconfdata/chardev-backends.x86_64-latest.args index bd5af10bb7..61ec4fac66 100644 --- a/tests/qemuxmlconfdata/chardev-backends.x86_64-latest.args +++ b/tests/qemuxmlconfdata/chardev-backends.x86_64-latest.args @@ -20,7 +20,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ @@ -46,7 +46,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -device '{"driver":"virtserialport","bus":"virtio-serial0.0","nr":6,"chard= ev":"charchannel5","id":"channel5","name":"chardev-pipe"}' \ -chardev serial,id=3Dcharchannel6,path=3D/path/to/device \ -device '{"driver":"virtserialport","bus":"virtio-serial0.0","nr":7,"chard= ev":"charchannel6","id":"channel6","name":"chardev-dev"}' \ --chardev socket,id=3Dcharchannel7,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharchannel7,fd=3DXXXXXXX,server=3Don,wait=3Doff \ -device '{"driver":"virtserialport","bus":"virtio-serial0.0","nr":8,"chard= ev":"charchannel7","id":"channel7","name":"chardev-unix-listen"}' \ -chardev socket,id=3Dcharchannel8,path=3D/path/to/unix-listen,reconnect-ms= =3D2000 \ -device '{"driver":"virtserialport","bus":"virtio-serial0.0","nr":9,"chard= ev":"charchannel8","id":"channel8","name":"chardev-unix-connect"}' \ diff --git a/tests/qemuxmlconfdata/chardev-label.x86_64-latest.args b/tests= /qemuxmlconfdata/chardev-label.x86_64-latest.args index b3c79cfd18..2c721abf3b 100644 --- a/tests/qemuxmlconfdata/chardev-label.x86_64-latest.args +++ b/tests/qemuxmlconfdata/chardev-label.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-machine= /.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/chardev-reconnect.x86_64-9.1.0.args b/te= sts/qemuxmlconfdata/chardev-reconnect.x86_64-9.1.0.args index 93a0fbbe74..fb8c2b5a5a 100644 --- a/tests/qemuxmlconfdata/chardev-reconnect.x86_64-9.1.0.args +++ b/tests/qemuxmlconfdata/chardev-reconnect.x86_64-9.1.0.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/chardev-reconnect.x86_64-latest.args b/t= ests/qemuxmlconfdata/chardev-reconnect.x86_64-latest.args index 7ff6a67bc4..e71229f173 100644 --- a/tests/qemuxmlconfdata/chardev-reconnect.x86_64-latest.args +++ b/tests/qemuxmlconfdata/chardev-reconnect.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/clock-absolute.x86_64-latest.args b/test= s/qemuxmlconfdata/clock-absolute.x86_64-latest.args index f46415b903..3b1b19b590 100644 --- a/tests/qemuxmlconfdata/clock-absolute.x86_64-latest.args +++ b/tests/qemuxmlconfdata/clock-absolute.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3D9999-12-31T23:59:59 \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/clock-catchup.x86_64-latest.args b/tests= /qemuxmlconfdata/clock-catchup.x86_64-latest.args index c1191ba50a..519991d238 100644 --- a/tests/qemuxmlconfdata/clock-catchup.x86_64-latest.args +++ b/tests/qemuxmlconfdata/clock-catchup.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc,driftfix=3Dslew \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/clock-france.x86_64-latest.args b/tests/= qemuxmlconfdata/clock-france.x86_64-latest.args index d8a5cf89b2..3b56c13745 100644 --- a/tests/qemuxmlconfdata/clock-france.x86_64-latest.args +++ b/tests/qemuxmlconfdata/clock-france.x86_64-latest.args @@ -22,7 +22,7 @@ TZ=3DEurope/Paris \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dlocaltime \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/clock-hpet-off.x86_64-7.2.0.args b/tests= /qemuxmlconfdata/clock-hpet-off.x86_64-7.2.0.args index 47bff8d51c..d7658a989a 100644 --- a/tests/qemuxmlconfdata/clock-hpet-off.x86_64-7.2.0.args +++ b/tests/qemuxmlconfdata/clock-hpet-off.x86_64-7.2.0.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc,driftfix=3Dslew \ -global kvm-pit.lost_tick_policy=3Ddelay \ diff --git a/tests/qemuxmlconfdata/clock-hpet-off.x86_64-latest.args b/test= s/qemuxmlconfdata/clock-hpet-off.x86_64-latest.args index 8b9b2cf1c3..1a277c5212 100644 --- a/tests/qemuxmlconfdata/clock-hpet-off.x86_64-latest.args +++ b/tests/qemuxmlconfdata/clock-hpet-off.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc,driftfix=3Dslew \ -global kvm-pit.lost_tick_policy=3Ddelay \ diff --git a/tests/qemuxmlconfdata/clock-localtime-basis-localtime.x86_64-l= atest.args b/tests/qemuxmlconfdata/clock-localtime-basis-localtime.x86_64-l= atest.args index 617b31aea6..30372e7c13 100644 --- a/tests/qemuxmlconfdata/clock-localtime-basis-localtime.x86_64-latest.a= rgs +++ b/tests/qemuxmlconfdata/clock-localtime-basis-localtime.x86_64-latest.a= rgs @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3D2009-02-14T00:01:30 \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/clock-localtime.x86_64-latest.args b/tes= ts/qemuxmlconfdata/clock-localtime.x86_64-latest.args index eb66aadb79..f6dd582eff 100644 --- a/tests/qemuxmlconfdata/clock-localtime.x86_64-latest.args +++ b/tests/qemuxmlconfdata/clock-localtime.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dlocaltime \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/clock-realtime.x86_64-latest.args b/test= s/qemuxmlconfdata/clock-realtime.x86_64-latest.args index d95b17493b..002c1b5b9e 100644 --- a/tests/qemuxmlconfdata/clock-realtime.x86_64-latest.args +++ b/tests/qemuxmlconfdata/clock-realtime.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc,clock=3Drt \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/clock-timer-armvtimer.aarch64-latest.arg= s b/tests/qemuxmlconfdata/clock-timer-armvtimer.aarch64-latest.args index 940a83a03d..53030f00b0 100644 --- a/tests/qemuxmlconfdata/clock-timer-armvtimer.aarch64-latest.args +++ b/tests/qemuxmlconfdata/clock-timer-armvtimer.aarch64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/clock-timer-hyperv-rtc.x86_64-latest.arg= s b/tests/qemuxmlconfdata/clock-timer-hyperv-rtc.x86_64-latest.args index c85a433da0..ac6a75cb5c 100644 --- a/tests/qemuxmlconfdata/clock-timer-hyperv-rtc.x86_64-latest.args +++ b/tests/qemuxmlconfdata/clock-timer-hyperv-rtc.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/clock-utc.x86_64-latest.args b/tests/qem= uxmlconfdata/clock-utc.x86_64-latest.args index 9493ded1c7..d59f1717d9 100644 --- a/tests/qemuxmlconfdata/clock-utc.x86_64-latest.args +++ b/tests/qemuxmlconfdata/clock-utc.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/clock-variable.x86_64-latest.args b/test= s/qemuxmlconfdata/clock-variable.x86_64-latest.args index 338db8d409..473a778b55 100644 --- a/tests/qemuxmlconfdata/clock-variable.x86_64-latest.args +++ b/tests/qemuxmlconfdata/clock-variable.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3D2009-02-15T09:49:06 \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/console-compat-auto.x86_64-latest.args b= /tests/qemuxmlconfdata/console-compat-auto.x86_64-latest.args index 8b128669d1..b49d6ed233 100644 --- a/tests/qemuxmlconfdata/console-compat-auto.x86_64-latest.args +++ b/tests/qemuxmlconfdata/console-compat-auto.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/console-compat-chardev.x86_64-latest.arg= s b/tests/qemuxmlconfdata/console-compat-chardev.x86_64-latest.args index 8b128669d1..b49d6ed233 100644 --- a/tests/qemuxmlconfdata/console-compat-chardev.x86_64-latest.args +++ b/tests/qemuxmlconfdata/console-compat-chardev.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/console-compat-crash.x86_64-latest.args = b/tests/qemuxmlconfdata/console-compat-crash.x86_64-latest.args index 3738d252a4..01fbbc8729 100644 --- a/tests/qemuxmlconfdata/console-compat-crash.x86_64-latest.args +++ b/tests/qemuxmlconfdata/console-compat-crash.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-D/.conf= ig \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/console-compat.x86_64-latest.args b/test= s/qemuxmlconfdata/console-compat.x86_64-latest.args index 1ea5610b58..5aa8e55ab8 100644 --- a/tests/qemuxmlconfdata/console-compat.x86_64-latest.args +++ b/tests/qemuxmlconfdata/console-compat.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/console-compat2.x86_64-latest.args b/tes= ts/qemuxmlconfdata/console-compat2.x86_64-latest.args index 6e59ee81f2..20361c86ed 100644 --- a/tests/qemuxmlconfdata/console-compat2.x86_64-latest.args +++ b/tests/qemuxmlconfdata/console-compat2.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/console-sclp.s390x-latest.args b/tests/q= emuxmlconfdata/console-sclp.s390x-latest.args index 09c0df6954..a4ec642377 100644 --- a/tests/qemuxmlconfdata/console-sclp.s390x-latest.args +++ b/tests/qemuxmlconfdata/console-sclp.s390x-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/console-virtio-ccw.s390x-latest.args b/t= ests/qemuxmlconfdata/console-virtio-ccw.s390x-latest.args index 547243529a..ce86f9043b 100644 --- a/tests/qemuxmlconfdata/console-virtio-ccw.s390x-latest.args +++ b/tests/qemuxmlconfdata/console-virtio-ccw.s390x-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/console-virtio-many.x86_64-latest.args b= /tests/qemuxmlconfdata/console-virtio-many.x86_64-latest.args index d0536011ec..48842c863b 100644 --- a/tests/qemuxmlconfdata/console-virtio-many.x86_64-latest.args +++ b/tests/qemuxmlconfdata/console-virtio-many.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/console-virtio-serial-autoassign-address= .x86_64-latest.args b/tests/qemuxmlconfdata/console-virtio-serial-autoassig= n-address.x86_64-latest.args index 8070b3e2af..0c88619892 100644 --- a/tests/qemuxmlconfdata/console-virtio-serial-autoassign-address.x86_64= -latest.args +++ b/tests/qemuxmlconfdata/console-virtio-serial-autoassign-address.x86_64= -latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/console-virtio-unix.x86_64-latest.args b= /tests/qemuxmlconfdata/console-virtio-unix.x86_64-latest.args index cd91e93e8d..9925ad4230 100644 --- a/tests/qemuxmlconfdata/console-virtio-unix.x86_64-latest.args +++ b/tests/qemuxmlconfdata/console-virtio-unix.x86_64-latest.args @@ -21,14 +21,14 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUG= uest1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ -boot 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":"0x2"}' \ --chardev socket,id=3Dcharconsole0,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharconsole0,fd=3DXXXXXXX,server=3Don,wait=3Doff \ -device '{"driver":"virtconsole","chardev":"charconsole0","id":"console0"}= ' \ -chardev socket,id=3Dcharconsole1,path=3D/tmp/connect.socket \ -device '{"driver":"virtconsole","chardev":"charconsole1","id":"console1"}= ' \ diff --git a/tests/qemuxmlconfdata/console-virtio.x86_64-latest.args b/test= s/qemuxmlconfdata/console-virtio.x86_64-latest.args index 9bde4b53b1..0d77888a65 100644 --- a/tests/qemuxmlconfdata/console-virtio.x86_64-latest.args +++ b/tests/qemuxmlconfdata/console-virtio.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/controller-order.x86_64-latest.args b/te= sts/qemuxmlconfdata/controller-order.x86_64-latest.args index a052f4fb8f..87cae5c6bf 100644 --- a/tests/qemuxmlconfdata/controller-order.x86_64-latest.args +++ b/tests/qemuxmlconfdata/controller-order.x86_64-latest.args @@ -20,7 +20,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-fdr/.co= nfig \ -uuid d091ea82-29e6-2e34-3005-f02617b36e87 \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/controller-scsi-auto.x86_64-latest.args = b/tests/qemuxmlconfdata/controller-scsi-auto.x86_64-latest.args index 9283d9ab19..210189306f 100644 --- a/tests/qemuxmlconfdata/controller-scsi-auto.x86_64-latest.args +++ b/tests/qemuxmlconfdata/controller-scsi-auto.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/controller-usb-order.x86_64-latest.args = b/tests/qemuxmlconfdata/controller-usb-order.x86_64-latest.args index cdfa9dd447..3ad0b16b7b 100644 --- a/tests/qemuxmlconfdata/controller-usb-order.x86_64-latest.args +++ b/tests/qemuxmlconfdata/controller-usb-order.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-rhel7/.= config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/controller-virtio-scsi.x86_64-latest.arg= s b/tests/qemuxmlconfdata/controller-virtio-scsi.x86_64-latest.args index e7f7c2819b..93b14f58aa 100644 --- a/tests/qemuxmlconfdata/controller-virtio-scsi.x86_64-latest.args +++ b/tests/qemuxmlconfdata/controller-virtio-scsi.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/cpu-Haswell-noTSX.x86_64-latest.args b/t= ests/qemuxmlconfdata/cpu-Haswell-noTSX.x86_64-latest.args index 41e7045dad..26f22eb8e9 100644 --- a/tests/qemuxmlconfdata/cpu-Haswell-noTSX.x86_64-latest.args +++ b/tests/qemuxmlconfdata/cpu-Haswell-noTSX.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/cpu-Haswell.x86_64-latest.args b/tests/q= emuxmlconfdata/cpu-Haswell.x86_64-latest.args index bfbb2d8700..48e1f4a085 100644 --- a/tests/qemuxmlconfdata/cpu-Haswell.x86_64-latest.args +++ b/tests/qemuxmlconfdata/cpu-Haswell.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/cpu-Haswell2.x86_64-latest.args b/tests/= qemuxmlconfdata/cpu-Haswell2.x86_64-latest.args index 84e9e86127..788e038354 100644 --- a/tests/qemuxmlconfdata/cpu-Haswell2.x86_64-latest.args +++ b/tests/qemuxmlconfdata/cpu-Haswell2.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/cpu-Haswell3.x86_64-latest.args b/tests/= qemuxmlconfdata/cpu-Haswell3.x86_64-latest.args index 4c2cdf0484..b221c5a612 100644 --- a/tests/qemuxmlconfdata/cpu-Haswell3.x86_64-latest.args +++ b/tests/qemuxmlconfdata/cpu-Haswell3.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/cpu-Icelake-Server-pconfig.x86_64-latest= .args b/tests/qemuxmlconfdata/cpu-Icelake-Server-pconfig.x86_64-latest.args index dc4a503dba..c1b4e7561e 100644 --- a/tests/qemuxmlconfdata/cpu-Icelake-Server-pconfig.x86_64-latest.args +++ b/tests/qemuxmlconfdata/cpu-Icelake-Server-pconfig.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-test/.c= onfig \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/cpu-cache-disable.x86_64-latest.args b/t= ests/qemuxmlconfdata/cpu-cache-disable.x86_64-latest.args index f4b2fc51d6..958bf65bfc 100644 --- a/tests/qemuxmlconfdata/cpu-cache-disable.x86_64-latest.args +++ b/tests/qemuxmlconfdata/cpu-cache-disable.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-foo/.co= nfig \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/cpu-cache-disable3.x86_64-latest.args b/= tests/qemuxmlconfdata/cpu-cache-disable3.x86_64-latest.args index 1e962589c9..1d2da8ae95 100644 --- a/tests/qemuxmlconfdata/cpu-cache-disable3.x86_64-latest.args +++ b/tests/qemuxmlconfdata/cpu-cache-disable3.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-foo/.co= nfig \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/cpu-cache-emulate-l3.x86_64-latest.args = b/tests/qemuxmlconfdata/cpu-cache-emulate-l3.x86_64-latest.args index 15ca76b6ab..bcd8fdc5b7 100644 --- a/tests/qemuxmlconfdata/cpu-cache-emulate-l3.x86_64-latest.args +++ b/tests/qemuxmlconfdata/cpu-cache-emulate-l3.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-foo/.co= nfig \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/cpu-cache-passthrough.x86_64-latest.args= b/tests/qemuxmlconfdata/cpu-cache-passthrough.x86_64-latest.args index 90261c5e5a..b09a5aa8b6 100644 --- a/tests/qemuxmlconfdata/cpu-cache-passthrough.x86_64-latest.args +++ b/tests/qemuxmlconfdata/cpu-cache-passthrough.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-foo/.co= nfig \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/cpu-check-default-none.x86_64-latest.arg= s b/tests/qemuxmlconfdata/cpu-check-default-none.x86_64-latest.args index 2f81053374..a0b72ec7c2 100644 --- a/tests/qemuxmlconfdata/cpu-check-default-none.x86_64-latest.args +++ b/tests/qemuxmlconfdata/cpu-check-default-none.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/cpu-check-default-none2.x86_64-latest.ar= gs b/tests/qemuxmlconfdata/cpu-check-default-none2.x86_64-latest.args index 3de38f2a61..e08ed48c1e 100644 --- a/tests/qemuxmlconfdata/cpu-check-default-none2.x86_64-latest.args +++ b/tests/qemuxmlconfdata/cpu-check-default-none2.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/cpu-check-default-partial.x86_64-latest.= args b/tests/qemuxmlconfdata/cpu-check-default-partial.x86_64-latest.args index fe553fd31b..08048c9f29 100644 --- a/tests/qemuxmlconfdata/cpu-check-default-partial.x86_64-latest.args +++ b/tests/qemuxmlconfdata/cpu-check-default-partial.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/cpu-check-default-partial2.x86_64-latest= .args b/tests/qemuxmlconfdata/cpu-check-default-partial2.x86_64-latest.args index a0cbbdd040..c65d9fe085 100644 --- a/tests/qemuxmlconfdata/cpu-check-default-partial2.x86_64-latest.args +++ b/tests/qemuxmlconfdata/cpu-check-default-partial2.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/cpu-check-none.x86_64-latest.args b/test= s/qemuxmlconfdata/cpu-check-none.x86_64-latest.args index a0cbbdd040..c65d9fe085 100644 --- a/tests/qemuxmlconfdata/cpu-check-none.x86_64-latest.args +++ b/tests/qemuxmlconfdata/cpu-check-none.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/cpu-empty.x86_64-latest.args b/tests/qem= uxmlconfdata/cpu-empty.x86_64-latest.args index 46bc2fe37a..ad33e4bec9 100644 --- a/tests/qemuxmlconfdata/cpu-empty.x86_64-latest.args +++ b/tests/qemuxmlconfdata/cpu-empty.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-cpu-emp= ty/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/cpu-eoi-disabled.x86_64-latest.args b/te= sts/qemuxmlconfdata/cpu-eoi-disabled.x86_64-latest.args index 34d81afdf7..e56f11d838 100644 --- a/tests/qemuxmlconfdata/cpu-eoi-disabled.x86_64-latest.args +++ b/tests/qemuxmlconfdata/cpu-eoi-disabled.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/cpu-eoi-enabled.x86_64-latest.args b/tes= ts/qemuxmlconfdata/cpu-eoi-enabled.x86_64-latest.args index 5a9313be11..fca96ce4e4 100644 --- a/tests/qemuxmlconfdata/cpu-eoi-enabled.x86_64-latest.args +++ b/tests/qemuxmlconfdata/cpu-eoi-enabled.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/cpu-exact1.x86_64-latest.args b/tests/qe= muxmlconfdata/cpu-exact1.x86_64-latest.args index bdc50b229f..5de6937548 100644 --- a/tests/qemuxmlconfdata/cpu-exact1.x86_64-latest.args +++ b/tests/qemuxmlconfdata/cpu-exact1.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/cpu-exact2-nofallback.x86_64-latest.args= b/tests/qemuxmlconfdata/cpu-exact2-nofallback.x86_64-latest.args index 7464609aba..51bf31b41a 100644 --- a/tests/qemuxmlconfdata/cpu-exact2-nofallback.x86_64-latest.args +++ b/tests/qemuxmlconfdata/cpu-exact2-nofallback.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/cpu-exact2.x86_64-latest.args b/tests/qe= muxmlconfdata/cpu-exact2.x86_64-latest.args index 7464609aba..51bf31b41a 100644 --- a/tests/qemuxmlconfdata/cpu-exact2.x86_64-latest.args +++ b/tests/qemuxmlconfdata/cpu-exact2.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/cpu-fallback.x86_64-8.0.0.args b/tests/q= emuxmlconfdata/cpu-fallback.x86_64-8.0.0.args index b0ce1dfcbd..94e4add6f6 100644 --- a/tests/qemuxmlconfdata/cpu-fallback.x86_64-8.0.0.args +++ b/tests/qemuxmlconfdata/cpu-fallback.x86_64-8.0.0.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/cpu-host-kvmclock.x86_64-latest.args b/t= ests/qemuxmlconfdata/cpu-host-kvmclock.x86_64-latest.args index 4201ea331c..51ccf7a7e2 100644 --- a/tests/qemuxmlconfdata/cpu-host-kvmclock.x86_64-latest.args +++ b/tests/qemuxmlconfdata/cpu-host-kvmclock.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/cpu-host-model-cmt.x86_64-latest.args b/= tests/qemuxmlconfdata/cpu-host-model-cmt.x86_64-latest.args index d6b57d40a3..1aaa804464 100644 --- a/tests/qemuxmlconfdata/cpu-host-model-cmt.x86_64-latest.args +++ b/tests/qemuxmlconfdata/cpu-host-model-cmt.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/cpu-host-model-fallback-kvm.x86_64-10.0.= 0.args b/tests/qemuxmlconfdata/cpu-host-model-fallback-kvm.x86_64-10.0.0.ar= gs index 08f37274b2..03030406a6 100644 --- a/tests/qemuxmlconfdata/cpu-host-model-fallback-kvm.x86_64-10.0.0.args +++ b/tests/qemuxmlconfdata/cpu-host-model-fallback-kvm.x86_64-10.0.0.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/cpu-host-model-fallback-kvm.x86_64-10.1.= 0.args b/tests/qemuxmlconfdata/cpu-host-model-fallback-kvm.x86_64-10.1.0.ar= gs index e4044a0c64..4d3567df5f 100644 --- a/tests/qemuxmlconfdata/cpu-host-model-fallback-kvm.x86_64-10.1.0.args +++ b/tests/qemuxmlconfdata/cpu-host-model-fallback-kvm.x86_64-10.1.0.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/cpu-host-model-fallback-kvm.x86_64-10.2.= 0.args b/tests/qemuxmlconfdata/cpu-host-model-fallback-kvm.x86_64-10.2.0.ar= gs index 309dc80244..f48ad3bba8 100644 --- a/tests/qemuxmlconfdata/cpu-host-model-fallback-kvm.x86_64-10.2.0.args +++ b/tests/qemuxmlconfdata/cpu-host-model-fallback-kvm.x86_64-10.2.0.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/cpu-host-model-fallback-kvm.x86_64-11.0.= 0.args b/tests/qemuxmlconfdata/cpu-host-model-fallback-kvm.x86_64-11.0.0.ar= gs index 9b336f1bfb..6156109c24 100644 --- a/tests/qemuxmlconfdata/cpu-host-model-fallback-kvm.x86_64-11.0.0.args +++ b/tests/qemuxmlconfdata/cpu-host-model-fallback-kvm.x86_64-11.0.0.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/cpu-host-model-fallback-kvm.x86_64-7.2.0= .args b/tests/qemuxmlconfdata/cpu-host-model-fallback-kvm.x86_64-7.2.0.args index 5d69199876..abaa5c4e64 100644 --- a/tests/qemuxmlconfdata/cpu-host-model-fallback-kvm.x86_64-7.2.0.args +++ b/tests/qemuxmlconfdata/cpu-host-model-fallback-kvm.x86_64-7.2.0.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/cpu-host-model-fallback-kvm.x86_64-8.0.0= .args b/tests/qemuxmlconfdata/cpu-host-model-fallback-kvm.x86_64-8.0.0.args index e7b424819e..bac3b0b155 100644 --- a/tests/qemuxmlconfdata/cpu-host-model-fallback-kvm.x86_64-8.0.0.args +++ b/tests/qemuxmlconfdata/cpu-host-model-fallback-kvm.x86_64-8.0.0.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/cpu-host-model-fallback-kvm.x86_64-8.1.0= .args b/tests/qemuxmlconfdata/cpu-host-model-fallback-kvm.x86_64-8.1.0.args index 58ad565dba..8dd87918ff 100644 --- a/tests/qemuxmlconfdata/cpu-host-model-fallback-kvm.x86_64-8.1.0.args +++ b/tests/qemuxmlconfdata/cpu-host-model-fallback-kvm.x86_64-8.1.0.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/cpu-host-model-fallback-kvm.x86_64-8.2.0= .args b/tests/qemuxmlconfdata/cpu-host-model-fallback-kvm.x86_64-8.2.0.args index fa1b674fa5..476d68f43d 100644 --- a/tests/qemuxmlconfdata/cpu-host-model-fallback-kvm.x86_64-8.2.0.args +++ b/tests/qemuxmlconfdata/cpu-host-model-fallback-kvm.x86_64-8.2.0.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/cpu-host-model-fallback-kvm.x86_64-9.0.0= .args b/tests/qemuxmlconfdata/cpu-host-model-fallback-kvm.x86_64-9.0.0.args index fc9985f901..ad9ef97cb9 100644 --- a/tests/qemuxmlconfdata/cpu-host-model-fallback-kvm.x86_64-9.0.0.args +++ b/tests/qemuxmlconfdata/cpu-host-model-fallback-kvm.x86_64-9.0.0.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/cpu-host-model-fallback-kvm.x86_64-9.1.0= .args b/tests/qemuxmlconfdata/cpu-host-model-fallback-kvm.x86_64-9.1.0.args index 1db86cb31e..72e4ec78d6 100644 --- a/tests/qemuxmlconfdata/cpu-host-model-fallback-kvm.x86_64-9.1.0.args +++ b/tests/qemuxmlconfdata/cpu-host-model-fallback-kvm.x86_64-9.1.0.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/cpu-host-model-fallback-kvm.x86_64-9.2.0= .args b/tests/qemuxmlconfdata/cpu-host-model-fallback-kvm.x86_64-9.2.0.args index 4dcd9332cb..d55c0ae2b2 100644 --- a/tests/qemuxmlconfdata/cpu-host-model-fallback-kvm.x86_64-9.2.0.args +++ b/tests/qemuxmlconfdata/cpu-host-model-fallback-kvm.x86_64-9.2.0.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/cpu-host-model-fallback-kvm.x86_64-lates= t.args b/tests/qemuxmlconfdata/cpu-host-model-fallback-kvm.x86_64-latest.ar= gs index 9b336f1bfb..6156109c24 100644 --- a/tests/qemuxmlconfdata/cpu-host-model-fallback-kvm.x86_64-latest.args +++ b/tests/qemuxmlconfdata/cpu-host-model-fallback-kvm.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/cpu-host-model-fallback-tcg.x86_64-10.0.= 0.args b/tests/qemuxmlconfdata/cpu-host-model-fallback-tcg.x86_64-10.0.0.ar= gs index 96c0676ff3..eeb5f996bd 100644 --- a/tests/qemuxmlconfdata/cpu-host-model-fallback-tcg.x86_64-10.0.0.args +++ b/tests/qemuxmlconfdata/cpu-host-model-fallback-tcg.x86_64-10.0.0.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/cpu-host-model-fallback-tcg.x86_64-10.1.= 0.args b/tests/qemuxmlconfdata/cpu-host-model-fallback-tcg.x86_64-10.1.0.ar= gs index 0b67c7f158..c6129599bf 100644 --- a/tests/qemuxmlconfdata/cpu-host-model-fallback-tcg.x86_64-10.1.0.args +++ b/tests/qemuxmlconfdata/cpu-host-model-fallback-tcg.x86_64-10.1.0.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/cpu-host-model-fallback-tcg.x86_64-10.2.= 0.args b/tests/qemuxmlconfdata/cpu-host-model-fallback-tcg.x86_64-10.2.0.ar= gs index 4daf8c40c4..c9fca6aaaa 100644 --- a/tests/qemuxmlconfdata/cpu-host-model-fallback-tcg.x86_64-10.2.0.args +++ b/tests/qemuxmlconfdata/cpu-host-model-fallback-tcg.x86_64-10.2.0.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/cpu-host-model-fallback-tcg.x86_64-11.0.= 0.args b/tests/qemuxmlconfdata/cpu-host-model-fallback-tcg.x86_64-11.0.0.ar= gs index 443de62f69..355bfc698f 100644 --- a/tests/qemuxmlconfdata/cpu-host-model-fallback-tcg.x86_64-11.0.0.args +++ b/tests/qemuxmlconfdata/cpu-host-model-fallback-tcg.x86_64-11.0.0.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/cpu-host-model-fallback-tcg.x86_64-7.2.0= .args b/tests/qemuxmlconfdata/cpu-host-model-fallback-tcg.x86_64-7.2.0.args index 20b3865d00..0253ae37cf 100644 --- a/tests/qemuxmlconfdata/cpu-host-model-fallback-tcg.x86_64-7.2.0.args +++ b/tests/qemuxmlconfdata/cpu-host-model-fallback-tcg.x86_64-7.2.0.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/cpu-host-model-fallback-tcg.x86_64-8.0.0= .args b/tests/qemuxmlconfdata/cpu-host-model-fallback-tcg.x86_64-8.0.0.args index 7e1a3a8be8..b8ce0b0fb1 100644 --- a/tests/qemuxmlconfdata/cpu-host-model-fallback-tcg.x86_64-8.0.0.args +++ b/tests/qemuxmlconfdata/cpu-host-model-fallback-tcg.x86_64-8.0.0.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/cpu-host-model-fallback-tcg.x86_64-8.1.0= .args b/tests/qemuxmlconfdata/cpu-host-model-fallback-tcg.x86_64-8.1.0.args index 2c81adbb23..886f2970c4 100644 --- a/tests/qemuxmlconfdata/cpu-host-model-fallback-tcg.x86_64-8.1.0.args +++ b/tests/qemuxmlconfdata/cpu-host-model-fallback-tcg.x86_64-8.1.0.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/cpu-host-model-fallback-tcg.x86_64-8.2.0= .args b/tests/qemuxmlconfdata/cpu-host-model-fallback-tcg.x86_64-8.2.0.args index 558ad39d14..84be19d211 100644 --- a/tests/qemuxmlconfdata/cpu-host-model-fallback-tcg.x86_64-8.2.0.args +++ b/tests/qemuxmlconfdata/cpu-host-model-fallback-tcg.x86_64-8.2.0.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/cpu-host-model-fallback-tcg.x86_64-9.0.0= .args b/tests/qemuxmlconfdata/cpu-host-model-fallback-tcg.x86_64-9.0.0.args index 512c5c311d..2f1902a2c6 100644 --- a/tests/qemuxmlconfdata/cpu-host-model-fallback-tcg.x86_64-9.0.0.args +++ b/tests/qemuxmlconfdata/cpu-host-model-fallback-tcg.x86_64-9.0.0.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/cpu-host-model-fallback-tcg.x86_64-9.1.0= .args b/tests/qemuxmlconfdata/cpu-host-model-fallback-tcg.x86_64-9.1.0.args index bd3ee8e16c..283b8453d4 100644 --- a/tests/qemuxmlconfdata/cpu-host-model-fallback-tcg.x86_64-9.1.0.args +++ b/tests/qemuxmlconfdata/cpu-host-model-fallback-tcg.x86_64-9.1.0.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/cpu-host-model-fallback-tcg.x86_64-9.2.0= .args b/tests/qemuxmlconfdata/cpu-host-model-fallback-tcg.x86_64-9.2.0.args index 5f8f093a0e..8e3f108342 100644 --- a/tests/qemuxmlconfdata/cpu-host-model-fallback-tcg.x86_64-9.2.0.args +++ b/tests/qemuxmlconfdata/cpu-host-model-fallback-tcg.x86_64-9.2.0.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/cpu-host-model-fallback-tcg.x86_64-lates= t.args b/tests/qemuxmlconfdata/cpu-host-model-fallback-tcg.x86_64-latest.ar= gs index 443de62f69..355bfc698f 100644 --- a/tests/qemuxmlconfdata/cpu-host-model-fallback-tcg.x86_64-latest.args +++ b/tests/qemuxmlconfdata/cpu-host-model-fallback-tcg.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/cpu-host-model-features.x86_64-latest.ar= gs b/tests/qemuxmlconfdata/cpu-host-model-features.x86_64-latest.args index d6e95be750..3f0ba42245 100644 --- a/tests/qemuxmlconfdata/cpu-host-model-features.x86_64-latest.args +++ b/tests/qemuxmlconfdata/cpu-host-model-features.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/cpu-host-model-kvm.x86_64-10.0.0.args b/= tests/qemuxmlconfdata/cpu-host-model-kvm.x86_64-10.0.0.args index 7dd5723b98..96553ea43f 100644 --- a/tests/qemuxmlconfdata/cpu-host-model-kvm.x86_64-10.0.0.args +++ b/tests/qemuxmlconfdata/cpu-host-model-kvm.x86_64-10.0.0.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/cpu-host-model-kvm.x86_64-10.1.0.args b/= tests/qemuxmlconfdata/cpu-host-model-kvm.x86_64-10.1.0.args index 987baa9b30..e1f4e8627b 100644 --- a/tests/qemuxmlconfdata/cpu-host-model-kvm.x86_64-10.1.0.args +++ b/tests/qemuxmlconfdata/cpu-host-model-kvm.x86_64-10.1.0.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/cpu-host-model-kvm.x86_64-10.2.0.args b/= tests/qemuxmlconfdata/cpu-host-model-kvm.x86_64-10.2.0.args index 34e873b4c8..01967b5d33 100644 --- a/tests/qemuxmlconfdata/cpu-host-model-kvm.x86_64-10.2.0.args +++ b/tests/qemuxmlconfdata/cpu-host-model-kvm.x86_64-10.2.0.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/cpu-host-model-kvm.x86_64-11.0.0.args b/= tests/qemuxmlconfdata/cpu-host-model-kvm.x86_64-11.0.0.args index 1a77a95efd..03a50ad684 100644 --- a/tests/qemuxmlconfdata/cpu-host-model-kvm.x86_64-11.0.0.args +++ b/tests/qemuxmlconfdata/cpu-host-model-kvm.x86_64-11.0.0.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/cpu-host-model-kvm.x86_64-7.2.0.args b/t= ests/qemuxmlconfdata/cpu-host-model-kvm.x86_64-7.2.0.args index 7e90b309a9..75c2c28af2 100644 --- a/tests/qemuxmlconfdata/cpu-host-model-kvm.x86_64-7.2.0.args +++ b/tests/qemuxmlconfdata/cpu-host-model-kvm.x86_64-7.2.0.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/cpu-host-model-kvm.x86_64-8.0.0.args b/t= ests/qemuxmlconfdata/cpu-host-model-kvm.x86_64-8.0.0.args index fc02c9a7e0..92d835ef3b 100644 --- a/tests/qemuxmlconfdata/cpu-host-model-kvm.x86_64-8.0.0.args +++ b/tests/qemuxmlconfdata/cpu-host-model-kvm.x86_64-8.0.0.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/cpu-host-model-kvm.x86_64-8.1.0.args b/t= ests/qemuxmlconfdata/cpu-host-model-kvm.x86_64-8.1.0.args index 8360dc02ef..bc3c56159f 100644 --- a/tests/qemuxmlconfdata/cpu-host-model-kvm.x86_64-8.1.0.args +++ b/tests/qemuxmlconfdata/cpu-host-model-kvm.x86_64-8.1.0.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/cpu-host-model-kvm.x86_64-8.2.0.args b/t= ests/qemuxmlconfdata/cpu-host-model-kvm.x86_64-8.2.0.args index b00138933c..ddd33305d1 100644 --- a/tests/qemuxmlconfdata/cpu-host-model-kvm.x86_64-8.2.0.args +++ b/tests/qemuxmlconfdata/cpu-host-model-kvm.x86_64-8.2.0.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/cpu-host-model-kvm.x86_64-9.0.0.args b/t= ests/qemuxmlconfdata/cpu-host-model-kvm.x86_64-9.0.0.args index 3b42130bd2..3b8d4fa52a 100644 --- a/tests/qemuxmlconfdata/cpu-host-model-kvm.x86_64-9.0.0.args +++ b/tests/qemuxmlconfdata/cpu-host-model-kvm.x86_64-9.0.0.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/cpu-host-model-kvm.x86_64-9.1.0.args b/t= ests/qemuxmlconfdata/cpu-host-model-kvm.x86_64-9.1.0.args index c451426cdd..4ae97ecf86 100644 --- a/tests/qemuxmlconfdata/cpu-host-model-kvm.x86_64-9.1.0.args +++ b/tests/qemuxmlconfdata/cpu-host-model-kvm.x86_64-9.1.0.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/cpu-host-model-kvm.x86_64-9.2.0.args b/t= ests/qemuxmlconfdata/cpu-host-model-kvm.x86_64-9.2.0.args index 1da6e508ff..5502035956 100644 --- a/tests/qemuxmlconfdata/cpu-host-model-kvm.x86_64-9.2.0.args +++ b/tests/qemuxmlconfdata/cpu-host-model-kvm.x86_64-9.2.0.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/cpu-host-model-kvm.x86_64-latest.args b/= tests/qemuxmlconfdata/cpu-host-model-kvm.x86_64-latest.args index 1a77a95efd..03a50ad684 100644 --- a/tests/qemuxmlconfdata/cpu-host-model-kvm.x86_64-latest.args +++ b/tests/qemuxmlconfdata/cpu-host-model-kvm.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/cpu-host-model-nofallback-kvm.x86_64-10.= 0.0.args b/tests/qemuxmlconfdata/cpu-host-model-nofallback-kvm.x86_64-10.0.= 0.args index 08f37274b2..03030406a6 100644 --- a/tests/qemuxmlconfdata/cpu-host-model-nofallback-kvm.x86_64-10.0.0.args +++ b/tests/qemuxmlconfdata/cpu-host-model-nofallback-kvm.x86_64-10.0.0.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/cpu-host-model-nofallback-kvm.x86_64-10.= 1.0.args b/tests/qemuxmlconfdata/cpu-host-model-nofallback-kvm.x86_64-10.1.= 0.args index e4044a0c64..4d3567df5f 100644 --- a/tests/qemuxmlconfdata/cpu-host-model-nofallback-kvm.x86_64-10.1.0.args +++ b/tests/qemuxmlconfdata/cpu-host-model-nofallback-kvm.x86_64-10.1.0.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/cpu-host-model-nofallback-kvm.x86_64-10.= 2.0.args b/tests/qemuxmlconfdata/cpu-host-model-nofallback-kvm.x86_64-10.2.= 0.args index 309dc80244..f48ad3bba8 100644 --- a/tests/qemuxmlconfdata/cpu-host-model-nofallback-kvm.x86_64-10.2.0.args +++ b/tests/qemuxmlconfdata/cpu-host-model-nofallback-kvm.x86_64-10.2.0.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/cpu-host-model-nofallback-kvm.x86_64-11.= 0.0.args b/tests/qemuxmlconfdata/cpu-host-model-nofallback-kvm.x86_64-11.0.= 0.args index 9b336f1bfb..6156109c24 100644 --- a/tests/qemuxmlconfdata/cpu-host-model-nofallback-kvm.x86_64-11.0.0.args +++ b/tests/qemuxmlconfdata/cpu-host-model-nofallback-kvm.x86_64-11.0.0.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/cpu-host-model-nofallback-kvm.x86_64-7.2= .0.args b/tests/qemuxmlconfdata/cpu-host-model-nofallback-kvm.x86_64-7.2.0.= args index 5d69199876..abaa5c4e64 100644 --- a/tests/qemuxmlconfdata/cpu-host-model-nofallback-kvm.x86_64-7.2.0.args +++ b/tests/qemuxmlconfdata/cpu-host-model-nofallback-kvm.x86_64-7.2.0.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/cpu-host-model-nofallback-kvm.x86_64-8.0= .0.args b/tests/qemuxmlconfdata/cpu-host-model-nofallback-kvm.x86_64-8.0.0.= args index e7b424819e..bac3b0b155 100644 --- a/tests/qemuxmlconfdata/cpu-host-model-nofallback-kvm.x86_64-8.0.0.args +++ b/tests/qemuxmlconfdata/cpu-host-model-nofallback-kvm.x86_64-8.0.0.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/cpu-host-model-nofallback-kvm.x86_64-8.1= .0.args b/tests/qemuxmlconfdata/cpu-host-model-nofallback-kvm.x86_64-8.1.0.= args index 58ad565dba..8dd87918ff 100644 --- a/tests/qemuxmlconfdata/cpu-host-model-nofallback-kvm.x86_64-8.1.0.args +++ b/tests/qemuxmlconfdata/cpu-host-model-nofallback-kvm.x86_64-8.1.0.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/cpu-host-model-nofallback-kvm.x86_64-8.2= .0.args b/tests/qemuxmlconfdata/cpu-host-model-nofallback-kvm.x86_64-8.2.0.= args index fa1b674fa5..476d68f43d 100644 --- a/tests/qemuxmlconfdata/cpu-host-model-nofallback-kvm.x86_64-8.2.0.args +++ b/tests/qemuxmlconfdata/cpu-host-model-nofallback-kvm.x86_64-8.2.0.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/cpu-host-model-nofallback-kvm.x86_64-9.0= .0.args b/tests/qemuxmlconfdata/cpu-host-model-nofallback-kvm.x86_64-9.0.0.= args index fc9985f901..ad9ef97cb9 100644 --- a/tests/qemuxmlconfdata/cpu-host-model-nofallback-kvm.x86_64-9.0.0.args +++ b/tests/qemuxmlconfdata/cpu-host-model-nofallback-kvm.x86_64-9.0.0.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/cpu-host-model-nofallback-kvm.x86_64-9.1= .0.args b/tests/qemuxmlconfdata/cpu-host-model-nofallback-kvm.x86_64-9.1.0.= args index 1db86cb31e..72e4ec78d6 100644 --- a/tests/qemuxmlconfdata/cpu-host-model-nofallback-kvm.x86_64-9.1.0.args +++ b/tests/qemuxmlconfdata/cpu-host-model-nofallback-kvm.x86_64-9.1.0.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/cpu-host-model-nofallback-kvm.x86_64-9.2= .0.args b/tests/qemuxmlconfdata/cpu-host-model-nofallback-kvm.x86_64-9.2.0.= args index 4dcd9332cb..d55c0ae2b2 100644 --- a/tests/qemuxmlconfdata/cpu-host-model-nofallback-kvm.x86_64-9.2.0.args +++ b/tests/qemuxmlconfdata/cpu-host-model-nofallback-kvm.x86_64-9.2.0.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/cpu-host-model-nofallback-kvm.x86_64-lat= est.args b/tests/qemuxmlconfdata/cpu-host-model-nofallback-kvm.x86_64-lates= t.args index 9b336f1bfb..6156109c24 100644 --- a/tests/qemuxmlconfdata/cpu-host-model-nofallback-kvm.x86_64-latest.args +++ b/tests/qemuxmlconfdata/cpu-host-model-nofallback-kvm.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/cpu-host-model-nofallback-tcg.x86_64-10.= 0.0.args b/tests/qemuxmlconfdata/cpu-host-model-nofallback-tcg.x86_64-10.0.= 0.args index 96c0676ff3..eeb5f996bd 100644 --- a/tests/qemuxmlconfdata/cpu-host-model-nofallback-tcg.x86_64-10.0.0.args +++ b/tests/qemuxmlconfdata/cpu-host-model-nofallback-tcg.x86_64-10.0.0.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/cpu-host-model-nofallback-tcg.x86_64-10.= 1.0.args b/tests/qemuxmlconfdata/cpu-host-model-nofallback-tcg.x86_64-10.1.= 0.args index 0b67c7f158..c6129599bf 100644 --- a/tests/qemuxmlconfdata/cpu-host-model-nofallback-tcg.x86_64-10.1.0.args +++ b/tests/qemuxmlconfdata/cpu-host-model-nofallback-tcg.x86_64-10.1.0.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/cpu-host-model-nofallback-tcg.x86_64-10.= 2.0.args b/tests/qemuxmlconfdata/cpu-host-model-nofallback-tcg.x86_64-10.2.= 0.args index 4daf8c40c4..c9fca6aaaa 100644 --- a/tests/qemuxmlconfdata/cpu-host-model-nofallback-tcg.x86_64-10.2.0.args +++ b/tests/qemuxmlconfdata/cpu-host-model-nofallback-tcg.x86_64-10.2.0.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/cpu-host-model-nofallback-tcg.x86_64-11.= 0.0.args b/tests/qemuxmlconfdata/cpu-host-model-nofallback-tcg.x86_64-11.0.= 0.args index 443de62f69..355bfc698f 100644 --- a/tests/qemuxmlconfdata/cpu-host-model-nofallback-tcg.x86_64-11.0.0.args +++ b/tests/qemuxmlconfdata/cpu-host-model-nofallback-tcg.x86_64-11.0.0.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/cpu-host-model-nofallback-tcg.x86_64-7.2= .0.args b/tests/qemuxmlconfdata/cpu-host-model-nofallback-tcg.x86_64-7.2.0.= args index 20b3865d00..0253ae37cf 100644 --- a/tests/qemuxmlconfdata/cpu-host-model-nofallback-tcg.x86_64-7.2.0.args +++ b/tests/qemuxmlconfdata/cpu-host-model-nofallback-tcg.x86_64-7.2.0.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/cpu-host-model-nofallback-tcg.x86_64-8.0= .0.args b/tests/qemuxmlconfdata/cpu-host-model-nofallback-tcg.x86_64-8.0.0.= args index 7e1a3a8be8..b8ce0b0fb1 100644 --- a/tests/qemuxmlconfdata/cpu-host-model-nofallback-tcg.x86_64-8.0.0.args +++ b/tests/qemuxmlconfdata/cpu-host-model-nofallback-tcg.x86_64-8.0.0.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/cpu-host-model-nofallback-tcg.x86_64-8.1= .0.args b/tests/qemuxmlconfdata/cpu-host-model-nofallback-tcg.x86_64-8.1.0.= args index 2c81adbb23..886f2970c4 100644 --- a/tests/qemuxmlconfdata/cpu-host-model-nofallback-tcg.x86_64-8.1.0.args +++ b/tests/qemuxmlconfdata/cpu-host-model-nofallback-tcg.x86_64-8.1.0.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/cpu-host-model-nofallback-tcg.x86_64-8.2= .0.args b/tests/qemuxmlconfdata/cpu-host-model-nofallback-tcg.x86_64-8.2.0.= args index 558ad39d14..84be19d211 100644 --- a/tests/qemuxmlconfdata/cpu-host-model-nofallback-tcg.x86_64-8.2.0.args +++ b/tests/qemuxmlconfdata/cpu-host-model-nofallback-tcg.x86_64-8.2.0.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/cpu-host-model-nofallback-tcg.x86_64-9.0= .0.args b/tests/qemuxmlconfdata/cpu-host-model-nofallback-tcg.x86_64-9.0.0.= args index 512c5c311d..2f1902a2c6 100644 --- a/tests/qemuxmlconfdata/cpu-host-model-nofallback-tcg.x86_64-9.0.0.args +++ b/tests/qemuxmlconfdata/cpu-host-model-nofallback-tcg.x86_64-9.0.0.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/cpu-host-model-nofallback-tcg.x86_64-9.1= .0.args b/tests/qemuxmlconfdata/cpu-host-model-nofallback-tcg.x86_64-9.1.0.= args index bd3ee8e16c..283b8453d4 100644 --- a/tests/qemuxmlconfdata/cpu-host-model-nofallback-tcg.x86_64-9.1.0.args +++ b/tests/qemuxmlconfdata/cpu-host-model-nofallback-tcg.x86_64-9.1.0.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/cpu-host-model-nofallback-tcg.x86_64-9.2= .0.args b/tests/qemuxmlconfdata/cpu-host-model-nofallback-tcg.x86_64-9.2.0.= args index 5f8f093a0e..8e3f108342 100644 --- a/tests/qemuxmlconfdata/cpu-host-model-nofallback-tcg.x86_64-9.2.0.args +++ b/tests/qemuxmlconfdata/cpu-host-model-nofallback-tcg.x86_64-9.2.0.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/cpu-host-model-nofallback-tcg.x86_64-lat= est.args b/tests/qemuxmlconfdata/cpu-host-model-nofallback-tcg.x86_64-lates= t.args index 443de62f69..355bfc698f 100644 --- a/tests/qemuxmlconfdata/cpu-host-model-nofallback-tcg.x86_64-latest.args +++ b/tests/qemuxmlconfdata/cpu-host-model-nofallback-tcg.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/cpu-host-model-tcg.x86_64-10.0.0.args b/= tests/qemuxmlconfdata/cpu-host-model-tcg.x86_64-10.0.0.args index 16b4723949..bbd3a7bb71 100644 --- a/tests/qemuxmlconfdata/cpu-host-model-tcg.x86_64-10.0.0.args +++ b/tests/qemuxmlconfdata/cpu-host-model-tcg.x86_64-10.0.0.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/cpu-host-model-tcg.x86_64-10.1.0.args b/= tests/qemuxmlconfdata/cpu-host-model-tcg.x86_64-10.1.0.args index d12cb96786..69a3c7cb42 100644 --- a/tests/qemuxmlconfdata/cpu-host-model-tcg.x86_64-10.1.0.args +++ b/tests/qemuxmlconfdata/cpu-host-model-tcg.x86_64-10.1.0.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/cpu-host-model-tcg.x86_64-10.2.0.args b/= tests/qemuxmlconfdata/cpu-host-model-tcg.x86_64-10.2.0.args index 627ee603f4..8ac7f31e9c 100644 --- a/tests/qemuxmlconfdata/cpu-host-model-tcg.x86_64-10.2.0.args +++ b/tests/qemuxmlconfdata/cpu-host-model-tcg.x86_64-10.2.0.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/cpu-host-model-tcg.x86_64-11.0.0.args b/= tests/qemuxmlconfdata/cpu-host-model-tcg.x86_64-11.0.0.args index 688a217c3c..27234506b3 100644 --- a/tests/qemuxmlconfdata/cpu-host-model-tcg.x86_64-11.0.0.args +++ b/tests/qemuxmlconfdata/cpu-host-model-tcg.x86_64-11.0.0.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/cpu-host-model-tcg.x86_64-7.2.0.args b/t= ests/qemuxmlconfdata/cpu-host-model-tcg.x86_64-7.2.0.args index 87eab5218e..7a70e9e8b7 100644 --- a/tests/qemuxmlconfdata/cpu-host-model-tcg.x86_64-7.2.0.args +++ b/tests/qemuxmlconfdata/cpu-host-model-tcg.x86_64-7.2.0.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/cpu-host-model-tcg.x86_64-8.0.0.args b/t= ests/qemuxmlconfdata/cpu-host-model-tcg.x86_64-8.0.0.args index 7ca5d33b42..30a685983a 100644 --- a/tests/qemuxmlconfdata/cpu-host-model-tcg.x86_64-8.0.0.args +++ b/tests/qemuxmlconfdata/cpu-host-model-tcg.x86_64-8.0.0.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/cpu-host-model-tcg.x86_64-8.1.0.args b/t= ests/qemuxmlconfdata/cpu-host-model-tcg.x86_64-8.1.0.args index 9763f7370b..d23e83746a 100644 --- a/tests/qemuxmlconfdata/cpu-host-model-tcg.x86_64-8.1.0.args +++ b/tests/qemuxmlconfdata/cpu-host-model-tcg.x86_64-8.1.0.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/cpu-host-model-tcg.x86_64-8.2.0.args b/t= ests/qemuxmlconfdata/cpu-host-model-tcg.x86_64-8.2.0.args index 2da4052d73..375db1efea 100644 --- a/tests/qemuxmlconfdata/cpu-host-model-tcg.x86_64-8.2.0.args +++ b/tests/qemuxmlconfdata/cpu-host-model-tcg.x86_64-8.2.0.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/cpu-host-model-tcg.x86_64-9.0.0.args b/t= ests/qemuxmlconfdata/cpu-host-model-tcg.x86_64-9.0.0.args index fb06433ce6..59bfc7cedd 100644 --- a/tests/qemuxmlconfdata/cpu-host-model-tcg.x86_64-9.0.0.args +++ b/tests/qemuxmlconfdata/cpu-host-model-tcg.x86_64-9.0.0.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/cpu-host-model-tcg.x86_64-9.1.0.args b/t= ests/qemuxmlconfdata/cpu-host-model-tcg.x86_64-9.1.0.args index daefe46b24..a1dad82651 100644 --- a/tests/qemuxmlconfdata/cpu-host-model-tcg.x86_64-9.1.0.args +++ b/tests/qemuxmlconfdata/cpu-host-model-tcg.x86_64-9.1.0.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/cpu-host-model-tcg.x86_64-9.2.0.args b/t= ests/qemuxmlconfdata/cpu-host-model-tcg.x86_64-9.2.0.args index 46cbd8e46c..18d610c998 100644 --- a/tests/qemuxmlconfdata/cpu-host-model-tcg.x86_64-9.2.0.args +++ b/tests/qemuxmlconfdata/cpu-host-model-tcg.x86_64-9.2.0.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/cpu-host-model-tcg.x86_64-latest.args b/= tests/qemuxmlconfdata/cpu-host-model-tcg.x86_64-latest.args index 688a217c3c..27234506b3 100644 --- a/tests/qemuxmlconfdata/cpu-host-model-tcg.x86_64-latest.args +++ b/tests/qemuxmlconfdata/cpu-host-model-tcg.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/cpu-host-model-vendor.x86_64-latest.args= b/tests/qemuxmlconfdata/cpu-host-model-vendor.x86_64-latest.args index ef7d442d5b..c556f6c1a9 100644 --- a/tests/qemuxmlconfdata/cpu-host-model-vendor.x86_64-latest.args +++ b/tests/qemuxmlconfdata/cpu-host-model-vendor.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/cpu-host-passthrough-features.x86_64-lat= est.args b/tests/qemuxmlconfdata/cpu-host-passthrough-features.x86_64-lates= t.args index efd481e58c..356de55fc8 100644 --- a/tests/qemuxmlconfdata/cpu-host-passthrough-features.x86_64-latest.args +++ b/tests/qemuxmlconfdata/cpu-host-passthrough-features.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/cpu-host-passthrough.x86_64-latest.args = b/tests/qemuxmlconfdata/cpu-host-passthrough.x86_64-latest.args index 2f81053374..a0b72ec7c2 100644 --- a/tests/qemuxmlconfdata/cpu-host-passthrough.x86_64-latest.args +++ b/tests/qemuxmlconfdata/cpu-host-passthrough.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/cpu-hotplug-startup.x86_64-latest.args b= /tests/qemuxmlconfdata/cpu-hotplug-startup.x86_64-latest.args index af1b464104..715639ce12 100644 --- a/tests/qemuxmlconfdata/cpu-hotplug-startup.x86_64-latest.args +++ b/tests/qemuxmlconfdata/cpu-hotplug-startup.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/cpu-kvmclock.x86_64-latest.args b/tests/= qemuxmlconfdata/cpu-kvmclock.x86_64-latest.args index bde2ee047d..20deb4dff4 100644 --- a/tests/qemuxmlconfdata/cpu-kvmclock.x86_64-latest.args +++ b/tests/qemuxmlconfdata/cpu-kvmclock.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/cpu-minimum1.x86_64-latest.args b/tests/= qemuxmlconfdata/cpu-minimum1.x86_64-latest.args index fe553fd31b..08048c9f29 100644 --- a/tests/qemuxmlconfdata/cpu-minimum1.x86_64-latest.args +++ b/tests/qemuxmlconfdata/cpu-minimum1.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/cpu-minimum2.x86_64-latest.args b/tests/= qemuxmlconfdata/cpu-minimum2.x86_64-latest.args index ddd0c64080..eff6930c84 100644 --- a/tests/qemuxmlconfdata/cpu-minimum2.x86_64-latest.args +++ b/tests/qemuxmlconfdata/cpu-minimum2.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/cpu-model-deprecated-features-none.s390x= -latest.args b/tests/qemuxmlconfdata/cpu-model-deprecated-features-none.s39= 0x-latest.args index 2305f6b194..4a7be00fa0 100644 --- a/tests/qemuxmlconfdata/cpu-model-deprecated-features-none.s390x-latest= .args +++ b/tests/qemuxmlconfdata/cpu-model-deprecated-features-none.s390x-latest= .args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/cpu-model-deprecated-features-off.s390x-= latest.args b/tests/qemuxmlconfdata/cpu-model-deprecated-features-off.s390x= -latest.args index 2305f6b194..4a7be00fa0 100644 --- a/tests/qemuxmlconfdata/cpu-model-deprecated-features-off.s390x-latest.= args +++ b/tests/qemuxmlconfdata/cpu-model-deprecated-features-off.s390x-latest.= args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/cpu-model-deprecated-features-on.s390x-l= atest.args b/tests/qemuxmlconfdata/cpu-model-deprecated-features-on.s390x-l= atest.args index e0d433e77e..1f1f7c7ec0 100644 --- a/tests/qemuxmlconfdata/cpu-model-deprecated-features-on.s390x-latest.a= rgs +++ b/tests/qemuxmlconfdata/cpu-model-deprecated-features-on.s390x-latest.a= rgs @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/cpu-no-removed-features.x86_64-latest.ar= gs b/tests/qemuxmlconfdata/cpu-no-removed-features.x86_64-latest.args index a0cbbdd040..c65d9fe085 100644 --- a/tests/qemuxmlconfdata/cpu-no-removed-features.x86_64-latest.args +++ b/tests/qemuxmlconfdata/cpu-no-removed-features.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/cpu-nofallback.x86_64-8.0.0.args b/tests= /qemuxmlconfdata/cpu-nofallback.x86_64-8.0.0.args index b0ce1dfcbd..94e4add6f6 100644 --- a/tests/qemuxmlconfdata/cpu-nofallback.x86_64-8.0.0.args +++ b/tests/qemuxmlconfdata/cpu-nofallback.x86_64-8.0.0.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/cpu-numa-disjoint.x86_64-latest.args b/t= ests/qemuxmlconfdata/cpu-numa-disjoint.x86_64-latest.args index 22fca082a8..448c1113a6 100644 --- a/tests/qemuxmlconfdata/cpu-numa-disjoint.x86_64-latest.args +++ b/tests/qemuxmlconfdata/cpu-numa-disjoint.x86_64-latest.args @@ -24,7 +24,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/cpu-numa-disordered.x86_64-latest.args b= /tests/qemuxmlconfdata/cpu-numa-disordered.x86_64-latest.args index bc4a6ad5f3..7bbb3422d7 100644 --- a/tests/qemuxmlconfdata/cpu-numa-disordered.x86_64-latest.args +++ b/tests/qemuxmlconfdata/cpu-numa-disordered.x86_64-latest.args @@ -26,7 +26,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/cpu-numa-memory-oldstyle.x86_64-10.2.0.a= rgs b/tests/qemuxmlconfdata/cpu-numa-memory-oldstyle.x86_64-10.2.0.args index 5c936add9a..90a1930ac0 100644 --- a/tests/qemuxmlconfdata/cpu-numa-memory-oldstyle.x86_64-10.2.0.args +++ b/tests/qemuxmlconfdata/cpu-numa-memory-oldstyle.x86_64-10.2.0.args @@ -22,7 +22,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/cpu-numa-memshared.x86_64-latest.args b/= tests/qemuxmlconfdata/cpu-numa-memshared.x86_64-latest.args index 1e486b1bbc..97831d818e 100644 --- a/tests/qemuxmlconfdata/cpu-numa-memshared.x86_64-latest.args +++ b/tests/qemuxmlconfdata/cpu-numa-memshared.x86_64-latest.args @@ -24,7 +24,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/cpu-numa-no-memory-element.x86_64-latest= .args b/tests/qemuxmlconfdata/cpu-numa-no-memory-element.x86_64-latest.args index 59372c4ab9..647531140c 100644 --- a/tests/qemuxmlconfdata/cpu-numa-no-memory-element.x86_64-latest.args +++ b/tests/qemuxmlconfdata/cpu-numa-no-memory-element.x86_64-latest.args @@ -24,7 +24,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/cpu-numa1.x86_64-latest.args b/tests/qem= uxmlconfdata/cpu-numa1.x86_64-latest.args index 59372c4ab9..647531140c 100644 --- a/tests/qemuxmlconfdata/cpu-numa1.x86_64-latest.args +++ b/tests/qemuxmlconfdata/cpu-numa1.x86_64-latest.args @@ -24,7 +24,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/cpu-numa2.x86_64-latest.args b/tests/qem= uxmlconfdata/cpu-numa2.x86_64-latest.args index 59372c4ab9..647531140c 100644 --- a/tests/qemuxmlconfdata/cpu-numa2.x86_64-latest.args +++ b/tests/qemuxmlconfdata/cpu-numa2.x86_64-latest.args @@ -24,7 +24,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/cpu-phys-bits-emulate-bare.x86_64-latest= .args b/tests/qemuxmlconfdata/cpu-phys-bits-emulate-bare.x86_64-latest.args index 801b75b317..a73bb20e47 100644 --- a/tests/qemuxmlconfdata/cpu-phys-bits-emulate-bare.x86_64-latest.args +++ b/tests/qemuxmlconfdata/cpu-phys-bits-emulate-bare.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-foo/.co= nfig \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/cpu-phys-bits-emulate.x86_64-latest.args= b/tests/qemuxmlconfdata/cpu-phys-bits-emulate.x86_64-latest.args index 3bf7649161..99251d2905 100644 --- a/tests/qemuxmlconfdata/cpu-phys-bits-emulate.x86_64-latest.args +++ b/tests/qemuxmlconfdata/cpu-phys-bits-emulate.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-foo/.co= nfig \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/cpu-phys-bits-emulate2.x86_64-latest.arg= s b/tests/qemuxmlconfdata/cpu-phys-bits-emulate2.x86_64-latest.args index 3808af7399..6f995a484a 100644 --- a/tests/qemuxmlconfdata/cpu-phys-bits-emulate2.x86_64-latest.args +++ b/tests/qemuxmlconfdata/cpu-phys-bits-emulate2.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-foo/.co= nfig \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/cpu-phys-bits-limit.x86_64-latest.args b= /tests/qemuxmlconfdata/cpu-phys-bits-limit.x86_64-latest.args index 16f96b1c63..9a0187d6b6 100644 --- a/tests/qemuxmlconfdata/cpu-phys-bits-limit.x86_64-latest.args +++ b/tests/qemuxmlconfdata/cpu-phys-bits-limit.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-foo/.co= nfig \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/cpu-phys-bits-passthrough.x86_64-latest.= args b/tests/qemuxmlconfdata/cpu-phys-bits-passthrough.x86_64-latest.args index 9dea8a3b1b..189b7af3d5 100644 --- a/tests/qemuxmlconfdata/cpu-phys-bits-passthrough.x86_64-latest.args +++ b/tests/qemuxmlconfdata/cpu-phys-bits-passthrough.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-foo/.co= nfig \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/cpu-s390-features.s390x-latest.args b/te= sts/qemuxmlconfdata/cpu-s390-features.s390x-latest.args index 6a95997ff5..3f93ec2a8e 100644 --- a/tests/qemuxmlconfdata/cpu-s390-features.s390x-latest.args +++ b/tests/qemuxmlconfdata/cpu-s390-features.s390x-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest1/= .config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/cpu-s390-zEC12.s390x-latest.args b/tests= /qemuxmlconfdata/cpu-s390-zEC12.s390x-latest.args index c47ad9e17c..e7f04a17c4 100644 --- a/tests/qemuxmlconfdata/cpu-s390-zEC12.s390x-latest.args +++ b/tests/qemuxmlconfdata/cpu-s390-zEC12.s390x-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest1/= .config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/cpu-strict1.x86_64-latest.args b/tests/q= emuxmlconfdata/cpu-strict1.x86_64-latest.args index 7e870db393..18f38c172d 100644 --- a/tests/qemuxmlconfdata/cpu-strict1.x86_64-latest.args +++ b/tests/qemuxmlconfdata/cpu-strict1.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/cpu-topology1.x86_64-latest.args b/tests= /qemuxmlconfdata/cpu-topology1.x86_64-latest.args index af1b464104..715639ce12 100644 --- a/tests/qemuxmlconfdata/cpu-topology1.x86_64-latest.args +++ b/tests/qemuxmlconfdata/cpu-topology1.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/cpu-topology2.x86_64-latest.args b/tests= /qemuxmlconfdata/cpu-topology2.x86_64-latest.args index 8560eb6126..71b04e4d30 100644 --- a/tests/qemuxmlconfdata/cpu-topology2.x86_64-latest.args +++ b/tests/qemuxmlconfdata/cpu-topology2.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/cpu-topology3.x86_64-latest.args b/tests= /qemuxmlconfdata/cpu-topology3.x86_64-latest.args index 3878c558b8..a5ec1cce16 100644 --- a/tests/qemuxmlconfdata/cpu-topology3.x86_64-latest.args +++ b/tests/qemuxmlconfdata/cpu-topology3.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/cpu-topology4.x86_64-latest.args b/tests= /qemuxmlconfdata/cpu-topology4.x86_64-latest.args index 8720038c0d..360da3bcf0 100644 --- a/tests/qemuxmlconfdata/cpu-topology4.x86_64-latest.args +++ b/tests/qemuxmlconfdata/cpu-topology4.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/cpu-topology5.aarch64-latest.args b/test= s/qemuxmlconfdata/cpu-topology5.aarch64-latest.args index 123657577d..e53c31a5d8 100644 --- a/tests/qemuxmlconfdata/cpu-topology5.aarch64-latest.args +++ b/tests/qemuxmlconfdata/cpu-topology5.aarch64-latest.args @@ -20,7 +20,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/cpu-translation.x86_64-latest.args b/tes= ts/qemuxmlconfdata/cpu-translation.x86_64-latest.args index d425866c67..fab0aaabba 100644 --- a/tests/qemuxmlconfdata/cpu-translation.x86_64-latest.args +++ b/tests/qemuxmlconfdata/cpu-translation.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/cpu-tsc-frequency.x86_64-latest.args b/t= ests/qemuxmlconfdata/cpu-tsc-frequency.x86_64-latest.args index e926d309f5..eb4c3e0cbf 100644 --- a/tests/qemuxmlconfdata/cpu-tsc-frequency.x86_64-latest.args +++ b/tests/qemuxmlconfdata/cpu-tsc-frequency.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/cputune-cpuset-big-id.x86_64-latest.args= b/tests/qemuxmlconfdata/cputune-cpuset-big-id.x86_64-latest.args index 724c036155..3916fa2e62 100644 --- a/tests/qemuxmlconfdata/cputune-cpuset-big-id.x86_64-latest.args +++ b/tests/qemuxmlconfdata/cputune-cpuset-big-id.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/cputune-numatune.x86_64-latest.args b/te= sts/qemuxmlconfdata/cputune-numatune.x86_64-latest.args index a0e4815d6a..5bf2b435b3 100644 --- a/tests/qemuxmlconfdata/cputune-numatune.x86_64-latest.args +++ b/tests/qemuxmlconfdata/cputune-numatune.x86_64-latest.args @@ -23,7 +23,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-dummy2/= .config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/cputune-zero-shares.x86_64-latest.args b= /tests/qemuxmlconfdata/cputune-zero-shares.x86_64-latest.args index 724c036155..3916fa2e62 100644 --- a/tests/qemuxmlconfdata/cputune-zero-shares.x86_64-latest.args +++ b/tests/qemuxmlconfdata/cputune-zero-shares.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/cputune.x86_64-latest.args b/tests/qemux= mlconfdata/cputune.x86_64-latest.args index 68abff6420..ebd62e6bc6 100644 --- a/tests/qemuxmlconfdata/cputune.x86_64-latest.args +++ b/tests/qemuxmlconfdata/cputune.x86_64-latest.args @@ -25,7 +25,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/crypto-builtin.x86_64-latest.args b/test= s/qemuxmlconfdata/crypto-builtin.x86_64-latest.args index c9a98d3001..8e127b800a 100644 --- a/tests/qemuxmlconfdata/crypto-builtin.x86_64-latest.args +++ b/tests/qemuxmlconfdata/crypto-builtin.x86_64-latest.args @@ -24,7 +24,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/default-kvm-host-arch.x86_64-latest.args= b/tests/qemuxmlconfdata/default-kvm-host-arch.x86_64-latest.args index fc060fefb3..5b5d44004c 100644 --- a/tests/qemuxmlconfdata/default-kvm-host-arch.x86_64-latest.args +++ b/tests/qemuxmlconfdata/default-kvm-host-arch.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-kvm/.co= nfig \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/default-qemu-host-arch.x86_64-latest.arg= s b/tests/qemuxmlconfdata/default-qemu-host-arch.x86_64-latest.args index 6d1154f9e5..6ac2549a5a 100644 --- a/tests/qemuxmlconfdata/default-qemu-host-arch.x86_64-latest.args +++ b/tests/qemuxmlconfdata/default-qemu-host-arch.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-qemu-ho= st/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/default-video-type-aarch64.aarch64-lates= t.args b/tests/qemuxmlconfdata/default-video-type-aarch64.aarch64-latest.ar= gs index d67890b771..dae5d408d5 100644 --- a/tests/qemuxmlconfdata/default-video-type-aarch64.aarch64-latest.args +++ b/tests/qemuxmlconfdata/default-video-type-aarch64.aarch64-latest.args @@ -19,7 +19,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-default= -video-type-a/.config \ -uuid 6ba410c5-1e5c-4d57-bee7-2228e7ffa32f \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/default-video-type-loongarch64.loongarch= 64-latest.args b/tests/qemuxmlconfdata/default-video-type-loongarch64.loong= arch64-latest.args index 0a76cca6ce..bdfaa51d2e 100644 --- a/tests/qemuxmlconfdata/default-video-type-loongarch64.loongarch64-late= st.args +++ b/tests/qemuxmlconfdata/default-video-type-loongarch64.loongarch64-late= st.args @@ -20,7 +20,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-default= -video-type-l/.config \ -uuid 6ba410c5-1e5c-4d57-bee7-2228e7ffa32f \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/default-video-type-ppc64.ppc64-latest.ar= gs b/tests/qemuxmlconfdata/default-video-type-ppc64.ppc64-latest.args index bb0b5a31b1..a668c3ed41 100644 --- a/tests/qemuxmlconfdata/default-video-type-ppc64.ppc64-latest.args +++ b/tests/qemuxmlconfdata/default-video-type-ppc64.ppc64-latest.args @@ -20,7 +20,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-default= -video-type-p/.config \ -uuid 6ba410c5-1e5c-4d57-bee7-2228e7ffa32f \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/default-video-type-riscv64.riscv64-lates= t.args b/tests/qemuxmlconfdata/default-video-type-riscv64.riscv64-latest.ar= gs index 3552fa576d..ed74557c07 100644 --- a/tests/qemuxmlconfdata/default-video-type-riscv64.riscv64-latest.args +++ b/tests/qemuxmlconfdata/default-video-type-riscv64.riscv64-latest.args @@ -20,7 +20,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-default= -video-type-r/.config \ -uuid 6ba410c5-1e5c-4d57-bee7-2228e7ffa32f \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/default-video-type-s390x.s390x-latest.ar= gs b/tests/qemuxmlconfdata/default-video-type-s390x.s390x-latest.args index f8b4538815..6a1fee3987 100644 --- a/tests/qemuxmlconfdata/default-video-type-s390x.s390x-latest.args +++ b/tests/qemuxmlconfdata/default-video-type-s390x.s390x-latest.args @@ -20,7 +20,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-default= -video-type-s/.config \ -uuid 6ba410c5-1e5c-4d57-bee7-2228e7ffa32f \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/default-video-type-x86_64.x86_64-latest.= args b/tests/qemuxmlconfdata/default-video-type-x86_64.x86_64-latest.args index 247927f7bb..a17838b713 100644 --- a/tests/qemuxmlconfdata/default-video-type-x86_64.x86_64-latest.args +++ b/tests/qemuxmlconfdata/default-video-type-x86_64.x86_64-latest.args @@ -20,7 +20,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-default= -video-type-x/.config \ -uuid 6ba410c5-1e5c-4d57-bee7-2228e7ffa32f \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/devices-acpi-index.x86_64-latest.args b/= tests/qemuxmlconfdata/devices-acpi-index.x86_64-latest.args index 394793be2c..493b6a55c3 100644 --- a/tests/qemuxmlconfdata/devices-acpi-index.x86_64-latest.args +++ b/tests/qemuxmlconfdata/devices-acpi-index.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-fdr-br/= .config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/disk-active-commit.x86_64-latest.args b/= tests/qemuxmlconfdata/disk-active-commit.x86_64-latest.args index 9bc93b69b2..f06a3cbbbb 100644 --- a/tests/qemuxmlconfdata/disk-active-commit.x86_64-latest.args +++ b/tests/qemuxmlconfdata/disk-active-commit.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/disk-aio-io_uring.x86_64-latest.args b/t= ests/qemuxmlconfdata/disk-aio-io_uring.x86_64-latest.args index b4f1c25b65..dae20730db 100644 --- a/tests/qemuxmlconfdata/disk-aio-io_uring.x86_64-latest.args +++ b/tests/qemuxmlconfdata/disk-aio-io_uring.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/disk-aio.x86_64-latest.args b/tests/qemu= xmlconfdata/disk-aio.x86_64-latest.args index ed398f9fca..901ebfa699 100644 --- a/tests/qemuxmlconfdata/disk-aio.x86_64-latest.args +++ b/tests/qemuxmlconfdata/disk-aio.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/disk-arm-virtio-sd.aarch64-latest.args b= /tests/qemuxmlconfdata/disk-arm-virtio-sd.aarch64-latest.args index 3328189b44..25cd471cec 100644 --- a/tests/qemuxmlconfdata/disk-arm-virtio-sd.aarch64-latest.args +++ b/tests/qemuxmlconfdata/disk-arm-virtio-sd.aarch64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-armtest= /.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/disk-backing-chains-noindex.x86_64-lates= t.args b/tests/qemuxmlconfdata/disk-backing-chains-noindex.x86_64-latest.ar= gs index a5c71cc146..68d38f9925 100644 --- a/tests/qemuxmlconfdata/disk-backing-chains-noindex.x86_64-latest.args +++ b/tests/qemuxmlconfdata/disk-backing-chains-noindex.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/disk-blockio-no-discard.x86_64-latest.ar= gs b/tests/qemuxmlconfdata/disk-blockio-no-discard.x86_64-latest.args index 0e477c6e40..925962a636 100644 --- a/tests/qemuxmlconfdata/disk-blockio-no-discard.x86_64-latest.args +++ b/tests/qemuxmlconfdata/disk-blockio-no-discard.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/disk-blockio.x86_64-latest.args b/tests/= qemuxmlconfdata/disk-blockio.x86_64-latest.args index 997bd13e56..b0f7a2beb4 100644 --- a/tests/qemuxmlconfdata/disk-blockio.x86_64-latest.args +++ b/tests/qemuxmlconfdata/disk-blockio.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/disk-boot-cdrom.x86_64-latest.args b/tes= ts/qemuxmlconfdata/disk-boot-cdrom.x86_64-latest.args index 1d36f4f9ee..0dc92cdd11 100644 --- a/tests/qemuxmlconfdata/disk-boot-cdrom.x86_64-latest.args +++ b/tests/qemuxmlconfdata/disk-boot-cdrom.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/disk-boot-disk.x86_64-latest.args b/test= s/qemuxmlconfdata/disk-boot-disk.x86_64-latest.args index ce8d057ca0..07c9a74c0a 100644 --- a/tests/qemuxmlconfdata/disk-boot-disk.x86_64-latest.args +++ b/tests/qemuxmlconfdata/disk-boot-disk.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/disk-cache.x86_64-latest.args b/tests/qe= muxmlconfdata/disk-cache.x86_64-latest.args index 27be644177..ac7675a7c8 100644 --- a/tests/qemuxmlconfdata/disk-cache.x86_64-latest.args +++ b/tests/qemuxmlconfdata/disk-cache.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/disk-cdrom-empty-network-invalid.x86_64-= latest.args b/tests/qemuxmlconfdata/disk-cdrom-empty-network-invalid.x86_64= -latest.args index 034dead422..2cc58c28de 100644 --- a/tests/qemuxmlconfdata/disk-cdrom-empty-network-invalid.x86_64-latest.= args +++ b/tests/qemuxmlconfdata/disk-cdrom-empty-network-invalid.x86_64-latest.= args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/disk-cdrom-network-nbdkit.x86_64-latest.= args b/tests/qemuxmlconfdata/disk-cdrom-network-nbdkit.x86_64-latest.args index 7cb4915e65..2ad5c3d4a4 100644 --- a/tests/qemuxmlconfdata/disk-cdrom-network-nbdkit.x86_64-latest.args +++ b/tests/qemuxmlconfdata/disk-cdrom-network-nbdkit.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/disk-cdrom-network.x86_64-latest.args b/= tests/qemuxmlconfdata/disk-cdrom-network.x86_64-latest.args index 00a82b0178..abb6b4f0ad 100644 --- a/tests/qemuxmlconfdata/disk-cdrom-network.x86_64-latest.args +++ b/tests/qemuxmlconfdata/disk-cdrom-network.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/disk-cdrom-tray.x86_64-latest.args b/tes= ts/qemuxmlconfdata/disk-cdrom-tray.x86_64-latest.args index 9619d41e79..96f260e293 100644 --- a/tests/qemuxmlconfdata/disk-cdrom-tray.x86_64-latest.args +++ b/tests/qemuxmlconfdata/disk-cdrom-tray.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-test/.c= onfig \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/disk-cdrom-usb-empty.x86_64-latest.abi-u= pdate.args b/tests/qemuxmlconfdata/disk-cdrom-usb-empty.x86_64-latest.abi-u= pdate.args index 44bf27e9a4..47625ca629 100644 --- a/tests/qemuxmlconfdata/disk-cdrom-usb-empty.x86_64-latest.abi-update.a= rgs +++ b/tests/qemuxmlconfdata/disk-cdrom-usb-empty.x86_64-latest.abi-update.a= rgs @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/disk-cdrom.x86_64-latest.args b/tests/qe= muxmlconfdata/disk-cdrom.x86_64-latest.args index 9e3fe36d91..f61e3d29b5 100644 --- a/tests/qemuxmlconfdata/disk-cdrom.x86_64-latest.args +++ b/tests/qemuxmlconfdata/disk-cdrom.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/disk-copy_on_read.x86_64-latest.args b/t= ests/qemuxmlconfdata/disk-copy_on_read.x86_64-latest.args index 4bdaf22de8..c9d9ca0ea7 100644 --- a/tests/qemuxmlconfdata/disk-copy_on_read.x86_64-latest.args +++ b/tests/qemuxmlconfdata/disk-copy_on_read.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-test/.c= onfig \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/disk-detect-zeroes.x86_64-latest.args b/= tests/qemuxmlconfdata/disk-detect-zeroes.x86_64-latest.args index 6284c082b1..355875bc38 100644 --- a/tests/qemuxmlconfdata/disk-detect-zeroes.x86_64-latest.args +++ b/tests/qemuxmlconfdata/disk-detect-zeroes.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-test/.c= onfig \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/disk-discard.x86_64-latest.args b/tests/= qemuxmlconfdata/disk-discard.x86_64-latest.args index 43e516f097..5f68a1be81 100644 --- a/tests/qemuxmlconfdata/disk-discard.x86_64-latest.args +++ b/tests/qemuxmlconfdata/disk-discard.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-test/.c= onfig \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/disk-discard_no_unref.x86_64-latest.args= b/tests/qemuxmlconfdata/disk-discard_no_unref.x86_64-latest.args index 25b8211cf3..32d7f8f54b 100644 --- a/tests/qemuxmlconfdata/disk-discard_no_unref.x86_64-latest.args +++ b/tests/qemuxmlconfdata/disk-discard_no_unref.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-test/.c= onfig \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/disk-error-policy-s390x.s390x-latest.arg= s b/tests/qemuxmlconfdata/disk-error-policy-s390x.s390x-latest.args index 4ca56d2265..c19ef5e069 100644 --- a/tests/qemuxmlconfdata/disk-error-policy-s390x.s390x-latest.args +++ b/tests/qemuxmlconfdata/disk-error-policy-s390x.s390x-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/disk-error-policy.x86_64-latest.args b/t= ests/qemuxmlconfdata/disk-error-policy.x86_64-latest.args index e1018fb2d6..764978323c 100644 --- a/tests/qemuxmlconfdata/disk-error-policy.x86_64-latest.args +++ b/tests/qemuxmlconfdata/disk-error-policy.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/disk-floppy-q35.x86_64-latest.args b/tes= ts/qemuxmlconfdata/disk-floppy-q35.x86_64-latest.args index 14679f3737..b83d649192 100644 --- a/tests/qemuxmlconfdata/disk-floppy-q35.x86_64-latest.args +++ b/tests/qemuxmlconfdata/disk-floppy-q35.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/disk-floppy-tray.x86_64-latest.args b/te= sts/qemuxmlconfdata/disk-floppy-tray.x86_64-latest.args index d9f8689e1a..0c7fd9d28b 100644 --- a/tests/qemuxmlconfdata/disk-floppy-tray.x86_64-latest.args +++ b/tests/qemuxmlconfdata/disk-floppy-tray.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/disk-floppy.x86_64-latest.args b/tests/q= emuxmlconfdata/disk-floppy.x86_64-latest.args index 3a6bbe8689..a41769966c 100644 --- a/tests/qemuxmlconfdata/disk-floppy.x86_64-latest.args +++ b/tests/qemuxmlconfdata/disk-floppy.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/disk-fmt-qcow.x86_64-latest.args b/tests= /qemuxmlconfdata/disk-fmt-qcow.x86_64-latest.args index 78f30ea750..69dff80b6c 100644 --- a/tests/qemuxmlconfdata/disk-fmt-qcow.x86_64-latest.args +++ b/tests/qemuxmlconfdata/disk-fmt-qcow.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/disk-geometry.x86_64-latest.args b/tests= /qemuxmlconfdata/disk-geometry.x86_64-latest.args index 139df58254..883a62da63 100644 --- a/tests/qemuxmlconfdata/disk-geometry.x86_64-latest.args +++ b/tests/qemuxmlconfdata/disk-geometry.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/disk-ide-split.x86_64-latest.args b/test= s/qemuxmlconfdata/disk-ide-split.x86_64-latest.args index 58d782729f..220ca34fca 100644 --- a/tests/qemuxmlconfdata/disk-ide-split.x86_64-latest.args +++ b/tests/qemuxmlconfdata/disk-ide-split.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/disk-ide-wwn.x86_64-latest.args b/tests/= qemuxmlconfdata/disk-ide-wwn.x86_64-latest.args index d1013cf7ae..4395901816 100644 --- a/tests/qemuxmlconfdata/disk-ide-wwn.x86_64-latest.args +++ b/tests/qemuxmlconfdata/disk-ide-wwn.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/disk-ioeventfd.x86_64-latest.args b/test= s/qemuxmlconfdata/disk-ioeventfd.x86_64-latest.args index c508cf41ab..e63bad3599 100644 --- a/tests/qemuxmlconfdata/disk-ioeventfd.x86_64-latest.args +++ b/tests/qemuxmlconfdata/disk-ioeventfd.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-test/.c= onfig \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/disk-metadata-cache.x86_64-latest.args b= /tests/qemuxmlconfdata/disk-metadata-cache.x86_64-latest.args index 9bb47e59ed..d05f644f36 100644 --- a/tests/qemuxmlconfdata/disk-metadata-cache.x86_64-latest.args +++ b/tests/qemuxmlconfdata/disk-metadata-cache.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/disk-mirror-old.x86_64-latest.args b/tes= ts/qemuxmlconfdata/disk-mirror-old.x86_64-latest.args index bf1d6983a4..01a96a3791 100644 --- a/tests/qemuxmlconfdata/disk-mirror-old.x86_64-latest.args +++ b/tests/qemuxmlconfdata/disk-mirror-old.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/disk-mirror.x86_64-latest.args b/tests/q= emuxmlconfdata/disk-mirror.x86_64-latest.args index e504a21594..e21c97dd67 100644 --- a/tests/qemuxmlconfdata/disk-mirror.x86_64-latest.args +++ b/tests/qemuxmlconfdata/disk-mirror.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/disk-network-gluster.x86_64-9.1.0.args b= /tests/qemuxmlconfdata/disk-network-gluster.x86_64-9.1.0.args index 7cf4c4404b..fdd0c82ea8 100644 --- a/tests/qemuxmlconfdata/disk-network-gluster.x86_64-9.1.0.args +++ b/tests/qemuxmlconfdata/disk-network-gluster.x86_64-9.1.0.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/disk-network-http-nbdkit.x86_64-latest.a= rgs b/tests/qemuxmlconfdata/disk-network-http-nbdkit.x86_64-latest.args index 8cb7feec1e..aa026ac94a 100644 --- a/tests/qemuxmlconfdata/disk-network-http-nbdkit.x86_64-latest.args +++ b/tests/qemuxmlconfdata/disk-network-http-nbdkit.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/disk-network-http.x86_64-latest.args b/t= ests/qemuxmlconfdata/disk-network-http.x86_64-latest.args index 854a1154ac..d139425d49 100644 --- a/tests/qemuxmlconfdata/disk-network-http.x86_64-latest.args +++ b/tests/qemuxmlconfdata/disk-network-http.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/disk-network-iscsi.x86_64-latest.args b/= tests/qemuxmlconfdata/disk-network-iscsi.x86_64-latest.args index 1423b02223..5af5658c2b 100644 --- a/tests/qemuxmlconfdata/disk-network-iscsi.x86_64-latest.args +++ b/tests/qemuxmlconfdata/disk-network-iscsi.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/disk-network-nbd.x86_64-latest.args b/te= sts/qemuxmlconfdata/disk-network-nbd.x86_64-latest.args index c47595e861..54d5d40f94 100644 --- a/tests/qemuxmlconfdata/disk-network-nbd.x86_64-latest.args +++ b/tests/qemuxmlconfdata/disk-network-nbd.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/disk-network-nfs.x86_64-latest.args b/te= sts/qemuxmlconfdata/disk-network-nfs.x86_64-latest.args index 62f56b146f..50bc8c20a1 100644 --- a/tests/qemuxmlconfdata/disk-network-nfs.x86_64-latest.args +++ b/tests/qemuxmlconfdata/disk-network-nfs.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/disk-network-rbd-encryption-layering.x86= _64-latest.args b/tests/qemuxmlconfdata/disk-network-rbd-encryption-layerin= g.x86_64-latest.args index de6bcb3db2..264fd5121d 100644 --- a/tests/qemuxmlconfdata/disk-network-rbd-encryption-layering.x86_64-lat= est.args +++ b/tests/qemuxmlconfdata/disk-network-rbd-encryption-layering.x86_64-lat= est.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-encrypt= disk/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/disk-network-rbd-encryption-luks-any.x86= _64-latest.args b/tests/qemuxmlconfdata/disk-network-rbd-encryption-luks-an= y.x86_64-latest.args index af178782b9..4e1c4155f3 100644 --- a/tests/qemuxmlconfdata/disk-network-rbd-encryption-luks-any.x86_64-lat= est.args +++ b/tests/qemuxmlconfdata/disk-network-rbd-encryption-luks-any.x86_64-lat= est.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-encrypt= disk/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/disk-network-rbd-encryption.x86_64-lates= t.args b/tests/qemuxmlconfdata/disk-network-rbd-encryption.x86_64-latest.ar= gs index 4b6afbb85d..778a049b56 100644 --- a/tests/qemuxmlconfdata/disk-network-rbd-encryption.x86_64-latest.args +++ b/tests/qemuxmlconfdata/disk-network-rbd-encryption.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-encrypt= disk/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/disk-network-rbd-no-colon.x86_64-latest.= args b/tests/qemuxmlconfdata/disk-network-rbd-no-colon.x86_64-latest.args index ca081c7fc1..19703afac5 100644 --- a/tests/qemuxmlconfdata/disk-network-rbd-no-colon.x86_64-latest.args +++ b/tests/qemuxmlconfdata/disk-network-rbd-no-colon.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/disk-network-rbd.x86_64-latest.args b/te= sts/qemuxmlconfdata/disk-network-rbd.x86_64-latest.args index a15263c884..21a771b040 100644 --- a/tests/qemuxmlconfdata/disk-network-rbd.x86_64-latest.args +++ b/tests/qemuxmlconfdata/disk-network-rbd.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/disk-network-source-auth.x86_64-latest.a= rgs b/tests/qemuxmlconfdata/disk-network-source-auth.x86_64-latest.args index 8ba9fbf79f..e1f4f97624 100644 --- a/tests/qemuxmlconfdata/disk-network-source-auth.x86_64-latest.args +++ b/tests/qemuxmlconfdata/disk-network-source-auth.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/disk-network-source-curl-nbdkit-backing.= x86_64-latest.args b/tests/qemuxmlconfdata/disk-network-source-curl-nbdkit-= backing.x86_64-latest.args index 25ec2513c2..1383cf2716 100644 --- a/tests/qemuxmlconfdata/disk-network-source-curl-nbdkit-backing.x86_64-= latest.args +++ b/tests/qemuxmlconfdata/disk-network-source-curl-nbdkit-backing.x86_64-= latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/disk-network-source-curl-nbdkit.x86_64-l= atest.args b/tests/qemuxmlconfdata/disk-network-source-curl-nbdkit.x86_64-l= atest.args index 031f1c45f9..8cf9d627c7 100644 --- a/tests/qemuxmlconfdata/disk-network-source-curl-nbdkit.x86_64-latest.a= rgs +++ b/tests/qemuxmlconfdata/disk-network-source-curl-nbdkit.x86_64-latest.a= rgs @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/disk-network-source-curl.x86_64-latest.a= rgs b/tests/qemuxmlconfdata/disk-network-source-curl.x86_64-latest.args index 55574bc153..9e935d327c 100644 --- a/tests/qemuxmlconfdata/disk-network-source-curl.x86_64-latest.args +++ b/tests/qemuxmlconfdata/disk-network-source-curl.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/disk-network-ssh-key.x86_64-latest.args = b/tests/qemuxmlconfdata/disk-network-ssh-key.x86_64-latest.args index 87d446cbab..11c1df578d 100644 --- a/tests/qemuxmlconfdata/disk-network-ssh-key.x86_64-latest.args +++ b/tests/qemuxmlconfdata/disk-network-ssh-key.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/disk-network-ssh-nbdkit.x86_64-latest.ar= gs b/tests/qemuxmlconfdata/disk-network-ssh-nbdkit.x86_64-latest.args index 00a7b523b0..71aa2f4275 100644 --- a/tests/qemuxmlconfdata/disk-network-ssh-nbdkit.x86_64-latest.args +++ b/tests/qemuxmlconfdata/disk-network-ssh-nbdkit.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/disk-network-ssh-password.x86_64-latest.= args b/tests/qemuxmlconfdata/disk-network-ssh-password.x86_64-latest.args index 00a7b523b0..71aa2f4275 100644 --- a/tests/qemuxmlconfdata/disk-network-ssh-password.x86_64-latest.args +++ b/tests/qemuxmlconfdata/disk-network-ssh-password.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/disk-network-ssh.x86_64-latest.args b/te= sts/qemuxmlconfdata/disk-network-ssh.x86_64-latest.args index ba5f59643f..3df53d3305 100644 --- a/tests/qemuxmlconfdata/disk-network-ssh.x86_64-latest.args +++ b/tests/qemuxmlconfdata/disk-network-ssh.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/disk-network-tlsx509-nbd-hostname.x86_64= -latest.args b/tests/qemuxmlconfdata/disk-network-tlsx509-nbd-hostname.x86_= 64-latest.args index 77d38c3020..ed3fb618f6 100644 --- a/tests/qemuxmlconfdata/disk-network-tlsx509-nbd-hostname.x86_64-latest= .args +++ b/tests/qemuxmlconfdata/disk-network-tlsx509-nbd-hostname.x86_64-latest= .args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/disk-network-tlsx509-nbd.x86_64-latest.a= rgs b/tests/qemuxmlconfdata/disk-network-tlsx509-nbd.x86_64-latest.args index fb68ac54fb..18e65ca27a 100644 --- a/tests/qemuxmlconfdata/disk-network-tlsx509-nbd.x86_64-latest.args +++ b/tests/qemuxmlconfdata/disk-network-tlsx509-nbd.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/disk-no-boot.x86_64-latest.args b/tests/= qemuxmlconfdata/disk-no-boot.x86_64-latest.args index 7f007f6c4d..a151fdfd6d 100644 --- a/tests/qemuxmlconfdata/disk-no-boot.x86_64-latest.args +++ b/tests/qemuxmlconfdata/disk-no-boot.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/disk-nvme.x86_64-latest.args b/tests/qem= uxmlconfdata/disk-nvme.x86_64-latest.args index 4bb7d67dc9..6a8c22797d 100644 --- a/tests/qemuxmlconfdata/disk-nvme.x86_64-latest.args +++ b/tests/qemuxmlconfdata/disk-nvme.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/disk-order.x86_64-latest.args b/tests/qe= muxmlconfdata/disk-order.x86_64-latest.args index bf1d6983a4..01a96a3791 100644 --- a/tests/qemuxmlconfdata/disk-order.x86_64-latest.args +++ b/tests/qemuxmlconfdata/disk-order.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/disk-qcow2-datafile-store.x86_64-latest.= args b/tests/qemuxmlconfdata/disk-qcow2-datafile-store.x86_64-latest.args index 74f2d1a090..5227dcf635 100644 --- a/tests/qemuxmlconfdata/disk-qcow2-datafile-store.x86_64-latest.args +++ b/tests/qemuxmlconfdata/disk-qcow2-datafile-store.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/disk-readonly-disk.x86_64-latest.args b/= tests/qemuxmlconfdata/disk-readonly-disk.x86_64-latest.args index 41d9f53b3b..7745709790 100644 --- a/tests/qemuxmlconfdata/disk-readonly-disk.x86_64-latest.args +++ b/tests/qemuxmlconfdata/disk-readonly-disk.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/disk-rotation.x86_64-latest.args b/tests= /qemuxmlconfdata/disk-rotation.x86_64-latest.args index f66c6ad412..5d80fdb158 100644 --- a/tests/qemuxmlconfdata/disk-rotation.x86_64-latest.args +++ b/tests/qemuxmlconfdata/disk-rotation.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/disk-sata-device.x86_64-latest.args b/te= sts/qemuxmlconfdata/disk-sata-device.x86_64-latest.args index bd02898f37..5417bb7854 100644 --- a/tests/qemuxmlconfdata/disk-sata-device.x86_64-latest.args +++ b/tests/qemuxmlconfdata/disk-sata-device.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/disk-sata-product.x86_64-latest.args b/t= ests/qemuxmlconfdata/disk-sata-product.x86_64-latest.args index a171f5c447..408a91c867 100644 --- a/tests/qemuxmlconfdata/disk-sata-product.x86_64-latest.args +++ b/tests/qemuxmlconfdata/disk-sata-product.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/disk-scsi-device-auto.x86_64-latest.args= b/tests/qemuxmlconfdata/disk-scsi-device-auto.x86_64-latest.args index f8399e3032..865e8b0222 100644 --- a/tests/qemuxmlconfdata/disk-scsi-device-auto.x86_64-latest.args +++ b/tests/qemuxmlconfdata/disk-scsi-device-auto.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/disk-scsi-disk-split.x86_64-latest.args = b/tests/qemuxmlconfdata/disk-scsi-disk-split.x86_64-latest.args index 9ca00368e9..79830d65bd 100644 --- a/tests/qemuxmlconfdata/disk-scsi-disk-split.x86_64-latest.args +++ b/tests/qemuxmlconfdata/disk-scsi-disk-split.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/disk-scsi-disk-vpd.x86_64-latest.args b/= tests/qemuxmlconfdata/disk-scsi-disk-vpd.x86_64-latest.args index 4234a7e677..11a436b083 100644 --- a/tests/qemuxmlconfdata/disk-scsi-disk-vpd.x86_64-latest.args +++ b/tests/qemuxmlconfdata/disk-scsi-disk-vpd.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/disk-scsi-disk-wwn.x86_64-latest.args b/= tests/qemuxmlconfdata/disk-scsi-disk-wwn.x86_64-latest.args index b9897f748c..37de215637 100644 --- a/tests/qemuxmlconfdata/disk-scsi-disk-wwn.x86_64-latest.args +++ b/tests/qemuxmlconfdata/disk-scsi-disk-wwn.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/disk-scsi-lun-passthrough.x86_64-latest.= args b/tests/qemuxmlconfdata/disk-scsi-lun-passthrough.x86_64-latest.args index eacf10b64f..271526eb81 100644 --- a/tests/qemuxmlconfdata/disk-scsi-lun-passthrough.x86_64-latest.args +++ b/tests/qemuxmlconfdata/disk-scsi-lun-passthrough.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/disk-scsi.x86_64-latest.args b/tests/qem= uxmlconfdata/disk-scsi.x86_64-latest.args index ae0a1ffe0c..03d369fc0d 100644 --- a/tests/qemuxmlconfdata/disk-scsi.x86_64-latest.args +++ b/tests/qemuxmlconfdata/disk-scsi.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/disk-serial.x86_64-latest.args b/tests/q= emuxmlconfdata/disk-serial.x86_64-latest.args index 626900f130..e0f9595595 100644 --- a/tests/qemuxmlconfdata/disk-serial.x86_64-latest.args +++ b/tests/qemuxmlconfdata/disk-serial.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/disk-shared.x86_64-latest.args b/tests/q= emuxmlconfdata/disk-shared.x86_64-latest.args index c990126d13..3057ef5790 100644 --- a/tests/qemuxmlconfdata/disk-shared.x86_64-latest.args +++ b/tests/qemuxmlconfdata/disk-shared.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/disk-slices.x86_64-latest.args b/tests/q= emuxmlconfdata/disk-slices.x86_64-latest.args index 658391c477..2ad705f034 100644 --- a/tests/qemuxmlconfdata/disk-slices.x86_64-latest.args +++ b/tests/qemuxmlconfdata/disk-slices.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/disk-snapshot.x86_64-latest.args b/tests= /qemuxmlconfdata/disk-snapshot.x86_64-latest.args index 69e7ebb14e..794a6add26 100644 --- a/tests/qemuxmlconfdata/disk-snapshot.x86_64-latest.args +++ b/tests/qemuxmlconfdata/disk-snapshot.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/disk-source-fd.x86_64-latest.args b/test= s/qemuxmlconfdata/disk-source-fd.x86_64-latest.args index 148fe74233..54f7839868 100644 --- a/tests/qemuxmlconfdata/disk-source-fd.x86_64-latest.args +++ b/tests/qemuxmlconfdata/disk-source-fd.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/disk-source-pool-mode.x86_64-latest.args= b/tests/qemuxmlconfdata/disk-source-pool-mode.x86_64-latest.args index 2f41b255b4..041cd4c9fc 100644 --- a/tests/qemuxmlconfdata/disk-source-pool-mode.x86_64-latest.args +++ b/tests/qemuxmlconfdata/disk-source-pool-mode.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/disk-source-pool.x86_64-latest.args b/te= sts/qemuxmlconfdata/disk-source-pool.x86_64-latest.args index b4fc6841db..209d0a738a 100644 --- a/tests/qemuxmlconfdata/disk-source-pool.x86_64-latest.args +++ b/tests/qemuxmlconfdata/disk-source-pool.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/disk-startuppolicy-optional-drop.x86_64-= latest.args b/tests/qemuxmlconfdata/disk-startuppolicy-optional-drop.x86_64= -latest.args index 13ddbc1a5d..78e7c9df68 100644 --- a/tests/qemuxmlconfdata/disk-startuppolicy-optional-drop.x86_64-latest.= args +++ b/tests/qemuxmlconfdata/disk-startuppolicy-optional-drop.x86_64-latest.= args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/disk-statistics-intervals.x86_64-latest.= args b/tests/qemuxmlconfdata/disk-statistics-intervals.x86_64-latest.args index 3dd3dee99d..b95cf55623 100644 --- a/tests/qemuxmlconfdata/disk-statistics-intervals.x86_64-latest.args +++ b/tests/qemuxmlconfdata/disk-statistics-intervals.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/disk-target-nvme.x86_64-latest.args b/te= sts/qemuxmlconfdata/disk-target-nvme.x86_64-latest.args index 9551f1f290..66603bed0c 100644 --- a/tests/qemuxmlconfdata/disk-target-nvme.x86_64-latest.args +++ b/tests/qemuxmlconfdata/disk-target-nvme.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-bar/.co= nfig \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/disk-transient.x86_64-latest.args b/test= s/qemuxmlconfdata/disk-transient.x86_64-latest.args index 101435a991..61d733925e 100644 --- a/tests/qemuxmlconfdata/disk-transient.x86_64-latest.args +++ b/tests/qemuxmlconfdata/disk-transient.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/disk-usb-device-model.x86_64-latest.args= b/tests/qemuxmlconfdata/disk-usb-device-model.x86_64-latest.args index b2dd9c3264..18c401e1be 100644 --- a/tests/qemuxmlconfdata/disk-usb-device-model.x86_64-latest.args +++ b/tests/qemuxmlconfdata/disk-usb-device-model.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/disk-usb-device.x86_64-latest.QEMU_CAPS_= DEVICE_USB_BOT-disabled.args b/tests/qemuxmlconfdata/disk-usb-device.x86_64= -latest.QEMU_CAPS_DEVICE_USB_BOT-disabled.args index 079dfe5d99..e9871e9483 100644 --- a/tests/qemuxmlconfdata/disk-usb-device.x86_64-latest.QEMU_CAPS_DEVICE_= USB_BOT-disabled.args +++ b/tests/qemuxmlconfdata/disk-usb-device.x86_64-latest.QEMU_CAPS_DEVICE_= USB_BOT-disabled.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/disk-usb-device.x86_64-latest.abi-update= .QEMU_CAPS_DEVICE_USB_BOT-disabled.args b/tests/qemuxmlconfdata/disk-usb-de= vice.x86_64-latest.abi-update.QEMU_CAPS_DEVICE_USB_BOT-disabled.args index 079dfe5d99..e9871e9483 100644 --- a/tests/qemuxmlconfdata/disk-usb-device.x86_64-latest.abi-update.QEMU_C= APS_DEVICE_USB_BOT-disabled.args +++ b/tests/qemuxmlconfdata/disk-usb-device.x86_64-latest.abi-update.QEMU_C= APS_DEVICE_USB_BOT-disabled.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/disk-usb-device.x86_64-latest.abi-update= .args b/tests/qemuxmlconfdata/disk-usb-device.x86_64-latest.abi-update.args index d8208d29b6..df81ca60ed 100644 --- a/tests/qemuxmlconfdata/disk-usb-device.x86_64-latest.abi-update.args +++ b/tests/qemuxmlconfdata/disk-usb-device.x86_64-latest.abi-update.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/disk-usb-device.x86_64-latest.args b/tes= ts/qemuxmlconfdata/disk-usb-device.x86_64-latest.args index 079dfe5d99..e9871e9483 100644 --- a/tests/qemuxmlconfdata/disk-usb-device.x86_64-latest.args +++ b/tests/qemuxmlconfdata/disk-usb-device.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/disk-vhostuser-numa.x86_64-latest.args b= /tests/qemuxmlconfdata/disk-vhostuser-numa.x86_64-latest.args index 9cc4cba471..56bfe4a7c2 100644 --- a/tests/qemuxmlconfdata/disk-vhostuser-numa.x86_64-latest.args +++ b/tests/qemuxmlconfdata/disk-vhostuser-numa.x86_64-latest.args @@ -22,7 +22,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/disk-vhostuser.x86_64-latest.args b/test= s/qemuxmlconfdata/disk-vhostuser.x86_64-latest.args index 3b09a1a992..9380146ee3 100644 --- a/tests/qemuxmlconfdata/disk-vhostuser.x86_64-latest.args +++ b/tests/qemuxmlconfdata/disk-vhostuser.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/disk-vhostvdpa.x86_64-latest.args b/test= s/qemuxmlconfdata/disk-vhostvdpa.x86_64-latest.args index f52fcd2eb0..cd48c61c7d 100644 --- a/tests/qemuxmlconfdata/disk-vhostvdpa.x86_64-latest.args +++ b/tests/qemuxmlconfdata/disk-vhostvdpa.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/disk-virtio-ccw-many.s390x-latest.args b= /tests/qemuxmlconfdata/disk-virtio-ccw-many.s390x-latest.args index 6c32bd7af6..0c5c43d03c 100644 --- a/tests/qemuxmlconfdata/disk-virtio-ccw-many.s390x-latest.args +++ b/tests/qemuxmlconfdata/disk-virtio-ccw-many.s390x-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/disk-virtio-ccw.s390x-latest.args b/test= s/qemuxmlconfdata/disk-virtio-ccw.s390x-latest.args index 546637a943..1bd9802734 100644 --- a/tests/qemuxmlconfdata/disk-virtio-ccw.s390x-latest.args +++ b/tests/qemuxmlconfdata/disk-virtio-ccw.s390x-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/disk-virtio-queues.x86_64-latest.args b/= tests/qemuxmlconfdata/disk-virtio-queues.x86_64-latest.args index fa074e0211..f34e1ea6ca 100644 --- a/tests/qemuxmlconfdata/disk-virtio-queues.x86_64-latest.args +++ b/tests/qemuxmlconfdata/disk-virtio-queues.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/disk-virtio-s390-zpci.s390x-latest.args = b/tests/qemuxmlconfdata/disk-virtio-s390-zpci.s390x-latest.args index ee4f86ce61..e26d996104 100644 --- a/tests/qemuxmlconfdata/disk-virtio-s390-zpci.s390x-latest.args +++ b/tests/qemuxmlconfdata/disk-virtio-s390-zpci.s390x-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/disk-virtio-scsi-reservations.x86_64-lat= est.args b/tests/qemuxmlconfdata/disk-virtio-scsi-reservations.x86_64-lates= t.args index f1d7a450ee..516aadbfc6 100644 --- a/tests/qemuxmlconfdata/disk-virtio-scsi-reservations.x86_64-latest.args +++ b/tests/qemuxmlconfdata/disk-virtio-scsi-reservations.x86_64-latest.args @@ -22,7 +22,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/disk-virtio.x86_64-latest.args b/tests/q= emuxmlconfdata/disk-virtio.x86_64-latest.args index ae88d8d6e3..d1148f774b 100644 --- a/tests/qemuxmlconfdata/disk-virtio.x86_64-latest.args +++ b/tests/qemuxmlconfdata/disk-virtio.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/downscript.x86_64-latest.args b/tests/qe= muxmlconfdata/downscript.x86_64-latest.args index e9da65afe5..af29ca9aa1 100644 --- a/tests/qemuxmlconfdata/downscript.x86_64-latest.args +++ b/tests/qemuxmlconfdata/downscript.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/encrypted-disk-usage.x86_64-latest.args = b/tests/qemuxmlconfdata/encrypted-disk-usage.x86_64-latest.args index b53f3741d9..13b837a3af 100644 --- a/tests/qemuxmlconfdata/encrypted-disk-usage.x86_64-latest.args +++ b/tests/qemuxmlconfdata/encrypted-disk-usage.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-encrypt= disk/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/encrypted-disk.x86_64-latest.args b/test= s/qemuxmlconfdata/encrypted-disk.x86_64-latest.args index 460e5508cd..6990c63023 100644 --- a/tests/qemuxmlconfdata/encrypted-disk.x86_64-latest.args +++ b/tests/qemuxmlconfdata/encrypted-disk.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-encrypt= disk/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/eoi-disabled.x86_64-latest.args b/tests/= qemuxmlconfdata/eoi-disabled.x86_64-latest.args index 8550c8a85d..ec72cc8a2a 100644 --- a/tests/qemuxmlconfdata/eoi-disabled.x86_64-latest.args +++ b/tests/qemuxmlconfdata/eoi-disabled.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/eoi-enabled.x86_64-latest.args b/tests/q= emuxmlconfdata/eoi-enabled.x86_64-latest.args index f39c4e01b3..170e6f1fd5 100644 --- a/tests/qemuxmlconfdata/eoi-enabled.x86_64-latest.args +++ b/tests/qemuxmlconfdata/eoi-enabled.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/event_idx.x86_64-latest.args b/tests/qem= uxmlconfdata/event_idx.x86_64-latest.args index 88161667e0..6aa7c4cf14 100644 --- a/tests/qemuxmlconfdata/event_idx.x86_64-latest.args +++ b/tests/qemuxmlconfdata/event_idx.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-test/.c= onfig \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/fd-memory-no-numa-topology.x86_64-latest= .args b/tests/qemuxmlconfdata/fd-memory-no-numa-topology.x86_64-latest.args index 1bd75a85a6..df66c5bf16 100644 --- a/tests/qemuxmlconfdata/fd-memory-no-numa-topology.x86_64-latest.args +++ b/tests/qemuxmlconfdata/fd-memory-no-numa-topology.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-instanc= e-00000092/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/fd-memory-numa-topology.x86_64-latest.ar= gs b/tests/qemuxmlconfdata/fd-memory-numa-topology.x86_64-latest.args index 17ef506431..479a213c2b 100644 --- a/tests/qemuxmlconfdata/fd-memory-numa-topology.x86_64-latest.args +++ b/tests/qemuxmlconfdata/fd-memory-numa-topology.x86_64-latest.args @@ -22,7 +22,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-instanc= e-00000092/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/fd-memory-numa-topology2.x86_64-latest.a= rgs b/tests/qemuxmlconfdata/fd-memory-numa-topology2.x86_64-latest.args index b247231b85..92705fa234 100644 --- a/tests/qemuxmlconfdata/fd-memory-numa-topology2.x86_64-latest.args +++ b/tests/qemuxmlconfdata/fd-memory-numa-topology2.x86_64-latest.args @@ -24,7 +24,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-instanc= e-00000092/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/fd-memory-numa-topology3.x86_64-latest.a= rgs b/tests/qemuxmlconfdata/fd-memory-numa-topology3.x86_64-latest.args index 9e94209499..2fad64ad1a 100644 --- a/tests/qemuxmlconfdata/fd-memory-numa-topology3.x86_64-latest.args +++ b/tests/qemuxmlconfdata/fd-memory-numa-topology3.x86_64-latest.args @@ -26,7 +26,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-instanc= e-00000092/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/fd-memory-numa-topology4-old-machine.x86= _64-10.2.0.args b/tests/qemuxmlconfdata/fd-memory-numa-topology4-old-machin= e.x86_64-10.2.0.args index 3cc67fb138..2324303fd2 100644 --- a/tests/qemuxmlconfdata/fd-memory-numa-topology4-old-machine.x86_64-10.= 2.0.args +++ b/tests/qemuxmlconfdata/fd-memory-numa-topology4-old-machine.x86_64-10.= 2.0.args @@ -22,7 +22,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-pc/.con= fig \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/fd-memory-numa-topology4.x86_64-latest.a= rgs b/tests/qemuxmlconfdata/fd-memory-numa-topology4.x86_64-latest.args index 6c9425268c..9f147bbb64 100644 --- a/tests/qemuxmlconfdata/fd-memory-numa-topology4.x86_64-latest.args +++ b/tests/qemuxmlconfdata/fd-memory-numa-topology4.x86_64-latest.args @@ -22,7 +22,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-pc/.con= fig \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/fips-enabled.x86_64-latest.args b/tests/= qemuxmlconfdata/fips-enabled.x86_64-latest.args index 23beb54806..689b636c57 100644 --- a/tests/qemuxmlconfdata/fips-enabled.x86_64-latest.args +++ b/tests/qemuxmlconfdata/fips-enabled.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/firmware-auto-bios-stateless.x86_64-late= st.args b/tests/qemuxmlconfdata/firmware-auto-bios-stateless.x86_64-latest.= args index a6a52e2b52..6265f0b718 100644 --- a/tests/qemuxmlconfdata/firmware-auto-bios-stateless.x86_64-latest.args +++ b/tests/qemuxmlconfdata/firmware-auto-bios-stateless.x86_64-latest.args @@ -22,7 +22,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/firmware-auto-bios.x86_64-latest.args b/= tests/qemuxmlconfdata/firmware-auto-bios.x86_64-latest.args index a6a52e2b52..6265f0b718 100644 --- a/tests/qemuxmlconfdata/firmware-auto-bios.x86_64-latest.args +++ b/tests/qemuxmlconfdata/firmware-auto-bios.x86_64-latest.args @@ -22,7 +22,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/firmware-auto-efi-aarch64.aarch64-latest= .abi-update.args b/tests/qemuxmlconfdata/firmware-auto-efi-aarch64.aarch64-= latest.abi-update.args index 11a5ffba74..54b61aafb7 100644 --- a/tests/qemuxmlconfdata/firmware-auto-efi-aarch64.aarch64-latest.abi-up= date.args +++ b/tests/qemuxmlconfdata/firmware-auto-efi-aarch64.aarch64-latest.abi-up= date.args @@ -24,7 +24,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/firmware-auto-efi-aarch64.aarch64-latest= .args b/tests/qemuxmlconfdata/firmware-auto-efi-aarch64.aarch64-latest.args index d31fb472dc..4404db16d4 100644 --- a/tests/qemuxmlconfdata/firmware-auto-efi-aarch64.aarch64-latest.args +++ b/tests/qemuxmlconfdata/firmware-auto-efi-aarch64.aarch64-latest.args @@ -23,7 +23,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/firmware-auto-efi-enrolled-keys-aarch64.= aarch64-latest.args b/tests/qemuxmlconfdata/firmware-auto-efi-enrolled-keys= -aarch64.aarch64-latest.args index 10f1a5a6a4..c3a07af44c 100644 --- a/tests/qemuxmlconfdata/firmware-auto-efi-enrolled-keys-aarch64.aarch64= -latest.args +++ b/tests/qemuxmlconfdata/firmware-auto-efi-enrolled-keys-aarch64.aarch64= -latest.args @@ -22,7 +22,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/firmware-auto-efi-enrolled-keys.x86_64-l= atest.args b/tests/qemuxmlconfdata/firmware-auto-efi-enrolled-keys.x86_64-l= atest.args index e7c9110c95..a17764ccd7 100644 --- a/tests/qemuxmlconfdata/firmware-auto-efi-enrolled-keys.x86_64-latest.a= rgs +++ b/tests/qemuxmlconfdata/firmware-auto-efi-enrolled-keys.x86_64-latest.a= rgs @@ -25,7 +25,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/firmware-auto-efi-format-loader-qcow2-nv= ram-path.x86_64-latest.args b/tests/qemuxmlconfdata/firmware-auto-efi-forma= t-loader-qcow2-nvram-path.x86_64-latest.args index 25b93c8a2e..a80a9b3c78 100644 --- a/tests/qemuxmlconfdata/firmware-auto-efi-format-loader-qcow2-nvram-pat= h.x86_64-latest.args +++ b/tests/qemuxmlconfdata/firmware-auto-efi-format-loader-qcow2-nvram-pat= h.x86_64-latest.args @@ -26,7 +26,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/firmware-auto-efi-format-loader-qcow2.x8= 6_64-latest.args b/tests/qemuxmlconfdata/firmware-auto-efi-format-loader-qc= ow2.x86_64-latest.args index 468ad4326c..a824939895 100644 --- a/tests/qemuxmlconfdata/firmware-auto-efi-format-loader-qcow2.x86_64-la= test.args +++ b/tests/qemuxmlconfdata/firmware-auto-efi-format-loader-qcow2.x86_64-la= test.args @@ -26,7 +26,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/firmware-auto-efi-format-loader-raw.aarc= h64-latest.abi-update.args b/tests/qemuxmlconfdata/firmware-auto-efi-format= -loader-raw.aarch64-latest.abi-update.args index d4fe601f75..93c979214f 100644 --- a/tests/qemuxmlconfdata/firmware-auto-efi-format-loader-raw.aarch64-lat= est.abi-update.args +++ b/tests/qemuxmlconfdata/firmware-auto-efi-format-loader-raw.aarch64-lat= est.abi-update.args @@ -23,7 +23,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/firmware-auto-efi-format-loader-raw.aarc= h64-latest.args b/tests/qemuxmlconfdata/firmware-auto-efi-format-loader-raw= .aarch64-latest.args index d31fb472dc..4404db16d4 100644 --- a/tests/qemuxmlconfdata/firmware-auto-efi-format-loader-raw.aarch64-lat= est.args +++ b/tests/qemuxmlconfdata/firmware-auto-efi-format-loader-raw.aarch64-lat= est.args @@ -23,7 +23,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/firmware-auto-efi-format-mismatch.x86_64= -latest.args b/tests/qemuxmlconfdata/firmware-auto-efi-format-mismatch.x86_= 64-latest.args index 468d7ee048..b0d0a03b0e 100644 --- a/tests/qemuxmlconfdata/firmware-auto-efi-format-mismatch.x86_64-latest= .args +++ b/tests/qemuxmlconfdata/firmware-auto-efi-format-mismatch.x86_64-latest= .args @@ -26,7 +26,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/firmware-auto-efi-format-nvram-qcow2-net= work-nbd.x86_64-latest.args b/tests/qemuxmlconfdata/firmware-auto-efi-forma= t-nvram-qcow2-network-nbd.x86_64-latest.args index 046aeb77cd..f08d30b52f 100644 --- a/tests/qemuxmlconfdata/firmware-auto-efi-format-nvram-qcow2-network-nb= d.x86_64-latest.args +++ b/tests/qemuxmlconfdata/firmware-auto-efi-format-nvram-qcow2-network-nb= d.x86_64-latest.args @@ -25,7 +25,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/firmware-auto-efi-format-nvram-qcow2-pat= h.x86_64-latest.args b/tests/qemuxmlconfdata/firmware-auto-efi-format-nvram= -qcow2-path.x86_64-latest.args index 25b93c8a2e..a80a9b3c78 100644 --- a/tests/qemuxmlconfdata/firmware-auto-efi-format-nvram-qcow2-path.x86_6= 4-latest.args +++ b/tests/qemuxmlconfdata/firmware-auto-efi-format-nvram-qcow2-path.x86_6= 4-latest.args @@ -26,7 +26,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/firmware-auto-efi-format-nvram-qcow2.x86= _64-latest.args b/tests/qemuxmlconfdata/firmware-auto-efi-format-nvram-qcow= 2.x86_64-latest.args index 468ad4326c..a824939895 100644 --- a/tests/qemuxmlconfdata/firmware-auto-efi-format-nvram-qcow2.x86_64-lat= est.args +++ b/tests/qemuxmlconfdata/firmware-auto-efi-format-nvram-qcow2.x86_64-lat= est.args @@ -26,7 +26,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/firmware-auto-efi-format-nvram-raw-loade= r-path.x86_64-latest.args b/tests/qemuxmlconfdata/firmware-auto-efi-format-= nvram-raw-loader-path.x86_64-latest.args index 14027c21db..16a34040bd 100644 --- a/tests/qemuxmlconfdata/firmware-auto-efi-format-nvram-raw-loader-path.= x86_64-latest.args +++ b/tests/qemuxmlconfdata/firmware-auto-efi-format-nvram-raw-loader-path.= x86_64-latest.args @@ -25,7 +25,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/firmware-auto-efi-format-nvram-raw-nvram= template-path.x86_64-latest.args b/tests/qemuxmlconfdata/firmware-auto-efi-= format-nvram-raw-nvramtemplate-path.x86_64-latest.args index 14027c21db..16a34040bd 100644 --- a/tests/qemuxmlconfdata/firmware-auto-efi-format-nvram-raw-nvramtemplat= e-path.x86_64-latest.args +++ b/tests/qemuxmlconfdata/firmware-auto-efi-format-nvram-raw-nvramtemplat= e-path.x86_64-latest.args @@ -25,7 +25,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/firmware-auto-efi-format-nvram-raw.x86_6= 4-latest.abi-update.args b/tests/qemuxmlconfdata/firmware-auto-efi-format-n= vram-raw.x86_64-latest.abi-update.args index e7c9110c95..a17764ccd7 100644 --- a/tests/qemuxmlconfdata/firmware-auto-efi-format-nvram-raw.x86_64-lates= t.abi-update.args +++ b/tests/qemuxmlconfdata/firmware-auto-efi-format-nvram-raw.x86_64-lates= t.abi-update.args @@ -25,7 +25,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/firmware-auto-efi-format-nvram-raw.x86_6= 4-latest.args b/tests/qemuxmlconfdata/firmware-auto-efi-format-nvram-raw.x8= 6_64-latest.args index e7c9110c95..a17764ccd7 100644 --- a/tests/qemuxmlconfdata/firmware-auto-efi-format-nvram-raw.x86_64-lates= t.args +++ b/tests/qemuxmlconfdata/firmware-auto-efi-format-nvram-raw.x86_64-lates= t.args @@ -25,7 +25,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/firmware-auto-efi-format-nvramtemplate-q= cow2.x86_64-latest.args b/tests/qemuxmlconfdata/firmware-auto-efi-format-nv= ramtemplate-qcow2.x86_64-latest.args index 468ad4326c..a824939895 100644 --- a/tests/qemuxmlconfdata/firmware-auto-efi-format-nvramtemplate-qcow2.x8= 6_64-latest.args +++ b/tests/qemuxmlconfdata/firmware-auto-efi-format-nvramtemplate-qcow2.x8= 6_64-latest.args @@ -26,7 +26,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/firmware-auto-efi-loader-insecure.x86_64= -latest.args b/tests/qemuxmlconfdata/firmware-auto-efi-loader-insecure.x86_= 64-latest.args index cbafadec2c..05ad82842e 100644 --- a/tests/qemuxmlconfdata/firmware-auto-efi-loader-insecure.x86_64-latest= .args +++ b/tests/qemuxmlconfdata/firmware-auto-efi-loader-insecure.x86_64-latest= .args @@ -24,7 +24,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/firmware-auto-efi-loader-path.x86_64-lat= est.args b/tests/qemuxmlconfdata/firmware-auto-efi-loader-path.x86_64-lates= t.args index cbafadec2c..05ad82842e 100644 --- a/tests/qemuxmlconfdata/firmware-auto-efi-loader-path.x86_64-latest.args +++ b/tests/qemuxmlconfdata/firmware-auto-efi-loader-path.x86_64-latest.args @@ -24,7 +24,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/firmware-auto-efi-loader-secure.x86_64-l= atest.abi-update.args b/tests/qemuxmlconfdata/firmware-auto-efi-loader-secu= re.x86_64-latest.abi-update.args index 468ad4326c..a824939895 100644 --- a/tests/qemuxmlconfdata/firmware-auto-efi-loader-secure.x86_64-latest.a= bi-update.args +++ b/tests/qemuxmlconfdata/firmware-auto-efi-loader-secure.x86_64-latest.a= bi-update.args @@ -26,7 +26,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/firmware-auto-efi-loader-secure.x86_64-l= atest.args b/tests/qemuxmlconfdata/firmware-auto-efi-loader-secure.x86_64-l= atest.args index e7c9110c95..a17764ccd7 100644 --- a/tests/qemuxmlconfdata/firmware-auto-efi-loader-secure.x86_64-latest.a= rgs +++ b/tests/qemuxmlconfdata/firmware-auto-efi-loader-secure.x86_64-latest.a= rgs @@ -25,7 +25,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/firmware-auto-efi-loongarch64.loongarch6= 4-latest.abi-update.args b/tests/qemuxmlconfdata/firmware-auto-efi-loongarc= h64.loongarch64-latest.abi-update.args index d31cb2dae8..f48ae817eb 100644 --- a/tests/qemuxmlconfdata/firmware-auto-efi-loongarch64.loongarch64-lates= t.abi-update.args +++ b/tests/qemuxmlconfdata/firmware-auto-efi-loongarch64.loongarch64-lates= t.abi-update.args @@ -25,7 +25,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/firmware-auto-efi-loongarch64.loongarch6= 4-latest.args b/tests/qemuxmlconfdata/firmware-auto-efi-loongarch64.loongar= ch64-latest.args index d31cb2dae8..f48ae817eb 100644 --- a/tests/qemuxmlconfdata/firmware-auto-efi-loongarch64.loongarch64-lates= t.args +++ b/tests/qemuxmlconfdata/firmware-auto-efi-loongarch64.loongarch64-lates= t.args @@ -25,7 +25,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/firmware-auto-efi-no-enrolled-keys.x86_6= 4-latest.args b/tests/qemuxmlconfdata/firmware-auto-efi-no-enrolled-keys.x8= 6_64-latest.args index e7c9110c95..a17764ccd7 100644 --- a/tests/qemuxmlconfdata/firmware-auto-efi-no-enrolled-keys.x86_64-lates= t.args +++ b/tests/qemuxmlconfdata/firmware-auto-efi-no-enrolled-keys.x86_64-lates= t.args @@ -25,7 +25,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/firmware-auto-efi-no-secboot.x86_64-late= st.args b/tests/qemuxmlconfdata/firmware-auto-efi-no-secboot.x86_64-latest.= args index cbafadec2c..05ad82842e 100644 --- a/tests/qemuxmlconfdata/firmware-auto-efi-no-secboot.x86_64-latest.args +++ b/tests/qemuxmlconfdata/firmware-auto-efi-no-secboot.x86_64-latest.args @@ -24,7 +24,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/firmware-auto-efi-nvram-file.x86_64-late= st.args b/tests/qemuxmlconfdata/firmware-auto-efi-nvram-file.x86_64-latest.= args index 0cb780853a..376e47487f 100644 --- a/tests/qemuxmlconfdata/firmware-auto-efi-nvram-file.x86_64-latest.args +++ b/tests/qemuxmlconfdata/firmware-auto-efi-nvram-file.x86_64-latest.args @@ -24,7 +24,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/firmware-auto-efi-nvram-network-iscsi.x8= 6_64-latest.args b/tests/qemuxmlconfdata/firmware-auto-efi-nvram-network-is= csi.x86_64-latest.args index 026155edff..9c43a1a793 100644 --- a/tests/qemuxmlconfdata/firmware-auto-efi-nvram-network-iscsi.x86_64-la= test.args +++ b/tests/qemuxmlconfdata/firmware-auto-efi-nvram-network-iscsi.x86_64-la= test.args @@ -25,7 +25,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/firmware-auto-efi-nvram-network-nbd.x86_= 64-latest.args b/tests/qemuxmlconfdata/firmware-auto-efi-nvram-network-nbd.= x86_64-latest.args index 2999e321d7..b465ca5ccc 100644 --- a/tests/qemuxmlconfdata/firmware-auto-efi-nvram-network-nbd.x86_64-late= st.args +++ b/tests/qemuxmlconfdata/firmware-auto-efi-nvram-network-nbd.x86_64-late= st.args @@ -24,7 +24,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/firmware-auto-efi-nvram-path.x86_64-late= st.args b/tests/qemuxmlconfdata/firmware-auto-efi-nvram-path.x86_64-latest.= args index 6fb2c7ffc4..e4d9d1f643 100644 --- a/tests/qemuxmlconfdata/firmware-auto-efi-nvram-path.x86_64-latest.args +++ b/tests/qemuxmlconfdata/firmware-auto-efi-nvram-path.x86_64-latest.args @@ -25,7 +25,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/firmware-auto-efi-nvram-template.x86_64-= latest.args b/tests/qemuxmlconfdata/firmware-auto-efi-nvram-template.x86_64= -latest.args index e7c9110c95..a17764ccd7 100644 --- a/tests/qemuxmlconfdata/firmware-auto-efi-nvram-template.x86_64-latest.= args +++ b/tests/qemuxmlconfdata/firmware-auto-efi-nvram-template.x86_64-latest.= args @@ -25,7 +25,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/firmware-auto-efi-riscv64.riscv64-latest= .abi-update.args b/tests/qemuxmlconfdata/firmware-auto-efi-riscv64.riscv64-= latest.abi-update.args index f467f71d72..497f5e616c 100644 --- a/tests/qemuxmlconfdata/firmware-auto-efi-riscv64.riscv64-latest.abi-up= date.args +++ b/tests/qemuxmlconfdata/firmware-auto-efi-riscv64.riscv64-latest.abi-up= date.args @@ -25,7 +25,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/firmware-auto-efi-rw-pflash.x86_64-lates= t.args b/tests/qemuxmlconfdata/firmware-auto-efi-rw-pflash.x86_64-latest.ar= gs index d06de24db8..779ba70768 100644 --- a/tests/qemuxmlconfdata/firmware-auto-efi-rw-pflash.x86_64-latest.args +++ b/tests/qemuxmlconfdata/firmware-auto-efi-rw-pflash.x86_64-latest.args @@ -24,7 +24,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/firmware-auto-efi-rw.x86_64-latest.args = b/tests/qemuxmlconfdata/firmware-auto-efi-rw.x86_64-latest.args index d06de24db8..779ba70768 100644 --- a/tests/qemuxmlconfdata/firmware-auto-efi-rw.x86_64-latest.args +++ b/tests/qemuxmlconfdata/firmware-auto-efi-rw.x86_64-latest.args @@ -24,7 +24,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/firmware-auto-efi-secboot.x86_64-latest.= args b/tests/qemuxmlconfdata/firmware-auto-efi-secboot.x86_64-latest.args index e7c9110c95..a17764ccd7 100644 --- a/tests/qemuxmlconfdata/firmware-auto-efi-secboot.x86_64-latest.args +++ b/tests/qemuxmlconfdata/firmware-auto-efi-secboot.x86_64-latest.args @@ -25,7 +25,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/firmware-auto-efi-sev-snp.x86_64-latest+= amdsev.args b/tests/qemuxmlconfdata/firmware-auto-efi-sev-snp.x86_64-latest= +amdsev.args index 99350f600c..608ccff0c5 100644 --- a/tests/qemuxmlconfdata/firmware-auto-efi-sev-snp.x86_64-latest+amdsev.= args +++ b/tests/qemuxmlconfdata/firmware-auto-efi-sev-snp.x86_64-latest+amdsev.= args @@ -23,7 +23,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/firmware-auto-efi-sev-stateful.x86_64-la= test+amdsev.args b/tests/qemuxmlconfdata/firmware-auto-efi-sev-stateful.x86= _64-latest+amdsev.args index 550ac52b8a..c8e110f88e 100644 --- a/tests/qemuxmlconfdata/firmware-auto-efi-sev-stateful.x86_64-latest+am= dsev.args +++ b/tests/qemuxmlconfdata/firmware-auto-efi-sev-stateful.x86_64-latest+am= dsev.args @@ -24,7 +24,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/firmware-auto-efi-sev.x86_64-latest+amds= ev.args b/tests/qemuxmlconfdata/firmware-auto-efi-sev.x86_64-latest+amdsev.= args index 550ac52b8a..c8e110f88e 100644 --- a/tests/qemuxmlconfdata/firmware-auto-efi-sev.x86_64-latest+amdsev.args +++ b/tests/qemuxmlconfdata/firmware-auto-efi-sev.x86_64-latest+amdsev.args @@ -24,7 +24,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/firmware-auto-efi-smm-off.x86_64-latest.= args b/tests/qemuxmlconfdata/firmware-auto-efi-smm-off.x86_64-latest.args index 42a47fe29e..b1196a599c 100644 --- a/tests/qemuxmlconfdata/firmware-auto-efi-smm-off.x86_64-latest.args +++ b/tests/qemuxmlconfdata/firmware-auto-efi-smm-off.x86_64-latest.args @@ -24,7 +24,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/firmware-auto-efi-stateless.x86_64-lates= t.args b/tests/qemuxmlconfdata/firmware-auto-efi-stateless.x86_64-latest.ar= gs index 0c0caf2468..81ddc73d48 100644 --- a/tests/qemuxmlconfdata/firmware-auto-efi-stateless.x86_64-latest.args +++ b/tests/qemuxmlconfdata/firmware-auto-efi-stateless.x86_64-latest.args @@ -23,7 +23,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/firmware-auto-efi-varstore-aarch64.aarch= 64-latest.args b/tests/qemuxmlconfdata/firmware-auto-efi-varstore-aarch64.a= arch64-latest.args index 10f1a5a6a4..c3a07af44c 100644 --- a/tests/qemuxmlconfdata/firmware-auto-efi-varstore-aarch64.aarch64-late= st.args +++ b/tests/qemuxmlconfdata/firmware-auto-efi-varstore-aarch64.aarch64-late= st.args @@ -22,7 +22,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/firmware-auto-efi-varstore-q35.x86_64-la= test.args b/tests/qemuxmlconfdata/firmware-auto-efi-varstore-q35.x86_64-lat= est.args index 392ea77c28..2d75ef55f1 100644 --- a/tests/qemuxmlconfdata/firmware-auto-efi-varstore-q35.x86_64-latest.ar= gs +++ b/tests/qemuxmlconfdata/firmware-auto-efi-varstore-q35.x86_64-latest.ar= gs @@ -23,7 +23,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/firmware-auto-efi.x86_64-latest.abi-upda= te.args b/tests/qemuxmlconfdata/firmware-auto-efi.x86_64-latest.abi-update.= args index 468ad4326c..a824939895 100644 --- a/tests/qemuxmlconfdata/firmware-auto-efi.x86_64-latest.abi-update.args +++ b/tests/qemuxmlconfdata/firmware-auto-efi.x86_64-latest.abi-update.args @@ -26,7 +26,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/firmware-auto-efi.x86_64-latest.args b/t= ests/qemuxmlconfdata/firmware-auto-efi.x86_64-latest.args index e7c9110c95..a17764ccd7 100644 --- a/tests/qemuxmlconfdata/firmware-auto-efi.x86_64-latest.args +++ b/tests/qemuxmlconfdata/firmware-auto-efi.x86_64-latest.args @@ -25,7 +25,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/firmware-manual-bios-not-stateless.x86_6= 4-latest.args b/tests/qemuxmlconfdata/firmware-manual-bios-not-stateless.x8= 6_64-latest.args index 969c7ad68c..ee19f80c46 100644 --- a/tests/qemuxmlconfdata/firmware-manual-bios-not-stateless.x86_64-lates= t.args +++ b/tests/qemuxmlconfdata/firmware-manual-bios-not-stateless.x86_64-lates= t.args @@ -22,7 +22,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/firmware-manual-bios-stateless.x86_64-la= test.args b/tests/qemuxmlconfdata/firmware-manual-bios-stateless.x86_64-lat= est.args index 969c7ad68c..ee19f80c46 100644 --- a/tests/qemuxmlconfdata/firmware-manual-bios-stateless.x86_64-latest.ar= gs +++ b/tests/qemuxmlconfdata/firmware-manual-bios-stateless.x86_64-latest.ar= gs @@ -22,7 +22,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/firmware-manual-bios.x86_64-latest.args = b/tests/qemuxmlconfdata/firmware-manual-bios.x86_64-latest.args index 969c7ad68c..ee19f80c46 100644 --- a/tests/qemuxmlconfdata/firmware-manual-bios.x86_64-latest.args +++ b/tests/qemuxmlconfdata/firmware-manual-bios.x86_64-latest.args @@ -22,7 +22,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/firmware-manual-efi-aarch64-legacy-paths= .aarch64-latest.args b/tests/qemuxmlconfdata/firmware-manual-efi-aarch64-le= gacy-paths.aarch64-latest.args index 8d52231c69..250109005a 100644 --- a/tests/qemuxmlconfdata/firmware-manual-efi-aarch64-legacy-paths.aarch6= 4-latest.args +++ b/tests/qemuxmlconfdata/firmware-manual-efi-aarch64-legacy-paths.aarch6= 4-latest.args @@ -23,7 +23,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/firmware-manual-efi-acpi-aarch64.aarch64= -latest.args b/tests/qemuxmlconfdata/firmware-manual-efi-acpi-aarch64.aarch= 64-latest.args index 26a4fdcd0d..7744793b81 100644 --- a/tests/qemuxmlconfdata/firmware-manual-efi-acpi-aarch64.aarch64-latest= .args +++ b/tests/qemuxmlconfdata/firmware-manual-efi-acpi-aarch64.aarch64-latest= .args @@ -23,7 +23,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/firmware-manual-efi-acpi-q35.x86_64-late= st.args b/tests/qemuxmlconfdata/firmware-manual-efi-acpi-q35.x86_64-latest.= args index fd560fa9fe..50ab59acec 100644 --- a/tests/qemuxmlconfdata/firmware-manual-efi-acpi-q35.x86_64-latest.args +++ b/tests/qemuxmlconfdata/firmware-manual-efi-acpi-q35.x86_64-latest.args @@ -24,7 +24,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/firmware-manual-efi-features.x86_64-late= st.args b/tests/qemuxmlconfdata/firmware-manual-efi-features.x86_64-latest.= args index d8a1abd7ff..ac6cf076d4 100644 --- a/tests/qemuxmlconfdata/firmware-manual-efi-features.x86_64-latest.args +++ b/tests/qemuxmlconfdata/firmware-manual-efi-features.x86_64-latest.args @@ -24,7 +24,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/firmware-manual-efi-loader-path-nonstand= ard.x86_64-latest.args b/tests/qemuxmlconfdata/firmware-manual-efi-loader-p= ath-nonstandard.x86_64-latest.args index a77d7fe7fd..9e900b9711 100644 --- a/tests/qemuxmlconfdata/firmware-manual-efi-loader-path-nonstandard.x86= _64-latest.args +++ b/tests/qemuxmlconfdata/firmware-manual-efi-loader-path-nonstandard.x86= _64-latest.args @@ -24,7 +24,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/firmware-manual-efi-loader-secure.x86_64= -latest.args b/tests/qemuxmlconfdata/firmware-manual-efi-loader-secure.x86_= 64-latest.args index 07f220db04..3f805244b6 100644 --- a/tests/qemuxmlconfdata/firmware-manual-efi-loader-secure.x86_64-latest= .args +++ b/tests/qemuxmlconfdata/firmware-manual-efi-loader-secure.x86_64-latest= .args @@ -25,7 +25,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/firmware-manual-efi-no-enrolled-keys-leg= acy-paths.x86_64-latest.args b/tests/qemuxmlconfdata/firmware-manual-efi-no= -enrolled-keys-legacy-paths.x86_64-latest.args index 1bbba7e99f..308010ee5d 100644 --- a/tests/qemuxmlconfdata/firmware-manual-efi-no-enrolled-keys-legacy-pat= hs.x86_64-latest.args +++ b/tests/qemuxmlconfdata/firmware-manual-efi-no-enrolled-keys-legacy-pat= hs.x86_64-latest.args @@ -25,7 +25,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/firmware-manual-efi-no-enrolled-keys.x86= _64-latest.args b/tests/qemuxmlconfdata/firmware-manual-efi-no-enrolled-key= s.x86_64-latest.args index 07f220db04..3f805244b6 100644 --- a/tests/qemuxmlconfdata/firmware-manual-efi-no-enrolled-keys.x86_64-lat= est.args +++ b/tests/qemuxmlconfdata/firmware-manual-efi-no-enrolled-keys.x86_64-lat= est.args @@ -25,7 +25,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/firmware-manual-efi-no-secboot-legacy-pa= ths.x86_64-latest.args b/tests/qemuxmlconfdata/firmware-manual-efi-no-secbo= ot-legacy-paths.x86_64-latest.args index 2113a46e80..a2a6ca920e 100644 --- a/tests/qemuxmlconfdata/firmware-manual-efi-no-secboot-legacy-paths.x86= _64-latest.args +++ b/tests/qemuxmlconfdata/firmware-manual-efi-no-secboot-legacy-paths.x86= _64-latest.args @@ -24,7 +24,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/firmware-manual-efi-no-secboot.x86_64-la= test.args b/tests/qemuxmlconfdata/firmware-manual-efi-no-secboot.x86_64-lat= est.args index fd560fa9fe..50ab59acec 100644 --- a/tests/qemuxmlconfdata/firmware-manual-efi-no-secboot.x86_64-latest.ar= gs +++ b/tests/qemuxmlconfdata/firmware-manual-efi-no-secboot.x86_64-latest.ar= gs @@ -24,7 +24,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/firmware-manual-efi-noacpi-aarch64.aarch= 64-latest.args b/tests/qemuxmlconfdata/firmware-manual-efi-noacpi-aarch64.a= arch64-latest.args index dba1be6c8a..106fa2f2ac 100644 --- a/tests/qemuxmlconfdata/firmware-manual-efi-noacpi-aarch64.aarch64-late= st.args +++ b/tests/qemuxmlconfdata/firmware-manual-efi-noacpi-aarch64.aarch64-late= st.args @@ -23,7 +23,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/firmware-manual-efi-nvram-file.x86_64-la= test.args b/tests/qemuxmlconfdata/firmware-manual-efi-nvram-file.x86_64-lat= est.args index 0cb780853a..376e47487f 100644 --- a/tests/qemuxmlconfdata/firmware-manual-efi-nvram-file.x86_64-latest.ar= gs +++ b/tests/qemuxmlconfdata/firmware-manual-efi-nvram-file.x86_64-latest.ar= gs @@ -24,7 +24,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/firmware-manual-efi-nvram-network-iscsi.= x86_64-latest.args b/tests/qemuxmlconfdata/firmware-manual-efi-nvram-networ= k-iscsi.x86_64-latest.args index 026155edff..9c43a1a793 100644 --- a/tests/qemuxmlconfdata/firmware-manual-efi-nvram-network-iscsi.x86_64-= latest.args +++ b/tests/qemuxmlconfdata/firmware-manual-efi-nvram-network-iscsi.x86_64-= latest.args @@ -25,7 +25,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/firmware-manual-efi-nvram-network-nbd.x8= 6_64-latest.args b/tests/qemuxmlconfdata/firmware-manual-efi-nvram-network-= nbd.x86_64-latest.args index 2999e321d7..b465ca5ccc 100644 --- a/tests/qemuxmlconfdata/firmware-manual-efi-nvram-network-nbd.x86_64-la= test.args +++ b/tests/qemuxmlconfdata/firmware-manual-efi-nvram-network-nbd.x86_64-la= test.args @@ -24,7 +24,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/firmware-manual-efi-nvram-template-nonst= andard-format.x86_64-latest.args b/tests/qemuxmlconfdata/firmware-manual-ef= i-nvram-template-nonstandard-format.x86_64-latest.args index fa0626a8f3..8784526f93 100644 --- a/tests/qemuxmlconfdata/firmware-manual-efi-nvram-template-nonstandard-= format.x86_64-latest.args +++ b/tests/qemuxmlconfdata/firmware-manual-efi-nvram-template-nonstandard-= format.x86_64-latest.args @@ -25,7 +25,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/firmware-manual-efi-nvram-template-nonst= andard-legacy-paths.x86_64-latest.args b/tests/qemuxmlconfdata/firmware-man= ual-efi-nvram-template-nonstandard-legacy-paths.x86_64-latest.args index 18ca736065..20d8cd5c37 100644 --- a/tests/qemuxmlconfdata/firmware-manual-efi-nvram-template-nonstandard-= legacy-paths.x86_64-latest.args +++ b/tests/qemuxmlconfdata/firmware-manual-efi-nvram-template-nonstandard-= legacy-paths.x86_64-latest.args @@ -25,7 +25,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/firmware-manual-efi-nvram-template-nonst= andard.x86_64-latest.args b/tests/qemuxmlconfdata/firmware-manual-efi-nvram= -template-nonstandard.x86_64-latest.args index cbafadec2c..05ad82842e 100644 --- a/tests/qemuxmlconfdata/firmware-manual-efi-nvram-template-nonstandard.= x86_64-latest.args +++ b/tests/qemuxmlconfdata/firmware-manual-efi-nvram-template-nonstandard.= x86_64-latest.args @@ -24,7 +24,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/firmware-manual-efi-nvram-template.x86_6= 4-latest.args b/tests/qemuxmlconfdata/firmware-manual-efi-nvram-template.x8= 6_64-latest.args index d8a1abd7ff..ac6cf076d4 100644 --- a/tests/qemuxmlconfdata/firmware-manual-efi-nvram-template.x86_64-lates= t.args +++ b/tests/qemuxmlconfdata/firmware-manual-efi-nvram-template.x86_64-lates= t.args @@ -24,7 +24,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/firmware-manual-efi-rw-implicit.x86_64-l= atest.args b/tests/qemuxmlconfdata/firmware-manual-efi-rw-implicit.x86_64-l= atest.args index 962ce5525b..749d116748 100644 --- a/tests/qemuxmlconfdata/firmware-manual-efi-rw-implicit.x86_64-latest.a= rgs +++ b/tests/qemuxmlconfdata/firmware-manual-efi-rw-implicit.x86_64-latest.a= rgs @@ -23,7 +23,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/firmware-manual-efi-rw-legacy-paths.x86_= 64-latest.args b/tests/qemuxmlconfdata/firmware-manual-efi-rw-legacy-paths.= x86_64-latest.args index f724cca477..45ecfc8aa4 100644 --- a/tests/qemuxmlconfdata/firmware-manual-efi-rw-legacy-paths.x86_64-late= st.args +++ b/tests/qemuxmlconfdata/firmware-manual-efi-rw-legacy-paths.x86_64-late= st.args @@ -23,7 +23,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/firmware-manual-efi-rw-modern-paths.x86_= 64-latest.args b/tests/qemuxmlconfdata/firmware-manual-efi-rw-modern-paths.= x86_64-latest.args index 4e4b7d563d..474babca98 100644 --- a/tests/qemuxmlconfdata/firmware-manual-efi-rw-modern-paths.x86_64-late= st.args +++ b/tests/qemuxmlconfdata/firmware-manual-efi-rw-modern-paths.x86_64-late= st.args @@ -23,7 +23,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/firmware-manual-efi-rw.x86_64-latest.arg= s b/tests/qemuxmlconfdata/firmware-manual-efi-rw.x86_64-latest.args index 962ce5525b..749d116748 100644 --- a/tests/qemuxmlconfdata/firmware-manual-efi-rw.x86_64-latest.args +++ b/tests/qemuxmlconfdata/firmware-manual-efi-rw.x86_64-latest.args @@ -23,7 +23,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/firmware-manual-efi-secboot-legacy-paths= .x86_64-latest.args b/tests/qemuxmlconfdata/firmware-manual-efi-secboot-leg= acy-paths.x86_64-latest.args index 1bbba7e99f..308010ee5d 100644 --- a/tests/qemuxmlconfdata/firmware-manual-efi-secboot-legacy-paths.x86_64= -latest.args +++ b/tests/qemuxmlconfdata/firmware-manual-efi-secboot-legacy-paths.x86_64= -latest.args @@ -25,7 +25,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/firmware-manual-efi-secboot.x86_64-lates= t.args b/tests/qemuxmlconfdata/firmware-manual-efi-secboot.x86_64-latest.ar= gs index 07f220db04..3f805244b6 100644 --- a/tests/qemuxmlconfdata/firmware-manual-efi-secboot.x86_64-latest.args +++ b/tests/qemuxmlconfdata/firmware-manual-efi-secboot.x86_64-latest.args @@ -25,7 +25,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/firmware-manual-efi-sev-snp.x86_64-lates= t+amdsev.args b/tests/qemuxmlconfdata/firmware-manual-efi-sev-snp.x86_64-la= test+amdsev.args index 99350f600c..608ccff0c5 100644 --- a/tests/qemuxmlconfdata/firmware-manual-efi-sev-snp.x86_64-latest+amdse= v.args +++ b/tests/qemuxmlconfdata/firmware-manual-efi-sev-snp.x86_64-latest+amdse= v.args @@ -23,7 +23,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/firmware-manual-efi-stateless.x86_64-lat= est.args b/tests/qemuxmlconfdata/firmware-manual-efi-stateless.x86_64-lates= t.args index ff30beeb35..ede3bb02ea 100644 --- a/tests/qemuxmlconfdata/firmware-manual-efi-stateless.x86_64-latest.args +++ b/tests/qemuxmlconfdata/firmware-manual-efi-stateless.x86_64-latest.args @@ -23,7 +23,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/firmware-manual-efi-tdx.x86_64-latest+in= teltdx.args b/tests/qemuxmlconfdata/firmware-manual-efi-tdx.x86_64-latest+i= nteltdx.args index 33a73bfc10..42f3526514 100644 --- a/tests/qemuxmlconfdata/firmware-manual-efi-tdx.x86_64-latest+inteltdx.= args +++ b/tests/qemuxmlconfdata/firmware-manual-efi-tdx.x86_64-latest+inteltdx.= args @@ -22,7 +22,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/firmware-manual-efi-varstore-aarch64.aar= ch64-latest.args b/tests/qemuxmlconfdata/firmware-manual-efi-varstore-aarch= 64.aarch64-latest.args index 894bab7ffe..41248042f1 100644 --- a/tests/qemuxmlconfdata/firmware-manual-efi-varstore-aarch64.aarch64-la= test.args +++ b/tests/qemuxmlconfdata/firmware-manual-efi-varstore-aarch64.aarch64-la= test.args @@ -22,7 +22,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/firmware-manual-efi-varstore-q35.x86_64-= latest.args b/tests/qemuxmlconfdata/firmware-manual-efi-varstore-q35.x86_64= -latest.args index 6c04c8c39f..1643d13961 100644 --- a/tests/qemuxmlconfdata/firmware-manual-efi-varstore-q35.x86_64-latest.= args +++ b/tests/qemuxmlconfdata/firmware-manual-efi-varstore-q35.x86_64-latest.= args @@ -23,7 +23,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/firmware-manual-efi.x86_64-latest.args b= /tests/qemuxmlconfdata/firmware-manual-efi.x86_64-latest.args index 0cb780853a..376e47487f 100644 --- a/tests/qemuxmlconfdata/firmware-manual-efi.x86_64-latest.args +++ b/tests/qemuxmlconfdata/firmware-manual-efi.x86_64-latest.args @@ -24,7 +24,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/firmware-manual-noefi-acpi-q35.x86_64-la= test.args b/tests/qemuxmlconfdata/firmware-manual-noefi-acpi-q35.x86_64-lat= est.args index 72fa81a9b3..ee2b3d58cb 100644 --- a/tests/qemuxmlconfdata/firmware-manual-noefi-acpi-q35.x86_64-latest.ar= gs +++ b/tests/qemuxmlconfdata/firmware-manual-noefi-acpi-q35.x86_64-latest.ar= gs @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/firmware-manual-noefi-noacpi-aarch64.aar= ch64-latest.args b/tests/qemuxmlconfdata/firmware-manual-noefi-noacpi-aarch= 64.aarch64-latest.args index 8784023d86..f268722856 100644 --- a/tests/qemuxmlconfdata/firmware-manual-noefi-noacpi-aarch64.aarch64-la= test.args +++ b/tests/qemuxmlconfdata/firmware-manual-noefi-noacpi-aarch64.aarch64-la= test.args @@ -20,7 +20,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/firmware-manual-noefi-noacpi-q35.x86_64-= latest.args b/tests/qemuxmlconfdata/firmware-manual-noefi-noacpi-q35.x86_64= -latest.args index 203e91e3c0..825fc41042 100644 --- a/tests/qemuxmlconfdata/firmware-manual-noefi-noacpi-q35.x86_64-latest.= args +++ b/tests/qemuxmlconfdata/firmware-manual-noefi-noacpi-q35.x86_64-latest.= args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/floppy-drive-fat.x86_64-latest.args b/te= sts/qemuxmlconfdata/floppy-drive-fat.x86_64-latest.args index e63ddfeb16..0b7018608b 100644 --- a/tests/qemuxmlconfdata/floppy-drive-fat.x86_64-latest.args +++ b/tests/qemuxmlconfdata/floppy-drive-fat.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/fs9p-ccw.s390x-latest.args b/tests/qemux= mlconfdata/fs9p-ccw.s390x-latest.args index 6771547e80..7872296c05 100644 --- a/tests/qemuxmlconfdata/fs9p-ccw.s390x-latest.args +++ b/tests/qemuxmlconfdata/fs9p-ccw.s390x-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/fs9p.x86_64-latest.args b/tests/qemuxmlc= onfdata/fs9p.x86_64-latest.args index d1505cce80..86274046e8 100644 --- a/tests/qemuxmlconfdata/fs9p.x86_64-latest.args +++ b/tests/qemuxmlconfdata/fs9p.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/genid-auto.x86_64-latest.args b/tests/qe= muxmlconfdata/genid-auto.x86_64-latest.args index e3aa0d5b10..1bbdbeedd3 100644 --- a/tests/qemuxmlconfdata/genid-auto.x86_64-latest.args +++ b/tests/qemuxmlconfdata/genid-auto.x86_64-latest.args @@ -22,7 +22,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/genid.x86_64-latest.args b/tests/qemuxml= confdata/genid.x86_64-latest.args index c1fb2cee78..99c5f1000d 100644 --- a/tests/qemuxmlconfdata/genid.x86_64-latest.args +++ b/tests/qemuxmlconfdata/genid.x86_64-latest.args @@ -22,7 +22,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/graphics-dbus-address.x86_64-latest.args= b/tests/qemuxmlconfdata/graphics-dbus-address.x86_64-latest.args index bcba7f8f64..3132dcd63d 100644 --- a/tests/qemuxmlconfdata/graphics-dbus-address.x86_64-latest.args +++ b/tests/qemuxmlconfdata/graphics-dbus-address.x86_64-latest.args @@ -20,7 +20,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/graphics-dbus-audio.x86_64-latest.args b= /tests/qemuxmlconfdata/graphics-dbus-audio.x86_64-latest.args index 19d1ac7a0a..fd7b84d79a 100644 --- a/tests/qemuxmlconfdata/graphics-dbus-audio.x86_64-latest.args +++ b/tests/qemuxmlconfdata/graphics-dbus-audio.x86_64-latest.args @@ -20,7 +20,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/graphics-dbus-chardev.x86_64-latest.args= b/tests/qemuxmlconfdata/graphics-dbus-chardev.x86_64-latest.args index 7ab1eb7787..45aec4f08f 100644 --- a/tests/qemuxmlconfdata/graphics-dbus-chardev.x86_64-latest.args +++ b/tests/qemuxmlconfdata/graphics-dbus-chardev.x86_64-latest.args @@ -20,7 +20,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/graphics-dbus-p2p.x86_64-latest.args b/t= ests/qemuxmlconfdata/graphics-dbus-p2p.x86_64-latest.args index 9fda433320..7b86736fab 100644 --- a/tests/qemuxmlconfdata/graphics-dbus-p2p.x86_64-latest.args +++ b/tests/qemuxmlconfdata/graphics-dbus-p2p.x86_64-latest.args @@ -20,7 +20,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/graphics-dbus-usbredir.x86_64-latest.arg= s b/tests/qemuxmlconfdata/graphics-dbus-usbredir.x86_64-latest.args index ceec8dbc89..7cde6c7055 100644 --- a/tests/qemuxmlconfdata/graphics-dbus-usbredir.x86_64-latest.args +++ b/tests/qemuxmlconfdata/graphics-dbus-usbredir.x86_64-latest.args @@ -20,7 +20,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/graphics-dbus.x86_64-latest.args b/tests= /qemuxmlconfdata/graphics-dbus.x86_64-latest.args index 33fb8b0e12..8b10b8ea17 100644 --- a/tests/qemuxmlconfdata/graphics-dbus.x86_64-latest.args +++ b/tests/qemuxmlconfdata/graphics-dbus.x86_64-latest.args @@ -20,7 +20,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/graphics-egl-headless-rendernode.x86_64-= latest.args b/tests/qemuxmlconfdata/graphics-egl-headless-rendernode.x86_64= -latest.args index 97996f30fc..1a3ffd795a 100644 --- a/tests/qemuxmlconfdata/graphics-egl-headless-rendernode.x86_64-latest.= args +++ b/tests/qemuxmlconfdata/graphics-egl-headless-rendernode.x86_64-latest.= args @@ -20,7 +20,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/graphics-egl-headless.x86_64-latest.args= b/tests/qemuxmlconfdata/graphics-egl-headless.x86_64-latest.args index 97996f30fc..1a3ffd795a 100644 --- a/tests/qemuxmlconfdata/graphics-egl-headless.x86_64-latest.args +++ b/tests/qemuxmlconfdata/graphics-egl-headless.x86_64-latest.args @@ -20,7 +20,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/graphics-listen-network.x86_64-latest.ar= gs b/tests/qemuxmlconfdata/graphics-listen-network.x86_64-latest.args index 62c2cc2a2c..d0fecb663b 100644 --- a/tests/qemuxmlconfdata/graphics-listen-network.x86_64-latest.args +++ b/tests/qemuxmlconfdata/graphics-listen-network.x86_64-latest.args @@ -20,7 +20,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/graphics-rdp.x86_64-latest.args b/tests/= qemuxmlconfdata/graphics-rdp.x86_64-latest.args index 292f283493..2a5916c456 100644 --- a/tests/qemuxmlconfdata/graphics-rdp.x86_64-latest.args +++ b/tests/qemuxmlconfdata/graphics-rdp.x86_64-latest.args @@ -20,7 +20,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/graphics-sdl-fullscreen.x86_64-latest.ar= gs b/tests/qemuxmlconfdata/graphics-sdl-fullscreen.x86_64-latest.args index 9a103b069a..66510ce199 100644 --- a/tests/qemuxmlconfdata/graphics-sdl-fullscreen.x86_64-latest.args +++ b/tests/qemuxmlconfdata/graphics-sdl-fullscreen.x86_64-latest.args @@ -22,7 +22,7 @@ DISPLAY=3D:0.1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/graphics-sdl.x86_64-latest.args b/tests/= qemuxmlconfdata/graphics-sdl.x86_64-latest.args index 82366b1297..e072a36568 100644 --- a/tests/qemuxmlconfdata/graphics-sdl.x86_64-latest.args +++ b/tests/qemuxmlconfdata/graphics-sdl.x86_64-latest.args @@ -22,7 +22,7 @@ DISPLAY=3D:0.1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/graphics-spice-agent-file-xfer.x86_64-la= test.args b/tests/qemuxmlconfdata/graphics-spice-agent-file-xfer.x86_64-lat= est.args index 3ffe09e6f6..e15eefd2ca 100644 --- a/tests/qemuxmlconfdata/graphics-spice-agent-file-xfer.x86_64-latest.ar= gs +++ b/tests/qemuxmlconfdata/graphics-spice-agent-file-xfer.x86_64-latest.ar= gs @@ -20,7 +20,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/graphics-spice-agentmouse.x86_64-latest.= args b/tests/qemuxmlconfdata/graphics-spice-agentmouse.x86_64-latest.args index c044c77105..9ad6b43c65 100644 --- a/tests/qemuxmlconfdata/graphics-spice-agentmouse.x86_64-latest.args +++ b/tests/qemuxmlconfdata/graphics-spice-agentmouse.x86_64-latest.args @@ -20,7 +20,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/graphics-spice-auto-socket-cfg.x86_64-la= test.args b/tests/qemuxmlconfdata/graphics-spice-auto-socket-cfg.x86_64-lat= est.args index 03fa8e868a..1c67f3e2e2 100644 --- a/tests/qemuxmlconfdata/graphics-spice-auto-socket-cfg.x86_64-latest.ar= gs +++ b/tests/qemuxmlconfdata/graphics-spice-auto-socket-cfg.x86_64-latest.ar= gs @@ -20,7 +20,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/graphics-spice-auto-socket.x86_64-latest= .args b/tests/qemuxmlconfdata/graphics-spice-auto-socket.x86_64-latest.args index 03fa8e868a..1c67f3e2e2 100644 --- a/tests/qemuxmlconfdata/graphics-spice-auto-socket.x86_64-latest.args +++ b/tests/qemuxmlconfdata/graphics-spice-auto-socket.x86_64-latest.args @@ -20,7 +20,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/graphics-spice-compression.x86_64-latest= .args b/tests/qemuxmlconfdata/graphics-spice-compression.x86_64-latest.args index 39eee130c1..f8b497d23b 100644 --- a/tests/qemuxmlconfdata/graphics-spice-compression.x86_64-latest.args +++ b/tests/qemuxmlconfdata/graphics-spice-compression.x86_64-latest.args @@ -20,7 +20,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/graphics-spice-egl-headless.x86_64-lates= t.args b/tests/qemuxmlconfdata/graphics-spice-egl-headless.x86_64-latest.ar= gs index e905aad710..686e847d2d 100644 --- a/tests/qemuxmlconfdata/graphics-spice-egl-headless.x86_64-latest.args +++ b/tests/qemuxmlconfdata/graphics-spice-egl-headless.x86_64-latest.args @@ -20,7 +20,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/graphics-spice-gl-auto-rendernode.x86_64= -latest.args b/tests/qemuxmlconfdata/graphics-spice-gl-auto-rendernode.x86_= 64-latest.args index 6fe49ca5ca..d360e288c0 100644 --- a/tests/qemuxmlconfdata/graphics-spice-gl-auto-rendernode.x86_64-latest= .args +++ b/tests/qemuxmlconfdata/graphics-spice-gl-auto-rendernode.x86_64-latest= .args @@ -20,7 +20,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/graphics-spice-no-args.x86_64-latest.arg= s b/tests/qemuxmlconfdata/graphics-spice-no-args.x86_64-latest.args index 512f17c5eb..0e2c03af8e 100644 --- a/tests/qemuxmlconfdata/graphics-spice-no-args.x86_64-latest.args +++ b/tests/qemuxmlconfdata/graphics-spice-no-args.x86_64-latest.args @@ -20,7 +20,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/graphics-spice-qxl-vga.x86_64-latest.arg= s b/tests/qemuxmlconfdata/graphics-spice-qxl-vga.x86_64-latest.args index 0f3a9a3def..62e0fba4bc 100644 --- a/tests/qemuxmlconfdata/graphics-spice-qxl-vga.x86_64-latest.args +++ b/tests/qemuxmlconfdata/graphics-spice-qxl-vga.x86_64-latest.args @@ -20,7 +20,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/graphics-spice-sasl.x86_64-latest.args b= /tests/qemuxmlconfdata/graphics-spice-sasl.x86_64-latest.args index 4c0d998a47..dbecc45ba6 100644 --- a/tests/qemuxmlconfdata/graphics-spice-sasl.x86_64-latest.args +++ b/tests/qemuxmlconfdata/graphics-spice-sasl.x86_64-latest.args @@ -21,7 +21,7 @@ SASL_CONF_PATH=3D/etc/sasl2 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/graphics-spice-socket.x86_64-latest.args= b/tests/qemuxmlconfdata/graphics-spice-socket.x86_64-latest.args index 9c30cf6089..52fc703d66 100644 --- a/tests/qemuxmlconfdata/graphics-spice-socket.x86_64-latest.args +++ b/tests/qemuxmlconfdata/graphics-spice-socket.x86_64-latest.args @@ -20,7 +20,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/graphics-spice-timeout.x86_64-latest.arg= s b/tests/qemuxmlconfdata/graphics-spice-timeout.x86_64-latest.args index 30010a5a0c..1ff9a0f46d 100644 --- a/tests/qemuxmlconfdata/graphics-spice-timeout.x86_64-latest.args +++ b/tests/qemuxmlconfdata/graphics-spice-timeout.x86_64-latest.args @@ -20,7 +20,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-f14/.co= nfig \ -uuid 553effab-b5e1-2d80-dfe3-da4344826c43 \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/graphics-spice-usb-redir.x86_64-latest.a= rgs b/tests/qemuxmlconfdata/graphics-spice-usb-redir.x86_64-latest.args index b5f695063c..995c8bf4dd 100644 --- a/tests/qemuxmlconfdata/graphics-spice-usb-redir.x86_64-latest.args +++ b/tests/qemuxmlconfdata/graphics-spice-usb-redir.x86_64-latest.args @@ -20,7 +20,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/graphics-spice.x86_64-latest.args b/test= s/qemuxmlconfdata/graphics-spice.x86_64-latest.args index 55df7945d0..a6064162a7 100644 --- a/tests/qemuxmlconfdata/graphics-spice.x86_64-latest.args +++ b/tests/qemuxmlconfdata/graphics-spice.x86_64-latest.args @@ -20,7 +20,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/graphics-vnc-auto-socket-cfg.x86_64-late= st.args b/tests/qemuxmlconfdata/graphics-vnc-auto-socket-cfg.x86_64-latest.= args index 51d550e8c9..509a8e4643 100644 --- a/tests/qemuxmlconfdata/graphics-vnc-auto-socket-cfg.x86_64-latest.args +++ b/tests/qemuxmlconfdata/graphics-vnc-auto-socket-cfg.x86_64-latest.args @@ -20,7 +20,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/graphics-vnc-auto-socket.x86_64-latest.a= rgs b/tests/qemuxmlconfdata/graphics-vnc-auto-socket.x86_64-latest.args index db2f7b5930..8a1bfaeed5 100644 --- a/tests/qemuxmlconfdata/graphics-vnc-auto-socket.x86_64-latest.args +++ b/tests/qemuxmlconfdata/graphics-vnc-auto-socket.x86_64-latest.args @@ -20,7 +20,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/graphics-vnc-egl-headless.x86_64-latest.= args b/tests/qemuxmlconfdata/graphics-vnc-egl-headless.x86_64-latest.args index bd1b4af92b..9578f68a69 100644 --- a/tests/qemuxmlconfdata/graphics-vnc-egl-headless.x86_64-latest.args +++ b/tests/qemuxmlconfdata/graphics-vnc-egl-headless.x86_64-latest.args @@ -20,7 +20,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/graphics-vnc-no-listen-attr.x86_64-lates= t.args b/tests/qemuxmlconfdata/graphics-vnc-no-listen-attr.x86_64-latest.ar= gs index 4a7a409925..b07f4abd64 100644 --- a/tests/qemuxmlconfdata/graphics-vnc-no-listen-attr.x86_64-latest.args +++ b/tests/qemuxmlconfdata/graphics-vnc-no-listen-attr.x86_64-latest.args @@ -20,7 +20,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/graphics-vnc-none.x86_64-latest.args b/t= ests/qemuxmlconfdata/graphics-vnc-none.x86_64-latest.args index 19372db9bc..7f9f2ea726 100644 --- a/tests/qemuxmlconfdata/graphics-vnc-none.x86_64-latest.args +++ b/tests/qemuxmlconfdata/graphics-vnc-none.x86_64-latest.args @@ -20,7 +20,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/graphics-vnc-policy.x86_64-latest.args b= /tests/qemuxmlconfdata/graphics-vnc-policy.x86_64-latest.args index f53fefe2b3..cbf23b6b5b 100644 --- a/tests/qemuxmlconfdata/graphics-vnc-policy.x86_64-latest.args +++ b/tests/qemuxmlconfdata/graphics-vnc-policy.x86_64-latest.args @@ -20,7 +20,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/graphics-vnc-power.x86_64-latest.args b/= tests/qemuxmlconfdata/graphics-vnc-power.x86_64-latest.args index 5a81f148d6..722ce9599f 100644 --- a/tests/qemuxmlconfdata/graphics-vnc-power.x86_64-latest.args +++ b/tests/qemuxmlconfdata/graphics-vnc-power.x86_64-latest.args @@ -20,7 +20,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/graphics-vnc-remove-generated-socket.x86= _64-latest.args b/tests/qemuxmlconfdata/graphics-vnc-remove-generated-socke= t.x86_64-latest.args index 854e3b9637..c694022e3f 100644 --- a/tests/qemuxmlconfdata/graphics-vnc-remove-generated-socket.x86_64-lat= est.args +++ b/tests/qemuxmlconfdata/graphics-vnc-remove-generated-socket.x86_64-lat= est.args @@ -20,7 +20,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/graphics-vnc-sasl.x86_64-latest.args b/t= ests/qemuxmlconfdata/graphics-vnc-sasl.x86_64-latest.args index 4570a7fa19..236e91d47c 100644 --- a/tests/qemuxmlconfdata/graphics-vnc-sasl.x86_64-latest.args +++ b/tests/qemuxmlconfdata/graphics-vnc-sasl.x86_64-latest.args @@ -21,7 +21,7 @@ SASL_CONF_PATH=3D/etc/sasl2 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/graphics-vnc-socket-new-cmdline.x86_64-l= atest.args b/tests/qemuxmlconfdata/graphics-vnc-socket-new-cmdline.x86_64-l= atest.args index dec43c1596..b1739c3d66 100644 --- a/tests/qemuxmlconfdata/graphics-vnc-socket-new-cmdline.x86_64-latest.a= rgs +++ b/tests/qemuxmlconfdata/graphics-vnc-socket-new-cmdline.x86_64-latest.a= rgs @@ -20,7 +20,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/graphics-vnc-socket.x86_64-latest.args b= /tests/qemuxmlconfdata/graphics-vnc-socket.x86_64-latest.args index ef36ca7291..4f2f89cd06 100644 --- a/tests/qemuxmlconfdata/graphics-vnc-socket.x86_64-latest.args +++ b/tests/qemuxmlconfdata/graphics-vnc-socket.x86_64-latest.args @@ -20,7 +20,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/graphics-vnc-tls-secret.x86_64-latest.ar= gs b/tests/qemuxmlconfdata/graphics-vnc-tls-secret.x86_64-latest.args index 32d7be1d3b..a0b092e955 100644 --- a/tests/qemuxmlconfdata/graphics-vnc-tls-secret.x86_64-latest.args +++ b/tests/qemuxmlconfdata/graphics-vnc-tls-secret.x86_64-latest.args @@ -21,7 +21,7 @@ SASL_CONF_PATH=3D/etc/sasl2 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/graphics-vnc-tls.x86_64-latest.args b/te= sts/qemuxmlconfdata/graphics-vnc-tls.x86_64-latest.args index 2e2e1ef6c3..49b5e87ed8 100644 --- a/tests/qemuxmlconfdata/graphics-vnc-tls.x86_64-latest.args +++ b/tests/qemuxmlconfdata/graphics-vnc-tls.x86_64-latest.args @@ -21,7 +21,7 @@ SASL_CONF_PATH=3D/etc/sasl2 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/graphics-vnc-websocket.x86_64-latest.arg= s b/tests/qemuxmlconfdata/graphics-vnc-websocket.x86_64-latest.args index 7728d69da2..b647510666 100644 --- a/tests/qemuxmlconfdata/graphics-vnc-websocket.x86_64-latest.args +++ b/tests/qemuxmlconfdata/graphics-vnc-websocket.x86_64-latest.args @@ -20,7 +20,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/graphics-vnc.x86_64-latest.args b/tests/= qemuxmlconfdata/graphics-vnc.x86_64-latest.args index 4a7a409925..b07f4abd64 100644 --- a/tests/qemuxmlconfdata/graphics-vnc.x86_64-latest.args +++ b/tests/qemuxmlconfdata/graphics-vnc.x86_64-latest.args @@ -20,7 +20,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/hostdev-mdev-display-ramfb.x86_64-latest= .args b/tests/qemuxmlconfdata/hostdev-mdev-display-ramfb.x86_64-latest.args index d881c56af0..65e2528c56 100644 --- a/tests/qemuxmlconfdata/hostdev-mdev-display-ramfb.x86_64-latest.args +++ b/tests/qemuxmlconfdata/hostdev-mdev-display-ramfb.x86_64-latest.args @@ -20,7 +20,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st2/.config \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/hostdev-mdev-display-spice-egl-headless.= x86_64-latest.args b/tests/qemuxmlconfdata/hostdev-mdev-display-spice-egl-h= eadless.x86_64-latest.args index cd74de7b73..a748007cd9 100644 --- a/tests/qemuxmlconfdata/hostdev-mdev-display-spice-egl-headless.x86_64-= latest.args +++ b/tests/qemuxmlconfdata/hostdev-mdev-display-spice-egl-headless.x86_64-= latest.args @@ -20,7 +20,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st2/.config \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/hostdev-mdev-display-spice-opengl.x86_64= -latest.args b/tests/qemuxmlconfdata/hostdev-mdev-display-spice-opengl.x86_= 64-latest.args index 1b8b48b742..69a30d0a80 100644 --- a/tests/qemuxmlconfdata/hostdev-mdev-display-spice-opengl.x86_64-latest= .args +++ b/tests/qemuxmlconfdata/hostdev-mdev-display-spice-opengl.x86_64-latest= .args @@ -20,7 +20,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st2/.config \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/hostdev-mdev-display-vnc-egl-headless.x8= 6_64-latest.args b/tests/qemuxmlconfdata/hostdev-mdev-display-vnc-egl-headl= ess.x86_64-latest.args index be678cb85b..c8cc164c3b 100644 --- a/tests/qemuxmlconfdata/hostdev-mdev-display-vnc-egl-headless.x86_64-la= test.args +++ b/tests/qemuxmlconfdata/hostdev-mdev-display-vnc-egl-headless.x86_64-la= test.args @@ -20,7 +20,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st2/.config \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/hostdev-mdev-display-vnc.x86_64-latest.a= rgs b/tests/qemuxmlconfdata/hostdev-mdev-display-vnc.x86_64-latest.args index b3e9d12f4e..9bf72f072b 100644 --- a/tests/qemuxmlconfdata/hostdev-mdev-display-vnc.x86_64-latest.args +++ b/tests/qemuxmlconfdata/hostdev-mdev-display-vnc.x86_64-latest.args @@ -20,7 +20,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st2/.config \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/hostdev-mdev-display.x86_64-latest.args = b/tests/qemuxmlconfdata/hostdev-mdev-display.x86_64-latest.args index b3e9d12f4e..9bf72f072b 100644 --- a/tests/qemuxmlconfdata/hostdev-mdev-display.x86_64-latest.args +++ b/tests/qemuxmlconfdata/hostdev-mdev-display.x86_64-latest.args @@ -20,7 +20,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st2/.config \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/hostdev-mdev-precreated.x86_64-latest.ar= gs b/tests/qemuxmlconfdata/hostdev-mdev-precreated.x86_64-latest.args index 18e59f7520..63d9645561 100644 --- a/tests/qemuxmlconfdata/hostdev-mdev-precreated.x86_64-latest.args +++ b/tests/qemuxmlconfdata/hostdev-mdev-precreated.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st2/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/hostdev-pci-address-device.x86_64-latest= .args b/tests/qemuxmlconfdata/hostdev-pci-address-device.x86_64-latest.args index 2a00147ae4..db9c331048 100644 --- a/tests/qemuxmlconfdata/hostdev-pci-address-device.x86_64-latest.args +++ b/tests/qemuxmlconfdata/hostdev-pci-address-device.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st2/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/hostdev-pci-address-unassigned.x86_64-la= test.args b/tests/qemuxmlconfdata/hostdev-pci-address-unassigned.x86_64-lat= est.args index 1247ff547b..75b9de2a0e 100644 --- a/tests/qemuxmlconfdata/hostdev-pci-address-unassigned.x86_64-latest.ar= gs +++ b/tests/qemuxmlconfdata/hostdev-pci-address-unassigned.x86_64-latest.ar= gs @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-delete/= .config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/hostdev-pci-address.x86_64-latest.args b= /tests/qemuxmlconfdata/hostdev-pci-address.x86_64-latest.args index f84904db82..ed49378c98 100644 --- a/tests/qemuxmlconfdata/hostdev-pci-address.x86_64-latest.args +++ b/tests/qemuxmlconfdata/hostdev-pci-address.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st2/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/hostdev-pci-display-ramfb.x86_64-latest.= args b/tests/qemuxmlconfdata/hostdev-pci-display-ramfb.x86_64-latest.args index a681504c3d..936cdf678b 100644 --- a/tests/qemuxmlconfdata/hostdev-pci-display-ramfb.x86_64-latest.args +++ b/tests/qemuxmlconfdata/hostdev-pci-display-ramfb.x86_64-latest.args @@ -20,7 +20,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st2/.config \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/hostdev-pci-multifunction.x86_64-latest.= args b/tests/qemuxmlconfdata/hostdev-pci-multifunction.x86_64-latest.args index f3bcec0983..92b049640a 100644 --- a/tests/qemuxmlconfdata/hostdev-pci-multifunction.x86_64-latest.args +++ b/tests/qemuxmlconfdata/hostdev-pci-multifunction.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-delete/= .config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/hostdev-scsi-autogen-address.x86_64-late= st.args b/tests/qemuxmlconfdata/hostdev-scsi-autogen-address.x86_64-latest.= args index 31bba71977..30490d95f8 100644 --- a/tests/qemuxmlconfdata/hostdev-scsi-autogen-address.x86_64-latest.args +++ b/tests/qemuxmlconfdata/hostdev-scsi-autogen-address.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st2/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/hostdev-scsi-large-unit.x86_64-latest.ar= gs b/tests/qemuxmlconfdata/hostdev-scsi-large-unit.x86_64-latest.args index 4e787674a3..2dc0ffca24 100644 --- a/tests/qemuxmlconfdata/hostdev-scsi-large-unit.x86_64-latest.args +++ b/tests/qemuxmlconfdata/hostdev-scsi-large-unit.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st2/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/hostdev-scsi-lsi.x86_64-latest.args b/te= sts/qemuxmlconfdata/hostdev-scsi-lsi.x86_64-latest.args index 8f03d96ef4..59db6a485d 100644 --- a/tests/qemuxmlconfdata/hostdev-scsi-lsi.x86_64-latest.args +++ b/tests/qemuxmlconfdata/hostdev-scsi-lsi.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st2/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/hostdev-scsi-shareable.x86_64-latest.arg= s b/tests/qemuxmlconfdata/hostdev-scsi-shareable.x86_64-latest.args index 4e787674a3..2dc0ffca24 100644 --- a/tests/qemuxmlconfdata/hostdev-scsi-shareable.x86_64-latest.args +++ b/tests/qemuxmlconfdata/hostdev-scsi-shareable.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st2/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/hostdev-scsi-vhost-scsi-ccw.s390x-latest= .args b/tests/qemuxmlconfdata/hostdev-scsi-vhost-scsi-ccw.s390x-latest.args index bce866221a..3986009d26 100644 --- a/tests/qemuxmlconfdata/hostdev-scsi-vhost-scsi-ccw.s390x-latest.args +++ b/tests/qemuxmlconfdata/hostdev-scsi-vhost-scsi-ccw.s390x-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st2/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/hostdev-scsi-vhost-scsi-pci.x86_64-lates= t.args b/tests/qemuxmlconfdata/hostdev-scsi-vhost-scsi-pci.x86_64-latest.ar= gs index abd57fceba..260859c48d 100644 --- a/tests/qemuxmlconfdata/hostdev-scsi-vhost-scsi-pci.x86_64-latest.args +++ b/tests/qemuxmlconfdata/hostdev-scsi-vhost-scsi-pci.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st2/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/hostdev-scsi-vhost-scsi-pcie.x86_64-late= st.args b/tests/qemuxmlconfdata/hostdev-scsi-vhost-scsi-pcie.x86_64-latest.= args index f2b39694ee..b7aa90d25f 100644 --- a/tests/qemuxmlconfdata/hostdev-scsi-vhost-scsi-pcie.x86_64-latest.args +++ b/tests/qemuxmlconfdata/hostdev-scsi-vhost-scsi-pcie.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st2/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/hostdev-scsi-virtio-scsi.x86_64-latest.a= rgs b/tests/qemuxmlconfdata/hostdev-scsi-virtio-scsi.x86_64-latest.args index d7a3c658d8..736b7e7dc0 100644 --- a/tests/qemuxmlconfdata/hostdev-scsi-virtio-scsi.x86_64-latest.args +++ b/tests/qemuxmlconfdata/hostdev-scsi-virtio-scsi.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st2/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/hostdev-subsys-mdev-vfio-ap.s390x-latest= .args b/tests/qemuxmlconfdata/hostdev-subsys-mdev-vfio-ap.s390x-latest.args index 880265bb03..920ef86c55 100644 --- a/tests/qemuxmlconfdata/hostdev-subsys-mdev-vfio-ap.s390x-latest.args +++ b/tests/qemuxmlconfdata/hostdev-subsys-mdev-vfio-ap.s390x-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/hostdev-subsys-mdev-vfio-ccw-boot.s390x-= latest.args b/tests/qemuxmlconfdata/hostdev-subsys-mdev-vfio-ccw-boot.s390x= -latest.args index aeb07a9bcb..91f9478a3c 100644 --- a/tests/qemuxmlconfdata/hostdev-subsys-mdev-vfio-ccw-boot.s390x-latest.= args +++ b/tests/qemuxmlconfdata/hostdev-subsys-mdev-vfio-ccw-boot.s390x-latest.= args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/hostdev-subsys-mdev-vfio-ccw.s390x-lates= t.args b/tests/qemuxmlconfdata/hostdev-subsys-mdev-vfio-ccw.s390x-latest.ar= gs index 01b182d44e..0daa5664fe 100644 --- a/tests/qemuxmlconfdata/hostdev-subsys-mdev-vfio-ccw.s390x-latest.args +++ b/tests/qemuxmlconfdata/hostdev-subsys-mdev-vfio-ccw.s390x-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/hostdev-usb-address-device-boot.x86_64-l= atest.args b/tests/qemuxmlconfdata/hostdev-usb-address-device-boot.x86_64-l= atest.args index 776eb24135..81f0287c38 100644 --- a/tests/qemuxmlconfdata/hostdev-usb-address-device-boot.x86_64-latest.a= rgs +++ b/tests/qemuxmlconfdata/hostdev-usb-address-device-boot.x86_64-latest.a= rgs @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/hostdev-usb-address-device.x86_64-latest= .args b/tests/qemuxmlconfdata/hostdev-usb-address-device.x86_64-latest.args index 5bae7acdc5..d226e95c12 100644 --- a/tests/qemuxmlconfdata/hostdev-usb-address-device.x86_64-latest.args +++ b/tests/qemuxmlconfdata/hostdev-usb-address-device.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/hostdev-usb-address-port.x86_64-latest.a= rgs b/tests/qemuxmlconfdata/hostdev-usb-address-port.x86_64-latest.args index 8996f05223..c4b96f015e 100644 --- a/tests/qemuxmlconfdata/hostdev-usb-address-port.x86_64-latest.args +++ b/tests/qemuxmlconfdata/hostdev-usb-address-port.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/hostdev-usb-address.x86_64-latest.args b= /tests/qemuxmlconfdata/hostdev-usb-address.x86_64-latest.args index fff0a672d7..497dc5b1da 100644 --- a/tests/qemuxmlconfdata/hostdev-usb-address.x86_64-latest.args +++ b/tests/qemuxmlconfdata/hostdev-usb-address.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/hostdev-usb-vendor-product.x86_64-latest= .args b/tests/qemuxmlconfdata/hostdev-usb-vendor-product.x86_64-latest.args index 62338db872..8f393c3db9 100644 --- a/tests/qemuxmlconfdata/hostdev-usb-vendor-product.x86_64-latest.args +++ b/tests/qemuxmlconfdata/hostdev-usb-vendor-product.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/hostdev-vfio-multidomain.x86_64-latest.a= rgs b/tests/qemuxmlconfdata/hostdev-vfio-multidomain.x86_64-latest.args index fa3fd3aa99..35c2ace727 100644 --- a/tests/qemuxmlconfdata/hostdev-vfio-multidomain.x86_64-latest.args +++ b/tests/qemuxmlconfdata/hostdev-vfio-multidomain.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st2/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/hostdev-vfio-zpci-autogenerate-fids.s390= x-latest.args b/tests/qemuxmlconfdata/hostdev-vfio-zpci-autogenerate-fids.s= 390x-latest.args index d0355d04b8..8e964cd8dc 100644 --- a/tests/qemuxmlconfdata/hostdev-vfio-zpci-autogenerate-fids.s390x-lates= t.args +++ b/tests/qemuxmlconfdata/hostdev-vfio-zpci-autogenerate-fids.s390x-lates= t.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/hostdev-vfio-zpci-autogenerate-uids.s390= x-latest.args b/tests/qemuxmlconfdata/hostdev-vfio-zpci-autogenerate-uids.s= 390x-latest.args index 6754899fe4..90c02a9ea2 100644 --- a/tests/qemuxmlconfdata/hostdev-vfio-zpci-autogenerate-uids.s390x-lates= t.args +++ b/tests/qemuxmlconfdata/hostdev-vfio-zpci-autogenerate-uids.s390x-lates= t.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/hostdev-vfio-zpci-autogenerate.s390x-lat= est.args b/tests/qemuxmlconfdata/hostdev-vfio-zpci-autogenerate.s390x-lates= t.args index 2c142c1e5a..dec3b00def 100644 --- a/tests/qemuxmlconfdata/hostdev-vfio-zpci-autogenerate.s390x-latest.args +++ b/tests/qemuxmlconfdata/hostdev-vfio-zpci-autogenerate.s390x-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/hostdev-vfio-zpci-boundaries.s390x-lates= t.args b/tests/qemuxmlconfdata/hostdev-vfio-zpci-boundaries.s390x-latest.ar= gs index 3bf6534c36..4df47ca28c 100644 --- a/tests/qemuxmlconfdata/hostdev-vfio-zpci-boundaries.s390x-latest.args +++ b/tests/qemuxmlconfdata/hostdev-vfio-zpci-boundaries.s390x-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/hostdev-vfio-zpci-ccw-memballoon.s390x-l= atest.args b/tests/qemuxmlconfdata/hostdev-vfio-zpci-ccw-memballoon.s390x-l= atest.args index e8a95ec89e..ca0c1c2f0e 100644 --- a/tests/qemuxmlconfdata/hostdev-vfio-zpci-ccw-memballoon.s390x-latest.a= rgs +++ b/tests/qemuxmlconfdata/hostdev-vfio-zpci-ccw-memballoon.s390x-latest.a= rgs @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-KVMGues= t1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/hostdev-vfio-zpci-multidomain-many.s390x= -latest.args b/tests/qemuxmlconfdata/hostdev-vfio-zpci-multidomain-many.s39= 0x-latest.args index 43b861b65c..16264d6f43 100644 --- a/tests/qemuxmlconfdata/hostdev-vfio-zpci-multidomain-many.s390x-latest= .args +++ b/tests/qemuxmlconfdata/hostdev-vfio-zpci-multidomain-many.s390x-latest= .args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/hostdev-vfio-zpci.s390x-latest.args b/te= sts/qemuxmlconfdata/hostdev-vfio-zpci.s390x-latest.args index 852fe0206a..d05e78b0ea 100644 --- a/tests/qemuxmlconfdata/hostdev-vfio-zpci.s390x-latest.args +++ b/tests/qemuxmlconfdata/hostdev-vfio-zpci.s390x-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/hostdev-vfio.x86_64-latest.args b/tests/= qemuxmlconfdata/hostdev-vfio.x86_64-latest.args index 658fc2559e..379853248d 100644 --- a/tests/qemuxmlconfdata/hostdev-vfio.x86_64-latest.args +++ b/tests/qemuxmlconfdata/hostdev-vfio.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st2/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/hotplug-base.x86_64-latest.args b/tests/= qemuxmlconfdata/hotplug-base.x86_64-latest.args index ecbf02ac3a..e93f2c8726 100644 --- a/tests/qemuxmlconfdata/hotplug-base.x86_64-latest.args +++ b/tests/qemuxmlconfdata/hotplug-base.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-hotplug= /.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/hugepages-default-2M.x86_64-latest.args = b/tests/qemuxmlconfdata/hugepages-default-2M.x86_64-latest.args index dd95b296ba..eb10fc39f5 100644 --- a/tests/qemuxmlconfdata/hugepages-default-2M.x86_64-latest.args +++ b/tests/qemuxmlconfdata/hugepages-default-2M.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-SomeDum= myHugepagesGu/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/hugepages-default-system-size.x86_64-lat= est.args b/tests/qemuxmlconfdata/hugepages-default-system-size.x86_64-lates= t.args index 11b4b700ae..decdca9516 100644 --- a/tests/qemuxmlconfdata/hugepages-default-system-size.x86_64-latest.args +++ b/tests/qemuxmlconfdata/hugepages-default-system-size.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-SomeDum= myHugepagesGu/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/hugepages-default.x86_64-latest.args b/t= ests/qemuxmlconfdata/hugepages-default.x86_64-latest.args index 310cd1f79a..39447a1e03 100644 --- a/tests/qemuxmlconfdata/hugepages-default.x86_64-latest.args +++ b/tests/qemuxmlconfdata/hugepages-default.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/hugepages-memaccess.x86_64-latest.args b= /tests/qemuxmlconfdata/hugepages-memaccess.x86_64-latest.args index 9aedba0539..3cb19a22d7 100644 --- a/tests/qemuxmlconfdata/hugepages-memaccess.x86_64-latest.args +++ b/tests/qemuxmlconfdata/hugepages-memaccess.x86_64-latest.args @@ -32,7 +32,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/hugepages-memaccess2.x86_64-latest.args = b/tests/qemuxmlconfdata/hugepages-memaccess2.x86_64-latest.args index 2dd0bdc228..d7a8595fa9 100644 --- a/tests/qemuxmlconfdata/hugepages-memaccess2.x86_64-latest.args +++ b/tests/qemuxmlconfdata/hugepages-memaccess2.x86_64-latest.args @@ -29,7 +29,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/hugepages-memaccess3.x86_64-latest.args = b/tests/qemuxmlconfdata/hugepages-memaccess3.x86_64-latest.args index 9c5d1671ea..51e197b728 100644 --- a/tests/qemuxmlconfdata/hugepages-memaccess3.x86_64-latest.args +++ b/tests/qemuxmlconfdata/hugepages-memaccess3.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-fedora/= .config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/hugepages-nodeset.x86_64-latest.args b/t= ests/qemuxmlconfdata/hugepages-nodeset.x86_64-latest.args index dd95b296ba..eb10fc39f5 100644 --- a/tests/qemuxmlconfdata/hugepages-nodeset.x86_64-latest.args +++ b/tests/qemuxmlconfdata/hugepages-nodeset.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-SomeDum= myHugepagesGu/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/hugepages-numa-default-2M.x86_64-latest.= args b/tests/qemuxmlconfdata/hugepages-numa-default-2M.x86_64-latest.args index 320910db61..a504fec129 100644 --- a/tests/qemuxmlconfdata/hugepages-numa-default-2M.x86_64-latest.args +++ b/tests/qemuxmlconfdata/hugepages-numa-default-2M.x86_64-latest.args @@ -24,7 +24,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-SomeDum= myHugepagesGu/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/hugepages-numa-default-dimm.x86_64-lates= t.args b/tests/qemuxmlconfdata/hugepages-numa-default-dimm.x86_64-latest.ar= gs index 5d2849ce75..128640b6af 100644 --- a/tests/qemuxmlconfdata/hugepages-numa-default-dimm.x86_64-latest.args +++ b/tests/qemuxmlconfdata/hugepages-numa-default-dimm.x86_64-latest.args @@ -22,7 +22,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-fedora/= .config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/hugepages-numa-default.x86_64-latest.arg= s b/tests/qemuxmlconfdata/hugepages-numa-default.x86_64-latest.args index 677122eba2..ad08f817d8 100644 --- a/tests/qemuxmlconfdata/hugepages-numa-default.x86_64-latest.args +++ b/tests/qemuxmlconfdata/hugepages-numa-default.x86_64-latest.args @@ -22,7 +22,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-fedora/= .config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/hugepages-numa-nodeset-part.x86_64-lates= t.args b/tests/qemuxmlconfdata/hugepages-numa-nodeset-part.x86_64-latest.ar= gs index a86697048c..801269b9f1 100644 --- a/tests/qemuxmlconfdata/hugepages-numa-nodeset-part.x86_64-latest.args +++ b/tests/qemuxmlconfdata/hugepages-numa-nodeset-part.x86_64-latest.args @@ -24,7 +24,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-SomeDum= myHugepagesGu/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/hugepages-numa-nodeset.x86_64-latest.arg= s b/tests/qemuxmlconfdata/hugepages-numa-nodeset.x86_64-latest.args index 23198ba24e..fdb67cf130 100644 --- a/tests/qemuxmlconfdata/hugepages-numa-nodeset.x86_64-latest.args +++ b/tests/qemuxmlconfdata/hugepages-numa-nodeset.x86_64-latest.args @@ -28,7 +28,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/hugepages-nvdimm.x86_64-latest.args b/te= sts/qemuxmlconfdata/hugepages-nvdimm.x86_64-latest.args index f30db0ad09..6c8be34341 100644 --- a/tests/qemuxmlconfdata/hugepages-nvdimm.x86_64-latest.args +++ b/tests/qemuxmlconfdata/hugepages-nvdimm.x86_64-latest.args @@ -22,7 +22,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/hugepages-shared.x86_64-latest.args b/te= sts/qemuxmlconfdata/hugepages-shared.x86_64-latest.args index 27c76dcdd3..e272117c04 100644 --- a/tests/qemuxmlconfdata/hugepages-shared.x86_64-latest.args +++ b/tests/qemuxmlconfdata/hugepages-shared.x86_64-latest.args @@ -32,7 +32,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/hvf-aarch64-virt-headless.aarch64-latest= +hvf.args b/tests/qemuxmlconfdata/hvf-aarch64-virt-headless.aarch64-latest+= hvf.args index fc3db040af..c428a00e64 100644 --- a/tests/qemuxmlconfdata/hvf-aarch64-virt-headless.aarch64-latest+hvf.ar= gs +++ b/tests/qemuxmlconfdata/hvf-aarch64-virt-headless.aarch64-latest+hvf.ar= gs @@ -23,7 +23,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-test/.c= onfig \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc,driftfix=3Dslew \ -no-shutdown \ @@ -42,7 +42,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-test/.c= onfig \ -device '{"driver":"virtio-net-pci","netdev":"hostnet0","id":"net0","mac":= "52:54:00:9a:e6:c6","bus":"pci.1","addr":"0x0"}' \ -chardev pty,id=3Dcharserial0 \ -serial chardev:charserial0 \ --chardev socket,id=3Dcharchannel0,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharchannel0,fd=3DXXXXXXX,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":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.4","add= r":"0x0"}' \ diff --git a/tests/qemuxmlconfdata/hvf-x86_64-q35-headless.x86_64-latest+hv= f.args b/tests/qemuxmlconfdata/hvf-x86_64-q35-headless.x86_64-latest+hvf.ar= gs index 03fa63585f..6cd5b380bd 100644 --- a/tests/qemuxmlconfdata/hvf-x86_64-q35-headless.x86_64-latest+hvf.args +++ b/tests/qemuxmlconfdata/hvf-x86_64-q35-headless.x86_64-latest+hvf.args @@ -26,7 +26,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-test/.c= onfig \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc,driftfix=3Dslew \ -global kvm-pit.lost_tick_policy=3Ddelay \ @@ -47,7 +47,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-test/.c= onfig \ -device '{"driver":"virtio-net-pci","netdev":"hostnet0","id":"net0","mac":= "52:54:00:9a:e6:c6","bus":"pci.1","addr":"0x0"}' \ -chardev pty,id=3Dcharserial0 \ -device '{"driver":"isa-serial","chardev":"charserial0","id":"serial0","in= dex":0}' \ --chardev socket,id=3Dcharchannel0,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharchannel0,fd=3DXXXXXXX,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":"audio1","driver":"none"}' \ -global ICH9-LPC.noreboot=3Doff \ diff --git a/tests/qemuxmlconfdata/hwuuid.x86_64-latest.args b/tests/qemuxm= lconfdata/hwuuid.x86_64-latest.args index fa3eb6b163..cf64daffea 100644 --- a/tests/qemuxmlconfdata/hwuuid.x86_64-latest.args +++ b/tests/qemuxmlconfdata/hwuuid.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/hyperv-host-model.x86_64-latest.args b/t= ests/qemuxmlconfdata/hyperv-host-model.x86_64-latest.args index d1f2326da1..1253948a18 100644 --- a/tests/qemuxmlconfdata/hyperv-host-model.x86_64-latest.args +++ b/tests/qemuxmlconfdata/hyperv-host-model.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/hyperv-off.x86_64-latest.args b/tests/qe= muxmlconfdata/hyperv-off.x86_64-latest.args index 81b67778be..87d89be1ee 100644 --- a/tests/qemuxmlconfdata/hyperv-off.x86_64-latest.args +++ b/tests/qemuxmlconfdata/hyperv-off.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/hyperv-panic.x86_64-latest.args b/tests/= qemuxmlconfdata/hyperv-panic.x86_64-latest.args index 11b165ea47..ead6f2efc5 100644 --- a/tests/qemuxmlconfdata/hyperv-panic.x86_64-latest.args +++ b/tests/qemuxmlconfdata/hyperv-panic.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/hyperv-passthrough.x86_64-latest.args b/= tests/qemuxmlconfdata/hyperv-passthrough.x86_64-latest.args index c2c29f7a52..2dc01446ca 100644 --- a/tests/qemuxmlconfdata/hyperv-passthrough.x86_64-latest.args +++ b/tests/qemuxmlconfdata/hyperv-passthrough.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/hyperv-spinlocks-never-notify.x86_64-lat= est.args b/tests/qemuxmlconfdata/hyperv-spinlocks-never-notify.x86_64-lates= t.args index bb66adc6a4..95919fb3f1 100644 --- a/tests/qemuxmlconfdata/hyperv-spinlocks-never-notify.x86_64-latest.args +++ b/tests/qemuxmlconfdata/hyperv-spinlocks-never-notify.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/hyperv-stimer-direct.x86_64-latest.args = b/tests/qemuxmlconfdata/hyperv-stimer-direct.x86_64-latest.args index 0a6d84fbd2..cd733ab1cd 100644 --- a/tests/qemuxmlconfdata/hyperv-stimer-direct.x86_64-latest.args +++ b/tests/qemuxmlconfdata/hyperv-stimer-direct.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/hyperv.x86_64-latest.args b/tests/qemuxm= lconfdata/hyperv.x86_64-latest.args index ea4b77de74..19f17f96e3 100644 --- a/tests/qemuxmlconfdata/hyperv.x86_64-latest.args +++ b/tests/qemuxmlconfdata/hyperv.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/input-linux.x86_64-latest.args b/tests/q= emuxmlconfdata/input-linux.x86_64-latest.args index 2794b49968..322bdd20b1 100644 --- a/tests/qemuxmlconfdata/input-linux.x86_64-latest.args +++ b/tests/qemuxmlconfdata/input-linux.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/input-usbmouse-addr.x86_64-latest.args b= /tests/qemuxmlconfdata/input-usbmouse-addr.x86_64-latest.args index 6da9a65429..860b80ee0c 100644 --- a/tests/qemuxmlconfdata/input-usbmouse-addr.x86_64-latest.args +++ b/tests/qemuxmlconfdata/input-usbmouse-addr.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/input-usbmouse.x86_64-latest.args b/test= s/qemuxmlconfdata/input-usbmouse.x86_64-latest.args index aca72a88a0..df4019eb87 100644 --- a/tests/qemuxmlconfdata/input-usbmouse.x86_64-latest.args +++ b/tests/qemuxmlconfdata/input-usbmouse.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/input-usbtablet.x86_64-latest.args b/tes= ts/qemuxmlconfdata/input-usbtablet.x86_64-latest.args index 16b4a8babb..027c13c94e 100644 --- a/tests/qemuxmlconfdata/input-usbtablet.x86_64-latest.args +++ b/tests/qemuxmlconfdata/input-usbtablet.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/input-virtio-ccw.s390x-latest.args b/tes= ts/qemuxmlconfdata/input-virtio-ccw.s390x-latest.args index fc32804695..9fa997766c 100644 --- a/tests/qemuxmlconfdata/input-virtio-ccw.s390x-latest.args +++ b/tests/qemuxmlconfdata/input-virtio-ccw.s390x-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/intel-iommu-aw-bits.x86_64-latest.args b= /tests/qemuxmlconfdata/intel-iommu-aw-bits.x86_64-latest.args index 9216ee6b9a..cec07e1aa6 100644 --- a/tests/qemuxmlconfdata/intel-iommu-aw-bits.x86_64-latest.args +++ b/tests/qemuxmlconfdata/intel-iommu-aw-bits.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/intel-iommu-caching-mode.x86_64-latest.a= rgs b/tests/qemuxmlconfdata/intel-iommu-caching-mode.x86_64-latest.args index b3a1dcfd7b..55140a086a 100644 --- a/tests/qemuxmlconfdata/intel-iommu-caching-mode.x86_64-latest.args +++ b/tests/qemuxmlconfdata/intel-iommu-caching-mode.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/intel-iommu-device-iotlb.x86_64-latest.a= rgs b/tests/qemuxmlconfdata/intel-iommu-device-iotlb.x86_64-latest.args index 920b703243..772e737a15 100644 --- a/tests/qemuxmlconfdata/intel-iommu-device-iotlb.x86_64-latest.args +++ b/tests/qemuxmlconfdata/intel-iommu-device-iotlb.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/intel-iommu-dma-translation.x86_64-lates= t.args b/tests/qemuxmlconfdata/intel-iommu-dma-translation.x86_64-latest.ar= gs index cc7f819f5c..873674e9a9 100644 --- a/tests/qemuxmlconfdata/intel-iommu-dma-translation.x86_64-latest.args +++ b/tests/qemuxmlconfdata/intel-iommu-dma-translation.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/intel-iommu-eim-autoadd.x86_64-latest.ab= i-update.args b/tests/qemuxmlconfdata/intel-iommu-eim-autoadd.x86_64-latest= .abi-update.args index 07fa1191b7..0162941b6e 100644 --- a/tests/qemuxmlconfdata/intel-iommu-eim-autoadd.x86_64-latest.abi-updat= e.args +++ b/tests/qemuxmlconfdata/intel-iommu-eim-autoadd.x86_64-latest.abi-updat= e.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/intel-iommu-eim.x86_64-latest.args b/tes= ts/qemuxmlconfdata/intel-iommu-eim.x86_64-latest.args index 07fa1191b7..0162941b6e 100644 --- a/tests/qemuxmlconfdata/intel-iommu-eim.x86_64-latest.args +++ b/tests/qemuxmlconfdata/intel-iommu-eim.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/intel-iommu.x86_64-latest.args b/tests/q= emuxmlconfdata/intel-iommu.x86_64-latest.args index 983d74383c..cb63b25689 100644 --- a/tests/qemuxmlconfdata/intel-iommu.x86_64-latest.args +++ b/tests/qemuxmlconfdata/intel-iommu.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/iommu-smmuv3-pci-bus-single.aarch64-late= st.args b/tests/qemuxmlconfdata/iommu-smmuv3-pci-bus-single.aarch64-latest.= args index 6fac84965e..0c5b1967a4 100644 --- a/tests/qemuxmlconfdata/iommu-smmuv3-pci-bus-single.aarch64-latest.args +++ b/tests/qemuxmlconfdata/iommu-smmuv3-pci-bus-single.aarch64-latest.args @@ -20,7 +20,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/iommu-smmuv3-pci-bus.aarch64-latest.args= b/tests/qemuxmlconfdata/iommu-smmuv3-pci-bus.aarch64-latest.args index 9acd66aab3..6dbbb445e7 100644 --- a/tests/qemuxmlconfdata/iommu-smmuv3-pci-bus.aarch64-latest.args +++ b/tests/qemuxmlconfdata/iommu-smmuv3-pci-bus.aarch64-latest.args @@ -20,7 +20,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/iommu-smmuv3.aarch64-latest.args b/tests= /qemuxmlconfdata/iommu-smmuv3.aarch64-latest.args index 20ccd2f5c3..3708ca8553 100644 --- a/tests/qemuxmlconfdata/iommu-smmuv3.aarch64-latest.args +++ b/tests/qemuxmlconfdata/iommu-smmuv3.aarch64-latest.args @@ -20,7 +20,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/iommufd-q35-fd.x86_64-latest.args b/test= s/qemuxmlconfdata/iommufd-q35-fd.x86_64-latest.args index 7df3d173f3..e95eab8d07 100644 --- a/tests/qemuxmlconfdata/iommufd-q35-fd.x86_64-latest.args +++ b/tests/qemuxmlconfdata/iommufd-q35-fd.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-q35-tes= t/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/iommufd-q35.x86_64-latest.args b/tests/q= emuxmlconfdata/iommufd-q35.x86_64-latest.args index f886c488e1..e90f3a20e1 100644 --- a/tests/qemuxmlconfdata/iommufd-q35.x86_64-latest.args +++ b/tests/qemuxmlconfdata/iommufd-q35.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-q35-tes= t/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/iommufd-virt-pci-bus-single.aarch64-late= st.args b/tests/qemuxmlconfdata/iommufd-virt-pci-bus-single.aarch64-latest.= args index 543e976c58..ac408b6b32 100644 --- a/tests/qemuxmlconfdata/iommufd-virt-pci-bus-single.aarch64-latest.args +++ b/tests/qemuxmlconfdata/iommufd-virt-pci-bus-single.aarch64-latest.args @@ -20,7 +20,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-foo/.co= nfig \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/iommufd-virt.aarch64-latest.args b/tests= /qemuxmlconfdata/iommufd-virt.aarch64-latest.args index e1a4c4bb9a..d472bd6144 100644 --- a/tests/qemuxmlconfdata/iommufd-virt.aarch64-latest.args +++ b/tests/qemuxmlconfdata/iommufd-virt.aarch64-latest.args @@ -20,7 +20,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-foo/.co= nfig \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/iommufd.x86_64-latest.args b/tests/qemux= mlconfdata/iommufd.x86_64-latest.args index b9aefda39d..8e93539c9e 100644 --- a/tests/qemuxmlconfdata/iommufd.x86_64-latest.args +++ b/tests/qemuxmlconfdata/iommufd.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-foo/.co= nfig \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/iothreads-disk.x86_64-latest.args b/test= s/qemuxmlconfdata/iothreads-disk.x86_64-latest.args index b355e76db9..35f843f5aa 100644 --- a/tests/qemuxmlconfdata/iothreads-disk.x86_64-latest.args +++ b/tests/qemuxmlconfdata/iothreads-disk.x86_64-latest.args @@ -25,7 +25,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/iothreads-ids-partial.x86_64-latest.args= b/tests/qemuxmlconfdata/iothreads-ids-partial.x86_64-latest.args index 403001e7df..308db90028 100644 --- a/tests/qemuxmlconfdata/iothreads-ids-partial.x86_64-latest.args +++ b/tests/qemuxmlconfdata/iothreads-ids-partial.x86_64-latest.args @@ -25,7 +25,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/iothreads-ids-pool-sizes.x86_64-latest.a= rgs b/tests/qemuxmlconfdata/iothreads-ids-pool-sizes.x86_64-latest.args index cec62acdd8..4cfce9b9da 100644 --- a/tests/qemuxmlconfdata/iothreads-ids-pool-sizes.x86_64-latest.args +++ b/tests/qemuxmlconfdata/iothreads-ids-pool-sizes.x86_64-latest.args @@ -27,7 +27,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/iothreads-ids.x86_64-latest.args b/tests= /qemuxmlconfdata/iothreads-ids.x86_64-latest.args index 0e847fe655..4d56d4c2c0 100644 --- a/tests/qemuxmlconfdata/iothreads-ids.x86_64-latest.args +++ b/tests/qemuxmlconfdata/iothreads-ids.x86_64-latest.args @@ -23,7 +23,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/iothreads-virtio-scsi-ccw.s390x-latest.a= rgs b/tests/qemuxmlconfdata/iothreads-virtio-scsi-ccw.s390x-latest.args index 953edb5445..0f9195543d 100644 --- a/tests/qemuxmlconfdata/iothreads-virtio-scsi-ccw.s390x-latest.args +++ b/tests/qemuxmlconfdata/iothreads-virtio-scsi-ccw.s390x-latest.args @@ -23,7 +23,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/iothreads-virtio-scsi-mapping.x86_64-lat= est.args b/tests/qemuxmlconfdata/iothreads-virtio-scsi-mapping.x86_64-lates= t.args index c4491cd995..ee98a94823 100644 --- a/tests/qemuxmlconfdata/iothreads-virtio-scsi-mapping.x86_64-latest.args +++ b/tests/qemuxmlconfdata/iothreads-virtio-scsi-mapping.x86_64-latest.args @@ -25,7 +25,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/iothreads-virtio-scsi-pci.x86_64-latest.= args b/tests/qemuxmlconfdata/iothreads-virtio-scsi-pci.x86_64-latest.args index e52ef3ba53..aff65f577a 100644 --- a/tests/qemuxmlconfdata/iothreads-virtio-scsi-pci.x86_64-latest.args +++ b/tests/qemuxmlconfdata/iothreads-virtio-scsi-pci.x86_64-latest.args @@ -23,7 +23,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/kvm-features-off.x86_64-latest.args b/te= sts/qemuxmlconfdata/kvm-features-off.x86_64-latest.args index 31a2022306..70b1fb83e1 100644 --- a/tests/qemuxmlconfdata/kvm-features-off.x86_64-latest.args +++ b/tests/qemuxmlconfdata/kvm-features-off.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/kvm-features.x86_64-latest.args b/tests/= qemuxmlconfdata/kvm-features.x86_64-latest.args index 955db67eb4..8221fdb16f 100644 --- a/tests/qemuxmlconfdata/kvm-features.x86_64-latest.args +++ b/tests/qemuxmlconfdata/kvm-features.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/kvm-pit-delay.x86_64-latest.args b/tests= /qemuxmlconfdata/kvm-pit-delay.x86_64-latest.args index 8d4981b6cf..e076cc25e9 100644 --- a/tests/qemuxmlconfdata/kvm-pit-delay.x86_64-latest.args +++ b/tests/qemuxmlconfdata/kvm-pit-delay.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -global kvm-pit.lost_tick_policy=3Ddelay \ diff --git a/tests/qemuxmlconfdata/kvm-pit-discard.x86_64-latest.args b/tes= ts/qemuxmlconfdata/kvm-pit-discard.x86_64-latest.args index 469ccac8ee..b92331e051 100644 --- a/tests/qemuxmlconfdata/kvm-pit-discard.x86_64-latest.args +++ b/tests/qemuxmlconfdata/kvm-pit-discard.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -global kvm-pit.lost_tick_policy=3Ddiscard \ diff --git a/tests/qemuxmlconfdata/kvmclock+eoi-disabled.x86_64-latest.args= b/tests/qemuxmlconfdata/kvmclock+eoi-disabled.x86_64-latest.args index 99b62a8c41..15bdc3babb 100644 --- a/tests/qemuxmlconfdata/kvmclock+eoi-disabled.x86_64-latest.args +++ b/tests/qemuxmlconfdata/kvmclock+eoi-disabled.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/kvmclock.x86_64-latest.args b/tests/qemu= xmlconfdata/kvmclock.x86_64-latest.args index f24504b43e..6e46d1b7f8 100644 --- a/tests/qemuxmlconfdata/kvmclock.x86_64-latest.args +++ b/tests/qemuxmlconfdata/kvmclock.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/launch-security-s390-pv.s390x-latest.arg= s b/tests/qemuxmlconfdata/launch-security-s390-pv.s390x-latest.args index 9786e0a574..0074a4e2cb 100644 --- a/tests/qemuxmlconfdata/launch-security-s390-pv.s390x-latest.args +++ b/tests/qemuxmlconfdata/launch-security-s390-pv.s390x-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/launch-security-sev-direct.x86_64-latest= +amdsev.args b/tests/qemuxmlconfdata/launch-security-sev-direct.x86_64-late= st+amdsev.args index 56fa8e0b21..3271bfcb50 100644 --- a/tests/qemuxmlconfdata/launch-security-sev-direct.x86_64-latest+amdsev= .args +++ b/tests/qemuxmlconfdata/launch-security-sev-direct.x86_64-latest+amdsev= .args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/launch-security-sev-direct.x86_64-latest= .args b/tests/qemuxmlconfdata/launch-security-sev-direct.x86_64-latest.args index 56fa8e0b21..3271bfcb50 100644 --- a/tests/qemuxmlconfdata/launch-security-sev-direct.x86_64-latest.args +++ b/tests/qemuxmlconfdata/launch-security-sev-direct.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/launch-security-sev-missing-platform-inf= o.x86_64-latest+amdsev.args b/tests/qemuxmlconfdata/launch-security-sev-mis= sing-platform-info.x86_64-latest+amdsev.args index 6e076cec63..3343139118 100644 --- a/tests/qemuxmlconfdata/launch-security-sev-missing-platform-info.x86_6= 4-latest+amdsev.args +++ b/tests/qemuxmlconfdata/launch-security-sev-missing-platform-info.x86_6= 4-latest+amdsev.args @@ -23,7 +23,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/launch-security-sev-snp.x86_64-latest+am= dsev.args b/tests/qemuxmlconfdata/launch-security-sev-snp.x86_64-latest+amd= sev.args index d849eb88e0..324c318e90 100644 --- a/tests/qemuxmlconfdata/launch-security-sev-snp.x86_64-latest+amdsev.ar= gs +++ b/tests/qemuxmlconfdata/launch-security-sev-snp.x86_64-latest+amdsev.ar= gs @@ -23,7 +23,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/launch-security-sev-snp.x86_64-latest.ar= gs b/tests/qemuxmlconfdata/launch-security-sev-snp.x86_64-latest.args index d849eb88e0..324c318e90 100644 --- a/tests/qemuxmlconfdata/launch-security-sev-snp.x86_64-latest.args +++ b/tests/qemuxmlconfdata/launch-security-sev-snp.x86_64-latest.args @@ -23,7 +23,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/launch-security-sev.x86_64-latest+amdsev= .args b/tests/qemuxmlconfdata/launch-security-sev.x86_64-latest+amdsev.args index b62961f974..53a835d1c4 100644 --- a/tests/qemuxmlconfdata/launch-security-sev.x86_64-latest+amdsev.args +++ b/tests/qemuxmlconfdata/launch-security-sev.x86_64-latest+amdsev.args @@ -23,7 +23,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/launch-security-tdx.x86_64-latest+intelt= dx.args b/tests/qemuxmlconfdata/launch-security-tdx.x86_64-latest+inteltdx.= args index 366d553c93..317f290493 100644 --- a/tests/qemuxmlconfdata/launch-security-tdx.x86_64-latest+inteltdx.args +++ b/tests/qemuxmlconfdata/launch-security-tdx.x86_64-latest+inteltdx.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/lease.x86_64-latest.args b/tests/qemuxml= confdata/lease.x86_64-latest.args index 1b172867c2..7523db7d72 100644 --- a/tests/qemuxmlconfdata/lease.x86_64-latest.args +++ b/tests/qemuxmlconfdata/lease.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/loongarch64-virt-default-models.loongarc= h64-latest.abi-update.args b/tests/qemuxmlconfdata/loongarch64-virt-default= -models.loongarch64-latest.abi-update.args index 0b7e265f9c..5d59c046c3 100644 --- a/tests/qemuxmlconfdata/loongarch64-virt-default-models.loongarch64-lat= est.abi-update.args +++ b/tests/qemuxmlconfdata/loongarch64-virt-default-models.loongarch64-lat= est.abi-update.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/loongarch64-virt-default-models.loongarc= h64-latest.args b/tests/qemuxmlconfdata/loongarch64-virt-default-models.loo= ngarch64-latest.args index 0b7e265f9c..5d59c046c3 100644 --- a/tests/qemuxmlconfdata/loongarch64-virt-default-models.loongarch64-lat= est.args +++ b/tests/qemuxmlconfdata/loongarch64-virt-default-models.loongarch64-lat= est.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/loongarch64-virt-graphics.loongarch64-la= test.args b/tests/qemuxmlconfdata/loongarch64-virt-graphics.loongarch64-lat= est.args index 4977e5b05f..5105a1d1d3 100644 --- a/tests/qemuxmlconfdata/loongarch64-virt-graphics.loongarch64-latest.ar= gs +++ b/tests/qemuxmlconfdata/loongarch64-virt-graphics.loongarch64-latest.ar= gs @@ -20,7 +20,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -uuid 96bc2754-8842-4714-a45f-3f69e7a9a852 \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ @@ -42,7 +42,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -device '{"driver":"virtio-net-pci","netdev":"hostnet0","id":"net0","mac":= "52:54:00:09:a4:37","bus":"pci.1","addr":"0x0"}' \ -chardev pty,id=3Dcharserial0 \ -serial chardev:charserial0 \ --chardev socket,id=3Dcharchannel0,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharchannel0,fd=3DXXXXXXX,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"}' \ -device '{"driver":"usb-kbd","id":"input1","bus":"usb.0","port":"2"}' \ diff --git a/tests/qemuxmlconfdata/loongarch64-virt-headless.loongarch64-la= test.args b/tests/qemuxmlconfdata/loongarch64-virt-headless.loongarch64-lat= est.args index e124668dbf..3265b7f561 100644 --- a/tests/qemuxmlconfdata/loongarch64-virt-headless.loongarch64-latest.ar= gs +++ b/tests/qemuxmlconfdata/loongarch64-virt-headless.loongarch64-latest.ar= gs @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ @@ -42,7 +42,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -device '{"driver":"virtio-net-pci","netdev":"hostnet0","id":"net0","mac":= "52:54:00:09:a4:37","bus":"pci.1","addr":"0x0"}' \ -chardev pty,id=3Dcharserial0 \ -serial chardev:charserial0 \ --chardev socket,id=3Dcharchannel0,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharchannel0,fd=3DXXXXXXX,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":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.5","add= r":"0x0"}' \ diff --git a/tests/qemuxmlconfdata/loongarch64-virt-minimal.loongarch64-lat= est.abi-update.args b/tests/qemuxmlconfdata/loongarch64-virt-minimal.loonga= rch64-latest.abi-update.args index fe682d9a72..552d350a0b 100644 --- a/tests/qemuxmlconfdata/loongarch64-virt-minimal.loongarch64-latest.abi= -update.args +++ b/tests/qemuxmlconfdata/loongarch64-virt-minimal.loongarch64-latest.abi= -update.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/loongarch64-virt-minimal.loongarch64-lat= est.args b/tests/qemuxmlconfdata/loongarch64-virt-minimal.loongarch64-lates= t.args index fe682d9a72..552d350a0b 100644 --- a/tests/qemuxmlconfdata/loongarch64-virt-minimal.loongarch64-latest.args +++ b/tests/qemuxmlconfdata/loongarch64-virt-minimal.loongarch64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/luks-disks-source-qcow2.x86_64-latest.ar= gs b/tests/qemuxmlconfdata/luks-disks-source-qcow2.x86_64-latest.args index 0d68d835f2..1f3056dd96 100644 --- a/tests/qemuxmlconfdata/luks-disks-source-qcow2.x86_64-latest.args +++ b/tests/qemuxmlconfdata/luks-disks-source-qcow2.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-encrypt= disk/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/luks-disks-source.x86_64-latest.args b/t= ests/qemuxmlconfdata/luks-disks-source.x86_64-latest.args index 6eedd9a33f..ac19a60ac8 100644 --- a/tests/qemuxmlconfdata/luks-disks-source.x86_64-latest.args +++ b/tests/qemuxmlconfdata/luks-disks-source.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-encrypt= disk/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/luks-disks.x86_64-latest.args b/tests/qe= muxmlconfdata/luks-disks.x86_64-latest.args index a8dc1b4f53..8fe957cb26 100644 --- a/tests/qemuxmlconfdata/luks-disks.x86_64-latest.args +++ b/tests/qemuxmlconfdata/luks-disks.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-encrypt= disk/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/mach-virt-console-native.aarch64-latest.= args b/tests/qemuxmlconfdata/mach-virt-console-native.aarch64-latest.args index 23d561de2e..359153a472 100644 --- a/tests/qemuxmlconfdata/mach-virt-console-native.aarch64-latest.args +++ b/tests/qemuxmlconfdata/mach-virt-console-native.aarch64-latest.args @@ -20,7 +20,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/mach-virt-console-virtio.aarch64-latest.= args b/tests/qemuxmlconfdata/mach-virt-console-virtio.aarch64-latest.args index 172daca909..3a9303fb01 100644 --- a/tests/qemuxmlconfdata/mach-virt-console-virtio.aarch64-latest.args +++ b/tests/qemuxmlconfdata/mach-virt-console-virtio.aarch64-latest.args @@ -20,7 +20,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/mach-virt-serial+console-native.aarch64-= latest.args b/tests/qemuxmlconfdata/mach-virt-serial+console-native.aarch64= -latest.args index 23d561de2e..359153a472 100644 --- a/tests/qemuxmlconfdata/mach-virt-serial+console-native.aarch64-latest.= args +++ b/tests/qemuxmlconfdata/mach-virt-serial+console-native.aarch64-latest.= args @@ -20,7 +20,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/mach-virt-serial-compat.aarch64-latest.a= rgs b/tests/qemuxmlconfdata/mach-virt-serial-compat.aarch64-latest.args index 23d561de2e..359153a472 100644 --- a/tests/qemuxmlconfdata/mach-virt-serial-compat.aarch64-latest.args +++ b/tests/qemuxmlconfdata/mach-virt-serial-compat.aarch64-latest.args @@ -20,7 +20,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/mach-virt-serial-native.aarch64-latest.a= rgs b/tests/qemuxmlconfdata/mach-virt-serial-native.aarch64-latest.args index 23d561de2e..359153a472 100644 --- a/tests/qemuxmlconfdata/mach-virt-serial-native.aarch64-latest.args +++ b/tests/qemuxmlconfdata/mach-virt-serial-native.aarch64-latest.args @@ -20,7 +20,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/mach-virt-serial-pci.aarch64-latest.args= b/tests/qemuxmlconfdata/mach-virt-serial-pci.aarch64-latest.args index 57b7899bc9..a471fc4a02 100644 --- a/tests/qemuxmlconfdata/mach-virt-serial-pci.aarch64-latest.args +++ b/tests/qemuxmlconfdata/mach-virt-serial-pci.aarch64-latest.args @@ -20,7 +20,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/mach-virt-serial-usb.aarch64-latest.args= b/tests/qemuxmlconfdata/mach-virt-serial-usb.aarch64-latest.args index 566407f341..f240af6880 100644 --- a/tests/qemuxmlconfdata/mach-virt-serial-usb.aarch64-latest.args +++ b/tests/qemuxmlconfdata/mach-virt-serial-usb.aarch64-latest.args @@ -20,7 +20,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/machine-aeskeywrap-off-cap.s390x-latest.= args b/tests/qemuxmlconfdata/machine-aeskeywrap-off-cap.s390x-latest.args index 3c17b8cb3b..546a783c53 100644 --- a/tests/qemuxmlconfdata/machine-aeskeywrap-off-cap.s390x-latest.args +++ b/tests/qemuxmlconfdata/machine-aeskeywrap-off-cap.s390x-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/machine-aeskeywrap-off-caps.s390x-latest= .args b/tests/qemuxmlconfdata/machine-aeskeywrap-off-caps.s390x-latest.args index 3c17b8cb3b..546a783c53 100644 --- a/tests/qemuxmlconfdata/machine-aeskeywrap-off-caps.s390x-latest.args +++ b/tests/qemuxmlconfdata/machine-aeskeywrap-off-caps.s390x-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/machine-aeskeywrap-on-cap.s390x-latest.a= rgs b/tests/qemuxmlconfdata/machine-aeskeywrap-on-cap.s390x-latest.args index 583885e470..67e52ffa29 100644 --- a/tests/qemuxmlconfdata/machine-aeskeywrap-on-cap.s390x-latest.args +++ b/tests/qemuxmlconfdata/machine-aeskeywrap-on-cap.s390x-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/machine-aeskeywrap-on-caps.s390x-latest.= args b/tests/qemuxmlconfdata/machine-aeskeywrap-on-caps.s390x-latest.args index 583885e470..67e52ffa29 100644 --- a/tests/qemuxmlconfdata/machine-aeskeywrap-on-caps.s390x-latest.args +++ b/tests/qemuxmlconfdata/machine-aeskeywrap-on-caps.s390x-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/machine-aliases1.x86_64-latest.args b/te= sts/qemuxmlconfdata/machine-aliases1.x86_64-latest.args index 23beb54806..689b636c57 100644 --- a/tests/qemuxmlconfdata/machine-aliases1.x86_64-latest.args +++ b/tests/qemuxmlconfdata/machine-aliases1.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/machine-aliases2.x86_64-latest.args b/te= sts/qemuxmlconfdata/machine-aliases2.x86_64-latest.args index 91bb98f2e6..bb3015c76d 100644 --- a/tests/qemuxmlconfdata/machine-aliases2.x86_64-latest.args +++ b/tests/qemuxmlconfdata/machine-aliases2.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/machine-core-off.x86_64-latest.args b/te= sts/qemuxmlconfdata/machine-core-off.x86_64-latest.args index 9493ded1c7..d59f1717d9 100644 --- a/tests/qemuxmlconfdata/machine-core-off.x86_64-latest.args +++ b/tests/qemuxmlconfdata/machine-core-off.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/machine-core-on.x86_64-latest.args b/tes= ts/qemuxmlconfdata/machine-core-on.x86_64-latest.args index 22aefe66ec..50936d34f8 100644 --- a/tests/qemuxmlconfdata/machine-core-on.x86_64-latest.args +++ b/tests/qemuxmlconfdata/machine-core-on.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/machine-deakeywrap-off-cap.s390x-latest.= args b/tests/qemuxmlconfdata/machine-deakeywrap-off-cap.s390x-latest.args index 6270b7e43a..107a32aa53 100644 --- a/tests/qemuxmlconfdata/machine-deakeywrap-off-cap.s390x-latest.args +++ b/tests/qemuxmlconfdata/machine-deakeywrap-off-cap.s390x-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/machine-deakeywrap-off-caps.s390x-latest= .args b/tests/qemuxmlconfdata/machine-deakeywrap-off-caps.s390x-latest.args index 6270b7e43a..107a32aa53 100644 --- a/tests/qemuxmlconfdata/machine-deakeywrap-off-caps.s390x-latest.args +++ b/tests/qemuxmlconfdata/machine-deakeywrap-off-caps.s390x-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/machine-deakeywrap-on-cap.s390x-latest.a= rgs b/tests/qemuxmlconfdata/machine-deakeywrap-on-cap.s390x-latest.args index c0104970b5..f24ddce225 100644 --- a/tests/qemuxmlconfdata/machine-deakeywrap-on-cap.s390x-latest.args +++ b/tests/qemuxmlconfdata/machine-deakeywrap-on-cap.s390x-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/machine-deakeywrap-on-caps.s390x-latest.= args b/tests/qemuxmlconfdata/machine-deakeywrap-on-caps.s390x-latest.args index c0104970b5..f24ddce225 100644 --- a/tests/qemuxmlconfdata/machine-deakeywrap-on-caps.s390x-latest.args +++ b/tests/qemuxmlconfdata/machine-deakeywrap-on-caps.s390x-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/machine-i8042-off.x86_64-latest.args b/t= ests/qemuxmlconfdata/machine-i8042-off.x86_64-latest.args index e340d164fc..fcdbf0a6e1 100644 --- a/tests/qemuxmlconfdata/machine-i8042-off.x86_64-latest.args +++ b/tests/qemuxmlconfdata/machine-i8042-off.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/machine-i8042-on.x86_64-latest.args b/te= sts/qemuxmlconfdata/machine-i8042-on.x86_64-latest.args index cda5002fec..57c593aa3a 100644 --- a/tests/qemuxmlconfdata/machine-i8042-on.x86_64-latest.args +++ b/tests/qemuxmlconfdata/machine-i8042-on.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/machine-keywrap-none-caps.s390x-latest.a= rgs b/tests/qemuxmlconfdata/machine-keywrap-none-caps.s390x-latest.args index 10594504bc..0a7c36b843 100644 --- a/tests/qemuxmlconfdata/machine-keywrap-none-caps.s390x-latest.args +++ b/tests/qemuxmlconfdata/machine-keywrap-none-caps.s390x-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/machine-keywrap-none.s390x-latest.args b= /tests/qemuxmlconfdata/machine-keywrap-none.s390x-latest.args index 10594504bc..0a7c36b843 100644 --- a/tests/qemuxmlconfdata/machine-keywrap-none.s390x-latest.args +++ b/tests/qemuxmlconfdata/machine-keywrap-none.s390x-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/machine-loadparm-hostdev.s390x-9.1.0.arg= s b/tests/qemuxmlconfdata/machine-loadparm-hostdev.s390x-9.1.0.args index 0a025e6335..55e010b3a5 100644 --- a/tests/qemuxmlconfdata/machine-loadparm-hostdev.s390x-9.1.0.args +++ b/tests/qemuxmlconfdata/machine-loadparm-hostdev.s390x-9.1.0.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/machine-loadparm-hostdev.s390x-latest.ar= gs b/tests/qemuxmlconfdata/machine-loadparm-hostdev.s390x-latest.args index 39f77c14e7..6859ce93e5 100644 --- a/tests/qemuxmlconfdata/machine-loadparm-hostdev.s390x-latest.args +++ b/tests/qemuxmlconfdata/machine-loadparm-hostdev.s390x-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/machine-loadparm-multiple-disks-nets-s39= 0.s390x-9.1.0.args b/tests/qemuxmlconfdata/machine-loadparm-multiple-disks-= nets-s390.s390x-9.1.0.args index 02c0612440..6a8d3a406b 100644 --- a/tests/qemuxmlconfdata/machine-loadparm-multiple-disks-nets-s390.s390x= -9.1.0.args +++ b/tests/qemuxmlconfdata/machine-loadparm-multiple-disks-nets-s390.s390x= -9.1.0.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/machine-loadparm-multiple-disks-nets-s39= 0.s390x-latest.args b/tests/qemuxmlconfdata/machine-loadparm-multiple-disks= -nets-s390.s390x-latest.args index 34f148e430..1e8825ec35 100644 --- a/tests/qemuxmlconfdata/machine-loadparm-multiple-disks-nets-s390.s390x= -latest.args +++ b/tests/qemuxmlconfdata/machine-loadparm-multiple-disks-nets-s390.s390x= -latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/machine-loadparm-net-s390.s390x-9.1.0.ar= gs b/tests/qemuxmlconfdata/machine-loadparm-net-s390.s390x-9.1.0.args index 4d34784f46..800ab47743 100644 --- a/tests/qemuxmlconfdata/machine-loadparm-net-s390.s390x-9.1.0.args +++ b/tests/qemuxmlconfdata/machine-loadparm-net-s390.s390x-9.1.0.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/machine-loadparm-net-s390.s390x-latest.a= rgs b/tests/qemuxmlconfdata/machine-loadparm-net-s390.s390x-latest.args index a5241c38f3..2cd3354734 100644 --- a/tests/qemuxmlconfdata/machine-loadparm-net-s390.s390x-latest.args +++ b/tests/qemuxmlconfdata/machine-loadparm-net-s390.s390x-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/machine-loadparm-s390.s390x-9.1.0.args b= /tests/qemuxmlconfdata/machine-loadparm-s390.s390x-9.1.0.args index cbb5e9df34..4644a9fe74 100644 --- a/tests/qemuxmlconfdata/machine-loadparm-s390.s390x-9.1.0.args +++ b/tests/qemuxmlconfdata/machine-loadparm-s390.s390x-9.1.0.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/machine-loadparm-s390.s390x-latest.args = b/tests/qemuxmlconfdata/machine-loadparm-s390.s390x-latest.args index 2b46f1b83f..d70378e274 100644 --- a/tests/qemuxmlconfdata/machine-loadparm-s390.s390x-latest.args +++ b/tests/qemuxmlconfdata/machine-loadparm-s390.s390x-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/machine-smm-off.x86_64-latest.args b/tes= ts/qemuxmlconfdata/machine-smm-off.x86_64-latest.args index 3a8c486df6..386e4e9a74 100644 --- a/tests/qemuxmlconfdata/machine-smm-off.x86_64-latest.args +++ b/tests/qemuxmlconfdata/machine-smm-off.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/machine-smm-on.x86_64-latest.args b/test= s/qemuxmlconfdata/machine-smm-on.x86_64-latest.args index e873488433..fe9e1b6228 100644 --- a/tests/qemuxmlconfdata/machine-smm-on.x86_64-latest.args +++ b/tests/qemuxmlconfdata/machine-smm-on.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/machine-vmport-opt.x86_64-latest.args b/= tests/qemuxmlconfdata/machine-vmport-opt.x86_64-latest.args index 105e64618a..9c7cf202ea 100644 --- a/tests/qemuxmlconfdata/machine-vmport-opt.x86_64-latest.args +++ b/tests/qemuxmlconfdata/machine-vmport-opt.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/memfd-memory-default-hugepage.x86_64-lat= est.args b/tests/qemuxmlconfdata/memfd-memory-default-hugepage.x86_64-lates= t.args index ad4620175e..c6aed849c4 100644 --- a/tests/qemuxmlconfdata/memfd-memory-default-hugepage.x86_64-latest.args +++ b/tests/qemuxmlconfdata/memfd-memory-default-hugepage.x86_64-latest.args @@ -23,7 +23,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-instanc= e-00000092/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/memfd-memory-numa.x86_64-latest.args b/t= ests/qemuxmlconfdata/memfd-memory-numa.x86_64-latest.args index 861d9fb18c..a5a4bab6c1 100644 --- a/tests/qemuxmlconfdata/memfd-memory-numa.x86_64-latest.args +++ b/tests/qemuxmlconfdata/memfd-memory-numa.x86_64-latest.args @@ -23,7 +23,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-instanc= e-00000092/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/memory-hotplug-dimm-addr.x86_64-latest.a= rgs b/tests/qemuxmlconfdata/memory-hotplug-dimm-addr.x86_64-latest.args index 7b9b60f309..82844926c5 100644 --- a/tests/qemuxmlconfdata/memory-hotplug-dimm-addr.x86_64-latest.args +++ b/tests/qemuxmlconfdata/memory-hotplug-dimm-addr.x86_64-latest.args @@ -22,7 +22,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/memory-hotplug-dimm.x86_64-latest.args b= /tests/qemuxmlconfdata/memory-hotplug-dimm.x86_64-latest.args index de835537d2..7f5c6b2888 100644 --- a/tests/qemuxmlconfdata/memory-hotplug-dimm.x86_64-latest.args +++ b/tests/qemuxmlconfdata/memory-hotplug-dimm.x86_64-latest.args @@ -22,7 +22,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/memory-hotplug-multiple.x86_64-latest.ar= gs b/tests/qemuxmlconfdata/memory-hotplug-multiple.x86_64-latest.args index 9eb2d37d96..353b9294f2 100644 --- a/tests/qemuxmlconfdata/memory-hotplug-multiple.x86_64-latest.args +++ b/tests/qemuxmlconfdata/memory-hotplug-multiple.x86_64-latest.args @@ -22,7 +22,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/memory-hotplug-numa-preferred.x86_64-lat= est.args b/tests/qemuxmlconfdata/memory-hotplug-numa-preferred.x86_64-lates= t.args index 8c20b3ba5d..75a0813a19 100644 --- a/tests/qemuxmlconfdata/memory-hotplug-numa-preferred.x86_64-latest.args +++ b/tests/qemuxmlconfdata/memory-hotplug-numa-preferred.x86_64-latest.args @@ -24,7 +24,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/memory-hotplug-nvdimm-access.x86_64-late= st.args b/tests/qemuxmlconfdata/memory-hotplug-nvdimm-access.x86_64-latest.= args index 693dea866c..71616e7aa7 100644 --- a/tests/qemuxmlconfdata/memory-hotplug-nvdimm-access.x86_64-latest.args +++ b/tests/qemuxmlconfdata/memory-hotplug-nvdimm-access.x86_64-latest.args @@ -22,7 +22,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/memory-hotplug-nvdimm-align.x86_64-lates= t.args b/tests/qemuxmlconfdata/memory-hotplug-nvdimm-align.x86_64-latest.ar= gs index a8ed07ec9a..6e8a6442ac 100644 --- a/tests/qemuxmlconfdata/memory-hotplug-nvdimm-align.x86_64-latest.args +++ b/tests/qemuxmlconfdata/memory-hotplug-nvdimm-align.x86_64-latest.args @@ -22,7 +22,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/memory-hotplug-nvdimm-label.x86_64-lates= t.args b/tests/qemuxmlconfdata/memory-hotplug-nvdimm-label.x86_64-latest.ar= gs index 364a2aa6ee..bd27981a78 100644 --- a/tests/qemuxmlconfdata/memory-hotplug-nvdimm-label.x86_64-latest.args +++ b/tests/qemuxmlconfdata/memory-hotplug-nvdimm-label.x86_64-latest.args @@ -22,7 +22,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/memory-hotplug-nvdimm-overlap.x86_64-lat= est.args b/tests/qemuxmlconfdata/memory-hotplug-nvdimm-overlap.x86_64-lates= t.args index e74d2d7013..093d8f2a8f 100644 --- a/tests/qemuxmlconfdata/memory-hotplug-nvdimm-overlap.x86_64-latest.args +++ b/tests/qemuxmlconfdata/memory-hotplug-nvdimm-overlap.x86_64-latest.args @@ -22,7 +22,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/memory-hotplug-nvdimm-pmem.x86_64-latest= .args b/tests/qemuxmlconfdata/memory-hotplug-nvdimm-pmem.x86_64-latest.args index 47291c1a09..254636bf35 100644 --- a/tests/qemuxmlconfdata/memory-hotplug-nvdimm-pmem.x86_64-latest.args +++ b/tests/qemuxmlconfdata/memory-hotplug-nvdimm-pmem.x86_64-latest.args @@ -22,7 +22,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/memory-hotplug-nvdimm-ppc64.ppc64-latest= .abi-update.args b/tests/qemuxmlconfdata/memory-hotplug-nvdimm-ppc64.ppc64-= latest.abi-update.args index c2c1623d9f..b52e4821bc 100644 --- a/tests/qemuxmlconfdata/memory-hotplug-nvdimm-ppc64.ppc64-latest.abi-up= date.args +++ b/tests/qemuxmlconfdata/memory-hotplug-nvdimm-ppc64.ppc64-latest.abi-up= date.args @@ -22,7 +22,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/memory-hotplug-nvdimm-ppc64.ppc64-latest= .args b/tests/qemuxmlconfdata/memory-hotplug-nvdimm-ppc64.ppc64-latest.args index c2c1623d9f..b52e4821bc 100644 --- a/tests/qemuxmlconfdata/memory-hotplug-nvdimm-ppc64.ppc64-latest.args +++ b/tests/qemuxmlconfdata/memory-hotplug-nvdimm-ppc64.ppc64-latest.args @@ -22,7 +22,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/memory-hotplug-nvdimm-readonly.x86_64-la= test.args b/tests/qemuxmlconfdata/memory-hotplug-nvdimm-readonly.x86_64-lat= est.args index 35f6653519..5bfa663004 100644 --- a/tests/qemuxmlconfdata/memory-hotplug-nvdimm-readonly.x86_64-latest.ar= gs +++ b/tests/qemuxmlconfdata/memory-hotplug-nvdimm-readonly.x86_64-latest.ar= gs @@ -22,7 +22,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/memory-hotplug-nvdimm.x86_64-latest.args= b/tests/qemuxmlconfdata/memory-hotplug-nvdimm.x86_64-latest.args index 97ee265fa2..9b7837d73f 100644 --- a/tests/qemuxmlconfdata/memory-hotplug-nvdimm.x86_64-latest.args +++ b/tests/qemuxmlconfdata/memory-hotplug-nvdimm.x86_64-latest.args @@ -22,7 +22,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/memory-hotplug-ppc64-nonuma.ppc64-latest= .abi-update.args b/tests/qemuxmlconfdata/memory-hotplug-ppc64-nonuma.ppc64-= latest.abi-update.args index 18ae15aa0b..83f05ccc9d 100644 --- a/tests/qemuxmlconfdata/memory-hotplug-ppc64-nonuma.ppc64-latest.abi-up= date.args +++ b/tests/qemuxmlconfdata/memory-hotplug-ppc64-nonuma.ppc64-latest.abi-up= date.args @@ -22,7 +22,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/memory-hotplug-ppc64-nonuma.ppc64-latest= .args b/tests/qemuxmlconfdata/memory-hotplug-ppc64-nonuma.ppc64-latest.args index 6c84ef3b01..ec901a1c34 100644 --- a/tests/qemuxmlconfdata/memory-hotplug-ppc64-nonuma.ppc64-latest.args +++ b/tests/qemuxmlconfdata/memory-hotplug-ppc64-nonuma.ppc64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/memory-hotplug-virtio-mem-ccw-s390x.s390= x-latest.args b/tests/qemuxmlconfdata/memory-hotplug-virtio-mem-ccw-s390x.s= 390x-latest.args index a6bbef5ce7..85b3a5bf2f 100644 --- a/tests/qemuxmlconfdata/memory-hotplug-virtio-mem-ccw-s390x.s390x-lates= t.args +++ b/tests/qemuxmlconfdata/memory-hotplug-virtio-mem-ccw-s390x.s390x-lates= t.args @@ -22,7 +22,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/memory-hotplug-virtio-mem-pci-s390x.s390= x-latest.args b/tests/qemuxmlconfdata/memory-hotplug-virtio-mem-pci-s390x.s= 390x-latest.args index 9704d7d5e9..6425942992 100644 --- a/tests/qemuxmlconfdata/memory-hotplug-virtio-mem-pci-s390x.s390x-lates= t.args +++ b/tests/qemuxmlconfdata/memory-hotplug-virtio-mem-pci-s390x.s390x-lates= t.args @@ -22,7 +22,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/memory-hotplug-virtio-mem.x86_64-latest.= args b/tests/qemuxmlconfdata/memory-hotplug-virtio-mem.x86_64-latest.args index 03fc5a1efe..20de4e2797 100644 --- a/tests/qemuxmlconfdata/memory-hotplug-virtio-mem.x86_64-latest.args +++ b/tests/qemuxmlconfdata/memory-hotplug-virtio-mem.x86_64-latest.args @@ -22,7 +22,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/memory-hotplug-virtio-pmem.x86_64-latest= .args b/tests/qemuxmlconfdata/memory-hotplug-virtio-pmem.x86_64-latest.args index 097bcda7e5..1196724c2b 100644 --- a/tests/qemuxmlconfdata/memory-hotplug-virtio-pmem.x86_64-latest.args +++ b/tests/qemuxmlconfdata/memory-hotplug-virtio-pmem.x86_64-latest.args @@ -22,7 +22,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/memory-hotplug.x86_64-latest.args b/test= s/qemuxmlconfdata/memory-hotplug.x86_64-latest.args index e15f6aca47..31c62ec38c 100644 --- a/tests/qemuxmlconfdata/memory-hotplug.x86_64-latest.args +++ b/tests/qemuxmlconfdata/memory-hotplug.x86_64-latest.args @@ -22,7 +22,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/memorybacking-set.x86_64-latest.args b/t= ests/qemuxmlconfdata/memorybacking-set.x86_64-latest.args index 9c0fb4bdb6..f021fa996c 100644 --- a/tests/qemuxmlconfdata/memorybacking-set.x86_64-latest.args +++ b/tests/qemuxmlconfdata/memorybacking-set.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-SomeDum= myGuest/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/memorybacking-unset.x86_64-latest.args b= /tests/qemuxmlconfdata/memorybacking-unset.x86_64-latest.args index 5e6d15e37b..f7d6278654 100644 --- a/tests/qemuxmlconfdata/memorybacking-unset.x86_64-latest.args +++ b/tests/qemuxmlconfdata/memorybacking-unset.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-SomeDum= myGuest/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/memtune-unlimited.x86_64-latest.args b/t= ests/qemuxmlconfdata/memtune-unlimited.x86_64-latest.args index 23beb54806..689b636c57 100644 --- a/tests/qemuxmlconfdata/memtune-unlimited.x86_64-latest.args +++ b/tests/qemuxmlconfdata/memtune-unlimited.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/memtune.x86_64-latest.args b/tests/qemux= mlconfdata/memtune.x86_64-latest.args index 23beb54806..689b636c57 100644 --- a/tests/qemuxmlconfdata/memtune.x86_64-latest.args +++ b/tests/qemuxmlconfdata/memtune.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/metadata-duplicate.x86_64-latest.args b/= tests/qemuxmlconfdata/metadata-duplicate.x86_64-latest.args index 23beb54806..689b636c57 100644 --- a/tests/qemuxmlconfdata/metadata-duplicate.x86_64-latest.args +++ b/tests/qemuxmlconfdata/metadata-duplicate.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/metadata.x86_64-latest.args b/tests/qemu= xmlconfdata/metadata.x86_64-latest.args index 23beb54806..689b636c57 100644 --- a/tests/qemuxmlconfdata/metadata.x86_64-latest.args +++ b/tests/qemuxmlconfdata/metadata.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/migrate-numa-unaligned.x86_64-latest.arg= s b/tests/qemuxmlconfdata/migrate-numa-unaligned.x86_64-latest.args index 434753d96d..0b975dc51c 100644 --- a/tests/qemuxmlconfdata/migrate-numa-unaligned.x86_64-latest.args +++ b/tests/qemuxmlconfdata/migrate-numa-unaligned.x86_64-latest.args @@ -26,7 +26,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/migrate.x86_64-latest.args b/tests/qemux= mlconfdata/migrate.x86_64-latest.args index 83ab8fbdf4..456a6dc79e 100644 --- a/tests/qemuxmlconfdata/migrate.x86_64-latest.args +++ b/tests/qemuxmlconfdata/migrate.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/misc-disable-s3.x86_64-latest.args b/tes= ts/qemuxmlconfdata/misc-disable-s3.x86_64-latest.args index 0420f7779b..48015d5546 100644 --- a/tests/qemuxmlconfdata/misc-disable-s3.x86_64-latest.args +++ b/tests/qemuxmlconfdata/misc-disable-s3.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/misc-disable-suspends.x86_64-latest.args= b/tests/qemuxmlconfdata/misc-disable-suspends.x86_64-latest.args index 32f953a49d..68743f6b78 100644 --- a/tests/qemuxmlconfdata/misc-disable-suspends.x86_64-latest.args +++ b/tests/qemuxmlconfdata/misc-disable-suspends.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/misc-enable-s4.x86_64-latest.args b/test= s/qemuxmlconfdata/misc-enable-s4.x86_64-latest.args index c83f8106e1..c0f17e959e 100644 --- a/tests/qemuxmlconfdata/misc-enable-s4.x86_64-latest.args +++ b/tests/qemuxmlconfdata/misc-enable-s4.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/misc-no-reboot.x86_64-latest.args b/test= s/qemuxmlconfdata/misc-no-reboot.x86_64-latest.args index 9493ded1c7..d59f1717d9 100644 --- a/tests/qemuxmlconfdata/misc-no-reboot.x86_64-latest.args +++ b/tests/qemuxmlconfdata/misc-no-reboot.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/misc-uuid.x86_64-latest.args b/tests/qem= uxmlconfdata/misc-uuid.x86_64-latest.args index c4e09c0af2..2d052351fa 100644 --- a/tests/qemuxmlconfdata/misc-uuid.x86_64-latest.args +++ b/tests/qemuxmlconfdata/misc-uuid.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/mlock-off.x86_64-latest.args b/tests/qem= uxmlconfdata/mlock-off.x86_64-latest.args index e4be4266bb..a08dae37e7 100644 --- a/tests/qemuxmlconfdata/mlock-off.x86_64-latest.args +++ b/tests/qemuxmlconfdata/mlock-off.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/mlock-on.x86_64-latest.args b/tests/qemu= xmlconfdata/mlock-on.x86_64-latest.args index 8b48a05883..7e703e9106 100644 --- a/tests/qemuxmlconfdata/mlock-on.x86_64-latest.args +++ b/tests/qemuxmlconfdata/mlock-on.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/mshv-x86_64-q35-headless.x86_64-latest+m= shv.args b/tests/qemuxmlconfdata/mshv-x86_64-q35-headless.x86_64-latest+msh= v.args index e72d109a52..28e3e3fc26 100644 --- a/tests/qemuxmlconfdata/mshv-x86_64-q35-headless.x86_64-latest+mshv.args +++ b/tests/qemuxmlconfdata/mshv-x86_64-q35-headless.x86_64-latest+mshv.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-qemu_ms= hv/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc,driftfix=3Dslew \ -global kvm-pit.lost_tick_policy=3Ddelay \ diff --git a/tests/qemuxmlconfdata/mtp-usb-device.x86_64-latest.args b/test= s/qemuxmlconfdata/mtp-usb-device.x86_64-latest.args index 71020e6e5e..8af45b4c6d 100644 --- a/tests/qemuxmlconfdata/mtp-usb-device.x86_64-latest.args +++ b/tests/qemuxmlconfdata/mtp-usb-device.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/multifunction-pci-device.x86_64-latest.a= rgs b/tests/qemuxmlconfdata/multifunction-pci-device.x86_64-latest.args index cb74747589..0f641f9293 100644 --- a/tests/qemuxmlconfdata/multifunction-pci-device.x86_64-latest.args +++ b/tests/qemuxmlconfdata/multifunction-pci-device.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/name-escape.x86_64-latest.args b/tests/q= emuxmlconfdata/name-escape.x86_64-latest.args index 6a7032d99a..5d0db75717 100644 --- a/tests/qemuxmlconfdata/name-escape.x86_64-latest.args +++ b/tests/qemuxmlconfdata/name-escape.x86_64-latest.args @@ -20,7 +20,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-foo=3D1= ,bar=3D2/.config \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/net-bandwidth.x86_64-latest.args b/tests= /qemuxmlconfdata/net-bandwidth.x86_64-latest.args index 107b65b7c8..44bf06ee28 100644 --- a/tests/qemuxmlconfdata/net-bandwidth.x86_64-latest.args +++ b/tests/qemuxmlconfdata/net-bandwidth.x86_64-latest.args @@ -20,7 +20,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-f14-60/= .config \ -uuid 38644c45-5227-a936-3b38-bc4f72c355bb \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/net-bandwidth2.x86_64-latest.args b/test= s/qemuxmlconfdata/net-bandwidth2.x86_64-latest.args index 2cd65e8c85..a3731cab99 100644 --- a/tests/qemuxmlconfdata/net-bandwidth2.x86_64-latest.args +++ b/tests/qemuxmlconfdata/net-bandwidth2.x86_64-latest.args @@ -20,7 +20,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-f14-60/= .config \ -uuid 38644c45-5227-a936-3b38-bc4f72c355bb \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/net-client.x86_64-latest.args b/tests/qe= muxmlconfdata/net-client.x86_64-latest.args index 4ddfd46e3b..e390929043 100644 --- a/tests/qemuxmlconfdata/net-client.x86_64-latest.args +++ b/tests/qemuxmlconfdata/net-client.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/net-coalesce.x86_64-latest.args b/tests/= qemuxmlconfdata/net-coalesce.x86_64-latest.args index c09d21576d..ac93af6891 100644 --- a/tests/qemuxmlconfdata/net-coalesce.x86_64-latest.args +++ b/tests/qemuxmlconfdata/net-coalesce.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-test/.c= onfig \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/net-eth-hostip.x86_64-latest.args b/test= s/qemuxmlconfdata/net-eth-hostip.x86_64-latest.args index 8105eaa55a..d5a8b6a107 100644 --- a/tests/qemuxmlconfdata/net-eth-hostip.x86_64-latest.args +++ b/tests/qemuxmlconfdata/net-eth-hostip.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/net-eth-ifname.x86_64-latest.args b/test= s/qemuxmlconfdata/net-eth-ifname.x86_64-latest.args index 8105eaa55a..d5a8b6a107 100644 --- a/tests/qemuxmlconfdata/net-eth-ifname.x86_64-latest.args +++ b/tests/qemuxmlconfdata/net-eth-ifname.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/net-eth-names.x86_64-latest.args b/tests= /qemuxmlconfdata/net-eth-names.x86_64-latest.args index 73cd790c4b..09313dcbd6 100644 --- a/tests/qemuxmlconfdata/net-eth-names.x86_64-latest.args +++ b/tests/qemuxmlconfdata/net-eth-names.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/net-eth-unmanaged-tap.x86_64-latest.args= b/tests/qemuxmlconfdata/net-eth-unmanaged-tap.x86_64-latest.args index ac96eb5928..5190a79647 100644 --- a/tests/qemuxmlconfdata/net-eth-unmanaged-tap.x86_64-latest.args +++ b/tests/qemuxmlconfdata/net-eth-unmanaged-tap.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/net-eth.x86_64-latest.args b/tests/qemux= mlconfdata/net-eth.x86_64-latest.args index 8105eaa55a..d5a8b6a107 100644 --- a/tests/qemuxmlconfdata/net-eth.x86_64-latest.args +++ b/tests/qemuxmlconfdata/net-eth.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/net-hostdev-bootorder.x86_64-latest.args= b/tests/qemuxmlconfdata/net-hostdev-bootorder.x86_64-latest.args index 26c61e29e2..5772fea1c2 100644 --- a/tests/qemuxmlconfdata/net-hostdev-bootorder.x86_64-latest.args +++ b/tests/qemuxmlconfdata/net-hostdev-bootorder.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/net-hostdev-multidomain.x86_64-latest.ar= gs b/tests/qemuxmlconfdata/net-hostdev-multidomain.x86_64-latest.args index 2e94db50a1..839011e0e9 100644 --- a/tests/qemuxmlconfdata/net-hostdev-multidomain.x86_64-latest.args +++ b/tests/qemuxmlconfdata/net-hostdev-multidomain.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/net-hostdev-vfio-multidomain.x86_64-late= st.args b/tests/qemuxmlconfdata/net-hostdev-vfio-multidomain.x86_64-latest.= args index c0e17fb91c..8bbaf6d279 100644 --- a/tests/qemuxmlconfdata/net-hostdev-vfio-multidomain.x86_64-latest.args +++ b/tests/qemuxmlconfdata/net-hostdev-vfio-multidomain.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/net-hostdev-vfio.x86_64-latest.args b/te= sts/qemuxmlconfdata/net-hostdev-vfio.x86_64-latest.args index 051afb53ac..1ea3597a13 100644 --- a/tests/qemuxmlconfdata/net-hostdev-vfio.x86_64-latest.args +++ b/tests/qemuxmlconfdata/net-hostdev-vfio.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/net-hostdev.x86_64-latest.args b/tests/q= emuxmlconfdata/net-hostdev.x86_64-latest.args index 8ee253826e..a5302f08b4 100644 --- a/tests/qemuxmlconfdata/net-hostdev.x86_64-latest.args +++ b/tests/qemuxmlconfdata/net-hostdev.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/net-isolated-port.x86_64-latest.args b/t= ests/qemuxmlconfdata/net-isolated-port.x86_64-latest.args index 186128635d..ae4ac627e4 100644 --- a/tests/qemuxmlconfdata/net-isolated-port.x86_64-latest.args +++ b/tests/qemuxmlconfdata/net-isolated-port.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-q35-tes= t/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/net-linkstate.x86_64-latest.args b/tests= /qemuxmlconfdata/net-linkstate.x86_64-latest.args index ba1608bf2e..8f52311d2a 100644 --- a/tests/qemuxmlconfdata/net-linkstate.x86_64-latest.args +++ b/tests/qemuxmlconfdata/net-linkstate.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/net-many-models.x86_64-latest.args b/tes= ts/qemuxmlconfdata/net-many-models.x86_64-latest.args index c6ecde421a..55d271319d 100644 --- a/tests/qemuxmlconfdata/net-many-models.x86_64-latest.args +++ b/tests/qemuxmlconfdata/net-many-models.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/net-mcast.x86_64-latest.args b/tests/qem= uxmlconfdata/net-mcast.x86_64-latest.args index 9caba36642..8fe56a04ef 100644 --- a/tests/qemuxmlconfdata/net-mcast.x86_64-latest.args +++ b/tests/qemuxmlconfdata/net-mcast.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/net-midonet.x86_64-latest.args b/tests/q= emuxmlconfdata/net-midonet.x86_64-latest.args index b07fd5779b..0f5a84c3ba 100644 --- a/tests/qemuxmlconfdata/net-midonet.x86_64-latest.args +++ b/tests/qemuxmlconfdata/net-midonet.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/net-mtu.x86_64-latest.args b/tests/qemux= mlconfdata/net-mtu.x86_64-latest.args index 65e89e47d5..c8f189d6e8 100644 --- a/tests/qemuxmlconfdata/net-mtu.x86_64-latest.args +++ b/tests/qemuxmlconfdata/net-mtu.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-test/.c= onfig \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/net-openvswitch.x86_64-latest.args b/tes= ts/qemuxmlconfdata/net-openvswitch.x86_64-latest.args index da792aeffd..6d134dcf80 100644 --- a/tests/qemuxmlconfdata/net-openvswitch.x86_64-latest.args +++ b/tests/qemuxmlconfdata/net-openvswitch.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/net-server.x86_64-latest.args b/tests/qe= muxmlconfdata/net-server.x86_64-latest.args index ea3213d508..5818f4f050 100644 --- a/tests/qemuxmlconfdata/net-server.x86_64-latest.args +++ b/tests/qemuxmlconfdata/net-server.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/net-udp.x86_64-latest.args b/tests/qemux= mlconfdata/net-udp.x86_64-latest.args index abd141af85..5b66fee2da 100644 --- a/tests/qemuxmlconfdata/net-udp.x86_64-latest.args +++ b/tests/qemuxmlconfdata/net-udp.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/net-usb.x86_64-latest.args b/tests/qemux= mlconfdata/net-usb.x86_64-latest.args index 714ab9aafe..092bf99e22 100644 --- a/tests/qemuxmlconfdata/net-usb.x86_64-latest.args +++ b/tests/qemuxmlconfdata/net-usb.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/net-user-addr.x86_64-latest.args b/tests= /qemuxmlconfdata/net-user-addr.x86_64-latest.args index 4383a8c115..d51441df84 100644 --- a/tests/qemuxmlconfdata/net-user-addr.x86_64-latest.args +++ b/tests/qemuxmlconfdata/net-user-addr.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/net-user-passt.x86_64-7.2.0.args b/tests= /qemuxmlconfdata/net-user-passt.x86_64-7.2.0.args index d9a81ad2a5..1308f7dceb 100644 --- a/tests/qemuxmlconfdata/net-user-passt.x86_64-7.2.0.args +++ b/tests/qemuxmlconfdata/net-user-passt.x86_64-7.2.0.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/net-user-passt.x86_64-latest.args b/test= s/qemuxmlconfdata/net-user-passt.x86_64-latest.args index 48d2596594..ff93aa4df6 100644 --- a/tests/qemuxmlconfdata/net-user-passt.x86_64-latest.args +++ b/tests/qemuxmlconfdata/net-user-passt.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/net-user.x86_64-latest.args b/tests/qemu= xmlconfdata/net-user.x86_64-latest.args index 919b5e3fc7..19dd3e6879 100644 --- a/tests/qemuxmlconfdata/net-user.x86_64-latest.args +++ b/tests/qemuxmlconfdata/net-user.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/net-vdpa-multiqueue.x86_64-latest.args b= /tests/qemuxmlconfdata/net-vdpa-multiqueue.x86_64-latest.args index 313627eab0..ccf76cb422 100644 --- a/tests/qemuxmlconfdata/net-vdpa-multiqueue.x86_64-latest.args +++ b/tests/qemuxmlconfdata/net-vdpa-multiqueue.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/net-vdpa.x86_64-latest.args b/tests/qemu= xmlconfdata/net-vdpa.x86_64-latest.args index 118dd5dcb8..2bf22174e4 100644 --- a/tests/qemuxmlconfdata/net-vdpa.x86_64-latest.args +++ b/tests/qemuxmlconfdata/net-vdpa.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/net-vhostuser-multiq.x86_64-latest.args = b/tests/qemuxmlconfdata/net-vhostuser-multiq.x86_64-latest.args index 4ea3d4eebd..5d5f0f2d08 100644 --- a/tests/qemuxmlconfdata/net-vhostuser-multiq.x86_64-latest.args +++ b/tests/qemuxmlconfdata/net-vhostuser-multiq.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/net-vhostuser-passt.x86_64-latest.args b= /tests/qemuxmlconfdata/net-vhostuser-passt.x86_64-latest.args index afbbe188cf..bc606a6b05 100644 --- a/tests/qemuxmlconfdata/net-vhostuser-passt.x86_64-latest.args +++ b/tests/qemuxmlconfdata/net-vhostuser-passt.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/net-vhostuser.x86_64-latest.args b/tests= /qemuxmlconfdata/net-vhostuser.x86_64-latest.args index f5925c77fe..5bbe1989d0 100644 --- a/tests/qemuxmlconfdata/net-vhostuser.x86_64-latest.args +++ b/tests/qemuxmlconfdata/net-vhostuser.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/net-virtio-ccw.s390x-latest.args b/tests= /qemuxmlconfdata/net-virtio-ccw.s390x-latest.args index 891d755501..e5e6a8b9f9 100644 --- a/tests/qemuxmlconfdata/net-virtio-ccw.s390x-latest.args +++ b/tests/qemuxmlconfdata/net-virtio-ccw.s390x-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/net-virtio-device.x86_64-latest.args b/t= ests/qemuxmlconfdata/net-virtio-device.x86_64-latest.args index 2730412dc7..f5c837a104 100644 --- a/tests/qemuxmlconfdata/net-virtio-device.x86_64-latest.args +++ b/tests/qemuxmlconfdata/net-virtio-device.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/net-virtio-disable-offloads.x86_64-lates= t.args b/tests/qemuxmlconfdata/net-virtio-disable-offloads.x86_64-latest.ar= gs index 07640fe3ba..1d625a1338 100644 --- a/tests/qemuxmlconfdata/net-virtio-disable-offloads.x86_64-latest.args +++ b/tests/qemuxmlconfdata/net-virtio-disable-offloads.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/net-virtio-netdev.x86_64-latest.args b/t= ests/qemuxmlconfdata/net-virtio-netdev.x86_64-latest.args index 544a3303cf..e17069aedd 100644 --- a/tests/qemuxmlconfdata/net-virtio-netdev.x86_64-latest.args +++ b/tests/qemuxmlconfdata/net-virtio-netdev.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/net-virtio-network-portgroup.x86_64-late= st.args b/tests/qemuxmlconfdata/net-virtio-network-portgroup.x86_64-latest.= args index f66cb6295d..a604512bf5 100644 --- a/tests/qemuxmlconfdata/net-virtio-network-portgroup.x86_64-latest.args +++ b/tests/qemuxmlconfdata/net-virtio-network-portgroup.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/net-virtio-rss.x86_64-latest.args b/test= s/qemuxmlconfdata/net-virtio-rss.x86_64-latest.args index 4de0393a8a..46853fe77f 100644 --- a/tests/qemuxmlconfdata/net-virtio-rss.x86_64-latest.args +++ b/tests/qemuxmlconfdata/net-virtio-rss.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/net-virtio-rxtxqueuesize.x86_64-latest.a= rgs b/tests/qemuxmlconfdata/net-virtio-rxtxqueuesize.x86_64-latest.args index 7fd596159a..7268d180e9 100644 --- a/tests/qemuxmlconfdata/net-virtio-rxtxqueuesize.x86_64-latest.args +++ b/tests/qemuxmlconfdata/net-virtio-rxtxqueuesize.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/net-virtio-teaming-hostdev.x86_64-latest= .args b/tests/qemuxmlconfdata/net-virtio-teaming-hostdev.x86_64-latest.args index a5cce0e27c..4c18f4a53f 100644 --- a/tests/qemuxmlconfdata/net-virtio-teaming-hostdev.x86_64-latest.args +++ b/tests/qemuxmlconfdata/net-virtio-teaming-hostdev.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/net-virtio-teaming-network.x86_64-latest= .args b/tests/qemuxmlconfdata/net-virtio-teaming-network.x86_64-latest.args index f03ab5522d..d639218629 100644 --- a/tests/qemuxmlconfdata/net-virtio-teaming-network.x86_64-latest.args +++ b/tests/qemuxmlconfdata/net-virtio-teaming-network.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/net-virtio-teaming.x86_64-latest.args b/= tests/qemuxmlconfdata/net-virtio-teaming.x86_64-latest.args index 090bf2979d..1f8876d7a8 100644 --- a/tests/qemuxmlconfdata/net-virtio-teaming.x86_64-latest.args +++ b/tests/qemuxmlconfdata/net-virtio-teaming.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/net-virtio-vhost.x86_64-latest.args b/te= sts/qemuxmlconfdata/net-virtio-vhost.x86_64-latest.args index f1da987dbd..fae2efe381 100644 --- a/tests/qemuxmlconfdata/net-virtio-vhost.x86_64-latest.args +++ b/tests/qemuxmlconfdata/net-virtio-vhost.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-test/.c= onfig \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/net-virtio.x86_64-latest.args b/tests/qe= muxmlconfdata/net-virtio.x86_64-latest.args index 3dc44b7c27..56f97699d2 100644 --- a/tests/qemuxmlconfdata/net-virtio.x86_64-latest.args +++ b/tests/qemuxmlconfdata/net-virtio.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/nosharepages.x86_64-latest.args b/tests/= qemuxmlconfdata/nosharepages.x86_64-latest.args index 8ad57bfcbc..0d91649703 100644 --- a/tests/qemuxmlconfdata/nosharepages.x86_64-latest.args +++ b/tests/qemuxmlconfdata/nosharepages.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/numad-auto-memory-vcpu-cpuset.x86_64-lat= est.args b/tests/qemuxmlconfdata/numad-auto-memory-vcpu-cpuset.x86_64-lates= t.args index 33b7eb9c16..48122a005c 100644 --- a/tests/qemuxmlconfdata/numad-auto-memory-vcpu-cpuset.x86_64-latest.args +++ b/tests/qemuxmlconfdata/numad-auto-memory-vcpu-cpuset.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/numad-auto-memory-vcpu-no-cpuset-and-pla= cement.x86_64-latest.args b/tests/qemuxmlconfdata/numad-auto-memory-vcpu-no= -cpuset-and-placement.x86_64-latest.args index 33b7eb9c16..48122a005c 100644 --- a/tests/qemuxmlconfdata/numad-auto-memory-vcpu-no-cpuset-and-placement.= x86_64-latest.args +++ b/tests/qemuxmlconfdata/numad-auto-memory-vcpu-no-cpuset-and-placement.= x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/numad-auto-vcpu-no-numatune.x86_64-lates= t.args b/tests/qemuxmlconfdata/numad-auto-vcpu-no-numatune.x86_64-latest.ar= gs index 1b53765d3c..0b720d7f3e 100644 --- a/tests/qemuxmlconfdata/numad-auto-vcpu-no-numatune.x86_64-latest.args +++ b/tests/qemuxmlconfdata/numad-auto-vcpu-no-numatune.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/numad-auto-vcpu-static-numatune.x86_64-l= atest.args b/tests/qemuxmlconfdata/numad-auto-vcpu-static-numatune.x86_64-l= atest.args index c4994ddca8..cfcb747db1 100644 --- a/tests/qemuxmlconfdata/numad-auto-vcpu-static-numatune.x86_64-latest.a= rgs +++ b/tests/qemuxmlconfdata/numad-auto-vcpu-static-numatune.x86_64-latest.a= rgs @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/numad-static-memory-auto-vcpu.x86_64-lat= est.args b/tests/qemuxmlconfdata/numad-static-memory-auto-vcpu.x86_64-lates= t.args index 33b7eb9c16..48122a005c 100644 --- a/tests/qemuxmlconfdata/numad-static-memory-auto-vcpu.x86_64-latest.args +++ b/tests/qemuxmlconfdata/numad-static-memory-auto-vcpu.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/numad-static-vcpu-no-numatune.x86_64-lat= est.args b/tests/qemuxmlconfdata/numad-static-vcpu-no-numatune.x86_64-lates= t.args index 6a137ee3ca..805bdda302 100644 --- a/tests/qemuxmlconfdata/numad-static-vcpu-no-numatune.x86_64-latest.args +++ b/tests/qemuxmlconfdata/numad-static-vcpu-no-numatune.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/numad.x86_64-latest.args b/tests/qemuxml= confdata/numad.x86_64-latest.args index 33b7eb9c16..48122a005c 100644 --- a/tests/qemuxmlconfdata/numad.x86_64-latest.args +++ b/tests/qemuxmlconfdata/numad.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/numatune-auto-nodeset-invalid.x86_64-lat= est.args b/tests/qemuxmlconfdata/numatune-auto-nodeset-invalid.x86_64-lates= t.args index 55f3fb6e36..490aa8b5a6 100644 --- a/tests/qemuxmlconfdata/numatune-auto-nodeset-invalid.x86_64-latest.args +++ b/tests/qemuxmlconfdata/numatune-auto-nodeset-invalid.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/numatune-auto-prefer.x86_64-latest.args = b/tests/qemuxmlconfdata/numatune-auto-prefer.x86_64-latest.args index d67d0dbe15..efeb509e22 100644 --- a/tests/qemuxmlconfdata/numatune-auto-prefer.x86_64-latest.args +++ b/tests/qemuxmlconfdata/numatune-auto-prefer.x86_64-latest.args @@ -22,7 +22,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/numatune-distances.x86_64-latest.args b/= tests/qemuxmlconfdata/numatune-distances.x86_64-latest.args index 8eb4883ed1..cb10375116 100644 --- a/tests/qemuxmlconfdata/numatune-distances.x86_64-latest.args +++ b/tests/qemuxmlconfdata/numatune-distances.x86_64-latest.args @@ -68,7 +68,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/numatune-hmat-none.x86_64-latest.args b/= tests/qemuxmlconfdata/numatune-hmat-none.x86_64-latest.args index 0f0791a501..afe6c8df24 100644 --- a/tests/qemuxmlconfdata/numatune-hmat-none.x86_64-latest.args +++ b/tests/qemuxmlconfdata/numatune-hmat-none.x86_64-latest.args @@ -37,7 +37,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/numatune-hmat.x86_64-latest.args b/tests= /qemuxmlconfdata/numatune-hmat.x86_64-latest.args index a80c21d11e..c6f5d7195b 100644 --- a/tests/qemuxmlconfdata/numatune-hmat.x86_64-latest.args +++ b/tests/qemuxmlconfdata/numatune-hmat.x86_64-latest.args @@ -37,7 +37,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/numatune-memnode-no-memory.x86_64-latest= .args b/tests/qemuxmlconfdata/numatune-memnode-no-memory.x86_64-latest.args index a500dda611..8ba2a3bb1e 100644 --- a/tests/qemuxmlconfdata/numatune-memnode-no-memory.x86_64-latest.args +++ b/tests/qemuxmlconfdata/numatune-memnode-no-memory.x86_64-latest.args @@ -24,7 +24,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/numatune-memnode-restrictive-mode.x86_64= -latest.args b/tests/qemuxmlconfdata/numatune-memnode-restrictive-mode.x86_= 64-latest.args index fec41d92cf..a7062b5dd0 100644 --- a/tests/qemuxmlconfdata/numatune-memnode-restrictive-mode.x86_64-latest= .args +++ b/tests/qemuxmlconfdata/numatune-memnode-restrictive-mode.x86_64-latest= .args @@ -26,7 +26,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/numatune-memnode.x86_64-latest.args b/te= sts/qemuxmlconfdata/numatune-memnode.x86_64-latest.args index 45b9585822..25809ac603 100644 --- a/tests/qemuxmlconfdata/numatune-memnode.x86_64-latest.args +++ b/tests/qemuxmlconfdata/numatune-memnode.x86_64-latest.args @@ -26,7 +26,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/numatune-no-vcpu.x86_64-latest.args b/te= sts/qemuxmlconfdata/numatune-no-vcpu.x86_64-latest.args index 0a1a8033aa..26ce3e4054 100644 --- a/tests/qemuxmlconfdata/numatune-no-vcpu.x86_64-latest.args +++ b/tests/qemuxmlconfdata/numatune-no-vcpu.x86_64-latest.args @@ -32,7 +32,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/numatune-system-memory.x86_64-latest.arg= s b/tests/qemuxmlconfdata/numatune-system-memory.x86_64-latest.args index d4746c4599..06d43dec48 100644 --- a/tests/qemuxmlconfdata/numatune-system-memory.x86_64-latest.args +++ b/tests/qemuxmlconfdata/numatune-system-memory.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/numavcpus-topology-mismatch.x86_64-lates= t.args b/tests/qemuxmlconfdata/numavcpus-topology-mismatch.x86_64-latest.ar= gs index 0d4866d277..14f0c2c595 100644 --- a/tests/qemuxmlconfdata/numavcpus-topology-mismatch.x86_64-latest.args +++ b/tests/qemuxmlconfdata/numavcpus-topology-mismatch.x86_64-latest.args @@ -24,7 +24,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-dummy/.= config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/pages-dimm-discard.x86_64-latest.args b/= tests/qemuxmlconfdata/pages-dimm-discard.x86_64-latest.args index c01acb4740..d28339fc23 100644 --- a/tests/qemuxmlconfdata/pages-dimm-discard.x86_64-latest.args +++ b/tests/qemuxmlconfdata/pages-dimm-discard.x86_64-latest.args @@ -22,7 +22,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-fedora/= .config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/pages-discard-hugepages.x86_64-latest.ar= gs b/tests/qemuxmlconfdata/pages-discard-hugepages.x86_64-latest.args index d1b3c45379..1146ca7ee6 100644 --- a/tests/qemuxmlconfdata/pages-discard-hugepages.x86_64-latest.args +++ b/tests/qemuxmlconfdata/pages-discard-hugepages.x86_64-latest.args @@ -24,7 +24,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-SomeDum= myHugepagesGu/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/pages-discard.x86_64-latest.args b/tests= /qemuxmlconfdata/pages-discard.x86_64-latest.args index 9bdf10d8d0..4545f5a0fa 100644 --- a/tests/qemuxmlconfdata/pages-discard.x86_64-latest.args +++ b/tests/qemuxmlconfdata/pages-discard.x86_64-latest.args @@ -28,7 +28,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/panic-double.x86_64-latest.args b/tests/= qemuxmlconfdata/panic-double.x86_64-latest.args index b76b28e877..e8295a205f 100644 --- a/tests/qemuxmlconfdata/panic-double.x86_64-latest.args +++ b/tests/qemuxmlconfdata/panic-double.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/panic-no-address.x86_64-latest.args b/te= sts/qemuxmlconfdata/panic-no-address.x86_64-latest.args index b2ef8dd6ff..edd542f688 100644 --- a/tests/qemuxmlconfdata/panic-no-address.x86_64-latest.args +++ b/tests/qemuxmlconfdata/panic-no-address.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/panic-pseries.ppc64-latest.args b/tests/= qemuxmlconfdata/panic-pseries.ppc64-latest.args index a4a0bc994f..388c0180db 100644 --- a/tests/qemuxmlconfdata/panic-pseries.ppc64-latest.args +++ b/tests/qemuxmlconfdata/panic-pseries.ppc64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/panic.x86_64-latest.args b/tests/qemuxml= confdata/panic.x86_64-latest.args index 621daa8dab..e64717ba6c 100644 --- a/tests/qemuxmlconfdata/panic.x86_64-latest.args +++ b/tests/qemuxmlconfdata/panic.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/parallel-parport-chardev.x86_64-latest.a= rgs b/tests/qemuxmlconfdata/parallel-parport-chardev.x86_64-latest.args index 2cf5a66040..cc60c2ba7e 100644 --- a/tests/qemuxmlconfdata/parallel-parport-chardev.x86_64-latest.args +++ b/tests/qemuxmlconfdata/parallel-parport-chardev.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/parallel-tcp-chardev.x86_64-latest.args = b/tests/qemuxmlconfdata/parallel-tcp-chardev.x86_64-latest.args index 4e433553e4..cd8ca587a2 100644 --- a/tests/qemuxmlconfdata/parallel-tcp-chardev.x86_64-latest.args +++ b/tests/qemuxmlconfdata/parallel-tcp-chardev.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/parallel-unix-chardev.x86_64-latest.args= b/tests/qemuxmlconfdata/parallel-unix-chardev.x86_64-latest.args index d727c44bfc..260e0cc4b5 100644 --- a/tests/qemuxmlconfdata/parallel-unix-chardev.x86_64-latest.args +++ b/tests/qemuxmlconfdata/parallel-unix-chardev.x86_64-latest.args @@ -21,13 +21,13 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUG= uest1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --chardev socket,id=3Dcharparallel0,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharparallel0,fd=3DXXXXXXX,server=3Don,wait=3Doff \ -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"}' \ diff --git a/tests/qemuxmlconfdata/pc-i440fx-acpi-root-hotplug-disable.x86_= 64-latest.args b/tests/qemuxmlconfdata/pc-i440fx-acpi-root-hotplug-disable.= x86_64-latest.args index 61ae4f23d3..959bc9a2fe 100644 --- a/tests/qemuxmlconfdata/pc-i440fx-acpi-root-hotplug-disable.x86_64-late= st.args +++ b/tests/qemuxmlconfdata/pc-i440fx-acpi-root-hotplug-disable.x86_64-late= st.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-i440fx/= .config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/pc-i440fx-acpi-root-hotplug-enable.x86_6= 4-latest.args b/tests/qemuxmlconfdata/pc-i440fx-acpi-root-hotplug-enable.x8= 6_64-latest.args index 9b257cb36d..6418fae461 100644 --- a/tests/qemuxmlconfdata/pc-i440fx-acpi-root-hotplug-enable.x86_64-lates= t.args +++ b/tests/qemuxmlconfdata/pc-i440fx-acpi-root-hotplug-enable.x86_64-lates= t.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-i440fx/= .config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/pci-autoadd-addr.x86_64-latest.args b/te= sts/qemuxmlconfdata/pci-autoadd-addr.x86_64-latest.args index a13238efd8..05fe35e50f 100644 --- a/tests/qemuxmlconfdata/pci-autoadd-addr.x86_64-latest.args +++ b/tests/qemuxmlconfdata/pci-autoadd-addr.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-fdr-br/= .config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/pci-autoadd-idx.x86_64-latest.args b/tes= ts/qemuxmlconfdata/pci-autoadd-idx.x86_64-latest.args index 3c27825431..8733f1f61b 100644 --- a/tests/qemuxmlconfdata/pci-autoadd-idx.x86_64-latest.args +++ b/tests/qemuxmlconfdata/pci-autoadd-idx.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-fdr-br/= .config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/pci-autofill-addr.x86_64-latest.args b/t= ests/qemuxmlconfdata/pci-autofill-addr.x86_64-latest.args index 4f37de212b..aed6f28244 100644 --- a/tests/qemuxmlconfdata/pci-autofill-addr.x86_64-latest.args +++ b/tests/qemuxmlconfdata/pci-autofill-addr.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-fdr-br/= .config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/pci-bridge-many-disks.x86_64-latest.args= b/tests/qemuxmlconfdata/pci-bridge-many-disks.x86_64-latest.args index c3e53eb0c0..0cde25cd1d 100644 --- a/tests/qemuxmlconfdata/pci-bridge-many-disks.x86_64-latest.args +++ b/tests/qemuxmlconfdata/pci-bridge-many-disks.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-lots-of= -disks/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/pci-bridge.x86_64-latest.args b/tests/qe= muxmlconfdata/pci-bridge.x86_64-latest.args index 6a631f557d..196d8bf362 100644 --- a/tests/qemuxmlconfdata/pci-bridge.x86_64-latest.args +++ b/tests/qemuxmlconfdata/pci-bridge.x86_64-latest.args @@ -20,7 +20,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-fdr-br/= .config \ -uuid 3ec6cbe1-b5a2-4515-b800-31a61855df41 \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/pci-expander-bus.x86_64-latest.args b/te= sts/qemuxmlconfdata/pci-expander-bus.x86_64-latest.args index d3960731be..1a968c7b61 100644 --- a/tests/qemuxmlconfdata/pci-expander-bus.x86_64-latest.args +++ b/tests/qemuxmlconfdata/pci-expander-bus.x86_64-latest.args @@ -24,7 +24,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-expande= r-test/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/pci-many.x86_64-latest.args b/tests/qemu= xmlconfdata/pci-many.x86_64-latest.args index 2bf2d2f9fe..c6ff7a88a3 100644 --- a/tests/qemuxmlconfdata/pci-many.x86_64-latest.args +++ b/tests/qemuxmlconfdata/pci-many.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-fdr-br/= .config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/pci-rom-disabled.x86_64-latest.args b/te= sts/qemuxmlconfdata/pci-rom-disabled.x86_64-latest.args index dbc18d1f38..965d27ddb2 100644 --- a/tests/qemuxmlconfdata/pci-rom-disabled.x86_64-latest.args +++ b/tests/qemuxmlconfdata/pci-rom-disabled.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/pci-rom.x86_64-latest.args b/tests/qemux= mlconfdata/pci-rom.x86_64-latest.args index a4a1c57319..e2bd79ec0c 100644 --- a/tests/qemuxmlconfdata/pci-rom.x86_64-latest.args +++ b/tests/qemuxmlconfdata/pci-rom.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st2/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/pci-serial-dev-chardev.x86_64-latest.arg= s b/tests/qemuxmlconfdata/pci-serial-dev-chardev.x86_64-latest.args index 5b535bea03..e25117f2a8 100644 --- a/tests/qemuxmlconfdata/pci-serial-dev-chardev.x86_64-latest.args +++ b/tests/qemuxmlconfdata/pci-serial-dev-chardev.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/pcie-expander-bus-aarch64.aarch64-latest= .args b/tests/qemuxmlconfdata/pcie-expander-bus-aarch64.aarch64-latest.args index e7661b4ac9..1cab3b43e6 100644 --- a/tests/qemuxmlconfdata/pcie-expander-bus-aarch64.aarch64-latest.args +++ b/tests/qemuxmlconfdata/pcie-expander-bus-aarch64.aarch64-latest.args @@ -20,7 +20,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-pcie-ex= pander-bus-te/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/pcie-expander-bus.x86_64-latest.args b/t= ests/qemuxmlconfdata/pcie-expander-bus.x86_64-latest.args index 497192f24e..960b200456 100644 --- a/tests/qemuxmlconfdata/pcie-expander-bus.x86_64-latest.args +++ b/tests/qemuxmlconfdata/pcie-expander-bus.x86_64-latest.args @@ -24,7 +24,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-pcie-ex= pander-bus-te/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/pcie-root-port-model-generic.x86_64-late= st.args b/tests/qemuxmlconfdata/pcie-root-port-model-generic.x86_64-latest.= args index dac9c0fd24..4f04041b8a 100644 --- a/tests/qemuxmlconfdata/pcie-root-port-model-generic.x86_64-latest.args +++ b/tests/qemuxmlconfdata/pcie-root-port-model-generic.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/pcie-root-port-model-ioh3420.x86_64-late= st.args b/tests/qemuxmlconfdata/pcie-root-port-model-ioh3420.x86_64-latest.= args index e44f95a165..8c74197be6 100644 --- a/tests/qemuxmlconfdata/pcie-root-port-model-ioh3420.x86_64-latest.args +++ b/tests/qemuxmlconfdata/pcie-root-port-model-ioh3420.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/pcie-root-port-nohotplug.x86_64-latest.a= rgs b/tests/qemuxmlconfdata/pcie-root-port-nohotplug.x86_64-latest.args index f9c2ad4f6d..12ede653d7 100644 --- a/tests/qemuxmlconfdata/pcie-root-port-nohotplug.x86_64-latest.args +++ b/tests/qemuxmlconfdata/pcie-root-port-nohotplug.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/pcie-root-port.x86_64-latest.args b/test= s/qemuxmlconfdata/pcie-root-port.x86_64-latest.args index 87689266e1..7fe61b07fc 100644 --- a/tests/qemuxmlconfdata/pcie-root-port.x86_64-latest.args +++ b/tests/qemuxmlconfdata/pcie-root-port.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-q35-tes= t/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/pcie-root.x86_64-latest.args b/tests/qem= uxmlconfdata/pcie-root.x86_64-latest.args index 24bdf4b998..258f19b119 100644 --- a/tests/qemuxmlconfdata/pcie-root.x86_64-latest.args +++ b/tests/qemuxmlconfdata/pcie-root.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-q35-tes= t/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/pcie-switch-downstream-port.x86_64-lates= t.args b/tests/qemuxmlconfdata/pcie-switch-downstream-port.x86_64-latest.ar= gs index 7bf7431006..97b7e7d1e8 100644 --- a/tests/qemuxmlconfdata/pcie-switch-downstream-port.x86_64-latest.args +++ b/tests/qemuxmlconfdata/pcie-switch-downstream-port.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-q35-tes= t/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/pcie-switch-upstream-port.x86_64-latest.= args b/tests/qemuxmlconfdata/pcie-switch-upstream-port.x86_64-latest.args index be5fe92358..fe3e5efde0 100644 --- a/tests/qemuxmlconfdata/pcie-switch-upstream-port.x86_64-latest.args +++ b/tests/qemuxmlconfdata/pcie-switch-upstream-port.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-q35-tes= t/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/pcihole64-gib.x86_64-latest.args b/tests= /qemuxmlconfdata/pcihole64-gib.x86_64-latest.args index 47533c584c..b10a8abb1b 100644 --- a/tests/qemuxmlconfdata/pcihole64-gib.x86_64-latest.args +++ b/tests/qemuxmlconfdata/pcihole64-gib.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-foo/.co= nfig \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/pcihole64-q35.x86_64-latest.args b/tests= /qemuxmlconfdata/pcihole64-q35.x86_64-latest.args index ff5d3ca592..2678f3a8e9 100644 --- a/tests/qemuxmlconfdata/pcihole64-q35.x86_64-latest.args +++ b/tests/qemuxmlconfdata/pcihole64-q35.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-q35-tes= t/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/pcihole64-virt.aarch64-latest.args b/tes= ts/qemuxmlconfdata/pcihole64-virt.aarch64-latest.args index c8655b84b2..046c847403 100644 --- a/tests/qemuxmlconfdata/pcihole64-virt.aarch64-latest.args +++ b/tests/qemuxmlconfdata/pcihole64-virt.aarch64-latest.args @@ -20,7 +20,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-foo/.co= nfig \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/pcihole64.x86_64-latest.args b/tests/qem= uxmlconfdata/pcihole64.x86_64-latest.args index 9f765a7816..7208dff53f 100644 --- a/tests/qemuxmlconfdata/pcihole64.x86_64-latest.args +++ b/tests/qemuxmlconfdata/pcihole64.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-foo/.co= nfig \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/pmu-feature-off.x86_64-latest.args b/tes= ts/qemuxmlconfdata/pmu-feature-off.x86_64-latest.args index b623627542..8224afd641 100644 --- a/tests/qemuxmlconfdata/pmu-feature-off.x86_64-latest.args +++ b/tests/qemuxmlconfdata/pmu-feature-off.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/pmu-feature.x86_64-latest.args b/tests/q= emuxmlconfdata/pmu-feature.x86_64-latest.args index 25e35f9711..06a556b04a 100644 --- a/tests/qemuxmlconfdata/pmu-feature.x86_64-latest.args +++ b/tests/qemuxmlconfdata/pmu-feature.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/ppc-dtb.ppc-latest.args b/tests/qemuxmlc= onfdata/ppc-dtb.ppc-latest.args index bdc86620c8..7db041d828 100644 --- a/tests/qemuxmlconfdata/ppc-dtb.ppc-latest.args +++ b/tests/qemuxmlconfdata/ppc-dtb.ppc-latest.args @@ -20,7 +20,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/ppc-mac99-minimal.ppc-latest.abi-update.= args b/tests/qemuxmlconfdata/ppc-mac99-minimal.ppc-latest.abi-update.args index 9c7c884c83..32952b1a3e 100644 --- a/tests/qemuxmlconfdata/ppc-mac99-minimal.ppc-latest.abi-update.args +++ b/tests/qemuxmlconfdata/ppc-mac99-minimal.ppc-latest.abi-update.args @@ -20,7 +20,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/ppc-mac99-minimal.ppc-latest.args b/test= s/qemuxmlconfdata/ppc-mac99-minimal.ppc-latest.args index 9c7c884c83..32952b1a3e 100644 --- a/tests/qemuxmlconfdata/ppc-mac99-minimal.ppc-latest.args +++ b/tests/qemuxmlconfdata/ppc-mac99-minimal.ppc-latest.args @@ -20,7 +20,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/ppc64-default-cpu-kvm-pseries-3.1.ppc64-= latest.args b/tests/qemuxmlconfdata/ppc64-default-cpu-kvm-pseries-3.1.ppc64= -latest.args index 6390322e8c..7f84dbc2e2 100644 --- a/tests/qemuxmlconfdata/ppc64-default-cpu-kvm-pseries-3.1.ppc64-latest.= args +++ b/tests/qemuxmlconfdata/ppc64-default-cpu-kvm-pseries-3.1.ppc64-latest.= args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/ppc64-default-cpu-kvm-pseries-4.2.ppc64-= latest.args b/tests/qemuxmlconfdata/ppc64-default-cpu-kvm-pseries-4.2.ppc64= -latest.args index 130c801fa6..ef93f746f0 100644 --- a/tests/qemuxmlconfdata/ppc64-default-cpu-kvm-pseries-4.2.ppc64-latest.= args +++ b/tests/qemuxmlconfdata/ppc64-default-cpu-kvm-pseries-4.2.ppc64-latest.= args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/ppc64-default-cpu-tcg-pseries-3.1.ppc64-= latest.args b/tests/qemuxmlconfdata/ppc64-default-cpu-tcg-pseries-3.1.ppc64= -latest.args index e1e7277596..6ff2a86c8e 100644 --- a/tests/qemuxmlconfdata/ppc64-default-cpu-tcg-pseries-3.1.ppc64-latest.= args +++ b/tests/qemuxmlconfdata/ppc64-default-cpu-tcg-pseries-3.1.ppc64-latest.= args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/ppc64-default-cpu-tcg-pseries-4.2.ppc64-= latest.args b/tests/qemuxmlconfdata/ppc64-default-cpu-tcg-pseries-4.2.ppc64= -latest.args index c15cbadf26..f1d742dbe3 100644 --- a/tests/qemuxmlconfdata/ppc64-default-cpu-tcg-pseries-4.2.ppc64-latest.= args +++ b/tests/qemuxmlconfdata/ppc64-default-cpu-tcg-pseries-4.2.ppc64-latest.= args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/ppc64-g3beige-minimal.ppc64-latest.abi-u= pdate.args b/tests/qemuxmlconfdata/ppc64-g3beige-minimal.ppc64-latest.abi-u= pdate.args index d32a4b9f2d..0745c49a13 100644 --- a/tests/qemuxmlconfdata/ppc64-g3beige-minimal.ppc64-latest.abi-update.a= rgs +++ b/tests/qemuxmlconfdata/ppc64-g3beige-minimal.ppc64-latest.abi-update.a= rgs @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/ppc64-g3beige-minimal.ppc64-latest.args = b/tests/qemuxmlconfdata/ppc64-g3beige-minimal.ppc64-latest.args index 581374949c..21212f319d 100644 --- a/tests/qemuxmlconfdata/ppc64-g3beige-minimal.ppc64-latest.args +++ b/tests/qemuxmlconfdata/ppc64-g3beige-minimal.ppc64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/ppc64-mac99-minimal.ppc64-latest.abi-upd= ate.args b/tests/qemuxmlconfdata/ppc64-mac99-minimal.ppc64-latest.abi-updat= e.args index b1fbfb221f..fa0e90e65b 100644 --- a/tests/qemuxmlconfdata/ppc64-mac99-minimal.ppc64-latest.abi-update.args +++ b/tests/qemuxmlconfdata/ppc64-mac99-minimal.ppc64-latest.abi-update.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/ppc64-mac99-minimal.ppc64-latest.args b/= tests/qemuxmlconfdata/ppc64-mac99-minimal.ppc64-latest.args index 2223bef896..d458143f08 100644 --- a/tests/qemuxmlconfdata/ppc64-mac99-minimal.ppc64-latest.args +++ b/tests/qemuxmlconfdata/ppc64-mac99-minimal.ppc64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/ppc64-powernv9-minimal.ppc64-latest.abi-= update.args b/tests/qemuxmlconfdata/ppc64-powernv9-minimal.ppc64-latest.abi= -update.args index 368b1575cb..c9379de0f7 100644 --- a/tests/qemuxmlconfdata/ppc64-powernv9-minimal.ppc64-latest.abi-update.= args +++ b/tests/qemuxmlconfdata/ppc64-powernv9-minimal.ppc64-latest.abi-update.= args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/ppc64-powernv9-minimal.ppc64-latest.args= b/tests/qemuxmlconfdata/ppc64-powernv9-minimal.ppc64-latest.args index 86c7109182..b2a65978e9 100644 --- a/tests/qemuxmlconfdata/ppc64-powernv9-minimal.ppc64-latest.args +++ b/tests/qemuxmlconfdata/ppc64-powernv9-minimal.ppc64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/ppc64-pseries-default-models.ppc64-lates= t.abi-update.args b/tests/qemuxmlconfdata/ppc64-pseries-default-models.ppc6= 4-latest.abi-update.args index a5f625beee..61ac8babe3 100644 --- a/tests/qemuxmlconfdata/ppc64-pseries-default-models.ppc64-latest.abi-u= pdate.args +++ b/tests/qemuxmlconfdata/ppc64-pseries-default-models.ppc64-latest.abi-u= pdate.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/ppc64-pseries-default-models.ppc64-lates= t.args b/tests/qemuxmlconfdata/ppc64-pseries-default-models.ppc64-latest.ar= gs index ca7a17f35d..c9af9b25cc 100644 --- a/tests/qemuxmlconfdata/ppc64-pseries-default-models.ppc64-latest.args +++ b/tests/qemuxmlconfdata/ppc64-pseries-default-models.ppc64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/ppc64-pseries-graphics.ppc64-latest.args= b/tests/qemuxmlconfdata/ppc64-pseries-graphics.ppc64-latest.args index b2f3b27a13..47c0fc440e 100644 --- a/tests/qemuxmlconfdata/ppc64-pseries-graphics.ppc64-latest.args +++ b/tests/qemuxmlconfdata/ppc64-pseries-graphics.ppc64-latest.args @@ -20,7 +20,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -uuid b35969f7-e7cf-4d90-a9a0-4dd9000f9824 \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ @@ -34,7 +34,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -device '{"driver":"virtio-net-pci","netdev":"hostnet0","id":"net0","mac":= "52:54:00:a2:44:92","bus":"pci.0","addr":"0x1"}' \ -chardev pty,id=3Dcharserial0 \ -device '{"driver":"spapr-vty","chardev":"charserial0","id":"serial0","reg= ":805306368}' \ --chardev socket,id=3Dcharchannel0,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharchannel0,fd=3DXXXXXXX,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"}' \ -device '{"driver":"usb-kbd","id":"input1","bus":"usb.0","port":"2"}' \ diff --git a/tests/qemuxmlconfdata/ppc64-pseries-headless.ppc64-latest.args= b/tests/qemuxmlconfdata/ppc64-pseries-headless.ppc64-latest.args index c35eaf6d6b..8c71679647 100644 --- a/tests/qemuxmlconfdata/ppc64-pseries-headless.ppc64-latest.args +++ b/tests/qemuxmlconfdata/ppc64-pseries-headless.ppc64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ @@ -35,7 +35,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -device '{"driver":"virtio-net-pci","netdev":"hostnet0","id":"net0","mac":= "52:54:00:09:a4:37","bus":"pci.0","addr":"0x1"}' \ -chardev pty,id=3Dcharserial0 \ -device '{"driver":"spapr-vty","chardev":"charserial0","id":"serial0","reg= ":805306368}' \ --chardev socket,id=3Dcharchannel0,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharchannel0,fd=3DXXXXXXX,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":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x5"}' \ diff --git a/tests/qemuxmlconfdata/ppc64-pseries-minimal.ppc64-latest.abi-u= pdate.args b/tests/qemuxmlconfdata/ppc64-pseries-minimal.ppc64-latest.abi-u= pdate.args index a7aa3009ce..0b9665d5db 100644 --- a/tests/qemuxmlconfdata/ppc64-pseries-minimal.ppc64-latest.abi-update.a= rgs +++ b/tests/qemuxmlconfdata/ppc64-pseries-minimal.ppc64-latest.abi-update.a= rgs @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/ppc64-pseries-minimal.ppc64-latest.args = b/tests/qemuxmlconfdata/ppc64-pseries-minimal.ppc64-latest.args index 72e2189563..08b909d6c4 100644 --- a/tests/qemuxmlconfdata/ppc64-pseries-minimal.ppc64-latest.args +++ b/tests/qemuxmlconfdata/ppc64-pseries-minimal.ppc64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/ppc64-tpmproxy-single.ppc64-latest.args = b/tests/qemuxmlconfdata/ppc64-tpmproxy-single.ppc64-latest.args index 42232bdbc0..05c58d5418 100644 --- a/tests/qemuxmlconfdata/ppc64-tpmproxy-single.ppc64-latest.args +++ b/tests/qemuxmlconfdata/ppc64-tpmproxy-single.ppc64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/ppc64-tpmproxy-with-tpm.ppc64-latest.arg= s b/tests/qemuxmlconfdata/ppc64-tpmproxy-with-tpm.ppc64-latest.args index 60512d24cd..7c8a58a3b4 100644 --- a/tests/qemuxmlconfdata/ppc64-tpmproxy-with-tpm.ppc64-latest.args +++ b/tests/qemuxmlconfdata/ppc64-tpmproxy-with-tpm.ppc64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/ppce500-serial.ppc-latest.args b/tests/q= emuxmlconfdata/ppce500-serial.ppc-latest.args index 21aa64b323..8d275cfa1c 100644 --- a/tests/qemuxmlconfdata/ppce500-serial.ppc-latest.args +++ b/tests/qemuxmlconfdata/ppce500-serial.ppc-latest.args @@ -20,7 +20,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/pseries-basic.ppc64-latest.args b/tests/= qemuxmlconfdata/pseries-basic.ppc64-latest.args index a4a0bc994f..388c0180db 100644 --- a/tests/qemuxmlconfdata/pseries-basic.ppc64-latest.args +++ b/tests/qemuxmlconfdata/pseries-basic.ppc64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/pseries-console-virtio.ppc64-latest.args= b/tests/qemuxmlconfdata/pseries-console-virtio.ppc64-latest.args index 062acbc7ed..7bef59651b 100644 --- a/tests/qemuxmlconfdata/pseries-console-virtio.ppc64-latest.args +++ b/tests/qemuxmlconfdata/pseries-console-virtio.ppc64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/pseries-cpu-compat-power10.ppc64-latest.= args b/tests/qemuxmlconfdata/pseries-cpu-compat-power10.ppc64-latest.args index 7978fcd5eb..4f49ac77b2 100644 --- a/tests/qemuxmlconfdata/pseries-cpu-compat-power10.ppc64-latest.args +++ b/tests/qemuxmlconfdata/pseries-cpu-compat-power10.ppc64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/pseries-cpu-compat-power11.ppc64-latest.= args b/tests/qemuxmlconfdata/pseries-cpu-compat-power11.ppc64-latest.args index a800f81905..bd582a2b5f 100644 --- a/tests/qemuxmlconfdata/pseries-cpu-compat-power11.ppc64-latest.args +++ b/tests/qemuxmlconfdata/pseries-cpu-compat-power11.ppc64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/pseries-cpu-compat-power9.ppc64-latest.a= rgs b/tests/qemuxmlconfdata/pseries-cpu-compat-power9.ppc64-latest.args index c78663468d..67ecd537f7 100644 --- a/tests/qemuxmlconfdata/pseries-cpu-compat-power9.ppc64-latest.args +++ b/tests/qemuxmlconfdata/pseries-cpu-compat-power9.ppc64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/pseries-cpu-compat.ppc64-latest.args b/t= ests/qemuxmlconfdata/pseries-cpu-compat.ppc64-latest.args index df4c9a257f..4a93f19bd8 100644 --- a/tests/qemuxmlconfdata/pseries-cpu-compat.ppc64-latest.args +++ b/tests/qemuxmlconfdata/pseries-cpu-compat.ppc64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/pseries-cpu-exact.ppc64-latest.args b/te= sts/qemuxmlconfdata/pseries-cpu-exact.ppc64-latest.args index 4f966d5079..acb3953489 100644 --- a/tests/qemuxmlconfdata/pseries-cpu-exact.ppc64-latest.args +++ b/tests/qemuxmlconfdata/pseries-cpu-exact.ppc64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/pseries-cpu-le.ppc64-latest.args b/tests= /qemuxmlconfdata/pseries-cpu-le.ppc64-latest.args index 7dbdc20359..33840497fc 100644 --- a/tests/qemuxmlconfdata/pseries-cpu-le.ppc64-latest.args +++ b/tests/qemuxmlconfdata/pseries-cpu-le.ppc64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/pseries-features.ppc64-latest.args b/tes= ts/qemuxmlconfdata/pseries-features.ppc64-latest.args index 721c86ccab..fc43fd6df0 100644 --- a/tests/qemuxmlconfdata/pseries-features.ppc64-latest.args +++ b/tests/qemuxmlconfdata/pseries-features.ppc64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/pseries-hostdevs-1.ppc64-latest.args b/t= ests/qemuxmlconfdata/pseries-hostdevs-1.ppc64-latest.args index 30d97d291c..aea182f981 100644 --- a/tests/qemuxmlconfdata/pseries-hostdevs-1.ppc64-latest.args +++ b/tests/qemuxmlconfdata/pseries-hostdevs-1.ppc64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/pseries-hostdevs-2.ppc64-latest.args b/t= ests/qemuxmlconfdata/pseries-hostdevs-2.ppc64-latest.args index 4674158fd1..bbd0735fcc 100644 --- a/tests/qemuxmlconfdata/pseries-hostdevs-2.ppc64-latest.args +++ b/tests/qemuxmlconfdata/pseries-hostdevs-2.ppc64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/pseries-hostdevs-3.ppc64-latest.args b/t= ests/qemuxmlconfdata/pseries-hostdevs-3.ppc64-latest.args index e85227a951..81db87c8ff 100644 --- a/tests/qemuxmlconfdata/pseries-hostdevs-3.ppc64-latest.args +++ b/tests/qemuxmlconfdata/pseries-hostdevs-3.ppc64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/pseries-many-buses-1.ppc64-latest.args b= /tests/qemuxmlconfdata/pseries-many-buses-1.ppc64-latest.args index fd4a9da867..958fdbbbee 100644 --- a/tests/qemuxmlconfdata/pseries-many-buses-1.ppc64-latest.args +++ b/tests/qemuxmlconfdata/pseries-many-buses-1.ppc64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/pseries-many-buses-2.ppc64-latest.args b= /tests/qemuxmlconfdata/pseries-many-buses-2.ppc64-latest.args index 2426df6feb..f8419a21d7 100644 --- a/tests/qemuxmlconfdata/pseries-many-buses-2.ppc64-latest.args +++ b/tests/qemuxmlconfdata/pseries-many-buses-2.ppc64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/pseries-many-devices.ppc64-latest.args b= /tests/qemuxmlconfdata/pseries-many-devices.ppc64-latest.args index 5e9d96e18c..46bd252834 100644 --- a/tests/qemuxmlconfdata/pseries-many-devices.ppc64-latest.args +++ b/tests/qemuxmlconfdata/pseries-many-devices.ppc64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/pseries-nvram.ppc64-latest.args b/tests/= qemuxmlconfdata/pseries-nvram.ppc64-latest.args index 9a279fd090..43169b3cc4 100644 --- a/tests/qemuxmlconfdata/pseries-nvram.ppc64-latest.args +++ b/tests/qemuxmlconfdata/pseries-nvram.ppc64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/pseries-panic-missing.ppc64-latest.args = b/tests/qemuxmlconfdata/pseries-panic-missing.ppc64-latest.args index a4a0bc994f..388c0180db 100644 --- a/tests/qemuxmlconfdata/pseries-panic-missing.ppc64-latest.args +++ b/tests/qemuxmlconfdata/pseries-panic-missing.ppc64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/pseries-panic-no-address.ppc64-latest.ar= gs b/tests/qemuxmlconfdata/pseries-panic-no-address.ppc64-latest.args index a4a0bc994f..388c0180db 100644 --- a/tests/qemuxmlconfdata/pseries-panic-no-address.ppc64-latest.args +++ b/tests/qemuxmlconfdata/pseries-panic-no-address.ppc64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/pseries-phb-default-missing.ppc64-latest= .args b/tests/qemuxmlconfdata/pseries-phb-default-missing.ppc64-latest.args index 4e9b590ae2..89fffcaf2d 100644 --- a/tests/qemuxmlconfdata/pseries-phb-default-missing.ppc64-latest.args +++ b/tests/qemuxmlconfdata/pseries-phb-default-missing.ppc64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/pseries-phb-numa-node.ppc64-latest.args = b/tests/qemuxmlconfdata/pseries-phb-numa-node.ppc64-latest.args index d833537772..7d9a023c74 100644 --- a/tests/qemuxmlconfdata/pseries-phb-numa-node.ppc64-latest.args +++ b/tests/qemuxmlconfdata/pseries-phb-numa-node.ppc64-latest.args @@ -24,7 +24,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/pseries-phb-simple.ppc64-latest.args b/t= ests/qemuxmlconfdata/pseries-phb-simple.ppc64-latest.args index d22ccd8874..35e3b881b5 100644 --- a/tests/qemuxmlconfdata/pseries-phb-simple.ppc64-latest.args +++ b/tests/qemuxmlconfdata/pseries-phb-simple.ppc64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/pseries-phb-user-alias.ppc64-latest.args= b/tests/qemuxmlconfdata/pseries-phb-user-alias.ppc64-latest.args index d2bedf6935..b992ffd5ab 100644 --- a/tests/qemuxmlconfdata/pseries-phb-user-alias.ppc64-latest.args +++ b/tests/qemuxmlconfdata/pseries-phb-user-alias.ppc64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/pseries-serial-native.ppc64-latest.args = b/tests/qemuxmlconfdata/pseries-serial-native.ppc64-latest.args index 0fb62d0e40..627438005b 100644 --- a/tests/qemuxmlconfdata/pseries-serial-native.ppc64-latest.args +++ b/tests/qemuxmlconfdata/pseries-serial-native.ppc64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/pseries-serial-pci.ppc64-latest.args b/t= ests/qemuxmlconfdata/pseries-serial-pci.ppc64-latest.args index 4cab803d7f..34a6d82ce1 100644 --- a/tests/qemuxmlconfdata/pseries-serial-pci.ppc64-latest.args +++ b/tests/qemuxmlconfdata/pseries-serial-pci.ppc64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/pseries-serial-usb.ppc64-latest.args b/t= ests/qemuxmlconfdata/pseries-serial-usb.ppc64-latest.args index 9ec0226e31..3090e2f01a 100644 --- a/tests/qemuxmlconfdata/pseries-serial-usb.ppc64-latest.args +++ b/tests/qemuxmlconfdata/pseries-serial-usb.ppc64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/pseries-usb-default.ppc64-latest.args b/= tests/qemuxmlconfdata/pseries-usb-default.ppc64-latest.args index a4a0bc994f..388c0180db 100644 --- a/tests/qemuxmlconfdata/pseries-usb-default.ppc64-latest.args +++ b/tests/qemuxmlconfdata/pseries-usb-default.ppc64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/pseries-usb-kbd.ppc64-latest.args b/test= s/qemuxmlconfdata/pseries-usb-kbd.ppc64-latest.args index 981d24a87a..4838af8ee3 100644 --- a/tests/qemuxmlconfdata/pseries-usb-kbd.ppc64-latest.args +++ b/tests/qemuxmlconfdata/pseries-usb-kbd.ppc64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/pseries-usb-multi.ppc64-latest.args b/te= sts/qemuxmlconfdata/pseries-usb-multi.ppc64-latest.args index 2effe61172..93d7cccef4 100644 --- a/tests/qemuxmlconfdata/pseries-usb-multi.ppc64-latest.args +++ b/tests/qemuxmlconfdata/pseries-usb-multi.ppc64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/pseries-vio-user-assigned.ppc64-latest.a= rgs b/tests/qemuxmlconfdata/pseries-vio-user-assigned.ppc64-latest.args index 801cd30ab9..9548493a5c 100644 --- a/tests/qemuxmlconfdata/pseries-vio-user-assigned.ppc64-latest.args +++ b/tests/qemuxmlconfdata/pseries-vio-user-assigned.ppc64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/pseries-vio.ppc64-latest.args b/tests/qe= muxmlconfdata/pseries-vio.ppc64-latest.args index d0a32179a9..e3401b4ff0 100644 --- a/tests/qemuxmlconfdata/pseries-vio.ppc64-latest.args +++ b/tests/qemuxmlconfdata/pseries-vio.ppc64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/pstore-acpi-erst.x86_64-latest.args b/te= sts/qemuxmlconfdata/pstore-acpi-erst.x86_64-latest.args index 2e217f6c83..a07af47b2f 100644 --- a/tests/qemuxmlconfdata/pstore-acpi-erst.x86_64-latest.args +++ b/tests/qemuxmlconfdata/pstore-acpi-erst.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/pv-spinlock-disabled.x86_64-latest.args = b/tests/qemuxmlconfdata/pv-spinlock-disabled.x86_64-latest.args index 46d3c94f87..af47bb71f7 100644 --- a/tests/qemuxmlconfdata/pv-spinlock-disabled.x86_64-latest.args +++ b/tests/qemuxmlconfdata/pv-spinlock-disabled.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/pv-spinlock-enabled.x86_64-latest.args b= /tests/qemuxmlconfdata/pv-spinlock-enabled.x86_64-latest.args index 8e0007be7c..0fdb3c7481 100644 --- a/tests/qemuxmlconfdata/pv-spinlock-enabled.x86_64-latest.args +++ b/tests/qemuxmlconfdata/pv-spinlock-enabled.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/pvpanic-pci-aarch64.aarch64-latest.args = b/tests/qemuxmlconfdata/pvpanic-pci-aarch64.aarch64-latest.args index 33313cd52d..11d92109cf 100644 --- a/tests/qemuxmlconfdata/pvpanic-pci-aarch64.aarch64-latest.args +++ b/tests/qemuxmlconfdata/pvpanic-pci-aarch64.aarch64-latest.args @@ -23,7 +23,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/pvpanic-pci-no-address-aarch64.aarch64-l= atest.args b/tests/qemuxmlconfdata/pvpanic-pci-no-address-aarch64.aarch64-l= atest.args index 867192c79e..45da4ae094 100644 --- a/tests/qemuxmlconfdata/pvpanic-pci-no-address-aarch64.aarch64-latest.a= rgs +++ b/tests/qemuxmlconfdata/pvpanic-pci-no-address-aarch64.aarch64-latest.a= rgs @@ -23,7 +23,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/pvpanic-pci-x86_64.x86_64-latest.args b/= tests/qemuxmlconfdata/pvpanic-pci-x86_64.x86_64-latest.args index b80ab56e25..c650f7c38c 100644 --- a/tests/qemuxmlconfdata/pvpanic-pci-x86_64.x86_64-latest.args +++ b/tests/qemuxmlconfdata/pvpanic-pci-x86_64.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/q35-default-devices-only.x86_64-latest.a= rgs b/tests/qemuxmlconfdata/q35-default-devices-only.x86_64-latest.args index fa3b7dc0cb..458efb7188 100644 --- a/tests/qemuxmlconfdata/q35-default-devices-only.x86_64-latest.args +++ b/tests/qemuxmlconfdata/q35-default-devices-only.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-q35-tes= t/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/q35-multifunction.x86_64-latest.args b/t= ests/qemuxmlconfdata/q35-multifunction.x86_64-latest.args index d8bc6d8478..45d20ff3ec 100644 --- a/tests/qemuxmlconfdata/q35-multifunction.x86_64-latest.args +++ b/tests/qemuxmlconfdata/q35-multifunction.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-q35-tes= t/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/q35-pci-force-address.x86_64-latest.args= b/tests/qemuxmlconfdata/q35-pci-force-address.x86_64-latest.args index 484de9ad27..9a10a484f6 100644 --- a/tests/qemuxmlconfdata/q35-pci-force-address.x86_64-latest.args +++ b/tests/qemuxmlconfdata/q35-pci-force-address.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-q35-tes= t/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/q35-pcie-autoadd.x86_64-latest.args b/te= sts/qemuxmlconfdata/q35-pcie-autoadd.x86_64-latest.args index 0f221ac2db..e478408ef7 100644 --- a/tests/qemuxmlconfdata/q35-pcie-autoadd.x86_64-latest.args +++ b/tests/qemuxmlconfdata/q35-pcie-autoadd.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-q35-tes= t/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/q35-pcie.x86_64-latest.args b/tests/qemu= xmlconfdata/q35-pcie.x86_64-latest.args index 0720377f2f..de392a1a89 100644 --- a/tests/qemuxmlconfdata/q35-pcie.x86_64-latest.args +++ b/tests/qemuxmlconfdata/q35-pcie.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-q35-tes= t/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/q35-usb2-multi.x86_64-latest.args b/test= s/qemuxmlconfdata/q35-usb2-multi.x86_64-latest.args index f3598e90fe..25d568ee78 100644 --- a/tests/qemuxmlconfdata/q35-usb2-multi.x86_64-latest.args +++ b/tests/qemuxmlconfdata/q35-usb2-multi.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-q35-tes= t/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/q35-usb2-reorder.x86_64-latest.args b/te= sts/qemuxmlconfdata/q35-usb2-reorder.x86_64-latest.args index c1d4ee40f1..95e3b11d41 100644 --- a/tests/qemuxmlconfdata/q35-usb2-reorder.x86_64-latest.args +++ b/tests/qemuxmlconfdata/q35-usb2-reorder.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-q35-tes= t/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/q35-usb2.x86_64-latest.args b/tests/qemu= xmlconfdata/q35-usb2.x86_64-latest.args index 86776e45f5..4d6ec71820 100644 --- a/tests/qemuxmlconfdata/q35-usb2.x86_64-latest.args +++ b/tests/qemuxmlconfdata/q35-usb2.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-q35-tes= t/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/q35-virt-manager-basic.x86_64-latest.arg= s b/tests/qemuxmlconfdata/q35-virt-manager-basic.x86_64-latest.args index d06a25ef10..82736207ec 100644 --- a/tests/qemuxmlconfdata/q35-virt-manager-basic.x86_64-latest.args +++ b/tests/qemuxmlconfdata/q35-virt-manager-basic.x86_64-latest.args @@ -20,7 +20,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-virt-ma= nager-basic/.config \ -uuid 1b826c23-8767-47ad-a6b5-c83a88277f71 \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc,driftfix=3Dslew \ -global kvm-pit.lost_tick_policy=3Ddelay \ @@ -43,7 +43,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-virt-ma= nager-basic/.config \ -device '{"driver":"virtio-net-pci","netdev":"hostnet0","id":"net0","mac":= "52:54:00:9a:e6:c6","bus":"pci.1","addr":"0x0"}' \ -chardev pty,id=3Dcharserial0 \ -device '{"driver":"isa-serial","chardev":"charserial0","id":"serial0","in= dex":0}' \ --chardev socket,id=3Dcharchannel0,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharchannel0,fd=3DXXXXXXX,server=3Don,wait=3Doff \ -device '{"driver":"virtserialport","bus":"virtio-serial0.0","nr":1,"chard= ev":"charchannel0","id":"channel0","name":"org.qemu.guest_agent.0"}' \ -chardev spicevmc,id=3Dcharchannel1,name=3Dvdagent \ -device '{"driver":"virtserialport","bus":"virtio-serial0.0","nr":2,"chard= ev":"charchannel1","id":"channel1","name":"com.redhat.spice.0"}' \ diff --git a/tests/qemuxmlconfdata/q35.x86_64-latest.args b/tests/qemuxmlco= nfdata/q35.x86_64-latest.args index 54ca1cb119..a3ce32772c 100644 --- a/tests/qemuxmlconfdata/q35.x86_64-latest.args +++ b/tests/qemuxmlconfdata/q35.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-q35-tes= t/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/qemu-ns-alt.x86_64-latest.args b/tests/q= emuxmlconfdata/qemu-ns-alt.x86_64-latest.args index 07af64af26..06ec76d1b3 100644 --- a/tests/qemuxmlconfdata/qemu-ns-alt.x86_64-latest.args +++ b/tests/qemuxmlconfdata/qemu-ns-alt.x86_64-latest.args @@ -23,7 +23,7 @@ BAR=3D'' \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/qemu-ns-commandline-ns0.x86_64-latest.ar= gs b/tests/qemuxmlconfdata/qemu-ns-commandline-ns0.x86_64-latest.args index 52a1488073..8a19dac9c8 100644 --- a/tests/qemuxmlconfdata/qemu-ns-commandline-ns0.x86_64-latest.args +++ b/tests/qemuxmlconfdata/qemu-ns-commandline-ns0.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/qemu-ns-commandline-ns1.x86_64-latest.ar= gs b/tests/qemuxmlconfdata/qemu-ns-commandline-ns1.x86_64-latest.args index 52a1488073..8a19dac9c8 100644 --- a/tests/qemuxmlconfdata/qemu-ns-commandline-ns1.x86_64-latest.args +++ b/tests/qemuxmlconfdata/qemu-ns-commandline-ns1.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/qemu-ns-commandline.x86_64-latest.args b= /tests/qemuxmlconfdata/qemu-ns-commandline.x86_64-latest.args index 52a1488073..8a19dac9c8 100644 --- a/tests/qemuxmlconfdata/qemu-ns-commandline.x86_64-latest.args +++ b/tests/qemuxmlconfdata/qemu-ns-commandline.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/qemu-ns-domain-commandline-ns0.x86_64-la= test.args b/tests/qemuxmlconfdata/qemu-ns-domain-commandline-ns0.x86_64-lat= est.args index 52a1488073..8a19dac9c8 100644 --- a/tests/qemuxmlconfdata/qemu-ns-domain-commandline-ns0.x86_64-latest.ar= gs +++ b/tests/qemuxmlconfdata/qemu-ns-domain-commandline-ns0.x86_64-latest.ar= gs @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/qemu-ns-domain-commandline.x86_64-latest= .args b/tests/qemuxmlconfdata/qemu-ns-domain-commandline.x86_64-latest.args index 52a1488073..8a19dac9c8 100644 --- a/tests/qemuxmlconfdata/qemu-ns-domain-commandline.x86_64-latest.args +++ b/tests/qemuxmlconfdata/qemu-ns-domain-commandline.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/qemu-ns-domain-ns0.x86_64-latest.args b/= tests/qemuxmlconfdata/qemu-ns-domain-ns0.x86_64-latest.args index 52a1488073..8a19dac9c8 100644 --- a/tests/qemuxmlconfdata/qemu-ns-domain-ns0.x86_64-latest.args +++ b/tests/qemuxmlconfdata/qemu-ns-domain-ns0.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/qemu-ns-no-env.x86_64-latest.args b/test= s/qemuxmlconfdata/qemu-ns-no-env.x86_64-latest.args index 43abe6e1fe..1c624fa658 100644 --- a/tests/qemuxmlconfdata/qemu-ns-no-env.x86_64-latest.args +++ b/tests/qemuxmlconfdata/qemu-ns-no-env.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/qemu-ns.x86_64-latest.args b/tests/qemux= mlconfdata/qemu-ns.x86_64-latest.args index de5067e1d5..459950e911 100644 --- a/tests/qemuxmlconfdata/qemu-ns.x86_64-latest.args +++ b/tests/qemuxmlconfdata/qemu-ns.x86_64-latest.args @@ -24,7 +24,7 @@ BAR=3D'' \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/reboot-timeout-disabled.x86_64-latest.ar= gs b/tests/qemuxmlconfdata/reboot-timeout-disabled.x86_64-latest.args index 0a2a024edb..faf0da785f 100644 --- a/tests/qemuxmlconfdata/reboot-timeout-disabled.x86_64-latest.args +++ b/tests/qemuxmlconfdata/reboot-timeout-disabled.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/reboot-timeout-enabled.x86_64-latest.arg= s b/tests/qemuxmlconfdata/reboot-timeout-enabled.x86_64-latest.args index 59dbfd7152..605a6a7f7f 100644 --- a/tests/qemuxmlconfdata/reboot-timeout-enabled.x86_64-latest.args +++ b/tests/qemuxmlconfdata/reboot-timeout-enabled.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/restore-v2-fd.x86_64-latest.args b/tests= /qemuxmlconfdata/restore-v2-fd.x86_64-latest.args index 853b9c30a9..273eaddd6d 100644 --- a/tests/qemuxmlconfdata/restore-v2-fd.x86_64-latest.args +++ b/tests/qemuxmlconfdata/restore-v2-fd.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/restore-v2.x86_64-latest.args b/tests/qe= muxmlconfdata/restore-v2.x86_64-latest.args index fd66760998..5cab2a5138 100644 --- a/tests/qemuxmlconfdata/restore-v2.x86_64-latest.args +++ b/tests/qemuxmlconfdata/restore-v2.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/riscv64-virt-acpi.riscv64-latest.args b/= tests/qemuxmlconfdata/riscv64-virt-acpi.riscv64-latest.args index cc38be287c..a07c5a92c6 100644 --- a/tests/qemuxmlconfdata/riscv64-virt-acpi.riscv64-latest.args +++ b/tests/qemuxmlconfdata/riscv64-virt-acpi.riscv64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/riscv64-virt-default-models.riscv64-late= st.abi-update.args b/tests/qemuxmlconfdata/riscv64-virt-default-models.risc= v64-latest.abi-update.args index 99e1946d98..3184cec16d 100644 --- a/tests/qemuxmlconfdata/riscv64-virt-default-models.riscv64-latest.abi-= update.args +++ b/tests/qemuxmlconfdata/riscv64-virt-default-models.riscv64-latest.abi-= update.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/riscv64-virt-default-models.riscv64-late= st.args b/tests/qemuxmlconfdata/riscv64-virt-default-models.riscv64-latest.= args index 99e1946d98..3184cec16d 100644 --- a/tests/qemuxmlconfdata/riscv64-virt-default-models.riscv64-latest.args +++ b/tests/qemuxmlconfdata/riscv64-virt-default-models.riscv64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/riscv64-virt-features-aia.riscv64-latest= .args b/tests/qemuxmlconfdata/riscv64-virt-features-aia.riscv64-latest.args index 0256026ba4..85ed15438e 100644 --- a/tests/qemuxmlconfdata/riscv64-virt-features-aia.riscv64-latest.args +++ b/tests/qemuxmlconfdata/riscv64-virt-features-aia.riscv64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/riscv64-virt-graphics.riscv64-latest.arg= s b/tests/qemuxmlconfdata/riscv64-virt-graphics.riscv64-latest.args index 217e318baa..3e5d16975d 100644 --- a/tests/qemuxmlconfdata/riscv64-virt-graphics.riscv64-latest.args +++ b/tests/qemuxmlconfdata/riscv64-virt-graphics.riscv64-latest.args @@ -20,7 +20,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -uuid 96bc2754-8842-4714-a45f-3f69e7a9a852 \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ @@ -42,7 +42,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -device '{"driver":"virtio-net-pci","netdev":"hostnet0","id":"net0","mac":= "52:54:00:09:a4:37","bus":"pci.1","addr":"0x0"}' \ -chardev pty,id=3Dcharserial0 \ -serial chardev:charserial0 \ --chardev socket,id=3Dcharchannel0,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharchannel0,fd=3DXXXXXXX,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"}' \ -device '{"driver":"usb-kbd","id":"input1","bus":"usb.0","port":"2"}' \ diff --git a/tests/qemuxmlconfdata/riscv64-virt-headless-mmio.riscv64-lates= t.args b/tests/qemuxmlconfdata/riscv64-virt-headless-mmio.riscv64-latest.ar= gs index aa847822a1..1bcbdb2f25 100644 --- a/tests/qemuxmlconfdata/riscv64-virt-headless-mmio.riscv64-latest.args +++ b/tests/qemuxmlconfdata/riscv64-virt-headless-mmio.riscv64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ @@ -34,7 +34,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -device '{"driver":"virtio-net-device","netdev":"hostnet0","id":"net0","ma= c":"52:54:00:09:a4:37"}' \ -chardev pty,id=3Dcharserial0 \ -serial chardev:charserial0 \ --chardev socket,id=3Dcharchannel0,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharchannel0,fd=3DXXXXXXX,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":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-device","id":"balloon0"}' \ diff --git a/tests/qemuxmlconfdata/riscv64-virt-headless.riscv64-latest.arg= s b/tests/qemuxmlconfdata/riscv64-virt-headless.riscv64-latest.args index 5ccfc8d206..be63cfa3df 100644 --- a/tests/qemuxmlconfdata/riscv64-virt-headless.riscv64-latest.args +++ b/tests/qemuxmlconfdata/riscv64-virt-headless.riscv64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ @@ -42,7 +42,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -device '{"driver":"virtio-net-pci","netdev":"hostnet0","id":"net0","mac":= "52:54:00:09:a4:37","bus":"pci.1","addr":"0x0"}' \ -chardev pty,id=3Dcharserial0 \ -serial chardev:charserial0 \ --chardev socket,id=3Dcharchannel0,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharchannel0,fd=3DXXXXXXX,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":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.5","add= r":"0x0"}' \ diff --git a/tests/qemuxmlconfdata/riscv64-virt-minimal.riscv64-latest.abi-= update.args b/tests/qemuxmlconfdata/riscv64-virt-minimal.riscv64-latest.abi= -update.args index 74bf8bc134..4e9f6c39bc 100644 --- a/tests/qemuxmlconfdata/riscv64-virt-minimal.riscv64-latest.abi-update.= args +++ b/tests/qemuxmlconfdata/riscv64-virt-minimal.riscv64-latest.abi-update.= args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/riscv64-virt-minimal.riscv64-latest.args= b/tests/qemuxmlconfdata/riscv64-virt-minimal.riscv64-latest.args index 74bf8bc134..4e9f6c39bc 100644 --- a/tests/qemuxmlconfdata/riscv64-virt-minimal.riscv64-latest.args +++ b/tests/qemuxmlconfdata/riscv64-virt-minimal.riscv64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/s390-async-teardown-disabled.s390x-lates= t.args b/tests/qemuxmlconfdata/s390-async-teardown-disabled.s390x-latest.ar= gs index 96b18b83ce..6e5203d072 100644 --- a/tests/qemuxmlconfdata/s390-async-teardown-disabled.s390x-latest.args +++ b/tests/qemuxmlconfdata/s390-async-teardown-disabled.s390x-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/s390-async-teardown-no-attrib.s390x-late= st.args b/tests/qemuxmlconfdata/s390-async-teardown-no-attrib.s390x-latest.= args index cc7866499f..d4951ba3f1 100644 --- a/tests/qemuxmlconfdata/s390-async-teardown-no-attrib.s390x-latest.args +++ b/tests/qemuxmlconfdata/s390-async-teardown-no-attrib.s390x-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/s390-async-teardown.s390x-latest.args b/= tests/qemuxmlconfdata/s390-async-teardown.s390x-latest.args index cc7866499f..d4951ba3f1 100644 --- a/tests/qemuxmlconfdata/s390-async-teardown.s390x-latest.args +++ b/tests/qemuxmlconfdata/s390-async-teardown.s390x-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/s390-default-cpu-kvm-ccw-virtio-10.0.s39= 0x-latest.args b/tests/qemuxmlconfdata/s390-default-cpu-kvm-ccw-virtio-10.0= .s390x-latest.args index 71678a29cf..bf9ee5fa4c 100644 --- a/tests/qemuxmlconfdata/s390-default-cpu-kvm-ccw-virtio-10.0.s390x-late= st.args +++ b/tests/qemuxmlconfdata/s390-default-cpu-kvm-ccw-virtio-10.0.s390x-late= st.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-test/.c= onfig \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/s390-default-cpu-kvm-ccw-virtio-4.2.s390= x-10.0.0.args b/tests/qemuxmlconfdata/s390-default-cpu-kvm-ccw-virtio-4.2.s= 390x-10.0.0.args index 3f3de9a668..6936ab6377 100644 --- a/tests/qemuxmlconfdata/s390-default-cpu-kvm-ccw-virtio-4.2.s390x-10.0.= 0.args +++ b/tests/qemuxmlconfdata/s390-default-cpu-kvm-ccw-virtio-4.2.s390x-10.0.= 0.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-test/.c= onfig \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/s390-default-cpu-tcg-ccw-virtio-10.0.s39= 0x-latest.args b/tests/qemuxmlconfdata/s390-default-cpu-tcg-ccw-virtio-10.0= .s390x-latest.args index a3e60cd6ab..1bd574fd6d 100644 --- a/tests/qemuxmlconfdata/s390-default-cpu-tcg-ccw-virtio-10.0.s390x-late= st.args +++ b/tests/qemuxmlconfdata/s390-default-cpu-tcg-ccw-virtio-10.0.s390x-late= st.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-test/.c= onfig \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/s390-default-cpu-tcg-ccw-virtio-4.2.s390= x-10.0.0.args b/tests/qemuxmlconfdata/s390-default-cpu-tcg-ccw-virtio-4.2.s= 390x-10.0.0.args index 61e38d908b..91eb69ad96 100644 --- a/tests/qemuxmlconfdata/s390-default-cpu-tcg-ccw-virtio-4.2.s390x-10.0.= 0.args +++ b/tests/qemuxmlconfdata/s390-default-cpu-tcg-ccw-virtio-4.2.s390x-10.0.= 0.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-test/.c= onfig \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/s390-defaultconsole.s390x-latest.args b/= tests/qemuxmlconfdata/s390-defaultconsole.s390x-latest.args index 1dceeb59d4..9ff15dd079 100644 --- a/tests/qemuxmlconfdata/s390-defaultconsole.s390x-latest.args +++ b/tests/qemuxmlconfdata/s390-defaultconsole.s390x-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-test/.c= onfig \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/s390-panic-missing.s390x-latest.args b/t= ests/qemuxmlconfdata/s390-panic-missing.s390x-latest.args index a2d6a10038..ef8acd792a 100644 --- a/tests/qemuxmlconfdata/s390-panic-missing.s390x-latest.args +++ b/tests/qemuxmlconfdata/s390-panic-missing.s390x-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/s390-panic-no-address.s390x-latest.args = b/tests/qemuxmlconfdata/s390-panic-no-address.s390x-latest.args index 7f7dedfa2b..a394800191 100644 --- a/tests/qemuxmlconfdata/s390-panic-no-address.s390x-latest.args +++ b/tests/qemuxmlconfdata/s390-panic-no-address.s390x-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/s390-panic.s390x-latest.args b/tests/qem= uxmlconfdata/s390-panic.s390x-latest.args index bd79ab1ee3..a0680e5efc 100644 --- a/tests/qemuxmlconfdata/s390-panic.s390x-latest.args +++ b/tests/qemuxmlconfdata/s390-panic.s390x-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-test/.c= onfig \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/s390-serial-2.s390x-latest.args b/tests/= qemuxmlconfdata/s390-serial-2.s390x-latest.args index 3d57c421d6..c6adbcb0ef 100644 --- a/tests/qemuxmlconfdata/s390-serial-2.s390x-latest.args +++ b/tests/qemuxmlconfdata/s390-serial-2.s390x-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/s390-serial-console.s390x-latest.args b/= tests/qemuxmlconfdata/s390-serial-console.s390x-latest.args index 8ee435d467..0eb20eb5e3 100644 --- a/tests/qemuxmlconfdata/s390-serial-console.s390x-latest.args +++ b/tests/qemuxmlconfdata/s390-serial-console.s390x-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/s390-serial.s390x-latest.args b/tests/qe= muxmlconfdata/s390-serial.s390x-latest.args index 8ee435d467..0eb20eb5e3 100644 --- a/tests/qemuxmlconfdata/s390-serial.s390x-latest.args +++ b/tests/qemuxmlconfdata/s390-serial.s390x-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/s390-usb-address.s390x-latest.args b/tes= ts/qemuxmlconfdata/s390-usb-address.s390x-latest.args index 485b121a08..0ab1c12582 100644 --- a/tests/qemuxmlconfdata/s390-usb-address.s390x-latest.args +++ b/tests/qemuxmlconfdata/s390-usb-address.s390x-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-test/.c= onfig \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/s390-usb-model.s390x-latest.args b/tests= /qemuxmlconfdata/s390-usb-model.s390x-latest.args index 85a3e5a53c..1c2e77a6e1 100644 --- a/tests/qemuxmlconfdata/s390-usb-model.s390x-latest.args +++ b/tests/qemuxmlconfdata/s390-usb-model.s390x-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-test/.c= onfig \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/s390-usb-none.s390x-latest.args b/tests/= qemuxmlconfdata/s390-usb-none.s390x-latest.args index 485b121a08..0ab1c12582 100644 --- a/tests/qemuxmlconfdata/s390-usb-none.s390x-latest.args +++ b/tests/qemuxmlconfdata/s390-usb-none.s390x-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-test/.c= onfig \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/s390x-ccw-acpi.s390x-latest.args b/tests= /qemuxmlconfdata/s390x-ccw-acpi.s390x-latest.args index 84098e580e..0f0d7c907e 100644 --- a/tests/qemuxmlconfdata/s390x-ccw-acpi.s390x-latest.args +++ b/tests/qemuxmlconfdata/s390x-ccw-acpi.s390x-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/s390x-ccw-default-models.s390x-latest.ab= i-update.args b/tests/qemuxmlconfdata/s390x-ccw-default-models.s390x-latest= .abi-update.args index 4c27502208..58795a1c5f 100644 --- a/tests/qemuxmlconfdata/s390x-ccw-default-models.s390x-latest.abi-updat= e.args +++ b/tests/qemuxmlconfdata/s390x-ccw-default-models.s390x-latest.abi-updat= e.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/s390x-ccw-default-models.s390x-latest.ar= gs b/tests/qemuxmlconfdata/s390x-ccw-default-models.s390x-latest.args index 4c27502208..58795a1c5f 100644 --- a/tests/qemuxmlconfdata/s390x-ccw-default-models.s390x-latest.args +++ b/tests/qemuxmlconfdata/s390x-ccw-default-models.s390x-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/s390x-ccw-graphics.s390x-latest.args b/t= ests/qemuxmlconfdata/s390x-ccw-graphics.s390x-latest.args index d80f459d12..25a3e89e47 100644 --- a/tests/qemuxmlconfdata/s390x-ccw-graphics.s390x-latest.args +++ b/tests/qemuxmlconfdata/s390x-ccw-graphics.s390x-latest.args @@ -20,7 +20,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -uuid a7ca230a-fbe0-48b8-8ea6-25836f8cbc32 \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ @@ -31,7 +31,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -device '{"driver":"virtio-blk-ccw","devno":"fe.0.0000","drive":"libvirt-1= -format","id":"virtio-disk0","bootindex":1}' \ -netdev '{"type":"user","id":"hostnet0"}' \ -device '{"driver":"virtio-net-ccw","netdev":"hostnet0","id":"net0","mac":= "52:54:00:09:1a:29","devno":"fe.0.0001"}' \ --chardev socket,id=3Dcharchannel0,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharchannel0,fd=3DXXXXXXX,server=3Don,wait=3Doff \ -device '{"driver":"virtserialport","bus":"virtio-serial0.0","nr":1,"chard= ev":"charchannel0","id":"channel0","name":"org.qemu.guest_agent.0"}' \ -chardev pty,id=3Dcharconsole0 \ -device '{"driver":"sclpconsole","chardev":"charconsole0","id":"console0"}= ' \ diff --git a/tests/qemuxmlconfdata/s390x-ccw-headless.s390x-latest.args b/t= ests/qemuxmlconfdata/s390x-ccw-headless.s390x-latest.args index b39b36db1e..b0a9e6cc1c 100644 --- a/tests/qemuxmlconfdata/s390x-ccw-headless.s390x-latest.args +++ b/tests/qemuxmlconfdata/s390x-ccw-headless.s390x-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ @@ -32,7 +32,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -device '{"driver":"virtio-blk-ccw","devno":"fe.0.0000","drive":"libvirt-1= -format","id":"virtio-disk0","bootindex":1}' \ -netdev '{"type":"user","id":"hostnet0"}' \ -device '{"driver":"virtio-net-ccw","netdev":"hostnet0","id":"net0","mac":= "52:54:00:09:a4:37","devno":"fe.0.0001"}' \ --chardev socket,id=3Dcharchannel0,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharchannel0,fd=3DXXXXXXX,server=3Don,wait=3Doff \ -device '{"driver":"virtserialport","bus":"virtio-serial0.0","nr":1,"chard= ev":"charchannel0","id":"channel0","name":"org.qemu.guest_agent.0"}' \ -chardev pty,id=3Dcharconsole0 \ -device '{"driver":"sclpconsole","chardev":"charconsole0","id":"console0"}= ' \ diff --git a/tests/qemuxmlconfdata/s390x-ccw-minimal.s390x-latest.abi-updat= e.args b/tests/qemuxmlconfdata/s390x-ccw-minimal.s390x-latest.abi-update.ar= gs index 84098e580e..0f0d7c907e 100644 --- a/tests/qemuxmlconfdata/s390x-ccw-minimal.s390x-latest.abi-update.args +++ b/tests/qemuxmlconfdata/s390x-ccw-minimal.s390x-latest.abi-update.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/s390x-ccw-minimal.s390x-latest.args b/te= sts/qemuxmlconfdata/s390x-ccw-minimal.s390x-latest.args index 84098e580e..0f0d7c907e 100644 --- a/tests/qemuxmlconfdata/s390x-ccw-minimal.s390x-latest.args +++ b/tests/qemuxmlconfdata/s390x-ccw-minimal.s390x-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/schema-reorder-domain-subelements.x86_64= -latest.args b/tests/qemuxmlconfdata/schema-reorder-domain-subelements.x86_= 64-latest.args index 76df9c30b0..5cc171d512 100644 --- a/tests/qemuxmlconfdata/schema-reorder-domain-subelements.x86_64-latest= .args +++ b/tests/qemuxmlconfdata/schema-reorder-domain-subelements.x86_64-latest= .args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-passtvh= ostuu/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/seclabel-dac-none.x86_64-latest.args b/t= ests/qemuxmlconfdata/seclabel-dac-none.x86_64-latest.args index 23beb54806..689b636c57 100644 --- a/tests/qemuxmlconfdata/seclabel-dac-none.x86_64-latest.args +++ b/tests/qemuxmlconfdata/seclabel-dac-none.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/seclabel-device-multiple.x86_64-latest.a= rgs b/tests/qemuxmlconfdata/seclabel-device-multiple.x86_64-latest.args index 23beb54806..689b636c57 100644 --- a/tests/qemuxmlconfdata/seclabel-device-multiple.x86_64-latest.args +++ b/tests/qemuxmlconfdata/seclabel-device-multiple.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/seclabel-dynamic-baselabel.x86_64-latest= .args b/tests/qemuxmlconfdata/seclabel-dynamic-baselabel.x86_64-latest.args index 23beb54806..689b636c57 100644 --- a/tests/qemuxmlconfdata/seclabel-dynamic-baselabel.x86_64-latest.args +++ b/tests/qemuxmlconfdata/seclabel-dynamic-baselabel.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/seclabel-dynamic-labelskip.x86_64-latest= .args b/tests/qemuxmlconfdata/seclabel-dynamic-labelskip.x86_64-latest.args index 23beb54806..689b636c57 100644 --- a/tests/qemuxmlconfdata/seclabel-dynamic-labelskip.x86_64-latest.args +++ b/tests/qemuxmlconfdata/seclabel-dynamic-labelskip.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/seclabel-dynamic-none-relabel.x86_64-lat= est.args b/tests/qemuxmlconfdata/seclabel-dynamic-none-relabel.x86_64-lates= t.args index 3cdc3360a7..8b6a26156d 100644 --- a/tests/qemuxmlconfdata/seclabel-dynamic-none-relabel.x86_64-latest.args +++ b/tests/qemuxmlconfdata/seclabel-dynamic-none-relabel.x86_64-latest.args @@ -20,7 +20,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-migt10/= .config \ -uuid 0d73c5c3-43d0-f75b-31de-6aa919b0176b \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/seclabel-dynamic-none.x86_64-latest.args= b/tests/qemuxmlconfdata/seclabel-dynamic-none.x86_64-latest.args index 23beb54806..689b636c57 100644 --- a/tests/qemuxmlconfdata/seclabel-dynamic-none.x86_64-latest.args +++ b/tests/qemuxmlconfdata/seclabel-dynamic-none.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/seclabel-dynamic-override.x86_64-latest.= args b/tests/qemuxmlconfdata/seclabel-dynamic-override.x86_64-latest.args index a8f42a7674..070683ac77 100644 --- a/tests/qemuxmlconfdata/seclabel-dynamic-override.x86_64-latest.args +++ b/tests/qemuxmlconfdata/seclabel-dynamic-override.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/seclabel-dynamic-relabel.x86_64-latest.a= rgs b/tests/qemuxmlconfdata/seclabel-dynamic-relabel.x86_64-latest.args index 23beb54806..689b636c57 100644 --- a/tests/qemuxmlconfdata/seclabel-dynamic-relabel.x86_64-latest.args +++ b/tests/qemuxmlconfdata/seclabel-dynamic-relabel.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/seclabel-dynamic.x86_64-latest.args b/te= sts/qemuxmlconfdata/seclabel-dynamic.x86_64-latest.args index 23beb54806..689b636c57 100644 --- a/tests/qemuxmlconfdata/seclabel-dynamic.x86_64-latest.args +++ b/tests/qemuxmlconfdata/seclabel-dynamic.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/seclabel-none.x86_64-latest.args b/tests= /qemuxmlconfdata/seclabel-none.x86_64-latest.args index 23beb54806..689b636c57 100644 --- a/tests/qemuxmlconfdata/seclabel-none.x86_64-latest.args +++ b/tests/qemuxmlconfdata/seclabel-none.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/seclabel-selinux-none-override.x86_64-la= test.args b/tests/qemuxmlconfdata/seclabel-selinux-none-override.x86_64-lat= est.args index 23beb54806..689b636c57 100644 --- a/tests/qemuxmlconfdata/seclabel-selinux-none-override.x86_64-latest.ar= gs +++ b/tests/qemuxmlconfdata/seclabel-selinux-none-override.x86_64-latest.ar= gs @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/seclabel-static-labelskip.x86_64-latest.= args b/tests/qemuxmlconfdata/seclabel-static-labelskip.x86_64-latest.args index 23beb54806..689b636c57 100644 --- a/tests/qemuxmlconfdata/seclabel-static-labelskip.x86_64-latest.args +++ b/tests/qemuxmlconfdata/seclabel-static-labelskip.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/seclabel-static-relabel.x86_64-latest.ar= gs b/tests/qemuxmlconfdata/seclabel-static-relabel.x86_64-latest.args index 23beb54806..689b636c57 100644 --- a/tests/qemuxmlconfdata/seclabel-static-relabel.x86_64-latest.args +++ b/tests/qemuxmlconfdata/seclabel-static-relabel.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/seclabel-static.x86_64-latest.args b/tes= ts/qemuxmlconfdata/seclabel-static.x86_64-latest.args index 23beb54806..689b636c57 100644 --- a/tests/qemuxmlconfdata/seclabel-static.x86_64-latest.args +++ b/tests/qemuxmlconfdata/seclabel-static.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/serial-debugcon.x86_64-latest.args b/tes= ts/qemuxmlconfdata/serial-debugcon.x86_64-latest.args index d14c874772..d4cd55756a 100644 --- a/tests/qemuxmlconfdata/serial-debugcon.x86_64-latest.args +++ b/tests/qemuxmlconfdata/serial-debugcon.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/serial-dev-chardev-iobase.x86_64-latest.= args b/tests/qemuxmlconfdata/serial-dev-chardev-iobase.x86_64-latest.args index a4ef64b0e6..4f17962ad8 100644 --- a/tests/qemuxmlconfdata/serial-dev-chardev-iobase.x86_64-latest.args +++ b/tests/qemuxmlconfdata/serial-dev-chardev-iobase.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/serial-dev-chardev.x86_64-latest.args b/= tests/qemuxmlconfdata/serial-dev-chardev.x86_64-latest.args index 4e0b5a20b5..f652d91ee4 100644 --- a/tests/qemuxmlconfdata/serial-dev-chardev.x86_64-latest.args +++ b/tests/qemuxmlconfdata/serial-dev-chardev.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/serial-file-chardev.x86_64-latest.args b= /tests/qemuxmlconfdata/serial-file-chardev.x86_64-latest.args index 59021c4443..7d2eae029f 100644 --- a/tests/qemuxmlconfdata/serial-file-chardev.x86_64-latest.args +++ b/tests/qemuxmlconfdata/serial-file-chardev.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/serial-file-log.x86_64-latest.args b/tes= ts/qemuxmlconfdata/serial-file-log.x86_64-latest.args index 260fb2f37a..0a48c675ff 100644 --- a/tests/qemuxmlconfdata/serial-file-log.x86_64-latest.args +++ b/tests/qemuxmlconfdata/serial-file-log.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/serial-many-chardev.x86_64-latest.args b= /tests/qemuxmlconfdata/serial-many-chardev.x86_64-latest.args index 2841bbd3ba..4a15316669 100644 --- a/tests/qemuxmlconfdata/serial-many-chardev.x86_64-latest.args +++ b/tests/qemuxmlconfdata/serial-many-chardev.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/serial-pty-chardev.x86_64-latest.args b/= tests/qemuxmlconfdata/serial-pty-chardev.x86_64-latest.args index 8b128669d1..b49d6ed233 100644 --- a/tests/qemuxmlconfdata/serial-pty-chardev.x86_64-latest.args +++ b/tests/qemuxmlconfdata/serial-pty-chardev.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/serial-spiceport.x86_64-latest.args b/te= sts/qemuxmlconfdata/serial-spiceport.x86_64-latest.args index dbbe2e10e5..d1110f5ffd 100644 --- a/tests/qemuxmlconfdata/serial-spiceport.x86_64-latest.args +++ b/tests/qemuxmlconfdata/serial-spiceport.x86_64-latest.args @@ -20,7 +20,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/serial-target-port-auto.x86_64-latest.ar= gs b/tests/qemuxmlconfdata/serial-target-port-auto.x86_64-latest.args index 4a4c23e178..64173810ea 100644 --- a/tests/qemuxmlconfdata/serial-target-port-auto.x86_64-latest.args +++ b/tests/qemuxmlconfdata/serial-target-port-auto.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/serial-tcp-chardev.x86_64-latest.args b/= tests/qemuxmlconfdata/serial-tcp-chardev.x86_64-latest.args index 9f6a7e08e6..d06f18055e 100644 --- a/tests/qemuxmlconfdata/serial-tcp-chardev.x86_64-latest.args +++ b/tests/qemuxmlconfdata/serial-tcp-chardev.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/serial-tcp-telnet-chardev.x86_64-latest.= args b/tests/qemuxmlconfdata/serial-tcp-telnet-chardev.x86_64-latest.args index 6c0ef3ef8d..ac1af3a533 100644 --- a/tests/qemuxmlconfdata/serial-tcp-telnet-chardev.x86_64-latest.args +++ b/tests/qemuxmlconfdata/serial-tcp-telnet-chardev.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/serial-tcp-tlsx509-chardev-notls.x86_64-= latest.args b/tests/qemuxmlconfdata/serial-tcp-tlsx509-chardev-notls.x86_64= -latest.args index 3a755c1aff..d46be03c01 100644 --- a/tests/qemuxmlconfdata/serial-tcp-tlsx509-chardev-notls.x86_64-latest.= args +++ b/tests/qemuxmlconfdata/serial-tcp-tlsx509-chardev-notls.x86_64-latest.= args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/serial-tcp-tlsx509-chardev-verify.x86_64= -latest.args b/tests/qemuxmlconfdata/serial-tcp-tlsx509-chardev-verify.x86_= 64-latest.args index f8f1bb8502..fa87b76d78 100644 --- a/tests/qemuxmlconfdata/serial-tcp-tlsx509-chardev-verify.x86_64-latest= .args +++ b/tests/qemuxmlconfdata/serial-tcp-tlsx509-chardev-verify.x86_64-latest= .args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/serial-tcp-tlsx509-chardev.x86_64-latest= .args b/tests/qemuxmlconfdata/serial-tcp-tlsx509-chardev.x86_64-latest.args index f8f1bb8502..fa87b76d78 100644 --- a/tests/qemuxmlconfdata/serial-tcp-tlsx509-chardev.x86_64-latest.args +++ b/tests/qemuxmlconfdata/serial-tcp-tlsx509-chardev.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/serial-tcp-tlsx509-secret-chardev.x86_64= -latest.args b/tests/qemuxmlconfdata/serial-tcp-tlsx509-secret-chardev.x86_= 64-latest.args index 492d1be626..d127cc4ecf 100644 --- a/tests/qemuxmlconfdata/serial-tcp-tlsx509-secret-chardev.x86_64-latest= .args +++ b/tests/qemuxmlconfdata/serial-tcp-tlsx509-secret-chardev.x86_64-latest= .args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/serial-udp-chardev.x86_64-latest.args b/= tests/qemuxmlconfdata/serial-udp-chardev.x86_64-latest.args index 3592ef6b19..b36d4ddddf 100644 --- a/tests/qemuxmlconfdata/serial-udp-chardev.x86_64-latest.args +++ b/tests/qemuxmlconfdata/serial-udp-chardev.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/serial-unix-chardev.x86_64-latest.args b= /tests/qemuxmlconfdata/serial-unix-chardev.x86_64-latest.args index 15bb205e36..a1e7e2e7b5 100644 --- a/tests/qemuxmlconfdata/serial-unix-chardev.x86_64-latest.args +++ b/tests/qemuxmlconfdata/serial-unix-chardev.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ @@ -29,7 +29,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ -chardev socket,id=3Dcharserial0,path=3D/tmp/serial.sock \ -device '{"driver":"isa-serial","chardev":"charserial0","id":"serial0","in= dex":0}' \ --chardev socket,id=3Dcharserial1,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharserial1,fd=3DXXXXXXX,server=3Don,wait=3Doff \ -device '{"driver":"isa-serial","chardev":"charserial1","id":"serial1","in= dex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ diff --git a/tests/qemuxmlconfdata/serial-vc-chardev.x86_64-latest.args b/t= ests/qemuxmlconfdata/serial-vc-chardev.x86_64-latest.args index 50df7aa9bd..e5355f6040 100644 --- a/tests/qemuxmlconfdata/serial-vc-chardev.x86_64-latest.args +++ b/tests/qemuxmlconfdata/serial-vc-chardev.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/sgx-epc.x86_64-latest+sgx.args b/tests/q= emuxmlconfdata/sgx-epc.x86_64-latest+sgx.args index e7cfb7dade..83acdc9d47 100644 --- a/tests/qemuxmlconfdata/sgx-epc.x86_64-latest+sgx.args +++ b/tests/qemuxmlconfdata/sgx-epc.x86_64-latest+sgx.args @@ -24,7 +24,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/shmem-plain-doorbell.x86_64-latest.args = b/tests/qemuxmlconfdata/shmem-plain-doorbell.x86_64-latest.args index 5894fa0e0c..c68e42d014 100644 --- a/tests/qemuxmlconfdata/shmem-plain-doorbell.x86_64-latest.args +++ b/tests/qemuxmlconfdata/shmem-plain-doorbell.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/smartcard-controller.x86_64-latest.args = b/tests/qemuxmlconfdata/smartcard-controller.x86_64-latest.args index 89406ff729..0959020464 100644 --- a/tests/qemuxmlconfdata/smartcard-controller.x86_64-latest.args +++ b/tests/qemuxmlconfdata/smartcard-controller.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/smartcard-host-certificates-database.x86= _64-latest.args b/tests/qemuxmlconfdata/smartcard-host-certificates-databas= e.x86_64-latest.args index 47210c66fe..c4f04d5736 100644 --- a/tests/qemuxmlconfdata/smartcard-host-certificates-database.x86_64-lat= est.args +++ b/tests/qemuxmlconfdata/smartcard-host-certificates-database.x86_64-lat= est.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/smartcard-host-certificates.x86_64-lates= t.args b/tests/qemuxmlconfdata/smartcard-host-certificates.x86_64-latest.ar= gs index 49c58929bf..bd3a94aaf3 100644 --- a/tests/qemuxmlconfdata/smartcard-host-certificates.x86_64-latest.args +++ b/tests/qemuxmlconfdata/smartcard-host-certificates.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/smartcard-host.x86_64-latest.args b/test= s/qemuxmlconfdata/smartcard-host.x86_64-latest.args index 89406ff729..0959020464 100644 --- a/tests/qemuxmlconfdata/smartcard-host.x86_64-latest.args +++ b/tests/qemuxmlconfdata/smartcard-host.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/smartcard-passthrough-spicevmc.x86_64-la= test.args b/tests/qemuxmlconfdata/smartcard-passthrough-spicevmc.x86_64-lat= est.args index d776270688..2177b6f6cc 100644 --- a/tests/qemuxmlconfdata/smartcard-passthrough-spicevmc.x86_64-latest.ar= gs +++ b/tests/qemuxmlconfdata/smartcard-passthrough-spicevmc.x86_64-latest.ar= gs @@ -20,7 +20,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/smartcard-passthrough-tcp.x86_64-latest.= args b/tests/qemuxmlconfdata/smartcard-passthrough-tcp.x86_64-latest.args index 26bb0b9bbf..c495083dde 100644 --- a/tests/qemuxmlconfdata/smartcard-passthrough-tcp.x86_64-latest.args +++ b/tests/qemuxmlconfdata/smartcard-passthrough-tcp.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/smartcard-passthrough-unix.x86_64-latest= .args b/tests/qemuxmlconfdata/smartcard-passthrough-unix.x86_64-latest.args index 737a96a4c1..62a3138a08 100644 --- a/tests/qemuxmlconfdata/smartcard-passthrough-unix.x86_64-latest.args +++ b/tests/qemuxmlconfdata/smartcard-passthrough-unix.x86_64-latest.args @@ -21,14 +21,14 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUG= uest1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ -device '{"driver":"usb-ccid","id":"ccid0","bus":"usb.0","port":"1"}' \ --chardev socket,id=3Dcharsmartcard0,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharsmartcard0,fd=3DXXXXXXX,server=3Don,wait=3Doff \ -device '{"driver":"ccid-card-passthru","chardev":"charsmartcard0","id":"s= martcard0","bus":"ccid0.0"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ diff --git a/tests/qemuxmlconfdata/smbios-type-fwcfg.x86_64-latest.args b/t= ests/qemuxmlconfdata/smbios-type-fwcfg.x86_64-latest.args index 41831fec53..85037b665e 100644 --- a/tests/qemuxmlconfdata/smbios-type-fwcfg.x86_64-latest.args +++ b/tests/qemuxmlconfdata/smbios-type-fwcfg.x86_64-latest.args @@ -26,7 +26,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/smbios.x86_64-latest.args b/tests/qemuxm= lconfdata/smbios.x86_64-latest.args index 969e587683..eac754934f 100644 --- a/tests/qemuxmlconfdata/smbios.x86_64-latest.args +++ b/tests/qemuxmlconfdata/smbios.x86_64-latest.args @@ -26,7 +26,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/sound-device-virtio.x86_64-latest.args b= /tests/qemuxmlconfdata/sound-device-virtio.x86_64-latest.args index cca0069c64..128e09de9f 100644 --- a/tests/qemuxmlconfdata/sound-device-virtio.x86_64-latest.args +++ b/tests/qemuxmlconfdata/sound-device-virtio.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/sound-device.x86_64-latest.args b/tests/= qemuxmlconfdata/sound-device.x86_64-latest.args index 9e40e9b680..adfd33395e 100644 --- a/tests/qemuxmlconfdata/sound-device.x86_64-latest.args +++ b/tests/qemuxmlconfdata/sound-device.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/sparc-minimal.sparc-latest.args b/tests/= qemuxmlconfdata/sparc-minimal.sparc-latest.args index 9d09b33003..f7c1aaef00 100644 --- a/tests/qemuxmlconfdata/sparc-minimal.sparc-latest.args +++ b/tests/qemuxmlconfdata/sparc-minimal.sparc-latest.args @@ -20,7 +20,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-redhat6= 2sparc/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/tap-vhost-incorrect.x86_64-latest.args b= /tests/qemuxmlconfdata/tap-vhost-incorrect.x86_64-latest.args index d140b1e09d..eebc7071da 100644 --- a/tests/qemuxmlconfdata/tap-vhost-incorrect.x86_64-latest.args +++ b/tests/qemuxmlconfdata/tap-vhost-incorrect.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-test/.c= onfig \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/tap-vhost.x86_64-latest.args b/tests/qem= uxmlconfdata/tap-vhost.x86_64-latest.args index 76a4b5c77b..8712ebd8f8 100644 --- a/tests/qemuxmlconfdata/tap-vhost.x86_64-latest.args +++ b/tests/qemuxmlconfdata/tap-vhost.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-test/.c= onfig \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/throttlefilter.x86_64-latest.args b/test= s/qemuxmlconfdata/throttlefilter.x86_64-latest.args index 95914ef5ce..a49915f69d 100644 --- a/tests/qemuxmlconfdata/throttlefilter.x86_64-latest.args +++ b/tests/qemuxmlconfdata/throttlefilter.x86_64-latest.args @@ -26,7 +26,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/tpm-emulator-crb-profile.x86_64-latest.a= rgs b/tests/qemuxmlconfdata/tpm-emulator-crb-profile.x86_64-latest.args index 6dd97dfbe7..ab982e5ef3 100644 --- a/tests/qemuxmlconfdata/tpm-emulator-crb-profile.x86_64-latest.args +++ b/tests/qemuxmlconfdata/tpm-emulator-crb-profile.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-TPM-VM/= .config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/tpm-emulator-tpm2-enc.x86_64-latest.args= b/tests/qemuxmlconfdata/tpm-emulator-tpm2-enc.x86_64-latest.args index 9ff9ac0db2..868c59fbb9 100644 --- a/tests/qemuxmlconfdata/tpm-emulator-tpm2-enc.x86_64-latest.args +++ b/tests/qemuxmlconfdata/tpm-emulator-tpm2-enc.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-TPM-VM/= .config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/tpm-emulator-tpm2-pstate.x86_64-latest.a= rgs b/tests/qemuxmlconfdata/tpm-emulator-tpm2-pstate.x86_64-latest.args index 9ff9ac0db2..868c59fbb9 100644 --- a/tests/qemuxmlconfdata/tpm-emulator-tpm2-pstate.x86_64-latest.args +++ b/tests/qemuxmlconfdata/tpm-emulator-tpm2-pstate.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-TPM-VM/= .config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/tpm-emulator-tpm2.x86_64-latest.args b/t= ests/qemuxmlconfdata/tpm-emulator-tpm2.x86_64-latest.args index 9ff9ac0db2..868c59fbb9 100644 --- a/tests/qemuxmlconfdata/tpm-emulator-tpm2.x86_64-latest.args +++ b/tests/qemuxmlconfdata/tpm-emulator-tpm2.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-TPM-VM/= .config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/tpm-emulator.x86_64-latest.args b/tests/= qemuxmlconfdata/tpm-emulator.x86_64-latest.args index 9ff9ac0db2..868c59fbb9 100644 --- a/tests/qemuxmlconfdata/tpm-emulator.x86_64-latest.args +++ b/tests/qemuxmlconfdata/tpm-emulator.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-TPM-VM/= .config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/tpm-external.x86_64-latest.args b/tests/= qemuxmlconfdata/tpm-external.x86_64-latest.args index 5ddf21a4c7..c5b4198d38 100644 --- a/tests/qemuxmlconfdata/tpm-external.x86_64-latest.args +++ b/tests/qemuxmlconfdata/tpm-external.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-TPM-VM/= .config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/tpm-passthrough-crb.x86_64-latest.args b= /tests/qemuxmlconfdata/tpm-passthrough-crb.x86_64-latest.args index 319bf9579c..f9f6acff01 100644 --- a/tests/qemuxmlconfdata/tpm-passthrough-crb.x86_64-latest.args +++ b/tests/qemuxmlconfdata/tpm-passthrough-crb.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-TPM-VM/= .config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/tpm-passthrough.x86_64-latest.args b/tes= ts/qemuxmlconfdata/tpm-passthrough.x86_64-latest.args index 896b6c3040..cd92127ade 100644 --- a/tests/qemuxmlconfdata/tpm-passthrough.x86_64-latest.args +++ b/tests/qemuxmlconfdata/tpm-passthrough.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-TPM-VM/= .config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/tseg-explicit-size.x86_64-latest.args b/= tests/qemuxmlconfdata/tseg-explicit-size.x86_64-latest.args index 36ae1a984d..8e53f8388c 100644 --- a/tests/qemuxmlconfdata/tseg-explicit-size.x86_64-latest.args +++ b/tests/qemuxmlconfdata/tseg-explicit-size.x86_64-latest.args @@ -22,7 +22,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/usb-controller-automatic-i440fx.x86_64-l= atest.args b/tests/qemuxmlconfdata/usb-controller-automatic-i440fx.x86_64-l= atest.args index e4be4266bb..a08dae37e7 100644 --- a/tests/qemuxmlconfdata/usb-controller-automatic-i440fx.x86_64-latest.a= rgs +++ b/tests/qemuxmlconfdata/usb-controller-automatic-i440fx.x86_64-latest.a= rgs @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/usb-controller-automatic-isapc.x86_64-la= test.args b/tests/qemuxmlconfdata/usb-controller-automatic-isapc.x86_64-lat= est.args index cf8a176cd8..b39522b193 100644 --- a/tests/qemuxmlconfdata/usb-controller-automatic-isapc.x86_64-latest.ar= gs +++ b/tests/qemuxmlconfdata/usb-controller-automatic-isapc.x86_64-latest.ar= gs @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/usb-controller-automatic-microvm.x86_64-= latest.args b/tests/qemuxmlconfdata/usb-controller-automatic-microvm.x86_64= -latest.args index 4aaf685a38..e5a1550c66 100644 --- a/tests/qemuxmlconfdata/usb-controller-automatic-microvm.x86_64-latest.= args +++ b/tests/qemuxmlconfdata/usb-controller-automatic-microvm.x86_64-latest.= args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/usb-controller-automatic-pseries.ppc64-l= atest.abi-update.args b/tests/qemuxmlconfdata/usb-controller-automatic-pser= ies.ppc64-latest.abi-update.args index 3d8df5ff6f..d5664c5022 100644 --- a/tests/qemuxmlconfdata/usb-controller-automatic-pseries.ppc64-latest.a= bi-update.args +++ b/tests/qemuxmlconfdata/usb-controller-automatic-pseries.ppc64-latest.a= bi-update.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/usb-controller-automatic-pseries.ppc64-l= atest.args b/tests/qemuxmlconfdata/usb-controller-automatic-pseries.ppc64-l= atest.args index 1859e1f5f9..4fbd72e76c 100644 --- a/tests/qemuxmlconfdata/usb-controller-automatic-pseries.ppc64-latest.a= rgs +++ b/tests/qemuxmlconfdata/usb-controller-automatic-pseries.ppc64-latest.a= rgs @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/usb-controller-automatic-q35.x86_64-late= st.args b/tests/qemuxmlconfdata/usb-controller-automatic-q35.x86_64-latest.= args index 9a660060a9..108e66bb44 100644 --- a/tests/qemuxmlconfdata/usb-controller-automatic-q35.x86_64-latest.args +++ b/tests/qemuxmlconfdata/usb-controller-automatic-q35.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/usb-controller-automatic-realview.aarch6= 4-latest.args b/tests/qemuxmlconfdata/usb-controller-automatic-realview.aar= ch64-latest.args index ccbff79f35..41cd0da428 100644 --- a/tests/qemuxmlconfdata/usb-controller-automatic-realview.aarch64-lates= t.args +++ b/tests/qemuxmlconfdata/usb-controller-automatic-realview.aarch64-lates= t.args @@ -20,7 +20,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-aarch64= test/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/usb-controller-automatic-s390x.s390x-lat= est.args b/tests/qemuxmlconfdata/usb-controller-automatic-s390x.s390x-lates= t.args index 77901f73fe..8811f2e78d 100644 --- a/tests/qemuxmlconfdata/usb-controller-automatic-s390x.s390x-latest.args +++ b/tests/qemuxmlconfdata/usb-controller-automatic-s390x.s390x-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/usb-controller-automatic-unavailable-q35= .x86_64-latest.args b/tests/qemuxmlconfdata/usb-controller-automatic-unavai= lable-q35.x86_64-latest.args index e883ce10cc..772fc92764 100644 --- a/tests/qemuxmlconfdata/usb-controller-automatic-unavailable-q35.x86_64= -latest.args +++ b/tests/qemuxmlconfdata/usb-controller-automatic-unavailable-q35.x86_64= -latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-q35-tes= t/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/usb-controller-automatic-versatilepb.arm= v7l-latest.args b/tests/qemuxmlconfdata/usb-controller-automatic-versatilep= b.armv7l-latest.args index 88fe2b62e8..50f5ca6c94 100644 --- a/tests/qemuxmlconfdata/usb-controller-automatic-versatilepb.armv7l-lat= est.args +++ b/tests/qemuxmlconfdata/usb-controller-automatic-versatilepb.armv7l-lat= est.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-armv7lt= est/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/usb-controller-automatic-virt-aarch64.aa= rch64-latest.args b/tests/qemuxmlconfdata/usb-controller-automatic-virt-aar= ch64.aarch64-latest.args index 073131f2d2..b290e35d9a 100644 --- a/tests/qemuxmlconfdata/usb-controller-automatic-virt-aarch64.aarch64-l= atest.args +++ b/tests/qemuxmlconfdata/usb-controller-automatic-virt-aarch64.aarch64-l= atest.args @@ -20,7 +20,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-test/.c= onfig \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/usb-controller-automatic-virt-loongarch6= 4.loongarch64-latest.args b/tests/qemuxmlconfdata/usb-controller-automatic-= virt-loongarch64.loongarch64-latest.args index cb73962813..1bfe5b55da 100644 --- a/tests/qemuxmlconfdata/usb-controller-automatic-virt-loongarch64.loong= arch64-latest.args +++ b/tests/qemuxmlconfdata/usb-controller-automatic-virt-loongarch64.loong= arch64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-test/.c= onfig \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/usb-controller-automatic-virt-riscv64.ri= scv64-latest.args b/tests/qemuxmlconfdata/usb-controller-automatic-virt-ris= cv64.riscv64-latest.args index 5413ca8b57..dc4a3a4340 100644 --- a/tests/qemuxmlconfdata/usb-controller-automatic-virt-riscv64.riscv64-l= atest.args +++ b/tests/qemuxmlconfdata/usb-controller-automatic-virt-riscv64.riscv64-l= atest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-test/.c= onfig \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/usb-controller-default-fallback-g3beige.= ppc64-latest.args b/tests/qemuxmlconfdata/usb-controller-default-fallback-g= 3beige.ppc64-latest.args index 7b0fd85a77..f65cd92257 100644 --- a/tests/qemuxmlconfdata/usb-controller-default-fallback-g3beige.ppc64-l= atest.args +++ b/tests/qemuxmlconfdata/usb-controller-default-fallback-g3beige.ppc64-l= atest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/usb-controller-default-fallback-mac99.pp= c64-latest.args b/tests/qemuxmlconfdata/usb-controller-default-fallback-mac= 99.ppc64-latest.args index ba81f4e2ad..9187aa729c 100644 --- a/tests/qemuxmlconfdata/usb-controller-default-fallback-mac99.ppc64-lat= est.args +++ b/tests/qemuxmlconfdata/usb-controller-default-fallback-mac99.ppc64-lat= est.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/usb-controller-default-fallback-mac99ppc= .ppc-latest.args b/tests/qemuxmlconfdata/usb-controller-default-fallback-ma= c99ppc.ppc-latest.args index da5437bc24..edafb1e693 100644 --- a/tests/qemuxmlconfdata/usb-controller-default-fallback-mac99ppc.ppc-la= test.args +++ b/tests/qemuxmlconfdata/usb-controller-default-fallback-mac99ppc.ppc-la= test.args @@ -20,7 +20,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/usb-controller-default-fallback-powernv9= .ppc64-latest.args b/tests/qemuxmlconfdata/usb-controller-default-fallback-= powernv9.ppc64-latest.args index 71528dee24..8706b4d8ce 100644 --- a/tests/qemuxmlconfdata/usb-controller-default-fallback-powernv9.ppc64-= latest.args +++ b/tests/qemuxmlconfdata/usb-controller-default-fallback-powernv9.ppc64-= latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/usb-controller-default-fallback-realview= .aarch64-latest.args b/tests/qemuxmlconfdata/usb-controller-default-fallbac= k-realview.aarch64-latest.args index 0d956241fc..fc0d8ca8aa 100644 --- a/tests/qemuxmlconfdata/usb-controller-default-fallback-realview.aarch6= 4-latest.args +++ b/tests/qemuxmlconfdata/usb-controller-default-fallback-realview.aarch6= 4-latest.args @@ -20,7 +20,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-aarch64= test/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/usb-controller-default-fallback-versatil= epb.armv7l-latest.args b/tests/qemuxmlconfdata/usb-controller-default-fallb= ack-versatilepb.armv7l-latest.args index a05a413290..4e46702d1e 100644 --- a/tests/qemuxmlconfdata/usb-controller-default-fallback-versatilepb.arm= v7l-latest.args +++ b/tests/qemuxmlconfdata/usb-controller-default-fallback-versatilepb.arm= v7l-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-armv7lt= est/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/usb-controller-default-fallback-virt-aar= ch64.aarch64-latest.args b/tests/qemuxmlconfdata/usb-controller-default-fal= lback-virt-aarch64.aarch64-latest.args index 746a28b6bc..1f509bb22e 100644 --- a/tests/qemuxmlconfdata/usb-controller-default-fallback-virt-aarch64.aa= rch64-latest.args +++ b/tests/qemuxmlconfdata/usb-controller-default-fallback-virt-aarch64.aa= rch64-latest.args @@ -20,7 +20,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-test/.c= onfig \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/usb-controller-default-g3beige.ppc64-lat= est.args b/tests/qemuxmlconfdata/usb-controller-default-g3beige.ppc64-lates= t.args index 7b0fd85a77..f65cd92257 100644 --- a/tests/qemuxmlconfdata/usb-controller-default-g3beige.ppc64-latest.args +++ b/tests/qemuxmlconfdata/usb-controller-default-g3beige.ppc64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/usb-controller-default-i440fx.x86_64-lat= est.args b/tests/qemuxmlconfdata/usb-controller-default-i440fx.x86_64-lates= t.args index e4be4266bb..a08dae37e7 100644 --- a/tests/qemuxmlconfdata/usb-controller-default-i440fx.x86_64-latest.args +++ b/tests/qemuxmlconfdata/usb-controller-default-i440fx.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/usb-controller-default-mac99.ppc64-lates= t.args b/tests/qemuxmlconfdata/usb-controller-default-mac99.ppc64-latest.ar= gs index ba81f4e2ad..9187aa729c 100644 --- a/tests/qemuxmlconfdata/usb-controller-default-mac99.ppc64-latest.args +++ b/tests/qemuxmlconfdata/usb-controller-default-mac99.ppc64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/usb-controller-default-mac99ppc.ppc-late= st.args b/tests/qemuxmlconfdata/usb-controller-default-mac99ppc.ppc-latest.= args index da5437bc24..edafb1e693 100644 --- a/tests/qemuxmlconfdata/usb-controller-default-mac99ppc.ppc-latest.args +++ b/tests/qemuxmlconfdata/usb-controller-default-mac99ppc.ppc-latest.args @@ -20,7 +20,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/usb-controller-default-powernv9.ppc64-la= test.args b/tests/qemuxmlconfdata/usb-controller-default-powernv9.ppc64-lat= est.args index 71528dee24..8706b4d8ce 100644 --- a/tests/qemuxmlconfdata/usb-controller-default-powernv9.ppc64-latest.ar= gs +++ b/tests/qemuxmlconfdata/usb-controller-default-powernv9.ppc64-latest.ar= gs @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/usb-controller-default-pseries.ppc64-lat= est.abi-update.args b/tests/qemuxmlconfdata/usb-controller-default-pseries.= ppc64-latest.abi-update.args index 3d8df5ff6f..d5664c5022 100644 --- a/tests/qemuxmlconfdata/usb-controller-default-pseries.ppc64-latest.abi= -update.args +++ b/tests/qemuxmlconfdata/usb-controller-default-pseries.ppc64-latest.abi= -update.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/usb-controller-default-pseries.ppc64-lat= est.args b/tests/qemuxmlconfdata/usb-controller-default-pseries.ppc64-lates= t.args index 1859e1f5f9..4fbd72e76c 100644 --- a/tests/qemuxmlconfdata/usb-controller-default-pseries.ppc64-latest.args +++ b/tests/qemuxmlconfdata/usb-controller-default-pseries.ppc64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/usb-controller-default-q35.x86_64-latest= .args b/tests/qemuxmlconfdata/usb-controller-default-q35.x86_64-latest.args index 7ba7b39a87..29a8a8f251 100644 --- a/tests/qemuxmlconfdata/usb-controller-default-q35.x86_64-latest.args +++ b/tests/qemuxmlconfdata/usb-controller-default-q35.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-q35-tes= t/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/usb-controller-default-realview.aarch64-= latest.args b/tests/qemuxmlconfdata/usb-controller-default-realview.aarch64= -latest.args index ccbff79f35..41cd0da428 100644 --- a/tests/qemuxmlconfdata/usb-controller-default-realview.aarch64-latest.= args +++ b/tests/qemuxmlconfdata/usb-controller-default-realview.aarch64-latest.= args @@ -20,7 +20,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-aarch64= test/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/usb-controller-default-s390x.s390x-lates= t.args b/tests/qemuxmlconfdata/usb-controller-default-s390x.s390x-latest.ar= gs index 77901f73fe..8811f2e78d 100644 --- a/tests/qemuxmlconfdata/usb-controller-default-s390x.s390x-latest.args +++ b/tests/qemuxmlconfdata/usb-controller-default-s390x.s390x-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/usb-controller-default-versatilepb.armv7= l-latest.args b/tests/qemuxmlconfdata/usb-controller-default-versatilepb.ar= mv7l-latest.args index 88fe2b62e8..50f5ca6c94 100644 --- a/tests/qemuxmlconfdata/usb-controller-default-versatilepb.armv7l-lates= t.args +++ b/tests/qemuxmlconfdata/usb-controller-default-versatilepb.armv7l-lates= t.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-armv7lt= est/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/usb-controller-default-virt-aarch64.aarc= h64-latest.args b/tests/qemuxmlconfdata/usb-controller-default-virt-aarch64= .aarch64-latest.args index 95bb398434..45813573d4 100644 --- a/tests/qemuxmlconfdata/usb-controller-default-virt-aarch64.aarch64-lat= est.args +++ b/tests/qemuxmlconfdata/usb-controller-default-virt-aarch64.aarch64-lat= est.args @@ -20,7 +20,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-test/.c= onfig \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/usb-controller-default-virt-loongarch64.= loongarch64-latest.args b/tests/qemuxmlconfdata/usb-controller-default-virt= -loongarch64.loongarch64-latest.args index 04b70a2dba..1317443649 100644 --- a/tests/qemuxmlconfdata/usb-controller-default-virt-loongarch64.loongar= ch64-latest.args +++ b/tests/qemuxmlconfdata/usb-controller-default-virt-loongarch64.loongar= ch64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-test/.c= onfig \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/usb-controller-default-virt-riscv64.risc= v64-latest.args b/tests/qemuxmlconfdata/usb-controller-default-virt-riscv64= .riscv64-latest.args index a0f79e499e..2e20215293 100644 --- a/tests/qemuxmlconfdata/usb-controller-default-virt-riscv64.riscv64-lat= est.args +++ b/tests/qemuxmlconfdata/usb-controller-default-virt-riscv64.riscv64-lat= est.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-test/.c= onfig \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/usb-controller-ich9-autoassign.x86_64-la= test.args b/tests/qemuxmlconfdata/usb-controller-ich9-autoassign.x86_64-lat= est.args index 4a8ed73ef3..d6201c5380 100644 --- a/tests/qemuxmlconfdata/usb-controller-ich9-autoassign.x86_64-latest.ar= gs +++ b/tests/qemuxmlconfdata/usb-controller-ich9-autoassign.x86_64-latest.ar= gs @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/usb-controller-ich9-companion.x86_64-lat= est.args b/tests/qemuxmlconfdata/usb-controller-ich9-companion.x86_64-lates= t.args index 4225a3489c..9d8f457b1a 100644 --- a/tests/qemuxmlconfdata/usb-controller-ich9-companion.x86_64-latest.args +++ b/tests/qemuxmlconfdata/usb-controller-ich9-companion.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/usb-controller-ich9-ehci-addr.x86_64-lat= est.args b/tests/qemuxmlconfdata/usb-controller-ich9-ehci-addr.x86_64-lates= t.args index 2ac2bbe4aa..3090e9388f 100644 --- a/tests/qemuxmlconfdata/usb-controller-ich9-ehci-addr.x86_64-latest.args +++ b/tests/qemuxmlconfdata/usb-controller-ich9-ehci-addr.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/usb-controller-nec-xhci-autoassign.x86_6= 4-latest.args b/tests/qemuxmlconfdata/usb-controller-nec-xhci-autoassign.x8= 6_64-latest.args index 14e62871ca..fc2bfd5144 100644 --- a/tests/qemuxmlconfdata/usb-controller-nec-xhci-autoassign.x86_64-lates= t.args +++ b/tests/qemuxmlconfdata/usb-controller-nec-xhci-autoassign.x86_64-lates= t.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/usb-controller-nec-xhci.x86_64-latest.ar= gs b/tests/qemuxmlconfdata/usb-controller-nec-xhci.x86_64-latest.args index 5c6eed22d1..303a2f791f 100644 --- a/tests/qemuxmlconfdata/usb-controller-nec-xhci.x86_64-latest.args +++ b/tests/qemuxmlconfdata/usb-controller-nec-xhci.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-q35-tes= t/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/usb-controller-piix3.x86_64-latest.args = b/tests/qemuxmlconfdata/usb-controller-piix3.x86_64-latest.args index e4be4266bb..a08dae37e7 100644 --- a/tests/qemuxmlconfdata/usb-controller-piix3.x86_64-latest.args +++ b/tests/qemuxmlconfdata/usb-controller-piix3.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/usb-controller-qemu-xhci.x86_64-latest.a= rgs b/tests/qemuxmlconfdata/usb-controller-qemu-xhci.x86_64-latest.args index 852574e17f..8f471e15b5 100644 --- a/tests/qemuxmlconfdata/usb-controller-qemu-xhci.x86_64-latest.args +++ b/tests/qemuxmlconfdata/usb-controller-qemu-xhci.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/usb-hub-autoadd-deluxe.x86_64-latest.arg= s b/tests/qemuxmlconfdata/usb-hub-autoadd-deluxe.x86_64-latest.args index 6c98dfc021..55d7d9e96c 100644 --- a/tests/qemuxmlconfdata/usb-hub-autoadd-deluxe.x86_64-latest.args +++ b/tests/qemuxmlconfdata/usb-hub-autoadd-deluxe.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/usb-hub-autoadd.x86_64-latest.args b/tes= ts/qemuxmlconfdata/usb-hub-autoadd.x86_64-latest.args index d8fc231f89..c388433db7 100644 --- a/tests/qemuxmlconfdata/usb-hub-autoadd.x86_64-latest.args +++ b/tests/qemuxmlconfdata/usb-hub-autoadd.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/usb-hub.x86_64-latest.args b/tests/qemux= mlconfdata/usb-hub.x86_64-latest.args index b01bbbe463..c8cb25adcb 100644 --- a/tests/qemuxmlconfdata/usb-hub.x86_64-latest.args +++ b/tests/qemuxmlconfdata/usb-hub.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/usb-long-port-path.x86_64-latest.args b/= tests/qemuxmlconfdata/usb-long-port-path.x86_64-latest.args index 6aeb776c8d..65450eeb87 100644 --- a/tests/qemuxmlconfdata/usb-long-port-path.x86_64-latest.args +++ b/tests/qemuxmlconfdata/usb-long-port-path.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/usb-none.x86_64-latest.args b/tests/qemu= xmlconfdata/usb-none.x86_64-latest.args index ba1e6d550f..9f1fc86dcd 100644 --- a/tests/qemuxmlconfdata/usb-none.x86_64-latest.args +++ b/tests/qemuxmlconfdata/usb-none.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/usb-port-autoassign.x86_64-latest.args b= /tests/qemuxmlconfdata/usb-port-autoassign.x86_64-latest.args index 8a8f747c1a..b2f1b19903 100644 --- a/tests/qemuxmlconfdata/usb-port-autoassign.x86_64-latest.args +++ b/tests/qemuxmlconfdata/usb-port-autoassign.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/usb-port-missing.x86_64-latest.args b/te= sts/qemuxmlconfdata/usb-port-missing.x86_64-latest.args index 5f06d7a229..b81c3e6ae3 100644 --- a/tests/qemuxmlconfdata/usb-port-missing.x86_64-latest.args +++ b/tests/qemuxmlconfdata/usb-port-missing.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/usb-ports.x86_64-latest.args b/tests/qem= uxmlconfdata/usb-ports.x86_64-latest.args index c8ed29e53d..c42e3b825a 100644 --- a/tests/qemuxmlconfdata/usb-ports.x86_64-latest.args +++ b/tests/qemuxmlconfdata/usb-ports.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/usb-redir-boot.x86_64-latest.args b/test= s/qemuxmlconfdata/usb-redir-boot.x86_64-latest.args index edbd32dd09..34cf5b6658 100644 --- a/tests/qemuxmlconfdata/usb-redir-boot.x86_64-latest.args +++ b/tests/qemuxmlconfdata/usb-redir-boot.x86_64-latest.args @@ -20,7 +20,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/usb-redir-filter-version.x86_64-latest.a= rgs b/tests/qemuxmlconfdata/usb-redir-filter-version.x86_64-latest.args index c8af5e2caf..839db22f12 100644 --- a/tests/qemuxmlconfdata/usb-redir-filter-version.x86_64-latest.args +++ b/tests/qemuxmlconfdata/usb-redir-filter-version.x86_64-latest.args @@ -20,7 +20,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/usb-redir-filter.x86_64-latest.args b/te= sts/qemuxmlconfdata/usb-redir-filter.x86_64-latest.args index 714a983c62..a811ca0e09 100644 --- a/tests/qemuxmlconfdata/usb-redir-filter.x86_64-latest.args +++ b/tests/qemuxmlconfdata/usb-redir-filter.x86_64-latest.args @@ -20,7 +20,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/usb-redir-unix.x86_64-latest.args b/test= s/qemuxmlconfdata/usb-redir-unix.x86_64-latest.args index f01464521a..7bdcd30d90 100644 --- a/tests/qemuxmlconfdata/usb-redir-unix.x86_64-latest.args +++ b/tests/qemuxmlconfdata/usb-redir-unix.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ @@ -33,7 +33,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -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 \ +-chardev socket,id=3Dcharredir1,fd=3DXXXXXXX,server=3Don,wait=3Doff \ -device '{"driver":"usb-redir","chardev":"charredir1","id":"redir1","bus":= "usb.0","port":"2"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ diff --git a/tests/qemuxmlconfdata/usb-redir.x86_64-latest.args b/tests/qem= uxmlconfdata/usb-redir.x86_64-latest.args index 3fa6875a39..a9e7332d12 100644 --- a/tests/qemuxmlconfdata/usb-redir.x86_64-latest.args +++ b/tests/qemuxmlconfdata/usb-redir.x86_64-latest.args @@ -20,7 +20,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/usb1-usb2.x86_64-latest.args b/tests/qem= uxmlconfdata/usb1-usb2.x86_64-latest.args index e112a90ad3..7f196528fc 100644 --- a/tests/qemuxmlconfdata/usb1-usb2.x86_64-latest.args +++ b/tests/qemuxmlconfdata/usb1-usb2.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/user-aliases-usb.x86_64-latest.args b/te= sts/qemuxmlconfdata/user-aliases-usb.x86_64-latest.args index 3da572e975..ffc95850fb 100644 --- a/tests/qemuxmlconfdata/user-aliases-usb.x86_64-latest.args +++ b/tests/qemuxmlconfdata/user-aliases-usb.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-gentoo/= .config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/user-aliases.x86_64-latest.args b/tests/= qemuxmlconfdata/user-aliases.x86_64-latest.args index 03cbcab64a..3e0fe1ff0b 100644 --- a/tests/qemuxmlconfdata/user-aliases.x86_64-latest.args +++ b/tests/qemuxmlconfdata/user-aliases.x86_64-latest.args @@ -27,7 +27,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-gentoo/= .config \ -uuid a75aca4b-a02f-2bcb-4a91-c93cd848c34b \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ @@ -60,7 +60,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-gentoo/= .config \ -device '{"driver":"isa-serial","chardev":"charserial0","id":"serial0","in= dex":0}' \ -chardev pty,id=3Dcharserial1 \ -device '{"driver":"isa-serial","chardev":"charserial1","id":"serial1","in= dex":1}' \ --chardev socket,id=3Dcharchannel0,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharchannel0,fd=3DXXXXXXX,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":"audio1","driver":"none"}' \ -vnc 127.0.0.1:0,audiodev=3Daudio1 \ diff --git a/tests/qemuxmlconfdata/user-aliases2.x86_64-latest.args b/tests= /qemuxmlconfdata/user-aliases2.x86_64-latest.args index 3c7c21c22f..139df16e0c 100644 --- a/tests/qemuxmlconfdata/user-aliases2.x86_64-latest.args +++ b/tests/qemuxmlconfdata/user-aliases2.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/vcpu-placement-static.x86_64-latest.args= b/tests/qemuxmlconfdata/vcpu-placement-static.x86_64-latest.args index dc188d45fc..239c7b494a 100644 --- a/tests/qemuxmlconfdata/vcpu-placement-static.x86_64-latest.args +++ b/tests/qemuxmlconfdata/vcpu-placement-static.x86_64-latest.args @@ -23,7 +23,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-dummy2/= .config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/vhost-user-fs-ccw.s390x-latest.args b/te= sts/qemuxmlconfdata/vhost-user-fs-ccw.s390x-latest.args index 72ca38c305..a38a0b1df5 100644 --- a/tests/qemuxmlconfdata/vhost-user-fs-ccw.s390x-latest.args +++ b/tests/qemuxmlconfdata/vhost-user-fs-ccw.s390x-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/vhost-user-fs-fd-memory.x86_64-latest.ar= gs b/tests/qemuxmlconfdata/vhost-user-fs-fd-memory.x86_64-latest.args index d3c71544f8..967ae0a962 100644 --- a/tests/qemuxmlconfdata/vhost-user-fs-fd-memory.x86_64-latest.args +++ b/tests/qemuxmlconfdata/vhost-user-fs-fd-memory.x86_64-latest.args @@ -22,7 +22,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/vhost-user-fs-fd-openfiles.x86_64-latest= .args b/tests/qemuxmlconfdata/vhost-user-fs-fd-openfiles.x86_64-latest.args index b4c2e3fe98..ac42fda09a 100644 --- a/tests/qemuxmlconfdata/vhost-user-fs-fd-openfiles.x86_64-latest.args +++ b/tests/qemuxmlconfdata/vhost-user-fs-fd-openfiles.x86_64-latest.args @@ -22,7 +22,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/vhost-user-fs-hugepages.x86_64-latest.ar= gs b/tests/qemuxmlconfdata/vhost-user-fs-hugepages.x86_64-latest.args index 51fada2721..32a48fa840 100644 --- a/tests/qemuxmlconfdata/vhost-user-fs-hugepages.x86_64-latest.args +++ b/tests/qemuxmlconfdata/vhost-user-fs-hugepages.x86_64-latest.args @@ -22,7 +22,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/vhost-user-fs-locking.x86_64-7.2.0.args = b/tests/qemuxmlconfdata/vhost-user-fs-locking.x86_64-7.2.0.args index ee8625dc0d..2702380e6a 100644 --- a/tests/qemuxmlconfdata/vhost-user-fs-locking.x86_64-7.2.0.args +++ b/tests/qemuxmlconfdata/vhost-user-fs-locking.x86_64-7.2.0.args @@ -22,7 +22,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/vhost-user-fs-readonly.x86_64-latest.arg= s b/tests/qemuxmlconfdata/vhost-user-fs-readonly.x86_64-latest.args index d3c71544f8..967ae0a962 100644 --- a/tests/qemuxmlconfdata/vhost-user-fs-readonly.x86_64-latest.args +++ b/tests/qemuxmlconfdata/vhost-user-fs-readonly.x86_64-latest.args @@ -22,7 +22,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/vhost-user-fs-sock.x86_64-latest.args b/= tests/qemuxmlconfdata/vhost-user-fs-sock.x86_64-latest.args index dab40e524c..136da432dd 100644 --- a/tests/qemuxmlconfdata/vhost-user-fs-sock.x86_64-latest.args +++ b/tests/qemuxmlconfdata/vhost-user-fs-sock.x86_64-latest.args @@ -22,7 +22,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/vhost-user-gpu-secondary.x86_64-latest.a= rgs b/tests/qemuxmlconfdata/vhost-user-gpu-secondary.x86_64-latest.args index ba03152c36..96f6e67aa8 100644 --- a/tests/qemuxmlconfdata/vhost-user-gpu-secondary.x86_64-latest.args +++ b/tests/qemuxmlconfdata/vhost-user-gpu-secondary.x86_64-latest.args @@ -22,7 +22,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ @@ -31,9 +31,9 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","read-only":false}' \ -device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-stor= age","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ --chardev socket,id=3Dchr-vu-video0,fd=3D1729 \ +-chardev socket,id=3Dchr-vu-video0,fd=3DXXXXXXX \ -device '{"driver":"vhost-user-vga","id":"video0","max_outputs":1,"chardev= ":"chr-vu-video0","bus":"pci.0","addr":"0x2"}' \ --chardev socket,id=3Dchr-vu-video1,fd=3D1729 \ +-chardev socket,id=3Dchr-vu-video1,fd=3DXXXXXXX \ -device '{"driver":"vhost-user-gpu-pci","id":"video1","max_outputs":1,"cha= rdev":"chr-vu-video1","bus":"pci.0","addr":"0x4"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x3"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ diff --git a/tests/qemuxmlconfdata/vhost-user-vga.x86_64-latest.args b/test= s/qemuxmlconfdata/vhost-user-vga.x86_64-latest.args index 69c4f5fa4c..4ddc6ad65c 100644 --- a/tests/qemuxmlconfdata/vhost-user-vga.x86_64-latest.args +++ b/tests/qemuxmlconfdata/vhost-user-vga.x86_64-latest.args @@ -22,7 +22,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ @@ -31,7 +31,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","read-only":false}' \ -device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-stor= age","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ --chardev socket,id=3Dchr-vu-video0,fd=3D1729 \ +-chardev socket,id=3Dchr-vu-video0,fd=3DXXXXXXX \ -device '{"driver":"vhost-user-vga","id":"video0","max_outputs":1,"chardev= ":"chr-vu-video0","bus":"pci.0","addr":"0x2"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x3"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ diff --git a/tests/qemuxmlconfdata/vhost-vsock-auto.x86_64-latest.args b/te= sts/qemuxmlconfdata/vhost-vsock-auto.x86_64-latest.args index f6a8536b43..d16eabdd90 100644 --- a/tests/qemuxmlconfdata/vhost-vsock-auto.x86_64-latest.args +++ b/tests/qemuxmlconfdata/vhost-vsock-auto.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-test/.c= onfig \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/vhost-vsock-ccw-auto.s390x-latest.args b= /tests/qemuxmlconfdata/vhost-vsock-ccw-auto.s390x-latest.args index ed9714cec7..05b7f64523 100644 --- a/tests/qemuxmlconfdata/vhost-vsock-ccw-auto.s390x-latest.args +++ b/tests/qemuxmlconfdata/vhost-vsock-ccw-auto.s390x-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/vhost-vsock-ccw-iommu.s390x-latest.args = b/tests/qemuxmlconfdata/vhost-vsock-ccw-iommu.s390x-latest.args index f7c7371648..ec0f06e2f4 100644 --- a/tests/qemuxmlconfdata/vhost-vsock-ccw-iommu.s390x-latest.args +++ b/tests/qemuxmlconfdata/vhost-vsock-ccw-iommu.s390x-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/vhost-vsock-ccw.s390x-latest.args b/test= s/qemuxmlconfdata/vhost-vsock-ccw.s390x-latest.args index f56ba3b919..04c97134a4 100644 --- a/tests/qemuxmlconfdata/vhost-vsock-ccw.s390x-latest.args +++ b/tests/qemuxmlconfdata/vhost-vsock-ccw.s390x-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/vhost-vsock.x86_64-latest.args b/tests/q= emuxmlconfdata/vhost-vsock.x86_64-latest.args index f800c6788c..fcc1b74bd0 100644 --- a/tests/qemuxmlconfdata/vhost-vsock.x86_64-latest.args +++ b/tests/qemuxmlconfdata/vhost-vsock.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-test/.c= onfig \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/video-bochs-display-device.x86_64-latest= .args b/tests/qemuxmlconfdata/video-bochs-display-device.x86_64-latest.args index 893d1448db..97921f0414 100644 --- a/tests/qemuxmlconfdata/video-bochs-display-device.x86_64-latest.args +++ b/tests/qemuxmlconfdata/video-bochs-display-device.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/video-bochs-edid-none.x86_64-latest.args= b/tests/qemuxmlconfdata/video-bochs-edid-none.x86_64-latest.args index c2ba47e6e7..da3dfcd166 100644 --- a/tests/qemuxmlconfdata/video-bochs-edid-none.x86_64-latest.args +++ b/tests/qemuxmlconfdata/video-bochs-edid-none.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/video-bochs-edid-off.x86_64-latest.args = b/tests/qemuxmlconfdata/video-bochs-edid-off.x86_64-latest.args index 1b0835c59b..e4c5ac43e8 100644 --- a/tests/qemuxmlconfdata/video-bochs-edid-off.x86_64-latest.args +++ b/tests/qemuxmlconfdata/video-bochs-edid-off.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/video-bochs-edid-on.x86_64-latest.args b= /tests/qemuxmlconfdata/video-bochs-edid-on.x86_64-latest.args index 522aab4b14..ff8e263b6d 100644 --- a/tests/qemuxmlconfdata/video-bochs-edid-on.x86_64-latest.args +++ b/tests/qemuxmlconfdata/video-bochs-edid-on.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/video-device-pciaddr-default.x86_64-late= st.args b/tests/qemuxmlconfdata/video-device-pciaddr-default.x86_64-latest.= args index 09583d06f2..ff124bf000 100644 --- a/tests/qemuxmlconfdata/video-device-pciaddr-default.x86_64-latest.args +++ b/tests/qemuxmlconfdata/video-device-pciaddr-default.x86_64-latest.args @@ -20,7 +20,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -uuid cdbebdfa-1d6d-65c3-be0f-fd74b978a773 \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/video-none-device.x86_64-latest.args b/t= ests/qemuxmlconfdata/video-none-device.x86_64-latest.args index 10e8ae1880..94c269df53 100644 --- a/tests/qemuxmlconfdata/video-none-device.x86_64-latest.args +++ b/tests/qemuxmlconfdata/video-none-device.x86_64-latest.args @@ -20,7 +20,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/video-qxl-device-vgamem.x86_64-latest.ar= gs b/tests/qemuxmlconfdata/video-qxl-device-vgamem.x86_64-latest.args index 84b9f4f73e..8d1453ccba 100644 --- a/tests/qemuxmlconfdata/video-qxl-device-vgamem.x86_64-latest.args +++ b/tests/qemuxmlconfdata/video-qxl-device-vgamem.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/video-qxl-device-vram64.x86_64-latest.ar= gs b/tests/qemuxmlconfdata/video-qxl-device-vram64.x86_64-latest.args index 42a8197abe..635fe95fae 100644 --- a/tests/qemuxmlconfdata/video-qxl-device-vram64.x86_64-latest.args +++ b/tests/qemuxmlconfdata/video-qxl-device-vram64.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/video-qxl-device.x86_64-latest.args b/te= sts/qemuxmlconfdata/video-qxl-device.x86_64-latest.args index 84b9f4f73e..8d1453ccba 100644 --- a/tests/qemuxmlconfdata/video-qxl-device.x86_64-latest.args +++ b/tests/qemuxmlconfdata/video-qxl-device.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/video-qxl-heads.x86_64-latest.args b/tes= ts/qemuxmlconfdata/video-qxl-heads.x86_64-latest.args index e3319f3c48..87887998ac 100644 --- a/tests/qemuxmlconfdata/video-qxl-heads.x86_64-latest.args +++ b/tests/qemuxmlconfdata/video-qxl-heads.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/video-qxl-noheads.x86_64-latest.args b/t= ests/qemuxmlconfdata/video-qxl-noheads.x86_64-latest.args index 41aa82250f..c00f4452e2 100644 --- a/tests/qemuxmlconfdata/video-qxl-noheads.x86_64-latest.args +++ b/tests/qemuxmlconfdata/video-qxl-noheads.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/video-qxl-resolution.x86_64-latest.args = b/tests/qemuxmlconfdata/video-qxl-resolution.x86_64-latest.args index 721ef8dc0b..5a61a41593 100644 --- a/tests/qemuxmlconfdata/video-qxl-resolution.x86_64-latest.args +++ b/tests/qemuxmlconfdata/video-qxl-resolution.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/video-qxl-sec-device-vgamem.x86_64-lates= t.args b/tests/qemuxmlconfdata/video-qxl-sec-device-vgamem.x86_64-latest.ar= gs index 8040756044..7385968638 100644 --- a/tests/qemuxmlconfdata/video-qxl-sec-device-vgamem.x86_64-latest.args +++ b/tests/qemuxmlconfdata/video-qxl-sec-device-vgamem.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/video-qxl-sec-device-vram64.x86_64-lates= t.args b/tests/qemuxmlconfdata/video-qxl-sec-device-vram64.x86_64-latest.ar= gs index 34f88d4cc5..80ad486061 100644 --- a/tests/qemuxmlconfdata/video-qxl-sec-device-vram64.x86_64-latest.args +++ b/tests/qemuxmlconfdata/video-qxl-sec-device-vram64.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/video-qxl-sec-device.x86_64-latest.args = b/tests/qemuxmlconfdata/video-qxl-sec-device.x86_64-latest.args index 8040756044..7385968638 100644 --- a/tests/qemuxmlconfdata/video-qxl-sec-device.x86_64-latest.args +++ b/tests/qemuxmlconfdata/video-qxl-sec-device.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/video-ramfb-display-device.x86_64-latest= .args b/tests/qemuxmlconfdata/video-ramfb-display-device.x86_64-latest.args index 0a52f9dc08..cfbbd5c921 100644 --- a/tests/qemuxmlconfdata/video-ramfb-display-device.x86_64-latest.args +++ b/tests/qemuxmlconfdata/video-ramfb-display-device.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/video-vga-device-vgamem.x86_64-latest.ar= gs b/tests/qemuxmlconfdata/video-vga-device-vgamem.x86_64-latest.args index f5bc6a1dcf..400b39104b 100644 --- a/tests/qemuxmlconfdata/video-vga-device-vgamem.x86_64-latest.args +++ b/tests/qemuxmlconfdata/video-vga-device-vgamem.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/video-vga-device.x86_64-latest.args b/te= sts/qemuxmlconfdata/video-vga-device.x86_64-latest.args index f5bc6a1dcf..400b39104b 100644 --- a/tests/qemuxmlconfdata/video-vga-device.x86_64-latest.args +++ b/tests/qemuxmlconfdata/video-vga-device.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/video-vga-edid-none.x86_64-latest.args b= /tests/qemuxmlconfdata/video-vga-edid-none.x86_64-latest.args index 0720c75549..29487e9e50 100644 --- a/tests/qemuxmlconfdata/video-vga-edid-none.x86_64-latest.args +++ b/tests/qemuxmlconfdata/video-vga-edid-none.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/video-vga-edid-off.x86_64-latest.args b/= tests/qemuxmlconfdata/video-vga-edid-off.x86_64-latest.args index b8af7d4af7..f3481bae44 100644 --- a/tests/qemuxmlconfdata/video-vga-edid-off.x86_64-latest.args +++ b/tests/qemuxmlconfdata/video-vga-edid-off.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/video-vga-edid-on.x86_64-latest.args b/t= ests/qemuxmlconfdata/video-vga-edid-on.x86_64-latest.args index 7c4145688c..4fb0d7477b 100644 --- a/tests/qemuxmlconfdata/video-vga-edid-on.x86_64-latest.args +++ b/tests/qemuxmlconfdata/video-vga-edid-on.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/video-vga-qxl-heads.x86_64-latest.args b= /tests/qemuxmlconfdata/video-vga-qxl-heads.x86_64-latest.args index e3319f3c48..87887998ac 100644 --- a/tests/qemuxmlconfdata/video-vga-qxl-heads.x86_64-latest.args +++ b/tests/qemuxmlconfdata/video-vga-qxl-heads.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/video-virtio-blob-off.x86_64-latest.args= b/tests/qemuxmlconfdata/video-virtio-blob-off.x86_64-latest.args index 837d5055c1..daeb7c64dc 100644 --- a/tests/qemuxmlconfdata/video-virtio-blob-off.x86_64-latest.args +++ b/tests/qemuxmlconfdata/video-virtio-blob-off.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/video-virtio-blob-on.x86_64-latest.args = b/tests/qemuxmlconfdata/video-virtio-blob-on.x86_64-latest.args index 172bd372e1..a9cea4fb41 100644 --- a/tests/qemuxmlconfdata/video-virtio-blob-on.x86_64-latest.args +++ b/tests/qemuxmlconfdata/video-virtio-blob-on.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/video-virtio-edid-none.x86_64-latest.arg= s b/tests/qemuxmlconfdata/video-virtio-edid-none.x86_64-latest.args index b0f4ec660b..05a522bd13 100644 --- a/tests/qemuxmlconfdata/video-virtio-edid-none.x86_64-latest.args +++ b/tests/qemuxmlconfdata/video-virtio-edid-none.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/video-virtio-edid-off.x86_64-latest.args= b/tests/qemuxmlconfdata/video-virtio-edid-off.x86_64-latest.args index c63978111b..576803a41f 100644 --- a/tests/qemuxmlconfdata/video-virtio-edid-off.x86_64-latest.args +++ b/tests/qemuxmlconfdata/video-virtio-edid-off.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/video-virtio-edid-on.x86_64-latest.args = b/tests/qemuxmlconfdata/video-virtio-edid-on.x86_64-latest.args index fba5ffc1c1..e7bd9401be 100644 --- a/tests/qemuxmlconfdata/video-virtio-edid-on.x86_64-latest.args +++ b/tests/qemuxmlconfdata/video-virtio-edid-on.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/video-virtio-gpu-ccw-auto.s390x-latest.a= rgs b/tests/qemuxmlconfdata/video-virtio-gpu-ccw-auto.s390x-latest.args index 935aa07144..90d8866923 100644 --- a/tests/qemuxmlconfdata/video-virtio-gpu-ccw-auto.s390x-latest.args +++ b/tests/qemuxmlconfdata/video-virtio-gpu-ccw-auto.s390x-latest.args @@ -20,7 +20,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1803 \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/video-virtio-gpu-ccw.s390x-latest.args b= /tests/qemuxmlconfdata/video-virtio-gpu-ccw.s390x-latest.args index 1da8f0ab68..e35052d8e2 100644 --- a/tests/qemuxmlconfdata/video-virtio-gpu-ccw.s390x-latest.args +++ b/tests/qemuxmlconfdata/video-virtio-gpu-ccw.s390x-latest.args @@ -20,7 +20,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1803 \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/video-virtio-gpu-device.x86_64-latest.ar= gs b/tests/qemuxmlconfdata/video-virtio-gpu-device.x86_64-latest.args index fec2b04ca9..74b64b3c91 100644 --- a/tests/qemuxmlconfdata/video-virtio-gpu-device.x86_64-latest.args +++ b/tests/qemuxmlconfdata/video-virtio-gpu-device.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/video-virtio-gpu-sdl-gl.x86_64-latest.ar= gs b/tests/qemuxmlconfdata/video-virtio-gpu-sdl-gl.x86_64-latest.args index 9ab281a94d..1acbc159f1 100644 --- a/tests/qemuxmlconfdata/video-virtio-gpu-sdl-gl.x86_64-latest.args +++ b/tests/qemuxmlconfdata/video-virtio-gpu-sdl-gl.x86_64-latest.args @@ -20,7 +20,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/video-virtio-gpu-secondary.x86_64-latest= .args b/tests/qemuxmlconfdata/video-virtio-gpu-secondary.x86_64-latest.args index 68aabbec28..67c9c4fcbb 100644 --- a/tests/qemuxmlconfdata/video-virtio-gpu-secondary.x86_64-latest.args +++ b/tests/qemuxmlconfdata/video-virtio-gpu-secondary.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/video-virtio-gpu-spice-gl.x86_64-latest.= args b/tests/qemuxmlconfdata/video-virtio-gpu-spice-gl.x86_64-latest.args index 7a2a85f863..5224433d91 100644 --- a/tests/qemuxmlconfdata/video-virtio-gpu-spice-gl.x86_64-latest.args +++ b/tests/qemuxmlconfdata/video-virtio-gpu-spice-gl.x86_64-latest.args @@ -20,7 +20,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/video-virtio-gpu-virgl.x86_64-latest.arg= s b/tests/qemuxmlconfdata/video-virtio-gpu-virgl.x86_64-latest.args index 5cd1b7998b..d7e683a734 100644 --- a/tests/qemuxmlconfdata/video-virtio-gpu-virgl.x86_64-latest.args +++ b/tests/qemuxmlconfdata/video-virtio-gpu-virgl.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/video-virtio-vga-gpu-gl.x86_64-latest.ar= gs b/tests/qemuxmlconfdata/video-virtio-vga-gpu-gl.x86_64-latest.args index e4ecf34124..d9096cfc1b 100644 --- a/tests/qemuxmlconfdata/video-virtio-vga-gpu-gl.x86_64-latest.args +++ b/tests/qemuxmlconfdata/video-virtio-vga-gpu-gl.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/video-virtio-vga.x86_64-latest.args b/te= sts/qemuxmlconfdata/video-virtio-vga.x86_64-latest.args index fec2b04ca9..74b64b3c91 100644 --- a/tests/qemuxmlconfdata/video-virtio-vga.x86_64-latest.args +++ b/tests/qemuxmlconfdata/video-virtio-vga.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/virtio-9p-createmode.x86_64-latest.args = b/tests/qemuxmlconfdata/virtio-9p-createmode.x86_64-latest.args index 8bc391a4fe..c9499b2098 100644 --- a/tests/qemuxmlconfdata/virtio-9p-createmode.x86_64-latest.args +++ b/tests/qemuxmlconfdata/virtio-9p-createmode.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/virtio-9p-multidevs.x86_64-latest.args b= /tests/qemuxmlconfdata/virtio-9p-multidevs.x86_64-latest.args index 31b51f30c8..2c3584a99e 100644 --- a/tests/qemuxmlconfdata/virtio-9p-multidevs.x86_64-latest.args +++ b/tests/qemuxmlconfdata/virtio-9p-multidevs.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/virtio-input-passthrough.x86_64-latest.a= rgs b/tests/qemuxmlconfdata/virtio-input-passthrough.x86_64-latest.args index 31f434b150..04c8a29191 100644 --- a/tests/qemuxmlconfdata/virtio-input-passthrough.x86_64-latest.args +++ b/tests/qemuxmlconfdata/virtio-input-passthrough.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/virtio-input.x86_64-latest.args b/tests/= qemuxmlconfdata/virtio-input.x86_64-latest.args index 20439c7de1..02afdf6506 100644 --- a/tests/qemuxmlconfdata/virtio-input.x86_64-latest.args +++ b/tests/qemuxmlconfdata/virtio-input.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/virtio-iommu-aarch64.aarch64-latest.args= b/tests/qemuxmlconfdata/virtio-iommu-aarch64.aarch64-latest.args index 3c9cc0e9d1..42f65d7805 100644 --- a/tests/qemuxmlconfdata/virtio-iommu-aarch64.aarch64-latest.args +++ b/tests/qemuxmlconfdata/virtio-iommu-aarch64.aarch64-latest.args @@ -23,7 +23,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/virtio-iommu-x86_64.x86_64-latest.args b= /tests/qemuxmlconfdata/virtio-iommu-x86_64.x86_64-latest.args index 0d49128149..7706aa3905 100644 --- a/tests/qemuxmlconfdata/virtio-iommu-x86_64.x86_64-latest.args +++ b/tests/qemuxmlconfdata/virtio-iommu-x86_64.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/virtio-lun.x86_64-9.0.0.args b/tests/qem= uxmlconfdata/virtio-lun.x86_64-9.0.0.args index b95698f58d..318669d956 100644 --- a/tests/qemuxmlconfdata/virtio-lun.x86_64-9.0.0.args +++ b/tests/qemuxmlconfdata/virtio-lun.x86_64-9.0.0.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-test/.c= onfig \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/virtio-non-transitional.x86_64-latest.ar= gs b/tests/qemuxmlconfdata/virtio-non-transitional.x86_64-latest.args index b529c798db..955390e23b 100644 --- a/tests/qemuxmlconfdata/virtio-non-transitional.x86_64-latest.args +++ b/tests/qemuxmlconfdata/virtio-non-transitional.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/virtio-options-controller-ats.x86_64-lat= est.args b/tests/qemuxmlconfdata/virtio-options-controller-ats.x86_64-lates= t.args index a5ed1cbb41..1723c24d04 100644 --- a/tests/qemuxmlconfdata/virtio-options-controller-ats.x86_64-latest.args +++ b/tests/qemuxmlconfdata/virtio-options-controller-ats.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/virtio-options-controller-iommu.x86_64-l= atest.args b/tests/qemuxmlconfdata/virtio-options-controller-iommu.x86_64-l= atest.args index 4193dc043d..a55ff345a3 100644 --- a/tests/qemuxmlconfdata/virtio-options-controller-iommu.x86_64-latest.a= rgs +++ b/tests/qemuxmlconfdata/virtio-options-controller-iommu.x86_64-latest.a= rgs @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/virtio-options-controller-packed.x86_64-= latest.args b/tests/qemuxmlconfdata/virtio-options-controller-packed.x86_64= -latest.args index 069e1179b4..644283b585 100644 --- a/tests/qemuxmlconfdata/virtio-options-controller-packed.x86_64-latest.= args +++ b/tests/qemuxmlconfdata/virtio-options-controller-packed.x86_64-latest.= args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/virtio-options-disk-ats.x86_64-latest.ar= gs b/tests/qemuxmlconfdata/virtio-options-disk-ats.x86_64-latest.args index a165eab675..58750eb659 100644 --- a/tests/qemuxmlconfdata/virtio-options-disk-ats.x86_64-latest.args +++ b/tests/qemuxmlconfdata/virtio-options-disk-ats.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/virtio-options-disk-iommu.x86_64-latest.= args b/tests/qemuxmlconfdata/virtio-options-disk-iommu.x86_64-latest.args index 8714d6ef42..42eace3f23 100644 --- a/tests/qemuxmlconfdata/virtio-options-disk-iommu.x86_64-latest.args +++ b/tests/qemuxmlconfdata/virtio-options-disk-iommu.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/virtio-options-disk-packed.x86_64-latest= .args b/tests/qemuxmlconfdata/virtio-options-disk-packed.x86_64-latest.args index f84b9c2433..ac6e4badaa 100644 --- a/tests/qemuxmlconfdata/virtio-options-disk-packed.x86_64-latest.args +++ b/tests/qemuxmlconfdata/virtio-options-disk-packed.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/virtio-options-fs-ats.x86_64-latest.args= b/tests/qemuxmlconfdata/virtio-options-fs-ats.x86_64-latest.args index 2c88713004..eb9d3b0fdb 100644 --- a/tests/qemuxmlconfdata/virtio-options-fs-ats.x86_64-latest.args +++ b/tests/qemuxmlconfdata/virtio-options-fs-ats.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/virtio-options-fs-iommu.x86_64-latest.ar= gs b/tests/qemuxmlconfdata/virtio-options-fs-iommu.x86_64-latest.args index f94345baec..6d43517b23 100644 --- a/tests/qemuxmlconfdata/virtio-options-fs-iommu.x86_64-latest.args +++ b/tests/qemuxmlconfdata/virtio-options-fs-iommu.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/virtio-options-fs-packed.x86_64-latest.a= rgs b/tests/qemuxmlconfdata/virtio-options-fs-packed.x86_64-latest.args index 708d2ea207..11e366d2b0 100644 --- a/tests/qemuxmlconfdata/virtio-options-fs-packed.x86_64-latest.args +++ b/tests/qemuxmlconfdata/virtio-options-fs-packed.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/virtio-options-input-ats.x86_64-latest.a= rgs b/tests/qemuxmlconfdata/virtio-options-input-ats.x86_64-latest.args index fe93032cb2..93a7219ac1 100644 --- a/tests/qemuxmlconfdata/virtio-options-input-ats.x86_64-latest.args +++ b/tests/qemuxmlconfdata/virtio-options-input-ats.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/virtio-options-input-iommu.x86_64-latest= .args b/tests/qemuxmlconfdata/virtio-options-input-iommu.x86_64-latest.args index cdad9633d6..c41bad1d36 100644 --- a/tests/qemuxmlconfdata/virtio-options-input-iommu.x86_64-latest.args +++ b/tests/qemuxmlconfdata/virtio-options-input-iommu.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/virtio-options-input-packed.x86_64-lates= t.args b/tests/qemuxmlconfdata/virtio-options-input-packed.x86_64-latest.ar= gs index 80e290f77e..83b6d4dd8a 100644 --- a/tests/qemuxmlconfdata/virtio-options-input-packed.x86_64-latest.args +++ b/tests/qemuxmlconfdata/virtio-options-input-packed.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/virtio-options-memballoon-ats.x86_64-lat= est.args b/tests/qemuxmlconfdata/virtio-options-memballoon-ats.x86_64-lates= t.args index 7805be0666..23fad7b10e 100644 --- a/tests/qemuxmlconfdata/virtio-options-memballoon-ats.x86_64-latest.args +++ b/tests/qemuxmlconfdata/virtio-options-memballoon-ats.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/virtio-options-memballoon-freepage-repor= ting.x86_64-latest.args b/tests/qemuxmlconfdata/virtio-options-memballoon-f= reepage-reporting.x86_64-latest.args index 1921441359..3506eff224 100644 --- a/tests/qemuxmlconfdata/virtio-options-memballoon-freepage-reporting.x8= 6_64-latest.args +++ b/tests/qemuxmlconfdata/virtio-options-memballoon-freepage-reporting.x8= 6_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/virtio-options-memballoon-iommu.x86_64-l= atest.args b/tests/qemuxmlconfdata/virtio-options-memballoon-iommu.x86_64-l= atest.args index 82fadcfc19..b1e3b366f5 100644 --- a/tests/qemuxmlconfdata/virtio-options-memballoon-iommu.x86_64-latest.a= rgs +++ b/tests/qemuxmlconfdata/virtio-options-memballoon-iommu.x86_64-latest.a= rgs @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/virtio-options-memballoon-packed.x86_64-= latest.args b/tests/qemuxmlconfdata/virtio-options-memballoon-packed.x86_64= -latest.args index 1eadfdb9ab..61ca7f73a9 100644 --- a/tests/qemuxmlconfdata/virtio-options-memballoon-packed.x86_64-latest.= args +++ b/tests/qemuxmlconfdata/virtio-options-memballoon-packed.x86_64-latest.= args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/virtio-options-net-ats.x86_64-latest.arg= s b/tests/qemuxmlconfdata/virtio-options-net-ats.x86_64-latest.args index 0c27d4b9b7..65cc6f259e 100644 --- a/tests/qemuxmlconfdata/virtio-options-net-ats.x86_64-latest.args +++ b/tests/qemuxmlconfdata/virtio-options-net-ats.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/virtio-options-net-iommu.x86_64-latest.a= rgs b/tests/qemuxmlconfdata/virtio-options-net-iommu.x86_64-latest.args index de8862357e..efd2c923ad 100644 --- a/tests/qemuxmlconfdata/virtio-options-net-iommu.x86_64-latest.args +++ b/tests/qemuxmlconfdata/virtio-options-net-iommu.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/virtio-options-net-packed.x86_64-latest.= args b/tests/qemuxmlconfdata/virtio-options-net-packed.x86_64-latest.args index 3d1270a180..38f5c91de9 100644 --- a/tests/qemuxmlconfdata/virtio-options-net-packed.x86_64-latest.args +++ b/tests/qemuxmlconfdata/virtio-options-net-packed.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/virtio-options-rng-ats.x86_64-latest.arg= s b/tests/qemuxmlconfdata/virtio-options-rng-ats.x86_64-latest.args index bb9f95c150..f6b71bca40 100644 --- a/tests/qemuxmlconfdata/virtio-options-rng-ats.x86_64-latest.args +++ b/tests/qemuxmlconfdata/virtio-options-rng-ats.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/virtio-options-rng-iommu.x86_64-latest.a= rgs b/tests/qemuxmlconfdata/virtio-options-rng-iommu.x86_64-latest.args index ea4d2cb533..d594c67210 100644 --- a/tests/qemuxmlconfdata/virtio-options-rng-iommu.x86_64-latest.args +++ b/tests/qemuxmlconfdata/virtio-options-rng-iommu.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/virtio-options-rng-packed.x86_64-latest.= args b/tests/qemuxmlconfdata/virtio-options-rng-packed.x86_64-latest.args index f18355db9d..5aa1fb79b1 100644 --- a/tests/qemuxmlconfdata/virtio-options-rng-packed.x86_64-latest.args +++ b/tests/qemuxmlconfdata/virtio-options-rng-packed.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/virtio-options-video-ats.x86_64-latest.a= rgs b/tests/qemuxmlconfdata/virtio-options-video-ats.x86_64-latest.args index a6ac54961a..3b6e9e43af 100644 --- a/tests/qemuxmlconfdata/virtio-options-video-ats.x86_64-latest.args +++ b/tests/qemuxmlconfdata/virtio-options-video-ats.x86_64-latest.args @@ -21,16 +21,16 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUG= uest1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ --chardev socket,id=3Dchr-vu-video0,fd=3D1729 \ +-chardev socket,id=3Dchr-vu-video0,fd=3DXXXXXXX \ -device '{"driver":"vhost-user-vga","id":"video0","max_outputs":1,"chardev= ":"chr-vu-video0","bus":"pci.0","addr":"0x2"}' \ --chardev socket,id=3Dchr-vu-video1,fd=3D1729 \ +-chardev socket,id=3Dchr-vu-video1,fd=3DXXXXXXX \ -device '{"driver":"vhost-user-gpu-pci","ats":false,"id":"video1","max_out= puts":1,"chardev":"chr-vu-video1","bus":"pci.0","addr":"0x3"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x4"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ diff --git a/tests/qemuxmlconfdata/virtio-options-video-iommu.x86_64-latest= .args b/tests/qemuxmlconfdata/virtio-options-video-iommu.x86_64-latest.args index f515669f17..c37c260a7c 100644 --- a/tests/qemuxmlconfdata/virtio-options-video-iommu.x86_64-latest.args +++ b/tests/qemuxmlconfdata/virtio-options-video-iommu.x86_64-latest.args @@ -21,16 +21,16 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUG= uest1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ --chardev socket,id=3Dchr-vu-video0,fd=3D1729 \ +-chardev socket,id=3Dchr-vu-video0,fd=3DXXXXXXX \ -device '{"driver":"vhost-user-vga","id":"video0","max_outputs":1,"chardev= ":"chr-vu-video0","bus":"pci.0","addr":"0x2"}' \ --chardev socket,id=3Dchr-vu-video1,fd=3D1729 \ +-chardev socket,id=3Dchr-vu-video1,fd=3DXXXXXXX \ -device '{"driver":"vhost-user-gpu-pci","iommu_platform":false,"id":"video= 1","max_outputs":1,"chardev":"chr-vu-video1","bus":"pci.0","addr":"0x3"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x4"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ diff --git a/tests/qemuxmlconfdata/virtio-options-video-packed.x86_64-lates= t.args b/tests/qemuxmlconfdata/virtio-options-video-packed.x86_64-latest.ar= gs index f0eefd1a5f..9ef03eaa0f 100644 --- a/tests/qemuxmlconfdata/virtio-options-video-packed.x86_64-latest.args +++ b/tests/qemuxmlconfdata/virtio-options-video-packed.x86_64-latest.args @@ -21,16 +21,16 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUG= uest1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ --chardev socket,id=3Dchr-vu-video0,fd=3D1729 \ +-chardev socket,id=3Dchr-vu-video0,fd=3DXXXXXXX \ -device '{"driver":"vhost-user-vga","id":"video0","max_outputs":1,"chardev= ":"chr-vu-video0","bus":"pci.0","addr":"0x2"}' \ --chardev socket,id=3Dchr-vu-video1,fd=3D1729 \ +-chardev socket,id=3Dchr-vu-video1,fd=3DXXXXXXX \ -device '{"driver":"vhost-user-gpu-pci","packed":false,"id":"video1","max_= outputs":1,"chardev":"chr-vu-video1","bus":"pci.0","addr":"0x3"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x4"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ diff --git a/tests/qemuxmlconfdata/virtio-options.x86_64-latest.args b/test= s/qemuxmlconfdata/virtio-options.x86_64-latest.args index 0f65cefd57..4cb38ae04f 100644 --- a/tests/qemuxmlconfdata/virtio-options.x86_64-latest.args +++ b/tests/qemuxmlconfdata/virtio-options.x86_64-latest.args @@ -22,7 +22,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ @@ -45,7 +45,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -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":"audio1","driver":"none"}' \ --chardev socket,id=3Dchr-vu-video0,fd=3D1729 \ +-chardev socket,id=3Dchr-vu-video0,fd=3DXXXXXXX \ -device '{"driver":"vhost-user-vga","id":"video0","max_outputs":1,"chardev= ":"chr-vu-video0","bus":"pci.0","addr":"0x2"}' \ -device '{"driver":"virtio-balloon-pci","iommu_platform":true,"ats":true,"= packed":true,"page-per-vq":true,"id":"balloon0","bus":"pci.0","addr":"0xc"}= ' \ -object '{"qom-type":"rng-random","id":"objrng0","filename":"/dev/random"}= ' \ diff --git a/tests/qemuxmlconfdata/virtio-rng-builtin.x86_64-latest.args b/= tests/qemuxmlconfdata/virtio-rng-builtin.x86_64-latest.args index 2126b014d8..83d1fa30be 100644 --- a/tests/qemuxmlconfdata/virtio-rng-builtin.x86_64-latest.args +++ b/tests/qemuxmlconfdata/virtio-rng-builtin.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/virtio-rng-ccw.s390x-latest.args b/tests= /qemuxmlconfdata/virtio-rng-ccw.s390x-latest.args index fe120c9b9c..5e1892510b 100644 --- a/tests/qemuxmlconfdata/virtio-rng-ccw.s390x-latest.args +++ b/tests/qemuxmlconfdata/virtio-rng-ccw.s390x-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/virtio-rng-default.x86_64-latest.args b/= tests/qemuxmlconfdata/virtio-rng-default.x86_64-latest.args index 48e845fec0..8f0ca84d04 100644 --- a/tests/qemuxmlconfdata/virtio-rng-default.x86_64-latest.args +++ b/tests/qemuxmlconfdata/virtio-rng-default.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/virtio-rng-egd-unix.x86_64-latest.args b= /tests/qemuxmlconfdata/virtio-rng-egd-unix.x86_64-latest.args index 94823c8a69..c90f2161bf 100644 --- a/tests/qemuxmlconfdata/virtio-rng-egd-unix.x86_64-latest.args +++ b/tests/qemuxmlconfdata/virtio-rng-egd-unix.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ @@ -29,7 +29,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ -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 \ +-chardev socket,id=3Dcharrng0,fd=3DXXXXXXX,server=3Don,wait=3Doff \ -object '{"qom-type":"rng-egd","id":"objrng0","chardev":"charrng0"}' \ -device '{"driver":"virtio-rng-pci","rng":"objrng0","id":"rng0","bus":"pci= .0","addr":"0x3"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ diff --git a/tests/qemuxmlconfdata/virtio-rng-egd.x86_64-latest.args b/test= s/qemuxmlconfdata/virtio-rng-egd.x86_64-latest.args index 5e2f9c928d..a570b2a865 100644 --- a/tests/qemuxmlconfdata/virtio-rng-egd.x86_64-latest.args +++ b/tests/qemuxmlconfdata/virtio-rng-egd.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/virtio-rng-multiple.x86_64-latest.args b= /tests/qemuxmlconfdata/virtio-rng-multiple.x86_64-latest.args index 4eae536074..1b884c93d2 100644 --- a/tests/qemuxmlconfdata/virtio-rng-multiple.x86_64-latest.args +++ b/tests/qemuxmlconfdata/virtio-rng-multiple.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/virtio-rng-random.x86_64-latest.args b/t= ests/qemuxmlconfdata/virtio-rng-random.x86_64-latest.args index 252730c85b..76463ca9d5 100644 --- a/tests/qemuxmlconfdata/virtio-rng-random.x86_64-latest.args +++ b/tests/qemuxmlconfdata/virtio-rng-random.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/virtio-transitional.x86_64-latest.args b= /tests/qemuxmlconfdata/virtio-transitional.x86_64-latest.args index c92eb58f61..e54eea6164 100644 --- a/tests/qemuxmlconfdata/virtio-transitional.x86_64-latest.args +++ b/tests/qemuxmlconfdata/virtio-transitional.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/vmcoreinfo.x86_64-latest.args b/tests/qe= muxmlconfdata/vmcoreinfo.x86_64-latest.args index 35aaa0d401..ec60e9764c 100644 --- a/tests/qemuxmlconfdata/vmcoreinfo.x86_64-latest.args +++ b/tests/qemuxmlconfdata/vmcoreinfo.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/watchdog-device.x86_64-latest.args b/tes= ts/qemuxmlconfdata/watchdog-device.x86_64-latest.args index f4e34880be..9854a4f64f 100644 --- a/tests/qemuxmlconfdata/watchdog-device.x86_64-latest.args +++ b/tests/qemuxmlconfdata/watchdog-device.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/watchdog-diag288.s390x-latest.args b/tes= ts/qemuxmlconfdata/watchdog-diag288.s390x-latest.args index f4f9ec15fb..465ec4aa8c 100644 --- a/tests/qemuxmlconfdata/watchdog-diag288.s390x-latest.args +++ b/tests/qemuxmlconfdata/watchdog-diag288.s390x-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/watchdog-dump.x86_64-latest.args b/tests= /qemuxmlconfdata/watchdog-dump.x86_64-latest.args index c97d6c87b4..f010299994 100644 --- a/tests/qemuxmlconfdata/watchdog-dump.x86_64-latest.args +++ b/tests/qemuxmlconfdata/watchdog-dump.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/watchdog-injectnmi.x86_64-latest.args b/= tests/qemuxmlconfdata/watchdog-injectnmi.x86_64-latest.args index bf757d8369..56329a57c9 100644 --- a/tests/qemuxmlconfdata/watchdog-injectnmi.x86_64-latest.args +++ b/tests/qemuxmlconfdata/watchdog-injectnmi.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/watchdog-q35-multiple.x86_64-latest.args= b/tests/qemuxmlconfdata/watchdog-q35-multiple.x86_64-latest.args index b790bb1f76..fe45a52e60 100644 --- a/tests/qemuxmlconfdata/watchdog-q35-multiple.x86_64-latest.args +++ b/tests/qemuxmlconfdata/watchdog-q35-multiple.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/watchdog.x86_64-latest.args b/tests/qemu= xmlconfdata/watchdog.x86_64-latest.args index b64d5454ac..d53cb5b4eb 100644 --- a/tests/qemuxmlconfdata/watchdog.x86_64-latest.args +++ b/tests/qemuxmlconfdata/watchdog.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/x86-kvm-32-on-64.x86_64-latest.args b/te= sts/qemuxmlconfdata/x86-kvm-32-on-64.x86_64-latest.args index 2bd5e8bde6..5cbcc96cea 100644 --- a/tests/qemuxmlconfdata/x86-kvm-32-on-64.x86_64-latest.args +++ b/tests/qemuxmlconfdata/x86-kvm-32-on-64.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-kvm/.co= nfig \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/x86_64-default-cpu-kvm-pc.x86_64-latest.= args b/tests/qemuxmlconfdata/x86_64-default-cpu-kvm-pc.x86_64-latest.args index eb3d834a6c..86670453d6 100644 --- a/tests/qemuxmlconfdata/x86_64-default-cpu-kvm-pc.x86_64-latest.args +++ b/tests/qemuxmlconfdata/x86_64-default-cpu-kvm-pc.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/x86_64-default-cpu-kvm-q35.x86_64-latest= .args b/tests/qemuxmlconfdata/x86_64-default-cpu-kvm-q35.x86_64-latest.args index c82cf98fd2..5a723d870a 100644 --- a/tests/qemuxmlconfdata/x86_64-default-cpu-kvm-q35.x86_64-latest.args +++ b/tests/qemuxmlconfdata/x86_64-default-cpu-kvm-q35.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/x86_64-default-cpu-tcg-features.x86_64-l= atest.args b/tests/qemuxmlconfdata/x86_64-default-cpu-tcg-features.x86_64-l= atest.args index 14a3fbc6b4..8166955cfa 100644 --- a/tests/qemuxmlconfdata/x86_64-default-cpu-tcg-features.x86_64-latest.a= rgs +++ b/tests/qemuxmlconfdata/x86_64-default-cpu-tcg-features.x86_64-latest.a= rgs @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/x86_64-default-cpu-tcg-pc.x86_64-latest.= args b/tests/qemuxmlconfdata/x86_64-default-cpu-tcg-pc.x86_64-latest.args index a8fb64384c..d998826d94 100644 --- a/tests/qemuxmlconfdata/x86_64-default-cpu-tcg-pc.x86_64-latest.args +++ b/tests/qemuxmlconfdata/x86_64-default-cpu-tcg-pc.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/x86_64-default-cpu-tcg-q35.x86_64-latest= .args b/tests/qemuxmlconfdata/x86_64-default-cpu-tcg-q35.x86_64-latest.args index 33981e6dd0..be243e911f 100644 --- a/tests/qemuxmlconfdata/x86_64-default-cpu-tcg-q35.x86_64-latest.args +++ b/tests/qemuxmlconfdata/x86_64-default-cpu-tcg-q35.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/x86_64-pc-default-models.x86_64-latest.a= bi-update.args b/tests/qemuxmlconfdata/x86_64-pc-default-models.x86_64-late= st.abi-update.args index 6563b05937..06a0622f98 100644 --- a/tests/qemuxmlconfdata/x86_64-pc-default-models.x86_64-latest.abi-upda= te.args +++ b/tests/qemuxmlconfdata/x86_64-pc-default-models.x86_64-latest.abi-upda= te.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/x86_64-pc-default-models.x86_64-latest.a= rgs b/tests/qemuxmlconfdata/x86_64-pc-default-models.x86_64-latest.args index 6563b05937..06a0622f98 100644 --- a/tests/qemuxmlconfdata/x86_64-pc-default-models.x86_64-latest.args +++ b/tests/qemuxmlconfdata/x86_64-pc-default-models.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/x86_64-pc-graphics.x86_64-latest.args b/= tests/qemuxmlconfdata/x86_64-pc-graphics.x86_64-latest.args index 45f33f6f31..2e564abb3e 100644 --- a/tests/qemuxmlconfdata/x86_64-pc-graphics.x86_64-latest.args +++ b/tests/qemuxmlconfdata/x86_64-pc-graphics.x86_64-latest.args @@ -20,7 +20,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -uuid 2c0abd3d-8f18-42c0-a132-9708213aaac9 \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc,driftfix=3Dslew \ -global kvm-pit.lost_tick_policy=3Ddelay \ @@ -37,7 +37,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -device '{"driver":"virtio-net-pci","netdev":"hostnet0","id":"net0","mac":= "52:54:00:4c:e3:86","bus":"pci.0","addr":"0x3"}' \ -chardev pty,id=3Dcharserial0 \ -device '{"driver":"isa-serial","chardev":"charserial0","id":"serial0","in= dex":0}' \ --chardev socket,id=3Dcharchannel0,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharchannel0,fd=3DXXXXXXX,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":"audio1","driver":"none"}' \ diff --git a/tests/qemuxmlconfdata/x86_64-pc-headless.x86_64-latest.args b/= tests/qemuxmlconfdata/x86_64-pc-headless.x86_64-latest.args index 7ed7d8d19d..648a693721 100644 --- a/tests/qemuxmlconfdata/x86_64-pc-headless.x86_64-latest.args +++ b/tests/qemuxmlconfdata/x86_64-pc-headless.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc,driftfix=3Dslew \ -global kvm-pit.lost_tick_policy=3Ddelay \ @@ -38,7 +38,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -device '{"driver":"virtio-net-pci","netdev":"hostnet0","id":"net0","mac":= "52:54:00:09:a4:37","bus":"pci.0","addr":"0x2"}' \ -chardev pty,id=3Dcharserial0 \ -device '{"driver":"isa-serial","chardev":"charserial0","id":"serial0","in= dex":0}' \ --chardev socket,id=3Dcharchannel0,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharchannel0,fd=3DXXXXXXX,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":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x6"}' \ diff --git a/tests/qemuxmlconfdata/x86_64-pc-minimal.x86_64-latest.abi-upda= te.args b/tests/qemuxmlconfdata/x86_64-pc-minimal.x86_64-latest.abi-update.= args index 606fd70519..9147e03d05 100644 --- a/tests/qemuxmlconfdata/x86_64-pc-minimal.x86_64-latest.abi-update.args +++ b/tests/qemuxmlconfdata/x86_64-pc-minimal.x86_64-latest.abi-update.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/x86_64-pc-minimal.x86_64-latest.args b/t= ests/qemuxmlconfdata/x86_64-pc-minimal.x86_64-latest.args index 606fd70519..9147e03d05 100644 --- a/tests/qemuxmlconfdata/x86_64-pc-minimal.x86_64-latest.args +++ b/tests/qemuxmlconfdata/x86_64-pc-minimal.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/x86_64-q35-default-models.x86_64-latest.= abi-update.args b/tests/qemuxmlconfdata/x86_64-q35-default-models.x86_64-la= test.abi-update.args index 29ea0bedac..79e4fe78ee 100644 --- a/tests/qemuxmlconfdata/x86_64-q35-default-models.x86_64-latest.abi-upd= ate.args +++ b/tests/qemuxmlconfdata/x86_64-q35-default-models.x86_64-latest.abi-upd= ate.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/x86_64-q35-default-models.x86_64-latest.= args b/tests/qemuxmlconfdata/x86_64-q35-default-models.x86_64-latest.args index 29ea0bedac..79e4fe78ee 100644 --- a/tests/qemuxmlconfdata/x86_64-q35-default-models.x86_64-latest.args +++ b/tests/qemuxmlconfdata/x86_64-q35-default-models.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/x86_64-q35-graphics.x86_64-latest.args b= /tests/qemuxmlconfdata/x86_64-q35-graphics.x86_64-latest.args index 419714b6d1..2fb82f684d 100644 --- a/tests/qemuxmlconfdata/x86_64-q35-graphics.x86_64-latest.args +++ b/tests/qemuxmlconfdata/x86_64-q35-graphics.x86_64-latest.args @@ -20,7 +20,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -uuid 61288c03-0b0d-4f1e-9496-0f0256f2e013 \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc,driftfix=3Dslew \ -global kvm-pit.lost_tick_policy=3Ddelay \ @@ -44,7 +44,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -device '{"driver":"virtio-net-pci","netdev":"hostnet0","id":"net0","mac":= "52:54:00:d2:70:0b","bus":"pci.1","addr":"0x0"}' \ -chardev pty,id=3Dcharserial0 \ -device '{"driver":"isa-serial","chardev":"charserial0","id":"serial0","in= dex":0}' \ --chardev socket,id=3Dcharchannel0,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharchannel0,fd=3DXXXXXXX,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":"audio1","driver":"none"}' \ diff --git a/tests/qemuxmlconfdata/x86_64-q35-headless.x86_64-latest.args b= /tests/qemuxmlconfdata/x86_64-q35-headless.x86_64-latest.args index 1c7b94726d..a2ef934627 100644 --- a/tests/qemuxmlconfdata/x86_64-q35-headless.x86_64-latest.args +++ b/tests/qemuxmlconfdata/x86_64-q35-headless.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc,driftfix=3Dslew \ -global kvm-pit.lost_tick_policy=3Ddelay \ @@ -45,7 +45,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -device '{"driver":"virtio-net-pci","netdev":"hostnet0","id":"net0","mac":= "52:54:00:09:a4:37","bus":"pci.1","addr":"0x0"}' \ -chardev pty,id=3Dcharserial0 \ -device '{"driver":"isa-serial","chardev":"charserial0","id":"serial0","in= dex":0}' \ --chardev socket,id=3Dcharchannel0,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharchannel0,fd=3DXXXXXXX,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":"audio1","driver":"none"}' \ -global ICH9-LPC.noreboot=3Doff \ diff --git a/tests/qemuxmlconfdata/x86_64-q35-minimal.x86_64-latest.abi-upd= ate.args b/tests/qemuxmlconfdata/x86_64-q35-minimal.x86_64-latest.abi-updat= e.args index 9566106b94..3003a120ca 100644 --- a/tests/qemuxmlconfdata/x86_64-q35-minimal.x86_64-latest.abi-update.args +++ b/tests/qemuxmlconfdata/x86_64-q35-minimal.x86_64-latest.abi-update.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconfdata/x86_64-q35-minimal.x86_64-latest.args b/= tests/qemuxmlconfdata/x86_64-q35-minimal.x86_64-latest.args index 9566106b94..3003a120ca 100644 --- a/tests/qemuxmlconfdata/x86_64-q35-minimal.x86_64-latest.args +++ b/tests/qemuxmlconfdata/x86_64-q35-minimal.x86_64-latest.args @@ -21,7 +21,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D@mon-fd@,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ diff --git a/tests/qemuxmlconftest.c b/tests/qemuxmlconftest.c index 6f5852657c..653cdb4012 100644 --- a/tests/qemuxmlconftest.c +++ b/tests/qemuxmlconftest.c @@ -524,9 +524,17 @@ testCompareXMLToArgvStabilizeArgs(virCommand *cmd, if (a + 1 >=3D nargs) break; - if (STREQ(args[a], "-add-fd")) { + if (STREQ(args[a], "-add-fd") || + STREQ(args[a], "-chardev")) { testCompareXMLToArgvStabilizeOne(&args[a + 1], "fd", fdsubsts,= false); + /* qemuxmlconftest also tests the JSON syntax which isn't supp= orted via + * -chardev upstream. The syntax is weird so we need to make s= ure to + * apply the substitution only on JSON with -chardev */ + if (STREQ(args[a], "-chardev") && STRPREFIX(args[a + 1], "{"))= { + testCompareXMLToArgvStabilizeOne(&args[a + 1], "str", fdsu= bsts, true); + } + a++; } } diff --git a/tests/testutilsqemu.c b/tests/testutilsqemu.c index e7a61d0c6f..7c0c975261 100644 --- a/tests/testutilsqemu.c +++ b/tests/testutilsqemu.c @@ -1037,6 +1037,8 @@ testQemuPrepareHostBackendChardevOne(virDomainDeviceD= ef *dev, return 0; } else { devalias =3D "monitor"; + fakesourcefd =3D 1764; + virTestDummyFDContextMarkFD(fakesourcefd, g_strdup("@mon-fd@")); } switch ((virDomainChrType) chardev->type) { @@ -1067,7 +1069,8 @@ testQemuPrepareHostBackendChardevOne(virDomainDeviceD= ef *dev, case VIR_DOMAIN_CHR_TYPE_UNIX: if (chardev->data.nix.listen) { g_autofree char *name =3D g_strdup_printf("%s-source", devalia= s); - fakesourcefd =3D 1729; + if (fakesourcefd =3D=3D -1) + fakesourcefd =3D 1729; charpriv->directfd =3D qemuFDPassDirectNew(name, &fakesourcefd= ); } --=20 2.54.0 From nobody Sat May 30 15:28:30 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.libvirt.org designates 38.145.34.151 as permitted sender) client-ip=38.145.34.151; envelope-from=devel-bounces@lists.libvirt.org; helo=lists.libvirt.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.libvirt.org designates 38.145.34.151 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=pass(p=reject dis=none) header.from=lists.libvirt.org ARC-Seal: i=1; a=rsa-sha256; t=1779382560; cv=none; d=zohomail.com; s=zohoarc; b=DncPUKdaN/cztOtV+Xi/YAlhEHE4O6lTfqKCmRuMEUp+s/czNz+exNqKlo7CC5KvYaIibbbLH5u0l+YdpTfDbYTUOZDbRmEwVAgzgaofAj3BR7J51DRYjiQPLIEXZWx0mptFTIPU/7FZWWnPcrIJfINsAfn5r2+6HN/t0O/Ic84= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1779382560; h=Content-Type:Content-Transfer-Encoding:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Owner:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:Reply-To:References:Subject:Subject:To:To:Message-Id:Cc; bh=RM2PEblf85j6H6/tdGoKrYDuB1jzphjX2YuSalV3j8U=; b=FyHnCOV5hrf26WBB7NRhdsjn4SL3n3L9xcRwZyXdVGUTdY4PQrFdGB2oRGDJ5g8OPp5kB7eLEPvJStZcAjTqPcc7XbbTUlQBf7TkxGztRsuqE2DbnzFpEH0Zt+ff083OtMtCdf8VyD4bvlz7MFuBIbMsqkZ8V/PRHDuZr3+0vZk= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.libvirt.org designates 38.145.34.151 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=pass header.from= (p=reject dis=none) Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [38.145.34.151]) by mx.zohomail.com with SMTPS id 1779382560049370.6089689397164; Thu, 21 May 2026 09:56:00 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 993) id D5F8F41AA4; Thu, 21 May 2026 12:55:58 -0400 (EDT) Received: from [172.19.199.4] (unknown [10.16.107.18]) by lists.libvirt.org (Postfix) with ESMTP id 3DAC043E4E; Thu, 21 May 2026 12:28:50 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 993) id EB55041AAA; Thu, 21 May 2026 12:28:42 -0400 (EDT) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (3072 bits) server-digest SHA256) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id 6A0B141BA1 for ; Thu, 21 May 2026 12:24:05 -0400 (EDT) Received: from mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-661-SoKuHmLHMRuaMtkQ5veMcQ-1; Thu, 21 May 2026 12:24:01 -0400 Received: from mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.17]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id CC61B19560B6 for ; Thu, 21 May 2026 16:24:00 +0000 (UTC) Received: from speedmetal.openshiftapps.com (unknown [10.44.22.3]) by mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 26ACF1956053 for ; Thu, 21 May 2026 16:23:59 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 4.0.1 (2024-03-26) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=0.6 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H4, RCVD_IN_MSPIKE_WL,RCVD_IN_SBL_CSS,SPF_HELO_PASS autolearn=no autolearn_force=no version=4.0.1 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1779380645; h=from:from: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; bh=RM2PEblf85j6H6/tdGoKrYDuB1jzphjX2YuSalV3j8U=; b=fvSLpkwsXvVmJfzheImLuMGhY5YHUlLaDs7Da+awRyeg8LY0rEV3efsog98SRczBc+mDK6 XqWXJkZmzPL9mDieX3foKRkX/ITMZ2R9LuNj5zJgurLS68WsW0AmPdW3s1iKm8GTSws46o hXCTG0efGkZJwwuAarrrTmC+phyFQrk= X-MC-Unique: SoKuHmLHMRuaMtkQ5veMcQ-1 X-Mimecast-MFC-AGG-ID: SoKuHmLHMRuaMtkQ5veMcQ_1779380640 To: devel@lists.libvirt.org Subject: [PATCH 14/30] qemuxmlconftest: Stabilize FDs in iommufd objects Date: Thu, 21 May 2026 18:23:23 +0200 Message-ID: <3da966d426e54b5eede6ce7b163bd03599c2cf06.1779380461.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.17 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: raVL9_IxpAd5RF9NXrEYBsYiHytUpgD7YBCF6QA26WI_1779380640 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: MU2DGI76YKU7YROYO54G77YGHD25Q4FE X-Message-ID-Hash: MU2DGI76YKU7YROYO54G77YGHD25Q4FE X-MailFrom: pkrempa@redhat.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; header-match-devel.lists.libvirt.org-0; emergency; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.10 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: From: Peter Krempa via Devel Reply-To: Peter Krempa X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1779382562025158500 Content-Type: text/plain; charset="utf-8" From: Peter Krempa Install the handler to stabilize output files on '-object' with 'iommufd' qom type which references a FD directly via the 'fd' property. Signed-off-by: Peter Krempa Reviewed-by: Michal Privoznik --- tests/qemuxmlconfdata/iommufd-q35-fd.x86_64-latest.args | 2 +- tests/qemuxmlconfdata/iommufd-q35.x86_64-latest.args | 2 +- .../iommufd-virt-pci-bus-single.aarch64-latest.args | 2 +- tests/qemuxmlconfdata/iommufd-virt.aarch64-latest.args | 2 +- tests/qemuxmlconfdata/iommufd.x86_64-latest.args | 2 +- tests/qemuxmlconftest.c | 3 ++- 6 files changed, 7 insertions(+), 6 deletions(-) diff --git a/tests/qemuxmlconfdata/iommufd-q35-fd.x86_64-latest.args b/test= s/qemuxmlconfdata/iommufd-q35-fd.x86_64-latest.args index e95eab8d07..f88e019770 100644 --- a/tests/qemuxmlconfdata/iommufd-q35-fd.x86_64-latest.args +++ b/tests/qemuxmlconfdata/iommufd-q35-fd.x86_64-latest.args @@ -35,7 +35,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-q35-tes= t/.config \ -device '{"driver":"qxl-vga","id":"video0","max_outputs":1,"ram_size":6710= 8864,"vram_size":33554432,"vram64_size_mb":0,"vgamem_mb":8,"bus":"pcie.0","= addr":"0x1"}' \ -global ICH9-LPC.noreboot=3Doff \ -watchdog-action reset \ --object '{"qom-type":"iommufd","id":"iommufd0","fd":"20"}' \ +-object '{"qom-type":"iommufd","id":"iommufd0","fd":"XXXXXXX"}' \ -device '{"driver":"vfio-pci","id":"hostdev0","iommufd":"iommufd0","fd":"0= ","bus":"pcie.0","addr":"0x3"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxmlconfdata/iommufd-q35.x86_64-latest.args b/tests/q= emuxmlconfdata/iommufd-q35.x86_64-latest.args index e90f3a20e1..f88e019770 100644 --- a/tests/qemuxmlconfdata/iommufd-q35.x86_64-latest.args +++ b/tests/qemuxmlconfdata/iommufd-q35.x86_64-latest.args @@ -35,7 +35,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-q35-tes= t/.config \ -device '{"driver":"qxl-vga","id":"video0","max_outputs":1,"ram_size":6710= 8864,"vram_size":33554432,"vram64_size_mb":0,"vgamem_mb":8,"bus":"pcie.0","= addr":"0x1"}' \ -global ICH9-LPC.noreboot=3Doff \ -watchdog-action reset \ --object '{"qom-type":"iommufd","id":"iommufd0","fd":"0"}' \ +-object '{"qom-type":"iommufd","id":"iommufd0","fd":"XXXXXXX"}' \ -device '{"driver":"vfio-pci","id":"hostdev0","iommufd":"iommufd0","fd":"0= ","bus":"pcie.0","addr":"0x3"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxmlconfdata/iommufd-virt-pci-bus-single.aarch64-late= st.args b/tests/qemuxmlconfdata/iommufd-virt-pci-bus-single.aarch64-latest.= args index ac408b6b32..28d8a47c31 100644 --- a/tests/qemuxmlconfdata/iommufd-virt-pci-bus-single.aarch64-latest.args +++ b/tests/qemuxmlconfdata/iommufd-virt-pci-bus-single.aarch64-latest.args @@ -26,7 +26,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-foo/.co= nfig \ -no-shutdown \ -boot strict=3Don \ -audiodev '{"id":"audio1","driver":"none"}' \ --object '{"qom-type":"iommufd","id":"iommufd0","fd":"0"}' \ +-object '{"qom-type":"iommufd","id":"iommufd0","fd":"XXXXXXX"}' \ -device '{"driver":"vfio-pci","id":"hostdev0","iommufd":"iommufd0","fd":"0= ","bus":"pcie.0","addr":"0x1"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxmlconfdata/iommufd-virt.aarch64-latest.args b/tests= /qemuxmlconfdata/iommufd-virt.aarch64-latest.args index d472bd6144..e910ccc760 100644 --- a/tests/qemuxmlconfdata/iommufd-virt.aarch64-latest.args +++ b/tests/qemuxmlconfdata/iommufd-virt.aarch64-latest.args @@ -29,7 +29,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-foo/.co= nfig \ -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"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ --object '{"qom-type":"iommufd","id":"iommufd0","fd":"0"}' \ +-object '{"qom-type":"iommufd","id":"iommufd0","fd":"XXXXXXX"}' \ -device '{"driver":"vfio-pci","id":"hostdev0","iommufd":"iommufd0","fd":"0= ","bus":"pci.1","addr":"0x0"}' \ -device '{"driver":"vfio-pci","id":"hostdev1","iommufd":"iommufd0","fd":"0= ","bus":"pci.2","addr":"0x0"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ diff --git a/tests/qemuxmlconfdata/iommufd.x86_64-latest.args b/tests/qemux= mlconfdata/iommufd.x86_64-latest.args index 8e93539c9e..f7e53ac388 100644 --- a/tests/qemuxmlconfdata/iommufd.x86_64-latest.args +++ b/tests/qemuxmlconfdata/iommufd.x86_64-latest.args @@ -28,7 +28,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-foo/.co= nfig \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ --object '{"qom-type":"iommufd","id":"iommufd0","fd":"0"}' \ +-object '{"qom-type":"iommufd","id":"iommufd0","fd":"XXXXXXX"}' \ -device '{"driver":"vfio-pci","id":"hostdev0","iommufd":"iommufd0","fd":"0= ","bus":"pci.0","addr":"0x3"}' \ -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/qemuxmlconftest.c b/tests/qemuxmlconftest.c index 653cdb4012..bbced4815a 100644 --- a/tests/qemuxmlconftest.c +++ b/tests/qemuxmlconftest.c @@ -525,7 +525,8 @@ testCompareXMLToArgvStabilizeArgs(virCommand *cmd, break; if (STREQ(args[a], "-add-fd") || - STREQ(args[a], "-chardev")) { + STREQ(args[a], "-chardev") || + (STREQ(args[a], "-object") && STRPREFIX(args[a + 1], "{\"qom-t= ype\":\"iommufd\""))) { testCompareXMLToArgvStabilizeOne(&args[a + 1], "fd", fdsubsts,= false); /* qemuxmlconftest also tests the JSON syntax which isn't supp= orted via --=20 2.54.0 From nobody Sat May 30 15:28:30 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.libvirt.org designates 38.145.34.151 as permitted sender) client-ip=38.145.34.151; envelope-from=devel-bounces@lists.libvirt.org; helo=lists.libvirt.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.libvirt.org designates 38.145.34.151 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=pass(p=reject dis=none) header.from=lists.libvirt.org ARC-Seal: i=1; a=rsa-sha256; t=1779382469; cv=none; d=zohomail.com; s=zohoarc; b=m6GY1c9d9holpiQhA5oyyX9NEucJIi/xtFFTkW5E+FNHiT9VqsSk9iAg6jJzrN5gQf7f0xFb+9JhJ5ih2BGZ9ztj+ApljlJCiq2gpcy3awaOZMgPA7TcuyG5WJK0b3+4Syf4kk9dXVGB5YXwov3RfQB63oVW8I2tyNJvLlXZm0A= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1779382469; h=Content-Type:Content-Transfer-Encoding:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Owner:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:Reply-To:References:Subject:Subject:To:To:Message-Id:Cc; bh=yNf6CcOUyq8JIlLYT2b0Qzei81XDX6EqXJFMIr6TZ4A=; b=Zp35ZghnDsx1GvBvOglRjv4Te5dvBs7cuK0hpJzY40Y9165PlU264DUPTHFbVUaL0t1Xv3zs2nDF5gdVtdlpiqMgOtirRZoSCOBBJUlLqKnDy54YUF1l5x0x6aPPU+31BmSKv2eq/EewPOPM1ZS4qPQogUOnxLjxDrE0Pg+xjEs= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.libvirt.org designates 38.145.34.151 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=pass header.from= (p=reject dis=none) Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [38.145.34.151]) by mx.zohomail.com with SMTPS id 1779382469219317.03997704682104; Thu, 21 May 2026 09:54:29 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 993) id 11C6741B10; Thu, 21 May 2026 12:54:28 -0400 (EDT) Received: from [172.19.199.4] (unknown [10.16.107.18]) by lists.libvirt.org (Postfix) with ESMTP id DFF5343E0F; Thu, 21 May 2026 12:27:57 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 993) id B104D41D01; Thu, 21 May 2026 12:27:49 -0400 (EDT) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (3072 bits) server-digest SHA256) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id 6570041B71 for ; Thu, 21 May 2026 12:24:04 -0400 (EDT) Received: from mx-prod-mc-03.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-648-ylfFFH_2NvGK2gjs2bPF2w-1; Thu, 21 May 2026 12:24:02 -0400 Received: from mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.17]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id E888D1956062 for ; Thu, 21 May 2026 16:24:01 +0000 (UTC) Received: from speedmetal.openshiftapps.com (unknown [10.44.22.3]) by mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 418051956053 for ; Thu, 21 May 2026 16:24:01 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 4.0.1 (2024-03-26) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=0.6 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H5, RCVD_IN_MSPIKE_WL,RCVD_IN_SBL_CSS,SPF_HELO_PASS autolearn=no autolearn_force=no version=4.0.1 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1779380644; h=from:from: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; bh=yNf6CcOUyq8JIlLYT2b0Qzei81XDX6EqXJFMIr6TZ4A=; b=XQFhmd7w2KArZx51Q9gzKZ7FxzmusTb7drr/gA3xdqsQLq+BGVfBp6XYT40dO601yUIQjf NWXxr8V4GhzthHfjWhRUZLQWj1NbyKTZgPNNlyTaeHpSplz0V7UjSf6DZZRnAd73qVOwzc jWEwHyUwktswGcXF9XLsaVt99mX1k9c= X-MC-Unique: ylfFFH_2NvGK2gjs2bPF2w-1 X-Mimecast-MFC-AGG-ID: ylfFFH_2NvGK2gjs2bPF2w_1779380642 To: devel@lists.libvirt.org Subject: [PATCH 15/30] qemuxmlconftest: Stabilize 'vsock' 'vhostfd' file descriptior in output files Date: Thu, 21 May 2026 18:23:24 +0200 Message-ID: <1f42569fc59d1525b27fcca1517350f5befb8aa1.1779380461.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.17 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: NIzapbdPLVYJzX5g3_hZGRnAME-z8TfQ2Nycog8N4gM_1779380642 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: 4ME75LLHTSASGWXC36NWRVN44XZDVKD7 X-Message-ID-Hash: 4ME75LLHTSASGWXC36NWRVN44XZDVKD7 X-MailFrom: pkrempa@redhat.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; header-match-devel.lists.libvirt.org-0; emergency; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.10 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: From: Peter Krempa via Devel Reply-To: Peter Krempa X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1779382469531158500 Content-Type: text/plain; charset="utf-8" From: Peter Krempa Install hanlder to stabilize 'vhostfd' fds in -device so that we can later switch tests to use real FDs. Signed-off-by: Peter Krempa Reviewed-by: Michal Privoznik --- tests/qemuxmlconfdata/vhost-vsock-auto.x86_64-latest.args | 2 +- .../qemuxmlconfdata/vhost-vsock-ccw-auto.s390x-latest.args | 2 +- .../qemuxmlconfdata/vhost-vsock-ccw-iommu.s390x-latest.args | 2 +- tests/qemuxmlconfdata/vhost-vsock-ccw.s390x-latest.args | 2 +- tests/qemuxmlconfdata/vhost-vsock.x86_64-latest.args | 2 +- .../virtio-non-transitional.x86_64-latest.args | 2 +- .../qemuxmlconfdata/virtio-transitional.x86_64-latest.args | 2 +- tests/qemuxmlconftest.c | 6 ++++++ 8 files changed, 13 insertions(+), 7 deletions(-) diff --git a/tests/qemuxmlconfdata/vhost-vsock-auto.x86_64-latest.args b/te= sts/qemuxmlconfdata/vhost-vsock-auto.x86_64-latest.args index d16eabdd90..b3f2e06c72 100644 --- a/tests/qemuxmlconfdata/vhost-vsock-auto.x86_64-latest.args +++ b/tests/qemuxmlconfdata/vhost-vsock-auto.x86_64-latest.args @@ -30,5 +30,5 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-test/.c= onfig \ -device '{"driver":"virtio-serial-pci","id":"virtio-serial0","bus":"pci.0"= ,"addr":"0x6"}' \ -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"}' \ +-device '{"driver":"vhost-vsock-pci","id":"vsock0","guest-cid":42,"vhostfd= ":"XXXXXXX","bus":"pci.0","addr":"0x2"}' \ -msg timestamp=3Don diff --git a/tests/qemuxmlconfdata/vhost-vsock-ccw-auto.s390x-latest.args b= /tests/qemuxmlconfdata/vhost-vsock-ccw-auto.s390x-latest.args index 05b7f64523..ccc7152713 100644 --- a/tests/qemuxmlconfdata/vhost-vsock-ccw-auto.s390x-latest.args +++ b/tests/qemuxmlconfdata/vhost-vsock-ccw-auto.s390x-latest.args @@ -31,5 +31,5 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-ccw","id":"balloon0","devno":"fe.0.0001= "}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ --device '{"driver":"vhost-vsock-ccw","id":"vsock0","guest-cid":42,"vhostfd= ":"6789","devno":"fe.0.0002"}' \ +-device '{"driver":"vhost-vsock-ccw","id":"vsock0","guest-cid":42,"vhostfd= ":"XXXXXXX","devno":"fe.0.0002"}' \ -msg timestamp=3Don diff --git a/tests/qemuxmlconfdata/vhost-vsock-ccw-iommu.s390x-latest.args = b/tests/qemuxmlconfdata/vhost-vsock-ccw-iommu.s390x-latest.args index ec0f06e2f4..a83ab0cc4b 100644 --- a/tests/qemuxmlconfdata/vhost-vsock-ccw-iommu.s390x-latest.args +++ b/tests/qemuxmlconfdata/vhost-vsock-ccw-iommu.s390x-latest.args @@ -31,5 +31,5 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-ccw","id":"balloon0","devno":"fe.0.0001= "}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ --device '{"driver":"vhost-vsock-ccw","iommu_platform":true,"id":"vsock0","= guest-cid":4,"vhostfd":"6789","devno":"fe.0.0002"}' \ +-device '{"driver":"vhost-vsock-ccw","iommu_platform":true,"id":"vsock0","= guest-cid":4,"vhostfd":"XXXXXXX","devno":"fe.0.0002"}' \ -msg timestamp=3Don diff --git a/tests/qemuxmlconfdata/vhost-vsock-ccw.s390x-latest.args b/test= s/qemuxmlconfdata/vhost-vsock-ccw.s390x-latest.args index 04c97134a4..3552cf18b6 100644 --- a/tests/qemuxmlconfdata/vhost-vsock-ccw.s390x-latest.args +++ b/tests/qemuxmlconfdata/vhost-vsock-ccw.s390x-latest.args @@ -31,5 +31,5 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-ccw","id":"balloon0","devno":"fe.0.0001= "}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ --device '{"driver":"vhost-vsock-ccw","id":"vsock0","guest-cid":4,"vhostfd"= :"6789","devno":"fe.0.0003"}' \ +-device '{"driver":"vhost-vsock-ccw","id":"vsock0","guest-cid":4,"vhostfd"= :"XXXXXXX","devno":"fe.0.0003"}' \ -msg timestamp=3Don diff --git a/tests/qemuxmlconfdata/vhost-vsock.x86_64-latest.args b/tests/q= emuxmlconfdata/vhost-vsock.x86_64-latest.args index fcc1b74bd0..e26677052b 100644 --- a/tests/qemuxmlconfdata/vhost-vsock.x86_64-latest.args +++ b/tests/qemuxmlconfdata/vhost-vsock.x86_64-latest.args @@ -30,5 +30,5 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-test/.c= onfig \ -device '{"driver":"virtio-serial-pci","id":"virtio-serial0","bus":"pci.0"= ,"addr":"0x6"}' \ -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"}' \ +-device '{"driver":"vhost-vsock-pci","id":"vsock0","guest-cid":4,"vhostfd"= :"XXXXXXX","bus":"pci.0","addr":"0x7"}' \ -msg timestamp=3Don diff --git a/tests/qemuxmlconfdata/virtio-non-transitional.x86_64-latest.ar= gs b/tests/qemuxmlconfdata/virtio-non-transitional.x86_64-latest.args index 955390e23b..0701791d47 100644 --- a/tests/qemuxmlconfdata/virtio-non-transitional.x86_64-latest.args +++ b/tests/qemuxmlconfdata/virtio-non-transitional.x86_64-latest.args @@ -52,5 +52,5 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -object '{"qom-type":"rng-random","id":"objrng0","filename":"/dev/urandom"= }' \ -device '{"driver":"virtio-rng-pci-non-transitional","rng":"objrng0","id":= "rng0","bus":"pci.8","addr":"0x0"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ --device '{"driver":"vhost-vsock-pci-non-transitional","id":"vsock0","guest= -cid":4,"vhostfd":"6789","bus":"pci.9","addr":"0x0"}' \ +-device '{"driver":"vhost-vsock-pci-non-transitional","id":"vsock0","guest= -cid":4,"vhostfd":"XXXXXXX","bus":"pci.9","addr":"0x0"}' \ -msg timestamp=3Don diff --git a/tests/qemuxmlconfdata/virtio-transitional.x86_64-latest.args b= /tests/qemuxmlconfdata/virtio-transitional.x86_64-latest.args index e54eea6164..8963b6c986 100644 --- a/tests/qemuxmlconfdata/virtio-transitional.x86_64-latest.args +++ b/tests/qemuxmlconfdata/virtio-transitional.x86_64-latest.args @@ -45,5 +45,5 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -object '{"qom-type":"rng-random","id":"objrng0","filename":"/dev/urandom"= }' \ -device '{"driver":"virtio-rng-pci-transitional","rng":"objrng0","id":"rng= 0","bus":"pci.2","addr":"0x8"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ --device '{"driver":"vhost-vsock-pci-transitional","id":"vsock0","guest-cid= ":4,"vhostfd":"6789","bus":"pci.2","addr":"0x9"}' \ +-device '{"driver":"vhost-vsock-pci-transitional","id":"vsock0","guest-cid= ":4,"vhostfd":"XXXXXXX","bus":"pci.2","addr":"0x9"}' \ -msg timestamp=3Don diff --git a/tests/qemuxmlconftest.c b/tests/qemuxmlconftest.c index bbced4815a..a6f2a3a19e 100644 --- a/tests/qemuxmlconftest.c +++ b/tests/qemuxmlconftest.c @@ -536,6 +536,12 @@ testCompareXMLToArgvStabilizeArgs(virCommand *cmd, testCompareXMLToArgvStabilizeOne(&args[a + 1], "str", fdsu= bsts, true); } + a++; + } else if (STREQ(args[a], "-device")) { + if (STRPREFIX(args[a + 1], "{\"driver\":\"vhost-vsock-")) { + testCompareXMLToArgvStabilizeOne(&args[a + 1], "vhostfd", = fdsubsts, false); + } + a++; } } --=20 2.54.0 From nobody Sat May 30 15:28:30 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.libvirt.org designates 38.145.34.151 as permitted sender) client-ip=38.145.34.151; envelope-from=devel-bounces@lists.libvirt.org; helo=lists.libvirt.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.libvirt.org designates 38.145.34.151 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=pass(p=reject dis=none) header.from=lists.libvirt.org ARC-Seal: i=1; a=rsa-sha256; t=1779382809; cv=none; d=zohomail.com; s=zohoarc; b=Zr/FM41xXalMkvG6jOuuUqefjmHBHK2wADyfadM0i8CzVQIP+1GN3qKmn29LJg3gfttxtebPapkNC/rLoxfzL9nTmSshnlyn1z1dVlnkOKAfXmIelmhAUUd9Azf4ZeBWkRb5+QLUWnzYsoXcqXziVDjZnP5lIPH4D1QTLWC0NO4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1779382809; h=Content-Type:Content-Transfer-Encoding:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Owner:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:Reply-To:References:Subject:Subject:To:To:Message-Id:Cc; bh=wrwFqzm9jLc/AWAecVhFC+48mtPTLYOqC85ZYQ1G9vM=; b=AK8JXtvZrxsEJoYpomiM0STzZomF9YNUJfZJB3RMNtHmufTkbfhjqi7+GG39dDbnZhiTPmjoGfK5bbC6l0s/7sWQvU31mKEATGMORQlq6OPfUNOyG63AKLAPPtiFAkraQdZzA9hW7PqHnXay9utZh3Km0biyC9jxFs3PyyNbJ3s= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.libvirt.org designates 38.145.34.151 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=pass header.from= (p=reject dis=none) Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [38.145.34.151]) by mx.zohomail.com with SMTPS id 1779382809685413.3637722647668; Thu, 21 May 2026 10:00:09 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 993) id 6915141B2F; Thu, 21 May 2026 12:59:53 -0400 (EDT) Received: from [172.19.199.4] (unknown [10.16.107.18]) by lists.libvirt.org (Postfix) with ESMTP id 417A043E88; Thu, 21 May 2026 12:29:42 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 993) id AA23F41CBD; Thu, 21 May 2026 12:29:33 -0400 (EDT) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (3072 bits) server-digest SHA256) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id 1891341BAB for ; Thu, 21 May 2026 12:24:06 -0400 (EDT) Received: from mx-prod-mc-08.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-474-ZRbUalM6Nnac7oifntIoEw-1; Thu, 21 May 2026 12:24:03 -0400 Received: from mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.17]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 2403A18002E9 for ; Thu, 21 May 2026 16:24:03 +0000 (UTC) Received: from speedmetal.openshiftapps.com (unknown [10.44.22.3]) by mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 5D0C01956053 for ; Thu, 21 May 2026 16:24:02 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 4.0.1 (2024-03-26) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H5, RCVD_IN_MSPIKE_WL,SPF_HELO_PASS autolearn=unavailable autolearn_force=no version=4.0.1 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1779380645; h=from:from: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; bh=wrwFqzm9jLc/AWAecVhFC+48mtPTLYOqC85ZYQ1G9vM=; b=L+JS4bfwmJfR9GebXvupdoXfwO2hLCmldmS3v9wRLuX+ADqCaIsS3t4ZsEyol94SrSRdQ1 MWFxvfXBB84DhWhtW96UQ8uaHkNYJIV3MpIxBZ4mZmyUeMMnP9qngv+T1p2/PgTwTEYAl8 0GdW1qznay6qj1E/CWOUnzJFPPqBaCw= X-MC-Unique: ZRbUalM6Nnac7oifntIoEw-1 X-Mimecast-MFC-AGG-ID: ZRbUalM6Nnac7oifntIoEw_1779380643 To: devel@lists.libvirt.org Subject: [PATCH 16/30] qemuxmlconftest: Stabilize fds in '-netdev' Date: Thu, 21 May 2026 18:23:25 +0200 Message-ID: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.17 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: -wJ6Wo1t4O9vd1sOzh2Z-UGTUuLdOKPtPavtxQC8lFY_1779380643 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: JF3223NSD3NY6X4EF2DJRZ7IXNYE3UHP X-Message-ID-Hash: JF3223NSD3NY6X4EF2DJRZ7IXNYE3UHP X-MailFrom: pkrempa@redhat.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; header-match-devel.lists.libvirt.org-0; emergency; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.10 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: From: Peter Krempa via Devel Reply-To: Peter Krempa X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1779382811522158500 Content-Type: text/plain; charset="utf-8" From: Peter Krempa Use 'testCompareXMLToArgvStabilizeOne' to provide stable test outputs even when we'll switch to real FDs in tests. Signed-off-by: Peter Krempa Reviewed-by: Michal Privoznik --- tests/qemuxmlconfdata/downscript.x86_64-latest.args | 2 +- .../graphics-spice-timeout.x86_64-latest.args | 2 +- tests/qemuxmlconfdata/net-bandwidth.x86_64-latest.args | 2 +- .../qemuxmlconfdata/net-bandwidth2.x86_64-latest.args | 2 +- tests/qemuxmlconfdata/net-coalesce.x86_64-latest.args | 6 +++--- .../qemuxmlconfdata/net-eth-hostip.x86_64-latest.args | 2 +- .../qemuxmlconfdata/net-eth-ifname.x86_64-latest.args | 2 +- tests/qemuxmlconfdata/net-eth-names.x86_64-latest.args | 4 ++-- .../net-eth-unmanaged-tap.x86_64-latest.args | 2 +- tests/qemuxmlconfdata/net-eth.x86_64-latest.args | 2 +- .../net-isolated-port.x86_64-latest.args | 2 +- tests/qemuxmlconfdata/net-midonet.x86_64-latest.args | 2 +- tests/qemuxmlconfdata/net-mtu.x86_64-latest.args | 4 ++-- .../qemuxmlconfdata/net-openvswitch.x86_64-latest.args | 2 +- .../net-virtio-network-portgroup.x86_64-latest.args | 6 +++--- .../net-virtio-teaming-network.x86_64-latest.args | 2 +- .../net-virtio-vhost.x86_64-latest.args | 6 +++--- .../tap-vhost-incorrect.x86_64-latest.args | 4 ++-- tests/qemuxmlconfdata/tap-vhost.x86_64-latest.args | 2 +- tests/qemuxmlconfdata/user-aliases.x86_64-latest.args | 2 +- tests/qemuxmlconftest.c | 10 ++++++++++ 21 files changed, 39 insertions(+), 29 deletions(-) diff --git a/tests/qemuxmlconfdata/downscript.x86_64-latest.args b/tests/qe= muxmlconfdata/downscript.x86_64-latest.args index af29ca9aa1..d0054089b6 100644 --- a/tests/qemuxmlconfdata/downscript.x86_64-latest.args +++ b/tests/qemuxmlconfdata/downscript.x86_64-latest.args @@ -34,7 +34,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -device '{"driver":"virtio-9p-pci","id":"fs0","fsdev":"fsdev-fs0","mount_t= ag":"fs1","bus":"pci.0","addr":"0x3"}' \ -fsdev local,security_model=3Dmapped,id=3Dfsdev-fs1,path=3D/export/fs2 \ -device '{"driver":"virtio-9p-pci","id":"fs1","fsdev":"fsdev-fs1","mount_t= ag":"fs2","bus":"pci.0","addr":"0x4"}' \ --netdev '{"type":"tap","fd":"2900","vhost":true,"vhostfd":"2200","id":"hos= tnet0"}' \ +-netdev '{"type":"tap","fd":"XXXXXXX","vhost":true,"vhostfd":"XXXXXXX","id= ":"hostnet0"}' \ -device '{"driver":"virtio-net-pci","netdev":"hostnet0","id":"net0","mac":= "52:54:00:f6:66:88","bus":"pci.0","addr":"0xb"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0xc"}' \ diff --git a/tests/qemuxmlconfdata/graphics-spice-timeout.x86_64-latest.arg= s b/tests/qemuxmlconfdata/graphics-spice-timeout.x86_64-latest.args index 1ff9a0f46d..cd5c91f9c4 100644 --- a/tests/qemuxmlconfdata/graphics-spice-timeout.x86_64-latest.args +++ b/tests/qemuxmlconfdata/graphics-spice-timeout.x86_64-latest.args @@ -27,7 +27,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-f14/.co= nfig \ -boot menu=3Don,strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ -device '{"driver":"virtio-serial-pci","id":"virtio-serial0","bus":"pci.0"= ,"addr":"0x6"}' \ --netdev '{"type":"tap","fd":"2900","id":"hostnet0"}' \ +-netdev '{"type":"tap","fd":"XXXXXXX","id":"hostnet0"}' \ -device '{"driver":"rtl8139","netdev":"hostnet0","id":"net0","mac":"52:54:= 00:71:70:89","bus":"pci.0","addr":"0x7"}' \ -device '{"driver":"usb-tablet","id":"input0","bus":"usb.0","port":"1"}' \ -audiodev '{"id":"audio1","driver":"spice"}' \ diff --git a/tests/qemuxmlconfdata/net-bandwidth.x86_64-latest.args b/tests= /qemuxmlconfdata/net-bandwidth.x86_64-latest.args index 44bf06ee28..210ae98d3c 100644 --- a/tests/qemuxmlconfdata/net-bandwidth.x86_64-latest.args +++ b/tests/qemuxmlconfdata/net-bandwidth.x86_64-latest.args @@ -32,7 +32,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-f14-60/= .config \ -device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x4","drive":"li= bvirt-2-format","id":"virtio-disk0","bootindex":2}' \ -blockdev '{"driver":"file","filename":"/home/zippy/tmp/Fedora-14-x86_64-L= ive-KDE.iso","node-name":"libvirt-1-storage","read-only":true}' \ -device '{"driver":"ide-cd","bus":"ide.1","unit":0,"drive":"libvirt-1-stor= age","id":"ide0-1-0","bootindex":1}' \ --netdev '{"type":"tap","fd":"2800","id":"hostnet0"}' \ +-netdev '{"type":"tap","fd":"XXXXXXX","id":"hostnet0"}' \ -device '{"driver":"rtl8139","netdev":"hostnet0","id":"net0","mac":"52:54:= 00:24:a5:9f","bus":"pci.0","addr":"0x7"}' \ -chardev pty,id=3Dcharserial0 \ -device '{"driver":"isa-serial","chardev":"charserial0","id":"serial0","in= dex":0}' \ diff --git a/tests/qemuxmlconfdata/net-bandwidth2.x86_64-latest.args b/test= s/qemuxmlconfdata/net-bandwidth2.x86_64-latest.args index a3731cab99..573c24ba17 100644 --- a/tests/qemuxmlconfdata/net-bandwidth2.x86_64-latest.args +++ b/tests/qemuxmlconfdata/net-bandwidth2.x86_64-latest.args @@ -30,7 +30,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-f14-60/= .config \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/f14-6.img"= ,"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-disk0","bootindex":2}' \ --netdev '{"type":"tap","fd":"2800","id":"hostnet0"}' \ +-netdev '{"type":"tap","fd":"XXXXXXX","id":"hostnet0"}' \ -device '{"driver":"rtl8139","netdev":"hostnet0","id":"net0","mac":"52:54:= 00:24:a5:9f","bus":"pci.0","addr":"0x7"}' \ -chardev pty,id=3Dcharserial0 \ -device '{"driver":"isa-serial","chardev":"charserial0","id":"serial0","in= dex":0}' \ diff --git a/tests/qemuxmlconfdata/net-coalesce.x86_64-latest.args b/tests/= qemuxmlconfdata/net-coalesce.x86_64-latest.args index ac93af6891..9c061e4e6f 100644 --- a/tests/qemuxmlconfdata/net-coalesce.x86_64-latest.args +++ b/tests/qemuxmlconfdata/net-coalesce.x86_64-latest.args @@ -33,11 +33,11 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-test/= .config \ -device '{"driver":"virtio-blk-pci","event_idx":true,"bus":"pci.0","addr":= "0x4","drive":"libvirt-2-format","id":"virtio-disk0","bootindex":2}' \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/Fedora-14-x86_64-= Live-KDE.iso","node-name":"libvirt-1-storage","read-only":true}' \ -device '{"driver":"ide-cd","bus":"ide.1","unit":0,"drive":"libvirt-1-stor= age","id":"ide0-1-0","bootindex":1}' \ --netdev '{"type":"tap","fd":"2800","vhost":true,"vhostfd":"2200","id":"hos= tnet0"}' \ +-netdev '{"type":"tap","fd":"XXXXXXX","vhost":true,"vhostfd":"XXXXXXX","id= ":"hostnet0"}' \ -device '{"driver":"virtio-net-pci","netdev":"hostnet0","id":"net0","mac":= "52:54:00:e5:48:58","bus":"pci.0","addr":"0x2"}' \ --netdev '{"type":"tap","fd":"2800","vhost":true,"vhostfd":"2200","id":"hos= tnet1"}' \ +-netdev '{"type":"tap","fd":"XXXXXXX","vhost":true,"vhostfd":"XXXXXXX","id= ":"hostnet1"}' \ -device '{"driver":"virtio-net-pci","netdev":"hostnet1","id":"net1","mac":= "52:54:00:e5:48:59","bus":"pci.0","addr":"0x3"}' \ --netdev '{"type":"tap","fd":"2800","vhost":true,"vhostfd":"2200","id":"hos= tnet2"}' \ +-netdev '{"type":"tap","fd":"XXXXXXX","vhost":true,"vhostfd":"XXXXXXX","id= ":"hostnet2"}' \ -device '{"driver":"virtio-net-pci","netdev":"hostnet2","id":"net2","mac":= "52:54:00:e5:48:60","bus":"pci.0","addr":"0x5"}' \ -chardev pty,id=3Dcharserial0 \ -device '{"driver":"isa-serial","chardev":"charserial0","id":"serial0","in= dex":0}' \ diff --git a/tests/qemuxmlconfdata/net-eth-hostip.x86_64-latest.args b/test= s/qemuxmlconfdata/net-eth-hostip.x86_64-latest.args index d5a8b6a107..6a9b53ca52 100644 --- a/tests/qemuxmlconfdata/net-eth-hostip.x86_64-latest.args +++ b/tests/qemuxmlconfdata/net-eth-hostip.x86_64-latest.args @@ -29,7 +29,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","read-only":false}' \ -device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-stor= age","id":"ide0-0-0","bootindex":1}' \ --netdev '{"type":"tap","fd":"2900","id":"hostnet0"}' \ +-netdev '{"type":"tap","fd":"XXXXXXX","id":"hostnet0"}' \ -device '{"driver":"rtl8139","netdev":"hostnet0","id":"net0","mac":"00:11:= 22:33:44:55","bus":"pci.0","addr":"0x2"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ diff --git a/tests/qemuxmlconfdata/net-eth-ifname.x86_64-latest.args b/test= s/qemuxmlconfdata/net-eth-ifname.x86_64-latest.args index d5a8b6a107..6a9b53ca52 100644 --- a/tests/qemuxmlconfdata/net-eth-ifname.x86_64-latest.args +++ b/tests/qemuxmlconfdata/net-eth-ifname.x86_64-latest.args @@ -29,7 +29,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","read-only":false}' \ -device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-stor= age","id":"ide0-0-0","bootindex":1}' \ --netdev '{"type":"tap","fd":"2900","id":"hostnet0"}' \ +-netdev '{"type":"tap","fd":"XXXXXXX","id":"hostnet0"}' \ -device '{"driver":"rtl8139","netdev":"hostnet0","id":"net0","mac":"00:11:= 22:33:44:55","bus":"pci.0","addr":"0x2"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ diff --git a/tests/qemuxmlconfdata/net-eth-names.x86_64-latest.args b/tests= /qemuxmlconfdata/net-eth-names.x86_64-latest.args index 09313dcbd6..70845d070a 100644 --- a/tests/qemuxmlconfdata/net-eth-names.x86_64-latest.args +++ b/tests/qemuxmlconfdata/net-eth-names.x86_64-latest.args @@ -29,9 +29,9 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","read-only":false}' \ -device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-stor= age","id":"ide0-0-0","bootindex":1}' \ --netdev '{"type":"tap","fd":"2900","id":"hostnet0"}' \ +-netdev '{"type":"tap","fd":"XXXXXXX","id":"hostnet0"}' \ -device '{"driver":"rtl8139","netdev":"hostnet0","id":"net0","mac":"00:11:= 22:33:44:55","bus":"pci.0","addr":"0x2"}' \ --netdev '{"type":"tap","fd":"2900","id":"hostnet1"}' \ +-netdev '{"type":"tap","fd":"XXXXXXX","id":"hostnet1"}' \ -device '{"driver":"e1000","netdev":"hostnet1","id":"net1","mac":"00:11:22= :33:44:56","bus":"pci.0","addr":"0x3"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x4"}' \ diff --git a/tests/qemuxmlconfdata/net-eth-unmanaged-tap.x86_64-latest.args= b/tests/qemuxmlconfdata/net-eth-unmanaged-tap.x86_64-latest.args index 5190a79647..2c441611ca 100644 --- a/tests/qemuxmlconfdata/net-eth-unmanaged-tap.x86_64-latest.args +++ b/tests/qemuxmlconfdata/net-eth-unmanaged-tap.x86_64-latest.args @@ -29,7 +29,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","read-only":false}' \ -device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-stor= age","id":"ide0-0-0","bootindex":1}' \ --netdev '{"type":"tap","fd":"2900","vhost":true,"vhostfd":"2200","id":"hos= tnet0"}' \ +-netdev '{"type":"tap","fd":"XXXXXXX","vhost":true,"vhostfd":"XXXXXXX","id= ":"hostnet0"}' \ -device '{"driver":"virtio-net-pci","netdev":"hostnet0","id":"net0","mac":= "fe:11:22:33:44:55","bus":"pci.0","addr":"0x2"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ diff --git a/tests/qemuxmlconfdata/net-eth.x86_64-latest.args b/tests/qemux= mlconfdata/net-eth.x86_64-latest.args index d5a8b6a107..6a9b53ca52 100644 --- a/tests/qemuxmlconfdata/net-eth.x86_64-latest.args +++ b/tests/qemuxmlconfdata/net-eth.x86_64-latest.args @@ -29,7 +29,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","read-only":false}' \ -device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-stor= age","id":"ide0-0-0","bootindex":1}' \ --netdev '{"type":"tap","fd":"2900","id":"hostnet0"}' \ +-netdev '{"type":"tap","fd":"XXXXXXX","id":"hostnet0"}' \ -device '{"driver":"rtl8139","netdev":"hostnet0","id":"net0","mac":"00:11:= 22:33:44:55","bus":"pci.0","addr":"0x2"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ diff --git a/tests/qemuxmlconfdata/net-isolated-port.x86_64-latest.args b/t= ests/qemuxmlconfdata/net-isolated-port.x86_64-latest.args index ae4ac627e4..20f83c0f16 100644 --- a/tests/qemuxmlconfdata/net-isolated-port.x86_64-latest.args +++ b/tests/qemuxmlconfdata/net-isolated-port.x86_64-latest.args @@ -32,7 +32,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-q35-tes= t/.config \ -device '{"driver":"qemu-xhci","id":"usb","bus":"pci.2","addr":"0x0"}' \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","read-only":false}' \ -device '{"driver":"ide-hd","bus":"ide.0","drive":"libvirt-1-storage","id"= :"sata0-0-0","bootindex":1}' \ --netdev '{"type":"tap","fd":"2800","vhost":true,"vhostfd":"2200","id":"hos= tnet0"}' \ +-netdev '{"type":"tap","fd":"XXXXXXX","vhost":true,"vhostfd":"XXXXXXX","id= ":"hostnet0"}' \ -device '{"driver":"virtio-net-pci","netdev":"hostnet0","id":"net0","mac":= "52:54:00:d6:c0:0b","bus":"pci.1","addr":"0x0"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"qxl-vga","id":"video0","max_outputs":1,"ram_size":6710= 8864,"vram_size":33554432,"vram64_size_mb":0,"vgamem_mb":8,"bus":"pcie.0","= addr":"0x1"}' \ diff --git a/tests/qemuxmlconfdata/net-midonet.x86_64-latest.args b/tests/q= emuxmlconfdata/net-midonet.x86_64-latest.args index 0f5a84c3ba..f5bac0b91c 100644 --- a/tests/qemuxmlconfdata/net-midonet.x86_64-latest.args +++ b/tests/qemuxmlconfdata/net-midonet.x86_64-latest.args @@ -29,7 +29,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","read-only":false}' \ -device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-stor= age","id":"ide0-0-0","bootindex":1}' \ --netdev '{"type":"tap","fd":"2800","vhost":true,"vhostfd":"2200","id":"hos= tnet0"}' \ +-netdev '{"type":"tap","fd":"XXXXXXX","vhost":true,"vhostfd":"XXXXXXX","id= ":"hostnet0"}' \ -device '{"driver":"virtio-net-pci","netdev":"hostnet0","id":"net0","mac":= "00:11:22:33:44:55","bus":"pci.0","addr":"0x2"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x3"}' \ diff --git a/tests/qemuxmlconfdata/net-mtu.x86_64-latest.args b/tests/qemux= mlconfdata/net-mtu.x86_64-latest.args index c8f189d6e8..ce88e8b1ba 100644 --- a/tests/qemuxmlconfdata/net-mtu.x86_64-latest.args +++ b/tests/qemuxmlconfdata/net-mtu.x86_64-latest.args @@ -33,9 +33,9 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-test/.c= onfig \ -device '{"driver":"virtio-blk-pci","event_idx":true,"bus":"pci.0","addr":= "0x4","drive":"libvirt-2-format","id":"virtio-disk0","bootindex":2}' \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/Fedora-14-x86_64-= Live-KDE.iso","node-name":"libvirt-1-storage","read-only":true}' \ -device '{"driver":"ide-cd","bus":"ide.1","unit":0,"drive":"libvirt-1-stor= age","id":"ide0-1-0","bootindex":1}' \ --netdev '{"type":"tap","fd":"2800","vhost":true,"vhostfd":"2200","id":"hos= tnet0"}' \ +-netdev '{"type":"tap","fd":"XXXXXXX","vhost":true,"vhostfd":"XXXXXXX","id= ":"hostnet0"}' \ -device '{"driver":"virtio-net-pci","host_mtu":1500,"netdev":"hostnet0","i= d":"net0","mac":"52:54:00:e5:48:58","bus":"pci.0","addr":"0x2"}' \ --netdev '{"type":"tap","fd":"2800","vhost":true,"vhostfd":"2200","sndbuf":= 1600,"id":"hostnet1"}' \ +-netdev '{"type":"tap","fd":"XXXXXXX","vhost":true,"vhostfd":"XXXXXXX","sn= dbuf":1600,"id":"hostnet1"}' \ -device '{"driver":"virtio-net-pci","host_mtu":9000,"netdev":"hostnet1","i= d":"net1","mac":"52:54:00:e5:48:59","bus":"pci.0","addr":"0x3"}' \ -chardev pty,id=3Dcharserial0 \ -device '{"driver":"isa-serial","chardev":"charserial0","id":"serial0","in= dex":0}' \ diff --git a/tests/qemuxmlconfdata/net-openvswitch.x86_64-latest.args b/tes= ts/qemuxmlconfdata/net-openvswitch.x86_64-latest.args index 6d134dcf80..31cc8cbbf3 100644 --- a/tests/qemuxmlconfdata/net-openvswitch.x86_64-latest.args +++ b/tests/qemuxmlconfdata/net-openvswitch.x86_64-latest.args @@ -29,7 +29,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","read-only":false}' \ -device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-stor= age","id":"ide0-0-0","bootindex":1}' \ --netdev '{"type":"tap","fd":"2800","id":"hostnet0"}' \ +-netdev '{"type":"tap","fd":"XXXXXXX","id":"hostnet0"}' \ -device '{"driver":"rtl8139","netdev":"hostnet0","id":"net0","mac":"00:11:= 22:33:44:55","bus":"pci.0","addr":"0x2"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x3"}' \ diff --git a/tests/qemuxmlconfdata/net-virtio-network-portgroup.x86_64-late= st.args b/tests/qemuxmlconfdata/net-virtio-network-portgroup.x86_64-latest.= args index a604512bf5..c01bc60976 100644 --- a/tests/qemuxmlconfdata/net-virtio-network-portgroup.x86_64-latest.args +++ b/tests/qemuxmlconfdata/net-virtio-network-portgroup.x86_64-latest.args @@ -29,11 +29,11 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUG= uest1/.config \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","read-only":false}' \ -device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-stor= age","id":"ide0-0-0","bootindex":1}' \ --netdev '{"type":"tap","fd":"2800","vhost":true,"vhostfd":"2200","id":"hos= tnet0"}' \ +-netdev '{"type":"tap","fd":"XXXXXXX","vhost":true,"vhostfd":"XXXXXXX","id= ":"hostnet0"}' \ -device '{"driver":"virtio-net-pci","netdev":"hostnet0","id":"net0","mac":= "00:11:22:33:44:55","bus":"pci.0","addr":"0x2"}' \ --netdev '{"type":"tap","fd":"2800","id":"hostnet1"}' \ +-netdev '{"type":"tap","fd":"XXXXXXX","id":"hostnet1"}' \ -device '{"driver":"rtl8139","netdev":"hostnet1","id":"net1","mac":"10:11:= 22:33:44:55","bus":"pci.0","addr":"0x3"}' \ --netdev '{"type":"tap","fd":"2800","id":"hostnet2"}' \ +-netdev '{"type":"tap","fd":"XXXXXXX","id":"hostnet2"}' \ -device '{"driver":"rtl8139","netdev":"hostnet2","id":"net2","mac":"22:11:= 22:33:44:55","bus":"pci.0","addr":"0x4"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x5"}' \ diff --git a/tests/qemuxmlconfdata/net-virtio-teaming-network.x86_64-latest= .args b/tests/qemuxmlconfdata/net-virtio-teaming-network.x86_64-latest.args index d639218629..2c2c219ba4 100644 --- a/tests/qemuxmlconfdata/net-virtio-teaming-network.x86_64-latest.args +++ b/tests/qemuxmlconfdata/net-virtio-teaming-network.x86_64-latest.args @@ -29,7 +29,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","read-only":false}' \ -device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-stor= age","id":"ide0-0-0","bootindex":1}' \ --netdev '{"type":"tap","fd":"2800","vhost":true,"vhostfd":"2200","id":"hos= tua-backup0"}' \ +-netdev '{"type":"tap","fd":"XXXXXXX","vhost":true,"vhostfd":"XXXXXXX","id= ":"hostua-backup0"}' \ -device '{"driver":"virtio-net-pci","failover":true,"netdev":"hostua-backu= p0","id":"ua-backup0","mac":"00:11:22:33:44:55","bus":"pci.0","addr":"0x2"}= ' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"vfio-pci","host":"0000:06:12.2","id":"hostdev0","failo= ver_pair_id":"ua-backup0","bus":"pci.0","addr":"0x3"}' \ diff --git a/tests/qemuxmlconfdata/net-virtio-vhost.x86_64-latest.args b/te= sts/qemuxmlconfdata/net-virtio-vhost.x86_64-latest.args index fae2efe381..c77cbd2a71 100644 --- a/tests/qemuxmlconfdata/net-virtio-vhost.x86_64-latest.args +++ b/tests/qemuxmlconfdata/net-virtio-vhost.x86_64-latest.args @@ -28,11 +28,11 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/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"}' \ --netdev '{"type":"tap","fds":"2900:2901:2902:2903:2904","vhost":true,"vhos= tfds":"2200:2201:2202:2203:2204","id":"hostnet0"}' \ +-netdev '{"type":"tap","fds":"XXXXXXX","vhost":true,"vhostfds":"XXXXXXX","= id":"hostnet0"}' \ -device '{"driver":"virtio-net-pci","mq":true,"vectors":12,"netdev":"hostn= et0","id":"net0","mac":"52:54:00:e5:48:58","bus":"pci.0","addr":"0x2"}' \ --netdev '{"type":"tap","fd":"2900","vhost":true,"vhostfd":"2200","id":"hos= tnet1"}' \ +-netdev '{"type":"tap","fd":"XXXXXXX","vhost":true,"vhostfd":"XXXXXXX","id= ":"hostnet1"}' \ -device '{"driver":"virtio-net-pci","ioeventfd":true,"netdev":"hostnet1","= id":"net1","mac":"52:54:00:e5:48:59","bus":"pci.0","addr":"0x3"}' \ --netdev '{"type":"tap","fds":"2900:2901:2902:2903:2904","vhost":true,"vhos= tfds":"2200:2201:2202:2203:2204","id":"hostnet2"}' \ +-netdev '{"type":"tap","fds":"XXXXXXX","vhost":true,"vhostfds":"XXXXXXX","= id":"hostnet2"}' \ -device '{"driver":"virtio-net-pci","ioeventfd":true,"mq":true,"vectors":1= 2,"netdev":"hostnet2","id":"net2","mac":"52:54:00:e5:48:5a","bus":"pci.0","= addr":"0x4"}' \ -chardev pty,id=3Dcharserial0 \ -device '{"driver":"isa-serial","chardev":"charserial0","id":"serial0","in= dex":0}' \ diff --git a/tests/qemuxmlconfdata/tap-vhost-incorrect.x86_64-latest.args b= /tests/qemuxmlconfdata/tap-vhost-incorrect.x86_64-latest.args index eebc7071da..9e0df73d75 100644 --- a/tests/qemuxmlconfdata/tap-vhost-incorrect.x86_64-latest.args +++ b/tests/qemuxmlconfdata/tap-vhost-incorrect.x86_64-latest.args @@ -28,9 +28,9 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-test/.c= onfig \ -boot menu=3Don,strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ -device '{"driver":"virtio-serial-pci","id":"virtio-serial0","bus":"pci.0"= ,"addr":"0x6"}' \ --netdev '{"type":"tap","fd":"2800","id":"hostnet0"}' \ +-netdev '{"type":"tap","fd":"XXXXXXX","id":"hostnet0"}' \ -device '{"driver":"e1000","netdev":"hostnet0","id":"net0","mac":"52:54:00= :e5:48:58","bus":"pci.0","addr":"0x2"}' \ --netdev '{"type":"tap","fd":"2800","vhost":true,"vhostfd":"2200","id":"hos= tnet1"}' \ +-netdev '{"type":"tap","fd":"XXXXXXX","vhost":true,"vhostfd":"XXXXXXX","id= ":"hostnet1"}' \ -device '{"driver":"virtio-net-pci","netdev":"hostnet1","id":"net1","mac":= "52:54:00:e5:48:59","bus":"pci.0","addr":"0x3"}' \ -chardev pty,id=3Dcharserial0 \ -device '{"driver":"isa-serial","chardev":"charserial0","id":"serial0","in= dex":0}' \ diff --git a/tests/qemuxmlconfdata/tap-vhost.x86_64-latest.args b/tests/qem= uxmlconfdata/tap-vhost.x86_64-latest.args index 8712ebd8f8..f66842a89d 100644 --- a/tests/qemuxmlconfdata/tap-vhost.x86_64-latest.args +++ b/tests/qemuxmlconfdata/tap-vhost.x86_64-latest.args @@ -33,7 +33,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-test/.c= onfig \ -device '{"driver":"virtio-blk-pci","event_idx":true,"bus":"pci.0","addr":= "0x4","drive":"libvirt-2-format","id":"virtio-disk0","bootindex":2}' \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/Fedora-14-x86_64-= Live-KDE.iso","node-name":"libvirt-1-storage","read-only":true}' \ -device '{"driver":"ide-cd","bus":"ide.1","unit":0,"drive":"libvirt-1-stor= age","id":"ide0-1-0","bootindex":1}' \ --netdev '{"type":"tap","fds":"2800:2801:2802:2803:2804","vhost":true,"vhos= tfds":"2200:2201:2202:2203:2204","id":"hostnet0"}' \ +-netdev '{"type":"tap","fds":"XXXXXXX","vhost":true,"vhostfds":"XXXXXXX","= id":"hostnet0"}' \ -device '{"driver":"virtio-net-pci","mq":true,"vectors":12,"netdev":"hostn= et0","id":"net0","mac":"52:54:00:e5:48:58","bus":"pci.0","addr":"0x2"}' \ -chardev pty,id=3Dcharserial0 \ -device '{"driver":"isa-serial","chardev":"charserial0","id":"serial0","in= dex":0}' \ diff --git a/tests/qemuxmlconfdata/user-aliases.x86_64-latest.args b/tests/= qemuxmlconfdata/user-aliases.x86_64-latest.args index 3e0fe1ff0b..d978f2d7a8 100644 --- a/tests/qemuxmlconfdata/user-aliases.x86_64-latest.args +++ b/tests/qemuxmlconfdata/user-aliases.x86_64-latest.args @@ -49,7 +49,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-gentoo/= .config \ -device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x7","drive":"li= bvirt-2-format","id":"ua-myEncryptedDisk1"}' \ -blockdev '{"driver":"file","filename":"/home/zippy/tmp/install-amd64-mini= mal-20140619.iso","node-name":"libvirt-1-storage","read-only":true,"cache":= {"direct":true,"no-flush":false}}' \ -device '{"driver":"ide-cd","bus":"ide.1","unit":0,"share-rw":true,"drive"= :"libvirt-1-storage","id":"ua-WhatAnAwesomeCDROM","bootindex":2,"write-cach= e":"on"}' \ --netdev '{"type":"tap","fd":"2900","vhost":true,"vhostfd":"2200","id":"hos= tua-CheckoutThisNIC"}' \ +-netdev '{"type":"tap","fd":"XXXXXXX","vhost":true,"vhostfd":"XXXXXXX","id= ":"hostua-CheckoutThisNIC"}' \ -device '{"driver":"virtio-net-pci","netdev":"hostua-CheckoutThisNIC","id"= :"ua-CheckoutThisNIC","mac":"52:54:00:d6:c0:0b","bus":"pci.0","addr":"0x3"}= ' \ -netdev '{"type":"socket","listen":"127.0.0.1:1234","id":"hostua-WeCanAlso= DoServerMode"}' \ -device '{"driver":"rtl8139","netdev":"hostua-WeCanAlsoDoServerMode","id":= "ua-WeCanAlsoDoServerMode","mac":"52:54:00:22:c9:42","bus":"pci.0","addr":"= 0x9"}' \ diff --git a/tests/qemuxmlconftest.c b/tests/qemuxmlconftest.c index a6f2a3a19e..0b0bcdea92 100644 --- a/tests/qemuxmlconftest.c +++ b/tests/qemuxmlconftest.c @@ -542,6 +542,16 @@ testCompareXMLToArgvStabilizeArgs(virCommand *cmd, testCompareXMLToArgvStabilizeOne(&args[a + 1], "vhostfd", = fdsubsts, false); } + a++; + } else if (STREQ(args[a], "-netdev")) { + /* Stabiilize both the singular and plural forms. For the plur= al + * forms we don't bother splitting the colon separated lists i= nto + * individual FDs so they will stay censored */ + testCompareXMLToArgvStabilizeOne(&args[a + 1], "fd", fdsubsts,= false); + testCompareXMLToArgvStabilizeOne(&args[a + 1], "fds", fdsubsts= , false); + testCompareXMLToArgvStabilizeOne(&args[a + 1], "vhostfd", fdsu= bsts, false); + testCompareXMLToArgvStabilizeOne(&args[a + 1], "vhostfds", fds= ubsts, false); + a++; } } --=20 2.54.0 From nobody Sat May 30 15:28:30 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.libvirt.org designates 38.145.34.151 as permitted sender) client-ip=38.145.34.151; envelope-from=devel-bounces@lists.libvirt.org; helo=lists.libvirt.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.libvirt.org designates 38.145.34.151 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=pass(p=reject dis=none) header.from=lists.libvirt.org ARC-Seal: i=1; a=rsa-sha256; t=1779382923; cv=none; d=zohomail.com; s=zohoarc; b=i4SRLvkr6DcXlO9D0bhR5uttdoEjUQIQMUJFhNw4UoAw42cFdKuCmiFDQZ62+Mm9jtxpz6HJrYA9x2HaYodIzTiw3oyNqhaWv104P6r/auOmlFm8i2auAbTnlqX9YmHvIvN/G87U0WBqfmjIXZ7eG2itd0Oo2viORYbriCKvjsQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1779382923; h=Content-Type:Content-Transfer-Encoding:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Owner:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:Reply-To:References:Subject:Subject:To:To:Message-Id:Cc; bh=kuo2CXp2tbZPqfFUmWCTTN3Whs4oq7asqpBaDIwKYnA=; b=Sa13pUemBy1QyQku0jgq5LTBgGqkWLA5bic7fKW8qaobspEWJkowYx/wf7T5cqFvJw/Vg3Rq02TrJZq4sA3FiEnWWvemzvkAFy784tVPrCB1b5t91PJjVHqjUJB+yBQHFy5vt2wADtqZ1GePc6g0SxywEw6AiyoIxC7gmXk5kYQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.libvirt.org designates 38.145.34.151 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=pass header.from= (p=reject dis=none) Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [38.145.34.151]) by mx.zohomail.com with SMTPS id 1779382923828731.3134468318174; Thu, 21 May 2026 10:02:03 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 993) id 1F97341CD5; Thu, 21 May 2026 13:02:02 -0400 (EDT) Received: from [172.19.199.4] (unknown [10.16.107.18]) by lists.libvirt.org (Postfix) with ESMTP id C94D843F1E; Thu, 21 May 2026 12:30:42 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 993) id 6895E41B82; Thu, 21 May 2026 12:30:18 -0400 (EDT) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (3072 bits) server-digest SHA256) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id 0454E41AE0 for ; Thu, 21 May 2026 12:24:06 -0400 (EDT) Received: from mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-689-7IHwicTAMjaSIQoRuJEtpg-1; Thu, 21 May 2026 12:24:04 -0400 Received: from mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.17]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 2B2B7195609F for ; Thu, 21 May 2026 16:24:04 +0000 (UTC) Received: from speedmetal.openshiftapps.com (unknown [10.44.22.3]) by mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 786441956053 for ; Thu, 21 May 2026 16:24:03 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 4.0.1 (2024-03-26) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=0.6 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H4, RCVD_IN_MSPIKE_WL,RCVD_IN_SBL_CSS,SPF_HELO_PASS autolearn=no autolearn_force=no version=4.0.1 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1779380646; h=from:from: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; bh=kuo2CXp2tbZPqfFUmWCTTN3Whs4oq7asqpBaDIwKYnA=; b=JQU68qQcQgnY2jozPsdloLxqTAdGXVuZiWBgiDoPtelS5XSH8Kpmypup5sCSgT/1HYxqyW jjW3bsapJ+byErC7n83Dpi0MjR5zY+HIpEvSl5lFEcDw3OAMyuP3hvVTpvUibliqRSdmhw lick/3AtOSnIX9AGCg4CuJPNMGEVofY= X-MC-Unique: 7IHwicTAMjaSIQoRuJEtpg-1 X-Mimecast-MFC-AGG-ID: 7IHwicTAMjaSIQoRuJEtpg_1779380644 To: devel@lists.libvirt.org Subject: [PATCH 17/30] qemuxmlconftest: Stabilize 'vfio-pci' hostdev fds Date: Thu, 21 May 2026 18:23:26 +0200 Message-ID: <59a5abf15361b21803d3ec261dad6d33dfc0d641.1779380461.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.17 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: wtjvAGiJRrL11hPivsllvB_BFMnbKB5o_SGFWg6bzQQ_1779380644 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: HDG7XIHUTKF7BUY33TLTN7OB2RSFYJJY X-Message-ID-Hash: HDG7XIHUTKF7BUY33TLTN7OB2RSFYJJY X-MailFrom: pkrempa@redhat.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; header-match-devel.lists.libvirt.org-0; emergency; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.10 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: From: Peter Krempa via Devel Reply-To: Peter Krempa X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1779382926507154100 Content-Type: text/plain; charset="utf-8" From: Peter Krempa Prepare to use real FDs in tests. Signed-off-by: Peter Krempa Reviewed-by: Michal Privoznik --- tests/qemuxmlconfdata/iommufd-q35-fd.x86_64-latest.args | 2 +- tests/qemuxmlconfdata/iommufd-q35.x86_64-latest.args | 2 +- .../iommufd-virt-pci-bus-single.aarch64-latest.args | 2 +- tests/qemuxmlconfdata/iommufd-virt.aarch64-latest.args | 4 ++-- tests/qemuxmlconfdata/iommufd.x86_64-latest.args | 2 +- tests/qemuxmlconftest.c | 2 ++ 6 files changed, 8 insertions(+), 6 deletions(-) diff --git a/tests/qemuxmlconfdata/iommufd-q35-fd.x86_64-latest.args b/test= s/qemuxmlconfdata/iommufd-q35-fd.x86_64-latest.args index f88e019770..730855afe1 100644 --- a/tests/qemuxmlconfdata/iommufd-q35-fd.x86_64-latest.args +++ b/tests/qemuxmlconfdata/iommufd-q35-fd.x86_64-latest.args @@ -36,6 +36,6 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-q35-tes= t/.config \ -global ICH9-LPC.noreboot=3Doff \ -watchdog-action reset \ -object '{"qom-type":"iommufd","id":"iommufd0","fd":"XXXXXXX"}' \ --device '{"driver":"vfio-pci","id":"hostdev0","iommufd":"iommufd0","fd":"0= ","bus":"pcie.0","addr":"0x3"}' \ +-device '{"driver":"vfio-pci","id":"hostdev0","iommufd":"iommufd0","fd":"X= XXXXXX","bus":"pcie.0","addr":"0x3"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxmlconfdata/iommufd-q35.x86_64-latest.args b/tests/q= emuxmlconfdata/iommufd-q35.x86_64-latest.args index f88e019770..730855afe1 100644 --- a/tests/qemuxmlconfdata/iommufd-q35.x86_64-latest.args +++ b/tests/qemuxmlconfdata/iommufd-q35.x86_64-latest.args @@ -36,6 +36,6 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-q35-tes= t/.config \ -global ICH9-LPC.noreboot=3Doff \ -watchdog-action reset \ -object '{"qom-type":"iommufd","id":"iommufd0","fd":"XXXXXXX"}' \ --device '{"driver":"vfio-pci","id":"hostdev0","iommufd":"iommufd0","fd":"0= ","bus":"pcie.0","addr":"0x3"}' \ +-device '{"driver":"vfio-pci","id":"hostdev0","iommufd":"iommufd0","fd":"X= XXXXXX","bus":"pcie.0","addr":"0x3"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxmlconfdata/iommufd-virt-pci-bus-single.aarch64-late= st.args b/tests/qemuxmlconfdata/iommufd-virt-pci-bus-single.aarch64-latest.= args index 28d8a47c31..e92b7b44fd 100644 --- a/tests/qemuxmlconfdata/iommufd-virt-pci-bus-single.aarch64-latest.args +++ b/tests/qemuxmlconfdata/iommufd-virt-pci-bus-single.aarch64-latest.args @@ -27,6 +27,6 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-foo/.co= nfig \ -boot strict=3Don \ -audiodev '{"id":"audio1","driver":"none"}' \ -object '{"qom-type":"iommufd","id":"iommufd0","fd":"XXXXXXX"}' \ --device '{"driver":"vfio-pci","id":"hostdev0","iommufd":"iommufd0","fd":"0= ","bus":"pcie.0","addr":"0x1"}' \ +-device '{"driver":"vfio-pci","id":"hostdev0","iommufd":"iommufd0","fd":"X= XXXXXX","bus":"pcie.0","addr":"0x1"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxmlconfdata/iommufd-virt.aarch64-latest.args b/tests= /qemuxmlconfdata/iommufd-virt.aarch64-latest.args index e910ccc760..6719b771c4 100644 --- a/tests/qemuxmlconfdata/iommufd-virt.aarch64-latest.args +++ b/tests/qemuxmlconfdata/iommufd-virt.aarch64-latest.args @@ -30,7 +30,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-foo/.co= nfig \ -device '{"driver":"pcie-root-port","port":10,"chassis":3,"id":"pci.3","bu= s":"pcie.0","addr":"0x1.0x2"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -object '{"qom-type":"iommufd","id":"iommufd0","fd":"XXXXXXX"}' \ --device '{"driver":"vfio-pci","id":"hostdev0","iommufd":"iommufd0","fd":"0= ","bus":"pci.1","addr":"0x0"}' \ --device '{"driver":"vfio-pci","id":"hostdev1","iommufd":"iommufd0","fd":"0= ","bus":"pci.2","addr":"0x0"}' \ +-device '{"driver":"vfio-pci","id":"hostdev0","iommufd":"iommufd0","fd":"X= XXXXXX","bus":"pci.1","addr":"0x0"}' \ +-device '{"driver":"vfio-pci","id":"hostdev1","iommufd":"iommufd0","fd":"X= XXXXXX","bus":"pci.2","addr":"0x0"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxmlconfdata/iommufd.x86_64-latest.args b/tests/qemux= mlconfdata/iommufd.x86_64-latest.args index f7e53ac388..8ee6b97615 100644 --- a/tests/qemuxmlconfdata/iommufd.x86_64-latest.args +++ b/tests/qemuxmlconfdata/iommufd.x86_64-latest.args @@ -29,7 +29,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-foo/.co= nfig \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -object '{"qom-type":"iommufd","id":"iommufd0","fd":"XXXXXXX"}' \ --device '{"driver":"vfio-pci","id":"hostdev0","iommufd":"iommufd0","fd":"0= ","bus":"pci.0","addr":"0x3"}' \ +-device '{"driver":"vfio-pci","id":"hostdev0","iommufd":"iommufd0","fd":"X= XXXXXX","bus":"pci.0","addr":"0x3"}' \ -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/qemuxmlconftest.c b/tests/qemuxmlconftest.c index 0b0bcdea92..6ccafcde0e 100644 --- a/tests/qemuxmlconftest.c +++ b/tests/qemuxmlconftest.c @@ -540,6 +540,8 @@ testCompareXMLToArgvStabilizeArgs(virCommand *cmd, } else if (STREQ(args[a], "-device")) { if (STRPREFIX(args[a + 1], "{\"driver\":\"vhost-vsock-")) { testCompareXMLToArgvStabilizeOne(&args[a + 1], "vhostfd", = fdsubsts, false); + } else if (STRPREFIX(args[a + 1], "{\"driver\":\"vfio-pci\""))= { + testCompareXMLToArgvStabilizeOne(&args[a + 1], "fd", fdsub= sts, false); } a++; --=20 2.54.0 From nobody Sat May 30 15:28:30 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.libvirt.org designates 38.145.34.151 as permitted sender) client-ip=38.145.34.151; envelope-from=devel-bounces@lists.libvirt.org; helo=lists.libvirt.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.libvirt.org designates 38.145.34.151 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=pass(p=reject dis=none) header.from=lists.libvirt.org ARC-Seal: i=1; a=rsa-sha256; t=1779382966; cv=none; d=zohomail.com; s=zohoarc; b=A4bkUEO5Dzcgdq7q0793MgruS6RkBk1g+4G/ZDGZwiXuo0Wb4B1wXWfIR2SXdbsznTqtUMFo0kduwJhn0yx/+WhO3PLfIYJFpsAkh+SrvGonkVtQCKxfHbZi2LJi+QQhcPbwyJnaPdbc3A5aAbmu0Bwljyi2sye3fjZidHG9fbs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1779382966; h=Content-Type:Content-Transfer-Encoding:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Owner:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:Reply-To:References:Subject:Subject:To:To:Message-Id:Cc; bh=Z3dk8Vj9fZp9RiyUKHt+FUFDbAaOxzsv2BOf1X/2sX0=; b=eaViOYKfwddU+ztBzx/VolHCPa+PcZBz+Rx7mrCCksFuMnJ4MUTYusYwl4SDLTywlceuqRo9sZIi4FuG4hlr2CZcZ5vj8xonrXvZ9g9QLgISgrL2mMwzv9DtW9pR8zb4Xql8cR85SyFQAHL3vtY0X2h0lMpGt3ZHA8DbU0jlVkA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.libvirt.org designates 38.145.34.151 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=pass header.from= (p=reject dis=none) Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [38.145.34.151]) by mx.zohomail.com with SMTPS id 177938296681560.371451555411; Thu, 21 May 2026 10:02:46 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 993) id C469841AE0; Thu, 21 May 2026 13:02:45 -0400 (EDT) Received: from [172.19.199.4] (unknown [10.16.107.18]) by lists.libvirt.org (Postfix) with ESMTP id 6AD4F43F71; Thu, 21 May 2026 12:31:35 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 993) id D121641DFE; Thu, 21 May 2026 12:31:27 -0400 (EDT) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (3072 bits) server-digest SHA256) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id F334741BB6 for ; Thu, 21 May 2026 12:24:07 -0400 (EDT) Received: from mx-prod-mc-03.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-19-JZmv7o-UNz-6wLDi6ZQ7TQ-1; Thu, 21 May 2026 12:24:06 -0400 Received: from mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.17]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 4CE601956062 for ; Thu, 21 May 2026 16:24:05 +0000 (UTC) Received: from speedmetal.openshiftapps.com (unknown [10.44.22.3]) by mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 914D31956053 for ; Thu, 21 May 2026 16:24:04 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 4.0.1 (2024-03-26) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=0.6 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H4, RCVD_IN_MSPIKE_WL,RCVD_IN_SBL_CSS,SPF_HELO_PASS autolearn=no autolearn_force=no version=4.0.1 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1779380647; h=from:from: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; bh=Z3dk8Vj9fZp9RiyUKHt+FUFDbAaOxzsv2BOf1X/2sX0=; b=i6cQj2/tJzDB9S7P1O13kh3Pujq7fKXSh80m6TpWe2N1WwK8EgnMQSbpeFpX+m/iesa6cl jVZWY04IAKgYaS6MXFuOdtFPaCMqq+RglR1HJDBF2cRZFRSEsFomlhOlHeQLF9uirwrP+E dliE7bF1J5Nus5PQKuKsyYOZzUlLswg= X-MC-Unique: JZmv7o-UNz-6wLDi6ZQ7TQ-1 X-Mimecast-MFC-AGG-ID: JZmv7o-UNz-6wLDi6ZQ7TQ_1779380645 To: devel@lists.libvirt.org Subject: [PATCH 18/30] testutilsqemu: Use real FD for monitor FDs instantiated by 'testQemuPrepareHostBackendChardevOne' Date: Thu, 21 May 2026 18:23:27 +0200 Message-ID: <55b055155506cb3ccd3c6d2336f8623759d9c170.1779380461.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.17 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: SO9IMSrVqk0ileNLEskX3QBre4QSn9KGNFoOQ7YlelI_1779380645 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: BIYZKK3P6P65DVFODDLARWGFARP4SYGX X-Message-ID-Hash: BIYZKK3P6P65DVFODDLARWGFARP4SYGX X-MailFrom: pkrempa@redhat.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; header-match-devel.lists.libvirt.org-0; emergency; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.10 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: From: Peter Krempa via Devel Reply-To: Peter Krempa X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1779382967233158500 Content-Type: text/plain; charset="utf-8" From: Peter Krempa Switch to 'virTestMakeDummyFD' which uses a real FD. No otuputs are changed thanks to the code which censors 'fd' field of --add-fd. Signed-off-by: Peter Krempa Reviewed-by: Michal Privoznik --- tests/testutilsqemu.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/tests/testutilsqemu.c b/tests/testutilsqemu.c index 7c0c975261..e8cd1b16b1 100644 --- a/tests/testutilsqemu.c +++ b/tests/testutilsqemu.c @@ -1037,8 +1037,7 @@ testQemuPrepareHostBackendChardevOne(virDomainDeviceD= ef *dev, return 0; } else { devalias =3D "monitor"; - fakesourcefd =3D 1764; - virTestDummyFDContextMarkFD(fakesourcefd, g_strdup("@mon-fd@")); + fakesourcefd =3D virTestMakeDummyFD(g_strdup("@mon-fd@")); } switch ((virDomainChrType) chardev->type) { --=20 2.54.0 From nobody Sat May 30 15:28:30 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.libvirt.org designates 38.145.34.151 as permitted sender) client-ip=38.145.34.151; envelope-from=devel-bounces@lists.libvirt.org; helo=lists.libvirt.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.libvirt.org designates 38.145.34.151 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=pass(p=reject dis=none) header.from=lists.libvirt.org ARC-Seal: i=1; a=rsa-sha256; t=1779383735; cv=none; d=zohomail.com; s=zohoarc; b=kb8Q1c3hyfAboSyAm6hxoJ68Vr7NllT/1RjMTxBq2/2YO14TI55yh2kUxkJB8AyykPhmls8Ma3vhTcQXjKufDYfcJVkki1Cium2iOBDSAQoXKtk++lxXmX5hs3TP9EPsivHzFy7FLbCS/HCSxSOv9Qb3IwSjvUim4o+BAyD6mlQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1779383735; h=Content-Type:Content-Transfer-Encoding:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Owner:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:Reply-To:References:Subject:Subject:To:To:Message-Id:Cc; bh=1yvuv6o6fD8PDfp2KfmPbKovGdX+LtvrA5G4LhKxZf4=; b=dz4Yg+Ot+1CaFfGIj9TthZ166E9r11gVqO3hSppyyYHjTDSmZiCTWbs75S439kuHLLW0p9SOVZau5fi6vBmVJiiFPgPIm73pNZPhEmaSx/9tbMBhu7Dp2XHUIKG9eH0r8600ApCg/tOHgDj3WAeYK+2huMwAUfOd/eX6fFcGOeU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.libvirt.org designates 38.145.34.151 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=pass header.from= (p=reject dis=none) Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [38.145.34.151]) by mx.zohomail.com with SMTPS id 1779383735865242.2374238937765; Thu, 21 May 2026 10:15:35 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 993) id 1D9F4419ED; Thu, 21 May 2026 13:15:35 -0400 (EDT) Received: from [172.19.199.4] (unknown [10.16.107.18]) by lists.libvirt.org (Postfix) with ESMTP id 556164408A; Thu, 21 May 2026 12:33:38 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 993) id 53B6C41B21; Thu, 21 May 2026 12:33:25 -0400 (EDT) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (3072 bits) server-digest SHA256) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id 1E2B341B21 for ; Thu, 21 May 2026 12:24:14 -0400 (EDT) Received: from mx-prod-mc-05.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-184-gKmnvDmoNDKCsrjR0dI7OA-1; Thu, 21 May 2026 12:24:07 -0400 Received: from mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.17]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 738AF1956088 for ; Thu, 21 May 2026 16:24:06 +0000 (UTC) Received: from speedmetal.openshiftapps.com (unknown [10.44.22.3]) by mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id C030A1956053 for ; Thu, 21 May 2026 16:24:05 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 4.0.1 (2024-03-26) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=0.6 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H5, RCVD_IN_MSPIKE_WL,RCVD_IN_SBL_CSS,SPF_HELO_PASS autolearn=no autolearn_force=no version=4.0.1 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1779380653; h=from:from: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; bh=1yvuv6o6fD8PDfp2KfmPbKovGdX+LtvrA5G4LhKxZf4=; b=QAxkcnb4E4bcZMQ6wkwx/LPCi59JeMfkpuxGOheYIqiQ/dGqyVH89pmCodhgfntmB/EPLK i1DwaqGstJcr7JVWtfViqkqSw7lVZqKAHpiTfLM6wCm6w8vD7bGu+xDocIqMvGFQMkf7oO UYkp7BrG5lrfz5TFgjtCZgTzblHuPoQ= X-MC-Unique: gKmnvDmoNDKCsrjR0dI7OA-1 X-Mimecast-MFC-AGG-ID: gKmnvDmoNDKCsrjR0dI7OA_1779380646 To: devel@lists.libvirt.org Subject: [PATCH 19/30] testQemuInfoSetArgs: Use real FDs with 'ARG_FD_GROUP' Date: Thu, 21 May 2026 18:23:28 +0200 Message-ID: <74c660048ceac438cd67c4955f88c9d43e550445.1779380461.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.17 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: EYTeNsm_d09KjfglUFPJhmfWWVbuEyxvH3GLe2L9TI0_1779380646 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: GNVPSQY6HRJNTMT5KGPWHR6UIMQYDCGH X-Message-ID-Hash: GNVPSQY6HRJNTMT5KGPWHR6UIMQYDCGH X-MailFrom: pkrempa@redhat.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; header-match-devel.lists.libvirt.org-0; emergency; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.10 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: From: Peter Krempa via Devel Reply-To: Peter Krempa X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1779383738477154100 Content-Type: text/plain; charset="utf-8" From: Peter Krempa Switch over to 'virTestMakeDummyFD' which allows to use real FDs in the test and also allows to track them in the output files in a stable way. Signed-off-by: Peter Krempa Reviewed-by: Michal Privoznik --- .../disk-source-fd.x86_64-latest.args | 16 ++++++++-------- .../iommufd-q35-fd.x86_64-latest.args | 2 +- tests/qemuxmlconftest.c | 14 +++++++------- tests/testutilsqemu.c | 15 +-------------- 4 files changed, 17 insertions(+), 30 deletions(-) diff --git a/tests/qemuxmlconfdata/disk-source-fd.x86_64-latest.args b/test= s/qemuxmlconfdata/disk-source-fd.x86_64-latest.args index 54f7839868..4a3dfdc0bf 100644 --- a/tests/qemuxmlconfdata/disk-source-fd.x86_64-latest.args +++ b/tests/qemuxmlconfdata/disk-source-fd.x86_64-latest.args @@ -27,26 +27,26 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUG= uest1/.config \ -no-shutdown \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --add-fd set=3D5,fd=3DXXXXXXX,opaque=3Dlibvirt-6-storage0 \ --add-fd set=3D5,fd=3DXXXXXXX,opaque=3Dlibvirt-6-storage1 \ +-add-fd set=3D5,fd=3D@testgroup2-0@-dup,opaque=3Dlibvirt-6-storage0 \ +-add-fd set=3D5,fd=3D@testgroup2-1@-dup,opaque=3Dlibvirt-6-storage1 \ -blockdev '{"driver":"file","filename":"/dev/fdset/5","node-name":"libvirt= -6-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-6-format","read-only":false,"driver":"qco= w2","file":"libvirt-6-storage"}' \ -device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x2","drive":"li= bvirt-6-format","id":"virtio-disk4","bootindex":1}' \ --add-fd set=3D4,fd=3DXXXXXXX,opaque=3Dlibvirt-5-storage0 \ +-add-fd set=3D4,fd=3D@raw-rw-base-0@-dup,opaque=3Dlibvirt-5-storage0 \ -blockdev '{"driver":"file","filename":"/dev/fdset/4","node-name":"libvirt= -5-storage","read-only":false,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-5-format","read-only":true,"driver":"raw"= ,"file":"libvirt-5-storage"}' \ --add-fd set=3D3,fd=3DXXXXXXX,opaque=3Dlibvirt-4-storage0 \ --add-fd set=3D3,fd=3DXXXXXXX,opaque=3Dlibvirt-4-storage1 \ +-add-fd set=3D3,fd=3D@testgroup6-0@-dup,opaque=3Dlibvirt-4-storage0 \ +-add-fd set=3D3,fd=3D@testgroup6-1@-dup,opaque=3Dlibvirt-4-storage1 \ -blockdev '{"driver":"file","filename":"/dev/fdset/3","node-name":"libvirt= -4-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-4-format","read-only":true,"driver":"qcow= 2","file":"libvirt-4-storage","backing":"libvirt-5-format"}' \ --add-fd set=3D2,fd=3DXXXXXXX,opaque=3Dlibvirt-3-storage0 \ +-add-fd set=3D2,fd=3D@testgroup5-0@-dup,opaque=3Dlibvirt-3-storage0 \ -blockdev '{"driver":"file","filename":"/dev/fdset/2","node-name":"libvirt= -3-storage","read-only":false,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-3-format","read-only":false,"driver":"qco= w2","file":"libvirt-3-storage","backing":"libvirt-4-format"}' \ -device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x3","drive":"li= bvirt-3-format","id":"virtio-disk5"}' \ --add-fd set=3D1,fd=3DXXXXXXX,opaque=3Dlibvirt-2-storage0 \ +-add-fd set=3D1,fd=3D@cdimage-ro-0@-dup,opaque=3Dlibvirt-2-storage0 \ -blockdev '{"driver":"file","filename":"/dev/fdset/1","node-name":"libvirt= -2-storage","read-only":true}' \ -device '{"driver":"ide-cd","bus":"ide.0","unit":0,"drive":"libvirt-2-stor= age","id":"ide0-0-0"}' \ --add-fd set=3D0,fd=3DXXXXXXX,opaque=3Dlibvirt-1-storage0 \ +-add-fd set=3D0,fd=3D@cdimage-rw-0@-dup,opaque=3Dlibvirt-1-storage0 \ -blockdev '{"driver":"file","filename":"/dev/fdset/0","node-name":"libvirt= -1-storage","read-only":false,"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":1,"drive":"libvirt-1-form= at","id":"ide0-0-1"}' \ diff --git a/tests/qemuxmlconfdata/iommufd-q35-fd.x86_64-latest.args b/test= s/qemuxmlconfdata/iommufd-q35-fd.x86_64-latest.args index 730855afe1..bf4ee71d7a 100644 --- a/tests/qemuxmlconfdata/iommufd-q35-fd.x86_64-latest.args +++ b/tests/qemuxmlconfdata/iommufd-q35-fd.x86_64-latest.args @@ -35,7 +35,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-q35-tes= t/.config \ -device '{"driver":"qxl-vga","id":"video0","max_outputs":1,"ram_size":6710= 8864,"vram_size":33554432,"vram64_size_mb":0,"vgamem_mb":8,"bus":"pcie.0","= addr":"0x1"}' \ -global ICH9-LPC.noreboot=3Doff \ -watchdog-action reset \ --object '{"qom-type":"iommufd","id":"iommufd0","fd":"XXXXXXX"}' \ +-object '{"qom-type":"iommufd","id":"iommufd0","fd":"@iommu-0@-dup"}' \ -device '{"driver":"vfio-pci","id":"hostdev0","iommufd":"iommufd0","fd":"X= XXXXXX","bus":"pcie.0","addr":"0x3"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxmlconftest.c b/tests/qemuxmlconftest.c index 6ccafcde0e..80b1577475 100644 --- a/tests/qemuxmlconftest.c +++ b/tests/qemuxmlconftest.c @@ -1749,12 +1749,12 @@ mymain(void) DO_TEST_CAPS_LATEST("disk-backing-chains-noindex"); DO_TEST_CAPS_LATEST("disk-qcow2-datafile-store"); DO_TEST_CAPS_ARCH_LATEST_FULL("disk-source-fd", "x86_64", - ARG_FD_GROUP, "testgroup2", false, 2, 20= 0, 205, - ARG_FD_GROUP, "testgroup5", false, 1, 20= 4, - ARG_FD_GROUP, "cdimage-ro", false, 1, 20= 7, - ARG_FD_GROUP, "cdimage-rw", true, 1, 208, - ARG_FD_GROUP, "raw-rw-base", true, 1, 20= 9, - ARG_FD_GROUP, "testgroup6", false, 2, 24= 7, 248); + ARG_FD_GROUP, "testgroup2", false, 2, + ARG_FD_GROUP, "testgroup5", false, 1, + ARG_FD_GROUP, "cdimage-ro", false, 1, + ARG_FD_GROUP, "cdimage-rw", true, 1, + ARG_FD_GROUP, "raw-rw-base", true, 1, + ARG_FD_GROUP, "testgroup6", false, 2); DO_TEST_CAPS_LATEST("disk-slices"); DO_TEST_CAPS_LATEST("disk-rotation"); @@ -2978,7 +2978,7 @@ mymain(void) DO_TEST_CAPS_LATEST("iommufd"); DO_TEST_CAPS_LATEST("iommufd-q35"); DO_TEST_CAPS_ARCH_LATEST_FULL("iommufd-q35-fd", "x86_64", - ARG_FD_GROUP, "iommu", false, 1, 20); + ARG_FD_GROUP, "iommu", false, 1); DO_TEST_CAPS_ARCH_LATEST("iommufd-virt", "aarch64"); DO_TEST_CAPS_ARCH_LATEST("iommufd-virt-pci-bus-single", "aarch64"); diff --git a/tests/testutilsqemu.c b/tests/testutilsqemu.c index e8cd1b16b1..81dff17cc9 100644 --- a/tests/testutilsqemu.c +++ b/tests/testutilsqemu.c @@ -714,28 +714,15 @@ testQemuInfoSetArgs(testQemuInfo *info, case ARG_FD_GROUP: { virDomainFDTuple *new =3D virDomainFDTupleNew(); const char *fdname =3D va_arg(argptr, char *); - VIR_AUTOCLOSE fakefd =3D open("/dev/zero", O_RDWR); bool writable =3D va_arg(argptr, int); size_t i; new->nfds =3D va_arg(argptr, unsigned int); new->fds =3D g_new0(int, new->nfds); - new->testfds =3D g_new0(int, new->nfds); new->writable =3D writable; for (i =3D 0; i < new->nfds; i++) { - new->testfds[i] =3D va_arg(argptr, unsigned int); - - if (fcntl(new->testfds[i], F_GETFD) !=3D -1) { - fprintf(stderr, "fd '%d' is already in use\n", new->te= stfds[i]); - abort(); - } - - if ((new->fds[i] =3D dup(fakefd)) < 0) { - fprintf(stderr, "failed to duplicate fake fd: %s", - g_strerror(errno)); - abort(); - } + new->fds[i] =3D virTestMakeDummyFD(g_strdup_printf("@%s-%z= u@", fdname, i)); } if (!info->args.fds) --=20 2.54.0 From nobody Sat May 30 15:28:30 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.libvirt.org designates 38.145.34.151 as permitted sender) client-ip=38.145.34.151; envelope-from=devel-bounces@lists.libvirt.org; helo=lists.libvirt.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.libvirt.org designates 38.145.34.151 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=pass(p=reject dis=none) header.from=lists.libvirt.org ARC-Seal: i=1; a=rsa-sha256; t=1779383023; cv=none; d=zohomail.com; s=zohoarc; b=lx8Hvq66dK5P9Qn/5nN3ukEdgFNT6rC2CspSA9WMLKN/ZDRKYd1VchNuS7U56WgpHbfl8psQrVFZ85boISS6ovc+r5yJ9wGA+eqToiglD9SWLeVjHJEoemFZkMYUSP/fjZS/3W+sxI76iZejVXOV0QwU5wtS+RYN0HfSq+uiOlM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1779383023; h=Content-Type:Content-Transfer-Encoding:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Owner:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:Reply-To:References:Subject:Subject:To:To:Message-Id:Cc; bh=7L92kca45WD61f1Lyrggwc5udjgwZc6/kFZqaL9wQeY=; b=dJRDMHTTLTCy1x1zolsDtl3+DoLKaJz4GsK6Pzr/bQxAqZ6SUf5OAob1zxdUis6OQ7vFSB0woDWy6hhk36XBpRZkW6l8rQyfH/fxz/iZVtsPXst31lLkkqkgisgPl5yggajBgmG7R3HGSVW9O/Omuw7g5Y09OY9UoFyQqv8dEn4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.libvirt.org designates 38.145.34.151 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=pass header.from= (p=reject dis=none) Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [38.145.34.151]) by mx.zohomail.com with SMTPS id 1779383023367553.5866158835001; Thu, 21 May 2026 10:03:43 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 993) id 1A51B41B82; Thu, 21 May 2026 13:03:42 -0400 (EDT) Received: from [172.19.199.4] (unknown [10.16.107.18]) by lists.libvirt.org (Postfix) with ESMTP id 8FAA841BC7; Thu, 21 May 2026 12:32:57 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 993) id 61E9641CEE; Thu, 21 May 2026 12:32:49 -0400 (EDT) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (3072 bits) server-digest SHA256) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id 9696541BDB for ; Thu, 21 May 2026 12:24:10 -0400 (EDT) Received: from mx-prod-mc-05.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-263-c2BFhKxfP_i11GokACJRyg-1; Thu, 21 May 2026 12:24:08 -0400 Received: from mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.17]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 8D483195608A for ; Thu, 21 May 2026 16:24:07 +0000 (UTC) Received: from speedmetal.openshiftapps.com (unknown [10.44.22.3]) by mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id DADEE1956053 for ; Thu, 21 May 2026 16:24:06 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 4.0.1 (2024-03-26) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=0.6 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H4, RCVD_IN_MSPIKE_WL,RCVD_IN_SBL_CSS,SPF_HELO_PASS autolearn=no autolearn_force=no version=4.0.1 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1779380650; h=from:from: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; bh=7L92kca45WD61f1Lyrggwc5udjgwZc6/kFZqaL9wQeY=; b=RmO/k6leYynLImGqZDlOzT5vbvdzAngXF1dYH0yEfIiv2P6NQgaTnTcLEVwboxM7Zp7RCm 8ybipG2CuNOj7G0t5uUHGLD3dIFMpWdIM0/jeexUedMraHweIieMX/hl6M2GMDFajPnxsN kbI9M0kDPbIEr0DvlEtFA87pv+HQpqY= X-MC-Unique: c2BFhKxfP_i11GokACJRyg-1 X-Mimecast-MFC-AGG-ID: c2BFhKxfP_i11GokACJRyg_1779380647 To: devel@lists.libvirt.org Subject: [PATCH 20/30] virDomainFDTuple: drop 'testfds' field Date: Thu, 21 May 2026 18:23:29 +0200 Message-ID: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.17 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: TTQdRVNIfZ2qBvOpFoTFphO2X24D3l3QLrw_J3elqLA_1779380647 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: L52BXVWGNRTUG4K6JNPPPWZJAMA6VA3X X-Message-ID-Hash: L52BXVWGNRTUG4K6JNPPPWZJAMA6VA3X X-MailFrom: pkrempa@redhat.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; header-match-devel.lists.libvirt.org-0; emergency; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.10 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: From: Peter Krempa via Devel Reply-To: Peter Krempa X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1779383023740158500 Content-Type: text/plain; charset="utf-8" From: Peter Krempa Thanks to real FD testing we no longer need to inject test infrastructure into production code. Remove it. Signed-off-by: Peter Krempa Reviewed-by: Michal Privoznik --- src/conf/virdomainfd.c | 1 - src/conf/virdomainfd.h | 1 - src/qemu/qemu_domain.c | 10 +--------- src/qemu/qemu_process.c | 10 +++------- 4 files changed, 4 insertions(+), 18 deletions(-) diff --git a/src/conf/virdomainfd.c b/src/conf/virdomainfd.c index 13c3161e6a..86990a10bc 100644 --- a/src/conf/virdomainfd.c +++ b/src/conf/virdomainfd.c @@ -30,7 +30,6 @@ virDomainFDTupleFinalize(GObject *object) VIR_FORCE_CLOSE(fdt->fds[i]); g_free(fdt->fds); - g_free(fdt->testfds); g_free(fdt->selinuxLabel); G_OBJECT_CLASS(vir_domain_fd_tuple_parent_class)->finalize(object); } diff --git a/src/conf/virdomainfd.h b/src/conf/virdomainfd.h index 0c0d475ed6..0ae84f2c0c 100644 --- a/src/conf/virdomainfd.h +++ b/src/conf/virdomainfd.h @@ -10,7 +10,6 @@ struct _virDomainFDTuple { GObject parent; int *fds; size_t nfds; - int *testfds; /* populated by tests to ensure stable FDs */ bool writable; bool tryRestoreLabel; diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index dde257bb70..84c8645259 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -9860,15 +9860,7 @@ qemuDomainPrepareStorageSourceFDs(virStorageSource *= src, for (i =3D 0; i < fdt->nfds; i++) { g_autofree char *idx =3D g_strdup_printf("%zu", i); - int tmpfd; - - if (fdt->testfds) { - /* when testing we want to use stable FD numbers provided by t= he test - * case */ - tmpfd =3D dup2(fdt->fds[i], fdt->testfds[i]); - } else { - tmpfd =3D dup(fdt->fds[i]); - } + int tmpfd =3D dup(fdt->fds[i]); if (tmpfd < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 83f5ebb19c..378b7925c2 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -7774,14 +7774,10 @@ qemuProcessGetPassedIommuFd(virDomainObj *vm) return -1; } - if (fdt->testfds) { - iommufd =3D dup2(fdt->fds[0], fdt->testfds[0]); - } else { - iommufd =3D dup(fdt->fds[0]); + iommufd =3D dup(fdt->fds[0]); - if (qemuSecuritySetImageFDLabel(priv->driver->securityManager, vm-= >def, iommufd) < 0) - return -1; - } + if (qemuSecuritySetImageFDLabel(priv->driver->securityManager, vm->def= , iommufd) < 0) + return -1; priv->iommufd =3D qemuFDPassDirectNew("iommufd", &iommufd); --=20 2.54.0 From nobody Sat May 30 15:28:30 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.libvirt.org designates 38.145.34.151 as permitted sender) client-ip=38.145.34.151; envelope-from=devel-bounces@lists.libvirt.org; helo=lists.libvirt.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.libvirt.org designates 38.145.34.151 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=pass(p=reject dis=none) header.from=lists.libvirt.org ARC-Seal: i=1; a=rsa-sha256; t=1779383503; cv=none; d=zohomail.com; s=zohoarc; b=GnHKrG+HWQ6TxARDmsDeoERlXJAEDjmw/hGvq2NOjqzxEvNKEprTm1RZvb1KTF5HWyIHsqr9HOoheBji//dRwlc1Lj3UML28uhmM9xmONa0Vs0R5N5ROOhpazEH9LZnqODWeJ2jZWuTLyik4KdBbAnQzMN/T9QtBMflN+14O300= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1779383503; h=Content-Type:Content-Transfer-Encoding:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Owner:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:Reply-To:References:Subject:Subject:To:To:Message-Id:Cc; bh=ko92mWwHo4LVqMuDGcl+IC3znSnkZeYC5Hzuu/uYN+E=; b=K2VpaHJSd0WxDKisD6s9tKetes9SL9Rk2sVJSyZWBYka5dgm3h/swRih846SrfZeV2eI8A9GXZW7TG2U7670d9zCdopFbB4TrlFNZEgGnHZSe1TXtLDsDQHPpiiE/VyednyyXiir4klRPu+toW4t78WR7h/H2fJ4sed+cMZolTM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.libvirt.org designates 38.145.34.151 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=pass header.from= (p=reject dis=none) Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [38.145.34.151]) by mx.zohomail.com with SMTPS id 1779383503108309.0697982272801; Thu, 21 May 2026 10:11:43 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 993) id A32A141B75; Thu, 21 May 2026 13:11:41 -0400 (EDT) Received: from [172.19.199.4] (unknown [10.16.107.18]) by lists.libvirt.org (Postfix) with ESMTP id E77154403F; Thu, 21 May 2026 12:33:27 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 993) id 51BDB41ACF; Thu, 21 May 2026 12:33:16 -0400 (EDT) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (3072 bits) server-digest SHA256) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id ECF8841B0C for ; Thu, 21 May 2026 12:24:11 -0400 (EDT) Received: from mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-311-3Tb5FUqFMyiSjSZ8R87SeA-1; Thu, 21 May 2026 12:24:09 -0400 Received: from mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.17]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id A7CA9180047F for ; Thu, 21 May 2026 16:24:08 +0000 (UTC) Received: from speedmetal.openshiftapps.com (unknown [10.44.22.3]) by mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 016ED1956056 for ; Thu, 21 May 2026 16:24:07 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 4.0.1 (2024-03-26) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H4, RCVD_IN_MSPIKE_WL,SPF_HELO_PASS autolearn=unavailable autolearn_force=no version=4.0.1 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1779380651; h=from:from: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; bh=ko92mWwHo4LVqMuDGcl+IC3znSnkZeYC5Hzuu/uYN+E=; b=EIwIFQCl+g7AGzAj5dCSA2ta3HdecCgg00EmBBdQ3hiEzRMGcy4SMsvjHlqILK85S3uTto 0/bxIz2eh37DgR9Nae3cyFsrnkCQoSpsFOZu0qBRY/F2LFdbm0Xgc5fDlt43B9LjryUFrS TC1T8edHEtq7HPbkpE36AbtmY72UaMY= X-MC-Unique: 3Tb5FUqFMyiSjSZ8R87SeA-1 X-Mimecast-MFC-AGG-ID: 3Tb5FUqFMyiSjSZ8R87SeA_1779380648 To: devel@lists.libvirt.org Subject: [PATCH 21/30] testQemuPrepareHostBackendChardevOne: Use real FDs for all cases Date: Thu, 21 May 2026 18:23:30 +0200 Message-ID: <6b11c0c92483772a67d531a52085217ddc92b366.1779380461.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.17 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: iI_wHdGyGIPBX2DxG6Hz5XHdiVDJEE9TKXwWwisxwFk_1779380648 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: XGASPKDPC7EQS5W3RP4ESHJBXWWMIJMM X-Message-ID-Hash: XGASPKDPC7EQS5W3RP4ESHJBXWWMIJMM X-MailFrom: pkrempa@redhat.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; header-match-devel.lists.libvirt.org-0; emergency; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.10 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: From: Peter Krempa via Devel Reply-To: Peter Krempa X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1779383506030158500 Content-Type: text/plain; charset="utf-8" From: Peter Krempa Use the virTestMakeDummyFD() function to setup real FDs for all chardev backends which are set up via testQemuPrepareHostBackendChardevOne. Signed-off-by: Peter Krempa Reviewed-by: Michal Privoznik --- .../aarch64-pci-serial.aarch64-latest.args | 2 +- .../aarch64-virt-graphics.aarch64-latest.args | 2 +- ...h64-virt-headless-mmio.aarch64-latest.args | 2 +- .../aarch64-virt-headless.aarch64-latest.args | 2 +- .../channel-unix-guestfwd.x86_64-latest.args | 2 +- ...hannel-unix-source-path.x86_64-latest.args | 20 +++++++++---------- .../channel-virtio-unix.x86_64-latest.args | 8 ++++---- .../chardev-backends-json.x86_64-9.1.0.args | 8 ++++---- .../chardev-backends-json.x86_64-latest.args | 8 ++++---- .../chardev-backends.x86_64-9.1.0.args | 8 ++++---- .../chardev-backends.x86_64-latest.args | 8 ++++---- .../chardev-label.x86_64-latest.args | 2 +- .../console-virtio-unix.x86_64-latest.args | 2 +- ...ch64-virt-headless.aarch64-latest+hvf.args | 2 +- ...x86_64-q35-headless.x86_64-latest+hvf.args | 2 +- ...ch64-virt-graphics.loongarch64-latest.args | 2 +- ...ch64-virt-headless.loongarch64-latest.args | 2 +- .../name-escape.x86_64-latest.args | 2 +- .../parallel-unix-chardev.x86_64-latest.args | 2 +- .../ppc64-pseries-graphics.ppc64-latest.args | 2 +- .../ppc64-pseries-headless.ppc64-latest.args | 2 +- .../q35-virt-manager-basic.x86_64-latest.args | 2 +- .../riscv64-virt-graphics.riscv64-latest.args | 2 +- ...v64-virt-headless-mmio.riscv64-latest.args | 2 +- .../riscv64-virt-headless.riscv64-latest.args | 2 +- .../s390x-ccw-graphics.s390x-latest.args | 2 +- .../s390x-ccw-headless.s390x-latest.args | 2 +- .../serial-file-chardev.x86_64-latest.args | 2 +- .../serial-file-log.x86_64-latest.args | 4 ++-- .../serial-many-chardev.x86_64-latest.args | 2 +- .../serial-unix-chardev.x86_64-latest.args | 2 +- ...rtcard-passthrough-unix.x86_64-latest.args | 2 +- .../usb-redir-unix.x86_64-latest.args | 2 +- .../user-aliases.x86_64-latest.args | 2 +- .../virtio-rng-egd-unix.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 +- tests/testutilsqemu.c | 16 +++++---------- 40 files changed, 69 insertions(+), 75 deletions(-) diff --git a/tests/qemuxmlconfdata/aarch64-pci-serial.aarch64-latest.args b= /tests/qemuxmlconfdata/aarch64-pci-serial.aarch64-latest.args index 504f401021..58f924055a 100644 --- a/tests/qemuxmlconfdata/aarch64-pci-serial.aarch64-latest.args +++ b/tests/qemuxmlconfdata/aarch64-pci-serial.aarch64-latest.args @@ -28,7 +28,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-aarch64= test/.config \ -device '{"driver":"pcie-root-port","port":8,"chassis":1,"id":"pci.1","bus= ":"pcie.0","multifunction":true,"addr":"0x1"}' \ -device '{"driver":"pcie-pci-bridge","id":"pci.2","bus":"pci.1","addr":"0x= 0"}' \ -device '{"driver":"pcie-root-port","port":9,"chassis":3,"id":"pci.3","bus= ":"pcie.0","addr":"0x1.0x1"}' \ --add-fd set=3D0,fd=3DXXXXXXX,opaque=3Dserial0-log \ +-add-fd set=3D0,fd=3D@serial0-log-fd@,opaque=3Dserial0-log \ -chardev pty,id=3Dcharserial0,logfile=3D/dev/fdset/0,logappend=3Don \ -device '{"driver":"pci-serial","chardev":"charserial0","id":"serial0","bu= s":"pci.2","addr":"0x1"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ diff --git a/tests/qemuxmlconfdata/aarch64-virt-graphics.aarch64-latest.arg= s b/tests/qemuxmlconfdata/aarch64-virt-graphics.aarch64-latest.args index b987772672..3954c5f203 100644 --- a/tests/qemuxmlconfdata/aarch64-virt-graphics.aarch64-latest.args +++ b/tests/qemuxmlconfdata/aarch64-virt-graphics.aarch64-latest.args @@ -44,7 +44,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -device '{"driver":"virtio-net-pci","netdev":"hostnet0","id":"net0","mac":= "52:54:00:53:45:a5","bus":"pci.1","addr":"0x0"}' \ -chardev pty,id=3Dcharserial0 \ -serial chardev:charserial0 \ --chardev socket,id=3Dcharchannel0,fd=3DXXXXXXX,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharchannel0,fd=3D@channel0-fd@,server=3Don,wait=3Dof= f \ -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"}' \ diff --git a/tests/qemuxmlconfdata/aarch64-virt-headless-mmio.aarch64-lates= t.args b/tests/qemuxmlconfdata/aarch64-virt-headless-mmio.aarch64-latest.ar= gs index aa5ee67f34..319a34619f 100644 --- a/tests/qemuxmlconfdata/aarch64-virt-headless-mmio.aarch64-latest.args +++ b/tests/qemuxmlconfdata/aarch64-virt-headless-mmio.aarch64-latest.args @@ -36,7 +36,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -device '{"driver":"virtio-net-device","netdev":"hostnet0","id":"net0","ma= c":"52:54:00:09:a4:37"}' \ -chardev pty,id=3Dcharserial0 \ -serial chardev:charserial0 \ --chardev socket,id=3Dcharchannel0,fd=3DXXXXXXX,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharchannel0,fd=3D@channel0-fd@,server=3Don,wait=3Dof= f \ -device '{"driver":"virtserialport","bus":"virtio-serial0.0","nr":1,"chard= ev":"charchannel0","id":"channel0","name":"org.qemu.guest_agent.0"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-device","id":"balloon0"}' \ diff --git a/tests/qemuxmlconfdata/aarch64-virt-headless.aarch64-latest.arg= s b/tests/qemuxmlconfdata/aarch64-virt-headless.aarch64-latest.args index 8d046cb2b8..9ee3449d6d 100644 --- a/tests/qemuxmlconfdata/aarch64-virt-headless.aarch64-latest.args +++ b/tests/qemuxmlconfdata/aarch64-virt-headless.aarch64-latest.args @@ -44,7 +44,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -device '{"driver":"virtio-net-pci","netdev":"hostnet0","id":"net0","mac":= "52:54:00:09:a4:37","bus":"pci.1","addr":"0x0"}' \ -chardev pty,id=3Dcharserial0 \ -serial chardev:charserial0 \ --chardev socket,id=3Dcharchannel0,fd=3DXXXXXXX,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharchannel0,fd=3D@channel0-fd@,server=3Don,wait=3Dof= f \ -device '{"driver":"virtserialport","bus":"virtio-serial0.0","nr":1,"chard= ev":"charchannel0","id":"channel0","name":"org.qemu.guest_agent.0"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.5","add= r":"0x0"}' \ diff --git a/tests/qemuxmlconfdata/channel-unix-guestfwd.x86_64-latest.args= b/tests/qemuxmlconfdata/channel-unix-guestfwd.x86_64-latest.args index 5c631f35ea..5487c78b6b 100644 --- a/tests/qemuxmlconfdata/channel-unix-guestfwd.x86_64-latest.args +++ b/tests/qemuxmlconfdata/channel-unix-guestfwd.x86_64-latest.args @@ -27,7 +27,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -no-shutdown \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --chardev socket,id=3Dcharchannel0,fd=3DXXXXXXX,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharchannel0,fd=3D@channel0-fd@,server=3Don,wait=3Dof= f \ -netdev '{"type":"user","guestfwd":[{"str":"tcp:10.0.2.1:4600-chardev:char= channel0"}],"id":"channel0"}' \ -chardev socket,id=3Dcharchannel1,path=3D/tmp/guestfwd-connect.socket \ -netdev '{"type":"user","guestfwd":[{"str":"tcp:10.0.2.1:4601-chardev:char= channel1"}],"id":"channel1"}' \ diff --git a/tests/qemuxmlconfdata/channel-unix-source-path.x86_64-latest.a= rgs b/tests/qemuxmlconfdata/channel-unix-source-path.x86_64-latest.args index c6247fbad1..6ec74a8504 100644 --- a/tests/qemuxmlconfdata/channel-unix-source-path.x86_64-latest.args +++ b/tests/qemuxmlconfdata/channel-unix-source-path.x86_64-latest.args @@ -28,25 +28,25 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUG= uest1/.config \ -boot 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":"0x2"}' \ --chardev socket,id=3Dcharchannel0,fd=3DXXXXXXX,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharchannel0,fd=3D@channel0-fd@,server=3Don,wait=3Dof= f \ -device '{"driver":"virtserialport","bus":"virtio-serial0.0","nr":1,"chard= ev":"charchannel0","id":"channel0","name":"org.qemu.guest_agent.0"}' \ --chardev socket,id=3Dcharchannel1,fd=3DXXXXXXX,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharchannel1,fd=3D@channel1-fd@,server=3Don,wait=3Dof= f \ -device '{"driver":"virtserialport","bus":"virtio-serial0.0","nr":2,"chard= ev":"charchannel1","id":"channel1","name":"org.qemu.guest_agent.1"}' \ --chardev socket,id=3Dcharchannel2,fd=3DXXXXXXX,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharchannel2,fd=3D@channel2-fd@,server=3Don,wait=3Dof= f \ -device '{"driver":"virtserialport","bus":"virtio-serial0.0","nr":3,"chard= ev":"charchannel2","id":"channel2","name":"org.qemu.guest_agent.2"}' \ --chardev socket,id=3Dcharchannel3,fd=3DXXXXXXX,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharchannel3,fd=3D@channel3-fd@,server=3Don,wait=3Dof= f \ -device '{"driver":"virtserialport","bus":"virtio-serial0.0","nr":4,"chard= ev":"charchannel3","id":"channel3","name":"org.qemu.guest_agent.3"}' \ --chardev socket,id=3Dcharchannel4,fd=3DXXXXXXX,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharchannel4,fd=3D@channel4-fd@,server=3Don,wait=3Dof= f \ -device '{"driver":"virtserialport","bus":"virtio-serial0.0","nr":5,"chard= ev":"charchannel4","id":"channel4","name":"org.qemu.guest_agent.4"}' \ --chardev socket,id=3Dcharchannel5,fd=3DXXXXXXX,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharchannel5,fd=3D@channel5-fd@,server=3Don,wait=3Dof= f \ -device '{"driver":"virtserialport","bus":"virtio-serial0.0","nr":6,"chard= ev":"charchannel5","id":"channel5","name":"org.qemu.guest_agent.5"}' \ --chardev socket,id=3Dcharchannel6,fd=3DXXXXXXX,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharchannel6,fd=3D@channel6-fd@,server=3Don,wait=3Dof= f \ -device '{"driver":"virtserialport","bus":"virtio-serial0.0","nr":7,"chard= ev":"charchannel6","id":"channel6","name":"org.qemu.guest_agent.6"}' \ --chardev socket,id=3Dcharchannel7,fd=3DXXXXXXX,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharchannel7,fd=3D@channel7-fd@,server=3Don,wait=3Dof= f \ -device '{"driver":"virtserialport","bus":"virtio-serial0.0","nr":8,"chard= ev":"charchannel7","id":"channel7","name":"org.qemu.guest_agent.7"}' \ --chardev socket,id=3Dcharchannel8,fd=3DXXXXXXX,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharchannel8,fd=3D@channel8-fd@,server=3Don,wait=3Dof= f \ -device '{"driver":"virtserialport","bus":"virtio-serial0.0","nr":9,"chard= ev":"charchannel8","id":"channel8","name":"org.qemu.guest_agent.8"}' \ --chardev socket,id=3Dcharchannel9,fd=3DXXXXXXX,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharchannel9,fd=3D@channel9-fd@,server=3Don,wait=3Dof= f \ -device '{"driver":"virtserialport","bus":"virtio-serial0.0","nr":10,"char= dev":"charchannel9","id":"channel9","name":"org.qemu.guest_agent.9"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ diff --git a/tests/qemuxmlconfdata/channel-virtio-unix.x86_64-latest.args b= /tests/qemuxmlconfdata/channel-virtio-unix.x86_64-latest.args index 70d4e0cfc5..aa8255d135 100644 --- a/tests/qemuxmlconfdata/channel-virtio-unix.x86_64-latest.args +++ b/tests/qemuxmlconfdata/channel-virtio-unix.x86_64-latest.args @@ -31,13 +31,13 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUG= uest1/.config \ -device '{"driver":"virtio-serial-pci","id":"virtio-serial1","bus":"pci.0"= ,"addr":"0xa"}' \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","read-only":false}' \ -device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-stor= age","id":"ide0-0-0","bootindex":1}' \ --chardev socket,id=3Dcharchannel0,fd=3DXXXXXXX,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharchannel0,fd=3D@channel0-fd@,server=3Don,wait=3Dof= f \ -device '{"driver":"virtserialport","bus":"virtio-serial0.0","nr":1,"chard= ev":"charchannel0","id":"channel0","name":"org.qemu.guest_agent.0"}' \ --chardev socket,id=3Dcharchannel1,fd=3DXXXXXXX,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharchannel1,fd=3D@channel1-fd@,server=3Don,wait=3Dof= f \ -device '{"driver":"virtserialport","bus":"virtio-serial0.0","nr":2,"chard= ev":"charchannel1","id":"channel1"}' \ --chardev socket,id=3Dcharchannel2,fd=3DXXXXXXX,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharchannel2,fd=3D@channel2-fd@,server=3Don,wait=3Dof= f \ -device '{"driver":"virtserialport","bus":"virtio-serial0.0","nr":3,"chard= ev":"charchannel2","id":"channel2","name":"ble"}' \ --chardev socket,id=3Dcharchannel3,fd=3DXXXXXXX,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharchannel3,fd=3D@channel3-fd@,server=3Don,wait=3Dof= f \ -device '{"driver":"virtserialport","bus":"virtio-serial0.0","nr":4,"chard= ev":"charchannel3","id":"channel3","name":"fdsa"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ diff --git a/tests/qemuxmlconfdata/chardev-backends-json.x86_64-9.1.0.args = b/tests/qemuxmlconfdata/chardev-backends-json.x86_64-9.1.0.args index ea08a0b651..fd1c94f8ed 100644 --- a/tests/qemuxmlconfdata/chardev-backends-json.x86_64-9.1.0.args +++ b/tests/qemuxmlconfdata/chardev-backends-json.x86_64-9.1.0.args @@ -29,24 +29,24 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUG= uest1/.config \ -device '{"driver":"virtio-serial-pci","id":"virtio-serial0","bus":"pci.0"= ,"addr":"0x3"}' \ -chardev '{"id":"charparallel0","backend":{"type":"parallel","data":{"devi= ce":"/dev/parport0"}}}' \ -device '{"driver":"isa-parallel","chardev":"charparallel0","id":"parallel= 0"}' \ --add-fd set=3D0,fd=3DXXXXXXX,opaque=3Dchannel0-log \ +-add-fd set=3D0,fd=3D@channel0-log-fd@,opaque=3Dchannel0-log \ -chardev '{"id":"charchannel0","backend":{"type":"null","data":{"logfile":= "/dev/fdset/0","logappend":true}}}' \ -device '{"driver":"virtserialport","bus":"virtio-serial0.0","nr":1,"chard= ev":"charchannel0","id":"channel0","name":"chardev-null"}' \ --add-fd set=3D1,fd=3DXXXXXXX,opaque=3Dchannel1-log \ +-add-fd set=3D1,fd=3D@channel1-log-fd@,opaque=3Dchannel1-log \ -chardev '{"id":"charchannel1","backend":{"type":"vc","data":{"logfile":"/= dev/fdset/1","logappend":true}}}' \ -device '{"driver":"virtserialport","bus":"virtio-serial0.0","nr":2,"chard= ev":"charchannel1","id":"channel1","name":"chardev-vc"}' \ -chardev '{"id":"charchannel2","backend":{"type":"pty","data":{}}}' \ -device '{"driver":"virtserialport","bus":"virtio-serial0.0","nr":3,"chard= ev":"charchannel2","id":"channel2","name":"chardev-pty"}' \ -chardev '{"id":"charchannel3","backend":{"type":"stdio","data":{}}}' \ -device '{"driver":"virtserialport","bus":"virtio-serial0.0","nr":4,"chard= ev":"charchannel3","id":"channel3","name":"chardev-stdio"}' \ --add-fd set=3D2,fd=3DXXXXXXX,opaque=3Dchannel4-source \ +-add-fd set=3D2,fd=3D@channel4-fd@,opaque=3Dchannel4-source \ -chardev '{"id":"charchannel4","backend":{"type":"file","data":{"out":"/de= v/fdset/2","append":true}}}' \ -device '{"driver":"virtserialport","bus":"virtio-serial0.0","nr":5,"chard= ev":"charchannel4","id":"channel4","name":"chardev-file"}' \ -chardev '{"id":"charchannel5","backend":{"type":"pipe","data":{"device":"= /path/to/pipe"}}}' \ -device '{"driver":"virtserialport","bus":"virtio-serial0.0","nr":6,"chard= ev":"charchannel5","id":"channel5","name":"chardev-pipe"}' \ -chardev '{"id":"charchannel6","backend":{"type":"serial","data":{"device"= :"/path/to/device"}}}' \ -device '{"driver":"virtserialport","bus":"virtio-serial0.0","nr":7,"chard= ev":"charchannel6","id":"channel6","name":"chardev-dev"}' \ --chardev '{"id":"charchannel7","backend":{"type":"socket","data":{"addr":{= "type":"fd","data":{"str":"XXXXXXX"}},"server":true,"wait":false}}}' \ +-chardev '{"id":"charchannel7","backend":{"type":"socket","data":{"addr":{= "type":"fd","data":{"str":"@channel7-fd@"}},"server":true,"wait":false}}}' \ -device '{"driver":"virtserialport","bus":"virtio-serial0.0","nr":8,"chard= ev":"charchannel7","id":"channel7","name":"chardev-unix-listen"}' \ -chardev '{"id":"charchannel8","backend":{"type":"socket","data":{"addr":{= "type":"unix","data":{"path":"/path/to/unix-listen"}},"server":false,"recon= nect":2}}}' \ -device '{"driver":"virtserialport","bus":"virtio-serial0.0","nr":9,"chard= ev":"charchannel8","id":"channel8","name":"chardev-unix-connect"}' \ diff --git a/tests/qemuxmlconfdata/chardev-backends-json.x86_64-latest.args= b/tests/qemuxmlconfdata/chardev-backends-json.x86_64-latest.args index b52e836f1f..7e5540ff09 100644 --- a/tests/qemuxmlconfdata/chardev-backends-json.x86_64-latest.args +++ b/tests/qemuxmlconfdata/chardev-backends-json.x86_64-latest.args @@ -29,24 +29,24 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUG= uest1/.config \ -device '{"driver":"virtio-serial-pci","id":"virtio-serial0","bus":"pci.0"= ,"addr":"0x3"}' \ -chardev '{"id":"charparallel0","backend":{"type":"parallel","data":{"devi= ce":"/dev/parport0"}}}' \ -device '{"driver":"isa-parallel","chardev":"charparallel0","id":"parallel= 0"}' \ --add-fd set=3D0,fd=3DXXXXXXX,opaque=3Dchannel0-log \ +-add-fd set=3D0,fd=3D@channel0-log-fd@,opaque=3Dchannel0-log \ -chardev '{"id":"charchannel0","backend":{"type":"null","data":{"logfile":= "/dev/fdset/0","logappend":true}}}' \ -device '{"driver":"virtserialport","bus":"virtio-serial0.0","nr":1,"chard= ev":"charchannel0","id":"channel0","name":"chardev-null"}' \ --add-fd set=3D1,fd=3DXXXXXXX,opaque=3Dchannel1-log \ +-add-fd set=3D1,fd=3D@channel1-log-fd@,opaque=3Dchannel1-log \ -chardev '{"id":"charchannel1","backend":{"type":"vc","data":{"logfile":"/= dev/fdset/1","logappend":true}}}' \ -device '{"driver":"virtserialport","bus":"virtio-serial0.0","nr":2,"chard= ev":"charchannel1","id":"channel1","name":"chardev-vc"}' \ -chardev '{"id":"charchannel2","backend":{"type":"pty","data":{}}}' \ -device '{"driver":"virtserialport","bus":"virtio-serial0.0","nr":3,"chard= ev":"charchannel2","id":"channel2","name":"chardev-pty"}' \ -chardev '{"id":"charchannel3","backend":{"type":"stdio","data":{}}}' \ -device '{"driver":"virtserialport","bus":"virtio-serial0.0","nr":4,"chard= ev":"charchannel3","id":"channel3","name":"chardev-stdio"}' \ --add-fd set=3D2,fd=3DXXXXXXX,opaque=3Dchannel4-source \ +-add-fd set=3D2,fd=3D@channel4-fd@,opaque=3Dchannel4-source \ -chardev '{"id":"charchannel4","backend":{"type":"file","data":{"out":"/de= v/fdset/2","append":true}}}' \ -device '{"driver":"virtserialport","bus":"virtio-serial0.0","nr":5,"chard= ev":"charchannel4","id":"channel4","name":"chardev-file"}' \ -chardev '{"id":"charchannel5","backend":{"type":"pipe","data":{"device":"= /path/to/pipe"}}}' \ -device '{"driver":"virtserialport","bus":"virtio-serial0.0","nr":6,"chard= ev":"charchannel5","id":"channel5","name":"chardev-pipe"}' \ -chardev '{"id":"charchannel6","backend":{"type":"serial","data":{"device"= :"/path/to/device"}}}' \ -device '{"driver":"virtserialport","bus":"virtio-serial0.0","nr":7,"chard= ev":"charchannel6","id":"channel6","name":"chardev-dev"}' \ --chardev '{"id":"charchannel7","backend":{"type":"socket","data":{"addr":{= "type":"fd","data":{"str":"XXXXXXX"}},"server":true,"wait":false}}}' \ +-chardev '{"id":"charchannel7","backend":{"type":"socket","data":{"addr":{= "type":"fd","data":{"str":"@channel7-fd@"}},"server":true,"wait":false}}}' \ -device '{"driver":"virtserialport","bus":"virtio-serial0.0","nr":8,"chard= ev":"charchannel7","id":"channel7","name":"chardev-unix-listen"}' \ -chardev '{"id":"charchannel8","backend":{"type":"socket","data":{"addr":{= "type":"unix","data":{"path":"/path/to/unix-listen"}},"server":false,"recon= nect-ms":2000}}}' \ -device '{"driver":"virtserialport","bus":"virtio-serial0.0","nr":9,"chard= ev":"charchannel8","id":"channel8","name":"chardev-unix-connect"}' \ diff --git a/tests/qemuxmlconfdata/chardev-backends.x86_64-9.1.0.args b/tes= ts/qemuxmlconfdata/chardev-backends.x86_64-9.1.0.args index 578fbc5d96..3a3128eb3e 100644 --- a/tests/qemuxmlconfdata/chardev-backends.x86_64-9.1.0.args +++ b/tests/qemuxmlconfdata/chardev-backends.x86_64-9.1.0.args @@ -29,24 +29,24 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUG= uest1/.config \ -device '{"driver":"virtio-serial-pci","id":"virtio-serial0","bus":"pci.0"= ,"addr":"0x3"}' \ -chardev parallel,id=3Dcharparallel0,path=3D/dev/parport0 \ -device '{"driver":"isa-parallel","chardev":"charparallel0","id":"parallel= 0"}' \ --add-fd set=3D0,fd=3DXXXXXXX,opaque=3Dchannel0-log \ +-add-fd set=3D0,fd=3D@channel0-log-fd@,opaque=3Dchannel0-log \ -chardev null,id=3Dcharchannel0,logfile=3D/dev/fdset/0,logappend=3Don \ -device '{"driver":"virtserialport","bus":"virtio-serial0.0","nr":1,"chard= ev":"charchannel0","id":"channel0","name":"chardev-null"}' \ --add-fd set=3D1,fd=3DXXXXXXX,opaque=3Dchannel1-log \ +-add-fd set=3D1,fd=3D@channel1-log-fd@,opaque=3Dchannel1-log \ -chardev vc,id=3Dcharchannel1,logfile=3D/dev/fdset/1,logappend=3Don \ -device '{"driver":"virtserialport","bus":"virtio-serial0.0","nr":2,"chard= ev":"charchannel1","id":"channel1","name":"chardev-vc"}' \ -chardev pty,id=3Dcharchannel2 \ -device '{"driver":"virtserialport","bus":"virtio-serial0.0","nr":3,"chard= ev":"charchannel2","id":"channel2","name":"chardev-pty"}' \ -chardev stdio,id=3Dcharchannel3 \ -device '{"driver":"virtserialport","bus":"virtio-serial0.0","nr":4,"chard= ev":"charchannel3","id":"channel3","name":"chardev-stdio"}' \ --add-fd set=3D2,fd=3DXXXXXXX,opaque=3Dchannel4-source \ +-add-fd set=3D2,fd=3D@channel4-fd@,opaque=3Dchannel4-source \ -chardev file,id=3Dcharchannel4,path=3D/dev/fdset/2,append=3Don \ -device '{"driver":"virtserialport","bus":"virtio-serial0.0","nr":5,"chard= ev":"charchannel4","id":"channel4","name":"chardev-file"}' \ -chardev pipe,id=3Dcharchannel5,path=3D/path/to/pipe \ -device '{"driver":"virtserialport","bus":"virtio-serial0.0","nr":6,"chard= ev":"charchannel5","id":"channel5","name":"chardev-pipe"}' \ -chardev serial,id=3Dcharchannel6,path=3D/path/to/device \ -device '{"driver":"virtserialport","bus":"virtio-serial0.0","nr":7,"chard= ev":"charchannel6","id":"channel6","name":"chardev-dev"}' \ --chardev socket,id=3Dcharchannel7,fd=3DXXXXXXX,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharchannel7,fd=3D@channel7-fd@,server=3Don,wait=3Dof= f \ -device '{"driver":"virtserialport","bus":"virtio-serial0.0","nr":8,"chard= ev":"charchannel7","id":"channel7","name":"chardev-unix-listen"}' \ -chardev socket,id=3Dcharchannel8,path=3D/path/to/unix-listen,reconnect=3D= 2 \ -device '{"driver":"virtserialport","bus":"virtio-serial0.0","nr":9,"chard= ev":"charchannel8","id":"channel8","name":"chardev-unix-connect"}' \ diff --git a/tests/qemuxmlconfdata/chardev-backends.x86_64-latest.args b/te= sts/qemuxmlconfdata/chardev-backends.x86_64-latest.args index 61ec4fac66..68357c42f1 100644 --- a/tests/qemuxmlconfdata/chardev-backends.x86_64-latest.args +++ b/tests/qemuxmlconfdata/chardev-backends.x86_64-latest.args @@ -29,24 +29,24 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUG= uest1/.config \ -device '{"driver":"virtio-serial-pci","id":"virtio-serial0","bus":"pci.0"= ,"addr":"0x3"}' \ -chardev parallel,id=3Dcharparallel0,path=3D/dev/parport0 \ -device '{"driver":"isa-parallel","chardev":"charparallel0","id":"parallel= 0"}' \ --add-fd set=3D0,fd=3DXXXXXXX,opaque=3Dchannel0-log \ +-add-fd set=3D0,fd=3D@channel0-log-fd@,opaque=3Dchannel0-log \ -chardev null,id=3Dcharchannel0,logfile=3D/dev/fdset/0,logappend=3Don \ -device '{"driver":"virtserialport","bus":"virtio-serial0.0","nr":1,"chard= ev":"charchannel0","id":"channel0","name":"chardev-null"}' \ --add-fd set=3D1,fd=3DXXXXXXX,opaque=3Dchannel1-log \ +-add-fd set=3D1,fd=3D@channel1-log-fd@,opaque=3Dchannel1-log \ -chardev vc,id=3Dcharchannel1,logfile=3D/dev/fdset/1,logappend=3Don \ -device '{"driver":"virtserialport","bus":"virtio-serial0.0","nr":2,"chard= ev":"charchannel1","id":"channel1","name":"chardev-vc"}' \ -chardev pty,id=3Dcharchannel2 \ -device '{"driver":"virtserialport","bus":"virtio-serial0.0","nr":3,"chard= ev":"charchannel2","id":"channel2","name":"chardev-pty"}' \ -chardev stdio,id=3Dcharchannel3 \ -device '{"driver":"virtserialport","bus":"virtio-serial0.0","nr":4,"chard= ev":"charchannel3","id":"channel3","name":"chardev-stdio"}' \ --add-fd set=3D2,fd=3DXXXXXXX,opaque=3Dchannel4-source \ +-add-fd set=3D2,fd=3D@channel4-fd@,opaque=3Dchannel4-source \ -chardev file,id=3Dcharchannel4,path=3D/dev/fdset/2,append=3Don \ -device '{"driver":"virtserialport","bus":"virtio-serial0.0","nr":5,"chard= ev":"charchannel4","id":"channel4","name":"chardev-file"}' \ -chardev pipe,id=3Dcharchannel5,path=3D/path/to/pipe \ -device '{"driver":"virtserialport","bus":"virtio-serial0.0","nr":6,"chard= ev":"charchannel5","id":"channel5","name":"chardev-pipe"}' \ -chardev serial,id=3Dcharchannel6,path=3D/path/to/device \ -device '{"driver":"virtserialport","bus":"virtio-serial0.0","nr":7,"chard= ev":"charchannel6","id":"channel6","name":"chardev-dev"}' \ --chardev socket,id=3Dcharchannel7,fd=3DXXXXXXX,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharchannel7,fd=3D@channel7-fd@,server=3Don,wait=3Dof= f \ -device '{"driver":"virtserialport","bus":"virtio-serial0.0","nr":8,"chard= ev":"charchannel7","id":"channel7","name":"chardev-unix-listen"}' \ -chardev socket,id=3Dcharchannel8,path=3D/path/to/unix-listen,reconnect-ms= =3D2000 \ -device '{"driver":"virtserialport","bus":"virtio-serial0.0","nr":9,"chard= ev":"charchannel8","id":"channel8","name":"chardev-unix-connect"}' \ diff --git a/tests/qemuxmlconfdata/chardev-label.x86_64-latest.args b/tests= /qemuxmlconfdata/chardev-label.x86_64-latest.args index 2c721abf3b..1ceef01587 100644 --- a/tests/qemuxmlconfdata/chardev-label.x86_64-latest.args +++ b/tests/qemuxmlconfdata/chardev-label.x86_64-latest.args @@ -27,7 +27,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-machine= /.config \ -no-shutdown \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --add-fd set=3D0,fd=3DXXXXXXX,opaque=3Dserial0-source \ +-add-fd set=3D0,fd=3D@serial0-fd@,opaque=3Dserial0-source \ -chardev file,id=3Dcharserial0,path=3D/dev/fdset/0,append=3Don \ -device '{"driver":"isa-serial","chardev":"charserial0","id":"serial0","in= dex":0}' \ -chardev socket,id=3Dcharserial1,path=3D/tmp/serial.sock \ diff --git a/tests/qemuxmlconfdata/console-virtio-unix.x86_64-latest.args b= /tests/qemuxmlconfdata/console-virtio-unix.x86_64-latest.args index 9925ad4230..69d93383f8 100644 --- a/tests/qemuxmlconfdata/console-virtio-unix.x86_64-latest.args +++ b/tests/qemuxmlconfdata/console-virtio-unix.x86_64-latest.args @@ -28,7 +28,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -boot 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":"0x2"}' \ --chardev socket,id=3Dcharconsole0,fd=3DXXXXXXX,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharconsole0,fd=3D@console0-fd@,server=3Don,wait=3Dof= f \ -device '{"driver":"virtconsole","chardev":"charconsole0","id":"console0"}= ' \ -chardev socket,id=3Dcharconsole1,path=3D/tmp/connect.socket \ -device '{"driver":"virtconsole","chardev":"charconsole1","id":"console1"}= ' \ diff --git a/tests/qemuxmlconfdata/hvf-aarch64-virt-headless.aarch64-latest= +hvf.args b/tests/qemuxmlconfdata/hvf-aarch64-virt-headless.aarch64-latest+= hvf.args index c428a00e64..e0cb3ea6ed 100644 --- a/tests/qemuxmlconfdata/hvf-aarch64-virt-headless.aarch64-latest+hvf.ar= gs +++ b/tests/qemuxmlconfdata/hvf-aarch64-virt-headless.aarch64-latest+hvf.ar= gs @@ -42,7 +42,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-test/.c= onfig \ -device '{"driver":"virtio-net-pci","netdev":"hostnet0","id":"net0","mac":= "52:54:00:9a:e6:c6","bus":"pci.1","addr":"0x0"}' \ -chardev pty,id=3Dcharserial0 \ -serial chardev:charserial0 \ --chardev socket,id=3Dcharchannel0,fd=3DXXXXXXX,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharchannel0,fd=3D@channel0-fd@,server=3Don,wait=3Dof= f \ -device '{"driver":"virtserialport","bus":"virtio-serial0.0","nr":1,"chard= ev":"charchannel0","id":"channel0","name":"org.qemu.guest_agent.0"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.4","add= r":"0x0"}' \ diff --git a/tests/qemuxmlconfdata/hvf-x86_64-q35-headless.x86_64-latest+hv= f.args b/tests/qemuxmlconfdata/hvf-x86_64-q35-headless.x86_64-latest+hvf.ar= gs index 6cd5b380bd..b36258359e 100644 --- a/tests/qemuxmlconfdata/hvf-x86_64-q35-headless.x86_64-latest+hvf.args +++ b/tests/qemuxmlconfdata/hvf-x86_64-q35-headless.x86_64-latest+hvf.args @@ -47,7 +47,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-test/.c= onfig \ -device '{"driver":"virtio-net-pci","netdev":"hostnet0","id":"net0","mac":= "52:54:00:9a:e6:c6","bus":"pci.1","addr":"0x0"}' \ -chardev pty,id=3Dcharserial0 \ -device '{"driver":"isa-serial","chardev":"charserial0","id":"serial0","in= dex":0}' \ --chardev socket,id=3Dcharchannel0,fd=3DXXXXXXX,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharchannel0,fd=3D@channel0-fd@,server=3Don,wait=3Dof= f \ -device '{"driver":"virtserialport","bus":"virtio-serial0.0","nr":1,"chard= ev":"charchannel0","id":"channel0","name":"org.qemu.guest_agent.0"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -global ICH9-LPC.noreboot=3Doff \ diff --git a/tests/qemuxmlconfdata/loongarch64-virt-graphics.loongarch64-la= test.args b/tests/qemuxmlconfdata/loongarch64-virt-graphics.loongarch64-lat= est.args index 5105a1d1d3..2c1b89e269 100644 --- a/tests/qemuxmlconfdata/loongarch64-virt-graphics.loongarch64-latest.ar= gs +++ b/tests/qemuxmlconfdata/loongarch64-virt-graphics.loongarch64-latest.ar= gs @@ -42,7 +42,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -device '{"driver":"virtio-net-pci","netdev":"hostnet0","id":"net0","mac":= "52:54:00:09:a4:37","bus":"pci.1","addr":"0x0"}' \ -chardev pty,id=3Dcharserial0 \ -serial chardev:charserial0 \ --chardev socket,id=3Dcharchannel0,fd=3DXXXXXXX,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharchannel0,fd=3D@channel0-fd@,server=3Don,wait=3Dof= f \ -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"}' \ diff --git a/tests/qemuxmlconfdata/loongarch64-virt-headless.loongarch64-la= test.args b/tests/qemuxmlconfdata/loongarch64-virt-headless.loongarch64-lat= est.args index 3265b7f561..e7eeec3511 100644 --- a/tests/qemuxmlconfdata/loongarch64-virt-headless.loongarch64-latest.ar= gs +++ b/tests/qemuxmlconfdata/loongarch64-virt-headless.loongarch64-latest.ar= gs @@ -42,7 +42,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -device '{"driver":"virtio-net-pci","netdev":"hostnet0","id":"net0","mac":= "52:54:00:09:a4:37","bus":"pci.1","addr":"0x0"}' \ -chardev pty,id=3Dcharserial0 \ -serial chardev:charserial0 \ --chardev socket,id=3Dcharchannel0,fd=3DXXXXXXX,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharchannel0,fd=3D@channel0-fd@,server=3Don,wait=3Dof= f \ -device '{"driver":"virtserialport","bus":"virtio-serial0.0","nr":1,"chard= ev":"charchannel0","id":"channel0","name":"org.qemu.guest_agent.0"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.5","add= r":"0x0"}' \ diff --git a/tests/qemuxmlconfdata/name-escape.x86_64-latest.args b/tests/q= emuxmlconfdata/name-escape.x86_64-latest.args index 5d0db75717..072afcfb5b 100644 --- a/tests/qemuxmlconfdata/name-escape.x86_64-latest.args +++ b/tests/qemuxmlconfdata/name-escape.x86_64-latest.args @@ -34,7 +34,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-foo=3D1= ,bar=3D2/.config \ -device '{"driver":"ccid-card-emulated","backend":"certificates","cert1":"= cert1,foo","cert2":"cert2","cert3":"cert3","db":"/etc/pki/nssdb,foo","id":"= smartcard0","bus":"ccid0.0"}' \ -chardev serial,id=3Dcharserial0,path=3D/dev/ttyS2,,foo \ -device '{"driver":"isa-serial","chardev":"charserial0","id":"serial0","in= dex":1}' \ --add-fd set=3D0,fd=3DXXXXXXX,opaque=3Dserial1-source \ +-add-fd set=3D0,fd=3D@serial1-fd@,opaque=3Dserial1-source \ -chardev file,id=3Dcharserial1,path=3D/dev/fdset/0,append=3Don \ -device '{"driver":"isa-serial","chardev":"charserial1","id":"serial1","in= dex":0}' \ -chardev pipe,id=3Dcharchannel0,path=3D/tmp/guestfwd,,foo \ diff --git a/tests/qemuxmlconfdata/parallel-unix-chardev.x86_64-latest.args= b/tests/qemuxmlconfdata/parallel-unix-chardev.x86_64-latest.args index 260e0cc4b5..719b2cc062 100644 --- a/tests/qemuxmlconfdata/parallel-unix-chardev.x86_64-latest.args +++ b/tests/qemuxmlconfdata/parallel-unix-chardev.x86_64-latest.args @@ -27,7 +27,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -no-shutdown \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --chardev socket,id=3Dcharparallel0,fd=3DXXXXXXX,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharparallel0,fd=3D@parallel0-fd@,server=3Don,wait=3D= off \ -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"}' \ diff --git a/tests/qemuxmlconfdata/ppc64-pseries-graphics.ppc64-latest.args= b/tests/qemuxmlconfdata/ppc64-pseries-graphics.ppc64-latest.args index 47c0fc440e..a13b86853e 100644 --- a/tests/qemuxmlconfdata/ppc64-pseries-graphics.ppc64-latest.args +++ b/tests/qemuxmlconfdata/ppc64-pseries-graphics.ppc64-latest.args @@ -34,7 +34,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -device '{"driver":"virtio-net-pci","netdev":"hostnet0","id":"net0","mac":= "52:54:00:a2:44:92","bus":"pci.0","addr":"0x1"}' \ -chardev pty,id=3Dcharserial0 \ -device '{"driver":"spapr-vty","chardev":"charserial0","id":"serial0","reg= ":805306368}' \ --chardev socket,id=3Dcharchannel0,fd=3DXXXXXXX,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharchannel0,fd=3D@channel0-fd@,server=3Don,wait=3Dof= f \ -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"}' \ diff --git a/tests/qemuxmlconfdata/ppc64-pseries-headless.ppc64-latest.args= b/tests/qemuxmlconfdata/ppc64-pseries-headless.ppc64-latest.args index 8c71679647..d2b1381b73 100644 --- a/tests/qemuxmlconfdata/ppc64-pseries-headless.ppc64-latest.args +++ b/tests/qemuxmlconfdata/ppc64-pseries-headless.ppc64-latest.args @@ -35,7 +35,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -device '{"driver":"virtio-net-pci","netdev":"hostnet0","id":"net0","mac":= "52:54:00:09:a4:37","bus":"pci.0","addr":"0x1"}' \ -chardev pty,id=3Dcharserial0 \ -device '{"driver":"spapr-vty","chardev":"charserial0","id":"serial0","reg= ":805306368}' \ --chardev socket,id=3Dcharchannel0,fd=3DXXXXXXX,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharchannel0,fd=3D@channel0-fd@,server=3Don,wait=3Dof= f \ -device '{"driver":"virtserialport","bus":"virtio-serial0.0","nr":1,"chard= ev":"charchannel0","id":"channel0","name":"org.qemu.guest_agent.0"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x5"}' \ diff --git a/tests/qemuxmlconfdata/q35-virt-manager-basic.x86_64-latest.arg= s b/tests/qemuxmlconfdata/q35-virt-manager-basic.x86_64-latest.args index 82736207ec..b476bfe761 100644 --- a/tests/qemuxmlconfdata/q35-virt-manager-basic.x86_64-latest.args +++ b/tests/qemuxmlconfdata/q35-virt-manager-basic.x86_64-latest.args @@ -43,7 +43,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-virt-ma= nager-basic/.config \ -device '{"driver":"virtio-net-pci","netdev":"hostnet0","id":"net0","mac":= "52:54:00:9a:e6:c6","bus":"pci.1","addr":"0x0"}' \ -chardev pty,id=3Dcharserial0 \ -device '{"driver":"isa-serial","chardev":"charserial0","id":"serial0","in= dex":0}' \ --chardev socket,id=3Dcharchannel0,fd=3DXXXXXXX,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharchannel0,fd=3D@channel0-fd@,server=3Don,wait=3Dof= f \ -device '{"driver":"virtserialport","bus":"virtio-serial0.0","nr":1,"chard= ev":"charchannel0","id":"channel0","name":"org.qemu.guest_agent.0"}' \ -chardev spicevmc,id=3Dcharchannel1,name=3Dvdagent \ -device '{"driver":"virtserialport","bus":"virtio-serial0.0","nr":2,"chard= ev":"charchannel1","id":"channel1","name":"com.redhat.spice.0"}' \ diff --git a/tests/qemuxmlconfdata/riscv64-virt-graphics.riscv64-latest.arg= s b/tests/qemuxmlconfdata/riscv64-virt-graphics.riscv64-latest.args index 3e5d16975d..fbe3d5914c 100644 --- a/tests/qemuxmlconfdata/riscv64-virt-graphics.riscv64-latest.args +++ b/tests/qemuxmlconfdata/riscv64-virt-graphics.riscv64-latest.args @@ -42,7 +42,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -device '{"driver":"virtio-net-pci","netdev":"hostnet0","id":"net0","mac":= "52:54:00:09:a4:37","bus":"pci.1","addr":"0x0"}' \ -chardev pty,id=3Dcharserial0 \ -serial chardev:charserial0 \ --chardev socket,id=3Dcharchannel0,fd=3DXXXXXXX,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharchannel0,fd=3D@channel0-fd@,server=3Don,wait=3Dof= f \ -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"}' \ diff --git a/tests/qemuxmlconfdata/riscv64-virt-headless-mmio.riscv64-lates= t.args b/tests/qemuxmlconfdata/riscv64-virt-headless-mmio.riscv64-latest.ar= gs index 1bcbdb2f25..70a1e298c1 100644 --- a/tests/qemuxmlconfdata/riscv64-virt-headless-mmio.riscv64-latest.args +++ b/tests/qemuxmlconfdata/riscv64-virt-headless-mmio.riscv64-latest.args @@ -34,7 +34,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -device '{"driver":"virtio-net-device","netdev":"hostnet0","id":"net0","ma= c":"52:54:00:09:a4:37"}' \ -chardev pty,id=3Dcharserial0 \ -serial chardev:charserial0 \ --chardev socket,id=3Dcharchannel0,fd=3DXXXXXXX,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharchannel0,fd=3D@channel0-fd@,server=3Don,wait=3Dof= f \ -device '{"driver":"virtserialport","bus":"virtio-serial0.0","nr":1,"chard= ev":"charchannel0","id":"channel0","name":"org.qemu.guest_agent.0"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-device","id":"balloon0"}' \ diff --git a/tests/qemuxmlconfdata/riscv64-virt-headless.riscv64-latest.arg= s b/tests/qemuxmlconfdata/riscv64-virt-headless.riscv64-latest.args index be63cfa3df..e90e2a768f 100644 --- a/tests/qemuxmlconfdata/riscv64-virt-headless.riscv64-latest.args +++ b/tests/qemuxmlconfdata/riscv64-virt-headless.riscv64-latest.args @@ -42,7 +42,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -device '{"driver":"virtio-net-pci","netdev":"hostnet0","id":"net0","mac":= "52:54:00:09:a4:37","bus":"pci.1","addr":"0x0"}' \ -chardev pty,id=3Dcharserial0 \ -serial chardev:charserial0 \ --chardev socket,id=3Dcharchannel0,fd=3DXXXXXXX,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharchannel0,fd=3D@channel0-fd@,server=3Don,wait=3Dof= f \ -device '{"driver":"virtserialport","bus":"virtio-serial0.0","nr":1,"chard= ev":"charchannel0","id":"channel0","name":"org.qemu.guest_agent.0"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.5","add= r":"0x0"}' \ diff --git a/tests/qemuxmlconfdata/s390x-ccw-graphics.s390x-latest.args b/t= ests/qemuxmlconfdata/s390x-ccw-graphics.s390x-latest.args index 25a3e89e47..0b69ee8e88 100644 --- a/tests/qemuxmlconfdata/s390x-ccw-graphics.s390x-latest.args +++ b/tests/qemuxmlconfdata/s390x-ccw-graphics.s390x-latest.args @@ -31,7 +31,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -device '{"driver":"virtio-blk-ccw","devno":"fe.0.0000","drive":"libvirt-1= -format","id":"virtio-disk0","bootindex":1}' \ -netdev '{"type":"user","id":"hostnet0"}' \ -device '{"driver":"virtio-net-ccw","netdev":"hostnet0","id":"net0","mac":= "52:54:00:09:1a:29","devno":"fe.0.0001"}' \ --chardev socket,id=3Dcharchannel0,fd=3DXXXXXXX,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharchannel0,fd=3D@channel0-fd@,server=3Don,wait=3Dof= f \ -device '{"driver":"virtserialport","bus":"virtio-serial0.0","nr":1,"chard= ev":"charchannel0","id":"channel0","name":"org.qemu.guest_agent.0"}' \ -chardev pty,id=3Dcharconsole0 \ -device '{"driver":"sclpconsole","chardev":"charconsole0","id":"console0"}= ' \ diff --git a/tests/qemuxmlconfdata/s390x-ccw-headless.s390x-latest.args b/t= ests/qemuxmlconfdata/s390x-ccw-headless.s390x-latest.args index b0a9e6cc1c..0975b76b70 100644 --- a/tests/qemuxmlconfdata/s390x-ccw-headless.s390x-latest.args +++ b/tests/qemuxmlconfdata/s390x-ccw-headless.s390x-latest.args @@ -32,7 +32,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -device '{"driver":"virtio-blk-ccw","devno":"fe.0.0000","drive":"libvirt-1= -format","id":"virtio-disk0","bootindex":1}' \ -netdev '{"type":"user","id":"hostnet0"}' \ -device '{"driver":"virtio-net-ccw","netdev":"hostnet0","id":"net0","mac":= "52:54:00:09:a4:37","devno":"fe.0.0001"}' \ --chardev socket,id=3Dcharchannel0,fd=3DXXXXXXX,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharchannel0,fd=3D@channel0-fd@,server=3Don,wait=3Dof= f \ -device '{"driver":"virtserialport","bus":"virtio-serial0.0","nr":1,"chard= ev":"charchannel0","id":"channel0","name":"org.qemu.guest_agent.0"}' \ -chardev pty,id=3Dcharconsole0 \ -device '{"driver":"sclpconsole","chardev":"charconsole0","id":"console0"}= ' \ diff --git a/tests/qemuxmlconfdata/serial-file-chardev.x86_64-latest.args b= /tests/qemuxmlconfdata/serial-file-chardev.x86_64-latest.args index 7d2eae029f..b59e693928 100644 --- a/tests/qemuxmlconfdata/serial-file-chardev.x86_64-latest.args +++ b/tests/qemuxmlconfdata/serial-file-chardev.x86_64-latest.args @@ -29,7 +29,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","read-only":false}' \ -device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-stor= age","id":"ide0-0-0","bootindex":1}' \ --add-fd set=3D0,fd=3DXXXXXXX,opaque=3Dserial0-source \ +-add-fd set=3D0,fd=3D@serial0-fd@,opaque=3Dserial0-source \ -chardev file,id=3Dcharserial0,path=3D/dev/fdset/0,append=3Don \ -device '{"driver":"isa-serial","chardev":"charserial0","id":"serial0","in= dex":0}' \ -audiodev '{"id":"audio1","driver":"none"}' \ diff --git a/tests/qemuxmlconfdata/serial-file-log.x86_64-latest.args b/tes= ts/qemuxmlconfdata/serial-file-log.x86_64-latest.args index 0a48c675ff..17a1eeb098 100644 --- a/tests/qemuxmlconfdata/serial-file-log.x86_64-latest.args +++ b/tests/qemuxmlconfdata/serial-file-log.x86_64-latest.args @@ -29,8 +29,8 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","read-only":false}' \ -device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-stor= age","id":"ide0-0-0","bootindex":1}' \ --add-fd set=3D0,fd=3DXXXXXXX,opaque=3Dserial0-source \ --add-fd set=3D1,fd=3DXXXXXXX,opaque=3Dserial0-log \ +-add-fd set=3D0,fd=3D@serial0-fd@,opaque=3Dserial0-source \ +-add-fd set=3D1,fd=3D@serial0-log-fd@,opaque=3Dserial0-log \ -chardev file,id=3Dcharserial0,path=3D/dev/fdset/0,append=3Don,logfile=3D/= dev/fdset/1,logappend=3Don \ -device '{"driver":"isa-serial","chardev":"charserial0","id":"serial0","in= dex":0}' \ -audiodev '{"id":"audio1","driver":"none"}' \ diff --git a/tests/qemuxmlconfdata/serial-many-chardev.x86_64-latest.args b= /tests/qemuxmlconfdata/serial-many-chardev.x86_64-latest.args index 4a15316669..59a8f2369b 100644 --- a/tests/qemuxmlconfdata/serial-many-chardev.x86_64-latest.args +++ b/tests/qemuxmlconfdata/serial-many-chardev.x86_64-latest.args @@ -31,7 +31,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-stor= age","id":"ide0-0-0","bootindex":1}' \ -chardev pty,id=3Dcharserial0 \ -device '{"driver":"isa-serial","chardev":"charserial0","id":"serial0","in= dex":0}' \ --add-fd set=3D0,fd=3DXXXXXXX,opaque=3Dserial1-source \ +-add-fd set=3D0,fd=3D@serial1-fd@,opaque=3Dserial1-source \ -chardev file,id=3Dcharserial1,path=3D/dev/fdset/0,append=3Don \ -device '{"driver":"isa-serial","chardev":"charserial1","id":"serial1","in= dex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ diff --git a/tests/qemuxmlconfdata/serial-unix-chardev.x86_64-latest.args b= /tests/qemuxmlconfdata/serial-unix-chardev.x86_64-latest.args index a1e7e2e7b5..abb68a8d49 100644 --- a/tests/qemuxmlconfdata/serial-unix-chardev.x86_64-latest.args +++ b/tests/qemuxmlconfdata/serial-unix-chardev.x86_64-latest.args @@ -29,7 +29,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ -chardev socket,id=3Dcharserial0,path=3D/tmp/serial.sock \ -device '{"driver":"isa-serial","chardev":"charserial0","id":"serial0","in= dex":0}' \ --chardev socket,id=3Dcharserial1,fd=3DXXXXXXX,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharserial1,fd=3D@serial1-fd@,server=3Don,wait=3Doff \ -device '{"driver":"isa-serial","chardev":"charserial1","id":"serial1","in= dex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ diff --git a/tests/qemuxmlconfdata/smartcard-passthrough-unix.x86_64-latest= .args b/tests/qemuxmlconfdata/smartcard-passthrough-unix.x86_64-latest.args index 62a3138a08..ca1fd472c3 100644 --- a/tests/qemuxmlconfdata/smartcard-passthrough-unix.x86_64-latest.args +++ b/tests/qemuxmlconfdata/smartcard-passthrough-unix.x86_64-latest.args @@ -28,7 +28,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ -device '{"driver":"usb-ccid","id":"ccid0","bus":"usb.0","port":"1"}' \ --chardev socket,id=3Dcharsmartcard0,fd=3DXXXXXXX,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharsmartcard0,fd=3D@smartcard0-fd@,server=3Don,wait= =3Doff \ -device '{"driver":"ccid-card-passthru","chardev":"charsmartcard0","id":"s= martcard0","bus":"ccid0.0"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ diff --git a/tests/qemuxmlconfdata/usb-redir-unix.x86_64-latest.args b/test= s/qemuxmlconfdata/usb-redir-unix.x86_64-latest.args index 7bdcd30d90..9be7acf12e 100644 --- a/tests/qemuxmlconfdata/usb-redir-unix.x86_64-latest.args +++ b/tests/qemuxmlconfdata/usb-redir-unix.x86_64-latest.args @@ -33,7 +33,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -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=3DXXXXXXX,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharredir1,fd=3D@redir1-fd@,server=3Don,wait=3Doff \ -device '{"driver":"usb-redir","chardev":"charredir1","id":"redir1","bus":= "usb.0","port":"2"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ diff --git a/tests/qemuxmlconfdata/user-aliases.x86_64-latest.args b/tests/= qemuxmlconfdata/user-aliases.x86_64-latest.args index d978f2d7a8..f5ca356773 100644 --- a/tests/qemuxmlconfdata/user-aliases.x86_64-latest.args +++ b/tests/qemuxmlconfdata/user-aliases.x86_64-latest.args @@ -60,7 +60,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-gentoo/= .config \ -device '{"driver":"isa-serial","chardev":"charserial0","id":"serial0","in= dex":0}' \ -chardev pty,id=3Dcharserial1 \ -device '{"driver":"isa-serial","chardev":"charserial1","id":"serial1","in= dex":1}' \ --chardev socket,id=3Dcharchannel0,fd=3DXXXXXXX,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharchannel0,fd=3D@channel0-fd@,server=3Don,wait=3Dof= f \ -device '{"driver":"virtserialport","bus":"virtio-serial0.0","nr":1,"chard= ev":"charchannel0","id":"channel0","name":"org.qemu.guest_agent.0"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -vnc 127.0.0.1:0,audiodev=3Daudio1 \ diff --git a/tests/qemuxmlconfdata/virtio-rng-egd-unix.x86_64-latest.args b= /tests/qemuxmlconfdata/virtio-rng-egd-unix.x86_64-latest.args index c90f2161bf..ca4685b733 100644 --- a/tests/qemuxmlconfdata/virtio-rng-egd-unix.x86_64-latest.args +++ b/tests/qemuxmlconfdata/virtio-rng-egd-unix.x86_64-latest.args @@ -29,7 +29,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ --chardev socket,id=3Dcharrng0,fd=3DXXXXXXX,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharrng0,fd=3D@rng0-fd@,server=3Don,wait=3Doff \ -object '{"qom-type":"rng-egd","id":"objrng0","chardev":"charrng0"}' \ -device '{"driver":"virtio-rng-pci","rng":"objrng0","id":"rng0","bus":"pci= .0","addr":"0x3"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ diff --git a/tests/qemuxmlconfdata/x86_64-pc-graphics.x86_64-latest.args b/= tests/qemuxmlconfdata/x86_64-pc-graphics.x86_64-latest.args index 2e564abb3e..1815c86f40 100644 --- a/tests/qemuxmlconfdata/x86_64-pc-graphics.x86_64-latest.args +++ b/tests/qemuxmlconfdata/x86_64-pc-graphics.x86_64-latest.args @@ -37,7 +37,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -device '{"driver":"virtio-net-pci","netdev":"hostnet0","id":"net0","mac":= "52:54:00:4c:e3:86","bus":"pci.0","addr":"0x3"}' \ -chardev pty,id=3Dcharserial0 \ -device '{"driver":"isa-serial","chardev":"charserial0","id":"serial0","in= dex":0}' \ --chardev socket,id=3Dcharchannel0,fd=3DXXXXXXX,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharchannel0,fd=3D@channel0-fd@,server=3Don,wait=3Dof= f \ -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":"audio1","driver":"none"}' \ diff --git a/tests/qemuxmlconfdata/x86_64-pc-headless.x86_64-latest.args b/= tests/qemuxmlconfdata/x86_64-pc-headless.x86_64-latest.args index 648a693721..3cae322027 100644 --- a/tests/qemuxmlconfdata/x86_64-pc-headless.x86_64-latest.args +++ b/tests/qemuxmlconfdata/x86_64-pc-headless.x86_64-latest.args @@ -38,7 +38,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -device '{"driver":"virtio-net-pci","netdev":"hostnet0","id":"net0","mac":= "52:54:00:09:a4:37","bus":"pci.0","addr":"0x2"}' \ -chardev pty,id=3Dcharserial0 \ -device '{"driver":"isa-serial","chardev":"charserial0","id":"serial0","in= dex":0}' \ --chardev socket,id=3Dcharchannel0,fd=3DXXXXXXX,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharchannel0,fd=3D@channel0-fd@,server=3Don,wait=3Dof= f \ -device '{"driver":"virtserialport","bus":"virtio-serial0.0","nr":1,"chard= ev":"charchannel0","id":"channel0","name":"org.qemu.guest_agent.0"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x6"}' \ diff --git a/tests/qemuxmlconfdata/x86_64-q35-graphics.x86_64-latest.args b= /tests/qemuxmlconfdata/x86_64-q35-graphics.x86_64-latest.args index 2fb82f684d..360d4628a0 100644 --- a/tests/qemuxmlconfdata/x86_64-q35-graphics.x86_64-latest.args +++ b/tests/qemuxmlconfdata/x86_64-q35-graphics.x86_64-latest.args @@ -44,7 +44,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -device '{"driver":"virtio-net-pci","netdev":"hostnet0","id":"net0","mac":= "52:54:00:d2:70:0b","bus":"pci.1","addr":"0x0"}' \ -chardev pty,id=3Dcharserial0 \ -device '{"driver":"isa-serial","chardev":"charserial0","id":"serial0","in= dex":0}' \ --chardev socket,id=3Dcharchannel0,fd=3DXXXXXXX,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharchannel0,fd=3D@channel0-fd@,server=3Don,wait=3Dof= f \ -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":"audio1","driver":"none"}' \ diff --git a/tests/qemuxmlconfdata/x86_64-q35-headless.x86_64-latest.args b= /tests/qemuxmlconfdata/x86_64-q35-headless.x86_64-latest.args index a2ef934627..96f98a12a2 100644 --- a/tests/qemuxmlconfdata/x86_64-q35-headless.x86_64-latest.args +++ b/tests/qemuxmlconfdata/x86_64-q35-headless.x86_64-latest.args @@ -45,7 +45,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -device '{"driver":"virtio-net-pci","netdev":"hostnet0","id":"net0","mac":= "52:54:00:09:a4:37","bus":"pci.1","addr":"0x0"}' \ -chardev pty,id=3Dcharserial0 \ -device '{"driver":"isa-serial","chardev":"charserial0","id":"serial0","in= dex":0}' \ --chardev socket,id=3Dcharchannel0,fd=3DXXXXXXX,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharchannel0,fd=3D@channel0-fd@,server=3Don,wait=3Dof= f \ -device '{"driver":"virtserialport","bus":"virtio-serial0.0","nr":1,"chard= ev":"charchannel0","id":"channel0","name":"org.qemu.guest_agent.0"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -global ICH9-LPC.noreboot=3Doff \ diff --git a/tests/testutilsqemu.c b/tests/testutilsqemu.c index 81dff17cc9..202cef28f9 100644 --- a/tests/testutilsqemu.c +++ b/tests/testutilsqemu.c @@ -1043,20 +1043,18 @@ testQemuPrepareHostBackendChardevOne(virDomainDevic= eDef *dev, break; case VIR_DOMAIN_CHR_TYPE_FILE: - fakesourcefd =3D 1750; - - if (fcntl(fakesourcefd, F_GETFD) !=3D -1) - abort(); - charpriv->sourcefd =3D qemuFDPassNew(devalias, priv); + if (fakesourcefd =3D=3D -1) + fakesourcefd =3D virTestMakeDummyFD(g_strdup_printf("@%s-fd@",= devalias)); qemuFDPassAddFD(charpriv->sourcefd, &fakesourcefd, "-source"); break; case VIR_DOMAIN_CHR_TYPE_UNIX: if (chardev->data.nix.listen) { g_autofree char *name =3D g_strdup_printf("%s-source", devalia= s); + if (fakesourcefd =3D=3D -1) - fakesourcefd =3D 1729; + fakesourcefd =3D virTestMakeDummyFD(g_strdup_printf("@%s-f= d@", devalias)); charpriv->directfd =3D qemuFDPassDirectNew(name, &fakesourcefd= ); } @@ -1069,13 +1067,9 @@ testQemuPrepareHostBackendChardevOne(virDomainDevice= Def *dev, } if (chardev->logfile) { - int fd =3D 1751; - - if (fcntl(fd, F_GETFD) !=3D -1) - abort(); + int fd =3D virTestMakeDummyFD(g_strdup_printf("@%s-log-fd@", deval= ias)); charpriv->logfd =3D qemuFDPassNew(devalias, priv); - qemuFDPassAddFD(charpriv->logfd, &fd, "-log"); } --=20 2.54.0 From nobody Sat May 30 15:28:30 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.libvirt.org designates 38.145.34.151 as permitted sender) client-ip=38.145.34.151; envelope-from=devel-bounces@lists.libvirt.org; helo=lists.libvirt.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.libvirt.org designates 38.145.34.151 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=pass(p=reject dis=none) header.from=lists.libvirt.org ARC-Seal: i=1; a=rsa-sha256; t=1779383114; cv=none; d=zohomail.com; s=zohoarc; b=KgoZb3bbkjLtzq/uZDC46PMLvbPu31K7J6HD4sDATc4NACTef84aieJcBHjH+rchffsc2pJuki2QAuTRplOibbJgoU8/2u17ODrtlOWiZDPeBjcUPexzHMGZgzKGlst6UgBe2CesQEUgy3i9lGd4ELq1tUftxBjw6imjEdtQLkc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1779383114; h=Content-Type:Content-Transfer-Encoding:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Owner:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:Reply-To:References:Subject:Subject:To:To:Message-Id:Cc; bh=xgmK/evv1Flmmtr87ArXB0LITlTB8xDELF1AVPx0jqI=; b=XlAnY/e+VqurItdToWqrXjI5VOEoQnTT5pEYZX4zHq1I5pV2lH24hnnTfSLkgi+ZxSsh6f5Dkn6O+Z6745xSQaqgPpBhs9NvmglTYlxz+JvcpHqW2EJI1QiHVqvKlr0fHbM5WGLjy9EVk8XVJrr5/W+GguW8muh9x6aq4AgH/f0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.libvirt.org designates 38.145.34.151 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=pass header.from= (p=reject dis=none) Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [38.145.34.151]) by mx.zohomail.com with SMTPS id 1779383114752721.0318059398955; Thu, 21 May 2026 10:05:14 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 993) id 54CEA419F0; Thu, 21 May 2026 13:05:13 -0400 (EDT) Received: from [172.19.199.4] (unknown [10.16.107.18]) by lists.libvirt.org (Postfix) with ESMTP id 9974643FD5; Thu, 21 May 2026 12:33:16 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 993) id 5B47441BDC; Thu, 21 May 2026 12:33:06 -0400 (EDT) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (3072 bits) server-digest SHA256) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id 4DAA741B00 for ; Thu, 21 May 2026 12:24:12 -0400 (EDT) Received: from mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-41-1IfjpitvPgGE9C70eDjrLw-1; Thu, 21 May 2026 12:24:10 -0400 Received: from mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.17]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id BFB611800614 for ; Thu, 21 May 2026 16:24:09 +0000 (UTC) Received: from speedmetal.openshiftapps.com (unknown [10.44.22.3]) by mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 19E6E1956053 for ; Thu, 21 May 2026 16:24:08 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 4.0.1 (2024-03-26) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H4, RCVD_IN_MSPIKE_WL,SPF_HELO_PASS autolearn=unavailable autolearn_force=no version=4.0.1 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1779380651; h=from:from: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; bh=xgmK/evv1Flmmtr87ArXB0LITlTB8xDELF1AVPx0jqI=; b=F63TW128sP+PifOaRmP6Y3grWuSM/KD4QVMX/IysslucSlbJQlGfLaWiX0fOILbjAL9WMM VbsK1UXiNzOyimmbuRS0inE/b4IyyPDPB9V1CVhhRTl4ZrOVob8ODii1iGdLu+XSWpkQll EQozOqGnR4xYLs4KIZEuM/mTsWGtjHA= X-MC-Unique: 1IfjpitvPgGE9C70eDjrLw-1 X-Mimecast-MFC-AGG-ID: 1IfjpitvPgGE9C70eDjrLw_1779380649 To: devel@lists.libvirt.org Subject: [PATCH 22/30] qemuxmlconftest: Setup real FDs for 'vhost-user-vga' Date: Thu, 21 May 2026 18:23:31 +0200 Message-ID: <1091983bee731c602c2d22951f3634b138c4314c.1779380461.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.17 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: cGB9jVpZr4XQbHMOtmFCg2nnl9qHz8P8KWJ2nHMm-ZI_1779380649 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: ZS7UTFTZL5Q4NEJJAGYYVAMPOSJYZ422 X-Message-ID-Hash: ZS7UTFTZL5Q4NEJJAGYYVAMPOSJYZ422 X-MailFrom: pkrempa@redhat.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; header-match-devel.lists.libvirt.org-0; emergency; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.10 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: From: Peter Krempa via Devel Reply-To: Peter Krempa X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1779383116597158500 Content-Type: text/plain; charset="utf-8" From: Peter Krempa Initialize the chardev backends for vhost-user graphics to use real FDs. Signed-off-by: Peter Krempa Reviewed-by: Michal Privoznik --- .../vhost-user-gpu-secondary.x86_64-latest.args | 4 ++-- tests/qemuxmlconfdata/vhost-user-vga.x86_64-latest.args | 2 +- .../virtio-options-video-ats.x86_64-latest.args | 4 ++-- .../virtio-options-video-iommu.x86_64-latest.args | 4 ++-- .../virtio-options-video-packed.x86_64-latest.args | 4 ++-- tests/qemuxmlconfdata/virtio-options.x86_64-latest.args | 2 +- tests/qemuxmlconftest.c | 2 +- 7 files changed, 11 insertions(+), 11 deletions(-) diff --git a/tests/qemuxmlconfdata/vhost-user-gpu-secondary.x86_64-latest.a= rgs b/tests/qemuxmlconfdata/vhost-user-gpu-secondary.x86_64-latest.args index 96f6e67aa8..7e684d2965 100644 --- a/tests/qemuxmlconfdata/vhost-user-gpu-secondary.x86_64-latest.args +++ b/tests/qemuxmlconfdata/vhost-user-gpu-secondary.x86_64-latest.args @@ -31,9 +31,9 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","read-only":false}' \ -device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-stor= age","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ --chardev socket,id=3Dchr-vu-video0,fd=3DXXXXXXX \ +-chardev socket,id=3Dchr-vu-video0,fd=3D@vhost-user-video-fd@ \ -device '{"driver":"vhost-user-vga","id":"video0","max_outputs":1,"chardev= ":"chr-vu-video0","bus":"pci.0","addr":"0x2"}' \ --chardev socket,id=3Dchr-vu-video1,fd=3DXXXXXXX \ +-chardev socket,id=3Dchr-vu-video1,fd=3D@vhost-user-video-fd@ \ -device '{"driver":"vhost-user-gpu-pci","id":"video1","max_outputs":1,"cha= rdev":"chr-vu-video1","bus":"pci.0","addr":"0x4"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x3"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ diff --git a/tests/qemuxmlconfdata/vhost-user-vga.x86_64-latest.args b/test= s/qemuxmlconfdata/vhost-user-vga.x86_64-latest.args index 4ddc6ad65c..59ce629b40 100644 --- a/tests/qemuxmlconfdata/vhost-user-vga.x86_64-latest.args +++ b/tests/qemuxmlconfdata/vhost-user-vga.x86_64-latest.args @@ -31,7 +31,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","read-only":false}' \ -device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-stor= age","id":"ide0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ --chardev socket,id=3Dchr-vu-video0,fd=3DXXXXXXX \ +-chardev socket,id=3Dchr-vu-video0,fd=3D@vhost-user-video-fd@ \ -device '{"driver":"vhost-user-vga","id":"video0","max_outputs":1,"chardev= ":"chr-vu-video0","bus":"pci.0","addr":"0x2"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x3"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ diff --git a/tests/qemuxmlconfdata/virtio-options-video-ats.x86_64-latest.a= rgs b/tests/qemuxmlconfdata/virtio-options-video-ats.x86_64-latest.args index 3b6e9e43af..7d9f9832c0 100644 --- a/tests/qemuxmlconfdata/virtio-options-video-ats.x86_64-latest.args +++ b/tests/qemuxmlconfdata/virtio-options-video-ats.x86_64-latest.args @@ -28,9 +28,9 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ --chardev socket,id=3Dchr-vu-video0,fd=3DXXXXXXX \ +-chardev socket,id=3Dchr-vu-video0,fd=3D@vhost-user-video-fd@ \ -device '{"driver":"vhost-user-vga","id":"video0","max_outputs":1,"chardev= ":"chr-vu-video0","bus":"pci.0","addr":"0x2"}' \ --chardev socket,id=3Dchr-vu-video1,fd=3DXXXXXXX \ +-chardev socket,id=3Dchr-vu-video1,fd=3D@vhost-user-video-fd@ \ -device '{"driver":"vhost-user-gpu-pci","ats":false,"id":"video1","max_out= puts":1,"chardev":"chr-vu-video1","bus":"pci.0","addr":"0x3"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x4"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ diff --git a/tests/qemuxmlconfdata/virtio-options-video-iommu.x86_64-latest= .args b/tests/qemuxmlconfdata/virtio-options-video-iommu.x86_64-latest.args index c37c260a7c..eb335a43be 100644 --- a/tests/qemuxmlconfdata/virtio-options-video-iommu.x86_64-latest.args +++ b/tests/qemuxmlconfdata/virtio-options-video-iommu.x86_64-latest.args @@ -28,9 +28,9 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ --chardev socket,id=3Dchr-vu-video0,fd=3DXXXXXXX \ +-chardev socket,id=3Dchr-vu-video0,fd=3D@vhost-user-video-fd@ \ -device '{"driver":"vhost-user-vga","id":"video0","max_outputs":1,"chardev= ":"chr-vu-video0","bus":"pci.0","addr":"0x2"}' \ --chardev socket,id=3Dchr-vu-video1,fd=3DXXXXXXX \ +-chardev socket,id=3Dchr-vu-video1,fd=3D@vhost-user-video-fd@ \ -device '{"driver":"vhost-user-gpu-pci","iommu_platform":false,"id":"video= 1","max_outputs":1,"chardev":"chr-vu-video1","bus":"pci.0","addr":"0x3"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x4"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ diff --git a/tests/qemuxmlconfdata/virtio-options-video-packed.x86_64-lates= t.args b/tests/qemuxmlconfdata/virtio-options-video-packed.x86_64-latest.ar= gs index 9ef03eaa0f..aa4f382525 100644 --- a/tests/qemuxmlconfdata/virtio-options-video-packed.x86_64-latest.args +++ b/tests/qemuxmlconfdata/virtio-options-video-packed.x86_64-latest.args @@ -28,9 +28,9 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ --chardev socket,id=3Dchr-vu-video0,fd=3DXXXXXXX \ +-chardev socket,id=3Dchr-vu-video0,fd=3D@vhost-user-video-fd@ \ -device '{"driver":"vhost-user-vga","id":"video0","max_outputs":1,"chardev= ":"chr-vu-video0","bus":"pci.0","addr":"0x2"}' \ --chardev socket,id=3Dchr-vu-video1,fd=3DXXXXXXX \ +-chardev socket,id=3Dchr-vu-video1,fd=3D@vhost-user-video-fd@ \ -device '{"driver":"vhost-user-gpu-pci","packed":false,"id":"video1","max_= outputs":1,"chardev":"chr-vu-video1","bus":"pci.0","addr":"0x3"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x4"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ diff --git a/tests/qemuxmlconfdata/virtio-options.x86_64-latest.args b/test= s/qemuxmlconfdata/virtio-options.x86_64-latest.args index 4cb38ae04f..28a8fd0f03 100644 --- a/tests/qemuxmlconfdata/virtio-options.x86_64-latest.args +++ b/tests/qemuxmlconfdata/virtio-options.x86_64-latest.args @@ -45,7 +45,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -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":"audio1","driver":"none"}' \ --chardev socket,id=3Dchr-vu-video0,fd=3DXXXXXXX \ +-chardev socket,id=3Dchr-vu-video0,fd=3D@vhost-user-video-fd@ \ -device '{"driver":"vhost-user-vga","id":"video0","max_outputs":1,"chardev= ":"chr-vu-video0","bus":"pci.0","addr":"0x2"}' \ -device '{"driver":"virtio-balloon-pci","iommu_platform":true,"ats":true,"= packed":true,"page-per-vq":true,"id":"balloon0","bus":"pci.0","addr":"0xc"}= ' \ -object '{"qom-type":"rng-random","id":"objrng0","filename":"/dev/random"}= ' \ diff --git a/tests/qemuxmlconftest.c b/tests/qemuxmlconftest.c index 80b1577475..ef071f5648 100644 --- a/tests/qemuxmlconftest.c +++ b/tests/qemuxmlconftest.c @@ -249,7 +249,7 @@ testCompareXMLToArgvCreateArgs(virQEMUDriver *drv, if (video->backend =3D=3D VIR_DOMAIN_VIDEO_BACKEND_TYPE_VHOSTUSER)= { qemuDomainVideoPrivate *vpriv =3D QEMU_DOMAIN_VIDEO_PRIVATE(vi= deo); - vpriv->vhost_user_fd =3D 1729; + vpriv->vhost_user_fd =3D virTestMakeDummyFD(g_strdup("@vhost-u= ser-video-fd@")); } } --=20 2.54.0 From nobody Sat May 30 15:28:30 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.libvirt.org designates 38.145.34.151 as permitted sender) client-ip=38.145.34.151; envelope-from=devel-bounces@lists.libvirt.org; helo=lists.libvirt.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.libvirt.org designates 38.145.34.151 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=pass(p=reject dis=none) header.from=lists.libvirt.org ARC-Seal: i=1; a=rsa-sha256; t=1779383650; cv=none; d=zohomail.com; s=zohoarc; b=gDgsRaSob4uwRV8zb6qY3XWDtDfIdpEhB7Hbi0Q+sAUqgjLn5umt9S3jAmwVKoa18RSCcigC6xwAeC4o6wcCw5IoldS5P8sGa9qgEOFGrD8/GnWA4fLJ1vYR9/lD8cH4gcI7lugUT2EDiTXDocHFiBagR9p25LYjvjTj5wS8ES4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1779383650; h=Content-Type:Content-Transfer-Encoding:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Owner:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:Reply-To:References:Subject:Subject:To:To:Message-Id:Cc; bh=VYdp0rrvwkfp4QLZRSW+UsTPW8+gM59vb5JjCn96Nfs=; b=DxpvRMbnrGM2uudi70o3DAFOiHnmzkvZddy2hyK8c7EN7Aob9eJmmfMEEmbEw9kPu/lKRch+QhDy7quRIzmxAuPgBPAwhCuGpvEHvAIUVFzAfDNWiKfL7CMsaW3/VsXAelf6Y8dmIOOQWUZ6ohs3W5L18LNIJSHNev5dnFOEWeQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.libvirt.org designates 38.145.34.151 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=pass header.from= (p=reject dis=none) Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [38.145.34.151]) by mx.zohomail.com with SMTPS id 1779383650156841.1957353018316; Thu, 21 May 2026 10:14:10 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 993) id 3E6B541CCF; Thu, 21 May 2026 13:14:09 -0400 (EDT) Received: from [172.19.199.4] (unknown [10.16.107.18]) by lists.libvirt.org (Postfix) with ESMTP id 67ED94409F; Thu, 21 May 2026 12:33:33 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 993) id 7AE9F41BA2; Thu, 21 May 2026 12:33:18 -0400 (EDT) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (3072 bits) server-digest SHA256) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id 94D1941C30 for ; Thu, 21 May 2026 12:24:13 -0400 (EDT) Received: from mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-446-QAh1PffrO9eYha9hpvaC3g-1; Thu, 21 May 2026 12:24:11 -0400 Received: from mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.17]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id DBAC718005BF for ; Thu, 21 May 2026 16:24:10 +0000 (UTC) Received: from speedmetal.openshiftapps.com (unknown [10.44.22.3]) by mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 350CB1956053 for ; Thu, 21 May 2026 16:24:09 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 4.0.1 (2024-03-26) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H5, RCVD_IN_MSPIKE_WL,SPF_HELO_PASS autolearn=unavailable autolearn_force=no version=4.0.1 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1779380653; h=from:from: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; bh=VYdp0rrvwkfp4QLZRSW+UsTPW8+gM59vb5JjCn96Nfs=; b=iFSgKQ86SUvF5IUOBsMUfpfcV7+iirTYD0OA+25MEkKwPnx+NMoPOYNxN36gHgLBe6u15Q 5FzbPUZp0Cfc0yBQtahwkVWDGdoFZEN0eKXEWPoefzwi2ixDqZFVHbBeuEaN9wqA4hmTwq Bstl8AO2a97mEW4zjR6gtFEZR+2psjk= X-MC-Unique: QAh1PffrO9eYha9hpvaC3g-1 X-Mimecast-MFC-AGG-ID: QAh1PffrO9eYha9hpvaC3g_1779380651 To: devel@lists.libvirt.org Subject: [PATCH 23/30] qemuxml2argvmoc: qemuBuildTPMOpenBackendFDs: Use real FDs Date: Thu, 21 May 2026 18:23:32 +0200 Message-ID: <4a7ee11cf9d4e88ebb2ffb9b592317218e2f8422.1779380461.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.17 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: WaLjKP1XKXIiBJFUrR0nG24F2n2f4AmW1XhPyFfkVd8_1779380651 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: 2BKYOF2B42S64GAVMFXFVRGE4KJXTOGU X-Message-ID-Hash: 2BKYOF2B42S64GAVMFXFVRGE4KJXTOGU X-MailFrom: pkrempa@redhat.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; header-match-devel.lists.libvirt.org-0; emergency; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.10 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: From: Peter Krempa via Devel Reply-To: Peter Krempa X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1779383653063154100 Content-Type: text/plain; charset="utf-8" From: Peter Krempa Use 'virTestMakeDummyFD()' to create real FDs both for 'tpmfd' and 'cancelfd'. Signed-off-by: Peter Krempa Reviewed-by: Michal Privoznik --- tests/qemuxml2argvmock.c | 12 +++++------- .../tpm-passthrough-crb.x86_64-latest.args | 4 ++-- .../tpm-passthrough.x86_64-latest.args | 4 ++-- 3 files changed, 9 insertions(+), 11 deletions(-) diff --git a/tests/qemuxml2argvmock.c b/tests/qemuxml2argvmock.c index d9f9c8e278..8261093964 100644 --- a/tests/qemuxml2argvmock.c +++ b/tests/qemuxml2argvmock.c @@ -40,6 +40,8 @@ #include #include +#include "testutils.h" + #define VIR_FROM_THIS VIR_FROM_NONE long virGetSystemPageSize(void) @@ -245,16 +247,12 @@ qemuInterfaceOpenVhostNet(virDomainObj *vm G_GNUC_UNU= SED, int -qemuBuildTPMOpenBackendFDs(const char *tpmdev G_GNUC_UNUSED, +qemuBuildTPMOpenBackendFDs(const char *tpmdev, int *tpmfd, int *cancelfd) { - if (fcntl(1730, F_GETFD) !=3D -1 || - fcntl(1731, F_GETFD) !=3D -1) - abort(); - - *tpmfd =3D 1730; - *cancelfd =3D 1731; + *tpmfd =3D virTestMakeDummyFD(g_strdup_printf("@tpm-%s-fd@", tpmdev)); + *cancelfd =3D virTestMakeDummyFD(g_strdup_printf("@tpm-%s-cancelfd@", = tpmdev)); return 0; } diff --git a/tests/qemuxmlconfdata/tpm-passthrough-crb.x86_64-latest.args b= /tests/qemuxmlconfdata/tpm-passthrough-crb.x86_64-latest.args index f9f6acff01..856bdb03aa 100644 --- a/tests/qemuxmlconfdata/tpm-passthrough-crb.x86_64-latest.args +++ b/tests/qemuxmlconfdata/tpm-passthrough-crb.x86_64-latest.args @@ -27,8 +27,8 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-TPM-VM/= .config \ -no-shutdown \ -boot menu=3Don,strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --add-fd set=3D0,fd=3DXXXXXXX,opaque=3Dtpm0-tpm \ --add-fd set=3D1,fd=3DXXXXXXX,opaque=3Dtpm0-cancel \ +-add-fd set=3D0,fd=3D@tpm-/dev/tpm0-fd@,opaque=3Dtpm0-tpm \ +-add-fd set=3D1,fd=3D@tpm-/dev/tpm0-cancelfd@,opaque=3Dtpm0-cancel \ -tpmdev passthrough,id=3Dtpm-tpm0,path=3D/dev/fdset/0,cancel-path=3D/dev/f= dset/1 \ -device '{"driver":"tpm-crb","tpmdev":"tpm-tpm0","id":"tpm0"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ diff --git a/tests/qemuxmlconfdata/tpm-passthrough.x86_64-latest.args b/tes= ts/qemuxmlconfdata/tpm-passthrough.x86_64-latest.args index cd92127ade..42738cf4ea 100644 --- a/tests/qemuxmlconfdata/tpm-passthrough.x86_64-latest.args +++ b/tests/qemuxmlconfdata/tpm-passthrough.x86_64-latest.args @@ -27,8 +27,8 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-TPM-VM/= .config \ -no-shutdown \ -boot menu=3Don,strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --add-fd set=3D0,fd=3DXXXXXXX,opaque=3Dtpm0-tpm \ --add-fd set=3D1,fd=3DXXXXXXX,opaque=3Dtpm0-cancel \ +-add-fd set=3D0,fd=3D@tpm-/dev/tpm0-fd@,opaque=3Dtpm0-tpm \ +-add-fd set=3D1,fd=3D@tpm-/dev/tpm0-cancelfd@,opaque=3Dtpm0-cancel \ -tpmdev passthrough,id=3Dtpm-tpm0,path=3D/dev/fdset/0,cancel-path=3D/dev/f= dset/1 \ -device '{"driver":"tpm-tis","tpmdev":"tpm-tpm0","id":"tpm0"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ --=20 2.54.0 From nobody Sat May 30 15:28:30 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.libvirt.org designates 38.145.34.151 as permitted sender) client-ip=38.145.34.151; envelope-from=devel-bounces@lists.libvirt.org; helo=lists.libvirt.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.libvirt.org designates 38.145.34.151 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=pass(p=reject dis=none) header.from=lists.libvirt.org ARC-Seal: i=1; a=rsa-sha256; t=1779383809; cv=none; d=zohomail.com; s=zohoarc; b=Bo67+AMmMPGxuS1XA6XQwAj061i6iRWPPkZCm660wpBpQa9DDdQPIrdjptFCq5PqA0E0VyCO1xxse8GlLPqUfmxHGWSIFkwuRs6dbeCt/dSGML0AXELbEFZQrOAdtyUvkg/UkC52+PR2meGfA2rO/O/TnAoMsXMavykofoBHqzw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1779383809; h=Content-Type:Content-Transfer-Encoding:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Owner:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:Reply-To:References:Subject:Subject:To:To:Message-Id:Cc; bh=va8sBQYHjTB2GE6jLnOirW78As8Vzeu8SwJrgYG0khE=; b=BqZ1yOyBdlpqH2LBvF4TLthRWTcemb6h7vu9qMn36NhP7PEPnKwP0X02nQ3CWovOraFag21LYVjb5zC4tWaK4bC2Exa8vUnlc33x/X+S9NJOKz86DPrnkFxiaz/5FBHy1QdoRPss/spZy2BsGzwmHFOJRI8Nfxc1wnJNXHDS6IQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.libvirt.org designates 38.145.34.151 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=pass header.from= (p=reject dis=none) Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [38.145.34.151]) by mx.zohomail.com with SMTPS id 1779383809260268.3786395238586; Thu, 21 May 2026 10:16:49 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 993) id 917F741AF9; Thu, 21 May 2026 13:16:48 -0400 (EDT) Received: from [172.19.199.4] (unknown [10.16.107.18]) by lists.libvirt.org (Postfix) with ESMTP id 785644411C; Thu, 21 May 2026 12:34:05 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 993) id E66B9440DC; Thu, 21 May 2026 12:33:57 -0400 (EDT) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (3072 bits) server-digest SHA256) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id D7A8E41C5C for ; Thu, 21 May 2026 12:24:15 -0400 (EDT) Received: from mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-78-QQQ0j4dBOQegTnwTVxrX-g-1; Thu, 21 May 2026 12:24:13 -0400 Received: from mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.17]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 025A5195609D for ; Thu, 21 May 2026 16:24:12 +0000 (UTC) Received: from speedmetal.openshiftapps.com (unknown [10.44.22.3]) by mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 4F54D1956056 for ; Thu, 21 May 2026 16:24:11 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 4.0.1 (2024-03-26) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=0.6 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H5, RCVD_IN_MSPIKE_WL,RCVD_IN_SBL_CSS,SPF_HELO_PASS autolearn=no autolearn_force=no version=4.0.1 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1779380655; h=from:from: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; bh=va8sBQYHjTB2GE6jLnOirW78As8Vzeu8SwJrgYG0khE=; b=irTl8Tt+pKyNVVeDEXywLN4wh8gwk6Ft65l+aLe8QFRtXx5Ug2x0Oy1y4E5bLqsOXortQR 1UYpk4Uez+HQUDtHuPS8t5gf5lOuSBqVNel0HWrTC3MV3r0WJmAEU4RoKdVHG+NGpbGmWL 9R5/BKu1NTC0FBRo2BJUkkfZf+GOdpE= X-MC-Unique: QQQ0j4dBOQegTnwTVxrX-g-1 X-Mimecast-MFC-AGG-ID: QQQ0j4dBOQegTnwTVxrX-g_1779380652 To: devel@lists.libvirt.org Subject: [PATCH 24/30] qemuxmlconftest: (consistently) use real FDs in tests for VDPA netdevs Date: Thu, 21 May 2026 18:23:33 +0200 Message-ID: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.17 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: uMLw1y2abfAbQ5fD1X7CWddXVIl93u7-E0nChWPjHbw_1779380652 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: RC5U6EOIQMXRZL7FY4FKY62IZMR4ZG2Y X-Message-ID-Hash: RC5U6EOIQMXRZL7FY4FKY62IZMR4ZG2Y X-MailFrom: pkrempa@redhat.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; header-match-devel.lists.libvirt.org-0; emergency; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.10 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: From: Peter Krempa via Devel Reply-To: Peter Krempa X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1779383811599154100 Content-Type: text/plain; charset="utf-8" From: Peter Krempa Use virTestMakeDummyFD() to get a real FD for the test in qemuxmlconftest. Use virTestMakeDummyFD() also in qemuhotplugmock. Signed-off-by: Peter Krempa Reviewed-by: Michal Privoznik --- tests/qemuhotplugmock.c | 7 ++++--- tests/qemuxml2argvmock.c | 6 ++---- .../qemuxmlconfdata/net-vdpa-multiqueue.x86_64-latest.args | 2 +- tests/qemuxmlconfdata/net-vdpa.x86_64-latest.args | 2 +- 4 files changed, 8 insertions(+), 9 deletions(-) diff --git a/tests/qemuhotplugmock.c b/tests/qemuhotplugmock.c index 79e9bdd8a8..6c90f4e58e 100644 --- a/tests/qemuhotplugmock.c +++ b/tests/qemuhotplugmock.c @@ -26,6 +26,8 @@ #include "virdevmapper.h" #include +#include "testutils.h" + #define LIBVIRT_QEMU_MONITOR_PRIV_H_ALLOW #include "qemu/qemu_monitor_priv.h" @@ -71,10 +73,9 @@ qemuProcessKillManagedPRDaemon(virDomainObj *vm G_GNUC_U= NUSED) } int -qemuVDPAConnect(const char *devicepath G_GNUC_UNUSED) +qemuVDPAConnect(const char *devicepath) { - /* need a valid fd or sendmsg won't work. Just open /dev/null */ - return open("/dev/null", O_RDONLY); + return virTestMakeDummyFD(g_strdup_printf("@vdpa-%s-fd@", devicepath)); } diff --git a/tests/qemuxml2argvmock.c b/tests/qemuxml2argvmock.c index 8261093964..de10117330 100644 --- a/tests/qemuxml2argvmock.c +++ b/tests/qemuxml2argvmock.c @@ -266,11 +266,9 @@ virNetDevBandwidthSetRootQDisc(const char *ifname G_GN= UC_UNUSED, int -qemuVDPAConnect(const char *devicepath G_GNUC_UNUSED) +qemuVDPAConnect(const char *devicepath) { - if (fcntl(1732, F_GETFD) !=3D -1) - abort(); - return 1732; + return virTestMakeDummyFD(g_strdup_printf("@vdpa-%s-fd@", devicepath)); } char * diff --git a/tests/qemuxmlconfdata/net-vdpa-multiqueue.x86_64-latest.args b= /tests/qemuxmlconfdata/net-vdpa-multiqueue.x86_64-latest.args index ccf76cb422..4de9a8667b 100644 --- a/tests/qemuxmlconfdata/net-vdpa-multiqueue.x86_64-latest.args +++ b/tests/qemuxmlconfdata/net-vdpa-multiqueue.x86_64-latest.args @@ -27,7 +27,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -no-shutdown \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --add-fd set=3D0,fd=3DXXXXXXX,opaque=3Dnet0-vdpa \ +-add-fd set=3D0,fd=3D@vdpa-/dev/vhost-vdpa-0-fd@,opaque=3Dnet0-vdpa \ -netdev '{"type":"vhost-vdpa","vhostdev":"/dev/fdset/0","queues":2,"id":"h= ostnet0"}' \ -device '{"driver":"virtio-net-pci","mq":true,"vectors":6,"netdev":"hostne= t0","id":"net0","mac":"52:54:00:95:db:c0","bus":"pci.0","addr":"0x2"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ diff --git a/tests/qemuxmlconfdata/net-vdpa.x86_64-latest.args b/tests/qemu= xmlconfdata/net-vdpa.x86_64-latest.args index 2bf22174e4..ecefa3d59d 100644 --- a/tests/qemuxmlconfdata/net-vdpa.x86_64-latest.args +++ b/tests/qemuxmlconfdata/net-vdpa.x86_64-latest.args @@ -27,7 +27,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -no-shutdown \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --add-fd set=3D0,fd=3DXXXXXXX,opaque=3Dnet0-vdpa \ +-add-fd set=3D0,fd=3D@vdpa-/dev/vhost-vdpa-0-fd@,opaque=3Dnet0-vdpa \ -netdev '{"type":"vhost-vdpa","vhostdev":"/dev/fdset/0","id":"hostnet0"}' \ -device '{"driver":"virtio-net-pci","netdev":"hostnet0","id":"net0","mac":= "52:54:00:95:db:c0","bus":"pci.0","addr":"0x2"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ --=20 2.54.0 From nobody Sat May 30 15:28:30 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.libvirt.org designates 38.145.34.151 as permitted sender) client-ip=38.145.34.151; envelope-from=devel-bounces@lists.libvirt.org; helo=lists.libvirt.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.libvirt.org designates 38.145.34.151 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=pass(p=reject dis=none) header.from=lists.libvirt.org ARC-Seal: i=1; a=rsa-sha256; t=1779383868; cv=none; d=zohomail.com; s=zohoarc; b=nsmgFotTBEQHsfL3Wf/ckOz1OpVINm+j+vM/yICpgwet3hu8v90IzZlZ/YBdZGmIV1KVUIc0OTEqS8GRh73K9kpdDJiYi7KIsaooq4U3enc04i5JdETdoR+jrM+fiUeHvItEi+C4RqQucZjRvSEBJz+DTlaN1NKkcRWGvOGLVks= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1779383868; h=Content-Type:Content-Transfer-Encoding:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Owner:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:Reply-To:References:Subject:Subject:To:To:Message-Id:Cc; bh=18GUAopJl+a1wEhEHX5vuZWjJPtAnKFPj44LVwp4M7w=; b=DoDnf6deiuxCAU5o0KCmUv0h6B8Soh/c4neqApDFs/rL+dPvTg1HsSqd87btjQAIXakC2UZRIX2PFwqjLDyP2HBBA3W+utb933dWNGqs5Dw+5PUoDLRpdeoZgrV9/te5ZWxBeW+0l7Tf0GukeZ7B9dSMLdIQ2cwr9wGYqTMdGZU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.libvirt.org designates 38.145.34.151 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=pass header.from= (p=reject dis=none) Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [38.145.34.151]) by mx.zohomail.com with SMTPS id 1779383868045504.13012090475604; Thu, 21 May 2026 10:17:48 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 993) id 4B93741BB5; Thu, 21 May 2026 13:17:47 -0400 (EDT) Received: from [172.19.199.4] (unknown [10.16.107.18]) by lists.libvirt.org (Postfix) with ESMTP id DECE544144; Thu, 21 May 2026 12:34:44 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 993) id A192344025; Thu, 21 May 2026 12:34:36 -0400 (EDT) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (3072 bits) server-digest SHA256) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id 9C6A241C62 for ; Thu, 21 May 2026 12:24:16 -0400 (EDT) Received: from mx-prod-mc-03.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-310-ga6sRkAqOLuaiYA-aiJVig-1; Thu, 21 May 2026 12:24:13 -0400 Received: from mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.17]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 1BD631956059 for ; Thu, 21 May 2026 16:24:13 +0000 (UTC) Received: from speedmetal.openshiftapps.com (unknown [10.44.22.3]) by mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 6949F1956053 for ; Thu, 21 May 2026 16:24:12 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 4.0.1 (2024-03-26) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=0.6 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H5, RCVD_IN_MSPIKE_WL,RCVD_IN_SBL_CSS,SPF_HELO_PASS autolearn=no autolearn_force=no version=4.0.1 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1779380656; h=from:from: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; bh=18GUAopJl+a1wEhEHX5vuZWjJPtAnKFPj44LVwp4M7w=; b=JBpEEe7YmVYV5WR4tKBiU0LQR/A4MyLl6zbn5GkOeZxV0cwc1YOTn8m+u3xr9l5rCUvQCr C+tvdSMLdpCL+r1Ymllnlb9CZ0wjtq/PEkOgoDhB8b5u81K2lb/tcaYrGGPj2fSkXwDiI/ kJdlEubq2LACoLDKn213I7x/yOVOxlo= X-MC-Unique: ga6sRkAqOLuaiYA-aiJVig-1 X-Mimecast-MFC-AGG-ID: ga6sRkAqOLuaiYA-aiJVig_1779380653 To: devel@lists.libvirt.org Subject: [PATCH 25/30] qemuxmlconftest: Use virTestMakeDummyFD() to get VDPA disk fds Date: Thu, 21 May 2026 18:23:34 +0200 Message-ID: <2e713142848276687fcb931da0289b0c8796f1b3.1779380461.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.17 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: OPokaDCj5SNCzx_FzL8gtStP1Zbbofl61nkNn9hR9YU_1779380653 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: GZEJPRH27NQTPZSVY23LT7HIPWNPODII X-Message-ID-Hash: GZEJPRH27NQTPZSVY23LT7HIPWNPODII X-MailFrom: pkrempa@redhat.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; header-match-devel.lists.libvirt.org-0; emergency; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.10 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: From: Peter Krempa via Devel Reply-To: Peter Krempa X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1779383870559154100 Content-Type: text/plain; charset="utf-8" From: Peter Krempa While VDPA disks did use real FDs they used convoluted infrastructure for mapping them to specific numbers. Remove that since we can now mask them from the output args instead. Signed-off-by: Peter Krempa Reviewed-by: Michal Privoznik --- .../disk-vhostvdpa.x86_64-latest.args | 2 +- tests/qemuxmlconftest.c | 36 +++++-------------- 2 files changed, 9 insertions(+), 29 deletions(-) diff --git a/tests/qemuxmlconfdata/disk-vhostvdpa.x86_64-latest.args b/test= s/qemuxmlconfdata/disk-vhostvdpa.x86_64-latest.args index cd48c61c7d..692df969ba 100644 --- a/tests/qemuxmlconfdata/disk-vhostvdpa.x86_64-latest.args +++ b/tests/qemuxmlconfdata/disk-vhostvdpa.x86_64-latest.args @@ -27,7 +27,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -no-shutdown \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --add-fd set=3D0,fd=3DXXXXXXX,opaque=3Dlibvirt-1-storage-vdpa \ +-add-fd set=3D0,fd=3D@vdpa-libvirt-1-storage-fd@,opaque=3Dlibvirt-1-storag= e-vdpa \ -blockdev '{"driver":"virtio-blk-vhost-vdpa","path":"/dev/fdset/0","node-n= ame":"libvirt-1-storage","read-only":false,"cache":{"direct":true,"no-flush= ":false}}' \ -device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x2","drive":"li= bvirt-1-storage","id":"virtio-disk0","bootindex":1,"write-cache":"on"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ diff --git a/tests/qemuxmlconftest.c b/tests/qemuxmlconftest.c index ef071f5648..19839fb32e 100644 --- a/tests/qemuxmlconftest.c +++ b/tests/qemuxmlconftest.c @@ -173,34 +173,14 @@ testCompareXMLToArgvCreateArgs(virQEMUDriver *drv, STREQ(disk->src->path, "/dev/cdrom")) disk->src->hostcdrom =3D true; - if (info->args.vdpafds) { - for (src =3D disk->src; virStorageSourceIsBacking(src); src = =3D src->backingStore) { - gpointer value; - - if (src->type !=3D VIR_STORAGE_TYPE_VHOST_VDPA) - continue; - - if ((value =3D g_hash_table_lookup(info->args.vdpafds, src= ->vdpadev))) { - int fd =3D GPOINTER_TO_INT(value); - qemuDomainStorageSourcePrivate *srcpriv; - VIR_AUTOCLOSE fakefd =3D open("/dev/zero", O_RDWR); - - if (fcntl(fd, F_GETFD) !=3D -1) { - fprintf(stderr, "fd '%d' is already in use\n", fd); - abort(); - } - - if (dup2(fakefd, fd) < 0) { - fprintf(stderr, "failed to duplicate fake fd: %s", - g_strerror(errno)); - abort(); - } - - srcpriv =3D qemuDomainStorageSourcePrivateFetch(src); - - srcpriv->fdpass =3D qemuFDPassNew(qemuBlockStorageSour= ceGetStorageNodename(src), priv); - qemuFDPassAddFD(srcpriv->fdpass, &fd, "-vdpa"); - } + for (src =3D disk->src; virStorageSourceIsBacking(src); src =3D sr= c->backingStore) { + if (src->type =3D=3D VIR_STORAGE_TYPE_VHOST_VDPA) { + qemuDomainStorageSourcePrivate *srcpriv =3D qemuDomainStor= ageSourcePrivateFetch(src); + int fd =3D virTestMakeDummyFD(g_strdup_printf("@vdpa-%s-fd= @", + qemuBlockStora= geSourceGetStorageNodename(src))); + + srcpriv->fdpass =3D qemuFDPassNew(qemuBlockStorageSourceGe= tStorageNodename(src), priv); + qemuFDPassAddFD(srcpriv->fdpass, &fd, "-vdpa"); } } } --=20 2.54.0 From nobody Sat May 30 15:28:30 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.libvirt.org designates 38.145.34.151 as permitted sender) client-ip=38.145.34.151; envelope-from=devel-bounces@lists.libvirt.org; helo=lists.libvirt.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.libvirt.org designates 38.145.34.151 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=pass(p=reject dis=none) header.from=lists.libvirt.org ARC-Seal: i=1; a=rsa-sha256; t=1779383929; cv=none; d=zohomail.com; s=zohoarc; b=iz97NHgGo+vOVifdoA11KIoKeEOQSZuw4GBWCkGdDNK/HZ3U0nxj8Pl9fcrAsy7b3ArDU3Ei1Wpv+6PJXgwuU1yA1SYU/I4dHmDxlw9CQEPPd6AUS0IXNnJroscM3BH6NiMmt1g6y5+GM1zYXT8F/WcnKOxxCUYo8qy6pPsLiFo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1779383929; h=Content-Type:Content-Transfer-Encoding:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Owner:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:Reply-To:References:Subject:Subject:To:To:Message-Id:Cc; bh=j/LUTaJpuWjg5yVdc8MBxUFLqldBGaSwAFmE5a3NV7w=; b=cZqBc5gdVy6Igrk+HrJAziKxZTlnzpDYsyBJ6KgwkRX+exojc00UY9icNu1VsuC3Qsoi4pTqaG1WuOvQKhUw4vL+n9xrDBq/vaMyDnBe/+kK/klbjAXUblLn+d6qfyFMG1s7TRrWbvrTDUHgCWq3WlWKgfKZGfH5dEUEnZahqsY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.libvirt.org designates 38.145.34.151 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=pass header.from= (p=reject dis=none) Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [38.145.34.151]) by mx.zohomail.com with SMTPS id 1779383929570373.80208617372136; Thu, 21 May 2026 10:18:49 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 993) id E737141BF7; Thu, 21 May 2026 13:18:48 -0400 (EDT) Received: from [172.19.199.4] (unknown [10.16.107.18]) by lists.libvirt.org (Postfix) with ESMTP id 7D78D4419A; Thu, 21 May 2026 12:34:48 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 993) id 66B9944038; Thu, 21 May 2026 12:34:39 -0400 (EDT) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (3072 bits) server-digest SHA256) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id 0965541B25 for ; Thu, 21 May 2026 12:24:17 -0400 (EDT) Received: from mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-522-XiqHnQAKOq64jFi5fNUh7g-1; Thu, 21 May 2026 12:24:15 -0400 Received: from mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.17]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 4DBCC1800283 for ; Thu, 21 May 2026 16:24:14 +0000 (UTC) Received: from speedmetal.openshiftapps.com (unknown [10.44.22.3]) by mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 83FDB1956053 for ; Thu, 21 May 2026 16:24:13 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 4.0.1 (2024-03-26) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H5, RCVD_IN_MSPIKE_WL,SPF_HELO_PASS autolearn=unavailable autolearn_force=no version=4.0.1 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1779380656; h=from:from: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; bh=j/LUTaJpuWjg5yVdc8MBxUFLqldBGaSwAFmE5a3NV7w=; b=Rkq5wvRvhq2hmlCbL2GJ9O1C3Hrv0NFaeexOROXPq2Zhpeq4X9quJvhipE8waccM6VCtCi CrCl1VrPNAlienUxWk8hHzS1iq/bKhKVNcCj0UJ9Dn9fLHKHa/IlRFYWya1S3EzAgP19xR k6KsReUJTzPRPv+ZbcPH2z2BYzgYRZE= X-MC-Unique: XiqHnQAKOq64jFi5fNUh7g-1 X-Mimecast-MFC-AGG-ID: XiqHnQAKOq64jFi5fNUh7g_1779380654 To: devel@lists.libvirt.org Subject: [PATCH 26/30] testutilsqemu: Remove unused 'ARG_VDPA_FD' test argument Date: Thu, 21 May 2026 18:23:35 +0200 Message-ID: <88ba872e46239d7e12e4f4ceb1d484ab2a876f2e.1779380461.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.17 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: S2Xj42dM3POrs11-ZQo-71Gnx1MtQx3gMn2D3_Zk8oY_1779380654 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: 3LQYBVM3TW4AP7ZYIBLI7IJ67JOGGGGV X-Message-ID-Hash: 3LQYBVM3TW4AP7ZYIBLI7IJ67JOGGGGV X-MailFrom: pkrempa@redhat.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; header-match-devel.lists.libvirt.org-0; emergency; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.10 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: From: Peter Krempa via Devel Reply-To: Peter Krempa X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1779383931503154100 Content-Type: text/plain; charset="utf-8" From: Peter Krempa The code was refactored to allow any FD numbers so the code to map them to specific numbers is no longer needed. Signed-off-by: Peter Krempa Reviewed-by: Michal Privoznik --- tests/qemuxmlconftest.c | 3 +-- tests/testutilsqemu.c | 12 ------------ tests/testutilsqemu.h | 2 -- 3 files changed, 1 insertion(+), 16 deletions(-) diff --git a/tests/qemuxmlconftest.c b/tests/qemuxmlconftest.c index 19839fb32e..646077648f 100644 --- a/tests/qemuxmlconftest.c +++ b/tests/qemuxmlconftest.c @@ -1664,8 +1664,7 @@ mymain(void) DO_TEST_CAPS_LATEST("disk-target-nvme"); DO_TEST_CAPS_LATEST("disk-vhostuser-numa"); DO_TEST_CAPS_LATEST("disk-vhostuser"); - DO_TEST_CAPS_ARCH_LATEST_FULL("disk-vhostvdpa", "x86_64", - ARG_VDPA_FD, "/dev/vhost-vdpa-0", 201); + DO_TEST_CAPS_LATEST("disk-vhostvdpa"); DO_TEST_CAPS_LATEST_PARSE_ERROR("disk-device-lun-type-invalid"); DO_TEST_CAPS_LATEST_PARSE_ERROR("disk-attaching-partition-nosupport"); DO_TEST_CAPS_LATEST("disk-usb-device"); diff --git a/tests/testutilsqemu.c b/tests/testutilsqemu.c index 202cef28f9..76d6521c7a 100644 --- a/tests/testutilsqemu.c +++ b/tests/testutilsqemu.c @@ -732,17 +732,6 @@ testQemuInfoSetArgs(testQemuInfo *info, break; } - case ARG_VDPA_FD: { - const char *vdpadev =3D va_arg(argptr, char *); - int vdpafd =3D va_arg(argptr, unsigned int); - - if (!info->args.vdpafds) - info->args.vdpafds =3D g_hash_table_new_full(g_str_hash, g= _str_equal, g_free, NULL); - - g_hash_table_insert(info->args.vdpafds, g_strdup(vdpadev), GIN= T_TO_POINTER(vdpafd)); - break; - } - case ARG_END: default: info->args.invalidarg =3D true; @@ -973,7 +962,6 @@ testQemuInfoFree(testQemuInfo *info) g_clear_pointer(&info->args.fakeCapsAdd, virBitmapFree); g_clear_pointer(&info->args.fakeCapsDel, virBitmapFree); g_clear_pointer(&info->args.fds, g_hash_table_unref); - g_clear_pointer(&info->args.vdpafds, g_hash_table_unref); g_clear_object(&info->nbdkitCaps); g_clear_pointer(&info->args.fakeNbdkitCaps, virBitmapFree); g_free(info); diff --git a/tests/testutilsqemu.h b/tests/testutilsqemu.h index a39f03518b..f30ddad3b6 100644 --- a/tests/testutilsqemu.h +++ b/tests/testutilsqemu.h @@ -48,7 +48,6 @@ typedef enum { ARG_CAPS_VARIANT, ARG_CAPS_HOST_CPU_MODEL, ARG_FD_GROUP, /* name, writable, nfds, fd[0], ... fd[n-1] */ - ARG_VDPA_FD, /* vdpadev, fd */ ARG_NBDKIT_CAPS, ARG_END, } testQemuInfoArgName; @@ -90,7 +89,6 @@ struct testQemuArgs { qemuTestCPUDef capsHostCPUModel; int gic; GHashTable *fds; - GHashTable *vdpafds; bool invalidarg; }; --=20 2.54.0 From nobody Sat May 30 15:28:30 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.libvirt.org designates 38.145.34.151 as permitted sender) client-ip=38.145.34.151; envelope-from=devel-bounces@lists.libvirt.org; helo=lists.libvirt.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.libvirt.org designates 38.145.34.151 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=pass(p=reject dis=none) header.from=lists.libvirt.org ARC-Seal: i=1; a=rsa-sha256; t=1779384033; cv=none; d=zohomail.com; s=zohoarc; b=McJHFqbAmRH2jjD/zChwLxuVVq3oudEXM7JyplQ9jl2WxG4u24h1AgC1WnYOy8LxAMkldphv4HuLVwg6VvUd8pmhiEl/sRDy4rkMPvgIISqEom8EwXrVDYiP9MzEhucnz+LE/6Atn1/6zfTUtNFDR1ypNix6Tq09Uv69yI/b0K4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1779384033; h=Content-Type:Content-Transfer-Encoding:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Owner:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:Reply-To:References:Subject:Subject:To:To:Message-Id:Cc; bh=f2elwCP1TLpOETTe2USqrxmuomgsE2aB7BVPNWRnm/I=; b=R5/dd4oblvft7dUs2qFxCRPDuoRX3NnxcFgFvd9tfDg4789gS7PyfinCpGSxsd9dD6ulmVqtHxMU21XdsF99hEDbeUu/JNNNOHQof72cION3Mj0fYX2gb1CjSdVrwmwjwgGFeif1wpXQ6qOl1IEDGkRjuEIGO7U8Np6qtnCaoL0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.libvirt.org designates 38.145.34.151 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=pass header.from= (p=reject dis=none) Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [38.145.34.151]) by mx.zohomail.com with SMTPS id 1779384033485427.97249208119695; Thu, 21 May 2026 10:20:33 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 993) id ADF2541BB7; Thu, 21 May 2026 13:20:32 -0400 (EDT) Received: from [172.19.199.4] (unknown [10.16.107.18]) by lists.libvirt.org (Postfix) with ESMTP id 68C844419E; Thu, 21 May 2026 12:34:57 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 993) id A85ED44193; Thu, 21 May 2026 12:34:47 -0400 (EDT) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (3072 bits) server-digest SHA256) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id D2A3E41B19 for ; Thu, 21 May 2026 12:24:17 -0400 (EDT) Received: from mx-prod-mc-03.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-570-8kxZPw5LOmaYH61D-DvwEw-1; Thu, 21 May 2026 12:24:16 -0400 Received: from mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.17]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 524D2195604F for ; Thu, 21 May 2026 16:24:15 +0000 (UTC) Received: from speedmetal.openshiftapps.com (unknown [10.44.22.3]) by mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 9FAC51956053 for ; Thu, 21 May 2026 16:24:14 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 4.0.1 (2024-03-26) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=0.6 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H5, RCVD_IN_MSPIKE_WL,RCVD_IN_SBL_CSS,SPF_HELO_PASS autolearn=no autolearn_force=no version=4.0.1 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1779380657; h=from:from: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; bh=f2elwCP1TLpOETTe2USqrxmuomgsE2aB7BVPNWRnm/I=; b=SB8WD+dHettFSmTzcptKZpCV0Amx7VE8piiBs/0RN7mWcizzfpNXiHh7NJL94KfHr42tpW cEdUW/TXrxyCIwf6dsjbT6y/zd/5jCgMqAHc8qTPBIVrntPi/GMz9RNlqI0M8QAC0ZB2df etCUBxv/2XfCQv1/VPUukqHCyjfJZfc= X-MC-Unique: 8kxZPw5LOmaYH61D-DvwEw-1 X-Mimecast-MFC-AGG-ID: 8kxZPw5LOmaYH61D-DvwEw_1779380655 To: devel@lists.libvirt.org Subject: [PATCH 27/30] qemuxmlconftest: Use real FDS for testing of 'vsock' Date: Thu, 21 May 2026 18:23:36 +0200 Message-ID: <0f33ea92ab5094b52819db929a5188da2e2fc2ca.1779380461.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.17 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: 9NNJj-ZSrwJcE56CL2MppMWdbpnBbudcOkaF8SnKZDc_1779380655 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: ANRC2FV7H4BYWMLKNUNOWPBK6RD37GAQ X-Message-ID-Hash: ANRC2FV7H4BYWMLKNUNOWPBK6RD37GAQ X-MailFrom: pkrempa@redhat.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; header-match-devel.lists.libvirt.org-0; emergency; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.10 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: From: Peter Krempa via Devel Reply-To: Peter Krempa X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1779384035203154100 Content-Type: text/plain; charset="utf-8" From: Peter Krempa Signed-off-by: Peter Krempa Reviewed-by: Michal Privoznik --- tests/qemuxmlconfdata/vhost-vsock-auto.x86_64-latest.args | 2 +- tests/qemuxmlconfdata/vhost-vsock-ccw-auto.s390x-latest.args | 2 +- tests/qemuxmlconfdata/vhost-vsock-ccw-iommu.s390x-latest.args | 2 +- tests/qemuxmlconfdata/vhost-vsock-ccw.s390x-latest.args | 2 +- tests/qemuxmlconfdata/vhost-vsock.x86_64-latest.args | 2 +- .../qemuxmlconfdata/virtio-non-transitional.x86_64-latest.args | 2 +- tests/qemuxmlconfdata/virtio-transitional.x86_64-latest.args | 2 +- tests/qemuxmlconftest.c | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/tests/qemuxmlconfdata/vhost-vsock-auto.x86_64-latest.args b/te= sts/qemuxmlconfdata/vhost-vsock-auto.x86_64-latest.args index b3f2e06c72..ff42814fb3 100644 --- a/tests/qemuxmlconfdata/vhost-vsock-auto.x86_64-latest.args +++ b/tests/qemuxmlconfdata/vhost-vsock-auto.x86_64-latest.args @@ -30,5 +30,5 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-test/.c= onfig \ -device '{"driver":"virtio-serial-pci","id":"virtio-serial0","bus":"pci.0"= ,"addr":"0x6"}' \ -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= ":"XXXXXXX","bus":"pci.0","addr":"0x2"}' \ +-device '{"driver":"vhost-vsock-pci","id":"vsock0","guest-cid":42,"vhostfd= ":"@vsock-vhost-fd@","bus":"pci.0","addr":"0x2"}' \ -msg timestamp=3Don diff --git a/tests/qemuxmlconfdata/vhost-vsock-ccw-auto.s390x-latest.args b= /tests/qemuxmlconfdata/vhost-vsock-ccw-auto.s390x-latest.args index ccc7152713..2a8affa58b 100644 --- a/tests/qemuxmlconfdata/vhost-vsock-ccw-auto.s390x-latest.args +++ b/tests/qemuxmlconfdata/vhost-vsock-ccw-auto.s390x-latest.args @@ -31,5 +31,5 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-ccw","id":"balloon0","devno":"fe.0.0001= "}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ --device '{"driver":"vhost-vsock-ccw","id":"vsock0","guest-cid":42,"vhostfd= ":"XXXXXXX","devno":"fe.0.0002"}' \ +-device '{"driver":"vhost-vsock-ccw","id":"vsock0","guest-cid":42,"vhostfd= ":"@vsock-vhost-fd@","devno":"fe.0.0002"}' \ -msg timestamp=3Don diff --git a/tests/qemuxmlconfdata/vhost-vsock-ccw-iommu.s390x-latest.args = b/tests/qemuxmlconfdata/vhost-vsock-ccw-iommu.s390x-latest.args index a83ab0cc4b..3b3642401c 100644 --- a/tests/qemuxmlconfdata/vhost-vsock-ccw-iommu.s390x-latest.args +++ b/tests/qemuxmlconfdata/vhost-vsock-ccw-iommu.s390x-latest.args @@ -31,5 +31,5 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-ccw","id":"balloon0","devno":"fe.0.0001= "}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ --device '{"driver":"vhost-vsock-ccw","iommu_platform":true,"id":"vsock0","= guest-cid":4,"vhostfd":"XXXXXXX","devno":"fe.0.0002"}' \ +-device '{"driver":"vhost-vsock-ccw","iommu_platform":true,"id":"vsock0","= guest-cid":4,"vhostfd":"@vsock-vhost-fd@","devno":"fe.0.0002"}' \ -msg timestamp=3Don diff --git a/tests/qemuxmlconfdata/vhost-vsock-ccw.s390x-latest.args b/test= s/qemuxmlconfdata/vhost-vsock-ccw.s390x-latest.args index 3552cf18b6..1d3c5ea6ae 100644 --- a/tests/qemuxmlconfdata/vhost-vsock-ccw.s390x-latest.args +++ b/tests/qemuxmlconfdata/vhost-vsock-ccw.s390x-latest.args @@ -31,5 +31,5 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-ccw","id":"balloon0","devno":"fe.0.0001= "}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ --device '{"driver":"vhost-vsock-ccw","id":"vsock0","guest-cid":4,"vhostfd"= :"XXXXXXX","devno":"fe.0.0003"}' \ +-device '{"driver":"vhost-vsock-ccw","id":"vsock0","guest-cid":4,"vhostfd"= :"@vsock-vhost-fd@","devno":"fe.0.0003"}' \ -msg timestamp=3Don diff --git a/tests/qemuxmlconfdata/vhost-vsock.x86_64-latest.args b/tests/q= emuxmlconfdata/vhost-vsock.x86_64-latest.args index e26677052b..49dc0f85b1 100644 --- a/tests/qemuxmlconfdata/vhost-vsock.x86_64-latest.args +++ b/tests/qemuxmlconfdata/vhost-vsock.x86_64-latest.args @@ -30,5 +30,5 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-test/.c= onfig \ -device '{"driver":"virtio-serial-pci","id":"virtio-serial0","bus":"pci.0"= ,"addr":"0x6"}' \ -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"= :"XXXXXXX","bus":"pci.0","addr":"0x7"}' \ +-device '{"driver":"vhost-vsock-pci","id":"vsock0","guest-cid":4,"vhostfd"= :"@vsock-vhost-fd@","bus":"pci.0","addr":"0x7"}' \ -msg timestamp=3Don diff --git a/tests/qemuxmlconfdata/virtio-non-transitional.x86_64-latest.ar= gs b/tests/qemuxmlconfdata/virtio-non-transitional.x86_64-latest.args index 0701791d47..aab6118333 100644 --- a/tests/qemuxmlconfdata/virtio-non-transitional.x86_64-latest.args +++ b/tests/qemuxmlconfdata/virtio-non-transitional.x86_64-latest.args @@ -52,5 +52,5 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -object '{"qom-type":"rng-random","id":"objrng0","filename":"/dev/urandom"= }' \ -device '{"driver":"virtio-rng-pci-non-transitional","rng":"objrng0","id":= "rng0","bus":"pci.8","addr":"0x0"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ --device '{"driver":"vhost-vsock-pci-non-transitional","id":"vsock0","guest= -cid":4,"vhostfd":"XXXXXXX","bus":"pci.9","addr":"0x0"}' \ +-device '{"driver":"vhost-vsock-pci-non-transitional","id":"vsock0","guest= -cid":4,"vhostfd":"@vsock-vhost-fd@","bus":"pci.9","addr":"0x0"}' \ -msg timestamp=3Don diff --git a/tests/qemuxmlconfdata/virtio-transitional.x86_64-latest.args b= /tests/qemuxmlconfdata/virtio-transitional.x86_64-latest.args index 8963b6c986..68ba7377e2 100644 --- a/tests/qemuxmlconfdata/virtio-transitional.x86_64-latest.args +++ b/tests/qemuxmlconfdata/virtio-transitional.x86_64-latest.args @@ -45,5 +45,5 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -object '{"qom-type":"rng-random","id":"objrng0","filename":"/dev/urandom"= }' \ -device '{"driver":"virtio-rng-pci-transitional","rng":"objrng0","id":"rng= 0","bus":"pci.2","addr":"0x8"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ --device '{"driver":"vhost-vsock-pci-transitional","id":"vsock0","guest-cid= ":4,"vhostfd":"XXXXXXX","bus":"pci.2","addr":"0x9"}' \ +-device '{"driver":"vhost-vsock-pci-transitional","id":"vsock0","guest-cid= ":4,"vhostfd":"@vsock-vhost-fd@","bus":"pci.2","addr":"0x9"}' \ -msg timestamp=3Don diff --git a/tests/qemuxmlconftest.c b/tests/qemuxmlconftest.c index 646077648f..c45701978c 100644 --- a/tests/qemuxmlconftest.c +++ b/tests/qemuxmlconftest.c @@ -193,7 +193,7 @@ testCompareXMLToArgvCreateArgs(virQEMUDriver *drv, if (vsock->auto_cid =3D=3D VIR_TRISTATE_BOOL_YES) vsock->guest_cid =3D 42; - vsockPriv->vhostfd =3D 6789; + vsockPriv->vhostfd =3D virTestMakeDummyFD(g_strdup("@vsock-vhost-f= d@")); } for (i =3D 0; i < vm->def->nfss; i++) { --=20 2.54.0 From nobody Sat May 30 15:28:30 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.libvirt.org designates 38.145.34.151 as permitted sender) client-ip=38.145.34.151; envelope-from=devel-bounces@lists.libvirt.org; helo=lists.libvirt.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.libvirt.org designates 38.145.34.151 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=pass(p=reject dis=none) header.from=lists.libvirt.org ARC-Seal: i=1; a=rsa-sha256; t=1779384321; cv=none; d=zohomail.com; s=zohoarc; b=U1E2tphFzLDRFND/8ZucCqlx3Gdv+Qby65T2fBxbigciD/X5dc1cCKC5VI7n6cFkqw6pBOLmzdq8qn7dKdx2K9Ao6U0TXKNA7wtrfTTS6mJilubUY9ZPVTxBWcFA/yeSL0agEIC78wZ7xt/6RwHutM1HuAoNb+8yqrH7S3yRcAM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1779384321; h=Content-Type:Content-Transfer-Encoding:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Owner:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:Reply-To:References:Subject:Subject:To:To:Message-Id:Cc; bh=Oyp/vyDnpsH17HosSM9bFXGbZZ1LvQUqn/GIztbLkM4=; b=kRVmczXWwOQLqBvy3gsZMCq7Nh+0IxJIHSxhgCAR07k37HnOU75dLv22DYowLWGSHzWnt9cxuC4Det2VMlucFYMYhcgLce0MdN5kj6fBWkEIUM469W1EvfgVZ/ASBaY/FiVS9eSbQP1E5EfVoq6VlIjfSstZNFgnAbb9NkPa6/s= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.libvirt.org designates 38.145.34.151 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=pass header.from= (p=reject dis=none) Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [38.145.34.151]) by mx.zohomail.com with SMTPS id 1779384321702954.4055672600457; Thu, 21 May 2026 10:25:21 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 993) id 75CE741BC2; Thu, 21 May 2026 13:25:20 -0400 (EDT) Received: from [172.19.199.4] (unknown [10.16.107.18]) by lists.libvirt.org (Postfix) with ESMTP id 6FF4A41A4E; Thu, 21 May 2026 12:36:11 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 993) id 8D95F41CAD; Thu, 21 May 2026 12:36:02 -0400 (EDT) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (3072 bits) server-digest SHA256) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id 0621641CC2 for ; Thu, 21 May 2026 12:24:23 -0400 (EDT) Received: from mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-588-jntGM0n_MKSejeNlQJEVeg-1; Thu, 21 May 2026 12:24:17 -0400 Received: from mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.17]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 6A86D18005B6 for ; Thu, 21 May 2026 16:24:16 +0000 (UTC) Received: from speedmetal.openshiftapps.com (unknown [10.44.22.3]) by mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id B81EB1956053 for ; Thu, 21 May 2026 16:24:15 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 4.0.1 (2024-03-26) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H5, RCVD_IN_MSPIKE_WL,SPF_HELO_PASS autolearn=unavailable autolearn_force=no version=4.0.1 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1779380663; h=from:from: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; bh=Oyp/vyDnpsH17HosSM9bFXGbZZ1LvQUqn/GIztbLkM4=; b=dUW76UJ6R0nRU1MxCSJQW627yb05wdPHNzQ2gYQGpdQC5MWSK598PP2RHH47QTkOwql8wj 8Ct2LHte96T2nlseQFL2MwmPf7SLz8Is1rCZhuk0rxGLGaVc1dZb/9RSaxe9OTupJGfPjt Ig0BvZXT5ucJJHpuJVLg7EmIuCWvoI0= X-MC-Unique: jntGM0n_MKSejeNlQJEVeg-1 X-Mimecast-MFC-AGG-ID: jntGM0n_MKSejeNlQJEVeg_1779380656 To: devel@lists.libvirt.org Subject: [PATCH 28/30] qemuxml2argvmock: Use real FDs for interface tests Date: Thu, 21 May 2026 18:23:37 +0200 Message-ID: <6f8c2376900f724e3eec5ae62ac0743c698e8d0a.1779380461.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.17 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: xoWh8LssZSISOd48vSbU8d70MosxZTUYatbKuXs3WEM_1779380656 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: T5WOZPG4GV4MTMWO22MAFLC6643F4D4D X-Message-ID-Hash: T5WOZPG4GV4MTMWO22MAFLC6643F4D4D X-MailFrom: pkrempa@redhat.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; header-match-devel.lists.libvirt.org-0; emergency; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.10 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: From: Peter Krempa via Devel Reply-To: Peter Krempa X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1779384322865158500 Content-Type: text/plain; charset="utf-8" From: Peter Krempa Similarly to previous commits use real FDs so that we don't risk collisions. Note that for the test cases passing multiple tap and vhost FDs the helpers which stabilize the output don't actually work, as the FDs are concatenated. For now we'll not deal with this and simply leave them censored by the 'XXXXXXX' string. Signed-off-by: Peter Krempa Reviewed-by: Michal Privoznik --- tests/qemuxml2argvmock.c | 19 +++++++++---------- .../downscript.x86_64-latest.args | 2 +- .../graphics-spice-timeout.x86_64-latest.args | 2 +- .../net-bandwidth.x86_64-latest.args | 2 +- .../net-bandwidth2.x86_64-latest.args | 2 +- .../net-coalesce.x86_64-latest.args | 6 +++--- .../net-eth-hostip.x86_64-latest.args | 2 +- .../net-eth-ifname.x86_64-latest.args | 2 +- .../net-eth-names.x86_64-latest.args | 4 ++-- .../net-eth-unmanaged-tap.x86_64-latest.args | 2 +- .../net-eth.x86_64-latest.args | 2 +- .../net-isolated-port.x86_64-latest.args | 2 +- .../net-midonet.x86_64-latest.args | 2 +- .../net-mtu.x86_64-latest.args | 4 ++-- .../net-openvswitch.x86_64-latest.args | 2 +- ...irtio-network-portgroup.x86_64-latest.args | 6 +++--- ...-virtio-teaming-network.x86_64-latest.args | 2 +- .../net-virtio-vhost.x86_64-latest.args | 2 +- .../tap-vhost-incorrect.x86_64-latest.args | 4 ++-- .../user-aliases.x86_64-latest.args | 2 +- 20 files changed, 35 insertions(+), 36 deletions(-) diff --git a/tests/qemuxml2argvmock.c b/tests/qemuxml2argvmock.c index de10117330..0440bb15e2 100644 --- a/tests/qemuxml2argvmock.c +++ b/tests/qemuxml2argvmock.c @@ -105,22 +105,21 @@ virNetDevTapCreate(char **ifname, { size_t i; - for (i =3D 0; i < tapfdSize; i++) - tapfd[i] =3D 2900 + i; - - if (STREQ_NULLABLE(*ifname, "mytap0")) { - return 0; - } else { + if (STRNEQ_NULLABLE(*ifname, "mytap0")) { VIR_FREE(*ifname); *ifname =3D g_strdup("vnet0"); - return 0; } + + for (i =3D 0; i < tapfdSize; i++) + tapfd[i] =3D virTestMakeDummyFD(g_strdup_printf("@tap-%s-fd@", *if= name)); + + return 0; } int virDomainInterfaceBridgeConnect(virDomainDef *def G_GNUC_UNUSED, - virDomainNetDef *net G_GNUC_UNUSED, + virDomainNetDef *net, int *tapfd, size_t *tapfdSize, bool privileged G_GNUC_UNUSED, @@ -131,7 +130,7 @@ virDomainInterfaceBridgeConnect(virDomainDef *def G_GNU= C_UNUSED, size_t i; for (i =3D 0; i < *tapfdSize; i++) - tapfd[i] =3D 2800 + i; + tapfd[i] =3D virTestMakeDummyFD(g_strdup_printf("@iface-%s-fd@", n= et->info.alias)); return 0; } @@ -235,7 +234,7 @@ qemuInterfaceOpenVhostNet(virDomainObj *vm G_GNUC_UNUSE= D, for (i =3D 0; i < vhostfdSize; i++) { g_autofree char *name =3D g_strdup_printf("vhostfd-%s%zu", net->in= fo.alias, i); - int fd =3D 2200 + i; + int fd =3D virTestMakeDummyFD(g_strdup_printf("@vhostfd-%s-fd@", n= et->info.alias)); netpriv->vhostfds =3D g_slist_prepend(netpriv->vhostfds, qemuFDPas= sDirectNew(name, &fd)); } diff --git a/tests/qemuxmlconfdata/downscript.x86_64-latest.args b/tests/qe= muxmlconfdata/downscript.x86_64-latest.args index d0054089b6..d3b1b8ec23 100644 --- a/tests/qemuxmlconfdata/downscript.x86_64-latest.args +++ b/tests/qemuxmlconfdata/downscript.x86_64-latest.args @@ -34,7 +34,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -device '{"driver":"virtio-9p-pci","id":"fs0","fsdev":"fsdev-fs0","mount_t= ag":"fs1","bus":"pci.0","addr":"0x3"}' \ -fsdev local,security_model=3Dmapped,id=3Dfsdev-fs1,path=3D/export/fs2 \ -device '{"driver":"virtio-9p-pci","id":"fs1","fsdev":"fsdev-fs1","mount_t= ag":"fs2","bus":"pci.0","addr":"0x4"}' \ --netdev '{"type":"tap","fd":"XXXXXXX","vhost":true,"vhostfd":"XXXXXXX","id= ":"hostnet0"}' \ +-netdev '{"type":"tap","fd":"@tap-vnet0-fd@","vhost":true,"vhostfd":"@vhos= tfd-net0-fd@","id":"hostnet0"}' \ -device '{"driver":"virtio-net-pci","netdev":"hostnet0","id":"net0","mac":= "52:54:00:f6:66:88","bus":"pci.0","addr":"0xb"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0xc"}' \ diff --git a/tests/qemuxmlconfdata/graphics-spice-timeout.x86_64-latest.arg= s b/tests/qemuxmlconfdata/graphics-spice-timeout.x86_64-latest.args index cd5c91f9c4..841a161654 100644 --- a/tests/qemuxmlconfdata/graphics-spice-timeout.x86_64-latest.args +++ b/tests/qemuxmlconfdata/graphics-spice-timeout.x86_64-latest.args @@ -27,7 +27,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-f14/.co= nfig \ -boot menu=3Don,strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ -device '{"driver":"virtio-serial-pci","id":"virtio-serial0","bus":"pci.0"= ,"addr":"0x6"}' \ --netdev '{"type":"tap","fd":"XXXXXXX","id":"hostnet0"}' \ +-netdev '{"type":"tap","fd":"@tap-vnet0-fd@","id":"hostnet0"}' \ -device '{"driver":"rtl8139","netdev":"hostnet0","id":"net0","mac":"52:54:= 00:71:70:89","bus":"pci.0","addr":"0x7"}' \ -device '{"driver":"usb-tablet","id":"input0","bus":"usb.0","port":"1"}' \ -audiodev '{"id":"audio1","driver":"spice"}' \ diff --git a/tests/qemuxmlconfdata/net-bandwidth.x86_64-latest.args b/tests= /qemuxmlconfdata/net-bandwidth.x86_64-latest.args index 210ae98d3c..e1d4e5c902 100644 --- a/tests/qemuxmlconfdata/net-bandwidth.x86_64-latest.args +++ b/tests/qemuxmlconfdata/net-bandwidth.x86_64-latest.args @@ -32,7 +32,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-f14-60/= .config \ -device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x4","drive":"li= bvirt-2-format","id":"virtio-disk0","bootindex":2}' \ -blockdev '{"driver":"file","filename":"/home/zippy/tmp/Fedora-14-x86_64-L= ive-KDE.iso","node-name":"libvirt-1-storage","read-only":true}' \ -device '{"driver":"ide-cd","bus":"ide.1","unit":0,"drive":"libvirt-1-stor= age","id":"ide0-1-0","bootindex":1}' \ --netdev '{"type":"tap","fd":"XXXXXXX","id":"hostnet0"}' \ +-netdev '{"type":"tap","fd":"@iface-net0-fd@","id":"hostnet0"}' \ -device '{"driver":"rtl8139","netdev":"hostnet0","id":"net0","mac":"52:54:= 00:24:a5:9f","bus":"pci.0","addr":"0x7"}' \ -chardev pty,id=3Dcharserial0 \ -device '{"driver":"isa-serial","chardev":"charserial0","id":"serial0","in= dex":0}' \ diff --git a/tests/qemuxmlconfdata/net-bandwidth2.x86_64-latest.args b/test= s/qemuxmlconfdata/net-bandwidth2.x86_64-latest.args index 573c24ba17..edcdaa997e 100644 --- a/tests/qemuxmlconfdata/net-bandwidth2.x86_64-latest.args +++ b/tests/qemuxmlconfdata/net-bandwidth2.x86_64-latest.args @@ -30,7 +30,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-f14-60/= .config \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/f14-6.img"= ,"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-disk0","bootindex":2}' \ --netdev '{"type":"tap","fd":"XXXXXXX","id":"hostnet0"}' \ +-netdev '{"type":"tap","fd":"@iface-net0-fd@","id":"hostnet0"}' \ -device '{"driver":"rtl8139","netdev":"hostnet0","id":"net0","mac":"52:54:= 00:24:a5:9f","bus":"pci.0","addr":"0x7"}' \ -chardev pty,id=3Dcharserial0 \ -device '{"driver":"isa-serial","chardev":"charserial0","id":"serial0","in= dex":0}' \ diff --git a/tests/qemuxmlconfdata/net-coalesce.x86_64-latest.args b/tests/= qemuxmlconfdata/net-coalesce.x86_64-latest.args index 9c061e4e6f..26c174778a 100644 --- a/tests/qemuxmlconfdata/net-coalesce.x86_64-latest.args +++ b/tests/qemuxmlconfdata/net-coalesce.x86_64-latest.args @@ -33,11 +33,11 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-test/= .config \ -device '{"driver":"virtio-blk-pci","event_idx":true,"bus":"pci.0","addr":= "0x4","drive":"libvirt-2-format","id":"virtio-disk0","bootindex":2}' \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/Fedora-14-x86_64-= Live-KDE.iso","node-name":"libvirt-1-storage","read-only":true}' \ -device '{"driver":"ide-cd","bus":"ide.1","unit":0,"drive":"libvirt-1-stor= age","id":"ide0-1-0","bootindex":1}' \ --netdev '{"type":"tap","fd":"XXXXXXX","vhost":true,"vhostfd":"XXXXXXX","id= ":"hostnet0"}' \ +-netdev '{"type":"tap","fd":"@iface-net0-fd@","vhost":true,"vhostfd":"@vho= stfd-net0-fd@","id":"hostnet0"}' \ -device '{"driver":"virtio-net-pci","netdev":"hostnet0","id":"net0","mac":= "52:54:00:e5:48:58","bus":"pci.0","addr":"0x2"}' \ --netdev '{"type":"tap","fd":"XXXXXXX","vhost":true,"vhostfd":"XXXXXXX","id= ":"hostnet1"}' \ +-netdev '{"type":"tap","fd":"@iface-net1-fd@","vhost":true,"vhostfd":"@vho= stfd-net1-fd@","id":"hostnet1"}' \ -device '{"driver":"virtio-net-pci","netdev":"hostnet1","id":"net1","mac":= "52:54:00:e5:48:59","bus":"pci.0","addr":"0x3"}' \ --netdev '{"type":"tap","fd":"XXXXXXX","vhost":true,"vhostfd":"XXXXXXX","id= ":"hostnet2"}' \ +-netdev '{"type":"tap","fd":"@iface-net2-fd@","vhost":true,"vhostfd":"@vho= stfd-net2-fd@","id":"hostnet2"}' \ -device '{"driver":"virtio-net-pci","netdev":"hostnet2","id":"net2","mac":= "52:54:00:e5:48:60","bus":"pci.0","addr":"0x5"}' \ -chardev pty,id=3Dcharserial0 \ -device '{"driver":"isa-serial","chardev":"charserial0","id":"serial0","in= dex":0}' \ diff --git a/tests/qemuxmlconfdata/net-eth-hostip.x86_64-latest.args b/test= s/qemuxmlconfdata/net-eth-hostip.x86_64-latest.args index 6a9b53ca52..2bea0659df 100644 --- a/tests/qemuxmlconfdata/net-eth-hostip.x86_64-latest.args +++ b/tests/qemuxmlconfdata/net-eth-hostip.x86_64-latest.args @@ -29,7 +29,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","read-only":false}' \ -device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-stor= age","id":"ide0-0-0","bootindex":1}' \ --netdev '{"type":"tap","fd":"XXXXXXX","id":"hostnet0"}' \ +-netdev '{"type":"tap","fd":"@tap-vnet0-fd@","id":"hostnet0"}' \ -device '{"driver":"rtl8139","netdev":"hostnet0","id":"net0","mac":"00:11:= 22:33:44:55","bus":"pci.0","addr":"0x2"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ diff --git a/tests/qemuxmlconfdata/net-eth-ifname.x86_64-latest.args b/test= s/qemuxmlconfdata/net-eth-ifname.x86_64-latest.args index 6a9b53ca52..2bea0659df 100644 --- a/tests/qemuxmlconfdata/net-eth-ifname.x86_64-latest.args +++ b/tests/qemuxmlconfdata/net-eth-ifname.x86_64-latest.args @@ -29,7 +29,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","read-only":false}' \ -device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-stor= age","id":"ide0-0-0","bootindex":1}' \ --netdev '{"type":"tap","fd":"XXXXXXX","id":"hostnet0"}' \ +-netdev '{"type":"tap","fd":"@tap-vnet0-fd@","id":"hostnet0"}' \ -device '{"driver":"rtl8139","netdev":"hostnet0","id":"net0","mac":"00:11:= 22:33:44:55","bus":"pci.0","addr":"0x2"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ diff --git a/tests/qemuxmlconfdata/net-eth-names.x86_64-latest.args b/tests= /qemuxmlconfdata/net-eth-names.x86_64-latest.args index 70845d070a..4e7109e54a 100644 --- a/tests/qemuxmlconfdata/net-eth-names.x86_64-latest.args +++ b/tests/qemuxmlconfdata/net-eth-names.x86_64-latest.args @@ -29,9 +29,9 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","read-only":false}' \ -device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-stor= age","id":"ide0-0-0","bootindex":1}' \ --netdev '{"type":"tap","fd":"XXXXXXX","id":"hostnet0"}' \ +-netdev '{"type":"tap","fd":"@tap-vnet0-fd@","id":"hostnet0"}' \ -device '{"driver":"rtl8139","netdev":"hostnet0","id":"net0","mac":"00:11:= 22:33:44:55","bus":"pci.0","addr":"0x2"}' \ --netdev '{"type":"tap","fd":"XXXXXXX","id":"hostnet1"}' \ +-netdev '{"type":"tap","fd":"@tap-vnet0-fd@","id":"hostnet1"}' \ -device '{"driver":"e1000","netdev":"hostnet1","id":"net1","mac":"00:11:22= :33:44:56","bus":"pci.0","addr":"0x3"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x4"}' \ diff --git a/tests/qemuxmlconfdata/net-eth-unmanaged-tap.x86_64-latest.args= b/tests/qemuxmlconfdata/net-eth-unmanaged-tap.x86_64-latest.args index 2c441611ca..695a08b9a9 100644 --- a/tests/qemuxmlconfdata/net-eth-unmanaged-tap.x86_64-latest.args +++ b/tests/qemuxmlconfdata/net-eth-unmanaged-tap.x86_64-latest.args @@ -29,7 +29,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","read-only":false}' \ -device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-stor= age","id":"ide0-0-0","bootindex":1}' \ --netdev '{"type":"tap","fd":"XXXXXXX","vhost":true,"vhostfd":"XXXXXXX","id= ":"hostnet0"}' \ +-netdev '{"type":"tap","fd":"@tap-mytap0-fd@","vhost":true,"vhostfd":"@vho= stfd-net0-fd@","id":"hostnet0"}' \ -device '{"driver":"virtio-net-pci","netdev":"hostnet0","id":"net0","mac":= "fe:11:22:33:44:55","bus":"pci.0","addr":"0x2"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ diff --git a/tests/qemuxmlconfdata/net-eth.x86_64-latest.args b/tests/qemux= mlconfdata/net-eth.x86_64-latest.args index 6a9b53ca52..2bea0659df 100644 --- a/tests/qemuxmlconfdata/net-eth.x86_64-latest.args +++ b/tests/qemuxmlconfdata/net-eth.x86_64-latest.args @@ -29,7 +29,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","read-only":false}' \ -device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-stor= age","id":"ide0-0-0","bootindex":1}' \ --netdev '{"type":"tap","fd":"XXXXXXX","id":"hostnet0"}' \ +-netdev '{"type":"tap","fd":"@tap-vnet0-fd@","id":"hostnet0"}' \ -device '{"driver":"rtl8139","netdev":"hostnet0","id":"net0","mac":"00:11:= 22:33:44:55","bus":"pci.0","addr":"0x2"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ diff --git a/tests/qemuxmlconfdata/net-isolated-port.x86_64-latest.args b/t= ests/qemuxmlconfdata/net-isolated-port.x86_64-latest.args index 20f83c0f16..d76c6fa4ac 100644 --- a/tests/qemuxmlconfdata/net-isolated-port.x86_64-latest.args +++ b/tests/qemuxmlconfdata/net-isolated-port.x86_64-latest.args @@ -32,7 +32,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-q35-tes= t/.config \ -device '{"driver":"qemu-xhci","id":"usb","bus":"pci.2","addr":"0x0"}' \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","read-only":false}' \ -device '{"driver":"ide-hd","bus":"ide.0","drive":"libvirt-1-storage","id"= :"sata0-0-0","bootindex":1}' \ --netdev '{"type":"tap","fd":"XXXXXXX","vhost":true,"vhostfd":"XXXXXXX","id= ":"hostnet0"}' \ +-netdev '{"type":"tap","fd":"@iface-net0-fd@","vhost":true,"vhostfd":"@vho= stfd-net0-fd@","id":"hostnet0"}' \ -device '{"driver":"virtio-net-pci","netdev":"hostnet0","id":"net0","mac":= "52:54:00:d6:c0:0b","bus":"pci.1","addr":"0x0"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"qxl-vga","id":"video0","max_outputs":1,"ram_size":6710= 8864,"vram_size":33554432,"vram64_size_mb":0,"vgamem_mb":8,"bus":"pcie.0","= addr":"0x1"}' \ diff --git a/tests/qemuxmlconfdata/net-midonet.x86_64-latest.args b/tests/q= emuxmlconfdata/net-midonet.x86_64-latest.args index f5bac0b91c..e98688963c 100644 --- a/tests/qemuxmlconfdata/net-midonet.x86_64-latest.args +++ b/tests/qemuxmlconfdata/net-midonet.x86_64-latest.args @@ -29,7 +29,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","read-only":false}' \ -device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-stor= age","id":"ide0-0-0","bootindex":1}' \ --netdev '{"type":"tap","fd":"XXXXXXX","vhost":true,"vhostfd":"XXXXXXX","id= ":"hostnet0"}' \ +-netdev '{"type":"tap","fd":"@iface-net0-fd@","vhost":true,"vhostfd":"@vho= stfd-net0-fd@","id":"hostnet0"}' \ -device '{"driver":"virtio-net-pci","netdev":"hostnet0","id":"net0","mac":= "00:11:22:33:44:55","bus":"pci.0","addr":"0x2"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x3"}' \ diff --git a/tests/qemuxmlconfdata/net-mtu.x86_64-latest.args b/tests/qemux= mlconfdata/net-mtu.x86_64-latest.args index ce88e8b1ba..0479462ebb 100644 --- a/tests/qemuxmlconfdata/net-mtu.x86_64-latest.args +++ b/tests/qemuxmlconfdata/net-mtu.x86_64-latest.args @@ -33,9 +33,9 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-test/.c= onfig \ -device '{"driver":"virtio-blk-pci","event_idx":true,"bus":"pci.0","addr":= "0x4","drive":"libvirt-2-format","id":"virtio-disk0","bootindex":2}' \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/Fedora-14-x86_64-= Live-KDE.iso","node-name":"libvirt-1-storage","read-only":true}' \ -device '{"driver":"ide-cd","bus":"ide.1","unit":0,"drive":"libvirt-1-stor= age","id":"ide0-1-0","bootindex":1}' \ --netdev '{"type":"tap","fd":"XXXXXXX","vhost":true,"vhostfd":"XXXXXXX","id= ":"hostnet0"}' \ +-netdev '{"type":"tap","fd":"@iface-net0-fd@","vhost":true,"vhostfd":"@vho= stfd-net0-fd@","id":"hostnet0"}' \ -device '{"driver":"virtio-net-pci","host_mtu":1500,"netdev":"hostnet0","i= d":"net0","mac":"52:54:00:e5:48:58","bus":"pci.0","addr":"0x2"}' \ --netdev '{"type":"tap","fd":"XXXXXXX","vhost":true,"vhostfd":"XXXXXXX","sn= dbuf":1600,"id":"hostnet1"}' \ +-netdev '{"type":"tap","fd":"@iface-net1-fd@","vhost":true,"vhostfd":"@vho= stfd-net1-fd@","sndbuf":1600,"id":"hostnet1"}' \ -device '{"driver":"virtio-net-pci","host_mtu":9000,"netdev":"hostnet1","i= d":"net1","mac":"52:54:00:e5:48:59","bus":"pci.0","addr":"0x3"}' \ -chardev pty,id=3Dcharserial0 \ -device '{"driver":"isa-serial","chardev":"charserial0","id":"serial0","in= dex":0}' \ diff --git a/tests/qemuxmlconfdata/net-openvswitch.x86_64-latest.args b/tes= ts/qemuxmlconfdata/net-openvswitch.x86_64-latest.args index 31cc8cbbf3..813b0509d6 100644 --- a/tests/qemuxmlconfdata/net-openvswitch.x86_64-latest.args +++ b/tests/qemuxmlconfdata/net-openvswitch.x86_64-latest.args @@ -29,7 +29,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","read-only":false}' \ -device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-stor= age","id":"ide0-0-0","bootindex":1}' \ --netdev '{"type":"tap","fd":"XXXXXXX","id":"hostnet0"}' \ +-netdev '{"type":"tap","fd":"@iface-net0-fd@","id":"hostnet0"}' \ -device '{"driver":"rtl8139","netdev":"hostnet0","id":"net0","mac":"00:11:= 22:33:44:55","bus":"pci.0","addr":"0x2"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x3"}' \ diff --git a/tests/qemuxmlconfdata/net-virtio-network-portgroup.x86_64-late= st.args b/tests/qemuxmlconfdata/net-virtio-network-portgroup.x86_64-latest.= args index c01bc60976..7c0e901f1d 100644 --- a/tests/qemuxmlconfdata/net-virtio-network-portgroup.x86_64-latest.args +++ b/tests/qemuxmlconfdata/net-virtio-network-portgroup.x86_64-latest.args @@ -29,11 +29,11 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUG= uest1/.config \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","read-only":false}' \ -device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-stor= age","id":"ide0-0-0","bootindex":1}' \ --netdev '{"type":"tap","fd":"XXXXXXX","vhost":true,"vhostfd":"XXXXXXX","id= ":"hostnet0"}' \ +-netdev '{"type":"tap","fd":"@iface-net0-fd@","vhost":true,"vhostfd":"@vho= stfd-net0-fd@","id":"hostnet0"}' \ -device '{"driver":"virtio-net-pci","netdev":"hostnet0","id":"net0","mac":= "00:11:22:33:44:55","bus":"pci.0","addr":"0x2"}' \ --netdev '{"type":"tap","fd":"XXXXXXX","id":"hostnet1"}' \ +-netdev '{"type":"tap","fd":"@iface-net1-fd@","id":"hostnet1"}' \ -device '{"driver":"rtl8139","netdev":"hostnet1","id":"net1","mac":"10:11:= 22:33:44:55","bus":"pci.0","addr":"0x3"}' \ --netdev '{"type":"tap","fd":"XXXXXXX","id":"hostnet2"}' \ +-netdev '{"type":"tap","fd":"@iface-net2-fd@","id":"hostnet2"}' \ -device '{"driver":"rtl8139","netdev":"hostnet2","id":"net2","mac":"22:11:= 22:33:44:55","bus":"pci.0","addr":"0x4"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x5"}' \ diff --git a/tests/qemuxmlconfdata/net-virtio-teaming-network.x86_64-latest= .args b/tests/qemuxmlconfdata/net-virtio-teaming-network.x86_64-latest.args index 2c2c219ba4..0a55473d12 100644 --- a/tests/qemuxmlconfdata/net-virtio-teaming-network.x86_64-latest.args +++ b/tests/qemuxmlconfdata/net-virtio-teaming-network.x86_64-latest.args @@ -29,7 +29,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","read-only":false}' \ -device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-stor= age","id":"ide0-0-0","bootindex":1}' \ --netdev '{"type":"tap","fd":"XXXXXXX","vhost":true,"vhostfd":"XXXXXXX","id= ":"hostua-backup0"}' \ +-netdev '{"type":"tap","fd":"@iface-ua-backup0-fd@","vhost":true,"vhostfd"= :"@vhostfd-ua-backup0-fd@","id":"hostua-backup0"}' \ -device '{"driver":"virtio-net-pci","failover":true,"netdev":"hostua-backu= p0","id":"ua-backup0","mac":"00:11:22:33:44:55","bus":"pci.0","addr":"0x2"}= ' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"vfio-pci","host":"0000:06:12.2","id":"hostdev0","failo= ver_pair_id":"ua-backup0","bus":"pci.0","addr":"0x3"}' \ diff --git a/tests/qemuxmlconfdata/net-virtio-vhost.x86_64-latest.args b/te= sts/qemuxmlconfdata/net-virtio-vhost.x86_64-latest.args index c77cbd2a71..acbb8a53ec 100644 --- a/tests/qemuxmlconfdata/net-virtio-vhost.x86_64-latest.args +++ b/tests/qemuxmlconfdata/net-virtio-vhost.x86_64-latest.args @@ -30,7 +30,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-test/.c= onfig \ -device '{"driver":"virtio-serial-pci","id":"virtio-serial0","bus":"pci.0"= ,"addr":"0x6"}' \ -netdev '{"type":"tap","fds":"XXXXXXX","vhost":true,"vhostfds":"XXXXXXX","= id":"hostnet0"}' \ -device '{"driver":"virtio-net-pci","mq":true,"vectors":12,"netdev":"hostn= et0","id":"net0","mac":"52:54:00:e5:48:58","bus":"pci.0","addr":"0x2"}' \ --netdev '{"type":"tap","fd":"XXXXXXX","vhost":true,"vhostfd":"XXXXXXX","id= ":"hostnet1"}' \ +-netdev '{"type":"tap","fd":"@tap-vnet0-fd@","vhost":true,"vhostfd":"@vhos= tfd-net1-fd@","id":"hostnet1"}' \ -device '{"driver":"virtio-net-pci","ioeventfd":true,"netdev":"hostnet1","= id":"net1","mac":"52:54:00:e5:48:59","bus":"pci.0","addr":"0x3"}' \ -netdev '{"type":"tap","fds":"XXXXXXX","vhost":true,"vhostfds":"XXXXXXX","= id":"hostnet2"}' \ -device '{"driver":"virtio-net-pci","ioeventfd":true,"mq":true,"vectors":1= 2,"netdev":"hostnet2","id":"net2","mac":"52:54:00:e5:48:5a","bus":"pci.0","= addr":"0x4"}' \ diff --git a/tests/qemuxmlconfdata/tap-vhost-incorrect.x86_64-latest.args b= /tests/qemuxmlconfdata/tap-vhost-incorrect.x86_64-latest.args index 9e0df73d75..156683c5a0 100644 --- a/tests/qemuxmlconfdata/tap-vhost-incorrect.x86_64-latest.args +++ b/tests/qemuxmlconfdata/tap-vhost-incorrect.x86_64-latest.args @@ -28,9 +28,9 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-test/.c= onfig \ -boot menu=3Don,strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ -device '{"driver":"virtio-serial-pci","id":"virtio-serial0","bus":"pci.0"= ,"addr":"0x6"}' \ --netdev '{"type":"tap","fd":"XXXXXXX","id":"hostnet0"}' \ +-netdev '{"type":"tap","fd":"@iface-net0-fd@","id":"hostnet0"}' \ -device '{"driver":"e1000","netdev":"hostnet0","id":"net0","mac":"52:54:00= :e5:48:58","bus":"pci.0","addr":"0x2"}' \ --netdev '{"type":"tap","fd":"XXXXXXX","vhost":true,"vhostfd":"XXXXXXX","id= ":"hostnet1"}' \ +-netdev '{"type":"tap","fd":"@iface-net1-fd@","vhost":true,"vhostfd":"@vho= stfd-net1-fd@","id":"hostnet1"}' \ -device '{"driver":"virtio-net-pci","netdev":"hostnet1","id":"net1","mac":= "52:54:00:e5:48:59","bus":"pci.0","addr":"0x3"}' \ -chardev pty,id=3Dcharserial0 \ -device '{"driver":"isa-serial","chardev":"charserial0","id":"serial0","in= dex":0}' \ diff --git a/tests/qemuxmlconfdata/user-aliases.x86_64-latest.args b/tests/= qemuxmlconfdata/user-aliases.x86_64-latest.args index f5ca356773..bd48634c40 100644 --- a/tests/qemuxmlconfdata/user-aliases.x86_64-latest.args +++ b/tests/qemuxmlconfdata/user-aliases.x86_64-latest.args @@ -49,7 +49,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-gentoo/= .config \ -device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x7","drive":"li= bvirt-2-format","id":"ua-myEncryptedDisk1"}' \ -blockdev '{"driver":"file","filename":"/home/zippy/tmp/install-amd64-mini= mal-20140619.iso","node-name":"libvirt-1-storage","read-only":true,"cache":= {"direct":true,"no-flush":false}}' \ -device '{"driver":"ide-cd","bus":"ide.1","unit":0,"share-rw":true,"drive"= :"libvirt-1-storage","id":"ua-WhatAnAwesomeCDROM","bootindex":2,"write-cach= e":"on"}' \ --netdev '{"type":"tap","fd":"XXXXXXX","vhost":true,"vhostfd":"XXXXXXX","id= ":"hostua-CheckoutThisNIC"}' \ +-netdev '{"type":"tap","fd":"@tap-vnet0-fd@","vhost":true,"vhostfd":"@vhos= tfd-ua-CheckoutThisNIC-fd@","id":"hostua-CheckoutThisNIC"}' \ -device '{"driver":"virtio-net-pci","netdev":"hostua-CheckoutThisNIC","id"= :"ua-CheckoutThisNIC","mac":"52:54:00:d6:c0:0b","bus":"pci.0","addr":"0x3"}= ' \ -netdev '{"type":"socket","listen":"127.0.0.1:1234","id":"hostua-WeCanAlso= DoServerMode"}' \ -device '{"driver":"rtl8139","netdev":"hostua-WeCanAlsoDoServerMode","id":= "ua-WeCanAlsoDoServerMode","mac":"52:54:00:22:c9:42","bus":"pci.0","addr":"= 0x9"}' \ --=20 2.54.0 From nobody Sat May 30 15:28:30 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.libvirt.org designates 38.145.34.151 as permitted sender) client-ip=38.145.34.151; envelope-from=devel-bounces@lists.libvirt.org; helo=lists.libvirt.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.libvirt.org designates 38.145.34.151 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=pass(p=reject dis=none) header.from=lists.libvirt.org ARC-Seal: i=1; a=rsa-sha256; t=1779384108; cv=none; d=zohomail.com; s=zohoarc; b=bvNY47RJoFc7222zva+LAOB3EcFFzOzKDEZcsIxTi/LLzRkeEV81pZ5It4MeOD+xCTly8ZP4Coy3wPS9Gnii5+YPa76xHROA3cag4uYde/SYyvIcn+HzXoIr1s7K3p9ArKqsk1gDWxiW+y2twkysvYPWcysoy/B54KzYRFxSK0g= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1779384108; h=Content-Type:Content-Transfer-Encoding:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Owner:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:Reply-To:References:Subject:Subject:To:To:Message-Id:Cc; bh=SSfBGzwnCcmftzC7YknAQf2l+hBmg5Gmx/a+1iOZDl0=; b=WR/aSVva7H0fNqYGfz8hV06dDfN3O2gnS3DVgvgbSgAi5Y8eudChQ1aMpLdKZM4CGM07R/CBtzqtN48sJCbrH1WoxwyQKE8gOLiBZkNqzmJBKSiPkDtc/8M71jZf1k85JlxwnV/8pibEQsjm4dJi8xxT13rLZ9pq/tJEruUsI8Q= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.libvirt.org designates 38.145.34.151 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=pass header.from= (p=reject dis=none) Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [38.145.34.151]) by mx.zohomail.com with SMTPS id 177938410854131.02155756848208; Thu, 21 May 2026 10:21:48 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 993) id C996141C8C; Thu, 21 May 2026 13:21:47 -0400 (EDT) Received: from [172.19.199.4] (unknown [10.16.107.18]) by lists.libvirt.org (Postfix) with ESMTP id 944C844203; Thu, 21 May 2026 12:35:19 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 993) id 47EAA44022; Thu, 21 May 2026 12:35:12 -0400 (EDT) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (3072 bits) server-digest SHA256) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id 5822641C3E for ; Thu, 21 May 2026 12:24:20 -0400 (EDT) Received: from mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-83-3VLFo9aeO_G8tWZto9HsZw-1; Thu, 21 May 2026 12:24:18 -0400 Received: from mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.17]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 8150C18005B2 for ; Thu, 21 May 2026 16:24:17 +0000 (UTC) Received: from speedmetal.openshiftapps.com (unknown [10.44.22.3]) by mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id CFC431956053 for ; Thu, 21 May 2026 16:24:16 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 4.0.1 (2024-03-26) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H4, RCVD_IN_MSPIKE_WL,SPF_HELO_PASS autolearn=unavailable autolearn_force=no version=4.0.1 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1779380660; h=from:from: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; bh=SSfBGzwnCcmftzC7YknAQf2l+hBmg5Gmx/a+1iOZDl0=; b=KWTioEWO9dbIdKyqewi+2gi9jIK8CZyxINxGVTc/UsbSjG8rAO9XB61Q4IttuKNDhRCFVW PbIF3DpzWmcv+Zg5O/WKp0qvrG3ukjM5bknjf6mvtcwTen29B1AcRKIjzdeCZmuowac8ux /5DVhm3gFeQJr5XCeOpxwbYwIyBYCY0= X-MC-Unique: 3VLFo9aeO_G8tWZto9HsZw-1 X-Mimecast-MFC-AGG-ID: 3VLFo9aeO_G8tWZto9HsZw_1779380657 To: devel@lists.libvirt.org Subject: [PATCH 29/30] qemuxmlconftest: Use real FDs for hostdev tests Date: Thu, 21 May 2026 18:23:38 +0200 Message-ID: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.17 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: oONNia8yWQOOOXf0GFI09g4ZvW3e9FmtSURCEHO8fTY_1779380657 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: PEONFMRIP4ZKNVFC6OFEQPMAYLLZLBXT X-Message-ID-Hash: PEONFMRIP4ZKNVFC6OFEQPMAYLLZLBXT X-MailFrom: pkrempa@redhat.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; header-match-devel.lists.libvirt.org-0; emergency; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.10 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: From: Peter Krempa via Devel Reply-To: Peter Krempa X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1779384110404154100 Content-Type: text/plain; charset="utf-8" From: Peter Krempa Signed-off-by: Peter Krempa Reviewed-by: Michal Privoznik --- tests/qemuxmlconfdata/iommufd-q35-fd.x86_64-latest.args | 2 +- tests/qemuxmlconfdata/iommufd-q35.x86_64-latest.args | 2 +- .../iommufd-virt-pci-bus-single.aarch64-latest.args | 2 +- tests/qemuxmlconfdata/iommufd-virt.aarch64-latest.args | 4 ++-- tests/qemuxmlconfdata/iommufd.x86_64-latest.args | 2 +- tests/qemuxmlconftest.c | 3 +-- 6 files changed, 7 insertions(+), 8 deletions(-) diff --git a/tests/qemuxmlconfdata/iommufd-q35-fd.x86_64-latest.args b/test= s/qemuxmlconfdata/iommufd-q35-fd.x86_64-latest.args index bf4ee71d7a..463192fbff 100644 --- a/tests/qemuxmlconfdata/iommufd-q35-fd.x86_64-latest.args +++ b/tests/qemuxmlconfdata/iommufd-q35-fd.x86_64-latest.args @@ -36,6 +36,6 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-q35-tes= t/.config \ -global ICH9-LPC.noreboot=3Doff \ -watchdog-action reset \ -object '{"qom-type":"iommufd","id":"iommufd0","fd":"@iommu-0@-dup"}' \ --device '{"driver":"vfio-pci","id":"hostdev0","iommufd":"iommufd0","fd":"X= XXXXXX","bus":"pcie.0","addr":"0x3"}' \ +-device '{"driver":"vfio-pci","id":"hostdev0","iommufd":"iommufd0","fd":"@= hostdev-hostdev0-fd@","bus":"pcie.0","addr":"0x3"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxmlconfdata/iommufd-q35.x86_64-latest.args b/tests/q= emuxmlconfdata/iommufd-q35.x86_64-latest.args index 730855afe1..22c811bfb7 100644 --- a/tests/qemuxmlconfdata/iommufd-q35.x86_64-latest.args +++ b/tests/qemuxmlconfdata/iommufd-q35.x86_64-latest.args @@ -36,6 +36,6 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-q35-tes= t/.config \ -global ICH9-LPC.noreboot=3Doff \ -watchdog-action reset \ -object '{"qom-type":"iommufd","id":"iommufd0","fd":"XXXXXXX"}' \ --device '{"driver":"vfio-pci","id":"hostdev0","iommufd":"iommufd0","fd":"X= XXXXXX","bus":"pcie.0","addr":"0x3"}' \ +-device '{"driver":"vfio-pci","id":"hostdev0","iommufd":"iommufd0","fd":"@= hostdev-hostdev0-fd@","bus":"pcie.0","addr":"0x3"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxmlconfdata/iommufd-virt-pci-bus-single.aarch64-late= st.args b/tests/qemuxmlconfdata/iommufd-virt-pci-bus-single.aarch64-latest.= args index e92b7b44fd..9c04fb6523 100644 --- a/tests/qemuxmlconfdata/iommufd-virt-pci-bus-single.aarch64-latest.args +++ b/tests/qemuxmlconfdata/iommufd-virt-pci-bus-single.aarch64-latest.args @@ -27,6 +27,6 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-foo/.co= nfig \ -boot strict=3Don \ -audiodev '{"id":"audio1","driver":"none"}' \ -object '{"qom-type":"iommufd","id":"iommufd0","fd":"XXXXXXX"}' \ --device '{"driver":"vfio-pci","id":"hostdev0","iommufd":"iommufd0","fd":"X= XXXXXX","bus":"pcie.0","addr":"0x1"}' \ +-device '{"driver":"vfio-pci","id":"hostdev0","iommufd":"iommufd0","fd":"@= hostdev-hostdev0-fd@","bus":"pcie.0","addr":"0x1"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxmlconfdata/iommufd-virt.aarch64-latest.args b/tests= /qemuxmlconfdata/iommufd-virt.aarch64-latest.args index 6719b771c4..659ac65eee 100644 --- a/tests/qemuxmlconfdata/iommufd-virt.aarch64-latest.args +++ b/tests/qemuxmlconfdata/iommufd-virt.aarch64-latest.args @@ -30,7 +30,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-foo/.co= nfig \ -device '{"driver":"pcie-root-port","port":10,"chassis":3,"id":"pci.3","bu= s":"pcie.0","addr":"0x1.0x2"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -object '{"qom-type":"iommufd","id":"iommufd0","fd":"XXXXXXX"}' \ --device '{"driver":"vfio-pci","id":"hostdev0","iommufd":"iommufd0","fd":"X= XXXXXX","bus":"pci.1","addr":"0x0"}' \ --device '{"driver":"vfio-pci","id":"hostdev1","iommufd":"iommufd0","fd":"X= XXXXXX","bus":"pci.2","addr":"0x0"}' \ +-device '{"driver":"vfio-pci","id":"hostdev0","iommufd":"iommufd0","fd":"@= hostdev-hostdev0-fd@","bus":"pci.1","addr":"0x0"}' \ +-device '{"driver":"vfio-pci","id":"hostdev1","iommufd":"iommufd0","fd":"@= hostdev-hostdev1-fd@","bus":"pci.2","addr":"0x0"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxmlconfdata/iommufd.x86_64-latest.args b/tests/qemux= mlconfdata/iommufd.x86_64-latest.args index 8ee6b97615..e04b4e5836 100644 --- a/tests/qemuxmlconfdata/iommufd.x86_64-latest.args +++ b/tests/qemuxmlconfdata/iommufd.x86_64-latest.args @@ -29,7 +29,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-foo/.co= nfig \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -object '{"qom-type":"iommufd","id":"iommufd0","fd":"XXXXXXX"}' \ --device '{"driver":"vfio-pci","id":"hostdev0","iommufd":"iommufd0","fd":"X= XXXXXX","bus":"pci.0","addr":"0x3"}' \ +-device '{"driver":"vfio-pci","id":"hostdev0","iommufd":"iommufd0","fd":"@= hostdev-hostdev0-fd@","bus":"pci.0","addr":"0x3"}' \ -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/qemuxmlconftest.c b/tests/qemuxmlconftest.c index c45701978c..e13347fe92 100644 --- a/tests/qemuxmlconftest.c +++ b/tests/qemuxmlconftest.c @@ -52,8 +52,7 @@ testQemuPrepareHostdevPCI(virDomainHostdevDef *hostdev) if (virHostdevIsPCIDeviceWithIOMMUFD(hostdev)) { g_autofree char *name =3D g_strdup_printf("hostdev-%s-fd", hostdev= ->info->alias); - /* Use a placeholder FD value for tests */ - int vfioDeviceFD =3D 0; + int vfioDeviceFD =3D virTestMakeDummyFD(g_strdup_printf("@hostdev-= %s-fd@", hostdev->info->alias)); hostdevPriv->vfioDeviceFd =3D qemuFDPassDirectNew(name, &vfioDevic= eFD); } } --=20 2.54.0 From nobody Sat May 30 15:28:30 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.libvirt.org designates 38.145.34.151 as permitted sender) client-ip=38.145.34.151; envelope-from=devel-bounces@lists.libvirt.org; helo=lists.libvirt.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.libvirt.org designates 38.145.34.151 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=pass(p=reject dis=none) header.from=lists.libvirt.org ARC-Seal: i=1; a=rsa-sha256; t=1779384445; cv=none; d=zohomail.com; s=zohoarc; b=VKO57Hm7lFs3BLCjX+RXOUk8URSXreTLAVBer8dmNh7t7wVlPAtrRty8tR+AwmQRuRAfiylDFtObKV5OhHL3WKo6kr7ZXKa+rDyg1NngWWgC7aQcYHHQWVECDHadxfgxPLWy4Rwu05g6pcm6Cxvp5BptMPMfooTkxLJSorv8sjw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1779384445; h=Content-Type:Content-Transfer-Encoding:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Owner:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:Reply-To:References:Subject:Subject:To:To:Message-Id:Cc; bh=aL0AJcnPcB5MPDKX+BkNHgWys3LhTGztDoc5MDxrUEg=; b=DQsJK3grba5GKJC3tBPlk0QlSJDU2toIlt6zFsToRxnu+Hqi/cGnklXXJ0tbyLkG//iCAFfbktZfoYmGp4WcqOH1yLfEZlQ2QUNz1b3BeQ7WI6dSrcCzOnvkAqy3ofEuF3tQSE6PMh8WmYRRjwDVdMRojWyeTUYeqPr06oKRzEs= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.libvirt.org designates 38.145.34.151 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=pass header.from= (p=reject dis=none) Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [38.145.34.151]) by mx.zohomail.com with SMTPS id 1779384445235841.2031794079293; Thu, 21 May 2026 10:27:25 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 993) id B7F1F41B0E; Thu, 21 May 2026 13:27:23 -0400 (EDT) Received: from [172.19.199.4] (unknown [10.16.107.18]) by lists.libvirt.org (Postfix) with ESMTP id DD38344022; Thu, 21 May 2026 12:38:25 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 993) id 60FCE41CB7; Thu, 21 May 2026 12:38:14 -0400 (EDT) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (3072 bits) server-digest SHA256) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id 5555D41D30 for ; Thu, 21 May 2026 12:24:36 -0400 (EDT) Received: from mx-prod-mc-05.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-317-KTJQt0zONvu-0Xg2KKa7uQ-1; Thu, 21 May 2026 12:24:19 -0400 Received: from mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.17]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 9DE13195608E for ; Thu, 21 May 2026 16:24:18 +0000 (UTC) Received: from speedmetal.openshiftapps.com (unknown [10.44.22.3]) by mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id EA22C1956053 for ; Thu, 21 May 2026 16:24:17 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 4.0.1 (2024-03-26) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=0.6 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H4, RCVD_IN_MSPIKE_WL,RCVD_IN_SBL_CSS,SPF_HELO_PASS autolearn=no autolearn_force=no version=4.0.1 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1779380675; h=from:from: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; bh=aL0AJcnPcB5MPDKX+BkNHgWys3LhTGztDoc5MDxrUEg=; b=g9TILmgRGRlUj9Y214s5+HS4LyaUHnW36M1iEqCJ516c59nWktkLMg7QYmd5+hhSZ3Xjzm bQQbe/t7LoER5WBM5+2L8MNoDlzlpC51nhSlFvA/WBDSkXs/1294Vz/jalOJR9WizXExRG IQ/odP4DxrAoPWX1DPdvcG+KMJwg/bM= X-MC-Unique: KTJQt0zONvu-0Xg2KKa7uQ-1 X-Mimecast-MFC-AGG-ID: KTJQt0zONvu-0Xg2KKa7uQ_1779380658 To: devel@lists.libvirt.org Subject: [PATCH 30/30] qemuxmlconftest: Use real FD for iommufd object in tests Date: Thu, 21 May 2026 18:23:39 +0200 Message-ID: <1ab57cd2081f0102103373ab195684c3b4ef5646.1779380461.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.17 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: iOdKycNvIBmegu3NWUxa0Gbx0Onh-yv7jIBDZLzlLY4_1779380658 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: 6PN6CVDFM42TK3ZKZUJ2PJ2UZPQG6AVM X-Message-ID-Hash: 6PN6CVDFM42TK3ZKZUJ2PJ2UZPQG6AVM X-MailFrom: pkrempa@redhat.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; header-match-devel.lists.libvirt.org-0; emergency; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.10 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: From: Peter Krempa via Devel Reply-To: Peter Krempa X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1779384445616158500 Content-Type: text/plain; charset="utf-8" From: Peter Krempa Signed-off-by: Peter Krempa Reviewed-by: Michal Privoznik --- tests/qemuxmlconfdata/iommufd-q35.x86_64-latest.args | 2 +- .../iommufd-virt-pci-bus-single.aarch64-latest.args | 2 +- tests/qemuxmlconfdata/iommufd-virt.aarch64-latest.args | 2 +- tests/qemuxmlconfdata/iommufd.x86_64-latest.args | 2 +- tests/qemuxmlconftest.c | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/tests/qemuxmlconfdata/iommufd-q35.x86_64-latest.args b/tests/q= emuxmlconfdata/iommufd-q35.x86_64-latest.args index 22c811bfb7..52f705f21c 100644 --- a/tests/qemuxmlconfdata/iommufd-q35.x86_64-latest.args +++ b/tests/qemuxmlconfdata/iommufd-q35.x86_64-latest.args @@ -35,7 +35,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-q35-tes= t/.config \ -device '{"driver":"qxl-vga","id":"video0","max_outputs":1,"ram_size":6710= 8864,"vram_size":33554432,"vram64_size_mb":0,"vgamem_mb":8,"bus":"pcie.0","= addr":"0x1"}' \ -global ICH9-LPC.noreboot=3Doff \ -watchdog-action reset \ --object '{"qom-type":"iommufd","id":"iommufd0","fd":"XXXXXXX"}' \ +-object '{"qom-type":"iommufd","id":"iommufd0","fd":"@iommufd-fd@"}' \ -device '{"driver":"vfio-pci","id":"hostdev0","iommufd":"iommufd0","fd":"@= hostdev-hostdev0-fd@","bus":"pcie.0","addr":"0x3"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxmlconfdata/iommufd-virt-pci-bus-single.aarch64-late= st.args b/tests/qemuxmlconfdata/iommufd-virt-pci-bus-single.aarch64-latest.= args index 9c04fb6523..9ab3b0f8f1 100644 --- a/tests/qemuxmlconfdata/iommufd-virt-pci-bus-single.aarch64-latest.args +++ b/tests/qemuxmlconfdata/iommufd-virt-pci-bus-single.aarch64-latest.args @@ -26,7 +26,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-foo/.co= nfig \ -no-shutdown \ -boot strict=3Don \ -audiodev '{"id":"audio1","driver":"none"}' \ --object '{"qom-type":"iommufd","id":"iommufd0","fd":"XXXXXXX"}' \ +-object '{"qom-type":"iommufd","id":"iommufd0","fd":"@iommufd-fd@"}' \ -device '{"driver":"vfio-pci","id":"hostdev0","iommufd":"iommufd0","fd":"@= hostdev-hostdev0-fd@","bus":"pcie.0","addr":"0x1"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxmlconfdata/iommufd-virt.aarch64-latest.args b/tests= /qemuxmlconfdata/iommufd-virt.aarch64-latest.args index 659ac65eee..513c537041 100644 --- a/tests/qemuxmlconfdata/iommufd-virt.aarch64-latest.args +++ b/tests/qemuxmlconfdata/iommufd-virt.aarch64-latest.args @@ -29,7 +29,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-foo/.co= nfig \ -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"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ --object '{"qom-type":"iommufd","id":"iommufd0","fd":"XXXXXXX"}' \ +-object '{"qom-type":"iommufd","id":"iommufd0","fd":"@iommufd-fd@"}' \ -device '{"driver":"vfio-pci","id":"hostdev0","iommufd":"iommufd0","fd":"@= hostdev-hostdev0-fd@","bus":"pci.1","addr":"0x0"}' \ -device '{"driver":"vfio-pci","id":"hostdev1","iommufd":"iommufd0","fd":"@= hostdev-hostdev1-fd@","bus":"pci.2","addr":"0x0"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ diff --git a/tests/qemuxmlconfdata/iommufd.x86_64-latest.args b/tests/qemux= mlconfdata/iommufd.x86_64-latest.args index e04b4e5836..123f816e3d 100644 --- a/tests/qemuxmlconfdata/iommufd.x86_64-latest.args +++ b/tests/qemuxmlconfdata/iommufd.x86_64-latest.args @@ -28,7 +28,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-foo/.co= nfig \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ --object '{"qom-type":"iommufd","id":"iommufd0","fd":"XXXXXXX"}' \ +-object '{"qom-type":"iommufd","id":"iommufd0","fd":"@iommufd-fd@"}' \ -device '{"driver":"vfio-pci","id":"hostdev0","iommufd":"iommufd0","fd":"@= hostdev-hostdev0-fd@","bus":"pci.0","addr":"0x3"}' \ -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/qemuxmlconftest.c b/tests/qemuxmlconftest.c index e13347fe92..8e0f4bcb4f 100644 --- a/tests/qemuxmlconftest.c +++ b/tests/qemuxmlconftest.c @@ -110,7 +110,7 @@ testQemuPrepareHostdev(virDomainObj *vm) if (vm->def->iommufd_fdgroup) { ignore_value(qemuProcessGetPassedIommuFd(vm)); } else if (virDomainDefHasPCIHostdevWithIOMMUFD(vm->def)) { - int iommufd =3D 0; + int iommufd =3D virTestMakeDummyFD(g_strdup("@iommufd-fd@")); priv->iommufd =3D qemuFDPassDirectNew("iommufd", &iommufd); } } --=20 2.54.0