External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-02-22 11:22:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

minor shmem clean-ups

Browse Source 
Signed-off-by: Martin Kletzander <mkletzan@redhat.com>
This commit is contained in:
Martin Kletzander 2014-10-04 10:46:22 +02:00
parent 8f17d0eaae
commit 34f514778b
3 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docs/formatdomain.html.in
View File

@ -5587,7 +5587,7 @@ qemu-kvm -net nic,model=? /dev/null
<p> <p>
A shared memory device allows to share a memory region between A shared memory device allows to share a memory region between
different virtual machines and the host. different virtual machines and the host.
<span class="since">Since 1.2.9, QEMU and KVM only</span> <span class="since">Since 1.2.10, QEMU and KVM only</span>
</p> </p>
<pre> <pre>

5
src/conf/domain_conf.c
View File

@ -17603,7 +17603,7 @@ virDomainShmemDefFormat(virBufferPtr buf,
virDomainShmemDefPtr def, virDomainShmemDefPtr def,
unsigned int flags) unsigned int flags)
{ {
virBufferAsprintf(buf, "<shmem name='%s'", def->name); virBufferEscapeString(buf, "<shmem name='%s'", def->name);
if (!def->size && if (!def->size &&
!def->server.enabled && !def->server.enabled &&
@ -17618,8 +17618,7 @@ virDomainShmemDefFormat(virBufferPtr buf,
virBufferAdjustIndent(buf, 2); virBufferAdjustIndent(buf, 2);
if (def->size) if (def->size)
virBufferAsprintf(buf, "<size unit='M'>%llu</size>\n", virBufferAsprintf(buf, "<size unit='M'>%llu</size>\n", def->size >> 20);
VIR_DIV_UP(def->size, 1024 * 1024));
if (def->server.enabled) { if (def->server.enabled) {
virBufferAddLit(buf, "<server"); virBufferAddLit(buf, "<server");

5
src/qemu/qemu_command.c
View File

@ -7549,7 +7549,7 @@ qemuBuildShmemDevCmd(virCommandPtr cmd,
/* /*
* Thanks to our parsing code, we have a guarantee that the * Thanks to our parsing code, we have a guarantee that the
* size is power of two and is at least a mebibyte in size. * size is power of two and is at least a mebibyte in size.
* But because it may change inthe future, the checks are * But because it may change in the future, the checks are
* doubled in here. * doubled in here.
*/ */
if (shmem->size & (shmem->size - 1)) { if (shmem->size & (shmem->size - 1)) {
@ -7562,8 +7562,7 @@ qemuBuildShmemDevCmd(virCommandPtr cmd,
_("shmem size must be at least 1 MiB")); _("shmem size must be at least 1 MiB"));
goto error; goto error;
} }
virBufferAsprintf(&buf, ",size=%llum", virBufferAsprintf(&buf, ",size=%llum", shmem->size >> 20);
VIR_DIV_UP(shmem->size, 1024 * 1024));
} }
if (!shmem->server.enabled) { if (!shmem->server.enabled) {