From: Thomas Huth <thuth@redhat.com>
To: qemu-devel@nongnu.org
Cc: "Peter Maydell" <peter.maydell@linaro.org>,
"Daniel P. Berrangé" <berrange@redhat.com>,
"Stefan Hajnoczi" <stefanha@redhat.com>
Subject: [PULL 04/17] Revert "osdep: add getloadavg"
Date: Thu, 11 Jan 2024 18:00:33 +0100 [thread overview]
Message-ID: <20240111170047.909117-5-thuth@redhat.com> (raw)
In-Reply-To: <20240111170047.909117-1-thuth@redhat.com>
From: Daniel P. Berrangé <berrange@redhat.com>
This reverts commit dc864d3a3777424187280e50c9bfb84dced54f12.
This functionality is not required after the previous revert
Signed-off-by: "Daniel P. Berrangé" <berrange@redhat.com>
Message-ID: <20240104162942.211458-3-berrange@redhat.com>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
meson.build | 1 -
include/qemu/osdep.h | 10 ----------
2 files changed, 11 deletions(-)
diff --git a/meson.build b/meson.build
index 371edafae6..8dd6347d1b 100644
--- a/meson.build
+++ b/meson.build
@@ -2341,7 +2341,6 @@ config_host_data.set('HAVE_GLIB_WITH_SLICE_ALLOCATOR', glib_has_gslice)
config_host_data.set('HAVE_OPENPTY', cc.has_function('openpty', dependencies: util))
config_host_data.set('HAVE_STRCHRNUL', cc.has_function('strchrnul'))
config_host_data.set('HAVE_SYSTEM_FUNCTION', cc.has_function('system', prefix: '#include <stdlib.h>'))
-config_host_data.set('HAVE_GETLOADAVG_FUNCTION', cc.has_function('getloadavg', prefix: '#include <stdlib.h>'))
if rbd.found()
config_host_data.set('HAVE_RBD_NAMESPACE_EXISTS',
cc.has_function('rbd_namespace_exists',
diff --git a/include/qemu/osdep.h b/include/qemu/osdep.h
index db366d6796..9a405bed89 100644
--- a/include/qemu/osdep.h
+++ b/include/qemu/osdep.h
@@ -781,16 +781,6 @@ static inline int platform_does_not_support_system(const char *command)
}
#endif /* !HAVE_SYSTEM_FUNCTION */
-/**
- * If the load average was unobtainable, -1 is returned
- */
-#ifndef HAVE_GETLOADAVG_FUNCTION
-static inline int getloadavg(double loadavg[], int nelem)
-{
- return -1;
-}
-#endif /* !HAVE_GETLOADAVG_FUNCTION */
-
#ifdef __cplusplus
}
#endif
--
2.43.0
next prev parent reply other threads:[~2024-01-11 17:04 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-01-11 17:00 [PULL 00/17] Misc patches (qtests, s390x, m68k, gitlab-ci) Thomas Huth
2024-01-11 17:00 ` [PULL 01/17] q800: move dp8393x_prom memory region to Q800MachineState Thomas Huth
2024-01-11 17:00 ` [PULL 02/17] qtest: use correct boolean type for failover property Thomas Huth
2024-01-11 17:00 ` [PULL 03/17] Revert "netdev: set timeout depending on loadavg" Thomas Huth
2024-01-11 17:00 ` Thomas Huth [this message]
2024-01-11 17:00 ` [PULL 05/17] Revert "tests/qtest/netdev-socket: Raise connection timeout to 120 seconds" Thomas Huth
2024-01-11 17:00 ` [PULL 06/17] net: add explicit info about connecting/listening state Thomas Huth
2024-01-11 17:00 ` [PULL 07/17] net: handle QIOTask completion to report useful error message Thomas Huth
2024-01-11 17:00 ` [PULL 08/17] qtest: ensure netdev-socket tests have non-overlapping names Thomas Huth
2024-01-11 17:00 ` [PULL 09/17] tests/qtest/virtio-ccw: Fix device presence checking Thomas Huth
2024-01-11 17:00 ` [PULL 10/17] gitlab: fix s390x tag for avocado-system-centos Thomas Huth
2024-01-11 17:00 ` [PULL 11/17] target/s390x/kvm/pv: Provide some more useful information if decryption fails Thomas Huth
2024-01-11 17:00 ` [PULL 12/17] hw/s390x/ccw: Replace basename() with g_path_get_basename() Thomas Huth
2024-01-11 17:00 ` [PULL 13/17] hw/s390x/ccw: Replace dirname() with g_path_get_dirname() Thomas Huth
2024-01-11 17:00 ` [PULL 14/17] scripts/checkpatch: Support codespell checking Thomas Huth
2024-01-11 17:00 ` [PULL 15/17] target/s390x: Fix LAE setting a wrong access register Thomas Huth
2024-01-11 17:00 ` [PULL 16/17] tests/tcg/s390x: Test LOAD ADDRESS EXTENDED Thomas Huth
2024-01-11 17:00 ` [PULL 17/17] .gitlab-ci.d/buildtest.yml: Work around htags bug when environment is large Thomas Huth
2024-01-12 17:27 ` [PULL 00/17] Misc patches (qtests, s390x, m68k, gitlab-ci) Peter Maydell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240111170047.909117-5-thuth@redhat.com \
--to=thuth@redhat.com \
--cc=berrange@redhat.com \
--cc=peter.maydell@linaro.org \
--cc=qemu-devel@nongnu.org \
--cc=stefanha@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).