From 5ce28b6d3b82b0909e4772dd4252c5f985a3270a Mon Sep 17 00:00:00 2001 From: Peter Krempa Date: Thu, 28 May 2015 14:40:30 +0200 Subject: [PATCH] Revert "cputune: Support cputune for xend driver" This reverts commit 01692bb167f7ab81213921ba1116d46a4651ef0e. Quoting the original commit message: "Not sure if it's the correct way to add cputune xml for xend driver..." It is not. The defition created that is converted from the internal xend structures would also be leaked since it isn't used any more. Revert the commit since it does not make sense to keep the info internally. --- src/xen/xend_internal.c | 34 ++-------------------------------- 1 file changed, 2 insertions(+), 32 deletions(-) diff --git a/src/xen/xend_internal.c b/src/xen/xend_internal.c index 99dfdcbf7b..b81c0b7436 100644 --- a/src/xen/xend_internal.c +++ b/src/xen/xend_internal.c @@ -1853,9 +1853,7 @@ xenDaemonDomainPinVcpu(virConnectPtr conn, { char buf[VIR_UUID_BUFLEN], mapstr[sizeof(cpumap_t) * 64]; size_t i, j; - int ret; xenUnifiedPrivatePtr priv = conn->privateData; - virDomainDefPtr def = NULL; if (maplen > (int)sizeof(cpumap_t)) { virReportError(VIR_ERR_INVALID_ARG, __FUNCTION__); @@ -1882,37 +1880,9 @@ xenDaemonDomainPinVcpu(virConnectPtr conn, snprintf(buf, sizeof(buf), "%d", vcpu); - ret = xend_op(conn, minidef->name, "op", "pincpu", "vcpu", buf, - "cpumap", mapstr, NULL); + return xend_op(conn, minidef->name, "op", "pincpu", "vcpu", buf, + "cpumap", mapstr, NULL); - if (!(def = xenDaemonDomainFetch(conn, - minidef->id, - minidef->name, - NULL))) - goto cleanup; - - if (ret == 0) { - if (!def->cputune.vcpupin) { - if (VIR_ALLOC(def->cputune.vcpupin) < 0) - goto cleanup; - def->cputune.nvcpupin = 0; - } - if (virDomainPinAdd(&def->cputune.vcpupin, - &def->cputune.nvcpupin, - cpumap, - maplen, - vcpu) < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, - "%s", _("failed to add vcpupin xml entry")); - return -1; - } - } - - return ret; - - cleanup: - virDomainDefFree(def); - return -1; } /**