2009-09-25 13:20:13 +00:00
|
|
|
/*
|
2012-12-13 15:25:48 +00:00
|
|
|
* virstoragefile.c: file utility functions for FS storage backend
|
2009-09-25 13:20:13 +00:00
|
|
|
*
|
2013-02-04 19:16:22 +00:00
|
|
|
* Copyright (C) 2007-2013 Red Hat, Inc.
|
2009-09-25 13:20:13 +00:00
|
|
|
* Copyright (C) 2007-2008 Daniel P. Berrange
|
|
|
|
*
|
|
|
|
* This library is free software; you can redistribute it and/or
|
|
|
|
* modify it under the terms of the GNU Lesser General Public
|
|
|
|
* License as published by the Free Software Foundation; either
|
|
|
|
* version 2.1 of the License, or (at your option) any later version.
|
|
|
|
*
|
|
|
|
* This library is distributed in the hope that it will be useful,
|
|
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
|
|
* Lesser General Public License for more details.
|
|
|
|
*
|
|
|
|
* You should have received a copy of the GNU Lesser General Public
|
2012-09-20 22:30:55 +00:00
|
|
|
* License along with this library. If not, see
|
2012-07-21 10:06:23 +00:00
|
|
|
* <http://www.gnu.org/licenses/>.
|
2009-09-25 13:20:13 +00:00
|
|
|
*
|
|
|
|
* Author: Daniel P. Berrange <berrange@redhat.com>
|
|
|
|
*/
|
|
|
|
|
|
|
|
#include <config.h>
|
2012-12-13 15:25:48 +00:00
|
|
|
#include "virstoragefile.h"
|
2009-09-25 13:20:13 +00:00
|
|
|
|
2011-05-26 18:05:32 +00:00
|
|
|
#include <sys/stat.h>
|
2009-09-29 08:34:48 +00:00
|
|
|
#include <unistd.h>
|
2009-09-29 08:41:23 +00:00
|
|
|
#include <fcntl.h>
|
2012-10-09 23:47:42 +00:00
|
|
|
#include <stdlib.h>
|
Don't reset user/group/security label on shared filesystems during migrate
When QEMU runs with its disk on NFS, and as a non-root user, the
disk is chownd to that non-root user. When migration completes
the last step is shutting down the QEMU on the source host. THis
normally resets user/group/security label. This is bad when the
VM was just migrated because the file is still in use on the dest
host. It is thus neccessary to skip the reset step for any files
found to be on a shared filesystem
* src/libvirt_private.syms: Export virStorageFileIsSharedFS
* src/util/storage_file.c, src/util/storage_file.h: Add a new
method virStorageFileIsSharedFS() to determine if a file is
on a shared filesystem (NFS, GFS, OCFS2, etc)
* src/qemu/qemu_driver.c: Tell security driver not to reset
disk labels on migration completion
* src/qemu/qemu_security_dac.c, src/qemu/qemu_security_stacked.c,
src/security/security_selinux.c, src/security/security_driver.h,
src/security/security_apparmor.c: Add ability to skip disk
restore step for files on shared filesystems.
2010-05-13 15:49:22 +00:00
|
|
|
#ifdef __linux__
|
2010-05-17 14:17:08 +00:00
|
|
|
# if HAVE_LINUX_MAGIC_H
|
|
|
|
# include <linux/magic.h>
|
|
|
|
# endif
|
Don't reset user/group/security label on shared filesystems during migrate
When QEMU runs with its disk on NFS, and as a non-root user, the
disk is chownd to that non-root user. When migration completes
the last step is shutting down the QEMU on the source host. THis
normally resets user/group/security label. This is bad when the
VM was just migrated because the file is still in use on the dest
host. It is thus neccessary to skip the reset step for any files
found to be on a shared filesystem
* src/libvirt_private.syms: Export virStorageFileIsSharedFS
* src/util/storage_file.c, src/util/storage_file.h: Add a new
method virStorageFileIsSharedFS() to determine if a file is
on a shared filesystem (NFS, GFS, OCFS2, etc)
* src/qemu/qemu_driver.c: Tell security driver not to reset
disk labels on migration completion
* src/qemu/qemu_security_dac.c, src/qemu/qemu_security_stacked.c,
src/security/security_selinux.c, src/security/security_driver.h,
src/security/security_apparmor.c: Add ability to skip disk
restore step for files on shared filesystems.
2010-05-13 15:49:22 +00:00
|
|
|
# include <sys/statfs.h>
|
|
|
|
#endif
|
2010-02-04 15:55:57 +00:00
|
|
|
#include "dirname.h"
|
2012-12-12 18:06:53 +00:00
|
|
|
#include "viralloc.h"
|
2012-12-13 18:21:53 +00:00
|
|
|
#include "virerror.h"
|
2012-12-12 17:59:27 +00:00
|
|
|
#include "virlog.h"
|
2011-07-19 18:32:58 +00:00
|
|
|
#include "virfile.h"
|
2011-07-20 09:40:53 +00:00
|
|
|
#include "c-ctype.h"
|
2012-12-12 16:27:01 +00:00
|
|
|
#include "vircommand.h"
|
2012-10-13 16:47:15 +00:00
|
|
|
#include "virhash.h"
|
2013-02-07 01:57:13 +00:00
|
|
|
#include "virendian.h"
|
2013-04-03 10:36:23 +00:00
|
|
|
#include "virstring.h"
|
|
|
|
#include "virutil.h"
|
2009-09-29 08:34:48 +00:00
|
|
|
|
|
|
|
#define VIR_FROM_THIS VIR_FROM_STORAGE
|
|
|
|
|
2009-09-25 13:20:13 +00:00
|
|
|
VIR_ENUM_IMPL(virStorageFileFormat,
|
|
|
|
VIR_STORAGE_FILE_LAST,
|
storage: list more file types
When an image has no backing file, using VIR_STORAGE_FILE_AUTO
for its type is a bit confusing. Additionally, a future patch
would like to reserve a default value for the case of no file
type specified in the XML, but different from the current use
of -1 to imply probing, since probing is not always safe.
Also, a couple of file types were missing compared to supported
code: libxl supports 'vhd', and qemu supports 'fat' for directories
passed through as a file system.
* src/util/storage_file.h (virStorageFileFormat): Add
VIR_STORAGE_FILE_NONE, VIR_STORAGE_FILE_FAT, VIR_STORAGE_FILE_VHD.
* src/util/storage_file.c (virStorageFileMatchesVersion): Match
documentation when version probing not supported.
(cowGetBackingStore, qcowXGetBackingStore, qcow1GetBackingStore)
(qcow2GetBackingStoreFormat, qedGetBackingStore)
(virStorageFileGetMetadataFromBuf)
(virStorageFileGetMetadataFromFD): Take NONE into account.
* src/conf/domain_conf.c (virDomainDiskDefForeachPath): Likewise.
* src/qemu/qemu_driver.c (qemuDomainGetBlockInfo): Likewise.
* src/conf/storage_conf.c (virStorageVolumeFormatFromString): New
function.
(poolTypeInfo): Use it.
2012-09-28 17:11:07 +00:00
|
|
|
"none",
|
2010-11-22 20:08:17 +00:00
|
|
|
"raw", "dir", "bochs",
|
2009-09-25 13:20:13 +00:00
|
|
|
"cloop", "cow", "dmg", "iso",
|
storage: list more file types
When an image has no backing file, using VIR_STORAGE_FILE_AUTO
for its type is a bit confusing. Additionally, a future patch
would like to reserve a default value for the case of no file
type specified in the XML, but different from the current use
of -1 to imply probing, since probing is not always safe.
Also, a couple of file types were missing compared to supported
code: libxl supports 'vhd', and qemu supports 'fat' for directories
passed through as a file system.
* src/util/storage_file.h (virStorageFileFormat): Add
VIR_STORAGE_FILE_NONE, VIR_STORAGE_FILE_FAT, VIR_STORAGE_FILE_VHD.
* src/util/storage_file.c (virStorageFileMatchesVersion): Match
documentation when version probing not supported.
(cowGetBackingStore, qcowXGetBackingStore, qcow1GetBackingStore)
(qcow2GetBackingStoreFormat, qedGetBackingStore)
(virStorageFileGetMetadataFromBuf)
(virStorageFileGetMetadataFromFD): Take NONE into account.
* src/conf/domain_conf.c (virDomainDiskDefForeachPath): Likewise.
* src/qemu/qemu_driver.c (qemuDomainGetBlockInfo): Likewise.
* src/conf/storage_conf.c (virStorageVolumeFormatFromString): New
function.
(poolTypeInfo): Use it.
2012-09-28 17:11:07 +00:00
|
|
|
"qcow", "qcow2", "qed", "vmdk", "vpc",
|
2013-02-04 19:18:22 +00:00
|
|
|
"fat", "vhd", "vdi")
|
2009-09-29 08:34:48 +00:00
|
|
|
|
|
|
|
enum lv_endian {
|
|
|
|
LV_LITTLE_ENDIAN = 1, /* 1234 */
|
|
|
|
LV_BIG_ENDIAN /* 4321 */
|
|
|
|
};
|
|
|
|
|
|
|
|
enum {
|
|
|
|
BACKING_STORE_OK,
|
|
|
|
BACKING_STORE_INVALID,
|
|
|
|
BACKING_STORE_ERROR,
|
|
|
|
};
|
|
|
|
|
|
|
|
/* Either 'magic' or 'extension' *must* be provided */
|
|
|
|
struct FileTypeInfo {
|
2013-02-04 19:16:22 +00:00
|
|
|
int magicOffset; /* Byte offset of the magic */
|
2009-09-29 08:34:48 +00:00
|
|
|
const char *magic; /* Optional string of file magic
|
|
|
|
* to check at head of file */
|
|
|
|
const char *extension; /* Optional file extension to check */
|
|
|
|
enum lv_endian endian; /* Endianness of file format */
|
|
|
|
int versionOffset; /* Byte offset from start of file
|
|
|
|
* where we find version number,
|
|
|
|
* -1 to skip version test */
|
|
|
|
int versionNumber; /* Version number to validate */
|
|
|
|
int sizeOffset; /* Byte offset from start of file
|
|
|
|
* where we find capacity info,
|
|
|
|
* -1 to use st_size as capacity */
|
|
|
|
int sizeBytes; /* Number of bytes for size field */
|
|
|
|
int sizeMultiplier; /* A scaling factor if size is not in bytes */
|
|
|
|
/* Store a COW base image path (possibly relative),
|
|
|
|
* or NULL if there is no COW base image, to RES;
|
|
|
|
* return BACKING_STORE_* */
|
|
|
|
int qcowCryptOffset; /* Byte offset from start of file
|
|
|
|
* where to find encryption mode,
|
|
|
|
* -1 if encryption is not used */
|
2010-06-14 14:53:59 +00:00
|
|
|
int (*getBackingStore)(char **res, int *format,
|
|
|
|
const unsigned char *buf, size_t buf_size);
|
2009-09-29 08:34:48 +00:00
|
|
|
};
|
|
|
|
|
2010-06-14 14:53:59 +00:00
|
|
|
static int cowGetBackingStore(char **, int *,
|
|
|
|
const unsigned char *, size_t);
|
|
|
|
static int qcow1GetBackingStore(char **, int *,
|
|
|
|
const unsigned char *, size_t);
|
|
|
|
static int qcow2GetBackingStore(char **, int *,
|
|
|
|
const unsigned char *, size_t);
|
|
|
|
static int vmdk4GetBackingStore(char **, int *,
|
|
|
|
const unsigned char *, size_t);
|
2010-11-19 23:19:24 +00:00
|
|
|
static int
|
|
|
|
qedGetBackingStore(char **, int *, const unsigned char *, size_t);
|
2010-06-14 14:53:59 +00:00
|
|
|
|
|
|
|
#define QCOWX_HDR_VERSION (4)
|
|
|
|
#define QCOWX_HDR_BACKING_FILE_OFFSET (QCOWX_HDR_VERSION+4)
|
|
|
|
#define QCOWX_HDR_BACKING_FILE_SIZE (QCOWX_HDR_BACKING_FILE_OFFSET+8)
|
|
|
|
#define QCOWX_HDR_IMAGE_SIZE (QCOWX_HDR_BACKING_FILE_SIZE+4+4)
|
|
|
|
|
|
|
|
#define QCOW1_HDR_CRYPT (QCOWX_HDR_IMAGE_SIZE+8+1+1)
|
|
|
|
#define QCOW2_HDR_CRYPT (QCOWX_HDR_IMAGE_SIZE+8)
|
|
|
|
|
|
|
|
#define QCOW1_HDR_TOTAL_SIZE (QCOW1_HDR_CRYPT+4+8)
|
|
|
|
#define QCOW2_HDR_TOTAL_SIZE (QCOW2_HDR_CRYPT+4+4+8+8+4+4+8)
|
|
|
|
|
|
|
|
#define QCOW2_HDR_EXTENSION_END 0
|
|
|
|
#define QCOW2_HDR_EXTENSION_BACKING_FORMAT 0xE2792ACA
|
|
|
|
|
2010-11-19 23:19:24 +00:00
|
|
|
#define QED_HDR_FEATURES_OFFSET (4+4+4+4)
|
2010-11-22 20:08:17 +00:00
|
|
|
#define QED_HDR_IMAGE_SIZE (QED_HDR_FEATURES_OFFSET+8+8+8+8)
|
|
|
|
#define QED_HDR_BACKING_FILE_OFFSET (QED_HDR_IMAGE_SIZE+8)
|
2010-11-19 23:19:24 +00:00
|
|
|
#define QED_HDR_BACKING_FILE_SIZE (QED_HDR_BACKING_FILE_OFFSET+4)
|
|
|
|
#define QED_F_BACKING_FILE 0x01
|
|
|
|
#define QED_F_BACKING_FORMAT_NO_PROBE 0x04
|
2010-11-19 16:18:16 +00:00
|
|
|
|
2013-02-04 19:16:22 +00:00
|
|
|
/* VMDK needs at least 20*512 B to find backing store,
|
|
|
|
* ISO has 5 Byte magic on offset 32769,
|
2010-06-15 13:58:10 +00:00
|
|
|
* other formats need less */
|
2013-02-04 19:16:22 +00:00
|
|
|
#define STORAGE_MAX_HEAD 32769+5
|
2009-09-29 08:34:48 +00:00
|
|
|
|
|
|
|
|
|
|
|
static struct FileTypeInfo const fileTypeInfo[] = {
|
2013-02-04 19:16:22 +00:00
|
|
|
[VIR_STORAGE_FILE_NONE] = { 0, NULL, NULL, LV_LITTLE_ENDIAN,
|
storage: list more file types
When an image has no backing file, using VIR_STORAGE_FILE_AUTO
for its type is a bit confusing. Additionally, a future patch
would like to reserve a default value for the case of no file
type specified in the XML, but different from the current use
of -1 to imply probing, since probing is not always safe.
Also, a couple of file types were missing compared to supported
code: libxl supports 'vhd', and qemu supports 'fat' for directories
passed through as a file system.
* src/util/storage_file.h (virStorageFileFormat): Add
VIR_STORAGE_FILE_NONE, VIR_STORAGE_FILE_FAT, VIR_STORAGE_FILE_VHD.
* src/util/storage_file.c (virStorageFileMatchesVersion): Match
documentation when version probing not supported.
(cowGetBackingStore, qcowXGetBackingStore, qcow1GetBackingStore)
(qcow2GetBackingStoreFormat, qedGetBackingStore)
(virStorageFileGetMetadataFromBuf)
(virStorageFileGetMetadataFromFD): Take NONE into account.
* src/conf/domain_conf.c (virDomainDiskDefForeachPath): Likewise.
* src/qemu/qemu_driver.c (qemuDomainGetBlockInfo): Likewise.
* src/conf/storage_conf.c (virStorageVolumeFormatFromString): New
function.
(poolTypeInfo): Use it.
2012-09-28 17:11:07 +00:00
|
|
|
-1, 0, 0, 0, 0, 0, NULL },
|
2013-02-04 19:16:22 +00:00
|
|
|
[VIR_STORAGE_FILE_RAW] = { 0, NULL, NULL, LV_LITTLE_ENDIAN,
|
storage: list more file types
When an image has no backing file, using VIR_STORAGE_FILE_AUTO
for its type is a bit confusing. Additionally, a future patch
would like to reserve a default value for the case of no file
type specified in the XML, but different from the current use
of -1 to imply probing, since probing is not always safe.
Also, a couple of file types were missing compared to supported
code: libxl supports 'vhd', and qemu supports 'fat' for directories
passed through as a file system.
* src/util/storage_file.h (virStorageFileFormat): Add
VIR_STORAGE_FILE_NONE, VIR_STORAGE_FILE_FAT, VIR_STORAGE_FILE_VHD.
* src/util/storage_file.c (virStorageFileMatchesVersion): Match
documentation when version probing not supported.
(cowGetBackingStore, qcowXGetBackingStore, qcow1GetBackingStore)
(qcow2GetBackingStoreFormat, qedGetBackingStore)
(virStorageFileGetMetadataFromBuf)
(virStorageFileGetMetadataFromFD): Take NONE into account.
* src/conf/domain_conf.c (virDomainDiskDefForeachPath): Likewise.
* src/qemu/qemu_driver.c (qemuDomainGetBlockInfo): Likewise.
* src/conf/storage_conf.c (virStorageVolumeFormatFromString): New
function.
(poolTypeInfo): Use it.
2012-09-28 17:11:07 +00:00
|
|
|
-1, 0, 0, 0, 0, 0, NULL },
|
2013-02-04 19:16:22 +00:00
|
|
|
[VIR_STORAGE_FILE_DIR] = { 0, NULL, NULL, LV_LITTLE_ENDIAN,
|
storage: list more file types
When an image has no backing file, using VIR_STORAGE_FILE_AUTO
for its type is a bit confusing. Additionally, a future patch
would like to reserve a default value for the case of no file
type specified in the XML, but different from the current use
of -1 to imply probing, since probing is not always safe.
Also, a couple of file types were missing compared to supported
code: libxl supports 'vhd', and qemu supports 'fat' for directories
passed through as a file system.
* src/util/storage_file.h (virStorageFileFormat): Add
VIR_STORAGE_FILE_NONE, VIR_STORAGE_FILE_FAT, VIR_STORAGE_FILE_VHD.
* src/util/storage_file.c (virStorageFileMatchesVersion): Match
documentation when version probing not supported.
(cowGetBackingStore, qcowXGetBackingStore, qcow1GetBackingStore)
(qcow2GetBackingStoreFormat, qedGetBackingStore)
(virStorageFileGetMetadataFromBuf)
(virStorageFileGetMetadataFromFD): Take NONE into account.
* src/conf/domain_conf.c (virDomainDiskDefForeachPath): Likewise.
* src/qemu/qemu_driver.c (qemuDomainGetBlockInfo): Likewise.
* src/conf/storage_conf.c (virStorageVolumeFormatFromString): New
function.
(poolTypeInfo): Use it.
2012-09-28 17:11:07 +00:00
|
|
|
-1, 0, 0, 0, 0, 0, NULL },
|
2010-06-14 15:39:32 +00:00
|
|
|
[VIR_STORAGE_FILE_BOCHS] = {
|
2013-02-04 19:16:22 +00:00
|
|
|
/*"Bochs Virtual HD Image", */ /* Untested */
|
|
|
|
0, NULL, NULL,
|
2010-06-14 15:39:32 +00:00
|
|
|
LV_LITTLE_ENDIAN, 64, 0x20000,
|
|
|
|
32+16+16+4+4+4+4+4, 8, 1, -1, NULL
|
|
|
|
},
|
|
|
|
[VIR_STORAGE_FILE_CLOOP] = {
|
2013-02-04 19:16:22 +00:00
|
|
|
/* #!/bin/sh
|
|
|
|
#V2.0 Format
|
|
|
|
modprobe cloop file=$0 && mount -r -t iso9660 /dev/cloop $1
|
|
|
|
*/ /* Untested */
|
|
|
|
0, NULL, NULL,
|
2010-06-14 15:39:32 +00:00
|
|
|
LV_LITTLE_ENDIAN, -1, 0,
|
|
|
|
-1, 0, 0, -1, NULL
|
|
|
|
},
|
|
|
|
[VIR_STORAGE_FILE_COW] = {
|
2013-02-04 19:16:22 +00:00
|
|
|
0, "OOOM", NULL,
|
2010-06-14 15:39:32 +00:00
|
|
|
LV_BIG_ENDIAN, 4, 2,
|
|
|
|
4+4+1024+4, 8, 1, -1, cowGetBackingStore
|
|
|
|
},
|
|
|
|
[VIR_STORAGE_FILE_DMG] = {
|
2013-02-04 19:16:22 +00:00
|
|
|
/* XXX QEMU says there's no magic for dmg,
|
|
|
|
* /usr/share/misc/magic lists double magic (both offsets
|
|
|
|
* would have to match) but then disables that check. */
|
|
|
|
0, NULL, ".dmg",
|
2010-06-14 15:39:32 +00:00
|
|
|
0, -1, 0,
|
|
|
|
-1, 0, 0, -1, NULL
|
|
|
|
},
|
|
|
|
[VIR_STORAGE_FILE_ISO] = {
|
2013-02-04 19:16:22 +00:00
|
|
|
32769, "CD001", ".iso",
|
|
|
|
LV_LITTLE_ENDIAN, -2, 0,
|
2010-06-14 15:39:32 +00:00
|
|
|
-1, 0, 0, -1, NULL
|
|
|
|
},
|
|
|
|
[VIR_STORAGE_FILE_QCOW] = {
|
2013-02-04 19:16:22 +00:00
|
|
|
0, "QFI", NULL,
|
2010-06-14 15:39:32 +00:00
|
|
|
LV_BIG_ENDIAN, 4, 1,
|
|
|
|
QCOWX_HDR_IMAGE_SIZE, 8, 1, QCOW1_HDR_CRYPT, qcow1GetBackingStore,
|
|
|
|
},
|
|
|
|
[VIR_STORAGE_FILE_QCOW2] = {
|
2013-02-04 19:16:22 +00:00
|
|
|
0, "QFI", NULL,
|
2010-06-14 15:39:32 +00:00
|
|
|
LV_BIG_ENDIAN, 4, 2,
|
|
|
|
QCOWX_HDR_IMAGE_SIZE, 8, 1, QCOW2_HDR_CRYPT, qcow2GetBackingStore,
|
|
|
|
},
|
2010-11-19 16:18:16 +00:00
|
|
|
[VIR_STORAGE_FILE_QED] = {
|
|
|
|
/* http://wiki.qemu.org/Features/QED */
|
2013-02-04 19:16:22 +00:00
|
|
|
0, "QED", NULL,
|
2012-12-13 14:25:10 +00:00
|
|
|
LV_LITTLE_ENDIAN, -2, -1,
|
2010-11-19 23:19:24 +00:00
|
|
|
QED_HDR_IMAGE_SIZE, 8, 1, -1, qedGetBackingStore,
|
2010-11-19 16:18:16 +00:00
|
|
|
},
|
2010-06-14 15:39:32 +00:00
|
|
|
[VIR_STORAGE_FILE_VMDK] = {
|
2013-02-04 19:16:22 +00:00
|
|
|
0, "KDMV", NULL,
|
2010-06-14 15:39:32 +00:00
|
|
|
LV_LITTLE_ENDIAN, 4, 1,
|
|
|
|
4+4+4, 8, 512, -1, vmdk4GetBackingStore
|
|
|
|
},
|
|
|
|
[VIR_STORAGE_FILE_VPC] = {
|
2013-02-04 19:16:22 +00:00
|
|
|
0, "conectix", NULL,
|
2010-06-14 15:39:32 +00:00
|
|
|
LV_BIG_ENDIAN, 12, 0x10000,
|
|
|
|
8 + 4 + 4 + 8 + 4 + 4 + 2 + 2 + 4, 8, 1, -1, NULL
|
|
|
|
},
|
2013-02-04 19:18:22 +00:00
|
|
|
/* TODO: add getBackingStore function */
|
|
|
|
[VIR_STORAGE_FILE_VDI] = {
|
|
|
|
64, "\x7f\x10\xda\xbe", ".vdi",
|
|
|
|
LV_LITTLE_ENDIAN, 68, 0x00010001,
|
2013-03-14 12:24:03 +00:00
|
|
|
64 + 5 * 4 + 256 + 7 * 4, 8, 1, -1, NULL},
|
2013-02-04 19:18:22 +00:00
|
|
|
|
storage: list more file types
When an image has no backing file, using VIR_STORAGE_FILE_AUTO
for its type is a bit confusing. Additionally, a future patch
would like to reserve a default value for the case of no file
type specified in the XML, but different from the current use
of -1 to imply probing, since probing is not always safe.
Also, a couple of file types were missing compared to supported
code: libxl supports 'vhd', and qemu supports 'fat' for directories
passed through as a file system.
* src/util/storage_file.h (virStorageFileFormat): Add
VIR_STORAGE_FILE_NONE, VIR_STORAGE_FILE_FAT, VIR_STORAGE_FILE_VHD.
* src/util/storage_file.c (virStorageFileMatchesVersion): Match
documentation when version probing not supported.
(cowGetBackingStore, qcowXGetBackingStore, qcow1GetBackingStore)
(qcow2GetBackingStoreFormat, qedGetBackingStore)
(virStorageFileGetMetadataFromBuf)
(virStorageFileGetMetadataFromFD): Take NONE into account.
* src/conf/domain_conf.c (virDomainDiskDefForeachPath): Likewise.
* src/qemu/qemu_driver.c (qemuDomainGetBlockInfo): Likewise.
* src/conf/storage_conf.c (virStorageVolumeFormatFromString): New
function.
(poolTypeInfo): Use it.
2012-09-28 17:11:07 +00:00
|
|
|
/* Not direct file formats, but used for various drivers */
|
2013-02-04 19:16:22 +00:00
|
|
|
[VIR_STORAGE_FILE_FAT] = { 0, NULL, NULL, LV_LITTLE_ENDIAN,
|
storage: list more file types
When an image has no backing file, using VIR_STORAGE_FILE_AUTO
for its type is a bit confusing. Additionally, a future patch
would like to reserve a default value for the case of no file
type specified in the XML, but different from the current use
of -1 to imply probing, since probing is not always safe.
Also, a couple of file types were missing compared to supported
code: libxl supports 'vhd', and qemu supports 'fat' for directories
passed through as a file system.
* src/util/storage_file.h (virStorageFileFormat): Add
VIR_STORAGE_FILE_NONE, VIR_STORAGE_FILE_FAT, VIR_STORAGE_FILE_VHD.
* src/util/storage_file.c (virStorageFileMatchesVersion): Match
documentation when version probing not supported.
(cowGetBackingStore, qcowXGetBackingStore, qcow1GetBackingStore)
(qcow2GetBackingStoreFormat, qedGetBackingStore)
(virStorageFileGetMetadataFromBuf)
(virStorageFileGetMetadataFromFD): Take NONE into account.
* src/conf/domain_conf.c (virDomainDiskDefForeachPath): Likewise.
* src/qemu/qemu_driver.c (qemuDomainGetBlockInfo): Likewise.
* src/conf/storage_conf.c (virStorageVolumeFormatFromString): New
function.
(poolTypeInfo): Use it.
2012-09-28 17:11:07 +00:00
|
|
|
-1, 0, 0, 0, 0, 0, NULL },
|
2013-02-04 19:16:22 +00:00
|
|
|
[VIR_STORAGE_FILE_VHD] = { 0, NULL, NULL, LV_LITTLE_ENDIAN,
|
storage: list more file types
When an image has no backing file, using VIR_STORAGE_FILE_AUTO
for its type is a bit confusing. Additionally, a future patch
would like to reserve a default value for the case of no file
type specified in the XML, but different from the current use
of -1 to imply probing, since probing is not always safe.
Also, a couple of file types were missing compared to supported
code: libxl supports 'vhd', and qemu supports 'fat' for directories
passed through as a file system.
* src/util/storage_file.h (virStorageFileFormat): Add
VIR_STORAGE_FILE_NONE, VIR_STORAGE_FILE_FAT, VIR_STORAGE_FILE_VHD.
* src/util/storage_file.c (virStorageFileMatchesVersion): Match
documentation when version probing not supported.
(cowGetBackingStore, qcowXGetBackingStore, qcow1GetBackingStore)
(qcow2GetBackingStoreFormat, qedGetBackingStore)
(virStorageFileGetMetadataFromBuf)
(virStorageFileGetMetadataFromFD): Take NONE into account.
* src/conf/domain_conf.c (virDomainDiskDefForeachPath): Likewise.
* src/qemu/qemu_driver.c (qemuDomainGetBlockInfo): Likewise.
* src/conf/storage_conf.c (virStorageVolumeFormatFromString): New
function.
(poolTypeInfo): Use it.
2012-09-28 17:11:07 +00:00
|
|
|
-1, 0, 0, 0, 0, 0, NULL },
|
2009-09-29 08:34:48 +00:00
|
|
|
};
|
2010-06-14 15:39:32 +00:00
|
|
|
verify(ARRAY_CARDINALITY(fileTypeInfo) == VIR_STORAGE_FILE_LAST);
|
2009-09-29 08:34:48 +00:00
|
|
|
|
|
|
|
static int
|
2010-02-04 22:46:55 +00:00
|
|
|
cowGetBackingStore(char **res,
|
2010-06-14 14:53:59 +00:00
|
|
|
int *format,
|
2009-09-29 08:34:48 +00:00
|
|
|
const unsigned char *buf,
|
|
|
|
size_t buf_size)
|
|
|
|
{
|
|
|
|
#define COW_FILENAME_MAXLEN 1024
|
|
|
|
*res = NULL;
|
2010-06-14 14:53:59 +00:00
|
|
|
*format = VIR_STORAGE_FILE_AUTO;
|
|
|
|
|
2009-09-29 08:34:48 +00:00
|
|
|
if (buf_size < 4+4+ COW_FILENAME_MAXLEN)
|
|
|
|
return BACKING_STORE_INVALID;
|
storage: list more file types
When an image has no backing file, using VIR_STORAGE_FILE_AUTO
for its type is a bit confusing. Additionally, a future patch
would like to reserve a default value for the case of no file
type specified in the XML, but different from the current use
of -1 to imply probing, since probing is not always safe.
Also, a couple of file types were missing compared to supported
code: libxl supports 'vhd', and qemu supports 'fat' for directories
passed through as a file system.
* src/util/storage_file.h (virStorageFileFormat): Add
VIR_STORAGE_FILE_NONE, VIR_STORAGE_FILE_FAT, VIR_STORAGE_FILE_VHD.
* src/util/storage_file.c (virStorageFileMatchesVersion): Match
documentation when version probing not supported.
(cowGetBackingStore, qcowXGetBackingStore, qcow1GetBackingStore)
(qcow2GetBackingStoreFormat, qedGetBackingStore)
(virStorageFileGetMetadataFromBuf)
(virStorageFileGetMetadataFromFD): Take NONE into account.
* src/conf/domain_conf.c (virDomainDiskDefForeachPath): Likewise.
* src/qemu/qemu_driver.c (qemuDomainGetBlockInfo): Likewise.
* src/conf/storage_conf.c (virStorageVolumeFormatFromString): New
function.
(poolTypeInfo): Use it.
2012-09-28 17:11:07 +00:00
|
|
|
if (buf[4+4] == '\0') { /* cow_header_v2.backing_file[0] */
|
|
|
|
*format = VIR_STORAGE_FILE_NONE;
|
2009-09-29 08:34:48 +00:00
|
|
|
return BACKING_STORE_OK;
|
storage: list more file types
When an image has no backing file, using VIR_STORAGE_FILE_AUTO
for its type is a bit confusing. Additionally, a future patch
would like to reserve a default value for the case of no file
type specified in the XML, but different from the current use
of -1 to imply probing, since probing is not always safe.
Also, a couple of file types were missing compared to supported
code: libxl supports 'vhd', and qemu supports 'fat' for directories
passed through as a file system.
* src/util/storage_file.h (virStorageFileFormat): Add
VIR_STORAGE_FILE_NONE, VIR_STORAGE_FILE_FAT, VIR_STORAGE_FILE_VHD.
* src/util/storage_file.c (virStorageFileMatchesVersion): Match
documentation when version probing not supported.
(cowGetBackingStore, qcowXGetBackingStore, qcow1GetBackingStore)
(qcow2GetBackingStoreFormat, qedGetBackingStore)
(virStorageFileGetMetadataFromBuf)
(virStorageFileGetMetadataFromFD): Take NONE into account.
* src/conf/domain_conf.c (virDomainDiskDefForeachPath): Likewise.
* src/qemu/qemu_driver.c (qemuDomainGetBlockInfo): Likewise.
* src/conf/storage_conf.c (virStorageVolumeFormatFromString): New
function.
(poolTypeInfo): Use it.
2012-09-28 17:11:07 +00:00
|
|
|
}
|
2009-09-29 08:34:48 +00:00
|
|
|
|
2012-10-17 09:23:12 +00:00
|
|
|
*res = strndup((const char*)buf + 4+4, COW_FILENAME_MAXLEN);
|
2009-09-29 08:34:48 +00:00
|
|
|
if (*res == NULL) {
|
2010-02-04 18:19:08 +00:00
|
|
|
virReportOOMError();
|
2009-09-29 08:34:48 +00:00
|
|
|
return BACKING_STORE_ERROR;
|
|
|
|
}
|
|
|
|
return BACKING_STORE_OK;
|
|
|
|
}
|
|
|
|
|
2010-06-14 14:53:59 +00:00
|
|
|
|
|
|
|
static int
|
|
|
|
qcow2GetBackingStoreFormat(int *format,
|
|
|
|
const unsigned char *buf,
|
|
|
|
size_t buf_size,
|
|
|
|
size_t extension_start,
|
|
|
|
size_t extension_end)
|
|
|
|
{
|
|
|
|
size_t offset = extension_start;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* The extensions take format of
|
|
|
|
*
|
|
|
|
* int32: magic
|
|
|
|
* int32: length
|
|
|
|
* byte[length]: payload
|
|
|
|
*
|
|
|
|
* Unknown extensions can be ignored by skipping
|
|
|
|
* over "length" bytes in the data stream.
|
|
|
|
*/
|
|
|
|
while (offset < (buf_size-8) &&
|
|
|
|
offset < (extension_end-8)) {
|
2013-02-07 01:57:13 +00:00
|
|
|
unsigned int magic = virReadBufInt32BE(buf + offset);
|
|
|
|
unsigned int len = virReadBufInt32BE(buf + offset + 4);
|
2010-06-14 14:53:59 +00:00
|
|
|
|
|
|
|
offset += 8;
|
|
|
|
|
|
|
|
if ((offset + len) < offset)
|
|
|
|
break;
|
|
|
|
|
|
|
|
if ((offset + len) > buf_size)
|
|
|
|
break;
|
|
|
|
|
|
|
|
switch (magic) {
|
|
|
|
case QCOW2_HDR_EXTENSION_END:
|
|
|
|
goto done;
|
|
|
|
|
|
|
|
case QCOW2_HDR_EXTENSION_BACKING_FORMAT:
|
|
|
|
if (buf[offset+len] != '\0')
|
|
|
|
break;
|
|
|
|
*format = virStorageFileFormatTypeFromString(
|
|
|
|
((const char *)buf)+offset);
|
storage: list more file types
When an image has no backing file, using VIR_STORAGE_FILE_AUTO
for its type is a bit confusing. Additionally, a future patch
would like to reserve a default value for the case of no file
type specified in the XML, but different from the current use
of -1 to imply probing, since probing is not always safe.
Also, a couple of file types were missing compared to supported
code: libxl supports 'vhd', and qemu supports 'fat' for directories
passed through as a file system.
* src/util/storage_file.h (virStorageFileFormat): Add
VIR_STORAGE_FILE_NONE, VIR_STORAGE_FILE_FAT, VIR_STORAGE_FILE_VHD.
* src/util/storage_file.c (virStorageFileMatchesVersion): Match
documentation when version probing not supported.
(cowGetBackingStore, qcowXGetBackingStore, qcow1GetBackingStore)
(qcow2GetBackingStoreFormat, qedGetBackingStore)
(virStorageFileGetMetadataFromBuf)
(virStorageFileGetMetadataFromFD): Take NONE into account.
* src/conf/domain_conf.c (virDomainDiskDefForeachPath): Likewise.
* src/qemu/qemu_driver.c (qemuDomainGetBlockInfo): Likewise.
* src/conf/storage_conf.c (virStorageVolumeFormatFromString): New
function.
(poolTypeInfo): Use it.
2012-09-28 17:11:07 +00:00
|
|
|
if (*format <= VIR_STORAGE_FILE_NONE)
|
|
|
|
return -1;
|
2010-06-14 14:53:59 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
offset += len;
|
|
|
|
}
|
|
|
|
|
|
|
|
done:
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2009-09-29 08:34:48 +00:00
|
|
|
static int
|
2010-02-04 22:46:55 +00:00
|
|
|
qcowXGetBackingStore(char **res,
|
2010-06-14 14:53:59 +00:00
|
|
|
int *format,
|
2009-09-29 08:34:48 +00:00
|
|
|
const unsigned char *buf,
|
2010-06-14 14:53:59 +00:00
|
|
|
size_t buf_size,
|
|
|
|
bool isQCow2)
|
2009-09-29 08:34:48 +00:00
|
|
|
{
|
|
|
|
unsigned long long offset;
|
2011-06-02 23:52:16 +00:00
|
|
|
unsigned int size;
|
2009-09-29 08:34:48 +00:00
|
|
|
|
|
|
|
*res = NULL;
|
2010-06-14 14:53:59 +00:00
|
|
|
if (format)
|
|
|
|
*format = VIR_STORAGE_FILE_AUTO;
|
|
|
|
|
|
|
|
if (buf_size < QCOWX_HDR_BACKING_FILE_OFFSET+8+4)
|
2009-09-29 08:34:48 +00:00
|
|
|
return BACKING_STORE_INVALID;
|
2013-02-07 01:57:13 +00:00
|
|
|
offset = virReadBufInt64BE(buf + QCOWX_HDR_BACKING_FILE_OFFSET);
|
2009-09-29 08:34:48 +00:00
|
|
|
if (offset > buf_size)
|
|
|
|
return BACKING_STORE_INVALID;
|
2013-02-07 01:57:13 +00:00
|
|
|
size = virReadBufInt32BE(buf + QCOWX_HDR_BACKING_FILE_SIZE);
|
storage: list more file types
When an image has no backing file, using VIR_STORAGE_FILE_AUTO
for its type is a bit confusing. Additionally, a future patch
would like to reserve a default value for the case of no file
type specified in the XML, but different from the current use
of -1 to imply probing, since probing is not always safe.
Also, a couple of file types were missing compared to supported
code: libxl supports 'vhd', and qemu supports 'fat' for directories
passed through as a file system.
* src/util/storage_file.h (virStorageFileFormat): Add
VIR_STORAGE_FILE_NONE, VIR_STORAGE_FILE_FAT, VIR_STORAGE_FILE_VHD.
* src/util/storage_file.c (virStorageFileMatchesVersion): Match
documentation when version probing not supported.
(cowGetBackingStore, qcowXGetBackingStore, qcow1GetBackingStore)
(qcow2GetBackingStoreFormat, qedGetBackingStore)
(virStorageFileGetMetadataFromBuf)
(virStorageFileGetMetadataFromFD): Take NONE into account.
* src/conf/domain_conf.c (virDomainDiskDefForeachPath): Likewise.
* src/qemu/qemu_driver.c (qemuDomainGetBlockInfo): Likewise.
* src/conf/storage_conf.c (virStorageVolumeFormatFromString): New
function.
(poolTypeInfo): Use it.
2012-09-28 17:11:07 +00:00
|
|
|
if (size == 0) {
|
|
|
|
if (format)
|
|
|
|
*format = VIR_STORAGE_FILE_NONE;
|
2009-09-29 08:34:48 +00:00
|
|
|
return BACKING_STORE_OK;
|
storage: list more file types
When an image has no backing file, using VIR_STORAGE_FILE_AUTO
for its type is a bit confusing. Additionally, a future patch
would like to reserve a default value for the case of no file
type specified in the XML, but different from the current use
of -1 to imply probing, since probing is not always safe.
Also, a couple of file types were missing compared to supported
code: libxl supports 'vhd', and qemu supports 'fat' for directories
passed through as a file system.
* src/util/storage_file.h (virStorageFileFormat): Add
VIR_STORAGE_FILE_NONE, VIR_STORAGE_FILE_FAT, VIR_STORAGE_FILE_VHD.
* src/util/storage_file.c (virStorageFileMatchesVersion): Match
documentation when version probing not supported.
(cowGetBackingStore, qcowXGetBackingStore, qcow1GetBackingStore)
(qcow2GetBackingStoreFormat, qedGetBackingStore)
(virStorageFileGetMetadataFromBuf)
(virStorageFileGetMetadataFromFD): Take NONE into account.
* src/conf/domain_conf.c (virDomainDiskDefForeachPath): Likewise.
* src/qemu/qemu_driver.c (qemuDomainGetBlockInfo): Likewise.
* src/conf/storage_conf.c (virStorageVolumeFormatFromString): New
function.
(poolTypeInfo): Use it.
2012-09-28 17:11:07 +00:00
|
|
|
}
|
2009-09-29 08:34:48 +00:00
|
|
|
if (offset + size > buf_size || offset + size < offset)
|
|
|
|
return BACKING_STORE_INVALID;
|
|
|
|
if (size + 1 == 0)
|
|
|
|
return BACKING_STORE_INVALID;
|
|
|
|
if (VIR_ALLOC_N(*res, size + 1) < 0) {
|
2010-02-04 18:19:08 +00:00
|
|
|
virReportOOMError();
|
2009-09-29 08:34:48 +00:00
|
|
|
return BACKING_STORE_ERROR;
|
|
|
|
}
|
|
|
|
memcpy(*res, buf + offset, size);
|
|
|
|
(*res)[size] = '\0';
|
2010-06-14 14:53:59 +00:00
|
|
|
|
|
|
|
/*
|
|
|
|
* Traditionally QCow2 files had a layout of
|
|
|
|
*
|
|
|
|
* [header]
|
|
|
|
* [backingStoreName]
|
|
|
|
*
|
|
|
|
* Although the backingStoreName typically followed
|
|
|
|
* the header immediately, this was not required by
|
|
|
|
* the format. By specifying a higher byte offset for
|
|
|
|
* the backing file offset in the header, it was
|
|
|
|
* possible to leave space between the header and
|
|
|
|
* start of backingStore.
|
|
|
|
*
|
|
|
|
* This hack is now used to store extensions to the
|
|
|
|
* qcow2 format:
|
|
|
|
*
|
|
|
|
* [header]
|
|
|
|
* [extensions]
|
|
|
|
* [backingStoreName]
|
|
|
|
*
|
|
|
|
* Thus the file region to search for extensions is
|
|
|
|
* between the end of the header (QCOW2_HDR_TOTAL_SIZE)
|
|
|
|
* and the start of the backingStoreName (offset)
|
|
|
|
*/
|
storage: list more file types
When an image has no backing file, using VIR_STORAGE_FILE_AUTO
for its type is a bit confusing. Additionally, a future patch
would like to reserve a default value for the case of no file
type specified in the XML, but different from the current use
of -1 to imply probing, since probing is not always safe.
Also, a couple of file types were missing compared to supported
code: libxl supports 'vhd', and qemu supports 'fat' for directories
passed through as a file system.
* src/util/storage_file.h (virStorageFileFormat): Add
VIR_STORAGE_FILE_NONE, VIR_STORAGE_FILE_FAT, VIR_STORAGE_FILE_VHD.
* src/util/storage_file.c (virStorageFileMatchesVersion): Match
documentation when version probing not supported.
(cowGetBackingStore, qcowXGetBackingStore, qcow1GetBackingStore)
(qcow2GetBackingStoreFormat, qedGetBackingStore)
(virStorageFileGetMetadataFromBuf)
(virStorageFileGetMetadataFromFD): Take NONE into account.
* src/conf/domain_conf.c (virDomainDiskDefForeachPath): Likewise.
* src/qemu/qemu_driver.c (qemuDomainGetBlockInfo): Likewise.
* src/conf/storage_conf.c (virStorageVolumeFormatFromString): New
function.
(poolTypeInfo): Use it.
2012-09-28 17:11:07 +00:00
|
|
|
if (isQCow2 && format &&
|
|
|
|
qcow2GetBackingStoreFormat(format, buf, buf_size, QCOW2_HDR_TOTAL_SIZE,
|
|
|
|
offset) < 0)
|
|
|
|
return BACKING_STORE_INVALID;
|
2010-06-14 14:53:59 +00:00
|
|
|
|
2009-09-29 08:34:48 +00:00
|
|
|
return BACKING_STORE_OK;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2010-06-14 14:53:59 +00:00
|
|
|
static int
|
|
|
|
qcow1GetBackingStore(char **res,
|
|
|
|
int *format,
|
|
|
|
const unsigned char *buf,
|
|
|
|
size_t buf_size)
|
|
|
|
{
|
storage: list more file types
When an image has no backing file, using VIR_STORAGE_FILE_AUTO
for its type is a bit confusing. Additionally, a future patch
would like to reserve a default value for the case of no file
type specified in the XML, but different from the current use
of -1 to imply probing, since probing is not always safe.
Also, a couple of file types were missing compared to supported
code: libxl supports 'vhd', and qemu supports 'fat' for directories
passed through as a file system.
* src/util/storage_file.h (virStorageFileFormat): Add
VIR_STORAGE_FILE_NONE, VIR_STORAGE_FILE_FAT, VIR_STORAGE_FILE_VHD.
* src/util/storage_file.c (virStorageFileMatchesVersion): Match
documentation when version probing not supported.
(cowGetBackingStore, qcowXGetBackingStore, qcow1GetBackingStore)
(qcow2GetBackingStoreFormat, qedGetBackingStore)
(virStorageFileGetMetadataFromBuf)
(virStorageFileGetMetadataFromFD): Take NONE into account.
* src/conf/domain_conf.c (virDomainDiskDefForeachPath): Likewise.
* src/qemu/qemu_driver.c (qemuDomainGetBlockInfo): Likewise.
* src/conf/storage_conf.c (virStorageVolumeFormatFromString): New
function.
(poolTypeInfo): Use it.
2012-09-28 17:11:07 +00:00
|
|
|
int ret;
|
|
|
|
|
2010-06-14 14:53:59 +00:00
|
|
|
/* QCow1 doesn't have the extensions capability
|
|
|
|
* used to store backing format */
|
|
|
|
*format = VIR_STORAGE_FILE_AUTO;
|
storage: list more file types
When an image has no backing file, using VIR_STORAGE_FILE_AUTO
for its type is a bit confusing. Additionally, a future patch
would like to reserve a default value for the case of no file
type specified in the XML, but different from the current use
of -1 to imply probing, since probing is not always safe.
Also, a couple of file types were missing compared to supported
code: libxl supports 'vhd', and qemu supports 'fat' for directories
passed through as a file system.
* src/util/storage_file.h (virStorageFileFormat): Add
VIR_STORAGE_FILE_NONE, VIR_STORAGE_FILE_FAT, VIR_STORAGE_FILE_VHD.
* src/util/storage_file.c (virStorageFileMatchesVersion): Match
documentation when version probing not supported.
(cowGetBackingStore, qcowXGetBackingStore, qcow1GetBackingStore)
(qcow2GetBackingStoreFormat, qedGetBackingStore)
(virStorageFileGetMetadataFromBuf)
(virStorageFileGetMetadataFromFD): Take NONE into account.
* src/conf/domain_conf.c (virDomainDiskDefForeachPath): Likewise.
* src/qemu/qemu_driver.c (qemuDomainGetBlockInfo): Likewise.
* src/conf/storage_conf.c (virStorageVolumeFormatFromString): New
function.
(poolTypeInfo): Use it.
2012-09-28 17:11:07 +00:00
|
|
|
ret = qcowXGetBackingStore(res, NULL, buf, buf_size, false);
|
|
|
|
if (ret == 0 && *buf == '\0')
|
|
|
|
*format = VIR_STORAGE_FILE_NONE;
|
|
|
|
return ret;
|
2010-06-14 14:53:59 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static int
|
|
|
|
qcow2GetBackingStore(char **res,
|
|
|
|
int *format,
|
|
|
|
const unsigned char *buf,
|
|
|
|
size_t buf_size)
|
|
|
|
{
|
|
|
|
return qcowXGetBackingStore(res, format, buf, buf_size, true);
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2009-09-29 08:34:48 +00:00
|
|
|
static int
|
2010-02-04 22:46:55 +00:00
|
|
|
vmdk4GetBackingStore(char **res,
|
2010-06-14 14:53:59 +00:00
|
|
|
int *format,
|
2009-09-29 08:34:48 +00:00
|
|
|
const unsigned char *buf,
|
|
|
|
size_t buf_size)
|
|
|
|
{
|
|
|
|
static const char prefix[] = "parentFileNameHint=\"";
|
2010-06-15 13:58:10 +00:00
|
|
|
char *desc, *start, *end;
|
2009-09-29 08:34:48 +00:00
|
|
|
size_t len;
|
2010-06-15 13:58:10 +00:00
|
|
|
int ret = BACKING_STORE_ERROR;
|
|
|
|
|
|
|
|
if (VIR_ALLOC_N(desc, STORAGE_MAX_HEAD + 1) < 0) {
|
|
|
|
virReportOOMError();
|
|
|
|
goto cleanup;
|
|
|
|
}
|
2009-09-29 08:34:48 +00:00
|
|
|
|
|
|
|
*res = NULL;
|
2010-06-14 14:53:59 +00:00
|
|
|
/*
|
|
|
|
* Technically this should have been VMDK, since
|
|
|
|
* VMDK spec / VMWare impl only support VMDK backed
|
|
|
|
* by VMDK. QEMU isn't following this though and
|
|
|
|
* does probing on VMDK backing files, hence we set
|
|
|
|
* AUTO
|
|
|
|
*/
|
|
|
|
*format = VIR_STORAGE_FILE_AUTO;
|
2009-09-29 08:34:48 +00:00
|
|
|
|
2010-06-15 13:58:10 +00:00
|
|
|
if (buf_size <= 0x200) {
|
|
|
|
ret = BACKING_STORE_INVALID;
|
|
|
|
goto cleanup;
|
|
|
|
}
|
2009-09-29 08:34:48 +00:00
|
|
|
len = buf_size - 0x200;
|
2010-06-15 13:58:10 +00:00
|
|
|
if (len > STORAGE_MAX_HEAD)
|
|
|
|
len = STORAGE_MAX_HEAD;
|
2009-09-29 08:34:48 +00:00
|
|
|
memcpy(desc, buf + 0x200, len);
|
|
|
|
desc[len] = '\0';
|
|
|
|
start = strstr(desc, prefix);
|
2010-06-15 13:58:10 +00:00
|
|
|
if (start == NULL) {
|
storage: list more file types
When an image has no backing file, using VIR_STORAGE_FILE_AUTO
for its type is a bit confusing. Additionally, a future patch
would like to reserve a default value for the case of no file
type specified in the XML, but different from the current use
of -1 to imply probing, since probing is not always safe.
Also, a couple of file types were missing compared to supported
code: libxl supports 'vhd', and qemu supports 'fat' for directories
passed through as a file system.
* src/util/storage_file.h (virStorageFileFormat): Add
VIR_STORAGE_FILE_NONE, VIR_STORAGE_FILE_FAT, VIR_STORAGE_FILE_VHD.
* src/util/storage_file.c (virStorageFileMatchesVersion): Match
documentation when version probing not supported.
(cowGetBackingStore, qcowXGetBackingStore, qcow1GetBackingStore)
(qcow2GetBackingStoreFormat, qedGetBackingStore)
(virStorageFileGetMetadataFromBuf)
(virStorageFileGetMetadataFromFD): Take NONE into account.
* src/conf/domain_conf.c (virDomainDiskDefForeachPath): Likewise.
* src/qemu/qemu_driver.c (qemuDomainGetBlockInfo): Likewise.
* src/conf/storage_conf.c (virStorageVolumeFormatFromString): New
function.
(poolTypeInfo): Use it.
2012-09-28 17:11:07 +00:00
|
|
|
*format = VIR_STORAGE_FILE_NONE;
|
2010-06-15 13:58:10 +00:00
|
|
|
ret = BACKING_STORE_OK;
|
|
|
|
goto cleanup;
|
|
|
|
}
|
2009-09-29 08:34:48 +00:00
|
|
|
start += strlen(prefix);
|
|
|
|
end = strchr(start, '"');
|
2010-06-15 13:58:10 +00:00
|
|
|
if (end == NULL) {
|
|
|
|
ret = BACKING_STORE_INVALID;
|
|
|
|
goto cleanup;
|
|
|
|
}
|
|
|
|
if (end == start) {
|
storage: list more file types
When an image has no backing file, using VIR_STORAGE_FILE_AUTO
for its type is a bit confusing. Additionally, a future patch
would like to reserve a default value for the case of no file
type specified in the XML, but different from the current use
of -1 to imply probing, since probing is not always safe.
Also, a couple of file types were missing compared to supported
code: libxl supports 'vhd', and qemu supports 'fat' for directories
passed through as a file system.
* src/util/storage_file.h (virStorageFileFormat): Add
VIR_STORAGE_FILE_NONE, VIR_STORAGE_FILE_FAT, VIR_STORAGE_FILE_VHD.
* src/util/storage_file.c (virStorageFileMatchesVersion): Match
documentation when version probing not supported.
(cowGetBackingStore, qcowXGetBackingStore, qcow1GetBackingStore)
(qcow2GetBackingStoreFormat, qedGetBackingStore)
(virStorageFileGetMetadataFromBuf)
(virStorageFileGetMetadataFromFD): Take NONE into account.
* src/conf/domain_conf.c (virDomainDiskDefForeachPath): Likewise.
* src/qemu/qemu_driver.c (qemuDomainGetBlockInfo): Likewise.
* src/conf/storage_conf.c (virStorageVolumeFormatFromString): New
function.
(poolTypeInfo): Use it.
2012-09-28 17:11:07 +00:00
|
|
|
*format = VIR_STORAGE_FILE_NONE;
|
2010-06-15 13:58:10 +00:00
|
|
|
ret = BACKING_STORE_OK;
|
|
|
|
goto cleanup;
|
|
|
|
}
|
2009-09-29 08:34:48 +00:00
|
|
|
*end = '\0';
|
|
|
|
*res = strdup(start);
|
|
|
|
if (*res == NULL) {
|
2010-02-04 18:19:08 +00:00
|
|
|
virReportOOMError();
|
2010-06-15 13:58:10 +00:00
|
|
|
goto cleanup;
|
2009-09-29 08:34:48 +00:00
|
|
|
}
|
2010-06-15 13:58:10 +00:00
|
|
|
|
|
|
|
ret = BACKING_STORE_OK;
|
|
|
|
|
|
|
|
cleanup:
|
|
|
|
VIR_FREE(desc);
|
|
|
|
return ret;
|
2009-09-29 08:34:48 +00:00
|
|
|
}
|
|
|
|
|
2010-11-19 23:19:24 +00:00
|
|
|
static int
|
|
|
|
qedGetBackingStore(char **res,
|
|
|
|
int *format,
|
|
|
|
const unsigned char *buf,
|
|
|
|
size_t buf_size)
|
|
|
|
{
|
|
|
|
unsigned long long flags;
|
|
|
|
unsigned long offset, size;
|
|
|
|
|
|
|
|
*res = NULL;
|
|
|
|
/* Check if this image has a backing file */
|
|
|
|
if (buf_size < QED_HDR_FEATURES_OFFSET+8)
|
|
|
|
return BACKING_STORE_INVALID;
|
2013-02-07 01:57:13 +00:00
|
|
|
flags = virReadBufInt64LE(buf + QED_HDR_FEATURES_OFFSET);
|
storage: list more file types
When an image has no backing file, using VIR_STORAGE_FILE_AUTO
for its type is a bit confusing. Additionally, a future patch
would like to reserve a default value for the case of no file
type specified in the XML, but different from the current use
of -1 to imply probing, since probing is not always safe.
Also, a couple of file types were missing compared to supported
code: libxl supports 'vhd', and qemu supports 'fat' for directories
passed through as a file system.
* src/util/storage_file.h (virStorageFileFormat): Add
VIR_STORAGE_FILE_NONE, VIR_STORAGE_FILE_FAT, VIR_STORAGE_FILE_VHD.
* src/util/storage_file.c (virStorageFileMatchesVersion): Match
documentation when version probing not supported.
(cowGetBackingStore, qcowXGetBackingStore, qcow1GetBackingStore)
(qcow2GetBackingStoreFormat, qedGetBackingStore)
(virStorageFileGetMetadataFromBuf)
(virStorageFileGetMetadataFromFD): Take NONE into account.
* src/conf/domain_conf.c (virDomainDiskDefForeachPath): Likewise.
* src/qemu/qemu_driver.c (qemuDomainGetBlockInfo): Likewise.
* src/conf/storage_conf.c (virStorageVolumeFormatFromString): New
function.
(poolTypeInfo): Use it.
2012-09-28 17:11:07 +00:00
|
|
|
if (!(flags & QED_F_BACKING_FILE)) {
|
|
|
|
*format = VIR_STORAGE_FILE_NONE;
|
2010-11-19 23:19:24 +00:00
|
|
|
return BACKING_STORE_OK;
|
storage: list more file types
When an image has no backing file, using VIR_STORAGE_FILE_AUTO
for its type is a bit confusing. Additionally, a future patch
would like to reserve a default value for the case of no file
type specified in the XML, but different from the current use
of -1 to imply probing, since probing is not always safe.
Also, a couple of file types were missing compared to supported
code: libxl supports 'vhd', and qemu supports 'fat' for directories
passed through as a file system.
* src/util/storage_file.h (virStorageFileFormat): Add
VIR_STORAGE_FILE_NONE, VIR_STORAGE_FILE_FAT, VIR_STORAGE_FILE_VHD.
* src/util/storage_file.c (virStorageFileMatchesVersion): Match
documentation when version probing not supported.
(cowGetBackingStore, qcowXGetBackingStore, qcow1GetBackingStore)
(qcow2GetBackingStoreFormat, qedGetBackingStore)
(virStorageFileGetMetadataFromBuf)
(virStorageFileGetMetadataFromFD): Take NONE into account.
* src/conf/domain_conf.c (virDomainDiskDefForeachPath): Likewise.
* src/qemu/qemu_driver.c (qemuDomainGetBlockInfo): Likewise.
* src/conf/storage_conf.c (virStorageVolumeFormatFromString): New
function.
(poolTypeInfo): Use it.
2012-09-28 17:11:07 +00:00
|
|
|
}
|
2010-11-19 23:19:24 +00:00
|
|
|
|
|
|
|
/* Parse the backing file */
|
|
|
|
if (buf_size < QED_HDR_BACKING_FILE_OFFSET+8)
|
|
|
|
return BACKING_STORE_INVALID;
|
2013-02-07 01:57:13 +00:00
|
|
|
offset = virReadBufInt32LE(buf + QED_HDR_BACKING_FILE_OFFSET);
|
2010-11-19 23:19:24 +00:00
|
|
|
if (offset > buf_size)
|
|
|
|
return BACKING_STORE_INVALID;
|
2013-02-07 01:57:13 +00:00
|
|
|
size = virReadBufInt32LE(buf + QED_HDR_BACKING_FILE_SIZE);
|
2010-11-19 23:19:24 +00:00
|
|
|
if (size == 0)
|
|
|
|
return BACKING_STORE_OK;
|
|
|
|
if (offset + size > buf_size || offset + size < offset)
|
|
|
|
return BACKING_STORE_INVALID;
|
|
|
|
if (VIR_ALLOC_N(*res, size + 1) < 0) {
|
|
|
|
virReportOOMError();
|
|
|
|
return BACKING_STORE_ERROR;
|
|
|
|
}
|
|
|
|
memcpy(*res, buf + offset, size);
|
|
|
|
(*res)[size] = '\0';
|
|
|
|
|
storage: list more file types
When an image has no backing file, using VIR_STORAGE_FILE_AUTO
for its type is a bit confusing. Additionally, a future patch
would like to reserve a default value for the case of no file
type specified in the XML, but different from the current use
of -1 to imply probing, since probing is not always safe.
Also, a couple of file types were missing compared to supported
code: libxl supports 'vhd', and qemu supports 'fat' for directories
passed through as a file system.
* src/util/storage_file.h (virStorageFileFormat): Add
VIR_STORAGE_FILE_NONE, VIR_STORAGE_FILE_FAT, VIR_STORAGE_FILE_VHD.
* src/util/storage_file.c (virStorageFileMatchesVersion): Match
documentation when version probing not supported.
(cowGetBackingStore, qcowXGetBackingStore, qcow1GetBackingStore)
(qcow2GetBackingStoreFormat, qedGetBackingStore)
(virStorageFileGetMetadataFromBuf)
(virStorageFileGetMetadataFromFD): Take NONE into account.
* src/conf/domain_conf.c (virDomainDiskDefForeachPath): Likewise.
* src/qemu/qemu_driver.c (qemuDomainGetBlockInfo): Likewise.
* src/conf/storage_conf.c (virStorageVolumeFormatFromString): New
function.
(poolTypeInfo): Use it.
2012-09-28 17:11:07 +00:00
|
|
|
if (flags & QED_F_BACKING_FORMAT_NO_PROBE)
|
|
|
|
*format = VIR_STORAGE_FILE_RAW;
|
|
|
|
else
|
|
|
|
*format = VIR_STORAGE_FILE_AUTO_SAFE;
|
2010-11-19 23:19:24 +00:00
|
|
|
|
|
|
|
return BACKING_STORE_OK;
|
|
|
|
}
|
|
|
|
|
2009-09-29 08:34:48 +00:00
|
|
|
/**
|
storage: don't follow backing chain symlinks too eagerly
If you have a qcow2 file /path1/to/file pointed to by symlink
/path2/symlink, and pass qemu /path2/symlink, then qemu treats
a relative backing file in the qcow2 metadata as being relative
to /path2, not /path1/to. Yes, this means that it is possible
to create a qcow2 file where the choice of WHICH directory and
symlink you access its contents from will then determine WHICH
backing file (if any) you actually find; the results can be
rather screwy, but we have to match what qemu does.
Libvirt and qemu default to creating absolute backing file
names, so most users don't hit this. But at least VDSM uses
symlinks and relative backing names alongside the
--reuse-external flags to libvirt snapshot operations, with the
result that libvirt was failing to follow the intended chain of
backing files, and then backing files were not granted the
necessary sVirt permissions to be opened by qemu.
See https://bugzilla.redhat.com/show_bug.cgi?id=903248 for
more gory details. This fixes a regression introduced in
commit 8250783.
I tested this patch by creating the following chain:
ls /home/eblake/Downloads/Fedora.iso # raw file for base
cd /var/lib/libvirt/images
qemu-img create -f qcow2 \
-obacking_file=/home/eblake/Downloads/Fedora.iso,backing_fmt=raw one
mkdir sub
cd sub
ln -s ../one onelink
qemu-img create -f qcow2 \
-obacking_file=../sub/onelink,backing_fmt=qcow2 two
mv two ..
ln -s ../two twolink
qemu-img create -f qcow2 \
-obacking_file=../sub/twolink,backing_fmt=qcow2 three
mv three ..
ln -s ../three threelink
then pointing my domain at /var/lib/libvirt/images/sub/threelink.
Prior to this patch, I got complaints about missing backing
files; afterwards, I was able to verify that the backing chain
(and hence DAC and SELinux relabels) of the entire chain worked.
* src/util/virstoragefile.h (_virStorageFileMetadata): Add
directory member.
* src/util/virstoragefile.c (absolutePathFromBaseFile): Drop,
replaced by...
(virFindBackingFile): ...better function.
(virStorageFileGetMetadataInternal): Add an argument.
(virStorageFileGetMetadataFromFD, virStorageFileChainLookup)
(virStorageFileGetMetadata): Update callers.
2013-02-06 22:48:15 +00:00
|
|
|
* Given a starting point START (either an original file name, or the
|
|
|
|
* directory containing the original name, depending on START_IS_DIR)
|
|
|
|
* and a possibly relative backing file NAME, compute the relative
|
|
|
|
* DIRECTORY (optional) and CANONICAL (mandatory) location of the
|
|
|
|
* backing file. Return 0 on success, negative on error.
|
2009-09-29 08:34:48 +00:00
|
|
|
*/
|
storage: don't follow backing chain symlinks too eagerly
If you have a qcow2 file /path1/to/file pointed to by symlink
/path2/symlink, and pass qemu /path2/symlink, then qemu treats
a relative backing file in the qcow2 metadata as being relative
to /path2, not /path1/to. Yes, this means that it is possible
to create a qcow2 file where the choice of WHICH directory and
symlink you access its contents from will then determine WHICH
backing file (if any) you actually find; the results can be
rather screwy, but we have to match what qemu does.
Libvirt and qemu default to creating absolute backing file
names, so most users don't hit this. But at least VDSM uses
symlinks and relative backing names alongside the
--reuse-external flags to libvirt snapshot operations, with the
result that libvirt was failing to follow the intended chain of
backing files, and then backing files were not granted the
necessary sVirt permissions to be opened by qemu.
See https://bugzilla.redhat.com/show_bug.cgi?id=903248 for
more gory details. This fixes a regression introduced in
commit 8250783.
I tested this patch by creating the following chain:
ls /home/eblake/Downloads/Fedora.iso # raw file for base
cd /var/lib/libvirt/images
qemu-img create -f qcow2 \
-obacking_file=/home/eblake/Downloads/Fedora.iso,backing_fmt=raw one
mkdir sub
cd sub
ln -s ../one onelink
qemu-img create -f qcow2 \
-obacking_file=../sub/onelink,backing_fmt=qcow2 two
mv two ..
ln -s ../two twolink
qemu-img create -f qcow2 \
-obacking_file=../sub/twolink,backing_fmt=qcow2 three
mv three ..
ln -s ../three threelink
then pointing my domain at /var/lib/libvirt/images/sub/threelink.
Prior to this patch, I got complaints about missing backing
files; afterwards, I was able to verify that the backing chain
(and hence DAC and SELinux relabels) of the entire chain worked.
* src/util/virstoragefile.h (_virStorageFileMetadata): Add
directory member.
* src/util/virstoragefile.c (absolutePathFromBaseFile): Drop,
replaced by...
(virFindBackingFile): ...better function.
(virStorageFileGetMetadataInternal): Add an argument.
(virStorageFileGetMetadataFromFD, virStorageFileChainLookup)
(virStorageFileGetMetadata): Update callers.
2013-02-06 22:48:15 +00:00
|
|
|
static int ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(3) ATTRIBUTE_NONNULL(5)
|
|
|
|
virFindBackingFile(const char *start, bool start_is_dir, const char *path,
|
|
|
|
char **directory, char **canonical)
|
2009-09-29 08:34:48 +00:00
|
|
|
{
|
storage: don't follow backing chain symlinks too eagerly
If you have a qcow2 file /path1/to/file pointed to by symlink
/path2/symlink, and pass qemu /path2/symlink, then qemu treats
a relative backing file in the qcow2 metadata as being relative
to /path2, not /path1/to. Yes, this means that it is possible
to create a qcow2 file where the choice of WHICH directory and
symlink you access its contents from will then determine WHICH
backing file (if any) you actually find; the results can be
rather screwy, but we have to match what qemu does.
Libvirt and qemu default to creating absolute backing file
names, so most users don't hit this. But at least VDSM uses
symlinks and relative backing names alongside the
--reuse-external flags to libvirt snapshot operations, with the
result that libvirt was failing to follow the intended chain of
backing files, and then backing files were not granted the
necessary sVirt permissions to be opened by qemu.
See https://bugzilla.redhat.com/show_bug.cgi?id=903248 for
more gory details. This fixes a regression introduced in
commit 8250783.
I tested this patch by creating the following chain:
ls /home/eblake/Downloads/Fedora.iso # raw file for base
cd /var/lib/libvirt/images
qemu-img create -f qcow2 \
-obacking_file=/home/eblake/Downloads/Fedora.iso,backing_fmt=raw one
mkdir sub
cd sub
ln -s ../one onelink
qemu-img create -f qcow2 \
-obacking_file=../sub/onelink,backing_fmt=qcow2 two
mv two ..
ln -s ../two twolink
qemu-img create -f qcow2 \
-obacking_file=../sub/twolink,backing_fmt=qcow2 three
mv three ..
ln -s ../three threelink
then pointing my domain at /var/lib/libvirt/images/sub/threelink.
Prior to this patch, I got complaints about missing backing
files; afterwards, I was able to verify that the backing chain
(and hence DAC and SELinux relabels) of the entire chain worked.
* src/util/virstoragefile.h (_virStorageFileMetadata): Add
directory member.
* src/util/virstoragefile.c (absolutePathFromBaseFile): Drop,
replaced by...
(virFindBackingFile): ...better function.
(virStorageFileGetMetadataInternal): Add an argument.
(virStorageFileGetMetadataFromFD, virStorageFileChainLookup)
(virStorageFileGetMetadata): Update callers.
2013-02-06 22:48:15 +00:00
|
|
|
char *combined = NULL;
|
|
|
|
int ret = -1;
|
2009-09-29 08:34:48 +00:00
|
|
|
|
storage: don't follow backing chain symlinks too eagerly
If you have a qcow2 file /path1/to/file pointed to by symlink
/path2/symlink, and pass qemu /path2/symlink, then qemu treats
a relative backing file in the qcow2 metadata as being relative
to /path2, not /path1/to. Yes, this means that it is possible
to create a qcow2 file where the choice of WHICH directory and
symlink you access its contents from will then determine WHICH
backing file (if any) you actually find; the results can be
rather screwy, but we have to match what qemu does.
Libvirt and qemu default to creating absolute backing file
names, so most users don't hit this. But at least VDSM uses
symlinks and relative backing names alongside the
--reuse-external flags to libvirt snapshot operations, with the
result that libvirt was failing to follow the intended chain of
backing files, and then backing files were not granted the
necessary sVirt permissions to be opened by qemu.
See https://bugzilla.redhat.com/show_bug.cgi?id=903248 for
more gory details. This fixes a regression introduced in
commit 8250783.
I tested this patch by creating the following chain:
ls /home/eblake/Downloads/Fedora.iso # raw file for base
cd /var/lib/libvirt/images
qemu-img create -f qcow2 \
-obacking_file=/home/eblake/Downloads/Fedora.iso,backing_fmt=raw one
mkdir sub
cd sub
ln -s ../one onelink
qemu-img create -f qcow2 \
-obacking_file=../sub/onelink,backing_fmt=qcow2 two
mv two ..
ln -s ../two twolink
qemu-img create -f qcow2 \
-obacking_file=../sub/twolink,backing_fmt=qcow2 three
mv three ..
ln -s ../three threelink
then pointing my domain at /var/lib/libvirt/images/sub/threelink.
Prior to this patch, I got complaints about missing backing
files; afterwards, I was able to verify that the backing chain
(and hence DAC and SELinux relabels) of the entire chain worked.
* src/util/virstoragefile.h (_virStorageFileMetadata): Add
directory member.
* src/util/virstoragefile.c (absolutePathFromBaseFile): Drop,
replaced by...
(virFindBackingFile): ...better function.
(virStorageFileGetMetadataInternal): Add an argument.
(virStorageFileGetMetadataFromFD, virStorageFileChainLookup)
(virStorageFileGetMetadata): Update callers.
2013-02-06 22:48:15 +00:00
|
|
|
if (*path == '/') {
|
|
|
|
/* Safe to cast away const */
|
|
|
|
combined = (char *)path;
|
|
|
|
} else {
|
|
|
|
size_t d_len = start_is_dir ? strlen(start) : dir_len(start);
|
2012-10-31 10:17:41 +00:00
|
|
|
|
storage: don't follow backing chain symlinks too eagerly
If you have a qcow2 file /path1/to/file pointed to by symlink
/path2/symlink, and pass qemu /path2/symlink, then qemu treats
a relative backing file in the qcow2 metadata as being relative
to /path2, not /path1/to. Yes, this means that it is possible
to create a qcow2 file where the choice of WHICH directory and
symlink you access its contents from will then determine WHICH
backing file (if any) you actually find; the results can be
rather screwy, but we have to match what qemu does.
Libvirt and qemu default to creating absolute backing file
names, so most users don't hit this. But at least VDSM uses
symlinks and relative backing names alongside the
--reuse-external flags to libvirt snapshot operations, with the
result that libvirt was failing to follow the intended chain of
backing files, and then backing files were not granted the
necessary sVirt permissions to be opened by qemu.
See https://bugzilla.redhat.com/show_bug.cgi?id=903248 for
more gory details. This fixes a regression introduced in
commit 8250783.
I tested this patch by creating the following chain:
ls /home/eblake/Downloads/Fedora.iso # raw file for base
cd /var/lib/libvirt/images
qemu-img create -f qcow2 \
-obacking_file=/home/eblake/Downloads/Fedora.iso,backing_fmt=raw one
mkdir sub
cd sub
ln -s ../one onelink
qemu-img create -f qcow2 \
-obacking_file=../sub/onelink,backing_fmt=qcow2 two
mv two ..
ln -s ../two twolink
qemu-img create -f qcow2 \
-obacking_file=../sub/twolink,backing_fmt=qcow2 three
mv three ..
ln -s ../three threelink
then pointing my domain at /var/lib/libvirt/images/sub/threelink.
Prior to this patch, I got complaints about missing backing
files; afterwards, I was able to verify that the backing chain
(and hence DAC and SELinux relabels) of the entire chain worked.
* src/util/virstoragefile.h (_virStorageFileMetadata): Add
directory member.
* src/util/virstoragefile.c (absolutePathFromBaseFile): Drop,
replaced by...
(virFindBackingFile): ...better function.
(virStorageFileGetMetadataInternal): Add an argument.
(virStorageFileGetMetadataFromFD, virStorageFileChainLookup)
(virStorageFileGetMetadata): Update callers.
2013-02-06 22:48:15 +00:00
|
|
|
if (d_len > INT_MAX) {
|
|
|
|
virReportError(VIR_ERR_INTERNAL_ERROR,
|
|
|
|
_("name too long: '%s'"), start);
|
|
|
|
goto cleanup;
|
|
|
|
} else if (d_len == 0) {
|
|
|
|
start = ".";
|
|
|
|
d_len = 1;
|
|
|
|
}
|
|
|
|
if (virAsprintf(&combined, "%.*s/%s", (int)d_len, start, path) < 0) {
|
|
|
|
virReportOOMError();
|
|
|
|
goto cleanup;
|
|
|
|
}
|
2012-10-31 10:17:41 +00:00
|
|
|
}
|
2009-09-29 08:34:48 +00:00
|
|
|
|
storage: don't follow backing chain symlinks too eagerly
If you have a qcow2 file /path1/to/file pointed to by symlink
/path2/symlink, and pass qemu /path2/symlink, then qemu treats
a relative backing file in the qcow2 metadata as being relative
to /path2, not /path1/to. Yes, this means that it is possible
to create a qcow2 file where the choice of WHICH directory and
symlink you access its contents from will then determine WHICH
backing file (if any) you actually find; the results can be
rather screwy, but we have to match what qemu does.
Libvirt and qemu default to creating absolute backing file
names, so most users don't hit this. But at least VDSM uses
symlinks and relative backing names alongside the
--reuse-external flags to libvirt snapshot operations, with the
result that libvirt was failing to follow the intended chain of
backing files, and then backing files were not granted the
necessary sVirt permissions to be opened by qemu.
See https://bugzilla.redhat.com/show_bug.cgi?id=903248 for
more gory details. This fixes a regression introduced in
commit 8250783.
I tested this patch by creating the following chain:
ls /home/eblake/Downloads/Fedora.iso # raw file for base
cd /var/lib/libvirt/images
qemu-img create -f qcow2 \
-obacking_file=/home/eblake/Downloads/Fedora.iso,backing_fmt=raw one
mkdir sub
cd sub
ln -s ../one onelink
qemu-img create -f qcow2 \
-obacking_file=../sub/onelink,backing_fmt=qcow2 two
mv two ..
ln -s ../two twolink
qemu-img create -f qcow2 \
-obacking_file=../sub/twolink,backing_fmt=qcow2 three
mv three ..
ln -s ../three threelink
then pointing my domain at /var/lib/libvirt/images/sub/threelink.
Prior to this patch, I got complaints about missing backing
files; afterwards, I was able to verify that the backing chain
(and hence DAC and SELinux relabels) of the entire chain worked.
* src/util/virstoragefile.h (_virStorageFileMetadata): Add
directory member.
* src/util/virstoragefile.c (absolutePathFromBaseFile): Drop,
replaced by...
(virFindBackingFile): ...better function.
(virStorageFileGetMetadataInternal): Add an argument.
(virStorageFileGetMetadataFromFD, virStorageFileChainLookup)
(virStorageFileGetMetadata): Update callers.
2013-02-06 22:48:15 +00:00
|
|
|
if (directory && !(*directory = mdir_name(combined))) {
|
|
|
|
virReportOOMError();
|
2012-10-31 10:17:41 +00:00
|
|
|
goto cleanup;
|
|
|
|
}
|
2010-02-05 13:57:35 +00:00
|
|
|
|
storage: don't follow backing chain symlinks too eagerly
If you have a qcow2 file /path1/to/file pointed to by symlink
/path2/symlink, and pass qemu /path2/symlink, then qemu treats
a relative backing file in the qcow2 metadata as being relative
to /path2, not /path1/to. Yes, this means that it is possible
to create a qcow2 file where the choice of WHICH directory and
symlink you access its contents from will then determine WHICH
backing file (if any) you actually find; the results can be
rather screwy, but we have to match what qemu does.
Libvirt and qemu default to creating absolute backing file
names, so most users don't hit this. But at least VDSM uses
symlinks and relative backing names alongside the
--reuse-external flags to libvirt snapshot operations, with the
result that libvirt was failing to follow the intended chain of
backing files, and then backing files were not granted the
necessary sVirt permissions to be opened by qemu.
See https://bugzilla.redhat.com/show_bug.cgi?id=903248 for
more gory details. This fixes a regression introduced in
commit 8250783.
I tested this patch by creating the following chain:
ls /home/eblake/Downloads/Fedora.iso # raw file for base
cd /var/lib/libvirt/images
qemu-img create -f qcow2 \
-obacking_file=/home/eblake/Downloads/Fedora.iso,backing_fmt=raw one
mkdir sub
cd sub
ln -s ../one onelink
qemu-img create -f qcow2 \
-obacking_file=../sub/onelink,backing_fmt=qcow2 two
mv two ..
ln -s ../two twolink
qemu-img create -f qcow2 \
-obacking_file=../sub/twolink,backing_fmt=qcow2 three
mv three ..
ln -s ../three threelink
then pointing my domain at /var/lib/libvirt/images/sub/threelink.
Prior to this patch, I got complaints about missing backing
files; afterwards, I was able to verify that the backing chain
(and hence DAC and SELinux relabels) of the entire chain worked.
* src/util/virstoragefile.h (_virStorageFileMetadata): Add
directory member.
* src/util/virstoragefile.c (absolutePathFromBaseFile): Drop,
replaced by...
(virFindBackingFile): ...better function.
(virStorageFileGetMetadataInternal): Add an argument.
(virStorageFileGetMetadataFromFD, virStorageFileChainLookup)
(virStorageFileGetMetadata): Update callers.
2013-02-06 22:48:15 +00:00
|
|
|
if (!(*canonical = canonicalize_file_name(combined))) {
|
|
|
|
virReportSystemError(errno,
|
|
|
|
_("Can't canonicalize path '%s'"), path);
|
2012-10-31 10:17:41 +00:00
|
|
|
goto cleanup;
|
|
|
|
}
|
|
|
|
|
storage: don't follow backing chain symlinks too eagerly
If you have a qcow2 file /path1/to/file pointed to by symlink
/path2/symlink, and pass qemu /path2/symlink, then qemu treats
a relative backing file in the qcow2 metadata as being relative
to /path2, not /path1/to. Yes, this means that it is possible
to create a qcow2 file where the choice of WHICH directory and
symlink you access its contents from will then determine WHICH
backing file (if any) you actually find; the results can be
rather screwy, but we have to match what qemu does.
Libvirt and qemu default to creating absolute backing file
names, so most users don't hit this. But at least VDSM uses
symlinks and relative backing names alongside the
--reuse-external flags to libvirt snapshot operations, with the
result that libvirt was failing to follow the intended chain of
backing files, and then backing files were not granted the
necessary sVirt permissions to be opened by qemu.
See https://bugzilla.redhat.com/show_bug.cgi?id=903248 for
more gory details. This fixes a regression introduced in
commit 8250783.
I tested this patch by creating the following chain:
ls /home/eblake/Downloads/Fedora.iso # raw file for base
cd /var/lib/libvirt/images
qemu-img create -f qcow2 \
-obacking_file=/home/eblake/Downloads/Fedora.iso,backing_fmt=raw one
mkdir sub
cd sub
ln -s ../one onelink
qemu-img create -f qcow2 \
-obacking_file=../sub/onelink,backing_fmt=qcow2 two
mv two ..
ln -s ../two twolink
qemu-img create -f qcow2 \
-obacking_file=../sub/twolink,backing_fmt=qcow2 three
mv three ..
ln -s ../three threelink
then pointing my domain at /var/lib/libvirt/images/sub/threelink.
Prior to this patch, I got complaints about missing backing
files; afterwards, I was able to verify that the backing chain
(and hence DAC and SELinux relabels) of the entire chain worked.
* src/util/virstoragefile.h (_virStorageFileMetadata): Add
directory member.
* src/util/virstoragefile.c (absolutePathFromBaseFile): Drop,
replaced by...
(virFindBackingFile): ...better function.
(virStorageFileGetMetadataInternal): Add an argument.
(virStorageFileGetMetadataFromFD, virStorageFileChainLookup)
(virStorageFileGetMetadata): Update callers.
2013-02-06 22:48:15 +00:00
|
|
|
ret = 0;
|
2012-10-31 10:17:41 +00:00
|
|
|
|
|
|
|
cleanup:
|
storage: don't follow backing chain symlinks too eagerly
If you have a qcow2 file /path1/to/file pointed to by symlink
/path2/symlink, and pass qemu /path2/symlink, then qemu treats
a relative backing file in the qcow2 metadata as being relative
to /path2, not /path1/to. Yes, this means that it is possible
to create a qcow2 file where the choice of WHICH directory and
symlink you access its contents from will then determine WHICH
backing file (if any) you actually find; the results can be
rather screwy, but we have to match what qemu does.
Libvirt and qemu default to creating absolute backing file
names, so most users don't hit this. But at least VDSM uses
symlinks and relative backing names alongside the
--reuse-external flags to libvirt snapshot operations, with the
result that libvirt was failing to follow the intended chain of
backing files, and then backing files were not granted the
necessary sVirt permissions to be opened by qemu.
See https://bugzilla.redhat.com/show_bug.cgi?id=903248 for
more gory details. This fixes a regression introduced in
commit 8250783.
I tested this patch by creating the following chain:
ls /home/eblake/Downloads/Fedora.iso # raw file for base
cd /var/lib/libvirt/images
qemu-img create -f qcow2 \
-obacking_file=/home/eblake/Downloads/Fedora.iso,backing_fmt=raw one
mkdir sub
cd sub
ln -s ../one onelink
qemu-img create -f qcow2 \
-obacking_file=../sub/onelink,backing_fmt=qcow2 two
mv two ..
ln -s ../two twolink
qemu-img create -f qcow2 \
-obacking_file=../sub/twolink,backing_fmt=qcow2 three
mv three ..
ln -s ../three threelink
then pointing my domain at /var/lib/libvirt/images/sub/threelink.
Prior to this patch, I got complaints about missing backing
files; afterwards, I was able to verify that the backing chain
(and hence DAC and SELinux relabels) of the entire chain worked.
* src/util/virstoragefile.h (_virStorageFileMetadata): Add
directory member.
* src/util/virstoragefile.c (absolutePathFromBaseFile): Drop,
replaced by...
(virFindBackingFile): ...better function.
(virStorageFileGetMetadataInternal): Add an argument.
(virStorageFileGetMetadataFromFD, virStorageFileChainLookup)
(virStorageFileGetMetadata): Update callers.
2013-02-06 22:48:15 +00:00
|
|
|
if (combined != path)
|
|
|
|
VIR_FREE(combined);
|
|
|
|
return ret;
|
2009-09-29 08:34:48 +00:00
|
|
|
}
|
|
|
|
|
2010-06-15 13:58:10 +00:00
|
|
|
|
|
|
|
static bool
|
|
|
|
virStorageFileMatchesMagic(int format,
|
|
|
|
unsigned char *buf,
|
|
|
|
size_t buflen)
|
2009-09-29 08:34:48 +00:00
|
|
|
{
|
2010-06-15 13:58:10 +00:00
|
|
|
int mlen;
|
2013-02-04 19:16:22 +00:00
|
|
|
int magicOffset = fileTypeInfo[format].magicOffset;
|
|
|
|
const char *magic = fileTypeInfo[format].magic;
|
2009-09-29 08:34:48 +00:00
|
|
|
|
2013-02-04 19:16:22 +00:00
|
|
|
if (magic == NULL)
|
2010-06-15 13:58:10 +00:00
|
|
|
return false;
|
2010-05-18 05:53:31 +00:00
|
|
|
|
2010-06-15 13:58:10 +00:00
|
|
|
/* Validate magic data */
|
2013-02-04 19:16:22 +00:00
|
|
|
mlen = strlen(magic);
|
|
|
|
if (magicOffset + mlen > buflen)
|
2010-06-15 13:58:10 +00:00
|
|
|
return false;
|
2009-09-29 08:34:48 +00:00
|
|
|
|
2013-02-04 19:16:22 +00:00
|
|
|
if (memcmp(buf + magicOffset, magic, mlen) != 0)
|
2010-06-15 13:58:10 +00:00
|
|
|
return false;
|
|
|
|
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
static bool
|
|
|
|
virStorageFileMatchesExtension(int format,
|
|
|
|
const char *path)
|
|
|
|
{
|
|
|
|
if (fileTypeInfo[format].extension == NULL)
|
|
|
|
return false;
|
|
|
|
|
|
|
|
if (virFileHasSuffix(path, fileTypeInfo[format].extension))
|
|
|
|
return true;
|
|
|
|
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
static bool
|
|
|
|
virStorageFileMatchesVersion(int format,
|
|
|
|
unsigned char *buf,
|
|
|
|
size_t buflen)
|
|
|
|
{
|
|
|
|
int version;
|
|
|
|
|
|
|
|
/* Validate version number info */
|
|
|
|
if (fileTypeInfo[format].versionOffset == -1)
|
storage: list more file types
When an image has no backing file, using VIR_STORAGE_FILE_AUTO
for its type is a bit confusing. Additionally, a future patch
would like to reserve a default value for the case of no file
type specified in the XML, but different from the current use
of -1 to imply probing, since probing is not always safe.
Also, a couple of file types were missing compared to supported
code: libxl supports 'vhd', and qemu supports 'fat' for directories
passed through as a file system.
* src/util/storage_file.h (virStorageFileFormat): Add
VIR_STORAGE_FILE_NONE, VIR_STORAGE_FILE_FAT, VIR_STORAGE_FILE_VHD.
* src/util/storage_file.c (virStorageFileMatchesVersion): Match
documentation when version probing not supported.
(cowGetBackingStore, qcowXGetBackingStore, qcow1GetBackingStore)
(qcow2GetBackingStoreFormat, qedGetBackingStore)
(virStorageFileGetMetadataFromBuf)
(virStorageFileGetMetadataFromFD): Take NONE into account.
* src/conf/domain_conf.c (virDomainDiskDefForeachPath): Likewise.
* src/qemu/qemu_driver.c (qemuDomainGetBlockInfo): Likewise.
* src/conf/storage_conf.c (virStorageVolumeFormatFromString): New
function.
(poolTypeInfo): Use it.
2012-09-28 17:11:07 +00:00
|
|
|
return false;
|
2010-06-15 13:58:10 +00:00
|
|
|
|
2012-12-13 14:25:10 +00:00
|
|
|
/* -2 == non-versioned file format, so trivially match */
|
|
|
|
if (fileTypeInfo[format].versionOffset == -2)
|
|
|
|
return true;
|
|
|
|
|
2010-06-15 13:58:10 +00:00
|
|
|
if ((fileTypeInfo[format].versionOffset + 4) > buflen)
|
|
|
|
return false;
|
|
|
|
|
2013-02-07 01:57:13 +00:00
|
|
|
if (fileTypeInfo[format].endian == LV_LITTLE_ENDIAN)
|
|
|
|
version = virReadBufInt32LE(buf + fileTypeInfo[format].versionOffset);
|
|
|
|
else
|
|
|
|
version = virReadBufInt32BE(buf + fileTypeInfo[format].versionOffset);
|
2012-12-13 14:23:50 +00:00
|
|
|
|
|
|
|
VIR_DEBUG("Compare detected version %d vs expected version %d",
|
|
|
|
version, fileTypeInfo[format].versionNumber);
|
2010-06-15 13:58:10 +00:00
|
|
|
if (version != fileTypeInfo[format].versionNumber)
|
|
|
|
return false;
|
2009-09-29 08:34:48 +00:00
|
|
|
|
2010-06-15 13:58:10 +00:00
|
|
|
return true;
|
|
|
|
}
|
2009-09-29 08:34:48 +00:00
|
|
|
|
2010-11-03 15:50:11 +00:00
|
|
|
static bool
|
|
|
|
virBackingStoreIsFile(const char *backing)
|
|
|
|
{
|
2012-08-08 21:02:24 +00:00
|
|
|
/* Backing store is a network block device or Rados block device */
|
|
|
|
if (STRPREFIX(backing, "nbd:") || STRPREFIX(backing, "rbd:"))
|
2010-11-03 15:50:11 +00:00
|
|
|
return false;
|
|
|
|
return true;
|
|
|
|
}
|
2009-09-29 08:34:48 +00:00
|
|
|
|
2013-02-06 23:54:08 +00:00
|
|
|
static int
|
|
|
|
virStorageFileProbeFormatFromBuf(const char *path,
|
|
|
|
unsigned char *buf,
|
|
|
|
size_t buflen)
|
|
|
|
{
|
|
|
|
int format = VIR_STORAGE_FILE_RAW;
|
|
|
|
int i;
|
|
|
|
int possibleFormat = VIR_STORAGE_FILE_RAW;
|
|
|
|
VIR_DEBUG("path=%s", path);
|
|
|
|
|
|
|
|
/* First check file magic */
|
|
|
|
for (i = 0 ; i < VIR_STORAGE_FILE_LAST ; i++) {
|
|
|
|
if (virStorageFileMatchesMagic(i, buf, buflen)) {
|
|
|
|
if (!virStorageFileMatchesVersion(i, buf, buflen)) {
|
|
|
|
possibleFormat = i;
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
format = i;
|
|
|
|
goto cleanup;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if (possibleFormat != VIR_STORAGE_FILE_RAW)
|
|
|
|
VIR_WARN("File %s matches %s magic, but version is wrong. "
|
|
|
|
"Please report new version to libvir-list@redhat.com",
|
|
|
|
path, virStorageFileFormatTypeToString(possibleFormat));
|
|
|
|
|
|
|
|
/* No magic, so check file extension */
|
|
|
|
for (i = 0 ; i < VIR_STORAGE_FILE_LAST ; i++) {
|
|
|
|
if (virStorageFileMatchesExtension(i, path)) {
|
|
|
|
format = i;
|
|
|
|
goto cleanup;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
cleanup:
|
|
|
|
VIR_DEBUG("format=%d", format);
|
|
|
|
return format;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
storage: don't follow backing chain symlinks too eagerly
If you have a qcow2 file /path1/to/file pointed to by symlink
/path2/symlink, and pass qemu /path2/symlink, then qemu treats
a relative backing file in the qcow2 metadata as being relative
to /path2, not /path1/to. Yes, this means that it is possible
to create a qcow2 file where the choice of WHICH directory and
symlink you access its contents from will then determine WHICH
backing file (if any) you actually find; the results can be
rather screwy, but we have to match what qemu does.
Libvirt and qemu default to creating absolute backing file
names, so most users don't hit this. But at least VDSM uses
symlinks and relative backing names alongside the
--reuse-external flags to libvirt snapshot operations, with the
result that libvirt was failing to follow the intended chain of
backing files, and then backing files were not granted the
necessary sVirt permissions to be opened by qemu.
See https://bugzilla.redhat.com/show_bug.cgi?id=903248 for
more gory details. This fixes a regression introduced in
commit 8250783.
I tested this patch by creating the following chain:
ls /home/eblake/Downloads/Fedora.iso # raw file for base
cd /var/lib/libvirt/images
qemu-img create -f qcow2 \
-obacking_file=/home/eblake/Downloads/Fedora.iso,backing_fmt=raw one
mkdir sub
cd sub
ln -s ../one onelink
qemu-img create -f qcow2 \
-obacking_file=../sub/onelink,backing_fmt=qcow2 two
mv two ..
ln -s ../two twolink
qemu-img create -f qcow2 \
-obacking_file=../sub/twolink,backing_fmt=qcow2 three
mv three ..
ln -s ../three threelink
then pointing my domain at /var/lib/libvirt/images/sub/threelink.
Prior to this patch, I got complaints about missing backing
files; afterwards, I was able to verify that the backing chain
(and hence DAC and SELinux relabels) of the entire chain worked.
* src/util/virstoragefile.h (_virStorageFileMetadata): Add
directory member.
* src/util/virstoragefile.c (absolutePathFromBaseFile): Drop,
replaced by...
(virFindBackingFile): ...better function.
(virStorageFileGetMetadataInternal): Add an argument.
(virStorageFileGetMetadataFromFD, virStorageFileChainLookup)
(virStorageFileGetMetadata): Update callers.
2013-02-06 22:48:15 +00:00
|
|
|
/* Given a file descriptor FD open on PATH, and optionally opened from
|
|
|
|
* a given DIRECTORY, return metadata about that file, assuming it has
|
|
|
|
* the given FORMAT. */
|
2013-02-09 13:41:01 +00:00
|
|
|
static virStorageFileMetadataPtr
|
2013-02-06 23:33:45 +00:00
|
|
|
virStorageFileGetMetadataInternal(const char *path,
|
|
|
|
int fd,
|
storage: don't follow backing chain symlinks too eagerly
If you have a qcow2 file /path1/to/file pointed to by symlink
/path2/symlink, and pass qemu /path2/symlink, then qemu treats
a relative backing file in the qcow2 metadata as being relative
to /path2, not /path1/to. Yes, this means that it is possible
to create a qcow2 file where the choice of WHICH directory and
symlink you access its contents from will then determine WHICH
backing file (if any) you actually find; the results can be
rather screwy, but we have to match what qemu does.
Libvirt and qemu default to creating absolute backing file
names, so most users don't hit this. But at least VDSM uses
symlinks and relative backing names alongside the
--reuse-external flags to libvirt snapshot operations, with the
result that libvirt was failing to follow the intended chain of
backing files, and then backing files were not granted the
necessary sVirt permissions to be opened by qemu.
See https://bugzilla.redhat.com/show_bug.cgi?id=903248 for
more gory details. This fixes a regression introduced in
commit 8250783.
I tested this patch by creating the following chain:
ls /home/eblake/Downloads/Fedora.iso # raw file for base
cd /var/lib/libvirt/images
qemu-img create -f qcow2 \
-obacking_file=/home/eblake/Downloads/Fedora.iso,backing_fmt=raw one
mkdir sub
cd sub
ln -s ../one onelink
qemu-img create -f qcow2 \
-obacking_file=../sub/onelink,backing_fmt=qcow2 two
mv two ..
ln -s ../two twolink
qemu-img create -f qcow2 \
-obacking_file=../sub/twolink,backing_fmt=qcow2 three
mv three ..
ln -s ../three threelink
then pointing my domain at /var/lib/libvirt/images/sub/threelink.
Prior to this patch, I got complaints about missing backing
files; afterwards, I was able to verify that the backing chain
(and hence DAC and SELinux relabels) of the entire chain worked.
* src/util/virstoragefile.h (_virStorageFileMetadata): Add
directory member.
* src/util/virstoragefile.c (absolutePathFromBaseFile): Drop,
replaced by...
(virFindBackingFile): ...better function.
(virStorageFileGetMetadataInternal): Add an argument.
(virStorageFileGetMetadataFromFD, virStorageFileChainLookup)
(virStorageFileGetMetadata): Update callers.
2013-02-06 22:48:15 +00:00
|
|
|
const char *directory,
|
2013-02-06 23:33:45 +00:00
|
|
|
int format)
|
2010-06-15 13:58:10 +00:00
|
|
|
{
|
2013-02-06 23:33:45 +00:00
|
|
|
virStorageFileMetadata *meta = NULL;
|
|
|
|
unsigned char *buf = NULL;
|
|
|
|
ssize_t len = STORAGE_MAX_HEAD;
|
2013-02-09 13:41:01 +00:00
|
|
|
virStorageFileMetadata *ret = NULL;
|
2013-02-06 23:33:45 +00:00
|
|
|
struct stat sb;
|
|
|
|
|
|
|
|
VIR_DEBUG("path=%s, fd=%d, format=%d", path, fd, format);
|
2013-02-09 13:41:01 +00:00
|
|
|
|
2013-02-06 23:33:45 +00:00
|
|
|
if (VIR_ALLOC(meta) < 0) {
|
|
|
|
virReportOOMError();
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (fstat(fd, &sb) < 0) {
|
|
|
|
virReportSystemError(errno,
|
|
|
|
_("cannot stat file '%s'"),
|
|
|
|
path);
|
|
|
|
goto cleanup;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* No header to probe for directories, but also no backing file */
|
|
|
|
if (S_ISDIR(sb.st_mode))
|
|
|
|
return meta;
|
|
|
|
|
|
|
|
if (lseek(fd, 0, SEEK_SET) == (off_t)-1) {
|
|
|
|
virReportSystemError(errno, _("cannot seek to start of '%s'"), path);
|
|
|
|
goto cleanup;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (VIR_ALLOC_N(buf, len) < 0) {
|
|
|
|
virReportOOMError();
|
|
|
|
goto cleanup;
|
|
|
|
}
|
|
|
|
|
|
|
|
if ((len = read(fd, buf, len)) < 0) {
|
|
|
|
virReportSystemError(errno, _("cannot read header '%s'"), path);
|
|
|
|
goto cleanup;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (format == VIR_STORAGE_FILE_AUTO)
|
|
|
|
format = virStorageFileProbeFormatFromBuf(path, buf, len);
|
|
|
|
|
|
|
|
if (format <= VIR_STORAGE_FILE_NONE ||
|
|
|
|
format >= VIR_STORAGE_FILE_LAST) {
|
|
|
|
virReportSystemError(EINVAL, _("unknown storage file format %d"),
|
|
|
|
format);
|
|
|
|
goto cleanup;
|
|
|
|
}
|
2012-12-13 14:23:50 +00:00
|
|
|
|
2010-06-15 13:58:10 +00:00
|
|
|
/* XXX we should consider moving virStorageBackendUpdateVolInfo
|
|
|
|
* code into this method, for non-magic files
|
|
|
|
*/
|
2013-02-06 23:33:45 +00:00
|
|
|
if (!fileTypeInfo[format].magic)
|
2013-02-09 13:41:01 +00:00
|
|
|
goto done;
|
2009-09-29 08:34:48 +00:00
|
|
|
|
2010-06-15 13:58:10 +00:00
|
|
|
/* Optionally extract capacity from file */
|
|
|
|
if (fileTypeInfo[format].sizeOffset != -1) {
|
2013-02-09 13:41:01 +00:00
|
|
|
if ((fileTypeInfo[format].sizeOffset + 8) > len)
|
|
|
|
goto done;
|
2010-06-15 13:58:10 +00:00
|
|
|
|
2013-02-07 01:57:13 +00:00
|
|
|
if (fileTypeInfo[format].endian == LV_LITTLE_ENDIAN)
|
|
|
|
meta->capacity = virReadBufInt64LE(buf +
|
|
|
|
fileTypeInfo[format].sizeOffset);
|
|
|
|
else
|
|
|
|
meta->capacity = virReadBufInt64BE(buf +
|
|
|
|
fileTypeInfo[format].sizeOffset);
|
2010-06-15 13:58:10 +00:00
|
|
|
/* Avoid unlikely, but theoretically possible overflow */
|
2013-02-07 01:57:13 +00:00
|
|
|
if (meta->capacity > (ULLONG_MAX /
|
|
|
|
fileTypeInfo[format].sizeMultiplier))
|
2013-02-09 13:41:01 +00:00
|
|
|
goto done;
|
2010-06-15 13:58:10 +00:00
|
|
|
meta->capacity *= fileTypeInfo[format].sizeMultiplier;
|
|
|
|
}
|
2009-09-29 08:34:48 +00:00
|
|
|
|
2010-06-15 13:58:10 +00:00
|
|
|
if (fileTypeInfo[format].qcowCryptOffset != -1) {
|
|
|
|
int crypt_format;
|
2009-09-29 08:34:48 +00:00
|
|
|
|
2013-02-07 01:57:13 +00:00
|
|
|
crypt_format = virReadBufInt32BE(buf +
|
|
|
|
fileTypeInfo[format].qcowCryptOffset);
|
2010-06-15 13:58:10 +00:00
|
|
|
meta->encrypted = crypt_format != 0;
|
|
|
|
}
|
2009-09-29 08:34:48 +00:00
|
|
|
|
2010-06-15 13:58:10 +00:00
|
|
|
if (fileTypeInfo[format].getBackingStore != NULL) {
|
|
|
|
char *backing;
|
|
|
|
int backingFormat;
|
2013-02-09 13:41:01 +00:00
|
|
|
int store = fileTypeInfo[format].getBackingStore(&backing,
|
|
|
|
&backingFormat,
|
|
|
|
buf, len);
|
|
|
|
if (store == BACKING_STORE_INVALID)
|
|
|
|
goto done;
|
2010-06-15 13:58:10 +00:00
|
|
|
|
2013-02-09 13:41:01 +00:00
|
|
|
if (store == BACKING_STORE_ERROR)
|
|
|
|
goto cleanup;
|
2010-06-15 13:58:10 +00:00
|
|
|
|
2010-11-03 15:50:11 +00:00
|
|
|
meta->backingStoreIsFile = false;
|
2010-06-15 13:58:10 +00:00
|
|
|
if (backing != NULL) {
|
2012-10-09 23:47:42 +00:00
|
|
|
meta->backingStore = strdup(backing);
|
|
|
|
if (meta->backingStore == NULL) {
|
|
|
|
virReportOOMError();
|
|
|
|
VIR_FREE(backing);
|
2013-02-09 13:41:01 +00:00
|
|
|
goto cleanup;
|
2012-10-09 23:47:42 +00:00
|
|
|
}
|
2010-11-03 15:50:11 +00:00
|
|
|
if (virBackingStoreIsFile(backing)) {
|
|
|
|
meta->backingStoreIsFile = true;
|
2012-10-09 23:47:42 +00:00
|
|
|
meta->backingStoreRaw = meta->backingStore;
|
storage: don't follow backing chain symlinks too eagerly
If you have a qcow2 file /path1/to/file pointed to by symlink
/path2/symlink, and pass qemu /path2/symlink, then qemu treats
a relative backing file in the qcow2 metadata as being relative
to /path2, not /path1/to. Yes, this means that it is possible
to create a qcow2 file where the choice of WHICH directory and
symlink you access its contents from will then determine WHICH
backing file (if any) you actually find; the results can be
rather screwy, but we have to match what qemu does.
Libvirt and qemu default to creating absolute backing file
names, so most users don't hit this. But at least VDSM uses
symlinks and relative backing names alongside the
--reuse-external flags to libvirt snapshot operations, with the
result that libvirt was failing to follow the intended chain of
backing files, and then backing files were not granted the
necessary sVirt permissions to be opened by qemu.
See https://bugzilla.redhat.com/show_bug.cgi?id=903248 for
more gory details. This fixes a regression introduced in
commit 8250783.
I tested this patch by creating the following chain:
ls /home/eblake/Downloads/Fedora.iso # raw file for base
cd /var/lib/libvirt/images
qemu-img create -f qcow2 \
-obacking_file=/home/eblake/Downloads/Fedora.iso,backing_fmt=raw one
mkdir sub
cd sub
ln -s ../one onelink
qemu-img create -f qcow2 \
-obacking_file=../sub/onelink,backing_fmt=qcow2 two
mv two ..
ln -s ../two twolink
qemu-img create -f qcow2 \
-obacking_file=../sub/twolink,backing_fmt=qcow2 three
mv three ..
ln -s ../three threelink
then pointing my domain at /var/lib/libvirt/images/sub/threelink.
Prior to this patch, I got complaints about missing backing
files; afterwards, I was able to verify that the backing chain
(and hence DAC and SELinux relabels) of the entire chain worked.
* src/util/virstoragefile.h (_virStorageFileMetadata): Add
directory member.
* src/util/virstoragefile.c (absolutePathFromBaseFile): Drop,
replaced by...
(virFindBackingFile): ...better function.
(virStorageFileGetMetadataInternal): Add an argument.
(virStorageFileGetMetadataFromFD, virStorageFileChainLookup)
(virStorageFileGetMetadata): Update callers.
2013-02-06 22:48:15 +00:00
|
|
|
meta->backingStore = NULL;
|
|
|
|
if (virFindBackingFile(directory ? directory : path,
|
|
|
|
!!directory, backing,
|
|
|
|
&meta->directory,
|
|
|
|
&meta->backingStore) < 0) {
|
2012-11-07 13:53:49 +00:00
|
|
|
/* the backing file is (currently) unavailable, treat this
|
2012-11-21 10:57:22 +00:00
|
|
|
* file as standalone:
|
|
|
|
* backingStoreRaw is kept to mark broken image chains */
|
|
|
|
meta->backingStoreIsFile = false;
|
2012-11-07 13:53:49 +00:00
|
|
|
backingFormat = VIR_STORAGE_FILE_NONE;
|
2012-11-21 10:57:22 +00:00
|
|
|
VIR_WARN("Backing file '%s' of image '%s' is missing.",
|
|
|
|
meta->backingStoreRaw, path);
|
|
|
|
|
2012-10-09 23:47:42 +00:00
|
|
|
}
|
2010-11-03 15:50:11 +00:00
|
|
|
}
|
2010-06-15 13:58:10 +00:00
|
|
|
VIR_FREE(backing);
|
|
|
|
meta->backingStoreFormat = backingFormat;
|
|
|
|
} else {
|
|
|
|
meta->backingStore = NULL;
|
storage: list more file types
When an image has no backing file, using VIR_STORAGE_FILE_AUTO
for its type is a bit confusing. Additionally, a future patch
would like to reserve a default value for the case of no file
type specified in the XML, but different from the current use
of -1 to imply probing, since probing is not always safe.
Also, a couple of file types were missing compared to supported
code: libxl supports 'vhd', and qemu supports 'fat' for directories
passed through as a file system.
* src/util/storage_file.h (virStorageFileFormat): Add
VIR_STORAGE_FILE_NONE, VIR_STORAGE_FILE_FAT, VIR_STORAGE_FILE_VHD.
* src/util/storage_file.c (virStorageFileMatchesVersion): Match
documentation when version probing not supported.
(cowGetBackingStore, qcowXGetBackingStore, qcow1GetBackingStore)
(qcow2GetBackingStoreFormat, qedGetBackingStore)
(virStorageFileGetMetadataFromBuf)
(virStorageFileGetMetadataFromFD): Take NONE into account.
* src/conf/domain_conf.c (virDomainDiskDefForeachPath): Likewise.
* src/qemu/qemu_driver.c (qemuDomainGetBlockInfo): Likewise.
* src/conf/storage_conf.c (virStorageVolumeFormatFromString): New
function.
(poolTypeInfo): Use it.
2012-09-28 17:11:07 +00:00
|
|
|
meta->backingStoreFormat = VIR_STORAGE_FILE_NONE;
|
2010-06-15 13:58:10 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2013-02-09 13:41:01 +00:00
|
|
|
done:
|
|
|
|
ret = meta;
|
2013-02-06 23:33:45 +00:00
|
|
|
meta = NULL;
|
|
|
|
|
2013-02-09 13:41:01 +00:00
|
|
|
cleanup:
|
2013-02-06 23:33:45 +00:00
|
|
|
virStorageFileFreeMetadata(meta);
|
|
|
|
VIR_FREE(buf);
|
2013-02-09 13:41:01 +00:00
|
|
|
return ret;
|
2010-06-15 13:58:10 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
* virStorageFileProbeFormatFromFD:
|
|
|
|
*
|
|
|
|
* Probe for the format of 'fd' (which is an open file descriptor
|
|
|
|
* pointing to 'path'), returning the detected disk format.
|
|
|
|
*
|
|
|
|
* Callers are advised never to trust the returned 'format'
|
|
|
|
* unless it is listed as VIR_STORAGE_FILE_RAW, since a
|
|
|
|
* malicious guest can turn a file into any other non-raw
|
|
|
|
* format at will.
|
|
|
|
*
|
|
|
|
* Best option: Don't use this function
|
|
|
|
*/
|
|
|
|
int
|
|
|
|
virStorageFileProbeFormatFromFD(const char *path, int fd)
|
|
|
|
{
|
|
|
|
unsigned char *head;
|
|
|
|
ssize_t len = STORAGE_MAX_HEAD;
|
|
|
|
int ret = -1;
|
2011-05-26 18:05:32 +00:00
|
|
|
struct stat sb;
|
|
|
|
|
|
|
|
if (fstat(fd, &sb) < 0) {
|
|
|
|
virReportSystemError(errno,
|
|
|
|
_("cannot stat file '%s'"),
|
|
|
|
path);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* No header to probe for directories */
|
|
|
|
if (S_ISDIR(sb.st_mode)) {
|
|
|
|
return VIR_STORAGE_FILE_DIR;
|
|
|
|
}
|
2010-06-15 13:58:10 +00:00
|
|
|
|
|
|
|
if (VIR_ALLOC_N(head, len) < 0) {
|
|
|
|
virReportOOMError();
|
|
|
|
return -1;
|
2009-09-29 08:34:48 +00:00
|
|
|
}
|
|
|
|
|
2010-06-15 13:58:10 +00:00
|
|
|
if (lseek(fd, 0, SEEK_SET) == (off_t)-1) {
|
|
|
|
virReportSystemError(errno, _("cannot set to start of '%s'"), path);
|
|
|
|
goto cleanup;
|
|
|
|
}
|
|
|
|
|
|
|
|
if ((len = read(fd, head, len)) < 0) {
|
|
|
|
virReportSystemError(errno, _("cannot read header '%s'"), path);
|
|
|
|
goto cleanup;
|
|
|
|
}
|
|
|
|
|
|
|
|
ret = virStorageFileProbeFormatFromBuf(path, head, len);
|
|
|
|
|
|
|
|
cleanup:
|
|
|
|
VIR_FREE(head);
|
|
|
|
return ret;
|
2009-09-29 08:34:48 +00:00
|
|
|
}
|
2009-09-29 08:41:23 +00:00
|
|
|
|
2010-06-15 13:58:10 +00:00
|
|
|
|
|
|
|
/**
|
|
|
|
* virStorageFileProbeFormat:
|
|
|
|
*
|
|
|
|
* Probe for the format of 'path', returning the detected
|
|
|
|
* disk format.
|
|
|
|
*
|
|
|
|
* Callers are advised never to trust the returned 'format'
|
|
|
|
* unless it is listed as VIR_STORAGE_FILE_RAW, since a
|
|
|
|
* malicious guest can turn a raw file into any other non-raw
|
|
|
|
* format at will.
|
|
|
|
*
|
|
|
|
* Best option: Don't use this function
|
|
|
|
*/
|
|
|
|
int
|
2012-10-20 19:56:35 +00:00
|
|
|
virStorageFileProbeFormat(const char *path, uid_t uid, gid_t gid)
|
2010-06-15 13:58:10 +00:00
|
|
|
{
|
|
|
|
int fd, ret;
|
|
|
|
|
2012-10-20 19:56:35 +00:00
|
|
|
if ((fd = virFileOpenAs(path, O_RDONLY, 0, uid, gid, 0)) < 0) {
|
util: fix virFileOpenAs return value and resulting error logs
This resolves:
https://bugzilla.redhat.com/show_bug.cgi?id=851411
https://bugzilla.redhat.com/show_bug.cgi?id=955500
The first problem was that virFileOpenAs was returning fd (-1) in one
of the error cases rather than ret (-errno), so the caller thought
that the error was EPERM rather than ENOENT.
The second problem was that some log messages in the general purpose
qemuOpenFile() function would always say "Failed to create" even if
the caller hadn't included O_CREAT (i.e. they were trying to open an
existing file).
This fixes virFileOpenAs to jump down to the error return (which
returns ret instead of fd) in the previously mentioned incorrect
failure case of virFileOpenAs(), removes all error logging from
virFileOpenAs() (since the callers report it), and modifies
qemuOpenFile to appropriately use "open" or "create" in its log
messages.
NB: I seriously considered removing logging from all callers of
virFileOpenAs(), but there is at least one case where the caller
doesn't want virFileOpenAs() to log any errors, because it's just
going to try again (qemuOpenFile()). We can't simply make a silent
variation of virFileOpenAs() though, because qemuOpenFile() can't make
the decision about whether or not it wants to retry until after
virFileOpenAs() has already returned an error code.
Likewise, I also considered changing virFileOpenAs() to return -1 with
errno set on return, and may still do that, but only as a separate
patch, as it obscures the intent of this patch too much.
2013-05-08 19:02:14 +00:00
|
|
|
virReportSystemError(-fd, _("Failed to open file '%s'"), path);
|
2010-06-15 13:58:10 +00:00
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
ret = virStorageFileProbeFormatFromFD(path, fd);
|
|
|
|
|
2010-11-09 20:48:48 +00:00
|
|
|
VIR_FORCE_CLOSE(fd);
|
2010-06-15 13:58:10 +00:00
|
|
|
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* virStorageFileGetMetadataFromFD:
|
|
|
|
*
|
2010-06-15 15:15:51 +00:00
|
|
|
* Extract metadata about the storage volume with the specified
|
|
|
|
* image format. If image format is VIR_STORAGE_FILE_AUTO, it
|
2012-10-13 16:47:15 +00:00
|
|
|
* will probe to automatically identify the format. Does not recurse.
|
2010-06-15 13:58:10 +00:00
|
|
|
*
|
2010-06-15 15:15:51 +00:00
|
|
|
* Callers are advised never to use VIR_STORAGE_FILE_AUTO as a
|
|
|
|
* format, since a malicious guest can turn a raw file into any
|
|
|
|
* other non-raw format at will.
|
|
|
|
*
|
|
|
|
* If the returned meta.backingStoreFormat is VIR_STORAGE_FILE_AUTO
|
|
|
|
* it indicates the image didn't specify an explicit format for its
|
|
|
|
* backing store. Callers are advised against probing for the
|
|
|
|
* backing store format in this case.
|
2011-07-14 10:53:45 +00:00
|
|
|
*
|
2012-10-13 17:01:27 +00:00
|
|
|
* Caller MUST free the result after use via virStorageFileFreeMetadata.
|
2010-06-15 13:58:10 +00:00
|
|
|
*/
|
2012-10-13 17:01:27 +00:00
|
|
|
virStorageFileMetadataPtr
|
2010-06-15 13:58:10 +00:00
|
|
|
virStorageFileGetMetadataFromFD(const char *path,
|
|
|
|
int fd,
|
2012-10-13 17:01:27 +00:00
|
|
|
int format)
|
2010-06-15 13:58:10 +00:00
|
|
|
{
|
storage: don't follow backing chain symlinks too eagerly
If you have a qcow2 file /path1/to/file pointed to by symlink
/path2/symlink, and pass qemu /path2/symlink, then qemu treats
a relative backing file in the qcow2 metadata as being relative
to /path2, not /path1/to. Yes, this means that it is possible
to create a qcow2 file where the choice of WHICH directory and
symlink you access its contents from will then determine WHICH
backing file (if any) you actually find; the results can be
rather screwy, but we have to match what qemu does.
Libvirt and qemu default to creating absolute backing file
names, so most users don't hit this. But at least VDSM uses
symlinks and relative backing names alongside the
--reuse-external flags to libvirt snapshot operations, with the
result that libvirt was failing to follow the intended chain of
backing files, and then backing files were not granted the
necessary sVirt permissions to be opened by qemu.
See https://bugzilla.redhat.com/show_bug.cgi?id=903248 for
more gory details. This fixes a regression introduced in
commit 8250783.
I tested this patch by creating the following chain:
ls /home/eblake/Downloads/Fedora.iso # raw file for base
cd /var/lib/libvirt/images
qemu-img create -f qcow2 \
-obacking_file=/home/eblake/Downloads/Fedora.iso,backing_fmt=raw one
mkdir sub
cd sub
ln -s ../one onelink
qemu-img create -f qcow2 \
-obacking_file=../sub/onelink,backing_fmt=qcow2 two
mv two ..
ln -s ../two twolink
qemu-img create -f qcow2 \
-obacking_file=../sub/twolink,backing_fmt=qcow2 three
mv three ..
ln -s ../three threelink
then pointing my domain at /var/lib/libvirt/images/sub/threelink.
Prior to this patch, I got complaints about missing backing
files; afterwards, I was able to verify that the backing chain
(and hence DAC and SELinux relabels) of the entire chain worked.
* src/util/virstoragefile.h (_virStorageFileMetadata): Add
directory member.
* src/util/virstoragefile.c (absolutePathFromBaseFile): Drop,
replaced by...
(virFindBackingFile): ...better function.
(virStorageFileGetMetadataInternal): Add an argument.
(virStorageFileGetMetadataFromFD, virStorageFileChainLookup)
(virStorageFileGetMetadata): Update callers.
2013-02-06 22:48:15 +00:00
|
|
|
return virStorageFileGetMetadataInternal(path, fd, NULL, format);
|
2010-06-15 13:58:10 +00:00
|
|
|
}
|
|
|
|
|
2012-10-13 16:47:15 +00:00
|
|
|
/* Recursive workhorse for virStorageFileGetMetadata. */
|
|
|
|
static virStorageFileMetadataPtr
|
storage: don't follow backing chain symlinks too eagerly
If you have a qcow2 file /path1/to/file pointed to by symlink
/path2/symlink, and pass qemu /path2/symlink, then qemu treats
a relative backing file in the qcow2 metadata as being relative
to /path2, not /path1/to. Yes, this means that it is possible
to create a qcow2 file where the choice of WHICH directory and
symlink you access its contents from will then determine WHICH
backing file (if any) you actually find; the results can be
rather screwy, but we have to match what qemu does.
Libvirt and qemu default to creating absolute backing file
names, so most users don't hit this. But at least VDSM uses
symlinks and relative backing names alongside the
--reuse-external flags to libvirt snapshot operations, with the
result that libvirt was failing to follow the intended chain of
backing files, and then backing files were not granted the
necessary sVirt permissions to be opened by qemu.
See https://bugzilla.redhat.com/show_bug.cgi?id=903248 for
more gory details. This fixes a regression introduced in
commit 8250783.
I tested this patch by creating the following chain:
ls /home/eblake/Downloads/Fedora.iso # raw file for base
cd /var/lib/libvirt/images
qemu-img create -f qcow2 \
-obacking_file=/home/eblake/Downloads/Fedora.iso,backing_fmt=raw one
mkdir sub
cd sub
ln -s ../one onelink
qemu-img create -f qcow2 \
-obacking_file=../sub/onelink,backing_fmt=qcow2 two
mv two ..
ln -s ../two twolink
qemu-img create -f qcow2 \
-obacking_file=../sub/twolink,backing_fmt=qcow2 three
mv three ..
ln -s ../three threelink
then pointing my domain at /var/lib/libvirt/images/sub/threelink.
Prior to this patch, I got complaints about missing backing
files; afterwards, I was able to verify that the backing chain
(and hence DAC and SELinux relabels) of the entire chain worked.
* src/util/virstoragefile.h (_virStorageFileMetadata): Add
directory member.
* src/util/virstoragefile.c (absolutePathFromBaseFile): Drop,
replaced by...
(virFindBackingFile): ...better function.
(virStorageFileGetMetadataInternal): Add an argument.
(virStorageFileGetMetadataFromFD, virStorageFileChainLookup)
(virStorageFileGetMetadata): Update callers.
2013-02-06 22:48:15 +00:00
|
|
|
virStorageFileGetMetadataRecurse(const char *path, const char *directory,
|
|
|
|
int format, uid_t uid, gid_t gid,
|
2012-10-13 16:47:15 +00:00
|
|
|
bool allow_probe, virHashTablePtr cycle)
|
|
|
|
{
|
|
|
|
int fd;
|
2012-12-13 14:23:50 +00:00
|
|
|
VIR_DEBUG("path=%s format=%d uid=%d gid=%d probe=%d",
|
|
|
|
path, format, (int)uid, (int)gid, allow_probe);
|
|
|
|
|
2012-10-13 16:47:15 +00:00
|
|
|
virStorageFileMetadataPtr ret = NULL;
|
|
|
|
|
|
|
|
if (virHashLookup(cycle, path)) {
|
|
|
|
virReportError(VIR_ERR_INTERNAL_ERROR,
|
|
|
|
_("backing store for %s is self-referential"),
|
|
|
|
path);
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
if (virHashAddEntry(cycle, path, (void *)1) < 0)
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
if ((fd = virFileOpenAs(path, O_RDONLY, 0, uid, gid, 0)) < 0) {
|
util: fix virFileOpenAs return value and resulting error logs
This resolves:
https://bugzilla.redhat.com/show_bug.cgi?id=851411
https://bugzilla.redhat.com/show_bug.cgi?id=955500
The first problem was that virFileOpenAs was returning fd (-1) in one
of the error cases rather than ret (-errno), so the caller thought
that the error was EPERM rather than ENOENT.
The second problem was that some log messages in the general purpose
qemuOpenFile() function would always say "Failed to create" even if
the caller hadn't included O_CREAT (i.e. they were trying to open an
existing file).
This fixes virFileOpenAs to jump down to the error return (which
returns ret instead of fd) in the previously mentioned incorrect
failure case of virFileOpenAs(), removes all error logging from
virFileOpenAs() (since the callers report it), and modifies
qemuOpenFile to appropriately use "open" or "create" in its log
messages.
NB: I seriously considered removing logging from all callers of
virFileOpenAs(), but there is at least one case where the caller
doesn't want virFileOpenAs() to log any errors, because it's just
going to try again (qemuOpenFile()). We can't simply make a silent
variation of virFileOpenAs() though, because qemuOpenFile() can't make
the decision about whether or not it wants to retry until after
virFileOpenAs() has already returned an error code.
Likewise, I also considered changing virFileOpenAs() to return -1 with
errno set on return, and may still do that, but only as a separate
patch, as it obscures the intent of this patch too much.
2013-05-08 19:02:14 +00:00
|
|
|
virReportSystemError(-fd, _("Failed to open file '%s'"), path);
|
2012-10-13 16:47:15 +00:00
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
storage: don't follow backing chain symlinks too eagerly
If you have a qcow2 file /path1/to/file pointed to by symlink
/path2/symlink, and pass qemu /path2/symlink, then qemu treats
a relative backing file in the qcow2 metadata as being relative
to /path2, not /path1/to. Yes, this means that it is possible
to create a qcow2 file where the choice of WHICH directory and
symlink you access its contents from will then determine WHICH
backing file (if any) you actually find; the results can be
rather screwy, but we have to match what qemu does.
Libvirt and qemu default to creating absolute backing file
names, so most users don't hit this. But at least VDSM uses
symlinks and relative backing names alongside the
--reuse-external flags to libvirt snapshot operations, with the
result that libvirt was failing to follow the intended chain of
backing files, and then backing files were not granted the
necessary sVirt permissions to be opened by qemu.
See https://bugzilla.redhat.com/show_bug.cgi?id=903248 for
more gory details. This fixes a regression introduced in
commit 8250783.
I tested this patch by creating the following chain:
ls /home/eblake/Downloads/Fedora.iso # raw file for base
cd /var/lib/libvirt/images
qemu-img create -f qcow2 \
-obacking_file=/home/eblake/Downloads/Fedora.iso,backing_fmt=raw one
mkdir sub
cd sub
ln -s ../one onelink
qemu-img create -f qcow2 \
-obacking_file=../sub/onelink,backing_fmt=qcow2 two
mv two ..
ln -s ../two twolink
qemu-img create -f qcow2 \
-obacking_file=../sub/twolink,backing_fmt=qcow2 three
mv three ..
ln -s ../three threelink
then pointing my domain at /var/lib/libvirt/images/sub/threelink.
Prior to this patch, I got complaints about missing backing
files; afterwards, I was able to verify that the backing chain
(and hence DAC and SELinux relabels) of the entire chain worked.
* src/util/virstoragefile.h (_virStorageFileMetadata): Add
directory member.
* src/util/virstoragefile.c (absolutePathFromBaseFile): Drop,
replaced by...
(virFindBackingFile): ...better function.
(virStorageFileGetMetadataInternal): Add an argument.
(virStorageFileGetMetadataFromFD, virStorageFileChainLookup)
(virStorageFileGetMetadata): Update callers.
2013-02-06 22:48:15 +00:00
|
|
|
ret = virStorageFileGetMetadataInternal(path, fd, directory, format);
|
2012-10-13 16:47:15 +00:00
|
|
|
|
|
|
|
if (VIR_CLOSE(fd) < 0)
|
|
|
|
VIR_WARN("could not close file %s", path);
|
|
|
|
|
2012-10-13 17:01:27 +00:00
|
|
|
if (ret && ret->backingStoreIsFile) {
|
2012-10-13 16:47:15 +00:00
|
|
|
if (ret->backingStoreFormat == VIR_STORAGE_FILE_AUTO && !allow_probe)
|
|
|
|
ret->backingStoreFormat = VIR_STORAGE_FILE_RAW;
|
|
|
|
else if (ret->backingStoreFormat == VIR_STORAGE_FILE_AUTO_SAFE)
|
|
|
|
ret->backingStoreFormat = VIR_STORAGE_FILE_AUTO;
|
|
|
|
format = ret->backingStoreFormat;
|
|
|
|
ret->backingMeta = virStorageFileGetMetadataRecurse(ret->backingStore,
|
storage: don't follow backing chain symlinks too eagerly
If you have a qcow2 file /path1/to/file pointed to by symlink
/path2/symlink, and pass qemu /path2/symlink, then qemu treats
a relative backing file in the qcow2 metadata as being relative
to /path2, not /path1/to. Yes, this means that it is possible
to create a qcow2 file where the choice of WHICH directory and
symlink you access its contents from will then determine WHICH
backing file (if any) you actually find; the results can be
rather screwy, but we have to match what qemu does.
Libvirt and qemu default to creating absolute backing file
names, so most users don't hit this. But at least VDSM uses
symlinks and relative backing names alongside the
--reuse-external flags to libvirt snapshot operations, with the
result that libvirt was failing to follow the intended chain of
backing files, and then backing files were not granted the
necessary sVirt permissions to be opened by qemu.
See https://bugzilla.redhat.com/show_bug.cgi?id=903248 for
more gory details. This fixes a regression introduced in
commit 8250783.
I tested this patch by creating the following chain:
ls /home/eblake/Downloads/Fedora.iso # raw file for base
cd /var/lib/libvirt/images
qemu-img create -f qcow2 \
-obacking_file=/home/eblake/Downloads/Fedora.iso,backing_fmt=raw one
mkdir sub
cd sub
ln -s ../one onelink
qemu-img create -f qcow2 \
-obacking_file=../sub/onelink,backing_fmt=qcow2 two
mv two ..
ln -s ../two twolink
qemu-img create -f qcow2 \
-obacking_file=../sub/twolink,backing_fmt=qcow2 three
mv three ..
ln -s ../three threelink
then pointing my domain at /var/lib/libvirt/images/sub/threelink.
Prior to this patch, I got complaints about missing backing
files; afterwards, I was able to verify that the backing chain
(and hence DAC and SELinux relabels) of the entire chain worked.
* src/util/virstoragefile.h (_virStorageFileMetadata): Add
directory member.
* src/util/virstoragefile.c (absolutePathFromBaseFile): Drop,
replaced by...
(virFindBackingFile): ...better function.
(virStorageFileGetMetadataInternal): Add an argument.
(virStorageFileGetMetadataFromFD, virStorageFileChainLookup)
(virStorageFileGetMetadata): Update callers.
2013-02-06 22:48:15 +00:00
|
|
|
ret->directory,
|
2012-10-13 16:47:15 +00:00
|
|
|
format,
|
|
|
|
uid, gid,
|
|
|
|
allow_probe,
|
|
|
|
cycle);
|
|
|
|
}
|
|
|
|
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
2010-06-15 13:58:10 +00:00
|
|
|
/**
|
|
|
|
* virStorageFileGetMetadata:
|
|
|
|
*
|
2010-06-15 15:15:51 +00:00
|
|
|
* Extract metadata about the storage volume with the specified
|
|
|
|
* image format. If image format is VIR_STORAGE_FILE_AUTO, it
|
2012-10-13 16:47:15 +00:00
|
|
|
* will probe to automatically identify the format. Recurses through
|
|
|
|
* the entire chain.
|
|
|
|
*
|
|
|
|
* Open files using UID and GID (or pass -1 for the current user/group).
|
|
|
|
* Treat any backing files without explicit type as raw, unless ALLOW_PROBE.
|
2010-06-15 13:58:10 +00:00
|
|
|
*
|
2010-06-15 15:15:51 +00:00
|
|
|
* Callers are advised never to use VIR_STORAGE_FILE_AUTO as a
|
|
|
|
* format, since a malicious guest can turn a raw file into any
|
|
|
|
* other non-raw format at will.
|
|
|
|
*
|
|
|
|
* If the returned meta.backingStoreFormat is VIR_STORAGE_FILE_AUTO
|
|
|
|
* it indicates the image didn't specify an explicit format for its
|
2012-10-13 16:47:15 +00:00
|
|
|
* backing store. Callers are advised against using ALLOW_PROBE, as
|
|
|
|
* it would probe the backing store format in this case.
|
2011-07-14 10:53:45 +00:00
|
|
|
*
|
2012-10-13 16:47:15 +00:00
|
|
|
* Caller MUST free result after use via virStorageFileFreeMetadata.
|
2010-06-15 13:58:10 +00:00
|
|
|
*/
|
2012-10-13 16:47:15 +00:00
|
|
|
virStorageFileMetadataPtr
|
|
|
|
virStorageFileGetMetadata(const char *path, int format,
|
|
|
|
uid_t uid, gid_t gid,
|
|
|
|
bool allow_probe)
|
2009-09-29 08:41:23 +00:00
|
|
|
{
|
2012-12-13 14:23:50 +00:00
|
|
|
VIR_DEBUG("path=%s format=%d uid=%d gid=%d probe=%d",
|
|
|
|
path, format, (int)uid, (int)gid, allow_probe);
|
|
|
|
|
2012-10-13 16:47:15 +00:00
|
|
|
virHashTablePtr cycle = virHashCreate(5, NULL);
|
|
|
|
virStorageFileMetadataPtr ret;
|
2009-09-29 08:41:23 +00:00
|
|
|
|
2012-10-13 16:47:15 +00:00
|
|
|
if (!cycle)
|
|
|
|
return NULL;
|
2009-09-29 08:41:23 +00:00
|
|
|
|
2012-10-13 16:47:15 +00:00
|
|
|
if (format <= VIR_STORAGE_FILE_NONE)
|
|
|
|
format = allow_probe ? VIR_STORAGE_FILE_AUTO : VIR_STORAGE_FILE_RAW;
|
storage: don't follow backing chain symlinks too eagerly
If you have a qcow2 file /path1/to/file pointed to by symlink
/path2/symlink, and pass qemu /path2/symlink, then qemu treats
a relative backing file in the qcow2 metadata as being relative
to /path2, not /path1/to. Yes, this means that it is possible
to create a qcow2 file where the choice of WHICH directory and
symlink you access its contents from will then determine WHICH
backing file (if any) you actually find; the results can be
rather screwy, but we have to match what qemu does.
Libvirt and qemu default to creating absolute backing file
names, so most users don't hit this. But at least VDSM uses
symlinks and relative backing names alongside the
--reuse-external flags to libvirt snapshot operations, with the
result that libvirt was failing to follow the intended chain of
backing files, and then backing files were not granted the
necessary sVirt permissions to be opened by qemu.
See https://bugzilla.redhat.com/show_bug.cgi?id=903248 for
more gory details. This fixes a regression introduced in
commit 8250783.
I tested this patch by creating the following chain:
ls /home/eblake/Downloads/Fedora.iso # raw file for base
cd /var/lib/libvirt/images
qemu-img create -f qcow2 \
-obacking_file=/home/eblake/Downloads/Fedora.iso,backing_fmt=raw one
mkdir sub
cd sub
ln -s ../one onelink
qemu-img create -f qcow2 \
-obacking_file=../sub/onelink,backing_fmt=qcow2 two
mv two ..
ln -s ../two twolink
qemu-img create -f qcow2 \
-obacking_file=../sub/twolink,backing_fmt=qcow2 three
mv three ..
ln -s ../three threelink
then pointing my domain at /var/lib/libvirt/images/sub/threelink.
Prior to this patch, I got complaints about missing backing
files; afterwards, I was able to verify that the backing chain
(and hence DAC and SELinux relabels) of the entire chain worked.
* src/util/virstoragefile.h (_virStorageFileMetadata): Add
directory member.
* src/util/virstoragefile.c (absolutePathFromBaseFile): Drop,
replaced by...
(virFindBackingFile): ...better function.
(virStorageFileGetMetadataInternal): Add an argument.
(virStorageFileGetMetadataFromFD, virStorageFileChainLookup)
(virStorageFileGetMetadata): Update callers.
2013-02-06 22:48:15 +00:00
|
|
|
ret = virStorageFileGetMetadataRecurse(path, NULL, format, uid, gid,
|
2012-10-13 16:47:15 +00:00
|
|
|
allow_probe, cycle);
|
|
|
|
virHashFree(cycle);
|
2009-09-29 08:41:23 +00:00
|
|
|
return ret;
|
|
|
|
}
|
Don't reset user/group/security label on shared filesystems during migrate
When QEMU runs with its disk on NFS, and as a non-root user, the
disk is chownd to that non-root user. When migration completes
the last step is shutting down the QEMU on the source host. THis
normally resets user/group/security label. This is bad when the
VM was just migrated because the file is still in use on the dest
host. It is thus neccessary to skip the reset step for any files
found to be on a shared filesystem
* src/libvirt_private.syms: Export virStorageFileIsSharedFS
* src/util/storage_file.c, src/util/storage_file.h: Add a new
method virStorageFileIsSharedFS() to determine if a file is
on a shared filesystem (NFS, GFS, OCFS2, etc)
* src/qemu/qemu_driver.c: Tell security driver not to reset
disk labels on migration completion
* src/qemu/qemu_security_dac.c, src/qemu/qemu_security_stacked.c,
src/security/security_selinux.c, src/security/security_driver.h,
src/security/security_apparmor.c: Add ability to skip disk
restore step for files on shared filesystems.
2010-05-13 15:49:22 +00:00
|
|
|
|
2011-07-14 10:53:45 +00:00
|
|
|
/**
|
|
|
|
* virStorageFileFreeMetadata:
|
|
|
|
*
|
|
|
|
* Free pointers in passed structure and structure itself.
|
|
|
|
*/
|
|
|
|
void
|
|
|
|
virStorageFileFreeMetadata(virStorageFileMetadata *meta)
|
|
|
|
{
|
|
|
|
if (!meta)
|
|
|
|
return;
|
|
|
|
|
2012-10-13 16:47:15 +00:00
|
|
|
virStorageFileFreeMetadata(meta->backingMeta);
|
2011-07-14 10:53:45 +00:00
|
|
|
VIR_FREE(meta->backingStore);
|
2012-10-09 23:47:42 +00:00
|
|
|
VIR_FREE(meta->backingStoreRaw);
|
storage: don't follow backing chain symlinks too eagerly
If you have a qcow2 file /path1/to/file pointed to by symlink
/path2/symlink, and pass qemu /path2/symlink, then qemu treats
a relative backing file in the qcow2 metadata as being relative
to /path2, not /path1/to. Yes, this means that it is possible
to create a qcow2 file where the choice of WHICH directory and
symlink you access its contents from will then determine WHICH
backing file (if any) you actually find; the results can be
rather screwy, but we have to match what qemu does.
Libvirt and qemu default to creating absolute backing file
names, so most users don't hit this. But at least VDSM uses
symlinks and relative backing names alongside the
--reuse-external flags to libvirt snapshot operations, with the
result that libvirt was failing to follow the intended chain of
backing files, and then backing files were not granted the
necessary sVirt permissions to be opened by qemu.
See https://bugzilla.redhat.com/show_bug.cgi?id=903248 for
more gory details. This fixes a regression introduced in
commit 8250783.
I tested this patch by creating the following chain:
ls /home/eblake/Downloads/Fedora.iso # raw file for base
cd /var/lib/libvirt/images
qemu-img create -f qcow2 \
-obacking_file=/home/eblake/Downloads/Fedora.iso,backing_fmt=raw one
mkdir sub
cd sub
ln -s ../one onelink
qemu-img create -f qcow2 \
-obacking_file=../sub/onelink,backing_fmt=qcow2 two
mv two ..
ln -s ../two twolink
qemu-img create -f qcow2 \
-obacking_file=../sub/twolink,backing_fmt=qcow2 three
mv three ..
ln -s ../three threelink
then pointing my domain at /var/lib/libvirt/images/sub/threelink.
Prior to this patch, I got complaints about missing backing
files; afterwards, I was able to verify that the backing chain
(and hence DAC and SELinux relabels) of the entire chain worked.
* src/util/virstoragefile.h (_virStorageFileMetadata): Add
directory member.
* src/util/virstoragefile.c (absolutePathFromBaseFile): Drop,
replaced by...
(virFindBackingFile): ...better function.
(virStorageFileGetMetadataInternal): Add an argument.
(virStorageFileGetMetadataFromFD, virStorageFileChainLookup)
(virStorageFileGetMetadata): Update callers.
2013-02-06 22:48:15 +00:00
|
|
|
VIR_FREE(meta->directory);
|
2011-07-14 10:53:45 +00:00
|
|
|
VIR_FREE(meta);
|
|
|
|
}
|
Don't reset user/group/security label on shared filesystems during migrate
When QEMU runs with its disk on NFS, and as a non-root user, the
disk is chownd to that non-root user. When migration completes
the last step is shutting down the QEMU on the source host. THis
normally resets user/group/security label. This is bad when the
VM was just migrated because the file is still in use on the dest
host. It is thus neccessary to skip the reset step for any files
found to be on a shared filesystem
* src/libvirt_private.syms: Export virStorageFileIsSharedFS
* src/util/storage_file.c, src/util/storage_file.h: Add a new
method virStorageFileIsSharedFS() to determine if a file is
on a shared filesystem (NFS, GFS, OCFS2, etc)
* src/qemu/qemu_driver.c: Tell security driver not to reset
disk labels on migration completion
* src/qemu/qemu_security_dac.c, src/qemu/qemu_security_stacked.c,
src/security/security_selinux.c, src/security/security_driver.h,
src/security/security_apparmor.c: Add ability to skip disk
restore step for files on shared filesystems.
2010-05-13 15:49:22 +00:00
|
|
|
|
2012-01-30 07:40:00 +00:00
|
|
|
/**
|
|
|
|
* virStorageFileResize:
|
|
|
|
*
|
|
|
|
* Change the capacity of the raw storage file at 'path'.
|
|
|
|
*/
|
|
|
|
int
|
|
|
|
virStorageFileResize(const char *path, unsigned long long capacity)
|
|
|
|
{
|
2012-02-08 14:03:29 +00:00
|
|
|
int fd = -1;
|
|
|
|
int ret = -1;
|
|
|
|
|
|
|
|
if ((fd = open(path, O_RDWR)) < 0) {
|
|
|
|
virReportSystemError(errno, _("Unable to open '%s'"), path);
|
|
|
|
goto cleanup;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (ftruncate(fd, capacity) < 0) {
|
2012-01-30 07:40:00 +00:00
|
|
|
virReportSystemError(errno, _("Failed to truncate file '%s'"), path);
|
2012-02-08 14:03:29 +00:00
|
|
|
goto cleanup;
|
2012-01-30 07:40:00 +00:00
|
|
|
}
|
|
|
|
|
2012-02-08 14:03:29 +00:00
|
|
|
if (VIR_CLOSE(fd) < 0) {
|
|
|
|
virReportSystemError(errno, _("Unable to save '%s'"), path);
|
|
|
|
goto cleanup;
|
|
|
|
}
|
|
|
|
|
|
|
|
ret = 0;
|
|
|
|
|
|
|
|
cleanup:
|
|
|
|
VIR_FORCE_CLOSE(fd);
|
|
|
|
return ret;
|
2012-01-30 07:40:00 +00:00
|
|
|
}
|
|
|
|
|
Don't reset user/group/security label on shared filesystems during migrate
When QEMU runs with its disk on NFS, and as a non-root user, the
disk is chownd to that non-root user. When migration completes
the last step is shutting down the QEMU on the source host. THis
normally resets user/group/security label. This is bad when the
VM was just migrated because the file is still in use on the dest
host. It is thus neccessary to skip the reset step for any files
found to be on a shared filesystem
* src/libvirt_private.syms: Export virStorageFileIsSharedFS
* src/util/storage_file.c, src/util/storage_file.h: Add a new
method virStorageFileIsSharedFS() to determine if a file is
on a shared filesystem (NFS, GFS, OCFS2, etc)
* src/qemu/qemu_driver.c: Tell security driver not to reset
disk labels on migration completion
* src/qemu/qemu_security_dac.c, src/qemu/qemu_security_stacked.c,
src/security/security_selinux.c, src/security/security_driver.h,
src/security/security_apparmor.c: Add ability to skip disk
restore step for files on shared filesystems.
2010-05-13 15:49:22 +00:00
|
|
|
#ifdef __linux__
|
|
|
|
|
2010-05-17 14:17:08 +00:00
|
|
|
# ifndef NFS_SUPER_MAGIC
|
|
|
|
# define NFS_SUPER_MAGIC 0x6969
|
|
|
|
# endif
|
Don't reset user/group/security label on shared filesystems during migrate
When QEMU runs with its disk on NFS, and as a non-root user, the
disk is chownd to that non-root user. When migration completes
the last step is shutting down the QEMU on the source host. THis
normally resets user/group/security label. This is bad when the
VM was just migrated because the file is still in use on the dest
host. It is thus neccessary to skip the reset step for any files
found to be on a shared filesystem
* src/libvirt_private.syms: Export virStorageFileIsSharedFS
* src/util/storage_file.c, src/util/storage_file.h: Add a new
method virStorageFileIsSharedFS() to determine if a file is
on a shared filesystem (NFS, GFS, OCFS2, etc)
* src/qemu/qemu_driver.c: Tell security driver not to reset
disk labels on migration completion
* src/qemu/qemu_security_dac.c, src/qemu/qemu_security_stacked.c,
src/security/security_selinux.c, src/security/security_driver.h,
src/security/security_apparmor.c: Add ability to skip disk
restore step for files on shared filesystems.
2010-05-13 15:49:22 +00:00
|
|
|
# ifndef OCFS2_SUPER_MAGIC
|
|
|
|
# define OCFS2_SUPER_MAGIC 0x7461636f
|
|
|
|
# endif
|
|
|
|
# ifndef GFS2_MAGIC
|
|
|
|
# define GFS2_MAGIC 0x01161970
|
|
|
|
# endif
|
|
|
|
# ifndef AFS_FS_MAGIC
|
|
|
|
# define AFS_FS_MAGIC 0x6B414653
|
|
|
|
# endif
|
|
|
|
|
|
|
|
|
2010-10-29 11:20:40 +00:00
|
|
|
int virStorageFileIsSharedFSType(const char *path,
|
|
|
|
int fstypes)
|
Don't reset user/group/security label on shared filesystems during migrate
When QEMU runs with its disk on NFS, and as a non-root user, the
disk is chownd to that non-root user. When migration completes
the last step is shutting down the QEMU on the source host. THis
normally resets user/group/security label. This is bad when the
VM was just migrated because the file is still in use on the dest
host. It is thus neccessary to skip the reset step for any files
found to be on a shared filesystem
* src/libvirt_private.syms: Export virStorageFileIsSharedFS
* src/util/storage_file.c, src/util/storage_file.h: Add a new
method virStorageFileIsSharedFS() to determine if a file is
on a shared filesystem (NFS, GFS, OCFS2, etc)
* src/qemu/qemu_driver.c: Tell security driver not to reset
disk labels on migration completion
* src/qemu/qemu_security_dac.c, src/qemu/qemu_security_stacked.c,
src/security/security_selinux.c, src/security/security_driver.h,
src/security/security_apparmor.c: Add ability to skip disk
restore step for files on shared filesystems.
2010-05-13 15:49:22 +00:00
|
|
|
{
|
2010-06-25 16:18:57 +00:00
|
|
|
char *dirpath, *p;
|
Don't reset user/group/security label on shared filesystems during migrate
When QEMU runs with its disk on NFS, and as a non-root user, the
disk is chownd to that non-root user. When migration completes
the last step is shutting down the QEMU on the source host. THis
normally resets user/group/security label. This is bad when the
VM was just migrated because the file is still in use on the dest
host. It is thus neccessary to skip the reset step for any files
found to be on a shared filesystem
* src/libvirt_private.syms: Export virStorageFileIsSharedFS
* src/util/storage_file.c, src/util/storage_file.h: Add a new
method virStorageFileIsSharedFS() to determine if a file is
on a shared filesystem (NFS, GFS, OCFS2, etc)
* src/qemu/qemu_driver.c: Tell security driver not to reset
disk labels on migration completion
* src/qemu/qemu_security_dac.c, src/qemu/qemu_security_stacked.c,
src/security/security_selinux.c, src/security/security_driver.h,
src/security/security_apparmor.c: Add ability to skip disk
restore step for files on shared filesystems.
2010-05-13 15:49:22 +00:00
|
|
|
struct statfs sb;
|
2010-06-25 16:18:57 +00:00
|
|
|
int statfs_ret;
|
Don't reset user/group/security label on shared filesystems during migrate
When QEMU runs with its disk on NFS, and as a non-root user, the
disk is chownd to that non-root user. When migration completes
the last step is shutting down the QEMU on the source host. THis
normally resets user/group/security label. This is bad when the
VM was just migrated because the file is still in use on the dest
host. It is thus neccessary to skip the reset step for any files
found to be on a shared filesystem
* src/libvirt_private.syms: Export virStorageFileIsSharedFS
* src/util/storage_file.c, src/util/storage_file.h: Add a new
method virStorageFileIsSharedFS() to determine if a file is
on a shared filesystem (NFS, GFS, OCFS2, etc)
* src/qemu/qemu_driver.c: Tell security driver not to reset
disk labels on migration completion
* src/qemu/qemu_security_dac.c, src/qemu/qemu_security_stacked.c,
src/security/security_selinux.c, src/security/security_driver.h,
src/security/security_apparmor.c: Add ability to skip disk
restore step for files on shared filesystems.
2010-05-13 15:49:22 +00:00
|
|
|
|
2010-06-25 16:18:57 +00:00
|
|
|
if ((dirpath = strdup(path)) == NULL) {
|
|
|
|
virReportOOMError();
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
do {
|
|
|
|
|
|
|
|
/* Try less and less of the path until we get to a
|
|
|
|
* directory we can stat. Even if we don't have 'x'
|
|
|
|
* permission on any directory in the path on the NFS
|
|
|
|
* server (assuming it's NFS), we will be able to stat the
|
|
|
|
* mount point, and that will properly tell us if the
|
|
|
|
* fstype is NFS.
|
|
|
|
*/
|
|
|
|
|
|
|
|
if ((p = strrchr(dirpath, '/')) == NULL) {
|
|
|
|
virReportSystemError(EINVAL,
|
|
|
|
_("Invalid relative path '%s'"), path);
|
|
|
|
VIR_FREE(dirpath);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (p == dirpath)
|
|
|
|
*(p+1) = '\0';
|
|
|
|
else
|
|
|
|
*p = '\0';
|
|
|
|
|
|
|
|
statfs_ret = statfs(dirpath, &sb);
|
|
|
|
|
|
|
|
} while ((statfs_ret < 0) && (p != dirpath));
|
|
|
|
|
|
|
|
VIR_FREE(dirpath);
|
|
|
|
|
|
|
|
if (statfs_ret < 0) {
|
Don't reset user/group/security label on shared filesystems during migrate
When QEMU runs with its disk on NFS, and as a non-root user, the
disk is chownd to that non-root user. When migration completes
the last step is shutting down the QEMU on the source host. THis
normally resets user/group/security label. This is bad when the
VM was just migrated because the file is still in use on the dest
host. It is thus neccessary to skip the reset step for any files
found to be on a shared filesystem
* src/libvirt_private.syms: Export virStorageFileIsSharedFS
* src/util/storage_file.c, src/util/storage_file.h: Add a new
method virStorageFileIsSharedFS() to determine if a file is
on a shared filesystem (NFS, GFS, OCFS2, etc)
* src/qemu/qemu_driver.c: Tell security driver not to reset
disk labels on migration completion
* src/qemu/qemu_security_dac.c, src/qemu/qemu_security_stacked.c,
src/security/security_selinux.c, src/security/security_driver.h,
src/security/security_apparmor.c: Add ability to skip disk
restore step for files on shared filesystems.
2010-05-13 15:49:22 +00:00
|
|
|
virReportSystemError(errno,
|
|
|
|
_("cannot determine filesystem for '%s'"),
|
|
|
|
path);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
VIR_DEBUG("Check if path %s with FS magic %lld is shared",
|
|
|
|
path, (long long int)sb.f_type);
|
|
|
|
|
2010-10-29 11:20:40 +00:00
|
|
|
if ((fstypes & VIR_STORAGE_FILE_SHFS_NFS) &&
|
|
|
|
(sb.f_type == NFS_SUPER_MAGIC))
|
|
|
|
return 1;
|
|
|
|
|
|
|
|
if ((fstypes & VIR_STORAGE_FILE_SHFS_GFS2) &&
|
|
|
|
(sb.f_type == GFS2_MAGIC))
|
|
|
|
return 1;
|
|
|
|
if ((fstypes & VIR_STORAGE_FILE_SHFS_OCFS) &&
|
|
|
|
(sb.f_type == OCFS2_SUPER_MAGIC))
|
|
|
|
return 1;
|
|
|
|
if ((fstypes & VIR_STORAGE_FILE_SHFS_AFS) &&
|
|
|
|
(sb.f_type == AFS_FS_MAGIC))
|
Don't reset user/group/security label on shared filesystems during migrate
When QEMU runs with its disk on NFS, and as a non-root user, the
disk is chownd to that non-root user. When migration completes
the last step is shutting down the QEMU on the source host. THis
normally resets user/group/security label. This is bad when the
VM was just migrated because the file is still in use on the dest
host. It is thus neccessary to skip the reset step for any files
found to be on a shared filesystem
* src/libvirt_private.syms: Export virStorageFileIsSharedFS
* src/util/storage_file.c, src/util/storage_file.h: Add a new
method virStorageFileIsSharedFS() to determine if a file is
on a shared filesystem (NFS, GFS, OCFS2, etc)
* src/qemu/qemu_driver.c: Tell security driver not to reset
disk labels on migration completion
* src/qemu/qemu_security_dac.c, src/qemu/qemu_security_stacked.c,
src/security/security_selinux.c, src/security/security_driver.h,
src/security/security_apparmor.c: Add ability to skip disk
restore step for files on shared filesystems.
2010-05-13 15:49:22 +00:00
|
|
|
return 1;
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
#else
|
2010-10-29 11:20:40 +00:00
|
|
|
int virStorageFileIsSharedFSType(const char *path ATTRIBUTE_UNUSED,
|
|
|
|
int fstypes ATTRIBUTE_UNUSED)
|
Don't reset user/group/security label on shared filesystems during migrate
When QEMU runs with its disk on NFS, and as a non-root user, the
disk is chownd to that non-root user. When migration completes
the last step is shutting down the QEMU on the source host. THis
normally resets user/group/security label. This is bad when the
VM was just migrated because the file is still in use on the dest
host. It is thus neccessary to skip the reset step for any files
found to be on a shared filesystem
* src/libvirt_private.syms: Export virStorageFileIsSharedFS
* src/util/storage_file.c, src/util/storage_file.h: Add a new
method virStorageFileIsSharedFS() to determine if a file is
on a shared filesystem (NFS, GFS, OCFS2, etc)
* src/qemu/qemu_driver.c: Tell security driver not to reset
disk labels on migration completion
* src/qemu/qemu_security_dac.c, src/qemu/qemu_security_stacked.c,
src/security/security_selinux.c, src/security/security_driver.h,
src/security/security_apparmor.c: Add ability to skip disk
restore step for files on shared filesystems.
2010-05-13 15:49:22 +00:00
|
|
|
{
|
|
|
|
/* XXX implement me :-) */
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
#endif
|
2010-10-29 11:20:40 +00:00
|
|
|
|
|
|
|
int virStorageFileIsSharedFS(const char *path)
|
|
|
|
{
|
|
|
|
return virStorageFileIsSharedFSType(path,
|
|
|
|
VIR_STORAGE_FILE_SHFS_NFS |
|
|
|
|
VIR_STORAGE_FILE_SHFS_GFS2 |
|
|
|
|
VIR_STORAGE_FILE_SHFS_OCFS |
|
|
|
|
VIR_STORAGE_FILE_SHFS_AFS);
|
|
|
|
}
|
2012-02-21 21:58:50 +00:00
|
|
|
|
|
|
|
int virStorageFileIsClusterFS(const char *path)
|
|
|
|
{
|
|
|
|
/* These are coherent cluster filesystems known to be safe for
|
|
|
|
* migration with cache != none
|
|
|
|
*/
|
|
|
|
return virStorageFileIsSharedFSType(path,
|
|
|
|
VIR_STORAGE_FILE_SHFS_GFS2 |
|
|
|
|
VIR_STORAGE_FILE_SHFS_OCFS);
|
|
|
|
}
|
2011-07-20 09:40:53 +00:00
|
|
|
|
|
|
|
#ifdef LVS
|
2012-12-11 19:10:51 +00:00
|
|
|
int virStorageFileGetLVMKey(const char *path,
|
|
|
|
char **key)
|
2011-07-20 09:40:53 +00:00
|
|
|
{
|
|
|
|
/*
|
|
|
|
* # lvs --noheadings --unbuffered --nosuffix --options "uuid" LVNAME
|
|
|
|
* 06UgP5-2rhb-w3Bo-3mdR-WeoL-pytO-SAa2ky
|
|
|
|
*/
|
2012-12-11 19:10:51 +00:00
|
|
|
int status;
|
2011-07-20 09:40:53 +00:00
|
|
|
virCommandPtr cmd = virCommandNewArgList(
|
|
|
|
LVS,
|
|
|
|
"--noheadings", "--unbuffered", "--nosuffix",
|
|
|
|
"--options", "uuid", path,
|
|
|
|
NULL
|
|
|
|
);
|
2012-12-11 19:10:51 +00:00
|
|
|
int ret = -1;
|
|
|
|
|
|
|
|
*key = NULL;
|
2011-07-20 09:40:53 +00:00
|
|
|
|
|
|
|
/* Run the program and capture its output */
|
2012-12-11 19:10:51 +00:00
|
|
|
virCommandSetOutputBuffer(cmd, key);
|
|
|
|
if (virCommandRun(cmd, &status) < 0)
|
2011-07-20 09:40:53 +00:00
|
|
|
goto cleanup;
|
|
|
|
|
2012-12-11 19:10:51 +00:00
|
|
|
/* Explicitly check status == 0, rather than passing NULL
|
|
|
|
* to virCommandRun because we don't want to raise an actual
|
|
|
|
* error in this scenario, just return a NULL key.
|
|
|
|
*/
|
|
|
|
|
|
|
|
if (status == 0 && *key) {
|
2011-07-20 09:40:53 +00:00
|
|
|
char *nl;
|
2012-12-11 19:10:51 +00:00
|
|
|
char *tmp = *key;
|
2011-07-20 09:40:53 +00:00
|
|
|
|
|
|
|
/* Find first non-space character */
|
|
|
|
while (*tmp && c_isspace(*tmp)) {
|
|
|
|
tmp++;
|
|
|
|
}
|
|
|
|
/* Kill leading spaces */
|
2012-12-11 19:10:51 +00:00
|
|
|
if (tmp != *key)
|
|
|
|
memmove(*key, tmp, strlen(tmp)+1);
|
2011-07-20 09:40:53 +00:00
|
|
|
|
|
|
|
/* Kill trailing newline */
|
2012-12-11 19:10:51 +00:00
|
|
|
if ((nl = strchr(*key, '\n')))
|
2011-07-20 09:40:53 +00:00
|
|
|
*nl = '\0';
|
|
|
|
}
|
|
|
|
|
2012-12-11 19:10:51 +00:00
|
|
|
ret = 0;
|
2011-07-20 09:40:53 +00:00
|
|
|
|
|
|
|
cleanup:
|
2012-12-11 19:10:51 +00:00
|
|
|
if (*key && STREQ(*key, ""))
|
|
|
|
VIR_FREE(*key);
|
|
|
|
|
2011-07-20 09:40:53 +00:00
|
|
|
virCommandFree(cmd);
|
|
|
|
|
2012-12-11 19:10:51 +00:00
|
|
|
return ret;
|
2011-07-20 09:40:53 +00:00
|
|
|
}
|
|
|
|
#else
|
2012-12-11 19:10:51 +00:00
|
|
|
int virStorageFileGetLVMKey(const char *path,
|
|
|
|
char **key ATTRIBUTE_UNUSED)
|
2011-07-20 09:40:53 +00:00
|
|
|
{
|
|
|
|
virReportSystemError(ENOSYS, _("Unable to get LVM key for %s"), path);
|
2012-12-11 19:10:51 +00:00
|
|
|
return -1;
|
2011-07-20 09:40:53 +00:00
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
2012-09-20 14:24:47 +00:00
|
|
|
#ifdef WITH_UDEV
|
2012-12-11 19:10:51 +00:00
|
|
|
int virStorageFileGetSCSIKey(const char *path,
|
|
|
|
char **key)
|
2011-07-20 09:40:53 +00:00
|
|
|
{
|
2012-12-11 19:10:51 +00:00
|
|
|
int status;
|
2011-07-20 09:40:53 +00:00
|
|
|
virCommandPtr cmd = virCommandNewArgList(
|
|
|
|
"/lib/udev/scsi_id",
|
|
|
|
"--replace-whitespace",
|
|
|
|
"--whitelisted",
|
|
|
|
"--device", path,
|
|
|
|
NULL
|
|
|
|
);
|
2012-12-11 19:10:51 +00:00
|
|
|
int ret = -1;
|
|
|
|
|
|
|
|
*key = NULL;
|
2011-07-20 09:40:53 +00:00
|
|
|
|
|
|
|
/* Run the program and capture its output */
|
2012-12-11 19:10:51 +00:00
|
|
|
virCommandSetOutputBuffer(cmd, key);
|
|
|
|
if (virCommandRun(cmd, &status) < 0)
|
2011-07-20 09:40:53 +00:00
|
|
|
goto cleanup;
|
|
|
|
|
2012-12-11 19:10:51 +00:00
|
|
|
/* Explicitly check status == 0, rather than passing NULL
|
|
|
|
* to virCommandRun because we don't want to raise an actual
|
|
|
|
* error in this scenario, just return a NULL key.
|
|
|
|
*/
|
|
|
|
if (status == 0 && *key) {
|
|
|
|
char *nl = strchr(*key, '\n');
|
2011-07-20 09:40:53 +00:00
|
|
|
if (nl)
|
|
|
|
*nl = '\0';
|
|
|
|
}
|
|
|
|
|
2012-12-11 19:10:51 +00:00
|
|
|
ret = 0;
|
|
|
|
|
2011-07-20 09:40:53 +00:00
|
|
|
cleanup:
|
2012-12-11 19:10:51 +00:00
|
|
|
if (*key && STREQ(*key, ""))
|
|
|
|
VIR_FREE(*key);
|
|
|
|
|
2011-07-20 09:40:53 +00:00
|
|
|
virCommandFree(cmd);
|
|
|
|
|
2012-12-11 19:10:51 +00:00
|
|
|
return ret;
|
2011-07-20 09:40:53 +00:00
|
|
|
}
|
|
|
|
#else
|
2012-12-11 19:10:51 +00:00
|
|
|
int virStorageFileGetSCSIKey(const char *path,
|
|
|
|
char **key ATTRIBUTE_UNUSED)
|
2011-07-20 09:40:53 +00:00
|
|
|
{
|
|
|
|
virReportSystemError(ENOSYS, _("Unable to get SCSI key for %s"), path);
|
2012-12-11 19:10:51 +00:00
|
|
|
return -1;
|
2011-07-20 09:40:53 +00:00
|
|
|
}
|
|
|
|
#endif
|
2012-10-12 22:29:14 +00:00
|
|
|
|
|
|
|
/* Given a CHAIN that starts at the named file START, return a string
|
|
|
|
* pointing to either START or within CHAIN that gives the preferred
|
|
|
|
* name for the backing file NAME within that chain. Pass NULL for
|
|
|
|
* NAME to find the base of the chain. If META is not NULL, set *META
|
|
|
|
* to the point in the chain that describes NAME (or to NULL if the
|
|
|
|
* backing element is not a file). If PARENT is not NULL, set *PARENT
|
|
|
|
* to the preferred name of the parent (or to NULL if NAME matches
|
|
|
|
* START). Since the results point within CHAIN, they must not be
|
|
|
|
* independently freed. */
|
|
|
|
const char *
|
|
|
|
virStorageFileChainLookup(virStorageFileMetadataPtr chain, const char *start,
|
|
|
|
const char *name, virStorageFileMetadataPtr *meta,
|
|
|
|
const char **parent)
|
|
|
|
{
|
|
|
|
virStorageFileMetadataPtr owner;
|
|
|
|
const char *tmp;
|
|
|
|
|
|
|
|
if (!parent)
|
|
|
|
parent = &tmp;
|
|
|
|
|
|
|
|
*parent = NULL;
|
|
|
|
if (name ? STREQ(start, name) || virFileLinkPointsTo(start, name) :
|
|
|
|
!chain->backingStore) {
|
|
|
|
if (meta)
|
|
|
|
*meta = chain;
|
|
|
|
return start;
|
|
|
|
}
|
|
|
|
|
|
|
|
owner = chain;
|
|
|
|
*parent = start;
|
|
|
|
while (owner) {
|
|
|
|
if (!owner->backingStore)
|
|
|
|
goto error;
|
|
|
|
if (!name) {
|
|
|
|
if (!owner->backingMeta ||
|
|
|
|
!owner->backingMeta->backingStore)
|
|
|
|
break;
|
|
|
|
} else if (STREQ_NULLABLE(name, owner->backingStoreRaw) ||
|
|
|
|
STREQ(name, owner->backingStore)) {
|
|
|
|
break;
|
|
|
|
} else if (owner->backingStoreIsFile) {
|
storage: don't follow backing chain symlinks too eagerly
If you have a qcow2 file /path1/to/file pointed to by symlink
/path2/symlink, and pass qemu /path2/symlink, then qemu treats
a relative backing file in the qcow2 metadata as being relative
to /path2, not /path1/to. Yes, this means that it is possible
to create a qcow2 file where the choice of WHICH directory and
symlink you access its contents from will then determine WHICH
backing file (if any) you actually find; the results can be
rather screwy, but we have to match what qemu does.
Libvirt and qemu default to creating absolute backing file
names, so most users don't hit this. But at least VDSM uses
symlinks and relative backing names alongside the
--reuse-external flags to libvirt snapshot operations, with the
result that libvirt was failing to follow the intended chain of
backing files, and then backing files were not granted the
necessary sVirt permissions to be opened by qemu.
See https://bugzilla.redhat.com/show_bug.cgi?id=903248 for
more gory details. This fixes a regression introduced in
commit 8250783.
I tested this patch by creating the following chain:
ls /home/eblake/Downloads/Fedora.iso # raw file for base
cd /var/lib/libvirt/images
qemu-img create -f qcow2 \
-obacking_file=/home/eblake/Downloads/Fedora.iso,backing_fmt=raw one
mkdir sub
cd sub
ln -s ../one onelink
qemu-img create -f qcow2 \
-obacking_file=../sub/onelink,backing_fmt=qcow2 two
mv two ..
ln -s ../two twolink
qemu-img create -f qcow2 \
-obacking_file=../sub/twolink,backing_fmt=qcow2 three
mv three ..
ln -s ../three threelink
then pointing my domain at /var/lib/libvirt/images/sub/threelink.
Prior to this patch, I got complaints about missing backing
files; afterwards, I was able to verify that the backing chain
(and hence DAC and SELinux relabels) of the entire chain worked.
* src/util/virstoragefile.h (_virStorageFileMetadata): Add
directory member.
* src/util/virstoragefile.c (absolutePathFromBaseFile): Drop,
replaced by...
(virFindBackingFile): ...better function.
(virStorageFileGetMetadataInternal): Add an argument.
(virStorageFileGetMetadataFromFD, virStorageFileChainLookup)
(virStorageFileGetMetadata): Update callers.
2013-02-06 22:48:15 +00:00
|
|
|
char *absName = NULL;
|
|
|
|
if (virFindBackingFile(owner->directory, true, name,
|
|
|
|
NULL, &absName) < 0)
|
|
|
|
goto error;
|
2012-10-12 22:29:14 +00:00
|
|
|
if (absName && STREQ(absName, owner->backingStore)) {
|
|
|
|
VIR_FREE(absName);
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
VIR_FREE(absName);
|
|
|
|
}
|
|
|
|
*parent = owner->backingStore;
|
|
|
|
owner = owner->backingMeta;
|
|
|
|
}
|
|
|
|
if (!owner)
|
|
|
|
goto error;
|
|
|
|
if (meta)
|
|
|
|
*meta = owner->backingMeta;
|
|
|
|
return owner->backingStore;
|
|
|
|
|
|
|
|
error:
|
|
|
|
*parent = NULL;
|
|
|
|
if (meta)
|
|
|
|
*meta = NULL;
|
|
|
|
return NULL;
|
|
|
|
}
|