From nobody Mon Feb 9 03:31:22 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1562157710; cv=none; d=zoho.com; s=zohoarc; b=aG4lnLzVMqOQ8YmpTyTMxGGyMPPB//Zu43kTx/V16y99gjtySA+qnGTy/tFTKMG0gv7M8k/acim/qyweuXVdC4BUQutEsZwlC8pkZCIZKyqm2dUS7H1P+KKkrt5KwSoRZRK2UAVvkUfEFcmbpOe2jcg4LJBZ5snjtFIEJISjZQg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1562157710; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=JuazyYD7qCC5pUXrEKLwmkL0f3RJ6bPLR7J77NFROH0=; b=c0Qu6Mfn1bsi0iEsVN9Q/WCeI0tWaxLg8CwUVBT+ePZ1tD7vC2N6+AI+Wit2DyH2bbv0ri9pdSu5YmfDOdjCVk38/NYpVusf6TR3s2sOKWHPNZkeI5yDSenmSPPokRM8cvgUgr9APKfbBfP6exSPTTcUQJVs9QRMO9Niiq8XvLU= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1562157710009449.28762478364376; Wed, 3 Jul 2019 05:41:50 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 2721E90C7A; Wed, 3 Jul 2019 12:41:48 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id F26E7196A7; Wed, 3 Jul 2019 12:41:47 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id BA0C718433AB; Wed, 3 Jul 2019 12:41:47 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x63CcKCx007932 for ; Wed, 3 Jul 2019 08:38:20 -0400 Received: by smtp.corp.redhat.com (Postfix) id 3BDEB834EB; Wed, 3 Jul 2019 12:38:20 +0000 (UTC) Received: from angien.brq.redhat.com (unknown [10.43.2.229]) by smtp.corp.redhat.com (Postfix) with ESMTP id BC785891D6 for ; Wed, 3 Jul 2019 12:38:19 +0000 (UTC) From: Peter Krempa To: libvir-list@redhat.com Date: Wed, 3 Jul 2019 14:38:04 +0200 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 12/14] xen: drop xen_sxpr.(c|h) X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.29]); Wed, 03 Jul 2019 12:41:48 +0000 (UTC) Content-Type: text/plain; charset="utf-8" The files are now completely unused. Remove them. Signed-off-by: Peter Krempa Reviewed-by: J=C3=A1n Tomko --- 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 =3D \ 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 - * - * 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 - * . - */ - -#include - -#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 =3D string2sexpr(sexpr); - int ret; - - *id =3D -1; - - if (!root) - return -1; - - ret =3D 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 =3D sexpr_node(root, "domain/domid"); - - *id =3D 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 - * . - */ - -#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 -#include "xen_sxpr.h" /* xen-unstable changeset 19788 removed MAX_VIRT_CPUS from public * headers. Its semantic was retained with XEN_LEGACY_MAX_VCPUS. --=20 2.21.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list