From nobody Mon Jan 20 22:01:15 2025 Delivered-To: importer@patchew.org Received-SPF: none (zohomail.com: 8.43.85.245 is neither permitted nor denied by domain of lists.libvirt.org) client-ip=8.43.85.245; envelope-from=devel-bounces@lists.libvirt.org; helo=lists.libvirt.org; Authentication-Results: mx.zohomail.com; spf=none (zohomail.com: 8.43.85.245 is neither permitted nor denied by domain of lists.libvirt.org) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 1705076904094973.0686287992346; Fri, 12 Jan 2024 08:28:24 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 996) id 0C4371D5A; Fri, 12 Jan 2024 11:28:23 -0500 (EST) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id B6A191A83; Fri, 12 Jan 2024 11:07:01 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 996) id 8019B1D4C; Fri, 12 Jan 2024 11:06:40 -0500 (EST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id E0F0C1D5A for ; Fri, 12 Jan 2024 11:05:57 -0500 (EST) Received: from mimecast-mx02.redhat.com (mx-ext.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-65-3FzxHJ72OmKBqFCszjwy5g-1; Fri, 12 Jan 2024 11:05:55 -0500 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 99A3A381D4C7 for ; Fri, 12 Jan 2024 16:05:55 +0000 (UTC) Received: from speedmetal.lan (unknown [10.45.242.9]) by smtp.corp.redhat.com (Postfix) with ESMTP id 12BF63C25 for ; Fri, 12 Jan 2024 16:05:54 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=-0.8 required=5.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H4, RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.4 X-MC-Unique: 3FzxHJ72OmKBqFCszjwy5g-1 From: Peter Krempa To: devel@lists.libvirt.org Subject: [PATCH 6/7] virDomainDefAddConsoleCompat: Fix numbering of console targets after modification Date: Fri, 12 Jan 2024 17:05:46 +0100 Message-ID: <0b6c0cd83bd890d21b4c60ac2bc5db827272a9c2.1705075252.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.1 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Message-ID-Hash: 6RA7HOKMP6ZKUQ5VAA2Z6DOC3VG6BHCN X-Message-ID-Hash: 6RA7HOKMP6ZKUQ5VAA2Z6DOC3VG6BHCN X-MailFrom: pkrempa@redhat.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-config-1; header-match-config-2; header-match-config-3; header-match-devel.lists.libvirt.org-0; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; suspicious-header X-Mailman-Version: 3.2.2 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: List-Post: List-Subscribe: List-Unsubscribe: Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZM-MESSAGEID: 1705076905976100001 The XML parser for consoles sets the 'port=3D' attribute of ' --- src/conf/domain_conf.c | 15 +++++++++++++++ .../console-compat2.x86_64-latest.xml | 2 +- 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 2283688ba0..5197953c7f 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -4957,6 +4957,7 @@ virDomainDefHasDeviceAddress(virDomainDef *def, static int virDomainDefAddConsoleCompat(virDomainDef *def) { + bool renumber_consoles =3D false; size_t i; /* @@ -5023,6 +5024,8 @@ virDomainDefAddConsoleCompat(virDomainDef *def) /* Create an console alias for the serial port */ def->consoles[0]->deviceType =3D VIR_DOMAIN_CHR_DEVICE_TYPE_CO= NSOLE; def->consoles[0]->targetType =3D VIR_DOMAIN_CHR_CONSOLE_TARGET= _TYPE_SERIAL; + + renumber_consoles =3D true; } } else if (def->os.type =3D=3D VIR_DOMAIN_OSTYPE_HVM && def->nserials = > 0 && def->serials[0]->deviceType =3D=3D VIR_DOMAIN_CHR_DEVICE_TY= PE_SERIAL) { @@ -5050,6 +5053,8 @@ virDomainDefAddConsoleCompat(virDomainDef *def) return -1; } + renumber_consoles =3D true; + def->consoles[0]->deviceType =3D VIR_DOMAIN_CHR_DEVICE_TYPE_CO= NSOLE; def->consoles[0]->targetType =3D VIR_DOMAIN_CHR_CONSOLE_TARGET= _TYPE_SERIAL; @@ -5065,6 +5070,16 @@ virDomainDefAddConsoleCompat(virDomainDef *def) } } + /* When consoles are parsed in 'virDomainDefParseXML' the value of + * 'target.port' is overriden by the index of the console in the + * 'def->consoles' array. Thus if we are modifying the list here we + * must ensure that the numbering will be identical as if we've parsed + * this definition */ + if (renumber_consoles) { + for (i =3D 0; i < def->nconsoles; i++) + def->consoles[i]->target.port =3D i; + } + return 0; } diff --git a/tests/qemuxml2xmloutdata/console-compat2.x86_64-latest.xml b/t= ests/qemuxml2xmloutdata/console-compat2.x86_64-latest.xml index 81bbb554d0..fd29155eae 100644 --- a/tests/qemuxml2xmloutdata/console-compat2.x86_64-latest.xml +++ b/tests/qemuxml2xmloutdata/console-compat2.x86_64-latest.xml @@ -42,7 +42,7 @@ - + --=20 2.43.0 _______________________________________________ Devel mailing list -- devel@lists.libvirt.org To unsubscribe send an email to devel-leave@lists.libvirt.org