External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-01-10 14:57:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

qemu: Implement VIR_DOMAIN_BANDWIDTH_IN_FLOOR

Browse Source 
Well, there are just two places that needs adjustment:

qemuDomainGetInterfaceParameters - to report the @floor
qemuDomainSetInterfaceParameters - now that the function has been
fixed, we can allow updating @floor too.

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
This commit is contained in:
Michal Privoznik 2015-08-01 09:47:46 +02:00
parent d7f5c88961
commit b044e3257f
1 changed files with 21 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/qemu/qemu_driver.c
View File

@ -138,7 +138,7 @@ VIR_LOG_INIT("qemu.qemu_driver");
#define QEMU_NB_BLKIO_PARAM 6 #define QEMU_NB_BLKIO_PARAM 6
#define QEMU_NB_BANDWIDTH_PARAM 6 #define QEMU_NB_BANDWIDTH_PARAM 7
static void processWatchdogEvent(virQEMUDriverPtr driver, static void processWatchdogEvent(virQEMUDriverPtr driver,
virDomainObjPtr vm, virDomainObjPtr vm,
@ -11130,6 +11130,8 @@ qemuDomainSetInterfaceParameters(virDomainPtr dom,
VIR_TYPED_PARAM_UINT, VIR_TYPED_PARAM_UINT,
VIR_DOMAIN_BANDWIDTH_IN_BURST, VIR_DOMAIN_BANDWIDTH_IN_BURST,
VIR_TYPED_PARAM_UINT, VIR_TYPED_PARAM_UINT,
VIR_DOMAIN_BANDWIDTH_IN_FLOOR,
VIR_TYPED_PARAM_UINT,
VIR_DOMAIN_BANDWIDTH_OUT_AVERAGE, VIR_DOMAIN_BANDWIDTH_OUT_AVERAGE,
VIR_TYPED_PARAM_UINT, VIR_TYPED_PARAM_UINT,
VIR_DOMAIN_BANDWIDTH_OUT_PEAK, VIR_DOMAIN_BANDWIDTH_OUT_PEAK,
@ -11182,6 +11184,9 @@ qemuDomainSetInterfaceParameters(virDomainPtr dom,
bandwidth->in->peak = params[i].value.ui; bandwidth->in->peak = params[i].value.ui;
} else if (STREQ(param->field, VIR_DOMAIN_BANDWIDTH_IN_BURST)) { } else if (STREQ(param->field, VIR_DOMAIN_BANDWIDTH_IN_BURST)) {
bandwidth->in->burst = params[i].value.ui; bandwidth->in->burst = params[i].value.ui;
} else if (STREQ(param->field, VIR_DOMAIN_BANDWIDTH_IN_FLOOR)) {
bandwidth->in->floor = params[i].value.ui;
inboundSpecified = true;
} else if (STREQ(param->field, VIR_DOMAIN_BANDWIDTH_OUT_AVERAGE)) { } else if (STREQ(param->field, VIR_DOMAIN_BANDWIDTH_OUT_AVERAGE)) {
bandwidth->out->average = params[i].value.ui; bandwidth->out->average = params[i].value.ui;
outboundSpecified = true; outboundSpecified = true;
@ -11192,10 +11197,10 @@ qemuDomainSetInterfaceParameters(virDomainPtr dom,
} }
} }
/* average is mandatory, peak and burst are optional. So if no /* average or floor are mandatory, peak and burst are optional.
* average is given, we free inbound/outbound here which causes * So if no average or floor is given, we free inbound/outbound
* inbound/outbound to not be set. */ * here which causes inbound/outbound to not be set. */
if (!bandwidth->in->average) if (!bandwidth->in->average && !bandwidth->in->floor)
VIR_FREE(bandwidth->in); VIR_FREE(bandwidth->in);
if (!bandwidth->out->average) if (!bandwidth->out->average)
VIR_FREE(bandwidth->out); VIR_FREE(bandwidth->out);
@ -11359,7 +11364,15 @@ qemuDomainGetInterfaceParameters(virDomainPtr dom,
if (net->bandwidth && net->bandwidth->in) if (net->bandwidth && net->bandwidth->in)
params[i].value.ui = net->bandwidth->in->burst; params[i].value.ui = net->bandwidth->in->burst;
break; break;
case 3: /* outbound.average */ case 3: /* inbound.floor */
if (virTypedParameterAssign(&params[i],
VIR_DOMAIN_BANDWIDTH_IN_FLOOR,
VIR_TYPED_PARAM_UINT, 0) < 0)
goto cleanup;
if (net->bandwidth && net->bandwidth->in)
params[i].value.ui = net->bandwidth->in->floor;
break;
case 4: /* outbound.average */
if (virTypedParameterAssign(&params[i], if (virTypedParameterAssign(&params[i],
VIR_DOMAIN_BANDWIDTH_OUT_AVERAGE, VIR_DOMAIN_BANDWIDTH_OUT_AVERAGE,
VIR_TYPED_PARAM_UINT, 0) < 0) VIR_TYPED_PARAM_UINT, 0) < 0)
@ -11367,7 +11380,7 @@ qemuDomainGetInterfaceParameters(virDomainPtr dom,
if (net->bandwidth && net->bandwidth->out) if (net->bandwidth && net->bandwidth->out)
params[i].value.ui = net->bandwidth->out->average; params[i].value.ui = net->bandwidth->out->average;
break; break;
case 4: /* outbound.peak */ case 5: /* outbound.peak */
if (virTypedParameterAssign(&params[i], if (virTypedParameterAssign(&params[i],
VIR_DOMAIN_BANDWIDTH_OUT_PEAK, VIR_DOMAIN_BANDWIDTH_OUT_PEAK,
VIR_TYPED_PARAM_UINT, 0) < 0) VIR_TYPED_PARAM_UINT, 0) < 0)
@ -11375,7 +11388,7 @@ qemuDomainGetInterfaceParameters(virDomainPtr dom,
if (net->bandwidth && net->bandwidth->out) if (net->bandwidth && net->bandwidth->out)
params[i].value.ui = net->bandwidth->out->peak; params[i].value.ui = net->bandwidth->out->peak;
break; break;
case 5: /* outbound.burst */ case 6: /* outbound.burst */
if (virTypedParameterAssign(&params[i], if (virTypedParameterAssign(&params[i],
VIR_DOMAIN_BANDWIDTH_OUT_BURST, VIR_DOMAIN_BANDWIDTH_OUT_BURST,
VIR_TYPED_PARAM_UINT, 0) < 0) VIR_TYPED_PARAM_UINT, 0) < 0)