conf: Use correct type for balloon stats period

We're parsing memballoon status period as unsigned int, but when we're
trying to set it, both we and qemu use signed int.  That means large
values will get wrapped around to negative one resulting in error.
Basically the same problem as commit e3a7b874 was dealing with when
updating live domain.

QEMU changed the accepted value to int64 in commit 1f9296b5, but even
values as INT_MAX don't make sense since the value passed means seconds.
Hence adding capability flag for this change isn't worth it.

Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1140958

Signed-off-by: Luyao Huang <lhuang@redhat.com>
Signed-off-by: Martin Kletzander <mkletzan@redhat.com>
This commit is contained in:
Martin Kletzander 2015-03-13 17:08:15 +01:00
parent 4fca30e0bd
commit ad69e8be4a
4 changed files with 20 additions and 16 deletions

View File

@ -5618,18 +5618,17 @@ qemu-kvm -net nic,model=? /dev/null
<dt><code>period</code></dt>
<dd>
<p>
The optional <code>period</code> allows the QEMU virtio memory
balloon driver to provide statistics through the <code>virsh
dommemstat [domain]</code> command. By default, collection is
not enabled. In order to enable, use the <code>virsh dommemstat
[domain] --period [number]</code> command or <code>virsh edit</code>
command to add the option to the XML definition.
The <code>virsh dommemstat</code> will accept the options
<code>--live</code>, <code>--current</code>, or <code>--config</code>.
If an option is not provided, the change for a running domain will
only be made to the active guest.
If the QEMU driver is not at the right
revision, the attempt to set the period will fail.
The optional <code>period</code> allows the QEMU virtio memory balloon
driver to provide statistics through the <code>virsh dommemstat
[domain]</code> command. By default, collection is not enabled. In
order to enable, use the <code>virsh dommemstat [domain] --period
[number]</code> command or <code>virsh edit</code> command to add the
option to the XML definition. The <code>virsh dommemstat</code> will
accept the options <code>--live</code>, <code>--current</code>,
or <code>--config</code>. If an option is not provided, the change
for a running domain will only be made to the active guest. If the
QEMU driver is not at the right revision, the attempt to set the
period will fail. Large values (e.g. many years) might be ignored.
<span class='since'>Since 1.1.1, requires QEMU 1.5</span>
</p>
</dd>

View File

@ -10492,6 +10492,7 @@ virDomainMemballoonDefParseXML(xmlNodePtr node,
char *model;
virDomainMemballoonDefPtr def;
xmlNodePtr save = ctxt->node;
unsigned int period = 0;
if (VIR_ALLOC(def) < 0)
return NULL;
@ -10510,12 +10511,16 @@ virDomainMemballoonDefParseXML(xmlNodePtr node,
}
ctxt->node = node;
if (virXPathUInt("string(./stats/@period)", ctxt, &def->period) < -1) {
if (virXPathUInt("string(./stats/@period)", ctxt, &period) < -1) {
virReportError(VIR_ERR_XML_ERROR, "%s",
_("invalid statistics collection period"));
goto error;
}
def->period = period;
if (def->period < 0)
def->period = 0;
if (def->model == VIR_DOMAIN_MEMBALLOON_MODEL_NONE)
VIR_DEBUG("Ignoring device address for none model Memballoon");
else if (virDomainDeviceInfoParseXML(node, NULL, &def->info, flags) < 0)
@ -18839,7 +18844,7 @@ virDomainMemballoonDefFormat(virBufferPtr buf,
virBufferAdjustIndent(&childrenBuf, indent + 2);
if (def->period)
virBufferAsprintf(&childrenBuf, "<stats period='%u'/>\n", def->period);
virBufferAsprintf(&childrenBuf, "<stats period='%i'/>\n", def->period);
if (virDomainDeviceInfoNeedsFormat(&def->info, flags) &&
virDomainDeviceInfoFormat(&childrenBuf, &def->info, flags) < 0) {

View File

@ -1560,7 +1560,7 @@ enum {
struct _virDomainMemballoonDef {
int model;
virDomainDeviceInfo info;
unsigned int period; /* seconds between collections */
int period; /* seconds between collections */
};
struct _virDomainNVRAMDef {

View File

@ -4309,7 +4309,7 @@ int qemuProcessStart(virConnectPtr conn,
virCommandPtr cmd = NULL;
struct qemuProcessHookData hookData;
unsigned long cur_balloon;
unsigned int period = 0;
int period = 0;
size_t i;
bool rawio_set = false;
char *nodeset = NULL;