forked from rpms/libvirt
123 lines
4.7 KiB
Diff
123 lines
4.7 KiB
Diff
From 2ffa5538e4f7507a77fdb7ac23bdc8aa51e54297 Mon Sep 17 00:00:00 2001
|
|
Message-Id: <2ffa5538e4f7507a77fdb7ac23bdc8aa51e54297@dist-git>
|
|
From: Michal Privoznik <mprivozn@redhat.com>
|
|
Date: Tue, 7 Mar 2023 16:06:14 +0100
|
|
Subject: [PATCH] qemuxml2argvmock: Drop virNuma* mocks
|
|
|
|
Since qemuxml2argvtest is now using virnumamock, there's no need
|
|
for qemuxml2argvmock to offer reimplementation of virNuma*()
|
|
functions. Also, the comment about CLang and FreeBSD (introduced
|
|
in v4.3.0-40-g77ac204d14) is no longer true. Looks like noinline
|
|
attribute was the missing culprit.
|
|
|
|
Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
|
|
Reviewed-by: Kristina Hanicova <khanicov@redhat.com>
|
|
Reviewed-by: Andrea Bolognani <abologna@redhat.com>
|
|
(cherry picked from commit 95ae91fdd4da33323ead8f916824b48f8506383c)
|
|
Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=2185039
|
|
Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
|
|
---
|
|
src/util/virnuma.h | 2 +-
|
|
...-unavailable-restrictive.x86_64-latest.err | 2 +-
|
|
...mnode-unavailable-strict.x86_64-latest.err | 2 +-
|
|
...umatune-static-nodeset-exceed-hostnode.err | 2 +-
|
|
tests/qemuxml2argvmock.c | 42 -------------------
|
|
5 files changed, 4 insertions(+), 46 deletions(-)
|
|
|
|
diff --git a/src/util/virnuma.h b/src/util/virnuma.h
|
|
index edd701d5c8..475df96e1d 100644
|
|
--- a/src/util/virnuma.h
|
|
+++ b/src/util/virnuma.h
|
|
@@ -32,7 +32,7 @@ int virNumaSetupMemoryPolicy(virDomainNumatuneMemMode mode,
|
|
virBitmap *nodeset);
|
|
|
|
virBitmap *virNumaGetHostMemoryNodeset(void);
|
|
-bool virNumaNodesetIsAvailable(virBitmap *nodeset) G_NO_INLINE;
|
|
+bool virNumaNodesetIsAvailable(virBitmap *nodeset);
|
|
bool virNumaIsAvailable(void) G_NO_INLINE;
|
|
int virNumaGetMaxNode(void) G_NO_INLINE;
|
|
bool virNumaNodeIsAvailable(int node) G_NO_INLINE;
|
|
diff --git a/tests/qemuxml2argvdata/numatune-memnode-unavailable-restrictive.x86_64-latest.err b/tests/qemuxml2argvdata/numatune-memnode-unavailable-restrictive.x86_64-latest.err
|
|
index a826c3cdeb..f872dd7e92 100644
|
|
--- a/tests/qemuxml2argvdata/numatune-memnode-unavailable-restrictive.x86_64-latest.err
|
|
+++ b/tests/qemuxml2argvdata/numatune-memnode-unavailable-restrictive.x86_64-latest.err
|
|
@@ -1 +1 @@
|
|
-internal error: Mock: no numa node set is available at bit 999
|
|
+unsupported configuration: NUMA node 999 is unavailable
|
|
diff --git a/tests/qemuxml2argvdata/numatune-memnode-unavailable-strict.x86_64-latest.err b/tests/qemuxml2argvdata/numatune-memnode-unavailable-strict.x86_64-latest.err
|
|
index a826c3cdeb..f872dd7e92 100644
|
|
--- a/tests/qemuxml2argvdata/numatune-memnode-unavailable-strict.x86_64-latest.err
|
|
+++ b/tests/qemuxml2argvdata/numatune-memnode-unavailable-strict.x86_64-latest.err
|
|
@@ -1 +1 @@
|
|
-internal error: Mock: no numa node set is available at bit 999
|
|
+unsupported configuration: NUMA node 999 is unavailable
|
|
diff --git a/tests/qemuxml2argvdata/numatune-static-nodeset-exceed-hostnode.err b/tests/qemuxml2argvdata/numatune-static-nodeset-exceed-hostnode.err
|
|
index b6b98775ee..2a33ccd791 100644
|
|
--- a/tests/qemuxml2argvdata/numatune-static-nodeset-exceed-hostnode.err
|
|
+++ b/tests/qemuxml2argvdata/numatune-static-nodeset-exceed-hostnode.err
|
|
@@ -1 +1 @@
|
|
-internal error: Mock: no numa node set is available at bit 8
|
|
+unsupported configuration: NUMA node 4 is unavailable
|
|
diff --git a/tests/qemuxml2argvmock.c b/tests/qemuxml2argvmock.c
|
|
index 85bd76c315..f566ec539a 100644
|
|
--- a/tests/qemuxml2argvmock.c
|
|
+++ b/tests/qemuxml2argvmock.c
|
|
@@ -30,7 +30,6 @@
|
|
#include "virnetdevip.h"
|
|
#include "virnetdevtap.h"
|
|
#include "virnetdevopenvswitch.h"
|
|
-#include "virnuma.h"
|
|
#include "virscsivhost.h"
|
|
#include "virtpm.h"
|
|
#include "virutil.h"
|
|
@@ -56,47 +55,6 @@ GDateTime *g_date_time_new_now_local(void)
|
|
return g_date_time_new_from_unix_local(1234567890);
|
|
}
|
|
|
|
-bool
|
|
-virNumaIsAvailable(void)
|
|
-{
|
|
- return true;
|
|
-}
|
|
-
|
|
-int
|
|
-virNumaGetMaxNode(void)
|
|
-{
|
|
- return 7;
|
|
-}
|
|
-
|
|
-/* We shouldn't need to mock virNumaNodeIsAvailable() and *definitely* not
|
|
- * virNumaNodesetIsAvailable(), but it seems to be the only way to get
|
|
- * mocking to work with Clang on FreeBSD, so keep these duplicates around
|
|
- * until we figure out a cleaner solution */
|
|
-bool
|
|
-virNumaNodeIsAvailable(int node)
|
|
-{
|
|
- return node >= 0 && node <= virNumaGetMaxNode();
|
|
-}
|
|
-
|
|
-bool
|
|
-virNumaNodesetIsAvailable(virBitmap *nodeset)
|
|
-{
|
|
- ssize_t bit = -1;
|
|
-
|
|
- if (!nodeset)
|
|
- return true;
|
|
-
|
|
- while ((bit = virBitmapNextSetBit(nodeset, bit)) >= 0) {
|
|
- if (virNumaNodeIsAvailable(bit))
|
|
- continue;
|
|
-
|
|
- virReportError(VIR_ERR_INTERNAL_ERROR,
|
|
- "Mock: no numa node set is available at bit %zd", bit);
|
|
- return false;
|
|
- }
|
|
-
|
|
- return true;
|
|
-}
|
|
|
|
char *
|
|
virTPMCreateCancelPath(const char *devpath)
|
|
--
|
|
2.40.0
|