Skip to content

Commit

Permalink
qemu: re-add padding to the saved state images
Browse files Browse the repository at this point in the history
In the past we added 1024 bytes of padding to saved state images so that
users can run "virsh managedsave-edit $GUEST" and make XML changes which
increase the size of the XML document. This padding was accidentally
lost a while back

  commit 6b9b21d
  Author: Peter Krempa <pkrempa@redhat.com>
  Date:   Wed Feb 17 13:10:11 2016 +0100

    qemu: Remove unnecessary calculations in qemuDomainSaveMemory

The original 1024 bytes was unreasonably stingy when we consider that
the QEMU state is typically going to be many 100's of MB in size. Thus
this adds 64 KB of padding after the XML which should cope with any
plausible modifications a user will want to make.

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

Reviewed-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
  • Loading branch information
berrange committed Apr 28, 2020
1 parent 856587e commit c4ccb0d
Showing 1 changed file with 10 additions and 7 deletions.
17 changes: 10 additions & 7 deletions src/qemu/qemu_driver.c
Expand Up @@ -2922,20 +2922,23 @@ virQEMUSaveDataWrite(virQEMUSaveDataPtr data,

len = xml_len + cookie_len;

if (header->data_len > 0) {
if (header->data_len == 0) {
/* This 64kb padding allows the user to edit the XML in
* a saved state image and have the new XML be larger
* that what was originally saved
*/
header->data_len = len + (64 * 1024);
} else {
if (len > header->data_len) {
virReportError(VIR_ERR_OPERATION_FAILED, "%s",
_("new xml too large to fit in file"));
return -1;
}

zerosLen = header->data_len - len;
if (VIR_ALLOC_N(zeros, zerosLen) < 0)
return -1;
} else {
header->data_len = len;
}

zerosLen = header->data_len - len;
zeros = g_new0(char, zerosLen);

if (data->cookie)
header->cookieOffset = xml_len;

Expand Down

0 comments on commit c4ccb0d

Please sign in to comment.