From nobody Thu May 2 11:24:31 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 1639281580442321.1994828929853; Sat, 11 Dec 2021 19:59:40 -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-40-NSAmvZcHOaKutkIFPQvl4A-1; Sat, 11 Dec 2021 22:59:35 -0500 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id D523A8042E1; Sun, 12 Dec 2021 03:59:30 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id E3C2460C9F; Sun, 12 Dec 2021 03:59:29 +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 841971809CB8; Sun, 12 Dec 2021 03:59:29 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 1BC3xSDl024074 for ; Sat, 11 Dec 2021 22:59:28 -0500 Received: by smtp.corp.redhat.com (Postfix) id 44FDC2026D2F; Sun, 12 Dec 2021 03:59:28 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast06.extmail.prod.ext.rdu2.redhat.com [10.11.55.22]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 3E9912026D46 for ; Sun, 12 Dec 2021 03:59:25 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [207.211.31.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 39E70181E089 for ; Sun, 12 Dec 2021 03:59:25 +0000 (UTC) Received: from mx0a-002c1b01.pphosted.com (mx0a-002c1b01.pphosted.com [148.163.151.68]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-477-8EAV4lHGP8ujS-1HbYDQUQ-1; Sat, 11 Dec 2021 22:59:21 -0500 Received: from pps.filterd (m0127837.ppops.net [127.0.0.1]) by mx0a-002c1b01.pphosted.com (8.16.1.2/8.16.1.2) with ESMTP id 1BC2UcJC016880; Sat, 11 Dec 2021 19:59:19 -0800 Received: from nam10-bn7-obe.outbound.protection.outlook.com (mail-bn7nam10lp2104.outbound.protection.outlook.com [104.47.70.104]) by mx0a-002c1b01.pphosted.com (PPS) with ESMTPS id 3cvrsb92tm-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Sat, 11 Dec 2021 19:59:19 -0800 Received: from SJ0PR02MB7775.namprd02.prod.outlook.com (2603:10b6:a03:326::12) by BY5PR02MB6740.namprd02.prod.outlook.com (2603:10b6:a03:202::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4778.11; Sun, 12 Dec 2021 03:59:16 +0000 Received: from SJ0PR02MB7775.namprd02.prod.outlook.com ([fe80::f957:252f:f948:17b5]) by SJ0PR02MB7775.namprd02.prod.outlook.com ([fe80::f957:252f:f948:17b5%7]) with mapi id 15.20.4755.026; Sun, 12 Dec 2021 03:59:16 +0000 Received: from asdfghjkdfghjklz.asdfghjzasdfgh.jklzasdfghjklzasd.fghjklzasdf.mm.eng.nutanix.com (192.146.154.241) by BY5PR20CA0011.namprd20.prod.outlook.com (2603:10b6:a03:1f4::24) with Microsoft SMTP Server (version=TLS1_2, cipher=) via Frontend Transport; Sun, 12 Dec 2021 03:59:15 +0000 X-MC-Unique: NSAmvZcHOaKutkIFPQvl4A-1 X-MC-Unique: 8EAV4lHGP8ujS-1HbYDQUQ-1 From: =?UTF-8?q?=E2=80=9CDivya?= To: libvir-list@redhat.com Subject: [RFC v2 1/1] qemu: add index for isa-serial device using target.port Date: Sat, 11 Dec 2021 19:57:47 -0800 Message-Id: <20211212035746.282546-2-divya.garg@nutanix.com> In-Reply-To: <20211212035746.282546-1-divya.garg@nutanix.com> References: <20211212035746.282546-1-divya.garg@nutanix.com> X-ClientProxiedBy: BY5PR20CA0011.namprd20.prod.outlook.com (2603:10b6:a03:1f4::24) 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: ffb80f12-5ce6-4053-8100-08d9bd23c407 X-MS-TrafficTypeDiagnostic: BY5PR02MB6740:EE_ X-Microsoft-Antispam-PRVS: x-proofpoint-crosstenant: true X-MS-Oob-TLC-OOBClassifiers: OLM:1360 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0 X-Microsoft-Antispam-Message-Info: O52yTV1TpSfqNNGWK6yOUyhE665/Z2u2o7Vczz+yr10BC5MdM6FuK6S9Lwq8wdb4uwL7VX7/X2ZU/Jm7YDvxJmSx2wc4cyUZ4MtdgGbXKy7M7kNv0K+aaP5vD3L8lSIYd077RnOLchSmHVKDYHUQyrL3wavaCn97fPwsskLWhzvUw2q1qXaJip6lF9ZINibfqACfahbpd0TOeVkIPR0ELmu2yf5CWI6lIAYPvtV6n8cOS3O3vtqCykn6xaRKBF3njqwZrYugDXmhmZvuCYFbMnaaaR94G7SYInK3FIWShsTnKFfzVE75swW+dYgMiOsbkDVsnERQa4uPGxkvb/CpkcC+XK/zKqcOOGm4y5ytPOlc0CuyDdHAT7+0rk1fBjaROljVmzkFUeB+TiUt9gC2jR/Akd5MPn1PLcI4NQBfScBlwBFHEJ3xKxortNbYqHh7ZOFgPvWaJyAJbcFyQl88DFvdAIm7R8FAGea7hl89nK4I6tTPdKm6YsP41JP4IVZAMXRFs4rcg3OsiGhquh/hoKP09aIaKcRAZCn2tZwb6wo2xF2/zdeI6ZtW/uYVqOZe9S/b9JkbNCSC7oeOVVoMWTIVZ48hhHzpAGFgpM+VYbskvlP+dH1nfLfZI/nSxDOPZMqzCduCRoorLjg0LuKS5XSsOW6OuNRguniXqIZKkan0epyTP8qz1c/LO7bVYwUQcVwhlHAb/pDS+24JV8KELw== 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)(26005)(6916009)(2906002)(4326008)(83380400001)(38100700002)(450100002)(38350700002)(186003)(107886003)(5660300002)(52116002)(7696005)(508600001)(6666004)(66476007)(8676002)(6486002)(1076003)(66556008)(30864003)(86362001)(36756003)(2616005)(956004)(66946007)(8936002)(316002)(579004); DIR:OUT; SFP:1102 X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?XhOboEB68tTJz6MQZvW0QdhyrgaXMQHPmoKwiI4kaYirBCBjCC8YCSGAWfFy?= =?us-ascii?Q?FjAVhRYcAMyQrSkEQz12BVbRdIOrPVuw/fM4FTcUJg6sR9Odbn7ul5ZMDA/4?= =?us-ascii?Q?7w0T71mYLz2Iz8BDTTN5K6MI8yqCYTl9hvqX2aCzNwq9PaThBqsl8XIt7AkF?= =?us-ascii?Q?DpLUJn4gio8lDDA+Og71HHZDtK2wz1NMO2/M3516ofKjjgkNvWsTIKD8gLPG?= =?us-ascii?Q?yESVI2aESzZY7wU55Axh2zv7vD1q15JkyZrsPnWRBda5RqSw9wZqwctfD3vC?= =?us-ascii?Q?A7rnC1xaEMh/F23fENY8gYTb8NEUYR0DrFtFNMmHH6vXdVS3Okfg7LB9noG9?= =?us-ascii?Q?fkHdmYgvkLzbnq5P8S4/U4bWApoW4pS1KXNpd0CA+J9okYtDZgWcrbOMbvYV?= =?us-ascii?Q?jRd8DnOBsbroJI7MsWBDVZkv7aKAoX3XAmZ1uhZDy+/Y6oDXWiEVlYvqNJZq?= =?us-ascii?Q?Tj+5Rn7wntOnyVXwolSmoYrJ0+CMQR5W80q994H5zREK9CFEkOgZoN1KfXM5?= =?us-ascii?Q?mlqX2sLXNLdp+6Fb7yr6me53LvZVZ62Zf5CGzAH57VQ2x3a5lw0wmK4rTNgD?= =?us-ascii?Q?NIT7sn5JNQvZsP51xUd807Ow2jrMPwhn8SqXQgUy60CrEinGfaaTAnVhiPn6?= =?us-ascii?Q?Vj+3a8onoEzUyUMJdcG4RODcRBLAPLvT957Pa5RccXVRF+bfooLNhfo6fAXx?= =?us-ascii?Q?mzvSUY4/6j+28HPho2EGRHwk3l88oJO7MXXbz7OdLTeb5Paemhr/nqSh37Zr?= =?us-ascii?Q?iqjYVvvlcjB/rMerzfiRhPFrXLOML0jGTMmB2IIiFozXS7JdbVSEukmozUFk?= =?us-ascii?Q?7MhNIzOeen3DwO5zlX3hCkV7/pYsmA5adZB5bWNczoVhlp9XctDOqZ6exC26?= =?us-ascii?Q?CqQiDdL0nVGd1iJqY9D1IParWqIi2ACiO/wmzLSKUH/N+KOO4jULGWfAGQP1?= =?us-ascii?Q?wC0MgLcvl8YRsaAzg04GD0WPj4KbLMc5QToUHfHPklPGqO04OpIQt+F4RrCz?= =?us-ascii?Q?xW37scaoOH9Wax2xQcMWHAcRjqnpDnHPkHpV7613ylLaNzkzZdKAZVE4wR8m?= =?us-ascii?Q?v0yD7eRI6vl7Gpcod3eygCBu6Nqf/U3hE+tiHL3xKroE3Xo8+uwrY5rKk8dM?= =?us-ascii?Q?lRYWWi23626J8kkZKN6yZJI4YNSLfgQCyP2/XFionfZYbBnSIkveDVFvABXQ?= =?us-ascii?Q?ysPt44pCs2vnDOP+eHYP2oIhYNbxiZCb7xiPGJqcQJYS/Ro0wp3dUKMtmdTU?= =?us-ascii?Q?Sv1ZHETjODYLwvZ/XxXMls1CDA0Wc2Sv5NotdaEwv2KoCVVloAYwS7D2d3rC?= =?us-ascii?Q?hsQ5gnf6Kny62YpX1HihFKpwrTuTOhNH0hX1Nz6VrmOYlJM5NrCaktCbomkC?= =?us-ascii?Q?rUlrfizx+8ADdhvSwm1Grhz9XJ7nGhysAwdC7JhfCBqwwb4qqgHR6fznsrTG?= =?us-ascii?Q?pLsmDjz93frlpU3Hc6TgA9wINoas0wFay313Pbtoa7ezXSPMq3kKbRWkoi6n?= =?us-ascii?Q?A4y5l60DnKp47DsYYSdrEbtWPtz4wTwaTsRLoX0ULeCu8F0d31RDaQlV+5Dy?= =?us-ascii?Q?068CJ7nfvAR19qmpojI5AuZF3nFmDKNudK0iCQE06iacwt98yEny+F1t+0sH?= =?us-ascii?Q?5qCJ65hQjoN3L6/ve+v3fZg=3D?= X-OriginatorOrg: nutanix.com X-MS-Exchange-CrossTenant-Network-Message-Id: ffb80f12-5ce6-4053-8100-08d9bd23c407 X-MS-Exchange-CrossTenant-AuthSource: SJ0PR02MB7775.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Dec 2021 03:59:16.1842 (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: dOGTyJ5AL5kEDH0ACNJXsiAEl9L0mhCovlrA06snDAUZLsZoe//Ho6szgoqEfgfCH1Ikrl7LvkHM+8JkJhbIyQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY5PR02MB6740 X-Proofpoint-ORIG-GUID: 2vlyzLBNGFNeZB_aqk0RBgGhDefZOPxM X-Proofpoint-GUID: 2vlyzLBNGFNeZB_aqk0RBgGhDefZOPxM 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=2021-12-12_01,2021-12-10_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.4 X-loop: libvir-list@redhat.com Cc: Divya Garg , pkrempa@redhat.com, prerna.saxena@nutanix.com X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZM-MESSAGEID: 1639281580981100001 Content-Type: text/plain; charset="utf-8" From: Divya Garg VM XML accepts target.port but this does not get passed while building the = qemu command line for this VM. This patch fixes this bug. In addition, this introduces additional checks in the port allocation logic for isa-serial devices to : * Check availability of requested ports * Prevent duplicate device assignments to the same port. * In case no ports are provided in the XML, this patch scans the list of un= used isa-serial indices to automatically assign available ports for this VM. Signed-off-by: Divya Garg --- src/conf/domain_conf.c | 66 ++++++++++++++++--- src/conf/domain_conf.h | 1 + src/qemu/qemu_command.c | 21 ++++-- ...g-console-compat-2-live+console-virtio.xml | 4 +- .../qemuhotplug-console-compat-2-live.xml | 4 +- tests/qemuxml2argvdata/bios.args | 2 +- .../qemuxml2argvdata/console-compat-auto.args | 2 +- .../console-compat-chardev.args | 2 +- tests/qemuxml2argvdata/console-compat.args | 2 +- .../qemuxml2argvdata/console-virtio-many.args | 2 +- tests/qemuxml2argvdata/controller-order.args | 2 +- .../name-escape.x86_64-2.11.0.args | 4 +- .../q35-virt-manager-basic.args | 2 +- .../serial-dev-chardev-iobase.args | 2 +- .../qemuxml2argvdata/serial-dev-chardev.args | 2 +- .../qemuxml2argvdata/serial-file-chardev.args | 2 +- tests/qemuxml2argvdata/serial-file-log.args | 2 +- .../qemuxml2argvdata/serial-many-chardev.args | 4 +- .../qemuxml2argvdata/serial-pty-chardev.args | 2 +- tests/qemuxml2argvdata/serial-spiceport.args | 2 +- .../qemuxml2argvdata/serial-tcp-chardev.args | 2 +- .../serial-tcp-telnet-chardev.args | 2 +- .../serial-tcp-tlsx509-chardev-notls.args | 4 +- .../serial-tcp-tlsx509-chardev-notls.xml | 2 +- .../serial-tcp-tlsx509-chardev-verify.args | 4 +- .../serial-tcp-tlsx509-chardev-verify.xml | 2 +- .../serial-tcp-tlsx509-chardev.args | 4 +- .../serial-tcp-tlsx509-chardev.xml | 2 +- .../serial-tcp-tlsx509-secret-chardev.args | 4 +- .../serial-tcp-tlsx509-secret-chardev.xml | 2 +- .../qemuxml2argvdata/serial-udp-chardev.args | 4 +- .../qemuxml2argvdata/serial-unix-chardev.args | 4 +- .../serial-unix-chardev.x86_64-latest.args | 4 +- tests/qemuxml2argvdata/serial-vc-chardev.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 +- .../serial-tcp-tlsx509-chardev.xml | 2 +- 42 files changed, 126 insertions(+), 64 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 107d2a4f5d..e8b19828d4 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -5319,6 +5319,61 @@ virDomainHostdevDefPostParse(virDomainHostdevDef *de= v, } =20 =20 +static int +virDomainChrIsaSerialDefPostParse(virDomainDef *def) +{ + size_t i, j; + size_t isa_serial_count =3D 0; + int isa_device_index_arr[VIR_MAX_AVAILABLE_ISA_SERIAL_PORTS] =3D {0}; + bool used_serial_port[VIR_MAX_AVAILABLE_ISA_SERIAL_PORTS] =3D {false}; + + for (i =3D 0; i < def->nserials; i++) { + if (def->serials[i]->targetType =3D=3D + VIR_DOMAIN_CHR_SERIAL_TARGET_MODEL_ISA_SERIAL) { + if (isa_serial_count >=3D VIR_MAX_AVAILABLE_ISA_SERIAL_PORTS) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Maximum supported number of ISA serial p= orts is %d."), VIR_MAX_AVAILABLE_ISA_SERIAL_PORTS); + return -1; + } + isa_device_index_arr[isa_serial_count++] =3D i; + } + /* Check for the user defined ports and mark them used if in the r= ange + * of isa-serial ports, .i.e, from 0 to + * VIR_MAX_AVAILABLE_ISA_SERIAL_PORTS. + */ + if (def->serials[i]->target.port !=3D -1 && + def->serials[i]->target.port < VIR_MAX_AVAILABLE_ISA_SERIAL_PO= RTS) { + 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 < isa_serial_count; i++) { + int isa_index =3D isa_device_index_arr[i]; + if (def->serials[isa_index]->target.port !=3D -1) + continue; + for (j =3D 0; j < VIR_MAX_AVAILABLE_ISA_SERIAL_PORTS; j++) { + if (!used_serial_port[j]) { + def->serials[isa_index]->target.port =3D j; + used_serial_port[j] =3D true; + break; + } + } + if (def->serials[isa_index]->target.port =3D=3D -1) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("out of ports for isa-serial device.")); + return -1; + } + } + return 0; +} + static void virDomainChrDefPostParse(virDomainChrDef *chr, const virDomainDef *def) @@ -6186,6 +6241,9 @@ virDomainDefPostParse(virDomainDef *def, goto cleanup; } =20 + if (virDomainChrIsaSerialDefPostParse(def) < 0) + return -1; + /* iterate the devices */ ret =3D virDomainDeviceInfoIterateFlags(def, virDomainDefPostParseDeviceItera= tor, @@ -19857,14 +19915,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 c0c07ea6ba..be162e592c 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -1179,6 +1179,7 @@ typedef enum { VIR_DOMAIN_CHR_CONSOLE_TARGET_TYPE_LAST } virDomainChrConsoleTargetType; =20 +#define VIR_MAX_AVAILABLE_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/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index c47998aabd..797cdfb955 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -10953,11 +10953,22 @@ 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) + if (serial->targetModel =3D=3D VIR_DOMAIN_CHR_SERIAL_TARGET_MODEL_ISA_= SERIAL) { + if (virJSONValueObjectAdd(&props, + "s:driver", + virDomainChrSerialTargetModelTypeToS= tring(serial->targetModel), + "s:chardev", chardev, + "s:id", serial->info.alias, + "k:index", serial->target.port, + NULL) < 0) + return NULL; + } + else if (virJSONValueObjectAdd(&props, + "s:driver", + virDomainChrSerialTargetModelTypeToStri= ng(serial->targetModel), + "s:chardev", chardev, + "s:id", serial->info.alias, + NULL) < 0) return NULL; =20 if (qemuBuildDeviceAddressProps(props, def, &serial->info) < 0) 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 5d688e7748..295d75b768 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 b916f30412..850ebddf52 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/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 5285d0749a..9c459b641b 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-chardev.args b/tests/qem= uxml2argvdata/console-compat-chardev.args index 5285d0749a..9c459b641b 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.args b/tests/qemuxml2arg= vdata/console-compat.args index 9f37788586..709a82faad 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-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 1ce91ff354..a57adedfa5 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/q35-virt-manager-basic.args b/tests/qem= uxml2argvdata/q35-virt-manager-basic.args index 6e84c9ca2a..a33a74e355 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 dfa6785795..1f358b6469 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.args b/tests/qemuxml= 2argvdata/serial-dev-chardev.args index c325f21e0c..47da5b8454 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-file-chardev.args b/tests/qemuxm= l2argvdata/serial-file-chardev.args index 4cbd0edf1c..5b8f3be45a 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-log.args b/tests/qemuxml2ar= gvdata/serial-file-log.args index c4c6106200..9ee066ef49 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-many-chardev.args b/tests/qemuxm= l2argvdata/serial-many-chardev.args index 2c548c9e4b..da0d0b21c3 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-pty-chardev.args b/tests/qemuxml= 2argvdata/serial-pty-chardev.args index 5285d0749a..9c459b641b 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-spiceport.args b/tests/qemuxml2a= rgvdata/serial-spiceport.args index 43e65a0679..704e6d1820 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-tcp-chardev.args b/tests/qemuxml= 2argvdata/serial-tcp-chardev.args index aec7093d03..263add4409 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-telnet-chardev.args b/tests/= qemuxml2argvdata/serial-tcp-telnet-chardev.args index 72f81d7938..13e092c4c7 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-tlsx509-chardev-notls.args b= /tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev-notls.args index 7db40862e9..8bf070d820 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.xml b/= tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev-notls.xml index 9b0b8b3e73..522f0184d3 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.args = b/tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev-verify.args index f3dc5f5019..374d24ec00 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.xml b= /tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev-verify.xml index 75c6c7f5f4..d41f5ee03e 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.args b/tests= /qemuxml2argvdata/serial-tcp-tlsx509-chardev.args index f3dc5f5019..374d24ec00 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.xml b/tests/= qemuxml2argvdata/serial-tcp-tlsx509-chardev.xml index 75c6c7f5f4..d41f5ee03e 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.args = b/tests/qemuxml2argvdata/serial-tcp-tlsx509-secret-chardev.args index 151629458b..2defeb28da 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.xml b= /tests/qemuxml2argvdata/serial-tcp-tlsx509-secret-chardev.xml index 670f282b84..2bf954bc9f 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/qemuxml2argvdata/serial-udp-chardev.args b/tests/qemuxml= 2argvdata/serial-udp-chardev.args index 9d2f2e03e9..de6621f0e2 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-unix-chardev.args b/tests/qemuxm= l2argvdata/serial-unix-chardev.args index 19731b02b2..1e2444f824 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 1e3d5772b4..1387fc9a1d 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 '{"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"}' \ +-device '{"driver":"isa-serial","chardev":"charserial0","id":"serial0","in= dex":0}' \ -chardev socket,id=3Dcharserial1,fd=3D1729,server=3Don,wait=3Doff \ --device '{"driver":"isa-serial","chardev":"charserial1","id":"serial1"}' \ +-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"}' \ -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 d28a3eee47..09b33a15ee 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/user-aliases.args b/tests/qemuxml2argvd= ata/user-aliases.args index 486473a566..8608144b5e 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 01fe01e3c6..d306b37b53 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 '{"driver":"virtio-9p-pci","id":"fs3","fsdev":"fsdev-fs3","mount_t= ag":"fs3","bus":"pci.0","addr":"0x5"}' \ -chardev pty,id=3Dcharserial0 \ --device '{"driver":"isa-serial","chardev":"charserial0","id":"serial0"}' \ +-device '{"driver":"isa-serial","chardev":"charserial0","id":"serial0","in= dex":0}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0xc"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ diff --git a/tests/qemuxml2argvdata/virtio-9p-multidevs.x86_64-latest.args = b/tests/qemuxml2argvdata/virtio-9p-multidevs.x86_64-latest.args index 8b325bb7ec..0752f09fe9 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 '{"driver":"virtio-9p-pci","id":"fs2","fsdev":"fsdev-fs2","mount_t= ag":"fs2","bus":"pci.0","addr":"0x4"}' \ -chardev pty,id=3Dcharserial0 \ --device '{"driver":"isa-serial","chardev":"charserial0","id":"serial0"}' \ +-device '{"driver":"isa-serial","chardev":"charserial0","id":"serial0","in= dex":0}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0xc"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ 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 3cae9fafa0..8cad1d9f38 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 '{"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"}' \ +-device '{"driver":"isa-serial","chardev":"charserial0","id":"serial0","in= dex":0}' \ -chardev socket,id=3Dcharchannel0,fd=3D1729,server=3Don,wait=3Doff \ -device '{"driver":"virtserialport","bus":"virtio-serial0.0","nr":1,"chard= ev":"charchannel0","id":"channel0","name":"org.qemu.guest_agent.0"}' \ -device '{"driver":"usb-tablet","id":"input0","bus":"usb.0","port":"1"}' \ 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 fbfb823d83..3c4688a89e 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 '{"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"}' \ +-device '{"driver":"isa-serial","chardev":"charserial0","id":"serial0","in= dex":0}' \ -chardev socket,id=3Dcharchannel0,fd=3D1729,server=3Don,wait=3Doff \ -device '{"driver":"virtserialport","bus":"virtio-serial0.0","nr":1,"chard= ev":"charchannel0","id":"channel0","name":"org.qemu.guest_agent.0"}' \ -audiodev '{"id":"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 ca0e00f468..9e4c361ec9 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 '{"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"}' \ +-device '{"driver":"isa-serial","chardev":"charserial0","id":"serial0","in= dex":0}' \ -chardev socket,id=3Dcharchannel0,fd=3D1729,server=3Don,wait=3Doff \ -device '{"driver":"virtserialport","bus":"virtio-serial0.0","nr":1,"chard= ev":"charchannel0","id":"channel0","name":"org.qemu.guest_agent.0"}' \ -device '{"driver":"usb-tablet","id":"input0","bus":"usb.0","port":"1"}' \ 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 c6970e349d..b4d90dff5e 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 '{"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"}' \ +-device '{"driver":"isa-serial","chardev":"charserial0","id":"serial0","in= dex":0}' \ -chardev socket,id=3Dcharchannel0,fd=3D1729,server=3Don,wait=3Doff \ -device '{"driver":"virtserialport","bus":"virtio-serial0.0","nr":1,"chard= ev":"charchannel0","id":"channel0","name":"org.qemu.guest_agent.0"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ diff --git a/tests/qemuxml2xmloutdata/serial-tcp-tlsx509-chardev.xml b/test= s/qemuxml2xmloutdata/serial-tcp-tlsx509-chardev.xml index 7fde19f283..de11465233 100644 --- a/tests/qemuxml2xmloutdata/serial-tcp-tlsx509-chardev.xml +++ b/tests/qemuxml2xmloutdata/serial-tcp-tlsx509-chardev.xml @@ -37,7 +37,7 @@ - + --=20 2.27.0