From nobody Tue May 7 15:49:52 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=1626959869; cv=none; d=zohomail.com; s=zohoarc; b=OORppgXvcJlADdlebxukuX7gCs9U6aIRlz3fTlyahSKFiSnHeOFgOYsQNlPWj9pQOuBAUxs53GBBok2TLh5bC3FvugD2irgZp0vIUXbd+pupv2KflNscX25NXarqM+rsHh5lsumZKyFFUQX/VVx7yxw8tqxrFyLeZ1+/sE0giRs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1626959869; h=Content-Type:Content-Transfer-Encoding:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=sx4vLDKLCg+XQdD+3oNVNNwNp5e4nDm4rnChV4b2HSw=; b=eagBxIz7/PPZRHzY8gZgKHinSGcgW91FcNOE8jBvc3CoAzYojUvAKlxtCVeY51/13jKFHaHwdfo0tAkUmJao46BY2Lx1zvoCFlXUODCmfBFuHfFhN0BEEAnOldsckde6Jh+Lw6YnMzZLwksJfm7cT7EFTbjaYUKzV8xpaRSal4I= 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 1626959869633631.5066942339453; Thu, 22 Jul 2021 06:17:49 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-422-1IiMcbg9Pbq9YgomFsx0jg-1; Thu, 22 Jul 2021 09:17:47 -0400 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 4ACE0801ADA; Thu, 22 Jul 2021 13:17:41 +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 0314060C05; Thu, 22 Jul 2021 13:17:39 +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 81D78180084A; Thu, 22 Jul 2021 13:17:36 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 16MDHZE5006407 for ; Thu, 22 Jul 2021 09:17:35 -0400 Received: by smtp.corp.redhat.com (Postfix) id 28C1912C82; Thu, 22 Jul 2021 13:17:35 +0000 (UTC) Received: from antique-laptop.lan (unknown [10.40.208.24]) by smtp.corp.redhat.com (Postfix) with ESMTP id 542B45DAA5 for ; Thu, 22 Jul 2021 13:17:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1626959868; 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:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=sx4vLDKLCg+XQdD+3oNVNNwNp5e4nDm4rnChV4b2HSw=; b=Jm8DKJ9ydZQ2iNkEKqZ8xlkmN9had4LEOmVvM/hg/Yv+Z0qPYK2yZiDQ57cMKWl/WjbjPv xk8brnHLyH4vM+JyYtW3JdgPzniXbfWuc3JRyRbQres7Dn3qFdd4pGQV2USsD/+opgKvxr Rrt01UlObSU4cdaRJnBWegrXTAOea8w= X-MC-Unique: 1IiMcbg9Pbq9YgomFsx0jg-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH] qemuxml2argvmock: drop virQEMUCapsGetKVMSupportsSecureGuest Date: Thu, 22 Jul 2021 15:17:28 +0200 Message-Id: <867ddeead2d328ef5d4071a87ac0737f6611995e.1626959819.git.phrdina@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 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.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-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1626959870639100001 Content-Type: text/plain; charset="utf-8" It is actually not needed because in qemuxml2argvtest we preload domaincapsmock as well. Reported-by: Michal Privoznik Signed-off-by: Pavel Hrdina Reviewed-by: Michal Privoznik --- tests/qemuxml2argvmock.c | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/tests/qemuxml2argvmock.c b/tests/qemuxml2argvmock.c index d7f77eabf7..2265492f1e 100644 --- a/tests/qemuxml2argvmock.c +++ b/tests/qemuxml2argvmock.c @@ -41,7 +41,6 @@ #include "virutil.h" #include "qemu/qemu_interface.h" #include "qemu/qemu_command.h" -#include "qemu/qemu_capabilities.h" #include #include #include @@ -302,18 +301,3 @@ virIdentityEnsureSystemToken(void) { return g_strdup("3de80bcbf22d4833897f1638e01be9b2"); } - -static bool (*real_virQEMUCapsGetKVMSupportsSecureGuest)(virQEMUCaps *qemu= Caps); - -bool -virQEMUCapsGetKVMSupportsSecureGuest(virQEMUCaps *qemuCaps) -{ - if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_MACHINE_CONFIDENTAL_GUEST_SUPPO= RT) && - virQEMUCapsGet(qemuCaps, QEMU_CAPS_S390_PV_GUEST)) - return true; - - if (!real_virQEMUCapsGetKVMSupportsSecureGuest) - VIR_MOCK_REAL_INIT(virQEMUCapsGetKVMSupportsSecureGuest); - - return real_virQEMUCapsGetKVMSupportsSecureGuest(qemuCaps); -} --=20 2.31.1