External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-07-30 21:47:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

storagefile: Check version to determine if qcow2 or not

Browse Source 
Rather than require a boolean to be passed in

Reviewed-by: Daniel Henrique Barboza <danielhb413@gmail.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
Signed-off-by: Cole Robinson <crobinso@redhat.com>
This commit is contained in:
Cole Robinson 2019-10-04 18:12:14 -04:00
parent 8699899692
commit 253f2cae4a
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/util/virstoragefile.c
View File

@ -486,7 +486,7 @@ qcowXGetBackingStore(char **res,
int *format,
const char *buf,
size_t buf_size,
bool isQCow2)
bool isQCow2 ATTRIBUTE_UNUSED)
{
unsigned long long offset;
unsigned int size;
@ -548,8 +548,11 @@ qcowXGetBackingStore(char **res,
* for qcow2 v3 images, the length of the header
* is stored at QCOW2v3_HDR_SIZE
*/
if (isQCow2) {
version = virReadBufInt32BE(buf + QCOWX_HDR_VERSION);
version = virReadBufInt32BE(buf + QCOWX_HDR_VERSION);
if (version >= 2) {
/* QCow1 doesn't have the extensions capability
* used to store backing format */
if (version == 2)
start = QCOW2_HDR_TOTAL_SIZE;
else
@ -569,8 +572,6 @@ qcow1GetBackingStore(char **res,
const char *buf,
size_t buf_size)
{
/* QCow1 doesn't have the extensions capability
* used to store backing format */
return qcowXGetBackingStore(res, format, buf, buf_size, false);
}