mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2025-01-20 11:35:19 +00:00
Remove unused macros
In the order of appearance: * MAX_LISTEN - never used added by 23ad665c (qemud) and addec57 (lock daemon) * NEXT_FREE_CLASS_ID - never used, added by 07d1b6b * virLockError - never used, added by eb8268a4 * OPENVZ_MAX_ARG, CMDBUF_LEN, CMDOP_LEN unused since the removal of ADD_ARG_LIT in d8b31306 * QEMU_NB_PER_CPU_STAT_PARAM - unused since 897808e * QEMU_CMD_PROMPT, QEMU_PASSWD_PROMPT - unused since 1dc10a7 * TEST_MODEL_WORDSIZE - unused since c25c18f7 * TEMPDIR - never used, added by 714bef5 * NSIG - workaround around old headers added by commit 60ed1d2 unused since virExec was moved by commit 02e8691 * DO_TEST_PARSE - never used, added by 9afa006 * DIFF_MSEC, GETTIMEOFDAY - unused since eee6eb6
This commit is contained in:
parent
4c7fb93d5a
commit
a0482396d7
@ -1097,7 +1097,6 @@ daemonUsage(const char *argv0, bool privileged)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
#define MAX_LISTEN 5
|
|
||||||
int main(int argc, char **argv) {
|
int main(int argc, char **argv) {
|
||||||
virNetServerPtr srv = NULL;
|
virNetServerPtr srv = NULL;
|
||||||
char *remote_config_file = NULL;
|
char *remote_config_file = NULL;
|
||||||
|
@ -47,7 +47,6 @@
|
|||||||
|
|
||||||
#define MAX_BRIDGE_ID 256
|
#define MAX_BRIDGE_ID 256
|
||||||
#define VIR_FROM_THIS VIR_FROM_NETWORK
|
#define VIR_FROM_THIS VIR_FROM_NETWORK
|
||||||
#define NEXT_FREE_CLASS_ID 3
|
|
||||||
/* currently, /sbin/tc implementation allows up to 16 bits for minor class size */
|
/* currently, /sbin/tc implementation allows up to 16 bits for minor class size */
|
||||||
#define CLASS_ID_BITMAP_SIZE (1<<16)
|
#define CLASS_ID_BITMAP_SIZE (1<<16)
|
||||||
|
|
||||||
|
@ -1111,7 +1111,6 @@ virLockDaemonUsage(const char *argv0, bool privileged)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
#define MAX_LISTEN 5
|
|
||||||
int main(int argc, char **argv) {
|
int main(int argc, char **argv) {
|
||||||
virNetServerProgramPtr lockProgram = NULL;
|
virNetServerProgramPtr lockProgram = NULL;
|
||||||
char *remote_config_file = NULL;
|
char *remote_config_file = NULL;
|
||||||
|
@ -38,10 +38,6 @@
|
|||||||
|
|
||||||
VIR_LOG_INIT("locking.lock_driver_lockd");
|
VIR_LOG_INIT("locking.lock_driver_lockd");
|
||||||
|
|
||||||
#define virLockError(code, ...) \
|
|
||||||
virReportErrorHelper(VIR_FROM_THIS, code, __FILE__, \
|
|
||||||
__FUNCTION__, __LINE__, __VA_ARGS__)
|
|
||||||
|
|
||||||
typedef struct _virLockManagerLockDaemonPrivate virLockManagerLockDaemonPrivate;
|
typedef struct _virLockManagerLockDaemonPrivate virLockManagerLockDaemonPrivate;
|
||||||
typedef virLockManagerLockDaemonPrivate *virLockManagerLockDaemonPrivatePtr;
|
typedef virLockManagerLockDaemonPrivate *virLockManagerLockDaemonPrivatePtr;
|
||||||
|
|
||||||
|
@ -63,10 +63,6 @@
|
|||||||
|
|
||||||
VIR_LOG_INIT("openvz.openvz_driver");
|
VIR_LOG_INIT("openvz.openvz_driver");
|
||||||
|
|
||||||
#define OPENVZ_MAX_ARG 28
|
|
||||||
#define CMDBUF_LEN 1488
|
|
||||||
#define CMDOP_LEN 288
|
|
||||||
|
|
||||||
#define OPENVZ_NB_MEM_PARAM 3
|
#define OPENVZ_NB_MEM_PARAM 3
|
||||||
|
|
||||||
static int openvzGetProcessInfo(unsigned long long *cpuTime, int vpsid);
|
static int openvzGetProcessInfo(unsigned long long *cpuTime, int vpsid);
|
||||||
|
@ -110,8 +110,6 @@ VIR_LOG_INIT("qemu.qemu_driver");
|
|||||||
|
|
||||||
#define QEMU_NB_NUMA_PARAM 2
|
#define QEMU_NB_NUMA_PARAM 2
|
||||||
|
|
||||||
#define QEMU_NB_PER_CPU_STAT_PARAM 2
|
|
||||||
|
|
||||||
#define QEMU_SCHED_MIN_PERIOD 1000LL
|
#define QEMU_SCHED_MIN_PERIOD 1000LL
|
||||||
#define QEMU_SCHED_MAX_PERIOD 1000000LL
|
#define QEMU_SCHED_MAX_PERIOD 1000000LL
|
||||||
#define QEMU_SCHED_MIN_QUOTA 1000LL
|
#define QEMU_SCHED_MIN_QUOTA 1000LL
|
||||||
|
@ -51,9 +51,6 @@
|
|||||||
|
|
||||||
VIR_LOG_INIT("qemu.qemu_monitor_text");
|
VIR_LOG_INIT("qemu.qemu_monitor_text");
|
||||||
|
|
||||||
#define QEMU_CMD_PROMPT "\n(qemu) "
|
|
||||||
#define QEMU_PASSWD_PROMPT "Password: "
|
|
||||||
|
|
||||||
#define DEBUG_IO 0
|
#define DEBUG_IO 0
|
||||||
|
|
||||||
/* Return -1 for error, 0 for success */
|
/* Return -1 for error, 0 for success */
|
||||||
|
@ -122,7 +122,6 @@ static int defaultConnections;
|
|||||||
static virMutex defaultLock = VIR_MUTEX_INITIALIZER;
|
static virMutex defaultLock = VIR_MUTEX_INITIALIZER;
|
||||||
|
|
||||||
#define TEST_MODEL "i686"
|
#define TEST_MODEL "i686"
|
||||||
#define TEST_MODEL_WORDSIZE 32
|
|
||||||
#define TEST_EMULATOR "/usr/bin/test-hv"
|
#define TEST_EMULATOR "/usr/bin/test-hv"
|
||||||
|
|
||||||
static const virNodeInfo defaultNodeInfo = {
|
static const virNodeInfo defaultNodeInfo = {
|
||||||
|
@ -71,9 +71,6 @@
|
|||||||
|
|
||||||
VIR_LOG_INIT("uml.uml_driver");
|
VIR_LOG_INIT("uml.uml_driver");
|
||||||
|
|
||||||
/* For storing short-lived temporary files. */
|
|
||||||
#define TEMPDIR LOCALSTATEDIR "/cache/libvirt"
|
|
||||||
|
|
||||||
typedef struct _umlDomainObjPrivate umlDomainObjPrivate;
|
typedef struct _umlDomainObjPrivate umlDomainObjPrivate;
|
||||||
typedef umlDomainObjPrivate *umlDomainObjPrivatePtr;
|
typedef umlDomainObjPrivate *umlDomainObjPrivatePtr;
|
||||||
struct _umlDomainObjPrivate {
|
struct _umlDomainObjPrivate {
|
||||||
|
@ -81,10 +81,6 @@
|
|||||||
#include "virstring.h"
|
#include "virstring.h"
|
||||||
#include "virutil.h"
|
#include "virutil.h"
|
||||||
|
|
||||||
#ifndef NSIG
|
|
||||||
# define NSIG 32
|
|
||||||
#endif
|
|
||||||
|
|
||||||
verify(sizeof(gid_t) <= sizeof(unsigned int) &&
|
verify(sizeof(gid_t) <= sizeof(unsigned int) &&
|
||||||
sizeof(uid_t) <= sizeof(unsigned int));
|
sizeof(uid_t) <= sizeof(unsigned int));
|
||||||
|
|
||||||
|
@ -259,16 +259,6 @@ mymain(void)
|
|||||||
*/
|
*/
|
||||||
virtTestQuiesceLibvirtErrors(false);
|
virtTestQuiesceLibvirtErrors(false);
|
||||||
|
|
||||||
#define DO_TEST_PARSE(addrstr, family, pass) \
|
|
||||||
do { \
|
|
||||||
virSocketAddr addr; \
|
|
||||||
struct testParseData data = { &addr, addrstr, family, pass }; \
|
|
||||||
memset(&addr, 0, sizeof(addr)); \
|
|
||||||
if (virtTestRun("Test parse " addrstr, \
|
|
||||||
testParseHelper, &data) < 0) \
|
|
||||||
ret = -1; \
|
|
||||||
} while (0)
|
|
||||||
|
|
||||||
#define DO_TEST_PARSE_AND_FORMAT(addrstr, family, pass) \
|
#define DO_TEST_PARSE_AND_FORMAT(addrstr, family, pass) \
|
||||||
do { \
|
do { \
|
||||||
virSocketAddr addr; \
|
virSocketAddr addr; \
|
||||||
|
@ -62,11 +62,6 @@
|
|||||||
|
|
||||||
VIR_LOG_INIT("tests.testutils");
|
VIR_LOG_INIT("tests.testutils");
|
||||||
|
|
||||||
#define GETTIMEOFDAY(T) gettimeofday(T, NULL)
|
|
||||||
#define DIFF_MSEC(T, U) \
|
|
||||||
((((int) ((T)->tv_sec - (U)->tv_sec)) * 1000000.0 + \
|
|
||||||
((int) ((T)->tv_usec - (U)->tv_usec))) / 1000.0)
|
|
||||||
|
|
||||||
#include "virfile.h"
|
#include "virfile.h"
|
||||||
|
|
||||||
static unsigned int testDebug = -1;
|
static unsigned int testDebug = -1;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user