From bd17012f0c2a689c814923e5c7c61b278e9636d6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= Date: Wed, 26 Jun 2019 16:46:50 +0100 Subject: [PATCH] Revert "error: Add VIR_ERR_DEPRECATED error code" MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 226094fbc483128c8888f4171c353aed738b8346. A deprecation is a warning to something that use of a feature is being discouraged. By definition it is not an error condition to continue to use a deprecated feature. A VIR_ERR_DEPRECATED constant thus makes no conceptual sense. For features which are entirely absent we already document that the VIR_ERR_NO_SUPPORT code will be used. There is no need to distinguish between a feature which never existed and a feature which previously existed and was since removed. Reviewed-by: Ján Tomko Signed-off-by: Daniel P. Berrangé --- include/libvirt/virterror.h | 1 - src/util/virerror.c | 4 ---- 2 files changed, 5 deletions(-) diff --git a/include/libvirt/virterror.h b/include/libvirt/virterror.h index 22bc3c2d27..102a2573bf 100644 --- a/include/libvirt/virterror.h +++ b/include/libvirt/virterror.h @@ -329,7 +329,6 @@ typedef enum { VIR_ERR_INVALID_NETWORK_PORT = 105, /* invalid network port object */ VIR_ERR_NETWORK_PORT_EXIST = 106, /* the network port already exist */ VIR_ERR_NO_NETWORK_PORT = 107, /* network port not found */ - VIR_ERR_DEPRECATED = 108, /* configuration or operation is no longer supported */ # ifdef VIR_ENUM_SENTINELS VIR_ERR_NUMBER_LAST diff --git a/src/util/virerror.c b/src/util/virerror.c index 26f14ddd29..dfba8c5712 100644 --- a/src/util/virerror.c +++ b/src/util/virerror.c @@ -1235,10 +1235,6 @@ const virErrorMsgTuple virErrorMsgStrings[VIR_ERR_NUMBER_LAST] = { [VIR_ERR_NO_NETWORK_PORT] = { N_("network port not found"), N_("network port not found: %s") }, - [VIR_ERR_DEPRECATED] = { - N_("operation or configuration no longer supported"), - "%s", - }, };