From nobody Wed Apr 24 08:19:14 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=fail(p=none dis=none) header.from=nutanix.com Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mx.zohomail.com with SMTPS id 1642059292005315.7829356443758; Wed, 12 Jan 2022 23:34:52 -0800 (PST) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-536-t29ycVSzOQ2i7adLyVD-Qw-1; Thu, 13 Jan 2022 02:34:49 -0500 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id A3B791006AA9; Thu, 13 Jan 2022 07:34:44 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 733D21059109; Thu, 13 Jan 2022 07:34:44 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 3B4734CA9B; Thu, 13 Jan 2022 07:34:44 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 20D7YANd028772 for ; Thu, 13 Jan 2022 02:34:10 -0500 Received: by smtp.corp.redhat.com (Postfix) id A8B791120ABB; Thu, 13 Jan 2022 07:34:10 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast07.extmail.prod.ext.rdu2.redhat.com [10.11.55.23]) by smtp.corp.redhat.com (Postfix) with ESMTPS id A349E1121335 for ; Thu, 13 Jan 2022 07:34:07 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [205.139.110.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id AB7E23C198A6 for ; Thu, 13 Jan 2022 07:34:07 +0000 (UTC) Received: from mx0b-002c1b01.pphosted.com (mx0b-002c1b01.pphosted.com [148.163.155.12]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-38-V1NkJrb6OxenQOxxDS2SPw-1; Thu, 13 Jan 2022 02:34:04 -0500 Received: from pps.filterd (m0127841.ppops.net [127.0.0.1]) by mx0b-002c1b01.pphosted.com (8.16.1.2/8.16.1.2) with ESMTP id 20D2iDWj028232; Wed, 12 Jan 2022 23:34:03 -0800 Received: from nam10-dm6-obe.outbound.protection.outlook.com (mail-dm6nam10lp2109.outbound.protection.outlook.com [104.47.58.109]) by mx0b-002c1b01.pphosted.com (PPS) with ESMTPS id 3dhby2c2bn-2 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 12 Jan 2022 23:34:02 -0800 Received: from SJ0PR02MB7775.namprd02.prod.outlook.com (2603:10b6:a03:326::12) by DM8PR02MB8171.namprd02.prod.outlook.com (2603:10b6:8:1c::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4888.9; Thu, 13 Jan 2022 07:34:01 +0000 Received: from SJ0PR02MB7775.namprd02.prod.outlook.com ([fe80::b8d0:a557:5500:8bd1]) by SJ0PR02MB7775.namprd02.prod.outlook.com ([fe80::b8d0:a557:5500:8bd1%7]) with mapi id 15.20.4888.011; Thu, 13 Jan 2022 07:34:01 +0000 X-MC-Unique: t29ycVSzOQ2i7adLyVD-Qw-1 X-MC-Unique: V1NkJrb6OxenQOxxDS2SPw-1 From: Divya Garg To: libvir-list@redhat.com Subject: [PATCH 1/2 for 8.0] Add the port allocation logic for isa-serial devices. Date: Wed, 12 Jan 2022 23:33:40 -0800 Message-Id: <20220113073341.999064-2-divya.garg@nutanix.com> In-Reply-To: <20220113073341.999064-1-divya.garg@nutanix.com> References: <20220113073341.999064-1-divya.garg@nutanix.com> X-ClientProxiedBy: BYAPR05CA0078.namprd05.prod.outlook.com (2603:10b6:a03:e0::19) To SJ0PR02MB7775.namprd02.prod.outlook.com (2603:10b6:a03:326::12) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 09db0f72-6bde-40e1-8556-08d9d6671161 X-MS-TrafficTypeDiagnostic: DM8PR02MB8171:EE_ X-Microsoft-Antispam-PRVS: x-proofpoint-crosstenant: true X-MS-Oob-TLC-OOBClassifiers: OLM:849 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0 X-Microsoft-Antispam-Message-Info: sJiH5EBNOAEGd1FvvWfezd/OnEwVyopQ+pc+LWlw5W1Trwhh6rltYG7ZVhroYLSwe8LCqpiu9O9Rg6kB46NuEYmNJMIPTP0SAQNuIn3if9SxQc/3eE7++DA4FIW7GTIlxwASxhvzHxv/sEVvkTG+YCxhlxeWcYVBQO9BKCbadB904vcStYFMVl3bOJK4fQu3Zm6jIfvqXjzpM/G5rwWadEzSJfFtn6K39Fg7P9hIORu4ETyJ3JM3MgR6mSQG7DAvYCjcAlUBX4bk6a4L8sxehHGj2pHbbFU+/XXilDh9VpZ6+mUiKhb6RRPnUER8OBlBYVqp8wIJSOSselCFhmHsWM47kku8dI85i0/0O+75wHLlzDFYNG2ZjVCiR4Y8VvY2m5xRtJWzG7b5gef+x54BCNoLn0Dd+HbYCTY2txfmqAPFGIjYHN3JYKcE7v9eyZKoubktA6qe3JNcM3XmUD1OMvWCGhJGwlfme1/kFz50bR/mAyJjUyCn+4+WV6Gtgjfs51IlugOYgkwATgpoHJsNVwR/EH8miho6xgulyNEXD/eNa6nDO7P906JapAHwEy+yC6CX2ERl5+jlBoUt0r3LHyux+rIY9gW1H/y6kEXK/ro8Ktvo4k54tv4G5LKWT+/kfNgiiT9SXnsSI7Y22MfLwNw7YbaJQY7HrY8qelDDMFB3I2/VBC9aEzd3HVacOgJntmHRLoauvenOqA6+e9XTXQ== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:SJ0PR02MB7775.namprd02.prod.outlook.com; PTR:; CAT:NONE; SFS:(366004)(8676002)(6486002)(2906002)(6512007)(8936002)(5660300002)(1076003)(36756003)(508600001)(2616005)(66556008)(4326008)(107886003)(86362001)(83380400001)(38100700002)(52116002)(38350700002)(186003)(26005)(6916009)(44832011)(6506007)(6666004)(66476007)(66946007)(316002); DIR:OUT; SFP:1102 X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?BxgYNzw6lSRldZ3LKKg93Brt4b/6krFiaN62VjFwRLbBQtNgvklGaN7Eg0Kq?= =?us-ascii?Q?nKqMbwUrzBRAqx/jrToXN1Ec4WYrrjUHeq6aJ0f8Iy8u7klC/JmD0FRLup8o?= =?us-ascii?Q?XuW7xsUVJnBz1FLxMCl8qESY4b8psswG9a+sXEDN8kT6iGyVzw4DImSUuaIv?= =?us-ascii?Q?yfWwnErXDISM2hFfgJSLz6OxLljSKXuNmIhVeRrVI/eCS1nWR8xjDOGniCl3?= =?us-ascii?Q?rED4NhrlPkahz8w3Q4bXeqPqyLHmZwB5+R3bDZYrpz1wnk76C6PSQjTqA+Nl?= =?us-ascii?Q?/mjx9rjTeI+nE0Bj7+v5Y4TwHXRgwCxltfcklPT8jZv9hIUyvx2jBHARe7Pf?= =?us-ascii?Q?/W23bqCh5Sc1o092JQqR7tn5udodtzeMc+o+J9Zcqt7Fn2pY8pkep5WwuNSN?= =?us-ascii?Q?nMnIiGjbfrQVECQNAXCrXRtqdQOgikNLuJcSOBV3hhSa/xOb3iE+Bvazz62l?= =?us-ascii?Q?3PnHYqX9pTV0yZFfuCLK6DnVMjDJAJZSDqNJOq+46zJD+SvAubn+84/goU2v?= =?us-ascii?Q?sK8+RH/8FXez24ZO6SlEBd5xAolA2DeVNw/s1V3c5Ak2jrljLsv6bVwpfOLB?= =?us-ascii?Q?S6BmRwarcnHqVuxkMCD7PyLbuY7vOQ7DA6MZxiVycz356PE496ttJGKO3ELI?= =?us-ascii?Q?tBbX1ec5Kf6/XyIVz0SzcDlV7H8JjhltNGl7t1pfGX3t8OnNMWboAc8q3ZrS?= =?us-ascii?Q?8IALew0T9rbibKHx1nY/2GxxtqcaOsteHJ6GfIOZFcIf0fHXYPmERIpy1Cyt?= =?us-ascii?Q?/rtq+fGHJZ5CN16zP5fDXUcm3ey0ayua5cQu8i1EBg94OsZ5hgtPHNCSQVj6?= =?us-ascii?Q?oShhEfOEaX4rSZbY57qa06mwWlL5zvJwnEcFfItt4qq/liS9eABhmMPWty7R?= =?us-ascii?Q?xDtYifhFex7zUYdvIlFhgb2KT6BE0Vr019uTYdCA8lmi2CuttDh8AmnVZvXb?= =?us-ascii?Q?IVqZuxLSQUxB2l/OEY6c5JrehGHOnvRYHts0KX5XgVCWDs15ECEXUMPviEN2?= =?us-ascii?Q?h2sCqCyAchp/m789dYl5Hw+NNHETC7yYwJBJBfC2ONLVMflXb0P7Xf3CXK5i?= =?us-ascii?Q?L2sVpu3jYU38TQJ9URtq9QkFD9QsvBSuUrHF9HGUqkX3Y+tk8o7YxSlBWQJS?= =?us-ascii?Q?5atjxHTJYEct5nwD1RNsl4CplUxOGMRSPGRGnALHcfZ3sNjVMMIwY7BzPRV6?= =?us-ascii?Q?KmpaJI0O16gECL0HfM4bJyiEPk/nKw8xPYdMQkHKJBMh59lgy5SrrjN+C5em?= =?us-ascii?Q?pNJ+A7j/HVn8EflAdtj0YqmvLUaKlUg0+IeiCdMT2UoxPs2HNEazedOOlviH?= =?us-ascii?Q?s15k9ToINiyaXDD5KEx+MU5Jk8syuyhQFiPTZzT0rF1Opql8K8y1p5Cj5nux?= =?us-ascii?Q?abwwkZg8qKOStK784UbszDXO4n7pqokWmr0hjpFvPn0TbPafaY3KV6ICQbi6?= =?us-ascii?Q?FSA/0hAu82FJGDmG77KSKc0VPrwWzt3YaGX3LGhfuJiVwJowaQkSZhSXGsN1?= =?us-ascii?Q?//tOW1zRbI4eWZYBuQxCl1X4DnOvwxtTGi2/XfdEe/mTt0zeWOPrYkZWwtz+?= =?us-ascii?Q?2dIiS3sRoiFf6HsmtS/JhK1TUJLy3dc6LvrCxk0RY4lR0bB3UQDWZNRD5VbG?= =?us-ascii?Q?i7WUlAqORs6qdBpMahFgUkQ=3D?= X-OriginatorOrg: nutanix.com X-MS-Exchange-CrossTenant-Network-Message-Id: 09db0f72-6bde-40e1-8556-08d9d6671161 X-MS-Exchange-CrossTenant-AuthSource: SJ0PR02MB7775.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Jan 2022 07:34:01.2777 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: bb047546-786f-4de1-bd75-24e5b6f79043 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: rMBybzdO16Gm1EFZTpmXawV18FIK/KUuLp3AJDG6yJLAWE/AGp3tcSqGuDiZpSDlkc/Ufk6/q03aYyvHm81mWg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM8PR02MB8171 X-Proofpoint-ORIG-GUID: AlG1vUNCiFmVYcHwb6x6KS_uds_KmpmC X-Proofpoint-GUID: AlG1vUNCiFmVYcHwb6x6KS_uds_KmpmC X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.205, Aquarius:18.0.790, Hydra:6.0.425, FMLib:17.11.62.513 definitions=2022-01-13_02,2022-01-11_01,2021-12-02_01 X-Proofpoint-Spam-Reason: safe X-Mimecast-Impersonation-Protect: Policy=CLT - Impersonation Protection Definition; Similar Internal Domain=false; Similar Monitored External Domain=false; Custom External Domain=false; Mimecast External Domain=false; Newly Observed Domain=false; Internal User Name=false; Custom Display Name List=false; Reply-to Address Mismatch=false; Targeted Threat Dictionary=false; Mimecast Threat Dictionary=false; Custom Threat Dictionary=false X-Scanned-By: MIMEDefang 2.78 on 10.11.54.3 X-loop: libvir-list@redhat.com Cc: pkrempa@redhat.com, prerna.saxena@nutanix.com, john.levon@nutanix.com, ani@anisinha.ca, Divya Garg X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZM-MESSAGEID: 1642059292852100001 Content-Type: text/plain; charset="utf-8" This commit takes care of following cases: -> Check availability of requested ports. ->The total number of requested ports should not be more than VIR_MAX_ISA_SERIAL_PORTS. ->The ports requested should be less than VIR_MAX_ISA_SERIAL_PORTS. ->VIR_MAX_ISA_SERIAL_PORTS should correspond to MAX_ISA_SERIAL_PORTS specified in qemu code commit def337ffda34d331404bd7f1a42726b71500df22. -> Prevent duplicate device assignments to the same port. -> In case no ports are provided in the XML, this patch scans the list of u= nused isa-serial indices to automatically assign available ports for this VM. Signed-off-by: Divya Garg Reviewed-by: Michal Privoznik --- src/conf/domain_conf.c | 61 ++++++++++++++++--- src/conf/domain_conf.h | 6 ++ ...g-console-compat-2-live+console-virtio.xml | 4 +- .../qemuhotplug-console-compat-2-live.xml | 4 +- .../serial-tcp-tlsx509-chardev-notls.xml | 2 +- .../serial-tcp-tlsx509-chardev-verify.xml | 2 +- .../serial-tcp-tlsx509-chardev.xml | 2 +- .../serial-tcp-tlsx509-secret-chardev.xml | 2 +- .../serial-tcp-tlsx509-chardev.xml | 2 +- 9 files changed, 68 insertions(+), 17 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 5691b8d2d5..e468e98045 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -5330,6 +5330,56 @@ virDomainHostdevDefPostParse(virDomainHostdevDef *de= v, } =20 =20 +static int +virDomainChrIsaSerialDefPostParse(virDomainDef *def) +{ + size_t i, j; + size_t isa_serial_count =3D 0; + bool used_serial_port[VIR_MAX_ISA_SERIAL_PORTS] =3D {false}; + + /* Perform all the required checks. */ + for (i =3D 0; i < def->nserials; i++) { + + if (def->serials[i]->targetType !=3D + VIR_DOMAIN_CHR_SERIAL_TARGET_MODEL_ISA_SERIAL) + continue; + + if (isa_serial_count++ >=3D VIR_MAX_ISA_SERIAL_PORTS || + def->serials[i]->target.port >=3D VIR_MAX_ISA_SERIAL_PORTS) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Maximum supported number of ISA serial ports= is '%d'."), VIR_MAX_ISA_SERIAL_PORTS); + return -1; + } + + if (def->serials[i]->target.port !=3D -1) { + if (used_serial_port[def->serials[i]->target.port]) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("target port '%d' already allocated."), d= ef->serials[i]->target.port); + return -1; + } + used_serial_port[def->serials[i]->target.port] =3D true; + } + } + + /* Assign the ports to the devices. */ + for (i =3D 0; i < def->nserials; i++) { + + if (def->serials[i]->targetType !=3D + VIR_DOMAIN_CHR_SERIAL_TARGET_MODEL_ISA_SERIAL || + def->serials[i]->target.port !=3D -1) + continue; + + for (j =3D 0; j < VIR_MAX_ISA_SERIAL_PORTS; j++) { + if (!used_serial_port[j]) { + def->serials[i]->target.port =3D j; + used_serial_port[j] =3D true; + break; + } + } + } + return 0; +} + static void virDomainChrDefPostParse(virDomainChrDef *chr, const virDomainDef *def) @@ -6197,6 +6247,9 @@ virDomainDefPostParse(virDomainDef *def, goto cleanup; } =20 + if (virDomainChrIsaSerialDefPostParse(def) < 0) + return -1; + /* iterate the devices */ ret =3D virDomainDeviceInfoIterateFlags(def, virDomainDefPostParseDeviceItera= tor, @@ -19929,14 +19982,6 @@ virDomainDefParseXML(xmlXPathContextPtr ctxt, if (!chr) return NULL; =20 - if (chr->target.port =3D=3D -1) { - int maxport =3D -1; - for (j =3D 0; j < i; j++) { - if (def->serials[j]->target.port > maxport) - maxport =3D def->serials[j]->target.port; - } - chr->target.port =3D maxport + 1; - } def->serials[def->nserials++] =3D chr; } VIR_FREE(nodes); diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index 144ba4dd12..a8f41dc8c2 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -1187,6 +1187,12 @@ typedef enum { VIR_DOMAIN_CHR_CONSOLE_TARGET_TYPE_LAST } virDomainChrConsoleTargetType; =20 +/* + * The value of VIR_MAX_ISA_SERIAL_PORTS corresponds to MAX_ISA_SERIAL_POR= TS + * set in qemu code base. + */ +#define VIR_MAX_ISA_SERIAL_PORTS 4 + typedef enum { VIR_DOMAIN_CHR_SERIAL_TARGET_MODEL_NONE =3D 0, VIR_DOMAIN_CHR_SERIAL_TARGET_MODEL_ISA_SERIAL, diff --git a/tests/qemuhotplugtestdomains/qemuhotplug-console-compat-2-live= +console-virtio.xml b/tests/qemuhotplugtestdomains/qemuhotplug-console-comp= at-2-live+console-virtio.xml index 38311b188c..72516555a0 100644 --- a/tests/qemuhotplugtestdomains/qemuhotplug-console-compat-2-live+consol= e-virtio.xml +++ b/tests/qemuhotplugtestdomains/qemuhotplug-console-compat-2-live+consol= e-virtio.xml @@ -74,7 +74,7 @@ - + @@ -82,7 +82,7 @@ - + diff --git a/tests/qemuhotplugtestdomains/qemuhotplug-console-compat-2-live= .xml b/tests/qemuhotplugtestdomains/qemuhotplug-console-compat-2-live.xml index 3fe205430c..6197a2bfe3 100644 --- a/tests/qemuhotplugtestdomains/qemuhotplug-console-compat-2-live.xml +++ b/tests/qemuhotplugtestdomains/qemuhotplug-console-compat-2-live.xml @@ -74,7 +74,7 @@ - + @@ -82,7 +82,7 @@ - + diff --git a/tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev-notls.xml b/= tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev-notls.xml index f27b119270..16734d9cce 100644 --- a/tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev-notls.xml +++ b/tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev-notls.xml @@ -37,7 +37,7 @@ - + diff --git a/tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev-verify.xml b= /tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev-verify.xml index be58ccc1da..15ce29c67d 100644 --- a/tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev-verify.xml +++ b/tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev-verify.xml @@ -29,7 +29,7 @@ - + diff --git a/tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev.xml b/tests/= qemuxml2argvdata/serial-tcp-tlsx509-chardev.xml index be58ccc1da..15ce29c67d 100644 --- a/tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev.xml +++ b/tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev.xml @@ -29,7 +29,7 @@ - + diff --git a/tests/qemuxml2argvdata/serial-tcp-tlsx509-secret-chardev.xml b= /tests/qemuxml2argvdata/serial-tcp-tlsx509-secret-chardev.xml index 8e44dea365..8bb7cbefae 100644 --- a/tests/qemuxml2argvdata/serial-tcp-tlsx509-secret-chardev.xml +++ b/tests/qemuxml2argvdata/serial-tcp-tlsx509-secret-chardev.xml @@ -34,7 +34,7 @@ - + diff --git a/tests/qemuxml2xmloutdata/serial-tcp-tlsx509-chardev.xml b/test= s/qemuxml2xmloutdata/serial-tcp-tlsx509-chardev.xml index aefd3513ce..4cdefed63d 100644 --- a/tests/qemuxml2xmloutdata/serial-tcp-tlsx509-chardev.xml +++ b/tests/qemuxml2xmloutdata/serial-tcp-tlsx509-chardev.xml @@ -37,7 +37,7 @@ - + --=20 2.25.1 From nobody Wed Apr 24 08:19:14 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=fail(p=none dis=none) header.from=nutanix.com Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mx.zohomail.com with SMTPS id 1642059268101713.3641569120617; Wed, 12 Jan 2022 23:34:28 -0800 (PST) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-562-_g7B2UYvM5aNZj7UnbNvwA-1; Thu, 13 Jan 2022 02:34:23 -0500 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id CC0D681EE61; Thu, 13 Jan 2022 07:34:18 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 7A3F25E48C; Thu, 13 Jan 2022 07:34:18 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id CB5574BB7C; Thu, 13 Jan 2022 07:34:14 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.rdu2.redhat.com [10.11.54.7]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 20D7YDLL028787 for ; Thu, 13 Jan 2022 02:34:13 -0500 Received: by smtp.corp.redhat.com (Postfix) id 6AFCC141DEDA; Thu, 13 Jan 2022 07:34:13 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast10.extmail.prod.ext.rdu2.redhat.com [10.11.55.26]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 64003141DEDC for ; Thu, 13 Jan 2022 07:34:12 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-2.mimecast.com [207.211.31.81]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id C1A7E1C0988B for ; Thu, 13 Jan 2022 07:34:12 +0000 (UTC) Received: from mx0b-002c1b01.pphosted.com (mx0b-002c1b01.pphosted.com [148.163.155.12]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-621-HAbz-bOcPPCrDE8GZ-Qqkg-1; Thu, 13 Jan 2022 02:34:08 -0500 Received: from pps.filterd (m0127844.ppops.net [127.0.0.1]) by mx0b-002c1b01.pphosted.com (8.16.1.2/8.16.1.2) with ESMTP id 20CM0dtx000600; Wed, 12 Jan 2022 23:34:07 -0800 Received: from nam10-dm6-obe.outbound.protection.outlook.com (mail-dm6nam10lp2109.outbound.protection.outlook.com [104.47.58.109]) by mx0b-002c1b01.pphosted.com (PPS) with ESMTPS id 3dhfruugrg-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 12 Jan 2022 23:34:07 -0800 Received: from SJ0PR02MB7775.namprd02.prod.outlook.com (2603:10b6:a03:326::12) by DM8PR02MB8171.namprd02.prod.outlook.com (2603:10b6:8:1c::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4888.9; Thu, 13 Jan 2022 07:34:02 +0000 Received: from SJ0PR02MB7775.namprd02.prod.outlook.com ([fe80::b8d0:a557:5500:8bd1]) by SJ0PR02MB7775.namprd02.prod.outlook.com ([fe80::b8d0:a557:5500:8bd1%7]) with mapi id 15.20.4888.011; Thu, 13 Jan 2022 07:34:02 +0000 X-MC-Unique: _g7B2UYvM5aNZj7UnbNvwA-1 X-MC-Unique: HAbz-bOcPPCrDE8GZ-Qqkg-1 From: Divya Garg To: libvir-list@redhat.com Subject: [PATCH 2/2 for 8.0] qemu: add index for isa-serial device using target.port Date: Wed, 12 Jan 2022 23:33:41 -0800 Message-Id: <20220113073341.999064-3-divya.garg@nutanix.com> In-Reply-To: <20220113073341.999064-1-divya.garg@nutanix.com> References: <20220113073341.999064-1-divya.garg@nutanix.com> X-ClientProxiedBy: BYAPR05CA0078.namprd05.prod.outlook.com (2603:10b6:a03:e0::19) To SJ0PR02MB7775.namprd02.prod.outlook.com (2603:10b6:a03:326::12) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: b5a8d35e-1ff6-4028-1f96-08d9d66711d4 X-MS-TrafficTypeDiagnostic: DM8PR02MB8171:EE_ X-Microsoft-Antispam-PRVS: x-proofpoint-crosstenant: true X-MS-Oob-TLC-OOBClassifiers: OLM:104 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0 X-Microsoft-Antispam-Message-Info: pic6mcOA+35piz/s9NjytfJJRW2L+HuWAOKMTGLQWVhgACT9iZZVP2/iRbYxFALeGGD7gAY/JUK8Sq2BCnA9Rh2s/wl/rineeLIrOBMyJQ1NgHVX04u0CTWgUwwLQeku8+7RwOTXI0bwSCb0s6wHy74ognPZ/Mkf+MV0npmqOSAM7xATANxbfiYMQZaFGz4Jf73NiuQrjiBlW/8ZyrwCAb+t2RPm3nJI2TwEa8FlaAKhx8nAbJU5DcRHThrKrNjX+k9gnRURCwQCK51LwUzarXof0fZoSRw0XuIo+phGh+GXBntW2sB+v0Pq7c6dYSUrIfRf9i8SzRy3LbtXxv+hs/arRqmr2qxFQ+mqK9IN6BdQmr6/EncF3eaz6wrE5O2PgkHC9AthEE+g6UEYK4iM2dVFroRvXg4q3Hutyo4mWhz5NsQJd6ZwmaH8L8zWC5sDstC3mrNT6U8Hd7g8Lwllvv8IqPoDmyYCYpNhOUQ9Yg+1ZCnSURAhU1moICqri2EEhu6ktI2ohuvMTdDXWLVI0Ju9ieXTR4rMn1xCFLalt/36RCrCS2KXy2OySsBFf4FcCaSB+1Vw9+W/a+5fPVEasn9YMZ//PCMkkrbtI3M272gbnL1VjIyRJoI6JsNe6ZIT1klEX9lXZGT5MP91ArR5fjMZQnVL2vzem0Rqs2Nml8aPzFXhUzsaN8xAvyuBXaGz5ZUg+wPnctHp3k1Qxy78Mg== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:SJ0PR02MB7775.namprd02.prod.outlook.com; PTR:; CAT:NONE; SFS:(366004)(8676002)(6486002)(2906002)(6512007)(8936002)(5660300002)(1076003)(30864003)(36756003)(508600001)(2616005)(66556008)(4326008)(107886003)(86362001)(83380400001)(38100700002)(52116002)(38350700002)(186003)(26005)(6916009)(44832011)(6506007)(6666004)(66476007)(66946007)(316002)(559001)(579004); DIR:OUT; SFP:1102 X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?0IUnNJqt9eIbiGQkPnykwOoZ3GHSVRx/XN1vNMkdF+DRrDNBPvoRU92/zs7U?= =?us-ascii?Q?xmgbajINaPOqfX8MW0Z033BJk2+WzbJ1lTYQDIwvj333OFTXpFV3cY7Z1pkR?= =?us-ascii?Q?IAlmNfsaBl2ZqeOLR9UvVomAPwywVYedaDfirj1pBkozFLV7sCt4InGZQz2N?= =?us-ascii?Q?7Q0EZcWSVu6MAaTYzHefnvJKZMSCFrk4GVtmpN1tCB/FNg4bUjX8QtuCi6zy?= =?us-ascii?Q?CsNu9wSsWGMCfrlWiOxLyyJ+hia74s1LlM99yDyLg2zYbHCoFmVMNsSb3aBK?= =?us-ascii?Q?XYkoTzOMb7F/y9Yt4Bo29o3pzpP3FcW7klfRi0gcVGoVL6NlJlur696HG7nz?= =?us-ascii?Q?dyKgPD3M+Wb5e27moBeRpuAn2lWQA3lBsh6bVqi1xWpFCRtX9skCz7HpvJ1J?= =?us-ascii?Q?ulROwBxY1wdLfY0siz0Dq7Vr9Uqzb+h2l6Pyin90iiof+ibAilaVrCyDfj6K?= =?us-ascii?Q?g+isw2fmFN5ZGo2TJxkcjjfPwNFvQdtzXP/JP01xKA6F72EPKb2Ac12fTq9N?= =?us-ascii?Q?SbqzLcUce/K0+WWg/99QIn4O0pIegTOOR8FTANlk2eGViiFKWnF2XnHjIzYX?= =?us-ascii?Q?IPDRgA0nsgCWdXxRADpuanA0f1Ufoz7B7cp0gMliYk+Pieto2iSgIksbOncL?= =?us-ascii?Q?1ZGtFMIO/fMa5Hh3QqSiut8+dJtuAmu3eAwj0O/KraeqGbmKrqE3go/vNyuF?= =?us-ascii?Q?bK/Qp3ElGF+gQYLc7NaLTixH/H8IJioWyEde7aiOUtlFpQkjAxpNk45X/KKC?= =?us-ascii?Q?5F5ciMWd7JzXNnWAPJyKHeENgPkoOuKId2l9yWJInu6d7S8341l9rFoZUw/e?= =?us-ascii?Q?7HxfQkj/HOsaA7w/8sgEJoeGz/YoaAUvrSaGksyKLgIV1QEKszjMALug1wYR?= =?us-ascii?Q?XFuH3PPOOr1OLB7I9VW1R7CrWT9ysyaJbBrVdd/I+KPgfVN7YPBkoe920gqv?= =?us-ascii?Q?1A3ar7q1nT+yHfwhlA/79Z7p4ScVjFI1s61gSLgBZq4Un+mXfRFncRRq2z2A?= =?us-ascii?Q?T8zr/DayjnNfg1jwvBpFPIB6LW4bYZL6MEA43I305WFfh6vWLkJI30WMZ3zY?= =?us-ascii?Q?+HPNNWPNX5mio0mJqrp8faSymg6gG+r4Up/ne9Kar8a6nFDDT8BZJ/VYSffG?= =?us-ascii?Q?pqtlYeWpXxJQR+qj67jmTrd/nA+wZjv3wWKgzIkcjzbK+irGWcVenVAur5hM?= =?us-ascii?Q?wAGUw/7IxFu7UbS5CvLeWY+lz69cBRmr5y79QQAZdylikJaM7z9f7fS/YPNM?= =?us-ascii?Q?z+ixCKfifubLrQLNZUDL5zcQgzyLs8kTTg2gWfL+Pd94wM2lgAP+p09gtIBP?= =?us-ascii?Q?BARzTPamxFp8FFXQOCucrxVF/cbJYcgGcSRBjG+1su/jJuXXqW+VnTqyFzmO?= =?us-ascii?Q?8Ddm060sQQLLqx7Y6GwZsgwOUBqkleks9j0osTFmLREHN/d1VWU9x48mmV5a?= =?us-ascii?Q?/Urqckb6h48T6MTDmvIZSfGfiOYKs6ttaqhtAhi4F9rf43Xt5pLzaZGddL2I?= =?us-ascii?Q?bSdZ+RWcYwF/V/1xfpEd2mSXOERHE90bgVdwUpobwnev2bgKBxaUxn4QAgUV?= =?us-ascii?Q?O1AJBbEYqwqYjvgBV3L9Rz8ROWZFmajxOGyHo859NAWctMp9SaYMC8TrsxkD?= =?us-ascii?Q?DS4HwGXmyYbTRlDJe6dFe0A=3D?= X-OriginatorOrg: nutanix.com X-MS-Exchange-CrossTenant-Network-Message-Id: b5a8d35e-1ff6-4028-1f96-08d9d66711d4 X-MS-Exchange-CrossTenant-AuthSource: SJ0PR02MB7775.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Jan 2022 07:34:02.0756 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: bb047546-786f-4de1-bd75-24e5b6f79043 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: OJL2uYVNn99wQXF3aOI0b6VyY2ypRvHnqVhW0ty69faXOeAn8Ij8ZmI1ilw9ffhFPTiqGhoHsCHy9T9tD87oTg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM8PR02MB8171 X-Proofpoint-GUID: WVVnyx_rCvprPB0gVjo3Tp0wkMBkGoQ9 X-Proofpoint-ORIG-GUID: WVVnyx_rCvprPB0gVjo3Tp0wkMBkGoQ9 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.205, Aquarius:18.0.790, Hydra:6.0.425, FMLib:17.11.62.513 definitions=2022-01-13_02,2022-01-11_01,2021-12-02_01 X-Proofpoint-Spam-Reason: safe X-Mimecast-Impersonation-Protect: Policy=CLT - Impersonation Protection Definition; Similar Internal Domain=false; Similar Monitored External Domain=false; Custom External Domain=false; Mimecast External Domain=false; Newly Observed Domain=false; Internal User Name=false; Custom Display Name List=false; Reply-to Address Mismatch=false; Targeted Threat Dictionary=false; Mimecast Threat Dictionary=false; Custom Threat Dictionary=false X-Scanned-By: MIMEDefang 2.85 on 10.11.54.7 X-loop: libvir-list@redhat.com Cc: pkrempa@redhat.com, prerna.saxena@nutanix.com, john.levon@nutanix.com, ani@anisinha.ca, Divya Garg X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZM-MESSAGEID: 1642059268800100002 Content-Type: text/plain; charset="utf-8" VM XML accepts target.port but this does not get passed while building the = qemu command line for this VM. Signed-off-by: Divya Garg Reviewed-by: Michal Privoznik --- src/qemu/qemu_command.c | 25 +++++++++++++++---- tests/qemuxml2argvdata/bios.args | 2 +- .../qemuxml2argvdata/console-compat-auto.args | 2 +- .../console-compat-auto.x86_64-latest.args | 2 +- .../console-compat-chardev.args | 2 +- .../console-compat-chardev.x86_64-latest.args | 2 +- tests/qemuxml2argvdata/console-compat.args | 2 +- .../console-compat.x86_64-latest.args | 2 +- .../qemuxml2argvdata/console-virtio-many.args | 2 +- tests/qemuxml2argvdata/controller-order.args | 2 +- .../name-escape.x86_64-2.11.0.args | 4 +-- .../name-escape.x86_64-latest.args | 4 +-- .../q35-virt-manager-basic.args | 2 +- .../serial-dev-chardev-iobase.args | 2 +- ...rial-dev-chardev-iobase.x86_64-latest.args | 2 +- .../qemuxml2argvdata/serial-dev-chardev.args | 2 +- .../serial-dev-chardev.x86_64-latest.args | 2 +- .../qemuxml2argvdata/serial-file-chardev.args | 2 +- .../serial-file-chardev.x86_64-latest.args | 2 +- tests/qemuxml2argvdata/serial-file-log.args | 2 +- .../serial-file-log.x86_64-latest.args | 2 +- .../qemuxml2argvdata/serial-many-chardev.args | 4 +-- .../serial-many-chardev.x86_64-latest.args | 4 +-- .../qemuxml2argvdata/serial-pty-chardev.args | 2 +- .../serial-pty-chardev.x86_64-latest.args | 2 +- tests/qemuxml2argvdata/serial-spiceport.args | 2 +- .../serial-spiceport.x86_64-latest.args | 2 +- .../qemuxml2argvdata/serial-tcp-chardev.args | 2 +- .../serial-tcp-chardev.x86_64-latest.args | 2 +- .../serial-tcp-telnet-chardev.args | 2 +- ...rial-tcp-telnet-chardev.x86_64-latest.args | 2 +- .../serial-tcp-tlsx509-chardev-notls.args | 4 +-- ...p-tlsx509-chardev-notls.x86_64-latest.args | 4 +-- .../serial-tcp-tlsx509-chardev-verify.args | 4 +-- ...-tlsx509-chardev-verify.x86_64-latest.args | 4 +-- .../serial-tcp-tlsx509-chardev.args | 4 +-- ...ial-tcp-tlsx509-chardev.x86_64-latest.args | 4 +-- .../serial-tcp-tlsx509-secret-chardev.args | 4 +-- ...-tlsx509-secret-chardev.x86_64-latest.args | 4 +-- .../qemuxml2argvdata/serial-udp-chardev.args | 4 +-- .../serial-udp-chardev.x86_64-latest.args | 4 +-- .../qemuxml2argvdata/serial-unix-chardev.args | 4 +-- .../serial-unix-chardev.x86_64-latest.args | 4 +-- tests/qemuxml2argvdata/serial-vc-chardev.args | 2 +- .../serial-vc-chardev.x86_64-latest.args | 2 +- tests/qemuxml2argvdata/user-aliases.args | 4 +-- .../virtio-9p-createmode.x86_64-latest.args | 2 +- .../virtio-9p-multidevs.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 +- 52 files changed, 88 insertions(+), 73 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index d822533ccb..4130df0ed9 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -10718,6 +10718,8 @@ qemuBuildSerialChrDeviceProps(const virDomainDef *d= ef, g_autoptr(virJSONValue) props =3D NULL; g_autofree char *chardev =3D g_strdup_printf("char%s", serial->info.al= ias); virQEMUCapsFlags caps; + const char *typestr; + int ret; =20 switch ((virDomainChrSerialTargetModel) serial->targetModel) { case VIR_DOMAIN_CHR_SERIAL_TARGET_MODEL_ISA_SERIAL: @@ -10750,11 +10752,24 @@ qemuBuildSerialChrDeviceProps(const virDomainDef = *def, return NULL; } =20 - if (virJSONValueObjectAdd(&props, - "s:driver", virDomainChrSerialTargetModelTyp= eToString(serial->targetModel), - "s:chardev", chardev, - "s:id", serial->info.alias, - NULL) < 0) + typestr =3D virDomainChrSerialTargetModelTypeToString(serial->targetMo= del); + + if (serial->targetModel =3D=3D VIR_DOMAIN_CHR_SERIAL_TARGET_MODEL_ISA_= SERIAL) { + ret =3D virJSONValueObjectAdd(&props, + "s:driver", typestr, + "s:chardev", chardev, + "s:id", serial->info.alias, + "k:index", serial->target.port, + NULL); + } else { + ret =3D virJSONValueObjectAdd(&props, + "s:driver", typestr, + "s:chardev", chardev, + "s:id", serial->info.alias, + NULL); + } + + if (ret < 0) return NULL; =20 if (qemuBuildDeviceAddressProps(props, def, &serial->info) < 0) diff --git a/tests/qemuxml2argvdata/bios.args b/tests/qemuxml2argvdata/bios= .args index 0469b7419e..62ec87541d 100644 --- a/tests/qemuxml2argvdata/bios.args +++ b/tests/qemuxml2argvdata/bios.args @@ -31,7 +31,7 @@ QEMU_AUDIO_DRV=3Dnone \ -drive file=3D/dev/HostVG/QEMUGuest1,format=3Draw,if=3Dnone,id=3Ddrive-ide= 0-0-0 \ -device ide-hd,bus=3Dide.0,unit=3D0,drive=3Ddrive-ide0-0-0,id=3Dide0-0-0,b= ootindex=3D1 \ -chardev pty,id=3Dcharserial0 \ --device isa-serial,chardev=3Dcharserial0,id=3Dserial0 \ +-device isa-serial,chardev=3Dcharserial0,id=3Dserial0,index=3D0 \ -device usb-tablet,id=3Dinput0,bus=3Dusb.0,port=3D1 \ -device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/console-compat-auto.args b/tests/qemuxm= l2argvdata/console-compat-auto.args index a4fbf3a2f2..936f375100 100644 --- a/tests/qemuxml2argvdata/console-compat-auto.args +++ b/tests/qemuxml2argvdata/console-compat-auto.args @@ -30,6 +30,6 @@ QEMU_AUDIO_DRV=3Dnone \ -drive file=3D/dev/HostVG/QEMUGuest1,format=3Draw,if=3Dnone,id=3Ddrive-ide= 0-0-0 \ -device ide-hd,bus=3Dide.0,unit=3D0,drive=3Ddrive-ide0-0-0,id=3Dide0-0-0,b= ootindex=3D1 \ -chardev pty,id=3Dcharserial0 \ --device isa-serial,chardev=3Dcharserial0,id=3Dserial0 \ +-device isa-serial,chardev=3Dcharserial0,id=3Dserial0,index=3D0 \ -device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/console-compat-auto.x86_64-latest.args = b/tests/qemuxml2argvdata/console-compat-auto.x86_64-latest.args index 688baaf2aa..5eafadd428 100644 --- a/tests/qemuxml2argvdata/console-compat-auto.x86_64-latest.args +++ b/tests/qemuxml2argvdata/console-compat-auto.x86_64-latest.args @@ -32,7 +32,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ -device ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-0-0= ,bootindex=3D1 \ -chardev pty,id=3Dcharserial0 \ --device isa-serial,chardev=3Dcharserial0,id=3Dserial0 \ +-device isa-serial,chardev=3Dcharserial0,id=3Dserial0,index=3D0 \ -audiodev '{"id":"audio1","driver":"none"}' \ -device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ diff --git a/tests/qemuxml2argvdata/console-compat-chardev.args b/tests/qem= uxml2argvdata/console-compat-chardev.args index a4fbf3a2f2..936f375100 100644 --- a/tests/qemuxml2argvdata/console-compat-chardev.args +++ b/tests/qemuxml2argvdata/console-compat-chardev.args @@ -30,6 +30,6 @@ QEMU_AUDIO_DRV=3Dnone \ -drive file=3D/dev/HostVG/QEMUGuest1,format=3Draw,if=3Dnone,id=3Ddrive-ide= 0-0-0 \ -device ide-hd,bus=3Dide.0,unit=3D0,drive=3Ddrive-ide0-0-0,id=3Dide0-0-0,b= ootindex=3D1 \ -chardev pty,id=3Dcharserial0 \ --device isa-serial,chardev=3Dcharserial0,id=3Dserial0 \ +-device isa-serial,chardev=3Dcharserial0,id=3Dserial0,index=3D0 \ -device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/console-compat-chardev.x86_64-latest.ar= gs b/tests/qemuxml2argvdata/console-compat-chardev.x86_64-latest.args index 688baaf2aa..5eafadd428 100644 --- a/tests/qemuxml2argvdata/console-compat-chardev.x86_64-latest.args +++ b/tests/qemuxml2argvdata/console-compat-chardev.x86_64-latest.args @@ -32,7 +32,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ -device ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-0-0= ,bootindex=3D1 \ -chardev pty,id=3Dcharserial0 \ --device isa-serial,chardev=3Dcharserial0,id=3Dserial0 \ +-device isa-serial,chardev=3Dcharserial0,id=3Dserial0,index=3D0 \ -audiodev '{"id":"audio1","driver":"none"}' \ -device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ diff --git a/tests/qemuxml2argvdata/console-compat.args b/tests/qemuxml2arg= vdata/console-compat.args index afaf50d4ba..e91e3c349f 100644 --- a/tests/qemuxml2argvdata/console-compat.args +++ b/tests/qemuxml2argvdata/console-compat.args @@ -30,5 +30,5 @@ QEMU_AUDIO_DRV=3Dnone \ -drive file=3D/dev/HostVG/QEMUGuest1,format=3Draw,if=3Dnone,id=3Ddrive-ide= 0-0-0 \ -device ide-hd,bus=3Dide.0,unit=3D0,drive=3Ddrive-ide0-0-0,id=3Dide0-0-0,b= ootindex=3D1 \ -chardev pty,id=3Dcharserial0 \ --device isa-serial,chardev=3Dcharserial0,id=3Dserial0 \ +-device isa-serial,chardev=3Dcharserial0,id=3Dserial0,index=3D0 \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/console-compat.x86_64-latest.args b/tes= ts/qemuxml2argvdata/console-compat.x86_64-latest.args index cd81c2cec9..66cb02b1c6 100644 --- a/tests/qemuxml2argvdata/console-compat.x86_64-latest.args +++ b/tests/qemuxml2argvdata/console-compat.x86_64-latest.args @@ -32,7 +32,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ -device ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-0-0= ,bootindex=3D1 \ -chardev pty,id=3Dcharserial0 \ --device isa-serial,chardev=3Dcharserial0,id=3Dserial0 \ +-device isa-serial,chardev=3Dcharserial0,id=3Dserial0,index=3D0 \ -audiodev '{"id":"audio1","driver":"none"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/console-virtio-many.args b/tests/qemuxm= l2argvdata/console-virtio-many.args index dc1aca1129..b509cd55b5 100644 --- a/tests/qemuxml2argvdata/console-virtio-many.args +++ b/tests/qemuxml2argvdata/console-virtio-many.args @@ -31,7 +31,7 @@ QEMU_AUDIO_DRV=3Dnone \ -drive file=3D/dev/HostVG/QEMUGuest1,format=3Draw,if=3Dnone,id=3Ddrive-ide= 0-0-0 \ -device ide-hd,bus=3Dide.0,unit=3D0,drive=3Ddrive-ide0-0-0,id=3Dide0-0-0,b= ootindex=3D1 \ -chardev pty,id=3Dcharserial0 \ --device isa-serial,chardev=3Dcharserial0,id=3Dserial0 \ +-device isa-serial,chardev=3Dcharserial0,id=3Dserial0,index=3D0 \ -chardev pty,id=3Dcharconsole1 \ -device virtconsole,chardev=3Dcharconsole1,id=3Dconsole1 \ -chardev pty,id=3Dcharconsole2 \ diff --git a/tests/qemuxml2argvdata/controller-order.args b/tests/qemuxml2a= rgvdata/controller-order.args index 51571a27bf..51fa04dfd8 100644 --- a/tests/qemuxml2argvdata/controller-order.args +++ b/tests/qemuxml2argvdata/controller-order.args @@ -37,7 +37,7 @@ QEMU_AUDIO_DRV=3Dspice \ -chardev spicevmc,id=3Dcharsmartcard0,name=3Dsmartcard \ -device ccid-card-passthru,chardev=3Dcharsmartcard0,id=3Dsmartcard0,bus=3D= ccid0.0 \ -chardev pty,id=3Dcharserial0 \ --device isa-serial,chardev=3Dcharserial0,id=3Dserial0 \ +-device isa-serial,chardev=3Dcharserial0,id=3Dserial0,index=3D0 \ -chardev spicevmc,id=3Dcharchannel0,name=3Dvdagent \ -device virtserialport,bus=3Dvirtio-serial0.0,nr=3D1,chardev=3Dcharchannel= 0,id=3Dchannel0,name=3Dcom.redhat.spice.0 \ -device usb-tablet,id=3Dinput0,bus=3Dusb.0,port=3D1.2 \ diff --git a/tests/qemuxml2argvdata/name-escape.x86_64-2.11.0.args b/tests/= qemuxml2argvdata/name-escape.x86_64-2.11.0.args index 241449f75d..a246c08b12 100644 --- a/tests/qemuxml2argvdata/name-escape.x86_64-2.11.0.args +++ b/tests/qemuxml2argvdata/name-escape.x86_64-2.11.0.args @@ -32,9 +32,9 @@ QEMU_AUDIO_DRV=3Dspice \ -device ide-hd,bus=3Dide.0,unit=3D0,drive=3Ddrive-ide0-0-0,id=3Dide0-0-0,b= ootindex=3D1,write-cache=3Don \ -device ccid-card-emulated,backend=3Dcertificates,cert1=3Dcert1,,foo,cert2= =3Dcert2,cert3=3Dcert3,db=3D/etc/pki/nssdb,,foo,id=3Dsmartcard0,bus=3Dccid0= .0 \ -chardev tty,id=3Dcharserial0,path=3D/dev/ttyS2,,foo \ --device isa-serial,chardev=3Dcharserial0,id=3Dserial0 \ +-device isa-serial,chardev=3Dcharserial0,id=3Dserial0,index=3D1 \ -chardev file,id=3Dcharserial1,path=3D/tmp/serial.log,,foo,append=3Don \ --device isa-serial,chardev=3Dcharserial1,id=3Dserial1 \ +-device isa-serial,chardev=3Dcharserial1,id=3Dserial1,index=3D0 \ -chardev pipe,id=3Dcharchannel0,path=3D/tmp/guestfwd,,foo \ -netdev user,guestfwd=3Dtcp:10.0.2.1:4600-chardev:charchannel0,id=3Dchanne= l0 \ -vnc vnc=3Dunix:/tmp/lib/domain--1-foo=3D1,,bar=3D2/vnc.sock \ diff --git a/tests/qemuxml2argvdata/name-escape.x86_64-latest.args b/tests/= qemuxml2argvdata/name-escape.x86_64-latest.args index bdd0254499..19939030ad 100644 --- a/tests/qemuxml2argvdata/name-escape.x86_64-latest.args +++ b/tests/qemuxml2argvdata/name-escape.x86_64-latest.args @@ -34,10 +34,10 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-foo=3D1,bar=3D2/.c= onfig \ -device ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-0-0= ,bootindex=3D1,write-cache=3Don \ -device ccid-card-emulated,backend=3Dcertificates,cert1=3Dcert1,,foo,cert2= =3Dcert2,cert3=3Dcert3,db=3D/etc/pki/nssdb,,foo,id=3Dsmartcard0,bus=3Dccid0= .0 \ -chardev tty,id=3Dcharserial0,path=3D/dev/ttyS2,,foo \ --device isa-serial,chardev=3Dcharserial0,id=3Dserial0 \ +-device isa-serial,chardev=3Dcharserial0,id=3Dserial0,index=3D1 \ -add-fd set=3D0,fd=3D1750 \ -chardev file,id=3Dcharserial1,path=3D/dev/fdset/0,append=3Don \ --device isa-serial,chardev=3Dcharserial1,id=3Dserial1 \ +-device isa-serial,chardev=3Dcharserial1,id=3Dserial1,index=3D0 \ -chardev pipe,id=3Dcharchannel0,path=3D/tmp/guestfwd,,foo \ -netdev user,guestfwd=3Dtcp:10.0.2.1:4600-chardev:charchannel0,id=3Dchanne= l0 \ -audiodev '{"id":"audio1","driver":"spice"}' \ diff --git a/tests/qemuxml2argvdata/q35-virt-manager-basic.args b/tests/qem= uxml2argvdata/q35-virt-manager-basic.args index 49e0f6794e..afaff44212 100644 --- a/tests/qemuxml2argvdata/q35-virt-manager-basic.args +++ b/tests/qemuxml2argvdata/q35-virt-manager-basic.args @@ -40,7 +40,7 @@ QEMU_AUDIO_DRV=3Dspice \ -netdev user,id=3Dhostnet0 \ -device virtio-net-pci,netdev=3Dhostnet0,id=3Dnet0,mac=3D52:54:00:9a:e6:c6= ,bus=3Dpci.1,addr=3D0x0 \ -chardev pty,id=3Dcharserial0 \ --device isa-serial,chardev=3Dcharserial0,id=3Dserial0 \ +-device isa-serial,chardev=3Dcharserial0,id=3Dserial0,index=3D0 \ -chardev socket,id=3Dcharchannel0,path=3D/tmp/channel/domain--1-virt-manag= er-basic/org.qemu.guest_agent.0,server=3Don,wait=3Doff \ -device virtserialport,bus=3Dvirtio-serial0.0,nr=3D1,chardev=3Dcharchannel= 0,id=3Dchannel0,name=3Dorg.qemu.guest_agent.0 \ -chardev spicevmc,id=3Dcharchannel1,name=3Dvdagent \ diff --git a/tests/qemuxml2argvdata/serial-dev-chardev-iobase.args b/tests/= qemuxml2argvdata/serial-dev-chardev-iobase.args index bcca630616..bcaf66f88d 100644 --- a/tests/qemuxml2argvdata/serial-dev-chardev-iobase.args +++ b/tests/qemuxml2argvdata/serial-dev-chardev-iobase.args @@ -30,6 +30,6 @@ QEMU_AUDIO_DRV=3Dnone \ -drive file=3D/dev/HostVG/QEMUGuest1,format=3Draw,if=3Dnone,id=3Ddrive-ide= 0-0-0 \ -device ide-hd,bus=3Dide.0,unit=3D0,drive=3Ddrive-ide0-0-0,id=3Dide0-0-0,b= ootindex=3D1 \ -chardev tty,id=3Dcharserial0,path=3D/dev/ttyS2 \ --device isa-serial,chardev=3Dcharserial0,id=3Dserial0,iobase=3D1016,irq=3D= 4 \ +-device isa-serial,chardev=3Dcharserial0,id=3Dserial0,index=3D0,iobase=3D1= 016,irq=3D4 \ -device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/serial-dev-chardev-iobase.x86_64-latest= .args b/tests/qemuxml2argvdata/serial-dev-chardev-iobase.x86_64-latest.args index 94d76fac91..067fa6987f 100644 --- a/tests/qemuxml2argvdata/serial-dev-chardev-iobase.x86_64-latest.args +++ b/tests/qemuxml2argvdata/serial-dev-chardev-iobase.x86_64-latest.args @@ -32,7 +32,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ -device ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-0-0= ,bootindex=3D1 \ -chardev tty,id=3Dcharserial0,path=3D/dev/ttyS2 \ --device isa-serial,chardev=3Dcharserial0,id=3Dserial0,iobase=3D1016,irq=3D= 4 \ +-device isa-serial,chardev=3Dcharserial0,id=3Dserial0,index=3D0,iobase=3D1= 016,irq=3D4 \ -audiodev '{"id":"audio1","driver":"none"}' \ -device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ diff --git a/tests/qemuxml2argvdata/serial-dev-chardev.args b/tests/qemuxml= 2argvdata/serial-dev-chardev.args index fb5276bc5f..0bf5d6ceb0 100644 --- a/tests/qemuxml2argvdata/serial-dev-chardev.args +++ b/tests/qemuxml2argvdata/serial-dev-chardev.args @@ -30,6 +30,6 @@ QEMU_AUDIO_DRV=3Dnone \ -drive file=3D/dev/HostVG/QEMUGuest1,format=3Draw,if=3Dnone,id=3Ddrive-ide= 0-0-0 \ -device ide-hd,bus=3Dide.0,unit=3D0,drive=3Ddrive-ide0-0-0,id=3Dide0-0-0,b= ootindex=3D1 \ -chardev tty,id=3Dcharserial0,path=3D/dev/ttyS2 \ --device isa-serial,chardev=3Dcharserial0,id=3Dserial0 \ +-device isa-serial,chardev=3Dcharserial0,id=3Dserial0,index=3D0 \ -device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/serial-dev-chardev.x86_64-latest.args b= /tests/qemuxml2argvdata/serial-dev-chardev.x86_64-latest.args index fe46edb5f6..a76bf66f8f 100644 --- a/tests/qemuxml2argvdata/serial-dev-chardev.x86_64-latest.args +++ b/tests/qemuxml2argvdata/serial-dev-chardev.x86_64-latest.args @@ -32,7 +32,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ -device ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-0-0= ,bootindex=3D1 \ -chardev tty,id=3Dcharserial0,path=3D/dev/ttyS2 \ --device isa-serial,chardev=3Dcharserial0,id=3Dserial0 \ +-device isa-serial,chardev=3Dcharserial0,id=3Dserial0,index=3D0 \ -audiodev '{"id":"audio1","driver":"none"}' \ -device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ diff --git a/tests/qemuxml2argvdata/serial-file-chardev.args b/tests/qemuxm= l2argvdata/serial-file-chardev.args index db46920bab..4ec07d9b1f 100644 --- a/tests/qemuxml2argvdata/serial-file-chardev.args +++ b/tests/qemuxml2argvdata/serial-file-chardev.args @@ -30,6 +30,6 @@ QEMU_AUDIO_DRV=3Dnone \ -drive file=3D/dev/HostVG/QEMUGuest1,format=3Draw,if=3Dnone,id=3Ddrive-ide= 0-0-0 \ -device ide-hd,bus=3Dide.0,unit=3D0,drive=3Ddrive-ide0-0-0,id=3Dide0-0-0,b= ootindex=3D1 \ -chardev file,id=3Dcharserial0,path=3D/tmp/serial.log,append=3Don \ --device isa-serial,chardev=3Dcharserial0,id=3Dserial0 \ +-device isa-serial,chardev=3Dcharserial0,id=3Dserial0,index=3D0 \ -device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/serial-file-chardev.x86_64-latest.args = b/tests/qemuxml2argvdata/serial-file-chardev.x86_64-latest.args index 02a5bbc121..308e73c0b9 100644 --- a/tests/qemuxml2argvdata/serial-file-chardev.x86_64-latest.args +++ b/tests/qemuxml2argvdata/serial-file-chardev.x86_64-latest.args @@ -33,7 +33,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -device ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-0-0= ,bootindex=3D1 \ -add-fd set=3D0,fd=3D1750 \ -chardev file,id=3Dcharserial0,path=3D/dev/fdset/0,append=3Don \ --device isa-serial,chardev=3Dcharserial0,id=3Dserial0 \ +-device isa-serial,chardev=3Dcharserial0,id=3Dserial0,index=3D0 \ -audiodev '{"id":"audio1","driver":"none"}' \ -device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ diff --git a/tests/qemuxml2argvdata/serial-file-log.args b/tests/qemuxml2ar= gvdata/serial-file-log.args index 3833413150..1ffa30d207 100644 --- a/tests/qemuxml2argvdata/serial-file-log.args +++ b/tests/qemuxml2argvdata/serial-file-log.args @@ -30,5 +30,5 @@ QEMU_AUDIO_DRV=3Dnone \ -drive file=3D/dev/HostVG/QEMUGuest1,format=3Draw,if=3Dnone,id=3Ddrive-ide= 0-0-0 \ -device ide-hd,bus=3Dide.0,unit=3D0,drive=3Ddrive-ide0-0-0,id=3Dide0-0-0,b= ootindex=3D1 \ -chardev file,id=3Dcharserial0,path=3D/tmp/serial.log,logfile=3D/var/lib/l= ibvirt/qemu/demo-serial.log,logappend=3Doff \ --device isa-serial,chardev=3Dcharserial0,id=3Dserial0 \ +-device isa-serial,chardev=3Dcharserial0,id=3Dserial0,index=3D0 \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/serial-file-log.x86_64-latest.args b/te= sts/qemuxml2argvdata/serial-file-log.x86_64-latest.args index 39c93eaa0c..558e189e86 100644 --- a/tests/qemuxml2argvdata/serial-file-log.x86_64-latest.args +++ b/tests/qemuxml2argvdata/serial-file-log.x86_64-latest.args @@ -34,7 +34,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -add-fd set=3D0,fd=3D1750 \ -add-fd set=3D1,fd=3D1751 \ -chardev file,id=3Dcharserial0,path=3D/dev/fdset/0,append=3Don,logfile=3D/= dev/fdset/1,logappend=3Don \ --device isa-serial,chardev=3Dcharserial0,id=3Dserial0 \ +-device isa-serial,chardev=3Dcharserial0,id=3Dserial0,index=3D0 \ -audiodev '{"id":"audio1","driver":"none"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/serial-many-chardev.args b/tests/qemuxm= l2argvdata/serial-many-chardev.args index 11e187fead..e0005656ea 100644 --- a/tests/qemuxml2argvdata/serial-many-chardev.args +++ b/tests/qemuxml2argvdata/serial-many-chardev.args @@ -30,8 +30,8 @@ QEMU_AUDIO_DRV=3Dnone \ -drive file=3D/dev/HostVG/QEMUGuest1,format=3Draw,if=3Dnone,id=3Ddrive-ide= 0-0-0 \ -device ide-hd,bus=3Dide.0,unit=3D0,drive=3Ddrive-ide0-0-0,id=3Dide0-0-0,b= ootindex=3D1 \ -chardev pty,id=3Dcharserial0 \ --device isa-serial,chardev=3Dcharserial0,id=3Dserial0 \ +-device isa-serial,chardev=3Dcharserial0,id=3Dserial0,index=3D0 \ -chardev file,id=3Dcharserial1,path=3D/tmp/serial.log \ --device isa-serial,chardev=3Dcharserial1,id=3Dserial1 \ +-device isa-serial,chardev=3Dcharserial1,id=3Dserial1,index=3D1 \ -device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/serial-many-chardev.x86_64-latest.args = b/tests/qemuxml2argvdata/serial-many-chardev.x86_64-latest.args index c15fbeafb9..29be886c5d 100644 --- a/tests/qemuxml2argvdata/serial-many-chardev.x86_64-latest.args +++ b/tests/qemuxml2argvdata/serial-many-chardev.x86_64-latest.args @@ -32,10 +32,10 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ -device ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-0-0= ,bootindex=3D1 \ -chardev pty,id=3Dcharserial0 \ --device isa-serial,chardev=3Dcharserial0,id=3Dserial0 \ +-device isa-serial,chardev=3Dcharserial0,id=3Dserial0,index=3D0 \ -add-fd set=3D0,fd=3D1750 \ -chardev file,id=3Dcharserial1,path=3D/dev/fdset/0,append=3Don \ --device isa-serial,chardev=3Dcharserial1,id=3Dserial1 \ +-device isa-serial,chardev=3Dcharserial1,id=3Dserial1,index=3D1 \ -audiodev '{"id":"audio1","driver":"none"}' \ -device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ diff --git a/tests/qemuxml2argvdata/serial-pty-chardev.args b/tests/qemuxml= 2argvdata/serial-pty-chardev.args index a4fbf3a2f2..936f375100 100644 --- a/tests/qemuxml2argvdata/serial-pty-chardev.args +++ b/tests/qemuxml2argvdata/serial-pty-chardev.args @@ -30,6 +30,6 @@ QEMU_AUDIO_DRV=3Dnone \ -drive file=3D/dev/HostVG/QEMUGuest1,format=3Draw,if=3Dnone,id=3Ddrive-ide= 0-0-0 \ -device ide-hd,bus=3Dide.0,unit=3D0,drive=3Ddrive-ide0-0-0,id=3Dide0-0-0,b= ootindex=3D1 \ -chardev pty,id=3Dcharserial0 \ --device isa-serial,chardev=3Dcharserial0,id=3Dserial0 \ +-device isa-serial,chardev=3Dcharserial0,id=3Dserial0,index=3D0 \ -device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/serial-pty-chardev.x86_64-latest.args b= /tests/qemuxml2argvdata/serial-pty-chardev.x86_64-latest.args index 688baaf2aa..5eafadd428 100644 --- a/tests/qemuxml2argvdata/serial-pty-chardev.x86_64-latest.args +++ b/tests/qemuxml2argvdata/serial-pty-chardev.x86_64-latest.args @@ -32,7 +32,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ -device ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-0-0= ,bootindex=3D1 \ -chardev pty,id=3Dcharserial0 \ --device isa-serial,chardev=3Dcharserial0,id=3Dserial0 \ +-device isa-serial,chardev=3Dcharserial0,id=3Dserial0,index=3D0 \ -audiodev '{"id":"audio1","driver":"none"}' \ -device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ diff --git a/tests/qemuxml2argvdata/serial-spiceport.args b/tests/qemuxml2a= rgvdata/serial-spiceport.args index 9e0c483f3d..7d4c2a0d37 100644 --- a/tests/qemuxml2argvdata/serial-spiceport.args +++ b/tests/qemuxml2argvdata/serial-spiceport.args @@ -29,7 +29,7 @@ QEMU_AUDIO_DRV=3Dspice \ -drive file=3D/dev/HostVG/QEMUGuest1,format=3Draw,if=3Dnone,id=3Ddrive-ide= 0-0-0 \ -device ide-hd,bus=3Dide.0,unit=3D0,drive=3Ddrive-ide0-0-0,id=3Dide0-0-0,b= ootindex=3D1 \ -chardev spiceport,id=3Dcharserial0,name=3Dorg.qemu.console.serial.0 \ --device isa-serial,chardev=3Dcharserial0,id=3Dserial0 \ +-device isa-serial,chardev=3Dcharserial0,id=3Dserial0,index=3D0 \ -device usb-tablet,id=3Dinput0,bus=3Dusb.0,port=3D1 \ -spice port=3D5903,tls-port=3D5904,addr=3D127.0.0.1,x509-dir=3D/etc/pki/li= bvirt-spice,seamless-migration=3Don \ -device qxl-vga,id=3Dvideo0,ram_size=3D67108864,vram_size=3D67108864,bus= =3Dpci.0,addr=3D0x2 \ diff --git a/tests/qemuxml2argvdata/serial-spiceport.x86_64-latest.args b/t= ests/qemuxml2argvdata/serial-spiceport.x86_64-latest.args index 5ac813d814..5315f66849 100644 --- a/tests/qemuxml2argvdata/serial-spiceport.x86_64-latest.args +++ b/tests/qemuxml2argvdata/serial-spiceport.x86_64-latest.args @@ -31,7 +31,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ -device ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-0-0= ,bootindex=3D1 \ -chardev spiceport,id=3Dcharserial0,name=3Dorg.qemu.console.serial.0 \ --device isa-serial,chardev=3Dcharserial0,id=3Dserial0 \ +-device isa-serial,chardev=3Dcharserial0,id=3Dserial0,index=3D0 \ -device usb-tablet,id=3Dinput0,bus=3Dusb.0,port=3D1 \ -audiodev '{"id":"audio1","driver":"spice"}' \ -spice port=3D5903,tls-port=3D5904,addr=3D127.0.0.1,x509-dir=3D/etc/pki/li= bvirt-spice,seamless-migration=3Don \ diff --git a/tests/qemuxml2argvdata/serial-tcp-chardev.args b/tests/qemuxml= 2argvdata/serial-tcp-chardev.args index 63b16ded13..de5af9c7ed 100644 --- a/tests/qemuxml2argvdata/serial-tcp-chardev.args +++ b/tests/qemuxml2argvdata/serial-tcp-chardev.args @@ -30,6 +30,6 @@ QEMU_AUDIO_DRV=3Dnone \ -drive file=3D/dev/HostVG/QEMUGuest1,format=3Draw,if=3Dnone,id=3Ddrive-ide= 0-0-0 \ -device ide-hd,bus=3Dide.0,unit=3D0,drive=3Ddrive-ide0-0-0,id=3Dide0-0-0,b= ootindex=3D1 \ -chardev socket,id=3Dcharserial0,host=3D127.0.0.1,port=3D9999 \ --device isa-serial,chardev=3Dcharserial0,id=3Dserial0 \ +-device isa-serial,chardev=3Dcharserial0,id=3Dserial0,index=3D0 \ -device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/serial-tcp-chardev.x86_64-latest.args b= /tests/qemuxml2argvdata/serial-tcp-chardev.x86_64-latest.args index f15a843909..bd98ea6be4 100644 --- a/tests/qemuxml2argvdata/serial-tcp-chardev.x86_64-latest.args +++ b/tests/qemuxml2argvdata/serial-tcp-chardev.x86_64-latest.args @@ -32,7 +32,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ -device ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-0-0= ,bootindex=3D1 \ -chardev socket,id=3Dcharserial0,host=3D127.0.0.1,port=3D9999 \ --device isa-serial,chardev=3Dcharserial0,id=3Dserial0 \ +-device isa-serial,chardev=3Dcharserial0,id=3Dserial0,index=3D0 \ -audiodev '{"id":"audio1","driver":"none"}' \ -device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ diff --git a/tests/qemuxml2argvdata/serial-tcp-telnet-chardev.args b/tests/= qemuxml2argvdata/serial-tcp-telnet-chardev.args index a804bdf7e6..2ac30c694c 100644 --- a/tests/qemuxml2argvdata/serial-tcp-telnet-chardev.args +++ b/tests/qemuxml2argvdata/serial-tcp-telnet-chardev.args @@ -30,6 +30,6 @@ QEMU_AUDIO_DRV=3Dnone \ -drive file=3D/dev/HostVG/QEMUGuest1,format=3Draw,if=3Dnone,id=3Ddrive-ide= 0-0-0 \ -device ide-hd,bus=3Dide.0,unit=3D0,drive=3Ddrive-ide0-0-0,id=3Dide0-0-0,b= ootindex=3D1 \ -chardev socket,id=3Dcharserial0,host=3D127.0.0.1,port=3D9999,telnet=3Don,= server=3Don,wait=3Doff \ --device isa-serial,chardev=3Dcharserial0,id=3Dserial0 \ +-device isa-serial,chardev=3Dcharserial0,id=3Dserial0,index=3D0 \ -device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/serial-tcp-telnet-chardev.x86_64-latest= .args b/tests/qemuxml2argvdata/serial-tcp-telnet-chardev.x86_64-latest.args index da4f1e8aae..67cedc30e9 100644 --- a/tests/qemuxml2argvdata/serial-tcp-telnet-chardev.x86_64-latest.args +++ b/tests/qemuxml2argvdata/serial-tcp-telnet-chardev.x86_64-latest.args @@ -32,7 +32,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ -device ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-0-0= ,bootindex=3D1 \ -chardev socket,id=3Dcharserial0,host=3D127.0.0.1,port=3D9999,telnet=3Don,= server=3Don,wait=3Doff \ --device isa-serial,chardev=3Dcharserial0,id=3Dserial0 \ +-device isa-serial,chardev=3Dcharserial0,id=3Dserial0,index=3D0 \ -audiodev '{"id":"audio1","driver":"none"}' \ -device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ diff --git a/tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev-notls.args b= /tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev-notls.args index a49f649309..302dc59394 100644 --- a/tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev-notls.args +++ b/tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev-notls.args @@ -30,8 +30,8 @@ QEMU_AUDIO_DRV=3Dnone \ -drive file=3D/dev/HostVG/QEMUGuest1,format=3Draw,if=3Dnone,id=3Ddrive-ide= 0-0-0 \ -device ide-hd,bus=3Dide.0,unit=3D0,drive=3Ddrive-ide0-0-0,id=3Dide0-0-0,b= ootindex=3D1 \ -chardev udp,id=3Dcharserial0,host=3D127.0.0.1,port=3D2222,localaddr=3D127= .0.0.1,localport=3D1111 \ --device isa-serial,chardev=3Dcharserial0,id=3Dserial0 \ +-device isa-serial,chardev=3Dcharserial0,id=3Dserial0,index=3D0 \ -chardev socket,id=3Dcharserial1,host=3D127.0.0.1,port=3D5555 \ --device isa-serial,chardev=3Dcharserial1,id=3Dserial1 \ +-device isa-serial,chardev=3Dcharserial1,id=3Dserial1,index=3D1 \ -device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x3 \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev-notls.x86_64= -latest.args b/tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev-notls.x86_= 64-latest.args index 45b1386916..58ae1338fa 100644 --- a/tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev-notls.x86_64-latest= .args +++ b/tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev-notls.x86_64-latest= .args @@ -32,9 +32,9 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ -device ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-0-0= ,bootindex=3D1 \ -chardev udp,id=3Dcharserial0,host=3D127.0.0.1,port=3D2222,localaddr=3D127= .0.0.1,localport=3D1111 \ --device isa-serial,chardev=3Dcharserial0,id=3Dserial0 \ +-device isa-serial,chardev=3Dcharserial0,id=3Dserial0,index=3D0 \ -chardev socket,id=3Dcharserial1,host=3D127.0.0.1,port=3D5555 \ --device isa-serial,chardev=3Dcharserial1,id=3Dserial1 \ +-device isa-serial,chardev=3Dcharserial1,id=3Dserial1,index=3D1 \ -audiodev '{"id":"audio1","driver":"none"}' \ -device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x3 \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ diff --git a/tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev-verify.args = b/tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev-verify.args index 8e45fc5490..998413bf0f 100644 --- a/tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev-verify.args +++ b/tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev-verify.args @@ -30,9 +30,9 @@ QEMU_AUDIO_DRV=3Dnone \ -drive file=3D/dev/HostVG/QEMUGuest1,format=3Draw,if=3Dnone,id=3Ddrive-ide= 0-0-0 \ -device ide-hd,bus=3Dide.0,unit=3D0,drive=3Ddrive-ide0-0-0,id=3Dide0-0-0,b= ootindex=3D1 \ -chardev udp,id=3Dcharserial0,host=3D127.0.0.1,port=3D2222,localaddr=3D127= .0.0.1,localport=3D1111 \ --device isa-serial,chardev=3Dcharserial0,id=3Dserial0 \ +-device isa-serial,chardev=3Dcharserial0,id=3Dserial0,index=3D0 \ -object tls-creds-x509,id=3Dobjcharserial1_tls0,dir=3D/etc/pki/libvirt-cha= rdev,endpoint=3Dclient,verify-peer=3Don \ -chardev socket,id=3Dcharserial1,host=3D127.0.0.1,port=3D5555,tls-creds=3D= objcharserial1_tls0 \ --device isa-serial,chardev=3Dcharserial1,id=3Dserial1 \ +-device isa-serial,chardev=3Dcharserial1,id=3Dserial1,index=3D1 \ -device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev-verify.x86_6= 4-latest.args b/tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev-verify.x8= 6_64-latest.args index 7b9b49b1cb..7f72c2d045 100644 --- a/tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev-verify.x86_64-lates= t.args +++ b/tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev-verify.x86_64-lates= t.args @@ -32,10 +32,10 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ -device ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-0-0= ,bootindex=3D1 \ -chardev udp,id=3Dcharserial0,host=3D127.0.0.1,port=3D2222,localaddr=3D127= .0.0.1,localport=3D1111 \ --device isa-serial,chardev=3Dcharserial0,id=3Dserial0 \ +-device isa-serial,chardev=3Dcharserial0,id=3Dserial0,index=3D0 \ -object '{"qom-type":"tls-creds-x509","id":"objcharserial1_tls0","dir":"/e= tc/pki/libvirt-chardev","endpoint":"client","verify-peer":true}' \ -chardev socket,id=3Dcharserial1,host=3D127.0.0.1,port=3D5555,tls-creds=3D= objcharserial1_tls0 \ --device isa-serial,chardev=3Dcharserial1,id=3Dserial1 \ +-device isa-serial,chardev=3Dcharserial1,id=3Dserial1,index=3D1 \ -audiodev '{"id":"audio1","driver":"none"}' \ -device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ diff --git a/tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev.args b/tests= /qemuxml2argvdata/serial-tcp-tlsx509-chardev.args index 8e45fc5490..998413bf0f 100644 --- a/tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev.args +++ b/tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev.args @@ -30,9 +30,9 @@ QEMU_AUDIO_DRV=3Dnone \ -drive file=3D/dev/HostVG/QEMUGuest1,format=3Draw,if=3Dnone,id=3Ddrive-ide= 0-0-0 \ -device ide-hd,bus=3Dide.0,unit=3D0,drive=3Ddrive-ide0-0-0,id=3Dide0-0-0,b= ootindex=3D1 \ -chardev udp,id=3Dcharserial0,host=3D127.0.0.1,port=3D2222,localaddr=3D127= .0.0.1,localport=3D1111 \ --device isa-serial,chardev=3Dcharserial0,id=3Dserial0 \ +-device isa-serial,chardev=3Dcharserial0,id=3Dserial0,index=3D0 \ -object tls-creds-x509,id=3Dobjcharserial1_tls0,dir=3D/etc/pki/libvirt-cha= rdev,endpoint=3Dclient,verify-peer=3Don \ -chardev socket,id=3Dcharserial1,host=3D127.0.0.1,port=3D5555,tls-creds=3D= objcharserial1_tls0 \ --device isa-serial,chardev=3Dcharserial1,id=3Dserial1 \ +-device isa-serial,chardev=3Dcharserial1,id=3Dserial1,index=3D1 \ -device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev.x86_64-lates= t.args b/tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev.x86_64-latest.ar= gs index 7b9b49b1cb..7f72c2d045 100644 --- a/tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev.x86_64-latest.args +++ b/tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev.x86_64-latest.args @@ -32,10 +32,10 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ -device ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-0-0= ,bootindex=3D1 \ -chardev udp,id=3Dcharserial0,host=3D127.0.0.1,port=3D2222,localaddr=3D127= .0.0.1,localport=3D1111 \ --device isa-serial,chardev=3Dcharserial0,id=3Dserial0 \ +-device isa-serial,chardev=3Dcharserial0,id=3Dserial0,index=3D0 \ -object '{"qom-type":"tls-creds-x509","id":"objcharserial1_tls0","dir":"/e= tc/pki/libvirt-chardev","endpoint":"client","verify-peer":true}' \ -chardev socket,id=3Dcharserial1,host=3D127.0.0.1,port=3D5555,tls-creds=3D= objcharserial1_tls0 \ --device isa-serial,chardev=3Dcharserial1,id=3Dserial1 \ +-device isa-serial,chardev=3Dcharserial1,id=3Dserial1,index=3D1 \ -audiodev '{"id":"audio1","driver":"none"}' \ -device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ diff --git a/tests/qemuxml2argvdata/serial-tcp-tlsx509-secret-chardev.args = b/tests/qemuxml2argvdata/serial-tcp-tlsx509-secret-chardev.args index 23331ed1d4..17926d7a11 100644 --- a/tests/qemuxml2argvdata/serial-tcp-tlsx509-secret-chardev.args +++ b/tests/qemuxml2argvdata/serial-tcp-tlsx509-secret-chardev.args @@ -30,10 +30,10 @@ QEMU_AUDIO_DRV=3Dnone \ -drive file=3D/dev/HostVG/QEMUGuest1,format=3Draw,if=3Dnone,id=3Ddrive-ide= 0-0-0 \ -device ide-hd,bus=3Dide.0,unit=3D0,drive=3Ddrive-ide0-0-0,id=3Dide0-0-0,b= ootindex=3D1 \ -chardev udp,id=3Dcharserial0,host=3D127.0.0.1,port=3D2222,localaddr=3D127= .0.0.1,localport=3D1111 \ --device isa-serial,chardev=3Dcharserial0,id=3Dserial0 \ +-device isa-serial,chardev=3Dcharserial0,id=3Dserial0,index=3D0 \ -object secret,id=3Dcharserial1-secret0,data=3D9eao5F8qtkGt+seB1HYivWIxbtw= Uu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1,keyid=3DmasterKey0,iv=3DAAECAwQFBgcIC= QoLDA0ODw=3D=3D,format=3Dbase64 \ -object tls-creds-x509,id=3Dobjcharserial1_tls0,dir=3D/etc/pki/libvirt-cha= rdev,endpoint=3Dclient,verify-peer=3Don,passwordid=3Dcharserial1-secret0 \ -chardev socket,id=3Dcharserial1,host=3D127.0.0.1,port=3D5555,tls-creds=3D= objcharserial1_tls0 \ --device isa-serial,chardev=3Dcharserial1,id=3Dserial1 \ +-device isa-serial,chardev=3Dcharserial1,id=3Dserial1,index=3D1 \ -device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x3 \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/serial-tcp-tlsx509-secret-chardev.x86_6= 4-latest.args b/tests/qemuxml2argvdata/serial-tcp-tlsx509-secret-chardev.x8= 6_64-latest.args index 1ce871f3cf..7ff4f6c5b2 100644 --- a/tests/qemuxml2argvdata/serial-tcp-tlsx509-secret-chardev.x86_64-lates= t.args +++ b/tests/qemuxml2argvdata/serial-tcp-tlsx509-secret-chardev.x86_64-lates= t.args @@ -32,11 +32,11 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ -device ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-0-0= ,bootindex=3D1 \ -chardev udp,id=3Dcharserial0,host=3D127.0.0.1,port=3D2222,localaddr=3D127= .0.0.1,localport=3D1111 \ --device isa-serial,chardev=3Dcharserial0,id=3Dserial0 \ +-device isa-serial,chardev=3Dcharserial0,id=3Dserial0,index=3D0 \ -object '{"qom-type":"secret","id":"charserial1-secret0","data":"9eao5F8qt= kGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1","keyid":"masterKey= 0","iv":"AAECAwQFBgcICQoLDA0ODw=3D=3D","format":"base64"}' \ -object '{"qom-type":"tls-creds-x509","id":"objcharserial1_tls0","dir":"/e= tc/pki/libvirt-chardev","endpoint":"client","verify-peer":true,"passwordid"= :"charserial1-secret0"}' \ -chardev socket,id=3Dcharserial1,host=3D127.0.0.1,port=3D5555,tls-creds=3D= objcharserial1_tls0 \ --device isa-serial,chardev=3Dcharserial1,id=3Dserial1 \ +-device isa-serial,chardev=3Dcharserial1,id=3Dserial1,index=3D1 \ -audiodev '{"id":"audio1","driver":"none"}' \ -device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x3 \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ diff --git a/tests/qemuxml2argvdata/serial-udp-chardev.args b/tests/qemuxml= 2argvdata/serial-udp-chardev.args index 9e5e909881..93bf2f4f0d 100644 --- a/tests/qemuxml2argvdata/serial-udp-chardev.args +++ b/tests/qemuxml2argvdata/serial-udp-chardev.args @@ -30,8 +30,8 @@ QEMU_AUDIO_DRV=3Dnone \ -drive file=3D/dev/HostVG/QEMUGuest1,format=3Draw,if=3Dnone,id=3Ddrive-ide= 0-0-0 \ -device ide-hd,bus=3Dide.0,unit=3D0,drive=3Ddrive-ide0-0-0,id=3Dide0-0-0,b= ootindex=3D1 \ -chardev udp,id=3Dcharserial0,host=3D127.0.0.1,port=3D9998,localaddr=3D127= .0.0.1,localport=3D9999 \ --device isa-serial,chardev=3Dcharserial0,id=3Dserial0 \ +-device isa-serial,chardev=3Dcharserial0,id=3Dserial0,index=3D0 \ -chardev udp,id=3Dcharserial1,host=3D,port=3D9999,localaddr=3D,localport= =3D0 \ --device isa-serial,chardev=3Dcharserial1,id=3Dserial1 \ +-device isa-serial,chardev=3Dcharserial1,id=3Dserial1,index=3D1 \ -device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/serial-udp-chardev.x86_64-latest.args b= /tests/qemuxml2argvdata/serial-udp-chardev.x86_64-latest.args index 48b44f8ffd..2c8b2bd117 100644 --- a/tests/qemuxml2argvdata/serial-udp-chardev.x86_64-latest.args +++ b/tests/qemuxml2argvdata/serial-udp-chardev.x86_64-latest.args @@ -32,9 +32,9 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ -device ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-0-0= ,bootindex=3D1 \ -chardev udp,id=3Dcharserial0,host=3D127.0.0.1,port=3D9998,localaddr=3D127= .0.0.1,localport=3D9999 \ --device isa-serial,chardev=3Dcharserial0,id=3Dserial0 \ +-device isa-serial,chardev=3Dcharserial0,id=3Dserial0,index=3D0 \ -chardev udp,id=3Dcharserial1,host=3D,port=3D9999,localaddr=3D,localport= =3D0 \ --device isa-serial,chardev=3Dcharserial1,id=3Dserial1 \ +-device isa-serial,chardev=3Dcharserial1,id=3Dserial1,index=3D1 \ -audiodev '{"id":"audio1","driver":"none"}' \ -device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ diff --git a/tests/qemuxml2argvdata/serial-unix-chardev.args b/tests/qemuxm= l2argvdata/serial-unix-chardev.args index 6f533a991a..4192ef5621 100644 --- a/tests/qemuxml2argvdata/serial-unix-chardev.args +++ b/tests/qemuxml2argvdata/serial-unix-chardev.args @@ -28,8 +28,8 @@ QEMU_AUDIO_DRV=3Dnone \ -boot strict=3Don \ -usb \ -chardev socket,id=3Dcharserial0,path=3D/tmp/serial.sock \ --device isa-serial,chardev=3Dcharserial0,id=3Dserial0 \ +-device isa-serial,chardev=3Dcharserial0,id=3Dserial0,index=3D0 \ -chardev socket,id=3Dcharserial1,path=3D/tmp/serial-server.sock,server=3Do= n,wait=3Doff \ --device isa-serial,chardev=3Dcharserial1,id=3Dserial1 \ +-device isa-serial,chardev=3Dcharserial1,id=3Dserial1,index=3D1 \ -device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/serial-unix-chardev.x86_64-latest.args = b/tests/qemuxml2argvdata/serial-unix-chardev.x86_64-latest.args index b8adaa39bc..27388d1351 100644 --- a/tests/qemuxml2argvdata/serial-unix-chardev.x86_64-latest.args +++ b/tests/qemuxml2argvdata/serial-unix-chardev.x86_64-latest.args @@ -29,9 +29,9 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -boot strict=3Don \ -device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ -chardev socket,id=3Dcharserial0,path=3D/tmp/serial.sock \ --device isa-serial,chardev=3Dcharserial0,id=3Dserial0 \ +-device isa-serial,chardev=3Dcharserial0,id=3Dserial0,index=3D0 \ -chardev socket,id=3Dcharserial1,fd=3D1729,server=3Don,wait=3Doff \ --device isa-serial,chardev=3Dcharserial1,id=3Dserial1 \ +-device isa-serial,chardev=3Dcharserial1,id=3Dserial1,index=3D1 \ -audiodev '{"id":"audio1","driver":"none"}' \ -device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ diff --git a/tests/qemuxml2argvdata/serial-vc-chardev.args b/tests/qemuxml2= argvdata/serial-vc-chardev.args index 65b1473c70..6870f976e4 100644 --- a/tests/qemuxml2argvdata/serial-vc-chardev.args +++ b/tests/qemuxml2argvdata/serial-vc-chardev.args @@ -30,6 +30,6 @@ QEMU_AUDIO_DRV=3Dnone \ -drive file=3D/dev/HostVG/QEMUGuest1,format=3Draw,if=3Dnone,id=3Ddrive-ide= 0-0-0 \ -device ide-hd,bus=3Dide.0,unit=3D0,drive=3Ddrive-ide0-0-0,id=3Dide0-0-0,b= ootindex=3D1 \ -chardev vc,id=3Dcharserial0 \ --device isa-serial,chardev=3Dcharserial0,id=3Dserial0 \ +-device isa-serial,chardev=3Dcharserial0,id=3Dserial0,index=3D0 \ -device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/serial-vc-chardev.x86_64-latest.args b/= tests/qemuxml2argvdata/serial-vc-chardev.x86_64-latest.args index 5c59309ad5..81f51dc8d7 100644 --- a/tests/qemuxml2argvdata/serial-vc-chardev.x86_64-latest.args +++ b/tests/qemuxml2argvdata/serial-vc-chardev.x86_64-latest.args @@ -32,7 +32,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ -device ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-0-0= ,bootindex=3D1 \ -chardev vc,id=3Dcharserial0 \ --device isa-serial,chardev=3Dcharserial0,id=3Dserial0 \ +-device isa-serial,chardev=3Dcharserial0,id=3Dserial0,index=3D0 \ -audiodev '{"id":"audio1","driver":"none"}' \ -device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ diff --git a/tests/qemuxml2argvdata/user-aliases.args b/tests/qemuxml2argvd= ata/user-aliases.args index 248469a668..bcd901da90 100644 --- a/tests/qemuxml2argvdata/user-aliases.args +++ b/tests/qemuxml2argvdata/user-aliases.args @@ -55,9 +55,9 @@ QEMU_AUDIO_DRV=3Dnone \ -device rtl8139,netdev=3Dhostua-AndAlsoClientMode,id=3Dua-AndAlsoClientMod= e,mac=3D52:54:00:8c:b1:f8,bus=3Dpci.0,addr=3D0xa \ -device ccid-card-emulated,backend=3Dnss-emulated,id=3Dsmartcard0,bus=3Dua= -myCCID.0 \ -chardev pty,id=3Dcharserial0 \ --device isa-serial,chardev=3Dcharserial0,id=3Dserial0 \ +-device isa-serial,chardev=3Dcharserial0,id=3Dserial0,index=3D0 \ -chardev pty,id=3Dcharserial1 \ --device isa-serial,chardev=3Dcharserial1,id=3Dserial1 \ +-device isa-serial,chardev=3Dcharserial1,id=3Dserial1,index=3D1 \ -chardev socket,id=3Dcharchannel0,path=3D/var/lib/libvirt/qemu/channel/tar= get/gentoo.org.qemu.guest_agent.0,server=3Don,wait=3Doff \ -device virtserialport,bus=3Dvirtio-serial0.0,nr=3D1,chardev=3Dcharchannel= 0,id=3Dchannel0,name=3Dorg.qemu.guest_agent.0 \ -vnc 127.0.0.1:0 \ diff --git a/tests/qemuxml2argvdata/virtio-9p-createmode.x86_64-latest.args= b/tests/qemuxml2argvdata/virtio-9p-createmode.x86_64-latest.args index 697bb1e655..92e4c770e2 100644 --- a/tests/qemuxml2argvdata/virtio-9p-createmode.x86_64-latest.args +++ b/tests/qemuxml2argvdata/virtio-9p-createmode.x86_64-latest.args @@ -37,7 +37,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -fsdev local,security_model=3Dmapped,id=3Dfsdev-fs3,path=3D/export/fs3 \ -device virtio-9p-pci,id=3Dfs3,fsdev=3Dfsdev-fs3,mount_tag=3Dfs3,bus=3Dpci= .0,addr=3D0x5 \ -chardev pty,id=3Dcharserial0 \ --device isa-serial,chardev=3Dcharserial0,id=3Dserial0 \ +-device isa-serial,chardev=3Dcharserial0,id=3Dserial0,index=3D0 \ -audiodev '{"id":"audio1","driver":"none"}' \ -device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0xc \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ diff --git a/tests/qemuxml2argvdata/virtio-9p-multidevs.x86_64-latest.args = b/tests/qemuxml2argvdata/virtio-9p-multidevs.x86_64-latest.args index e52826f2c4..cd8948de04 100644 --- a/tests/qemuxml2argvdata/virtio-9p-multidevs.x86_64-latest.args +++ b/tests/qemuxml2argvdata/virtio-9p-multidevs.x86_64-latest.args @@ -35,7 +35,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -fsdev local,security_model=3Dmapped,multidevs=3Dwarn,id=3Dfsdev-fs2,path= =3D/export/fs2 \ -device virtio-9p-pci,id=3Dfs2,fsdev=3Dfsdev-fs2,mount_tag=3Dfs2,bus=3Dpci= .0,addr=3D0x4 \ -chardev pty,id=3Dcharserial0 \ --device isa-serial,chardev=3Dcharserial0,id=3Dserial0 \ +-device isa-serial,chardev=3Dcharserial0,id=3Dserial0,index=3D0 \ -audiodev '{"id":"audio1","driver":"none"}' \ -device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0xc \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ diff --git a/tests/qemuxml2argvdata/x86_64-pc-graphics.x86_64-latest.args b= /tests/qemuxml2argvdata/x86_64-pc-graphics.x86_64-latest.args index 313d1e684f..4b76dd1665 100644 --- a/tests/qemuxml2argvdata/x86_64-pc-graphics.x86_64-latest.args +++ b/tests/qemuxml2argvdata/x86_64-pc-graphics.x86_64-latest.args @@ -37,7 +37,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-guest/.config \ -netdev user,id=3Dhostnet0 \ -device virtio-net-pci,netdev=3Dhostnet0,id=3Dnet0,mac=3D52:54:00:4c:e3:86= ,bus=3Dpci.0,addr=3D0x3 \ -chardev pty,id=3Dcharserial0 \ --device isa-serial,chardev=3Dcharserial0,id=3Dserial0 \ +-device isa-serial,chardev=3Dcharserial0,id=3Dserial0,index=3D0 \ -chardev socket,id=3Dcharchannel0,fd=3D1729,server=3Don,wait=3Doff \ -device virtserialport,bus=3Dvirtio-serial0.0,nr=3D1,chardev=3Dcharchannel= 0,id=3Dchannel0,name=3Dorg.qemu.guest_agent.0 \ -device usb-tablet,id=3Dinput0,bus=3Dusb.0,port=3D1 \ diff --git a/tests/qemuxml2argvdata/x86_64-pc-headless.x86_64-latest.args b= /tests/qemuxml2argvdata/x86_64-pc-headless.x86_64-latest.args index 0ce0be2bc8..64559a1150 100644 --- a/tests/qemuxml2argvdata/x86_64-pc-headless.x86_64-latest.args +++ b/tests/qemuxml2argvdata/x86_64-pc-headless.x86_64-latest.args @@ -38,7 +38,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-guest/.config \ -netdev user,id=3Dhostnet0 \ -device virtio-net-pci,netdev=3Dhostnet0,id=3Dnet0,mac=3D52:54:00:09:a4:37= ,bus=3Dpci.0,addr=3D0x2 \ -chardev pty,id=3Dcharserial0 \ --device isa-serial,chardev=3Dcharserial0,id=3Dserial0 \ +-device isa-serial,chardev=3Dcharserial0,id=3Dserial0,index=3D0 \ -chardev socket,id=3Dcharchannel0,fd=3D1729,server=3Don,wait=3Doff \ -device virtserialport,bus=3Dvirtio-serial0.0,nr=3D1,chardev=3Dcharchannel= 0,id=3Dchannel0,name=3Dorg.qemu.guest_agent.0 \ -audiodev '{"id":"audio1","driver":"none"}' \ diff --git a/tests/qemuxml2argvdata/x86_64-q35-graphics.x86_64-latest.args = b/tests/qemuxml2argvdata/x86_64-q35-graphics.x86_64-latest.args index deab063476..f8f12ada5c 100644 --- a/tests/qemuxml2argvdata/x86_64-q35-graphics.x86_64-latest.args +++ b/tests/qemuxml2argvdata/x86_64-q35-graphics.x86_64-latest.args @@ -44,7 +44,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-guest/.config \ -netdev user,id=3Dhostnet0 \ -device virtio-net-pci,netdev=3Dhostnet0,id=3Dnet0,mac=3D52:54:00:d2:70:0b= ,bus=3Dpci.1,addr=3D0x0 \ -chardev pty,id=3Dcharserial0 \ --device isa-serial,chardev=3Dcharserial0,id=3Dserial0 \ +-device isa-serial,chardev=3Dcharserial0,id=3Dserial0,index=3D0 \ -chardev socket,id=3Dcharchannel0,fd=3D1729,server=3Don,wait=3Doff \ -device virtserialport,bus=3Dvirtio-serial0.0,nr=3D1,chardev=3Dcharchannel= 0,id=3Dchannel0,name=3Dorg.qemu.guest_agent.0 \ -device usb-tablet,id=3Dinput0,bus=3Dusb.0,port=3D1 \ diff --git a/tests/qemuxml2argvdata/x86_64-q35-headless.x86_64-latest.args = b/tests/qemuxml2argvdata/x86_64-q35-headless.x86_64-latest.args index f35385702a..7db2d691d6 100644 --- a/tests/qemuxml2argvdata/x86_64-q35-headless.x86_64-latest.args +++ b/tests/qemuxml2argvdata/x86_64-q35-headless.x86_64-latest.args @@ -45,7 +45,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-guest/.config \ -netdev user,id=3Dhostnet0 \ -device virtio-net-pci,netdev=3Dhostnet0,id=3Dnet0,mac=3D52:54:00:09:a4:37= ,bus=3Dpci.1,addr=3D0x0 \ -chardev pty,id=3Dcharserial0 \ --device isa-serial,chardev=3Dcharserial0,id=3Dserial0 \ +-device isa-serial,chardev=3Dcharserial0,id=3Dserial0,index=3D0 \ -chardev socket,id=3Dcharchannel0,fd=3D1729,server=3Don,wait=3Doff \ -device virtserialport,bus=3Dvirtio-serial0.0,nr=3D1,chardev=3Dcharchannel= 0,id=3Dchannel0,name=3Dorg.qemu.guest_agent.0 \ -audiodev '{"id":"audio1","driver":"none"}' \ --=20 2.25.1