7:38 a.m.
The files are now completely unused. Remove them.
Signed-off-by: Peter Krempa <pkrempa(a)redhat.com>
---
src/libvirt_xenconfig.syms | 4 ---
src/xenconfig/Makefile.inc.am | 2 --
src/xenconfig/xen_sxpr.c | 64 -----------------------------------
src/xenconfig/xen_sxpr.h | 32 ------------------
src/xenconfig/xenxs_private.h | 1 -
5 files changed, 103 deletions(-)
delete mode 100644 src/xenconfig/xen_sxpr.c
delete mode 100644 src/xenconfig/xen_sxpr.h
diff --git a/src/libvirt_xenconfig.syms b/src/libvirt_xenconfig.syms
index ddaecd6850..6e2e578b15 100644
--- a/src/libvirt_xenconfig.syms
+++ b/src/libvirt_xenconfig.syms
@@ -2,10 +2,6 @@
# These symbols are dependent upon --with-xen via WITH_XEN or --with-libxl via
WITH_LIBXL.
#
-# xenconfig/xen_sxpr.h
-xenGetDomIdFromSxpr;
-xenGetDomIdFromSxprString;
-
# xenconfig/xen_xm.h
xenFormatXM;
xenParseXM;
diff --git a/src/xenconfig/Makefile.inc.am b/src/xenconfig/Makefile.inc.am
index cd751029d2..5785b49268 100644
--- a/src/xenconfig/Makefile.inc.am
+++ b/src/xenconfig/Makefile.inc.am
@@ -4,8 +4,6 @@ XENCONFIG_SOURCES = \
xenconfig/xenxs_private.h \
xenconfig/xen_common.c \
xenconfig/xen_common.h \
- xenconfig/xen_sxpr.c \
- xenconfig/xen_sxpr.h \
xenconfig/xen_xm.c \
xenconfig/xen_xm.h \
$(NULL)
diff --git a/src/xenconfig/xen_sxpr.c b/src/xenconfig/xen_sxpr.c
deleted file mode 100644
index f087464c4d..0000000000
--- a/src/xenconfig/xen_sxpr.c
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * xen_sxpr.c: Xen SEXPR parsing functions
- *
- * Copyright (C) 2010-2016 Red Hat, Inc.
- * Copyright (C) 2011 Univention GmbH
- * Copyright (C) 2005 Anthony Liguori <aliguori(a)us.ibm.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library. If not, see
- * <http://www.gnu.org/licenses/>;.
- */
-
-#include <config.h>
-
-#include "internal.h"
-#include "virerror.h"
-#include "virconf.h"
-#include "viralloc.h"
-#include "viruuid.h"
-#include "virlog.h"
-#include "count-one-bits.h"
-#include "xenxs_private.h"
-#include "xen_sxpr.h"
-#include "virstoragefile.h"
-#include "virstring.h"
-
-#define VIR_FROM_THIS VIR_FROM_SEXPR
-
-VIR_LOG_INIT("xenconfig.xen_sxpr");
-
-/* Get a domain id from a S-expression string */
-int xenGetDomIdFromSxprString(const char *sexpr, int *id)
-{
- struct sexpr *root = string2sexpr(sexpr);
- int ret;
-
- *id = -1;
-
- if (!root)
- return -1;
-
- ret = xenGetDomIdFromSxpr(root, id);
- sexpr_free(root);
- return ret;
-}
-
-/* Get a domain id from a S-expression */
-int xenGetDomIdFromSxpr(const struct sexpr *root, int *id)
-{
- const char * tmp = sexpr_node(root, "domain/domid");
-
- *id = tmp ? sexpr_int(root, "domain/domid") : -1;
- return 0;
-}
diff --git a/src/xenconfig/xen_sxpr.h b/src/xenconfig/xen_sxpr.h
deleted file mode 100644
index ad6e293e57..0000000000
--- a/src/xenconfig/xen_sxpr.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * xen_sxpr.h: Xen SEXPR parsing functions
- *
- * Copyright (C) 2006-2008, 2010, 2012 Red Hat, Inc.
- * Copyright (C) 2011 Univention GmbH
- * Copyright (C) 2005,2006
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library. If not, see
- * <http://www.gnu.org/licenses/>;.
- */
-
-#pragma once
-
-#include "internal.h"
-#include "virconf.h"
-#include "domain_conf.h"
-#include "virsexpr.h"
-
-/* helper functions to get the dom id from a sexpr */
-int xenGetDomIdFromSxprString(const char *sexpr, int *id);
-int xenGetDomIdFromSxpr(const struct sexpr *root, int *id);
diff --git a/src/xenconfig/xenxs_private.h b/src/xenconfig/xenxs_private.h
index 79909aba2f..2b0877d67e 100644
--- a/src/xenconfig/xenxs_private.h
+++ b/src/xenconfig/xenxs_private.h
@@ -24,7 +24,6 @@
#include "internal.h"
#include <xen/xen.h>
-#include "xen_sxpr.h"
/* xen-unstable changeset 19788 removed MAX_VIRT_CPUS from public
* headers. Its semantic was retained with XEN_LEGACY_MAX_VCPUS.
--
2.21.0