From nobody Sat Nov 23 04:58:28 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1682065528; cv=none; d=zohomail.com; s=zohoarc; b=SEXwsX9jxLgmThQTFBbhHcYbR5UCYGeLooHRZbk4rnW9Osipm2rH4OIwT1OecOZO5455bQG6aSAuoLVGFVuK36aWy6EXT8oks8qZQVDMFhUG/s8Usz8FJuB70HaSI7mI/QK6k8Kcr1W+ZYBU+UuvRWU8Zy43BIy0yI67aruSKj8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1682065528; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=D1wLP8hL1DP5DKsEvIk4N0Fcyk0WTROvKw9JyeFQPMU=; b=V8AFUk93k6KsOMZObnKLYfq7j/2bONXYBcvuBm+kPgnZxpGTar1a8QQKqo+OLTdIxXJh09y60Lq3nQ5wD+64csi/udyv1cRFinrI1Gmqz2OxV8ADuXB8NmbTbmreDuklVhfbx58cASe1om6TkdqoLy9oXsI0I4Ra8UjaZkWNwHY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mx.zohomail.com with SMTPS id 168206552851219.939847295082927; Fri, 21 Apr 2023 01:25:28 -0700 (PDT) Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-626-SV43hB47P02SduaOYDsykQ-1; Fri, 21 Apr 2023 04:25:23 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.rdu2.redhat.com [10.11.54.8]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 4A0D83815F8A; Fri, 21 Apr 2023 08:25:20 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (unknown [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 37F2DC164E7; Fri, 21 Apr 2023 08:25:20 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 198491946A40; Fri, 21 Apr 2023 08:25:20 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id AB3B41946A5A for ; Fri, 21 Apr 2023 08:25:17 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id A0E6263ABA; Fri, 21 Apr 2023 08:25:17 +0000 (UTC) Received: from localhost.localdomain (unknown [10.43.2.39]) by smtp.corp.redhat.com (Postfix) with ESMTP id 471BF63A51 for ; Fri, 21 Apr 2023 08:25:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1682065527; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=D1wLP8hL1DP5DKsEvIk4N0Fcyk0WTROvKw9JyeFQPMU=; b=aWgwlgk38Y7TjTjX2ZkpvyJDA2koCImi8E/EtfGhHbE+5E32PW00YMKDE800zh2fCH60Nh zMsEsr7SJ3I3ssVA49mRCIgZKI7I9cX3M0NbMUpAdhrKjbPJlhGv+Sz7Je348R5t0IZH9Y Ii1Hh8+C7/qzucxpVBv5/CcHkhKhlNY= X-MC-Unique: SV43hB47P02SduaOYDsykQ-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Michal Privoznik To: libvir-list@redhat.com Subject: [PATCH 09/11] qemuhotplugtest: Don't overwrite vm->def->id in testQemuHotplugCheckResult() Date: Fri, 21 Apr 2023 10:25:08 +0200 Message-Id: <4389d4a2911542ae79eb7ca1ab63bd8bdfc68729.1682065352.git.mprivozn@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.5 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 3.1 on 10.11.54.8 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1682065530204100003 Content-Type: text/plain; charset="utf-8"; x-default="true" This is a leftover from v2.0.0-rc1~300. In v1.2.12-rc1~43 we've introduced a code that explicitly sets vm->def->id to -1 to force generation of inactive XML. But this was removed in the later commit, which forgot to remove the restoration of the original dom ID. Signed-off-by: Michal Privoznik Reviewed-by: Kristina Hanicova --- tests/qemuhotplugtest.c | 1 - 1 file changed, 1 deletion(-) diff --git a/tests/qemuhotplugtest.c b/tests/qemuhotplugtest.c index 9a1cf8ab2f..d5ceb1373b 100644 --- a/tests/qemuhotplugtest.c +++ b/tests/qemuhotplugtest.c @@ -122,7 +122,6 @@ testQemuHotplugCheckResult(virDomainObj *vm, VIR_DOMAIN_DEF_FORMAT_SECURE); if (!actual) return -1; - vm->def->id =3D QEMU_HOTPLUG_TEST_DOMAIN_ID; =20 if (STREQ(expected, actual)) { if (fail) --=20 2.39.2