mirror of
https://github.com/izzy2lost/xemu.git
synced 2026-07-06 00:20:22 -07:00
Merge remote-tracking branch 'remotes/kevin/tags/for-upstream' into staging
Block layer patches: - file-posix: Fix read-only Linux block devices with auto-read-only - Require aligned image size with O_DIRECT to avoid assertion failure - Allow byte-aligned direct I/O on NFS instead of guessing 4k alignment - Fix nbd_export_close_all() crash - Fix race in iotests case 030 - qemu-img resize: Require --shrink for shrinking all image formats - crypto: use a stronger private key for tests - Remove VXHS block device - MAINTAINERS: vvfat: set status to odd fixes # gpg: Signature made Fri 17 Jul 2020 13:31:18 BST # gpg: using RSA key DC3DEB159A9AF95D3D7456FE7F09B272C88F2FD6 # gpg: issuer "kwolf@redhat.com" # gpg: Good signature from "Kevin Wolf <kwolf@redhat.com>" [full] # Primary key fingerprint: DC3D EB15 9A9A F95D 3D74 56FE 7F09 B272 C88F 2FD6 * remotes/kevin/tags/for-upstream: file-posix: Fix leaked fd in raw_open_common() error path file-posix: Fix check_hdev_writable() with auto-read-only file-posix: Move check_hdev_writable() up file-posix: Allow byte-aligned O_DIRECT with NFS block: Require aligned image size to avoid assertion failure iotests: test shutdown when bitmap is exported through NBD nbd: make nbd_export_close_all() synchronous iotests/030: Reduce job speed to make race less likely crypto: use a stronger private key for tests qemu-img resize: Require --shrink for shrinking all image formats Remove VXHS block device vvfat: set status to odd fixes Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Peter Maydell
+1
-1
@@ -2987,7 +2987,7 @@ F: block/vpc.c
|
||||
vvfat
|
||||
M: Kevin Wolf <kwolf@redhat.com>
|
||||
L: qemu-block@nongnu.org
|
||||
S: Supported
|
||||
S: Odd Fixes
|
||||
F: block/vvfat.c
|
||||
|
||||
Image format fuzzer
|
||||
|
||||
@@ -2025,6 +2025,22 @@ static int bdrv_check_perm(BlockDriverState *bs, BlockReopenQueue *q,
|
||||
return -EPERM;
|
||||
}
|
||||
|
||||
/*
|
||||
* Unaligned requests will automatically be aligned to bl.request_alignment
|
||||
* and without RESIZE we can't extend requests to write to space beyond the
|
||||
* end of the image, so it's required that the image size is aligned.
|
||||
*/
|
||||
if ((cumulative_perms & (BLK_PERM_WRITE | BLK_PERM_WRITE_UNCHANGED)) &&
|
||||
!(cumulative_perms & BLK_PERM_RESIZE))
|
||||
{
|
||||
if ((bs->total_sectors * BDRV_SECTOR_SIZE) % bs->bl.request_alignment) {
|
||||
error_setg(errp, "Cannot get 'write' permission without 'resize': "
|
||||
"Image size is not a multiple of request "
|
||||
"alignment");
|
||||
return -EPERM;
|
||||
}
|
||||
}
|
||||
|
||||
/* Check this node */
|
||||
if (!drv) {
|
||||
return 0;
|
||||
|
||||
@@ -31,7 +31,6 @@ block-obj-$(CONFIG_LIBNFS) += nfs.o
|
||||
block-obj-$(CONFIG_CURL) += curl.o
|
||||
block-obj-$(CONFIG_RBD) += rbd.o
|
||||
block-obj-$(CONFIG_GLUSTERFS) += gluster.o
|
||||
block-obj-$(CONFIG_VXHS) += vxhs.o
|
||||
block-obj-$(CONFIG_LIBSSH) += ssh.o
|
||||
block-obj-y += accounting.o dirty-bitmap.o
|
||||
block-obj-y += write-threshold.o
|
||||
@@ -61,7 +60,6 @@ rbd.o-cflags := $(RBD_CFLAGS)
|
||||
rbd.o-libs := $(RBD_LIBS)
|
||||
gluster.o-cflags := $(GLUSTERFS_CFLAGS)
|
||||
gluster.o-libs := $(GLUSTERFS_LIBS)
|
||||
vxhs.o-libs := $(VXHS_LIBS)
|
||||
ssh.o-cflags := $(LIBSSH_CFLAGS)
|
||||
ssh.o-libs := $(LIBSSH_LIBS)
|
||||
block-obj-dmg-bz2-$(CONFIG_BZIP2) += dmg-bz2.o
|
||||
|
||||
+79
-43
@@ -62,10 +62,12 @@
|
||||
#include <sys/ioctl.h>
|
||||
#include <sys/param.h>
|
||||
#include <sys/syscall.h>
|
||||
#include <sys/vfs.h>
|
||||
#include <linux/cdrom.h>
|
||||
#include <linux/fd.h>
|
||||
#include <linux/fs.h>
|
||||
#include <linux/hdreg.h>
|
||||
#include <linux/magic.h>
|
||||
#include <scsi/sg.h>
|
||||
#ifdef __s390__
|
||||
#include <asm/dasd.h>
|
||||
@@ -300,6 +302,28 @@ static int probe_physical_blocksize(int fd, unsigned int *blk_size)
|
||||
#endif
|
||||
}
|
||||
|
||||
/*
|
||||
* Returns true if no alignment restrictions are necessary even for files
|
||||
* opened with O_DIRECT.
|
||||
*
|
||||
* raw_probe_alignment() probes the required alignment and assume that 1 means
|
||||
* the probing failed, so it falls back to a safe default of 4k. This can be
|
||||
* avoided if we know that byte alignment is okay for the file.
|
||||
*/
|
||||
static bool dio_byte_aligned(int fd)
|
||||
{
|
||||
#ifdef __linux__
|
||||
struct statfs buf;
|
||||
int ret;
|
||||
|
||||
ret = fstatfs(fd, &buf);
|
||||
if (ret == 0 && buf.f_type == NFS_SUPER_MAGIC) {
|
||||
return true;
|
||||
}
|
||||
#endif
|
||||
return false;
|
||||
}
|
||||
|
||||
/* Check if read is allowed with given memory buffer and length.
|
||||
*
|
||||
* This function is used to check O_DIRECT memory buffer and request alignment.
|
||||
@@ -401,6 +425,39 @@ static void raw_probe_alignment(BlockDriverState *bs, int fd, Error **errp)
|
||||
}
|
||||
}
|
||||
|
||||
static int check_hdev_writable(int fd)
|
||||
{
|
||||
#if defined(BLKROGET)
|
||||
/* Linux block devices can be configured "read-only" using blockdev(8).
|
||||
* This is independent of device node permissions and therefore open(2)
|
||||
* with O_RDWR succeeds. Actual writes fail with EPERM.
|
||||
*
|
||||
* bdrv_open() is supposed to fail if the disk is read-only. Explicitly
|
||||
* check for read-only block devices so that Linux block devices behave
|
||||
* properly.
|
||||
*/
|
||||
struct stat st;
|
||||
int readonly = 0;
|
||||
|
||||
if (fstat(fd, &st)) {
|
||||
return -errno;
|
||||
}
|
||||
|
||||
if (!S_ISBLK(st.st_mode)) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
if (ioctl(fd, BLKROGET, &readonly) < 0) {
|
||||
return -errno;
|
||||
}
|
||||
|
||||
if (readonly) {
|
||||
return -EACCES;
|
||||
}
|
||||
#endif /* defined(BLKROGET) */
|
||||
return 0;
|
||||
}
|
||||
|
||||
static void raw_parse_flags(int bdrv_flags, int *open_flags, bool has_writers)
|
||||
{
|
||||
bool read_write = false;
|
||||
@@ -585,6 +642,15 @@ static int raw_open_common(BlockDriverState *bs, QDict *options,
|
||||
}
|
||||
s->fd = fd;
|
||||
|
||||
/* Check s->open_flags rather than bdrv_flags due to auto-read-only */
|
||||
if (s->open_flags & O_RDWR) {
|
||||
ret = check_hdev_writable(s->fd);
|
||||
if (ret < 0) {
|
||||
error_setg_errno(errp, -ret, "The device is not writable");
|
||||
goto fail;
|
||||
}
|
||||
}
|
||||
|
||||
s->perm = 0;
|
||||
s->shared_perm = BLK_PERM_ALL;
|
||||
|
||||
@@ -629,7 +695,7 @@ static int raw_open_common(BlockDriverState *bs, QDict *options,
|
||||
|
||||
s->has_discard = true;
|
||||
s->has_write_zeroes = true;
|
||||
if ((bs->open_flags & BDRV_O_NOCACHE) != 0) {
|
||||
if ((bs->open_flags & BDRV_O_NOCACHE) != 0 && !dio_byte_aligned(s->fd)) {
|
||||
s->needs_alignment = true;
|
||||
}
|
||||
|
||||
@@ -707,6 +773,9 @@ static int raw_open_common(BlockDriverState *bs, QDict *options,
|
||||
}
|
||||
ret = 0;
|
||||
fail:
|
||||
if (ret < 0 && s->fd != -1) {
|
||||
qemu_close(s->fd);
|
||||
}
|
||||
if (filename && (bdrv_flags & BDRV_O_TEMPORARY)) {
|
||||
unlink(filename);
|
||||
}
|
||||
@@ -977,6 +1046,15 @@ static int raw_reconfigure_getfd(BlockDriverState *bs, int flags,
|
||||
}
|
||||
}
|
||||
|
||||
if (fd != -1 && (*open_flags & O_RDWR)) {
|
||||
ret = check_hdev_writable(fd);
|
||||
if (ret < 0) {
|
||||
qemu_close(fd);
|
||||
error_setg_errno(errp, -ret, "The device is not writable");
|
||||
return -1;
|
||||
}
|
||||
}
|
||||
|
||||
return fd;
|
||||
}
|
||||
|
||||
@@ -3299,39 +3377,6 @@ static int hdev_probe_device(const char *filename)
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int check_hdev_writable(BDRVRawState *s)
|
||||
{
|
||||
#if defined(BLKROGET)
|
||||
/* Linux block devices can be configured "read-only" using blockdev(8).
|
||||
* This is independent of device node permissions and therefore open(2)
|
||||
* with O_RDWR succeeds. Actual writes fail with EPERM.
|
||||
*
|
||||
* bdrv_open() is supposed to fail if the disk is read-only. Explicitly
|
||||
* check for read-only block devices so that Linux block devices behave
|
||||
* properly.
|
||||
*/
|
||||
struct stat st;
|
||||
int readonly = 0;
|
||||
|
||||
if (fstat(s->fd, &st)) {
|
||||
return -errno;
|
||||
}
|
||||
|
||||
if (!S_ISBLK(st.st_mode)) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
if (ioctl(s->fd, BLKROGET, &readonly) < 0) {
|
||||
return -errno;
|
||||
}
|
||||
|
||||
if (readonly) {
|
||||
return -EACCES;
|
||||
}
|
||||
#endif /* defined(BLKROGET) */
|
||||
return 0;
|
||||
}
|
||||
|
||||
static void hdev_parse_filename(const char *filename, QDict *options,
|
||||
Error **errp)
|
||||
{
|
||||
@@ -3454,15 +3499,6 @@ hdev_open_Mac_error:
|
||||
/* Since this does ioctl the device must be already opened */
|
||||
bs->sg = hdev_is_sg(bs);
|
||||
|
||||
if (flags & BDRV_O_RDWR) {
|
||||
ret = check_hdev_writable(s);
|
||||
if (ret < 0) {
|
||||
raw_close(bs);
|
||||
error_setg_errno(errp, -ret, "The device is not writable");
|
||||
return ret;
|
||||
}
|
||||
}
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
||||
|
||||
@@ -136,23 +136,6 @@ qed_aio_write_prefill(void *s, void *acb, uint64_t start, size_t len, uint64_t o
|
||||
qed_aio_write_postfill(void *s, void *acb, uint64_t start, size_t len, uint64_t offset) "s %p acb %p start %"PRIu64" len %zu offset %"PRIu64
|
||||
qed_aio_write_main(void *s, void *acb, int ret, uint64_t offset, size_t len) "s %p acb %p ret %d offset %"PRIu64" len %zu"
|
||||
|
||||
# vxhs.c
|
||||
vxhs_iio_callback(int error) "ctx is NULL: error %d"
|
||||
vxhs_iio_callback_chnfail(int err, int error) "QNIO channel failed, no i/o %d, %d"
|
||||
vxhs_iio_callback_unknwn(int opcode, int err) "unexpected opcode %d, errno %d"
|
||||
vxhs_aio_rw_invalid(int req) "Invalid I/O request iodir %d"
|
||||
vxhs_aio_rw_ioerr(char *guid, int iodir, uint64_t size, uint64_t off, void *acb, int ret, int err) "IO ERROR (vDisk %s) FOR : Read/Write = %d size = %"PRIu64" offset = %"PRIu64" ACB = %p. Error = %d, errno = %d"
|
||||
vxhs_get_vdisk_stat_err(char *guid, int ret, int err) "vDisk (%s) stat ioctl failed, ret = %d, errno = %d"
|
||||
vxhs_get_vdisk_stat(char *vdisk_guid, uint64_t vdisk_size) "vDisk %s stat ioctl returned size %"PRIu64
|
||||
vxhs_complete_aio(void *acb, uint64_t ret) "aio failed acb %p ret %"PRIu64
|
||||
vxhs_parse_uri_filename(const char *filename) "URI passed via bdrv_parse_filename %s"
|
||||
vxhs_open_vdiskid(const char *vdisk_id) "Opening vdisk-id %s"
|
||||
vxhs_open_hostinfo(char *of_vsa_addr, int port) "Adding host %s:%d to BDRVVXHSState"
|
||||
vxhs_open_iio_open(const char *host) "Failed to connect to storage agent on host %s"
|
||||
vxhs_parse_uri_hostinfo(char *host, int port) "Host: IP %s, Port %d"
|
||||
vxhs_close(char *vdisk_guid) "Closing vdisk %s"
|
||||
vxhs_get_creds(const char *cacert, const char *client_key, const char *client_cert) "cacert %s, client_key %s, client_cert %s"
|
||||
|
||||
# nvme.c
|
||||
nvme_kick(void *s, int queue) "s %p queue %d"
|
||||
nvme_dma_flush_queue_wait(void *s) "s %p"
|
||||
|
||||
-587
File diff suppressed because it is too large
Load Diff
@@ -501,7 +501,6 @@ numa=""
|
||||
tcmalloc="no"
|
||||
jemalloc="no"
|
||||
replication="yes"
|
||||
vxhs=""
|
||||
bochs="yes"
|
||||
cloop="yes"
|
||||
dmg="yes"
|
||||
@@ -1541,10 +1540,6 @@ for opt do
|
||||
;;
|
||||
--enable-replication) replication="yes"
|
||||
;;
|
||||
--disable-vxhs) vxhs="no"
|
||||
;;
|
||||
--enable-vxhs) vxhs="yes"
|
||||
;;
|
||||
--disable-bochs) bochs="no"
|
||||
;;
|
||||
--enable-bochs) bochs="yes"
|
||||
@@ -1932,7 +1927,6 @@ disabled with --disable-FEATURE, default is enabled if available:
|
||||
xfsctl xfsctl support
|
||||
qom-cast-debug cast debugging support
|
||||
tools build qemu-io, qemu-nbd and qemu-img tools
|
||||
vxhs Veritas HyperScale vDisk backend support
|
||||
bochs bochs image format support
|
||||
cloop cloop image format support
|
||||
dmg dmg image format support
|
||||
@@ -6249,33 +6243,6 @@ if compile_prog "" "" ; then
|
||||
have_sysmacros=yes
|
||||
fi
|
||||
|
||||
##########################################
|
||||
# Veritas HyperScale block driver VxHS
|
||||
# Check if libvxhs is installed
|
||||
|
||||
if test "$vxhs" != "no" ; then
|
||||
cat > $TMPC <<EOF
|
||||
#include <stdint.h>
|
||||
#include <qnio/qnio_api.h>
|
||||
|
||||
void *vxhs_callback;
|
||||
|
||||
int main(void) {
|
||||
iio_init(QNIO_VERSION, vxhs_callback);
|
||||
return 0;
|
||||
}
|
||||
EOF
|
||||
vxhs_libs="-lvxhs -lssl"
|
||||
if compile_prog "" "$vxhs_libs" ; then
|
||||
vxhs=yes
|
||||
else
|
||||
if test "$vxhs" = "yes" ; then
|
||||
feature_not_found "vxhs block device" "Install libvxhs See github"
|
||||
fi
|
||||
vxhs=no
|
||||
fi
|
||||
fi
|
||||
|
||||
##########################################
|
||||
# check for _Static_assert()
|
||||
|
||||
@@ -7033,7 +7000,6 @@ echo "jemalloc support $jemalloc"
|
||||
echo "avx2 optimization $avx2_opt"
|
||||
echo "avx512f optimization $avx512f_opt"
|
||||
echo "replication support $replication"
|
||||
echo "VxHS block device $vxhs"
|
||||
echo "bochs support $bochs"
|
||||
echo "cloop support $cloop"
|
||||
echo "dmg support $dmg"
|
||||
@@ -7884,11 +7850,6 @@ elif test "$pthread_setname_np_wo_tid" = "yes" ; then
|
||||
echo "CONFIG_PTHREAD_SETNAME_NP_WO_TID=y" >> $config_host_mak
|
||||
fi
|
||||
|
||||
if test "$vxhs" = "yes" ; then
|
||||
echo "CONFIG_VXHS=y" >> $config_host_mak
|
||||
echo "VXHS_LIBS=$vxhs_libs" >> $config_host_mak
|
||||
fi
|
||||
|
||||
if test "$libpmem" = "yes" ; then
|
||||
echo "CONFIG_LIBPMEM=y" >> $config_host_mak
|
||||
fi
|
||||
|
||||
@@ -618,3 +618,11 @@ to achieve the same fake NUMA effect or a properly configured
|
||||
New machine versions (since 5.1) will not accept the option but it will still
|
||||
work with old machine types. User can check the QAPI schema to see if the legacy
|
||||
option is supported by looking at MachineInfo::numa-mem-supported property.
|
||||
|
||||
Block devices
|
||||
-------------
|
||||
|
||||
VXHS backend (removed in 5.1)
|
||||
'''''''''''''''''''''''''''''
|
||||
|
||||
The VXHS code does not compile since v2.12.0. It was removed in 5.1.
|
||||
|
||||
@@ -102,6 +102,8 @@ struct NBDExport {
|
||||
};
|
||||
|
||||
static QTAILQ_HEAD(, NBDExport) exports = QTAILQ_HEAD_INITIALIZER(exports);
|
||||
static QTAILQ_HEAD(, NBDExport) closed_exports =
|
||||
QTAILQ_HEAD_INITIALIZER(closed_exports);
|
||||
|
||||
/* NBDExportMetaContexts represents a list of contexts to be exported,
|
||||
* as selected by NBD_OPT_SET_META_CONTEXT. Also used for
|
||||
@@ -1659,6 +1661,7 @@ void nbd_export_close(NBDExport *exp)
|
||||
g_free(exp->name);
|
||||
exp->name = NULL;
|
||||
QTAILQ_REMOVE(&exports, exp, next);
|
||||
QTAILQ_INSERT_TAIL(&closed_exports, exp, next);
|
||||
}
|
||||
g_free(exp->description);
|
||||
exp->description = NULL;
|
||||
@@ -1722,7 +1725,9 @@ void nbd_export_put(NBDExport *exp)
|
||||
g_free(exp->export_bitmap_context);
|
||||
}
|
||||
|
||||
QTAILQ_REMOVE(&closed_exports, exp, next);
|
||||
g_free(exp);
|
||||
aio_wait_kick();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1742,6 +1747,9 @@ void nbd_export_close_all(void)
|
||||
nbd_export_close(exp);
|
||||
aio_context_release(aio_context);
|
||||
}
|
||||
|
||||
AIO_WAIT_WHILE(NULL, !(QTAILQ_EMPTY(&exports) &&
|
||||
QTAILQ_EMPTY(&closed_exports)));
|
||||
}
|
||||
|
||||
static int coroutine_fn nbd_co_send_iov(NBDClient *client, struct iovec *iov,
|
||||
|
||||
+2
-20
@@ -2790,7 +2790,6 @@
|
||||
#
|
||||
# Drivers that are supported in block device operations.
|
||||
#
|
||||
# @vxhs: Since 2.10
|
||||
# @throttle: Since 2.11
|
||||
# @nvme: Since 2.12
|
||||
# @copy-on-read: Since 3.0
|
||||
@@ -2808,7 +2807,7 @@
|
||||
'qcow', 'qcow2', 'qed', 'quorum', 'raw', 'rbd',
|
||||
{ 'name': 'replication', 'if': 'defined(CONFIG_REPLICATION)' },
|
||||
'sheepdog',
|
||||
'ssh', 'throttle', 'vdi', 'vhdx', 'vmdk', 'vpc', 'vvfat', 'vxhs' ] }
|
||||
'ssh', 'throttle', 'vdi', 'vhdx', 'vmdk', 'vpc', 'vvfat' ] }
|
||||
|
||||
##
|
||||
# @BlockdevOptionsFile:
|
||||
@@ -3895,22 +3894,6 @@
|
||||
'base': 'BlockdevOptionsGenericFormat',
|
||||
'data': { '*offset': 'int', '*size': 'int' } }
|
||||
|
||||
##
|
||||
# @BlockdevOptionsVxHS:
|
||||
#
|
||||
# Driver specific block device options for VxHS
|
||||
#
|
||||
# @vdisk-id: UUID of VxHS volume
|
||||
# @server: vxhs server IP, port
|
||||
# @tls-creds: TLS credentials ID
|
||||
#
|
||||
# Since: 2.10
|
||||
##
|
||||
{ 'struct': 'BlockdevOptionsVxHS',
|
||||
'data': { 'vdisk-id': 'str',
|
||||
'server': 'InetSocketAddressBase',
|
||||
'*tls-creds': 'str' } }
|
||||
|
||||
##
|
||||
# @BlockdevOptionsThrottle:
|
||||
#
|
||||
@@ -4010,8 +3993,7 @@
|
||||
'vhdx': 'BlockdevOptionsGenericFormat',
|
||||
'vmdk': 'BlockdevOptionsGenericCOWFormat',
|
||||
'vpc': 'BlockdevOptionsGenericFormat',
|
||||
'vvfat': 'BlockdevOptionsVVFAT',
|
||||
'vxhs': 'BlockdevOptionsVxHS'
|
||||
'vvfat': 'BlockdevOptionsVVFAT'
|
||||
} }
|
||||
|
||||
##
|
||||
|
||||
+3
-11
@@ -4004,20 +4004,12 @@ static int img_resize(int argc, char **argv)
|
||||
}
|
||||
|
||||
if (total_size < current_size && !shrink) {
|
||||
error_report("Use the --shrink option to perform a shrink operation.");
|
||||
warn_report("Shrinking an image will delete all data beyond the "
|
||||
"shrunken image's end. Before performing such an "
|
||||
"operation, make sure there is no important data there.");
|
||||
|
||||
if (g_strcmp0(bdrv_get_format_name(blk_bs(blk)), "raw") != 0) {
|
||||
error_report(
|
||||
"Use the --shrink option to perform a shrink operation.");
|
||||
ret = -1;
|
||||
goto out;
|
||||
} else {
|
||||
warn_report("Using the --shrink option will suppress this message. "
|
||||
"Note that future versions of qemu-img may refuse to "
|
||||
"shrink images without this option.");
|
||||
}
|
||||
ret = -1;
|
||||
goto out;
|
||||
}
|
||||
|
||||
/*
|
||||
|
||||
@@ -37,25 +37,46 @@ ASN1_TYPE pkix_asn1;
|
||||
* here's one we prepared earlier :-)
|
||||
*/
|
||||
gnutls_x509_privkey_t privkey;
|
||||
# define PRIVATE_KEY \
|
||||
"-----BEGIN PRIVATE KEY-----\n" \
|
||||
"MIICdQIBADANBgkqhkiG9w0BAQEFAASCAl8wggJbAgEAAoGBALVcr\n" \
|
||||
"BL40Tm6yq88FBhJNw1aaoCjmtg0l4dWQZ/e9Fimx4ARxFpT+ji4FE\n" \
|
||||
"Cgl9s/SGqC+1nvlkm9ViSo0j7MKDbnDB+VRHDvMAzQhA2X7e8M0n9\n" \
|
||||
"rPolUY2lIVC83q0BBaOBkCj2RSmT2xTEbbC2xLukSrg2WP/ihVOxc\n" \
|
||||
"kXRuyFtzAgMBAAECgYB7slBexDwXrtItAMIH6m/U+LUpNe0Xx48OL\n" \
|
||||
"IOn4a4whNgO/o84uIwygUK27ZGFZT0kAGAk8CdF9hA6ArcbQ62s1H\n" \
|
||||
"myxrUbF9/mrLsQw1NEqpuUk9Ay2Tx5U/wPx35S3W/X2AvR/ZpTnCn\n" \
|
||||
"2q/7ym9fyiSoj86drD7BTvmKXlOnOwQJBAPOFMp4mMa9NGpGuEssO\n" \
|
||||
"m3Uwbp6lhcP0cA9MK+iOmeANpoKWfBdk5O34VbmeXnGYWEkrnX+9J\n" \
|
||||
"bM4wVhnnBWtgBMCQQC+qAEmvwcfhauERKYznMVUVksyeuhxhCe7EK\n" \
|
||||
"mPh+U2+g0WwdKvGDgO0PPt1gq0ILEjspMDeMHVdTwkaVBo/uMhAkA\n" \
|
||||
"Z5SsZyCP2aTOPFDypXRdI4eqRcjaEPOUBq27r3uYb/jeboVb2weLa\n" \
|
||||
"L1MmVuHiIHoa5clswPdWVI2y0em2IGoDAkBPSp/v9VKJEZabk9Frd\n" \
|
||||
"a+7u4fanrM9QrEjY3KhduslSilXZZSxrWjjAJPyPiqFb3M8XXA26W\n" \
|
||||
"nz1KYGnqYKhLcBAkB7dt57n9xfrhDpuyVEv+Uv1D3VVAhZlsaZ5Pp\n" \
|
||||
"dcrhrkJn2sa/+O8OKvdrPSeeu/N5WwYhJf61+CPoenMp7IFci\n" \
|
||||
"-----END PRIVATE KEY-----\n"
|
||||
# define PRIVATE_KEY \
|
||||
"-----BEGIN RSA PRIVATE KEY-----\n" \
|
||||
"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\n" \
|
||||
"-----END RSA PRIVATE KEY-----\n"
|
||||
|
||||
/*
|
||||
* This loads the private key we defined earlier
|
||||
|
||||
@@ -40,7 +40,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
|
||||
# Any format supporting backing files
|
||||
_supported_fmt qcow qcow2 vmdk qed
|
||||
_supported_proto generic
|
||||
_unsupported_proto vxhs
|
||||
_unsupported_imgopts "subformat=monolithicFlat" "subformat=twoGbMaxExtentFlat" \
|
||||
"subformat=streamOptimized"
|
||||
|
||||
|
||||
@@ -41,7 +41,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
|
||||
# Any format supporting intenal snapshots
|
||||
_supported_fmt qcow2
|
||||
_supported_proto generic
|
||||
_unsupported_proto vxhs
|
||||
# Internal snapshots are (currently) impossible with refcount_bits=1,
|
||||
# and generally impossible with external data files
|
||||
_unsupported_imgopts 'refcount_bits=1[^0-9]' data_file
|
||||
|
||||
@@ -243,7 +243,7 @@ class TestParallelOps(iotests.QMPTestCase):
|
||||
node_name = 'node%d' % i
|
||||
job_id = 'stream-%s' % node_name
|
||||
pending_jobs.append(job_id)
|
||||
result = self.vm.qmp('block-stream', device=node_name, job_id=job_id, base=self.imgs[i-2], speed=512*1024)
|
||||
result = self.vm.qmp('block-stream', device=node_name, job_id=job_id, base=self.imgs[i-2], speed=1024)
|
||||
self.assert_qmp(result, 'return', {})
|
||||
|
||||
for job in pending_jobs:
|
||||
|
||||
@@ -38,7 +38,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
|
||||
|
||||
_supported_fmt qcow2
|
||||
_supported_proto generic
|
||||
_unsupported_proto vxhs
|
||||
# External data files do not support compressed clusters
|
||||
# (TODO: Consider writing a version for external data files that does
|
||||
# not test compressed clusters)
|
||||
|
||||
@@ -38,7 +38,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
|
||||
|
||||
_supported_fmt qcow2
|
||||
_supported_proto generic
|
||||
_unsupported_proto vxhs
|
||||
# At least OpenBSD doesn't seem to have truncate
|
||||
_supported_os Linux
|
||||
# qcow2.py does not work too well with external data files
|
||||
|
||||
@@ -42,7 +42,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
|
||||
|
||||
_supported_fmt qcow2
|
||||
_supported_proto generic
|
||||
_unsupported_proto vxhs
|
||||
_supported_os Linux
|
||||
# We are going to use lazy-refcounts
|
||||
_unsupported_imgopts 'compat=0.10'
|
||||
|
||||
@@ -38,7 +38,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
|
||||
|
||||
_supported_fmt qcow qcow2
|
||||
_supported_proto generic
|
||||
_unsupported_proto vxhs
|
||||
|
||||
|
||||
size=128M
|
||||
|
||||
@@ -50,7 +50,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
|
||||
|
||||
_supported_fmt qcow2 qed
|
||||
_supported_proto generic
|
||||
_unsupported_proto vxhs
|
||||
# Copying files around with cp does not work with external data files
|
||||
_unsupported_imgopts data_file
|
||||
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user