From nobody Thu May 2 09:25:20 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=1666880088; cv=none; d=zohomail.com; s=zohoarc; b=KHz3l87DNFaIQqu5DgEtixc8OeBuCp7Cb/mFXX3I+oGOyBKyjC4MN9nX1Wgy46hhUVjFj1TU0s2Sv2zuLt/IheDrD6msEIr9N2u/8AE52gX2blr2WvRPiEWnSzjI7rv8/T28OvW7aO5e2XL4ZUbafGQLRdfRY5d+oAqCsN6c+YA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1666880088; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=f6qqVdNDcestNhbK04rfNyJHFWZcbBzwyk28NHnwWBM=; b=neLnSzF7AVWRqWwn2m2gNqVmxZSZzj/utxqglvdzmURP8oIf2NXUIlp1XUPQuV563zYXQNVRn8SzWK3rx/9tn6eGHD907o9CQ6jk3A1Hg5rATVZM42O1KAKhR//pAyvqRah+8MXUvqHZWOjtgtSfsBohA3gwttTFXrYMR0tMDk0= 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 1666880088468892.406740947242; Thu, 27 Oct 2022 07:14:48 -0700 (PDT) Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-608-YK7a_4V0NBK-nLWCG2cjlw-1; Thu, 27 Oct 2022 10:14:42 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 84D26862FFC; Thu, 27 Oct 2022 14:14:33 +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 83AEE2166B2B; Thu, 27 Oct 2022 14:14:32 +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 44AEB19465A4; Thu, 27 Oct 2022 14:14:32 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id EB4531946597 for ; Thu, 27 Oct 2022 14:14:30 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 826422024CC5; Thu, 27 Oct 2022 14:14:30 +0000 (UTC) Received: from worklaptop.redhat.com (unknown [10.22.16.128]) by smtp.corp.redhat.com (Postfix) with ESMTP id 54AD02024CB7; Thu, 27 Oct 2022 14:14:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1666880083; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc: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=f6qqVdNDcestNhbK04rfNyJHFWZcbBzwyk28NHnwWBM=; b=h79Pcu+FRBTia/o3z8Aqy6pe0uBRlN9HDnT7tAG2s7IvXlXxBqyw0dTbopWJWaZfVDxnCA fCdL05MGVAjg1hIjMHtpQ1HH0HN1raDVHrpG0J30yw14EQSTauaO4OB9HajHxl7ZNNMoyP UXQn2EcLd6C3SzEvK/GZFxnn4dxt1hY= X-MC-Unique: YK7a_4V0NBK-nLWCG2cjlw-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Cole Robinson To: libvir-list@redhat.com Subject: [PATCH] tests: Fix libxlxml2domconfigtest with latest xen Date: Thu, 27 Oct 2022 10:14:27 -0400 Message-Id: <99b40587e8cd83a136d94e208d32a80be76dc22a.1666880067.git.crobinso@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.4 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: , Cc: Cole Robinson Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 3.1 on 10.11.54.6 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: 1666880092302100001 Content-Type: text/plain; charset="utf-8" shadow_memkb is populated from a libxl API call, and the value can change. For example: https://xenbits.xen.org/gitweb/?p=3Dxen.git;a=3Dcommit;h=3D2c992810854a15b4= 1be920519ce83a4a328d5168 Mock libxl_get_required_shadow_memory to give consistent output Signed-off-by: Cole Robinson Reviewed-by: Michal Privoznik --- tests/libxlmock.c | 11 +++++++++++ tests/libxlxml2domconfigdata/basic-hvm.json | 2 +- tests/libxlxml2domconfigdata/basic-pv.json | 2 +- tests/libxlxml2domconfigdata/basic-pvh.json | 2 +- tests/libxlxml2domconfigdata/cpu-shares-hvm.json | 2 +- tests/libxlxml2domconfigdata/fullvirt-acpi-slic.json | 2 +- .../fullvirt-cpuid-legacy-nest.json | 2 +- tests/libxlxml2domconfigdata/fullvirt-cpuid.json | 2 +- .../libxlxml2domconfigdata/max-eventchannels-hvm.json | 2 +- tests/libxlxml2domconfigdata/max-gntframes-hvm.json | 2 +- tests/libxlxml2domconfigdata/moredevs-hvm.json | 2 +- tests/libxlxml2domconfigdata/multiple-ip.json | 2 +- tests/libxlxml2domconfigdata/variable-clock-hvm.json | 2 +- .../libxlxml2domconfigdata/vnuma-hvm-legacy-nest.json | 2 +- tests/libxlxml2domconfigdata/vnuma-hvm.json | 2 +- 15 files changed, 25 insertions(+), 14 deletions(-) diff --git a/tests/libxlmock.c b/tests/libxlmock.c index 0e4bf7df52..4754597e5b 100644 --- a/tests/libxlmock.c +++ b/tests/libxlmock.c @@ -109,6 +109,17 @@ VIR_MOCK_STUB_RET_ARGS(bind, const struct sockaddr *, addr, socklen_t, addrlen) =20 +VIR_MOCK_IMPL_RET_ARGS(libxl_get_required_shadow_memory, + unsigned long, + unsigned long, maxmem_kb, + unsigned int, smp_cpus) +{ + /* silence gcc warning about unused function */ + if (0) + real_libxl_get_required_shadow_memory(maxmem_kb, smp_cpus); + return 1234; +} + VIR_MOCK_IMPL_RET_ARGS(__xstat, int, int, ver, const char *, path, diff --git a/tests/libxlxml2domconfigdata/basic-hvm.json b/tests/libxlxml2d= omconfigdata/basic-hvm.json index 87f8cb7d8a..d30875420d 100644 --- a/tests/libxlxml2domconfigdata/basic-hvm.json +++ b/tests/libxlxml2domconfigdata/basic-hvm.json @@ -15,7 +15,7 @@ "max_memkb": 1048576, "target_memkb": 1048576, "video_memkb": 8192, - "shadow_memkb": 12288, + "shadow_memkb": 1234, "device_model_version": "qemu_xen", "device_model": "/bin/true", "sched_params": { diff --git a/tests/libxlxml2domconfigdata/basic-pv.json b/tests/libxlxml2do= mconfigdata/basic-pv.json index b71c3b0f49..32d188fabd 100644 --- a/tests/libxlxml2domconfigdata/basic-pv.json +++ b/tests/libxlxml2domconfigdata/basic-pv.json @@ -14,7 +14,7 @@ ], "max_memkb": 524288, "target_memkb": 524288, - "shadow_memkb": 8192, + "shadow_memkb": 1234, "sched_params": { =20 }, diff --git a/tests/libxlxml2domconfigdata/basic-pvh.json b/tests/libxlxml2d= omconfigdata/basic-pvh.json index 48365c9026..f51957aa85 100644 --- a/tests/libxlxml2domconfigdata/basic-pvh.json +++ b/tests/libxlxml2domconfigdata/basic-pvh.json @@ -14,7 +14,7 @@ ], "max_memkb": 524288, "target_memkb": 524288, - "shadow_memkb": 8192, + "shadow_memkb": 1234, "sched_params": { =20 }, diff --git a/tests/libxlxml2domconfigdata/cpu-shares-hvm.json b/tests/libxl= xml2domconfigdata/cpu-shares-hvm.json index 2aa97e88c5..15105c83ad 100644 --- a/tests/libxlxml2domconfigdata/cpu-shares-hvm.json +++ b/tests/libxlxml2domconfigdata/cpu-shares-hvm.json @@ -15,7 +15,7 @@ "max_memkb": 1048576, "target_memkb": 1048576, "video_memkb": 8192, - "shadow_memkb": 12288, + "shadow_memkb": 1234, "device_model_version": "qemu_xen", "device_model": "/bin/true", "sched_params": { diff --git a/tests/libxlxml2domconfigdata/fullvirt-acpi-slic.json b/tests/l= ibxlxml2domconfigdata/fullvirt-acpi-slic.json index a2d46797aa..26f5abefee 100644 --- a/tests/libxlxml2domconfigdata/fullvirt-acpi-slic.json +++ b/tests/libxlxml2domconfigdata/fullvirt-acpi-slic.json @@ -11,7 +11,7 @@ ], "max_memkb": 592896, "target_memkb": 403456, - "shadow_memkb": 5656, + "shadow_memkb": 1234, "sched_params": { }, "apic": "True", diff --git a/tests/libxlxml2domconfigdata/fullvirt-cpuid-legacy-nest.json b= /tests/libxlxml2domconfigdata/fullvirt-cpuid-legacy-nest.json index 6290655c20..740b82d2e6 100644 --- a/tests/libxlxml2domconfigdata/fullvirt-cpuid-legacy-nest.json +++ b/tests/libxlxml2domconfigdata/fullvirt-cpuid-legacy-nest.json @@ -11,7 +11,7 @@ ], "max_memkb": 592896, "target_memkb": 403456, - "shadow_memkb": 5656, + "shadow_memkb": 1234, "cpuid": [ { "leaf": 1, diff --git a/tests/libxlxml2domconfigdata/fullvirt-cpuid.json b/tests/libxl= xml2domconfigdata/fullvirt-cpuid.json index 811a4f0ac7..8bf41894a5 100644 --- a/tests/libxlxml2domconfigdata/fullvirt-cpuid.json +++ b/tests/libxlxml2domconfigdata/fullvirt-cpuid.json @@ -11,7 +11,7 @@ ], "max_memkb": 592896, "target_memkb": 403456, - "shadow_memkb": 5656, + "shadow_memkb": 1234, "cpuid": [ { "leaf": 1, diff --git a/tests/libxlxml2domconfigdata/max-eventchannels-hvm.json b/test= s/libxlxml2domconfigdata/max-eventchannels-hvm.json index 4a5b0ca65f..6f0daa065f 100644 --- a/tests/libxlxml2domconfigdata/max-eventchannels-hvm.json +++ b/tests/libxlxml2domconfigdata/max-eventchannels-hvm.json @@ -15,7 +15,7 @@ "max_memkb": 1048576, "target_memkb": 1048576, "video_memkb": 8192, - "shadow_memkb": 12288, + "shadow_memkb": 1234, "event_channels": 2047, "device_model_version": "qemu_xen", "device_model": "/bin/true", diff --git a/tests/libxlxml2domconfigdata/max-gntframes-hvm.json b/tests/li= bxlxml2domconfigdata/max-gntframes-hvm.json index 2883d057ff..35de588abc 100644 --- a/tests/libxlxml2domconfigdata/max-gntframes-hvm.json +++ b/tests/libxlxml2domconfigdata/max-gntframes-hvm.json @@ -15,7 +15,7 @@ "max_memkb": 1048576, "target_memkb": 1048576, "video_memkb": 8192, - "shadow_memkb": 12288, + "shadow_memkb": 1234, "max_grant_frames": 64, "device_model_version": "qemu_xen", "device_model": "/bin/true", diff --git a/tests/libxlxml2domconfigdata/moredevs-hvm.json b/tests/libxlxm= l2domconfigdata/moredevs-hvm.json index 58cf32a8d4..bdc9afc29b 100644 --- a/tests/libxlxml2domconfigdata/moredevs-hvm.json +++ b/tests/libxlxml2domconfigdata/moredevs-hvm.json @@ -17,7 +17,7 @@ "max_memkb": 1048576, "target_memkb": 1048576, "video_memkb": 8192, - "shadow_memkb": 12288, + "shadow_memkb": 1234, "device_model_version": "qemu_xen", "device_model": "/bin/true", "sched_params": { diff --git a/tests/libxlxml2domconfigdata/multiple-ip.json b/tests/libxlxml= 2domconfigdata/multiple-ip.json index 2db98b82f6..e0b37aa795 100644 --- a/tests/libxlxml2domconfigdata/multiple-ip.json +++ b/tests/libxlxml2domconfigdata/multiple-ip.json @@ -14,7 +14,7 @@ ], "max_memkb": 524288, "target_memkb": 524288, - "shadow_memkb": 8192, + "shadow_memkb": 1234, "sched_params": { =20 }, diff --git a/tests/libxlxml2domconfigdata/variable-clock-hvm.json b/tests/l= ibxlxml2domconfigdata/variable-clock-hvm.json index 9a25d51da2..3c131c603c 100644 --- a/tests/libxlxml2domconfigdata/variable-clock-hvm.json +++ b/tests/libxlxml2domconfigdata/variable-clock-hvm.json @@ -15,7 +15,7 @@ "max_memkb": 1048576, "target_memkb": 1048576, "video_memkb": 8192, - "shadow_memkb": 12288, + "shadow_memkb": 1234, "rtc_timeoffset": 3600, "localtime": "True", "device_model_version": "qemu_xen", diff --git a/tests/libxlxml2domconfigdata/vnuma-hvm-legacy-nest.json b/test= s/libxlxml2domconfigdata/vnuma-hvm-legacy-nest.json index 6cda8d0252..6725df9112 100644 --- a/tests/libxlxml2domconfigdata/vnuma-hvm-legacy-nest.json +++ b/tests/libxlxml2domconfigdata/vnuma-hvm-legacy-nest.json @@ -103,7 +103,7 @@ "max_memkb": 1048576, "target_memkb": 1048576, "video_memkb": 8192, - "shadow_memkb": 14336, + "shadow_memkb": 1234, "device_model_version": "qemu_xen", "device_model": "/bin/true", "sched_params": { diff --git a/tests/libxlxml2domconfigdata/vnuma-hvm.json b/tests/libxlxml2d= omconfigdata/vnuma-hvm.json index f578ccd3d3..2556c82d5f 100644 --- a/tests/libxlxml2domconfigdata/vnuma-hvm.json +++ b/tests/libxlxml2domconfigdata/vnuma-hvm.json @@ -103,7 +103,7 @@ "max_memkb": 1048576, "target_memkb": 1048576, "video_memkb": 8192, - "shadow_memkb": 14336, + "shadow_memkb": 1234, "device_model_version": "qemu_xen", "device_model": "/bin/true", "sched_params": { --=20 2.37.3