|
 |
7a3408 |
From 967db74af2bc58af78339a40a079759ec265b8ad Mon Sep 17 00:00:00 2001
|
|
|
7a3408 |
Message-Id: <967db74af2bc58af78339a40a079759ec265b8ad@dist-git>
|
|
|
7a3408 |
From: Luyao Huang <lhuang@redhat.com>
|
|
|
7a3408 |
Date: Wed, 5 Aug 2015 18:18:06 +0200
|
|
|
7a3408 |
Subject: [PATCH] qemu: remove deadcode in
|
|
|
7a3408 |
qemuDomain{HelperGetVcpus|GetIOThreadsLive}
|
|
|
7a3408 |
|
|
|
7a3408 |
We set @hostcpus variable but not use it.
|
|
|
7a3408 |
|
|
|
7a3408 |
Signed-off-by: Luyao Huang <lhuang@redhat.com>
|
|
|
7a3408 |
(cherry picked from commit 3b2b4114da4341feaf477cec7bc20556810e11e7)
|
|
|
7a3408 |
|
|
|
7a3408 |
Bug: https://bugzilla.redhat.com/show_bug.cgi?id=1213713
|
|
|
7a3408 |
|
|
|
7a3408 |
Signed-off-by: Andrea Bolognani <abologna@redhat.com>
|
|
|
7a3408 |
Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
|
|
|
7a3408 |
---
|
|
|
7a3408 |
src/qemu/qemu_driver.c | 8 --------
|
|
|
7a3408 |
1 file changed, 8 deletions(-)
|
|
|
7a3408 |
|
|
|
7a3408 |
diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
|
|
|
7a3408 |
index c59186d..8f5e4fb 100644
|
|
|
7a3408 |
--- a/src/qemu/qemu_driver.c
|
|
|
7a3408 |
+++ b/src/qemu/qemu_driver.c
|
|
|
7a3408 |
@@ -1427,13 +1427,9 @@ static int
|
|
|
7a3408 |
qemuDomainHelperGetVcpus(virDomainObjPtr vm, virVcpuInfoPtr info, int maxinfo,
|
|
|
7a3408 |
unsigned char *cpumaps, int maplen)
|
|
|
7a3408 |
{
|
|
|
7a3408 |
- int hostcpus;
|
|
|
7a3408 |
size_t i, v;
|
|
|
7a3408 |
qemuDomainObjPrivatePtr priv = vm->privateData;
|
|
|
7a3408 |
|
|
|
7a3408 |
- if ((hostcpus = nodeGetCPUCount()) < 0)
|
|
|
7a3408 |
- return -1;
|
|
|
7a3408 |
-
|
|
|
7a3408 |
if (priv->vcpupids == NULL) {
|
|
|
7a3408 |
virReportError(VIR_ERR_OPERATION_INVALID,
|
|
|
7a3408 |
"%s", _("cpu affinity is not supported"));
|
|
|
7a3408 |
@@ -5599,7 +5595,6 @@ qemuDomainGetIOThreadsLive(virQEMUDriverPtr driver,
|
|
|
7a3408 |
qemuMonitorIOThreadInfoPtr *iothreads = NULL;
|
|
|
7a3408 |
virDomainIOThreadInfoPtr *info_ret = NULL;
|
|
|
7a3408 |
int niothreads = 0;
|
|
|
7a3408 |
- int hostcpus;
|
|
|
7a3408 |
size_t i;
|
|
|
7a3408 |
int ret = -1;
|
|
|
7a3408 |
|
|
|
7a3408 |
@@ -5632,9 +5627,6 @@ qemuDomainGetIOThreadsLive(virQEMUDriverPtr driver,
|
|
|
7a3408 |
goto endjob;
|
|
|
7a3408 |
}
|
|
|
7a3408 |
|
|
|
7a3408 |
- if ((hostcpus = nodeGetCPUCount()) < 0)
|
|
|
7a3408 |
- goto endjob;
|
|
|
7a3408 |
-
|
|
|
7a3408 |
if (VIR_ALLOC_N(info_ret, niothreads) < 0)
|
|
|
7a3408 |
goto endjob;
|
|
|
7a3408 |
|
|
|
7a3408 |
--
|
|
|
7a3408 |
2.5.0
|
|
|
7a3408 |
|