From nobody Mon Feb 9 10:49:25 2026 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=1637253281; cv=none; d=zohomail.com; s=zohoarc; b=BZ2ohtoH/TgOAyjUqZSH58eEoi8nDv76DLiew/W06v1kFdDj2poZutkOEuHNAAG/+m9lnJ9iEdbh1lbcJLCmEV5KjX7P/fXS+FgtVlCtLoBpFzQSljiHan12ckwzkiIXZfrr/0IDuwR3dnA6XG6041LOhYBno89vQNnmhvzJ3X0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1637253281; 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=H8kwUuePDfF40T0Fofo6imv6lYW20Y88az6BlCa2Ocs=; b=AW4F3YcFd95xUOSJJ01Qm1CYQERU5+wd1tTEszBMB41QdIFNr47DXkXJbNSBgyREhIZ9lzaQO55RjeHn0Q9TiZUAqxTUliCuPw7clXWWZemnhFD913f6MAzNw5+ujX9bC4IzApI8Gn7cATHjVIbt5Ds+ahLeU8v+hFuMo5ypK9g= 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 1637253281487143.9650668969416; Thu, 18 Nov 2021 08:34:41 -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-420-V42zecKINDiMKMiG6ZORtQ-1; Thu, 18 Nov 2021 11:34:38 -0500 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id ADD05804147; Thu, 18 Nov 2021 16:34:32 +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 8F7B65F4ED; Thu, 18 Nov 2021 16:34:32 +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 59DC94EA45; Thu, 18 Nov 2021 16:34:32 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 1AIGYE4k028287 for ; Thu, 18 Nov 2021 11:34:14 -0500 Received: by smtp.corp.redhat.com (Postfix) id 2A26B5BB12; Thu, 18 Nov 2021 16:34:14 +0000 (UTC) Received: from speedmetal.lan (unknown [10.40.208.20]) by smtp.corp.redhat.com (Postfix) with ESMTP id 76F0E5BAFF for ; Thu, 18 Nov 2021 16:34:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1637253280; 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=H8kwUuePDfF40T0Fofo6imv6lYW20Y88az6BlCa2Ocs=; b=ZdUBCnnacbVhfdNMTKMHZAXwFa+QMgUwzv/aqAn/iMzAKR6Hkq4/bDgAMyT2mS4nB/w9qK iuFBLI21zbDzOtvepqE7nMQJnpQ07hICpJWWRjG8LmSFv/YN+x0p85eKtQYc9/PuUS6WEw qwXFCCFoVhn2IU19D19EaItR4SuplkQ= X-MC-Unique: V42zecKINDiMKMiG6ZORtQ-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 16/16] qemuxml2argvtest: Fix type for faked chardev backing a TPM Date: Thu, 18 Nov 2021 17:33:41 +0100 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-loop: libvir-list@redhat.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.15 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-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1637253283549100001 Content-Type: text/plain; charset="utf-8" The test filled the chardev type to VIR_DOMAIN_CHR_TYPE_FILE and thus set the 'data.emulator.source->data.file.path' pointer, but the commandline formatter is unconditionally expecting VIR_DOMAIN_CHR_TYPE_UNIX and thus reading 'data.emulator.source->data.nix.path'. Since it's an union it happened to land in the correct place. Fix the faked data. Signed-off-by: Peter Krempa Reviewed-by: J=C3=A1n Tomko --- tests/qemuxml2argvtest.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 1d0d6e14ba..a5d162958e 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -450,9 +450,9 @@ testCompareXMLToArgvCreateArgs(virQEMUDriver *drv, if (vm->def->tpms[i]->type !=3D VIR_DOMAIN_TPM_TYPE_EMULATOR) continue; - VIR_FREE(vm->def->tpms[i]->data.emulator.source->data.file.path); - vm->def->tpms[i]->data.emulator.source->data.file.path =3D g_strdu= p("/dev/test"); - vm->def->tpms[i]->data.emulator.source->type =3D VIR_DOMAIN_CHR_TY= PE_FILE; + VIR_FREE(vm->def->tpms[i]->data.emulator.source->data.nix.path); + vm->def->tpms[i]->data.emulator.source->type =3D VIR_DOMAIN_CHR_TY= PE_UNIX; + vm->def->tpms[i]->data.emulator.source->data.nix.path =3D g_strdup= ("/dev/test"); } for (i =3D 0; i < vm->def->nvideos; i++) { --=20 2.31.1