From nobody Fri Dec 19 17:38:35 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) client-ip=170.10.129.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.129.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=1679064933; cv=none; d=zohomail.com; s=zohoarc; b=X6yFZ3/u8UOit3IOOiqIny8r1EGqdT1P6o9IE4y2W+HK7Y1mxFwNAFEjsYGsxsZXXek0+EjYrNmi5gpTv4EMDc2WGjmnVOyYY+Pm2YCfmSndSsOdkGjOZUrS/bjfJn6ofzmKaNBz1dXqIsl9mqyi2sp9zVJjFZGwK+URhTS4Hxg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1679064933; 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=lW4Kf2Rp8FXeAJL01JB96ZbC46tuBk9yCeON81VAcnA=; b=PuQJb3bxT0RMOOaIOm2NcmjiBVKWKNxcV7JqmKl5jD5JbAWrbdfJHw3NjMv0L5vXOJZf/YApyFGi8Fxu6l+92OvFMuspGNRextUhHpEbbEYkNsB+YwO9pu9ZH2/xkVCXphXblf24CxqD+Z5iq8k6nCn3056Q2CFnIlf1g4N0Nuw= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.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.129.124]) by mx.zohomail.com with SMTPS id 1679064933483733.9348513213724; Fri, 17 Mar 2023 07:55:33 -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-665-uXQo0Q9AMBWIjdc9pEjDqw-1; Fri, 17 Mar 2023 10:55:26 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 8EC6428082D6; Fri, 17 Mar 2023 14:55:19 +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 7748940B3ED7; Fri, 17 Mar 2023 14:55:19 +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 662F51946A40; Fri, 17 Mar 2023 14:55:19 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id EBD091946587 for ; Thu, 16 Mar 2023 16:13:37 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 0B7BD2166B26; Thu, 16 Mar 2023 16:13:37 +0000 (UTC) Received: from speedmetal.redhat.com (unknown [10.45.242.18]) by smtp.corp.redhat.com (Postfix) with ESMTP id E78482166B29 for ; Thu, 16 Mar 2023 16:13:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1679064932; 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=lW4Kf2Rp8FXeAJL01JB96ZbC46tuBk9yCeON81VAcnA=; b=ZaryF0owZhJv1nTvsbKcCD9HoieZ0LeqfzD5tGDgSSFqltyjbQYpBj0pr7GDs0QzM4wfHw eONRzdFmVbDrym2bRR+Oez1N9kE3rWS5k6fYYO9HeOK8IOryKHFFi3SiOcaYLKBS7Mtegk ySOhwdgryaVhkOmSQG1LUUYr65Ti8zw= X-MC-Unique: uXQo0Q9AMBWIjdc9pEjDqw-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 24/24] testutilsqemu: Remove infrastructure for fake-caps testing of OSX Date: Thu, 16 Mar 2023 17:11:53 +0100 Message-Id: <682f7a64b1aef80ded78baca935ba1cb1111645b.1678982996.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.6 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.1 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: 1679064933893100003 Content-Type: text/plain; charset="utf-8" All tests using this were refactored to use real capabilities. Signed-off-by: Peter Krempa --- tests/testutilsqemu.c | 144 +++++++++--------------------------------- tests/testutilsqemu.h | 10 --- 2 files changed, 31 insertions(+), 123 deletions(-) diff --git a/tests/testutilsqemu.c b/tests/testutilsqemu.c index e12eaf4dd8..d5922f302d 100644 --- a/tests/testutilsqemu.c +++ b/tests/testutilsqemu.c @@ -62,15 +62,6 @@ static const char *const *qemu_machines[VIR_ARCH_LAST] = =3D { [VIR_ARCH_S390X] =3D s390x_machines, }; -static const char *const *hvf_machines[VIR_ARCH_LAST] =3D { - [VIR_ARCH_I686] =3D NULL, - [VIR_ARCH_X86_64] =3D x86_64_machines, - [VIR_ARCH_AARCH64] =3D aarch64_machines, - [VIR_ARCH_PPC64] =3D NULL, - [VIR_ARCH_RISCV64] =3D NULL, - [VIR_ARCH_S390X] =3D NULL, -}; - static const char *qemu_default_ram_id[VIR_ARCH_LAST] =3D { [VIR_ARCH_I686] =3D "pc.ram", [VIR_ARCH_X86_64] =3D "pc.ram", @@ -165,8 +156,7 @@ virHostCPUX86GetCPUID(uint32_t leaf, static int testQemuAddGuest(virCaps *caps, - virArch arch, - testQemuHostOS hostOS) + virArch arch) { size_t nmachines; virCapsGuestMachine **machines =3D NULL; @@ -199,31 +189,15 @@ testQemuAddGuest(virCaps *caps, virCapabilitiesAddGuestDomain(guest, VIR_DOMAIN_VIRT_QEMU, NULL, NULL, 0, NULL); - if (hostOS =3D=3D HOST_OS_LINUX) { - nmachines =3D g_strv_length((char **)qemu_machines[emu_arch]); - machines =3D virCapabilitiesAllocMachines(qemu_machines[emu_arch], - nmachines); - if (machines =3D=3D NULL) - goto error; - - virCapabilitiesAddGuestDomain(guest, VIR_DOMAIN_VIRT_KVM, - qemu_emulators[emu_arch], - NULL, nmachines, machines); - } + nmachines =3D g_strv_length((char **)qemu_machines[emu_arch]); + machines =3D virCapabilitiesAllocMachines(qemu_machines[emu_arch], + nmachines); + if (machines =3D=3D NULL) + goto error; - if (hostOS =3D=3D HOST_OS_MACOS) { - if (hvf_machines[emu_arch] !=3D NULL) { - nmachines =3D g_strv_length((char **)hvf_machines[emu_arch]); - machines =3D virCapabilitiesAllocMachines(hvf_machines[emu_arc= h], - nmachines); - if (machines =3D=3D NULL) - goto error; - - virCapabilitiesAddGuestDomain(guest, VIR_DOMAIN_VIRT_HVF, - qemu_emulators[emu_arch], - NULL, nmachines, machines); - } - } + virCapabilitiesAddGuestDomain(guest, VIR_DOMAIN_VIRT_KVM, + qemu_emulators[emu_arch], + NULL, nmachines, machines); return 0; @@ -233,8 +207,8 @@ testQemuAddGuest(virCaps *caps, } -static virCaps* -testQemuCapsInitImpl(testQemuHostOS hostOS) +virCaps * +testQemuCapsInit(void) { virCaps *caps; size_t i; @@ -254,7 +228,7 @@ testQemuCapsInitImpl(testQemuHostOS hostOS) goto cleanup; for (i =3D 0; i < VIR_ARCH_LAST; i++) { - if (testQemuAddGuest(caps, i, hostOS) < 0) + if (testQemuAddGuest(caps, i) < 0) goto cleanup; } @@ -276,19 +250,6 @@ testQemuCapsInitImpl(testQemuHostOS hostOS) return NULL; } -virCaps* -testQemuCapsInit(void) -{ - return testQemuCapsInitImpl(HOST_OS_LINUX); -} - -virCaps* -testQemuCapsInitMacOS(void) -{ - return testQemuCapsInitImpl(HOST_OS_MACOS); -} - - virCPUDef * qemuTestGetCPUDef(qemuTestCPUDef d) { @@ -386,8 +347,7 @@ void qemuTestDriverFree(virQEMUDriver *driver) static void qemuTestCapsPopulateFakeMachines(virQEMUCaps *caps, - virArch arch, - testQemuHostOS hostOS) + virArch arch) { size_t i; const char *defaultRAMid =3D NULL; @@ -415,41 +375,19 @@ qemuTestCapsPopulateFakeMachines(virQEMUCaps *caps, VIR_TRISTATE_BOOL_ABSENT); virQEMUCapsSet(caps, QEMU_CAPS_TCG); - if (hostOS =3D=3D HOST_OS_LINUX) { - virQEMUCapsAddMachine(caps, - VIR_DOMAIN_VIRT_KVM, - qemu_machines[arch][i], - NULL, - NULL, - 0, - false, - false, - true, - defaultRAMid, - false, - VIR_TRISTATE_BOOL_ABSENT); - virQEMUCapsSet(caps, QEMU_CAPS_KVM); - } - } - - if (hostOS =3D=3D HOST_OS_MACOS) { - if (hvf_machines[arch] !=3D NULL) { - for (i =3D 0; hvf_machines[arch][i] !=3D NULL; i++) { - virQEMUCapsAddMachine(caps, - VIR_DOMAIN_VIRT_HVF, - hvf_machines[arch][i], - NULL, - NULL, - 0, - false, - false, - true, - defaultRAMid, - false, - VIR_TRISTATE_BOOL_ABSENT); - virQEMUCapsSet(caps, QEMU_CAPS_HVF); - } - } + virQEMUCapsAddMachine(caps, + VIR_DOMAIN_VIRT_KVM, + qemu_machines[arch][i], + NULL, + NULL, + 0, + false, + false, + true, + defaultRAMid, + false, + VIR_TRISTATE_BOOL_ABSENT); + virQEMUCapsSet(caps, QEMU_CAPS_KVM); } } @@ -468,10 +406,9 @@ qemuTestCapsCacheInsertData(virFileCache *cache, } -static int -qemuTestCapsCacheInsertImpl(virFileCache *cache, - virQEMUCaps *caps, - testQemuHostOS hostOS) +int +qemuTestCapsCacheInsert(virFileCache *cache, + virQEMUCaps *caps) { size_t i; @@ -498,7 +435,7 @@ qemuTestCapsCacheInsertImpl(virFileCache *cache, /* if we are dealing with fake caps we need to populate ma= chine types */ if (!virQEMUCapsHasMachines(caps)) { copyCaps =3D effCaps =3D virQEMUCapsNewCopy(caps); - qemuTestCapsPopulateFakeMachines(copyCaps, arch, hostO= S); + qemuTestCapsPopulateFakeMachines(copyCaps, arch); } if (qemuTestCapsCacheInsertData(cache, qemu_emulators[arch= ], effCaps) < 0) @@ -516,7 +453,7 @@ qemuTestCapsCacheInsertImpl(virFileCache *cache, tmp =3D virQEMUCapsNewCopy(caps); - qemuTestCapsPopulateFakeMachines(tmp, i, hostOS); + qemuTestCapsPopulateFakeMachines(tmp, i); if (qemuTestCapsCacheInsertData(cache, qemu_emulators[i], tmp)= < 0) return -1; @@ -526,21 +463,6 @@ qemuTestCapsCacheInsertImpl(virFileCache *cache, return 0; } -int -qemuTestCapsCacheInsert(virFileCache *cache, - virQEMUCaps *caps) -{ - return qemuTestCapsCacheInsertImpl(cache, caps, HOST_OS_LINUX); -} - -int -qemuTestCapsCacheInsertMacOS(virFileCache *cache, - virQEMUCaps *caps) -{ - return qemuTestCapsCacheInsertImpl(cache, caps, HOST_OS_MACOS); -} - - # define STATEDIRTEMPLATE abs_builddir "/qemustatedir-XXXXXX" # define CONFIGDIRTEMPLATE abs_builddir "/qemuconfigdir-XXXXXX" @@ -951,10 +873,6 @@ testQemuInfoSetArgs(struct testQemuInfo *info, info->args.capsHostCPUModel =3D va_arg(argptr, int); break; - case ARG_HOST_OS: - info->args.hostOS =3D va_arg(argptr, int); - break; - case ARG_FD_GROUP: { virStorageSourceFDTuple *new =3D virStorageSourceFDTupleNew(); const char *fdname =3D va_arg(argptr, char *); diff --git a/tests/testutilsqemu.h b/tests/testutilsqemu.h index 070bca6a53..69cad61f5a 100644 --- a/tests/testutilsqemu.h +++ b/tests/testutilsqemu.h @@ -36,11 +36,6 @@ enum { GIC_BOTH, }; -typedef enum { - HOST_OS_LINUX =3D 0, - HOST_OS_MACOS, -} testQemuHostOS; - typedef enum { ARG_QEMU_CAPS =3D QEMU_CAPS_LAST + 1, ARG_QEMU_CAPS_DEL, @@ -53,7 +48,6 @@ typedef enum { ARG_CAPS_VER, ARG_CAPS_VARIANT, ARG_CAPS_HOST_CPU_MODEL, - ARG_HOST_OS, ARG_FD_GROUP, /* name, nfds, fd[0], ... fd[n-1] */ ARG_END, } testQemuInfoArgName; @@ -90,7 +84,6 @@ struct testQemuArgs { const char *capsvariant; qemuTestCPUDef capsHostCPUModel; int gic; - testQemuHostOS hostOS; GHashTable *fds; bool invalidarg; }; @@ -113,7 +106,6 @@ struct testQemuInfo { }; virCaps *testQemuCapsInit(void); -virCaps *testQemuCapsInitMacOS(void); virDomainXMLOption *testQemuXMLConfInit(void); @@ -131,8 +123,6 @@ int qemuTestDriverInit(virQEMUDriver *driver); void qemuTestDriverFree(virQEMUDriver *driver); int qemuTestCapsCacheInsert(virFileCache *cache, virQEMUCaps *caps); -int qemuTestCapsCacheInsertMacOS(virFileCache *cache, - virQEMUCaps *caps); int testQemuCapsSetGIC(virQEMUCaps *qemuCaps, int gic); --=20 2.39.2