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: - Add blockdev-create job - qcow2: Silence Coverity false positive # gpg: Signature made Wed 30 May 2018 16:55:31 BST # gpg: using RSA key 7F09B272C88F2FD6 # gpg: Good signature from "Kevin Wolf <kwolf@redhat.com>" # Primary key fingerprint: DC3D EB15 9A9A F95D 3D74 56FE 7F09 B272 C88F 2FD6 * remotes/kevin/tags/for-upstream: block/create: Mark blockdev-create stable qemu-iotests: Rewrite 213 for blockdev-create job qemu-iotests: Rewrite 212 for blockdev-create job qemu-iotests: Rewrite 211 for blockdev-create job qemu-iotests: Rewrite 210 for blockdev-create job qemu-iotests: Rewrite 207 for blockdev-create job qemu-iotests: Rewrite 206 for blockdev-create job qemu-iotests: iotests.py helper for non-file protocols qemu-iotests: Add VM.run_job() qemu-iotests: Add iotests.img_info_log() qemu-iotests: Add VM.qmp_log() qemu-iotests: Add VM.get_qmp_events_filtered() block/create: Make x-blockdev-create a job job: Add error message for failing jobs vhdx: Fix vhdx_co_create() return value vdi: Fix vdi_co_do_create() return value qcow2: Fix Coverity warning when calculating the refcount cache size Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Peter Maydell
+1
-1
@@ -321,7 +321,7 @@ static void backup_complete(Job *job, void *opaque)
|
||||
{
|
||||
BackupCompleteData *data = opaque;
|
||||
|
||||
job_completed(job, data->ret);
|
||||
job_completed(job, data->ret, NULL);
|
||||
g_free(data);
|
||||
}
|
||||
|
||||
|
||||
+1
-1
@@ -117,7 +117,7 @@ static void commit_complete(Job *job, void *opaque)
|
||||
* bdrv_set_backing_hd() to fail. */
|
||||
block_job_remove_all_bdrv(bjob);
|
||||
|
||||
job_completed(job, ret);
|
||||
job_completed(job, ret, NULL);
|
||||
g_free(data);
|
||||
|
||||
/* If bdrv_drop_intermediate() didn't already do that, remove the commit
|
||||
|
||||
+46
-21
@@ -24,28 +24,51 @@
|
||||
|
||||
#include "qemu/osdep.h"
|
||||
#include "block/block_int.h"
|
||||
#include "qemu/job.h"
|
||||
#include "qapi/qapi-commands-block-core.h"
|
||||
#include "qapi/qapi-visit-block-core.h"
|
||||
#include "qapi/clone-visitor.h"
|
||||
#include "qapi/error.h"
|
||||
|
||||
typedef struct BlockdevCreateCo {
|
||||
typedef struct BlockdevCreateJob {
|
||||
Job common;
|
||||
BlockDriver *drv;
|
||||
BlockdevCreateOptions *opts;
|
||||
int ret;
|
||||
Error **errp;
|
||||
} BlockdevCreateCo;
|
||||
Error *err;
|
||||
} BlockdevCreateJob;
|
||||
|
||||
static void coroutine_fn bdrv_co_create_co_entry(void *opaque)
|
||||
static void blockdev_create_complete(Job *job, void *opaque)
|
||||
{
|
||||
BlockdevCreateCo *cco = opaque;
|
||||
cco->ret = cco->drv->bdrv_co_create(cco->opts, cco->errp);
|
||||
BlockdevCreateJob *s = container_of(job, BlockdevCreateJob, common);
|
||||
|
||||
job_completed(job, s->ret, s->err);
|
||||
}
|
||||
|
||||
void qmp_x_blockdev_create(BlockdevCreateOptions *options, Error **errp)
|
||||
static void coroutine_fn blockdev_create_run(void *opaque)
|
||||
{
|
||||
BlockdevCreateJob *s = opaque;
|
||||
|
||||
job_progress_set_remaining(&s->common, 1);
|
||||
s->ret = s->drv->bdrv_co_create(s->opts, &s->err);
|
||||
job_progress_update(&s->common, 1);
|
||||
|
||||
qapi_free_BlockdevCreateOptions(s->opts);
|
||||
job_defer_to_main_loop(&s->common, blockdev_create_complete, NULL);
|
||||
}
|
||||
|
||||
static const JobDriver blockdev_create_job_driver = {
|
||||
.instance_size = sizeof(BlockdevCreateJob),
|
||||
.job_type = JOB_TYPE_CREATE,
|
||||
.start = blockdev_create_run,
|
||||
};
|
||||
|
||||
void qmp_blockdev_create(const char *job_id, BlockdevCreateOptions *options,
|
||||
Error **errp)
|
||||
{
|
||||
BlockdevCreateJob *s;
|
||||
const char *fmt = BlockdevDriver_str(options->driver);
|
||||
BlockDriver *drv = bdrv_find_format(fmt);
|
||||
Coroutine *co;
|
||||
BlockdevCreateCo cco;
|
||||
|
||||
/* If the driver is in the schema, we know that it exists. But it may not
|
||||
* be whitelisted. */
|
||||
@@ -55,22 +78,24 @@ void qmp_x_blockdev_create(BlockdevCreateOptions *options, Error **errp)
|
||||
return;
|
||||
}
|
||||
|
||||
/* Call callback if it exists */
|
||||
/* Error out if the driver doesn't support .bdrv_co_create */
|
||||
if (!drv->bdrv_co_create) {
|
||||
error_setg(errp, "Driver does not support blockdev-create");
|
||||
return;
|
||||
}
|
||||
|
||||
cco = (BlockdevCreateCo) {
|
||||
.drv = drv,
|
||||
.opts = options,
|
||||
.ret = -EINPROGRESS,
|
||||
.errp = errp,
|
||||
};
|
||||
|
||||
co = qemu_coroutine_create(bdrv_co_create_co_entry, &cco);
|
||||
qemu_coroutine_enter(co);
|
||||
while (cco.ret == -EINPROGRESS) {
|
||||
aio_poll(qemu_get_aio_context(), true);
|
||||
/* Create the block job */
|
||||
/* TODO Running in the main context. Block drivers need to error out or add
|
||||
* locking when they use a BDS in a different AioContext. */
|
||||
s = job_create(job_id, &blockdev_create_job_driver, NULL,
|
||||
qemu_get_aio_context(), JOB_DEFAULT | JOB_MANUAL_DISMISS,
|
||||
NULL, NULL, errp);
|
||||
if (!s) {
|
||||
return;
|
||||
}
|
||||
|
||||
s->drv = drv,
|
||||
s->opts = QAPI_CLONE(BlockdevCreateOptions, options),
|
||||
|
||||
job_start(&s->common);
|
||||
}
|
||||
|
||||
+1
-1
@@ -581,7 +581,7 @@ static void mirror_exit(Job *job, void *opaque)
|
||||
blk_set_perm(bjob->blk, 0, BLK_PERM_ALL, &error_abort);
|
||||
blk_insert_bs(bjob->blk, mirror_top_bs, &error_abort);
|
||||
|
||||
job_completed(job, data->ret);
|
||||
job_completed(job, data->ret, NULL);
|
||||
|
||||
g_free(data);
|
||||
bdrv_drained_end(src);
|
||||
|
||||
+2
-3
@@ -768,6 +768,7 @@ static void read_cache_sizes(BlockDriverState *bs, QemuOpts *opts,
|
||||
BDRVQcow2State *s = bs->opaque;
|
||||
uint64_t combined_cache_size;
|
||||
bool l2_cache_size_set, refcount_cache_size_set, combined_cache_size_set;
|
||||
int min_refcount_cache = MIN_REFCOUNT_CACHE_SIZE * s->cluster_size;
|
||||
|
||||
combined_cache_size_set = qemu_opt_get(opts, QCOW2_OPT_CACHE_SIZE);
|
||||
l2_cache_size_set = qemu_opt_get(opts, QCOW2_OPT_L2_CACHE_SIZE);
|
||||
@@ -804,8 +805,6 @@ static void read_cache_sizes(BlockDriverState *bs, QemuOpts *opts,
|
||||
} else {
|
||||
uint64_t virtual_disk_size = bs->total_sectors * BDRV_SECTOR_SIZE;
|
||||
uint64_t max_l2_cache = virtual_disk_size / (s->cluster_size / 8);
|
||||
uint64_t min_refcount_cache =
|
||||
(uint64_t) MIN_REFCOUNT_CACHE_SIZE * s->cluster_size;
|
||||
|
||||
/* Assign as much memory as possible to the L2 cache, and
|
||||
* use the remainder for the refcount cache */
|
||||
@@ -825,7 +824,7 @@ static void read_cache_sizes(BlockDriverState *bs, QemuOpts *opts,
|
||||
* s->cluster_size);
|
||||
}
|
||||
if (!refcount_cache_size_set) {
|
||||
*refcount_cache_size = MIN_REFCOUNT_CACHE_SIZE * s->cluster_size;
|
||||
*refcount_cache_size = min_refcount_cache;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
+1
-1
@@ -93,7 +93,7 @@ out:
|
||||
}
|
||||
|
||||
g_free(s->backing_file_str);
|
||||
job_completed(job, data->ret);
|
||||
job_completed(job, data->ret, NULL);
|
||||
g_free(data);
|
||||
}
|
||||
|
||||
|
||||
@@ -865,6 +865,7 @@ static int coroutine_fn vdi_co_do_create(BlockdevCreateOptions *create_options,
|
||||
}
|
||||
}
|
||||
|
||||
ret = 0;
|
||||
exit:
|
||||
blk_unref(blk);
|
||||
bdrv_unref(bs_file);
|
||||
|
||||
+1
-1
@@ -1951,7 +1951,7 @@ static int coroutine_fn vhdx_co_create(BlockdevCreateOptions *opts,
|
||||
goto delete_and_exit;
|
||||
}
|
||||
|
||||
|
||||
ret = 0;
|
||||
delete_and_exit:
|
||||
blk_unref(blk);
|
||||
bdrv_unref(bs);
|
||||
|
||||
+6
-1
@@ -124,6 +124,9 @@ typedef struct Job {
|
||||
/** Estimated progress_current value at the completion of the job */
|
||||
int64_t progress_total;
|
||||
|
||||
/** Error string for a failed job (NULL if, and only if, job->ret == 0) */
|
||||
char *error;
|
||||
|
||||
/** ret code passed to job_completed. */
|
||||
int ret;
|
||||
|
||||
@@ -466,13 +469,15 @@ void job_transition_to_ready(Job *job);
|
||||
/**
|
||||
* @job: The job being completed.
|
||||
* @ret: The status code.
|
||||
* @error: The error message for a failing job (only with @ret < 0). If @ret is
|
||||
* negative, but NULL is given for @error, strerror() is used.
|
||||
*
|
||||
* Marks @job as completed. If @ret is non-zero, the job transaction it is part
|
||||
* of is aborted. If @ret is zero, the job moves into the WAITING state. If it
|
||||
* is the last job to complete in its transaction, all jobs in the transaction
|
||||
* move from WAITING to PENDING.
|
||||
*/
|
||||
void job_completed(Job *job, int ret);
|
||||
void job_completed(Job *job, int ret, Error *error);
|
||||
|
||||
/** Asynchronously complete the specified @job. */
|
||||
void job_complete(Job *job, Error **errp);
|
||||
|
||||
@@ -136,14 +136,9 @@ void qmp_job_dismiss(const char *id, Error **errp)
|
||||
static JobInfo *job_query_single(Job *job, Error **errp)
|
||||
{
|
||||
JobInfo *info;
|
||||
const char *errmsg = NULL;
|
||||
|
||||
assert(!job_is_internal(job));
|
||||
|
||||
if (job->ret < 0) {
|
||||
errmsg = strerror(-job->ret);
|
||||
}
|
||||
|
||||
info = g_new(JobInfo, 1);
|
||||
*info = (JobInfo) {
|
||||
.id = g_strdup(job->id),
|
||||
@@ -151,8 +146,8 @@ static JobInfo *job_query_single(Job *job, Error **errp)
|
||||
.status = job->status,
|
||||
.current_progress = job->progress_current,
|
||||
.total_progress = job->progress_total,
|
||||
.has_error = !!errmsg,
|
||||
.error = g_strdup(errmsg),
|
||||
.has_error = !!job->error,
|
||||
.error = g_strdup(job->error),
|
||||
};
|
||||
|
||||
return info;
|
||||
|
||||
@@ -369,6 +369,7 @@ void job_unref(Job *job)
|
||||
|
||||
QLIST_REMOVE(job, job_list);
|
||||
|
||||
g_free(job->error);
|
||||
g_free(job->id);
|
||||
g_free(job);
|
||||
}
|
||||
@@ -660,6 +661,9 @@ static void job_update_rc(Job *job)
|
||||
job->ret = -ECANCELED;
|
||||
}
|
||||
if (job->ret) {
|
||||
if (!job->error) {
|
||||
job->error = g_strdup(strerror(-job->ret));
|
||||
}
|
||||
job_state_transition(job, JOB_STATUS_ABORTING);
|
||||
}
|
||||
}
|
||||
@@ -782,6 +786,7 @@ static int job_prepare(Job *job)
|
||||
{
|
||||
if (job->ret == 0 && job->driver->prepare) {
|
||||
job->ret = job->driver->prepare(job);
|
||||
job_update_rc(job);
|
||||
}
|
||||
return job->ret;
|
||||
}
|
||||
@@ -855,10 +860,17 @@ static void job_completed_txn_success(Job *job)
|
||||
}
|
||||
}
|
||||
|
||||
void job_completed(Job *job, int ret)
|
||||
void job_completed(Job *job, int ret, Error *error)
|
||||
{
|
||||
assert(job && job->txn && !job_is_completed(job));
|
||||
|
||||
job->ret = ret;
|
||||
if (error) {
|
||||
assert(job->ret < 0);
|
||||
job->error = g_strdup(error_get_pretty(error));
|
||||
error_free(error);
|
||||
}
|
||||
|
||||
job_update_rc(job);
|
||||
trace_job_completed(job, ret, job->ret);
|
||||
if (job->ret) {
|
||||
@@ -876,7 +888,7 @@ void job_cancel(Job *job, bool force)
|
||||
}
|
||||
job_cancel_async(job, force);
|
||||
if (!job_started(job)) {
|
||||
job_completed(job, -ECANCELED);
|
||||
job_completed(job, -ECANCELED, NULL);
|
||||
} else if (job->deferred_to_main_loop) {
|
||||
job_completed_txn_abort(job);
|
||||
} else {
|
||||
|
||||
+11
-7
@@ -4011,16 +4011,20 @@
|
||||
} }
|
||||
|
||||
##
|
||||
# @x-blockdev-create:
|
||||
# @blockdev-create:
|
||||
#
|
||||
# Create an image format on a given node.
|
||||
# TODO Replace with something asynchronous (block job?)
|
||||
# Starts a job to create an image format on a given node. The job is
|
||||
# automatically finalized, but a manual job-dismiss is required.
|
||||
#
|
||||
# Since: 2.12
|
||||
# @job-id: Identifier for the newly created job.
|
||||
#
|
||||
# @options: Options for the image creation.
|
||||
#
|
||||
# Since: 3.0
|
||||
##
|
||||
{ 'command': 'x-blockdev-create',
|
||||
'data': 'BlockdevCreateOptions',
|
||||
'boxed': true }
|
||||
{ 'command': 'blockdev-create',
|
||||
'data': { 'job-id': 'str',
|
||||
'options': 'BlockdevCreateOptions' } }
|
||||
|
||||
##
|
||||
# @blockdev-open-tray:
|
||||
|
||||
+3
-1
@@ -17,10 +17,12 @@
|
||||
#
|
||||
# @backup: drive backup job type, see "drive-backup"
|
||||
#
|
||||
# @create: image creation job type, see "blockdev-create" (since 3.0)
|
||||
#
|
||||
# Since: 1.7
|
||||
##
|
||||
{ 'enum': 'JobType',
|
||||
'data': ['commit', 'stream', 'mirror', 'backup'] }
|
||||
'data': ['commit', 'stream', 'mirror', 'backup', 'create'] }
|
||||
|
||||
##
|
||||
# @JobStatus:
|
||||
|
||||
+222
-376
File diff suppressed because it is too large
Load Diff
+144
-97
@@ -1,17 +1,18 @@
|
||||
QA output created by 206
|
||||
|
||||
=== Successful image creation (defaults) ===
|
||||
|
||||
Testing:
|
||||
QMP_VERSION
|
||||
{"return": {}}
|
||||
{"return": {}}
|
||||
{"return": {}}
|
||||
{"return": {}}
|
||||
{"return": {}}
|
||||
{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "SHUTDOWN", "data": {"guest": false}}
|
||||
{'execute': 'blockdev-create', 'arguments': {'job_id': 'job0', 'options': {'size': 0, 'driver': 'file', 'filename': 'TEST_DIR/PID-t.qcow2'}}}
|
||||
{u'return': {}}
|
||||
{'execute': 'job-dismiss', 'arguments': {'id': 'job0'}}
|
||||
{u'return': {}}
|
||||
|
||||
image: TEST_DIR/t.IMGFMT
|
||||
{'execute': 'blockdev-add', 'arguments': {'node_name': 'imgfile', 'driver': 'file', 'filename': 'TEST_DIR/PID-t.qcow2'}}
|
||||
{u'return': {}}
|
||||
{'execute': 'blockdev-create', 'arguments': {'job_id': 'job0', 'options': {'driver': 'qcow2', 'file': 'imgfile', 'size': 134217728}}}
|
||||
{u'return': {}}
|
||||
{'execute': 'job-dismiss', 'arguments': {'id': 'job0'}}
|
||||
{u'return': {}}
|
||||
|
||||
image: TEST_IMG
|
||||
file format: IMGFMT
|
||||
virtual size: 128M (134217728 bytes)
|
||||
cluster_size: 65536
|
||||
@@ -23,15 +24,17 @@ Format specific information:
|
||||
|
||||
=== Successful image creation (inline blockdev-add, explicit defaults) ===
|
||||
|
||||
Testing:
|
||||
QMP_VERSION
|
||||
{"return": {}}
|
||||
{"return": {}}
|
||||
{"return": {}}
|
||||
{"return": {}}
|
||||
{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "SHUTDOWN", "data": {"guest": false}}
|
||||
{'execute': 'blockdev-create', 'arguments': {'job_id': 'job0', 'options': {'nocow': False, 'preallocation': 'off', 'size': 0, 'driver': 'file', 'filename': 'TEST_DIR/PID-t.qcow2'}}}
|
||||
{u'return': {}}
|
||||
{'execute': 'job-dismiss', 'arguments': {'id': 'job0'}}
|
||||
{u'return': {}}
|
||||
|
||||
image: TEST_DIR/t.IMGFMT
|
||||
{'execute': 'blockdev-create', 'arguments': {'job_id': 'job0', 'options': {'cluster-size': 65536, 'refcount-bits': 16, 'version': 'v3', 'preallocation': 'off', 'file': {'driver': 'file', 'filename': 'TEST_DIR/PID-t.qcow2'}, 'lazy-refcounts': False, 'driver': 'qcow2', 'size': 67108864}}}
|
||||
{u'return': {}}
|
||||
{'execute': 'job-dismiss', 'arguments': {'id': 'job0'}}
|
||||
{u'return': {}}
|
||||
|
||||
image: TEST_IMG
|
||||
file format: IMGFMT
|
||||
virtual size: 64M (67108864 bytes)
|
||||
cluster_size: 65536
|
||||
@@ -43,15 +46,17 @@ Format specific information:
|
||||
|
||||
=== Successful image creation (v3 non-default options) ===
|
||||
|
||||
Testing:
|
||||
QMP_VERSION
|
||||
{"return": {}}
|
||||
{"return": {}}
|
||||
{"return": {}}
|
||||
{"return": {}}
|
||||
{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "SHUTDOWN", "data": {"guest": false}}
|
||||
{'execute': 'blockdev-create', 'arguments': {'job_id': 'job0', 'options': {'nocow': True, 'preallocation': 'falloc', 'size': 0, 'driver': 'file', 'filename': 'TEST_DIR/PID-t.qcow2'}}}
|
||||
{u'return': {}}
|
||||
{'execute': 'job-dismiss', 'arguments': {'id': 'job0'}}
|
||||
{u'return': {}}
|
||||
|
||||
image: TEST_DIR/t.IMGFMT
|
||||
{'execute': 'blockdev-create', 'arguments': {'job_id': 'job0', 'options': {'cluster-size': 2097152, 'refcount-bits': 1, 'version': 'v3', 'preallocation': 'metadata', 'file': {'driver': 'file', 'filename': 'TEST_DIR/PID-t.qcow2'}, 'lazy-refcounts': True, 'driver': 'qcow2', 'size': 33554432}}}
|
||||
{u'return': {}}
|
||||
{'execute': 'job-dismiss', 'arguments': {'id': 'job0'}}
|
||||
{u'return': {}}
|
||||
|
||||
image: TEST_IMG
|
||||
file format: IMGFMT
|
||||
virtual size: 32M (33554432 bytes)
|
||||
cluster_size: 2097152
|
||||
@@ -63,19 +68,21 @@ Format specific information:
|
||||
|
||||
=== Successful image creation (v2 non-default options) ===
|
||||
|
||||
Testing:
|
||||
QMP_VERSION
|
||||
{"return": {}}
|
||||
{"return": {}}
|
||||
{"return": {}}
|
||||
{"return": {}}
|
||||
{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "SHUTDOWN", "data": {"guest": false}}
|
||||
{'execute': 'blockdev-create', 'arguments': {'job_id': 'job0', 'options': {'size': 0, 'driver': 'file', 'filename': 'TEST_DIR/PID-t.qcow2'}}}
|
||||
{u'return': {}}
|
||||
{'execute': 'job-dismiss', 'arguments': {'id': 'job0'}}
|
||||
{u'return': {}}
|
||||
|
||||
image: TEST_DIR/t.IMGFMT
|
||||
{'execute': 'blockdev-create', 'arguments': {'job_id': 'job0', 'options': {'cluster-size': 512, 'backing-fmt': 'qcow2', 'driver': 'qcow2', 'version': 'v2', 'file': {'driver': 'file', 'filename': 'TEST_DIR/PID-t.qcow2'}, 'backing-file': 'TEST_DIR/PID-t.qcow2.base', 'size': 33554432}}}
|
||||
{u'return': {}}
|
||||
{'execute': 'job-dismiss', 'arguments': {'id': 'job0'}}
|
||||
{u'return': {}}
|
||||
|
||||
image: TEST_IMG
|
||||
file format: IMGFMT
|
||||
virtual size: 32M (33554432 bytes)
|
||||
cluster_size: 512
|
||||
backing file: TEST_DIR/t.IMGFMT.base
|
||||
backing file: TEST_IMG.base
|
||||
backing file format: IMGFMT
|
||||
Format specific information:
|
||||
compat: 0.10
|
||||
@@ -83,16 +90,16 @@ Format specific information:
|
||||
|
||||
=== Successful image creation (encrypted) ===
|
||||
|
||||
Testing: -object secret,id=keysec0,data=foo
|
||||
QMP_VERSION
|
||||
{"return": {}}
|
||||
{"return": {}}
|
||||
{"return": {}}
|
||||
{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "SHUTDOWN", "data": {"guest": false}}
|
||||
{'execute': 'blockdev-create', 'arguments': {'job_id': 'job0', 'options': {'encrypt': {'key-secret': 'keysec0', 'iter-time': 10, 'cipher-mode': 'ctr', 'ivgen-hash-alg': 'md5', 'cipher-alg': 'twofish-128', 'format': 'luks', 'ivgen-alg': 'plain64', 'hash-alg': 'sha1'}, 'driver': 'qcow2', 'file': {'driver': 'file', 'filename': 'TEST_DIR/PID-t.qcow2'}, 'size': 33554432}}}
|
||||
{u'return': {}}
|
||||
{'execute': 'job-dismiss', 'arguments': {'id': 'job0'}}
|
||||
{u'return': {}}
|
||||
|
||||
image: TEST_DIR/t.IMGFMT
|
||||
image: TEST_IMG
|
||||
file format: IMGFMT
|
||||
virtual size: 32M (33554432 bytes)
|
||||
encrypted: yes
|
||||
cluster_size: 65536
|
||||
Format specific information:
|
||||
compat: 1.1
|
||||
lazy refcounts: false
|
||||
@@ -101,13 +108,13 @@ Format specific information:
|
||||
ivgen alg: plain64
|
||||
hash alg: sha1
|
||||
cipher alg: twofish-128
|
||||
uuid: 00000000-0000-0000-0000-000000000000
|
||||
uuid: XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX
|
||||
format: luks
|
||||
cipher mode: ctr
|
||||
slots:
|
||||
[0]:
|
||||
active: true
|
||||
iters: 1024
|
||||
iters: XXX
|
||||
key offset: 4096
|
||||
stripes: 4000
|
||||
[1]:
|
||||
@@ -132,78 +139,118 @@ Format specific information:
|
||||
active: false
|
||||
key offset: 462848
|
||||
payload offset: 528384
|
||||
master key iters: 1024
|
||||
master key iters: XXX
|
||||
corrupt: false
|
||||
|
||||
=== Invalid BlockdevRef ===
|
||||
|
||||
Testing:
|
||||
QMP_VERSION
|
||||
{"return": {}}
|
||||
{"error": {"class": "GenericError", "desc": "Cannot find device=this doesn't exist nor node_name=this doesn't exist"}}
|
||||
{"return": {}}
|
||||
{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "SHUTDOWN", "data": {"guest": false}}
|
||||
|
||||
{'execute': 'blockdev-create', 'arguments': {'job_id': 'job0', 'options': {'driver': 'qcow2', 'file': "this doesn't exist", 'size': 33554432}}}
|
||||
{u'return': {}}
|
||||
Job failed: Cannot find device=this doesn't exist nor node_name=this doesn't exist
|
||||
{'execute': 'job-dismiss', 'arguments': {'id': 'job0'}}
|
||||
{u'return': {}}
|
||||
|
||||
=== Invalid sizes ===
|
||||
{'execute': 'blockdev-create', 'arguments': {'job_id': 'job0', 'options': {'driver': 'qcow2', 'file': 'node0', 'size': 1234}}}
|
||||
{u'return': {}}
|
||||
Job failed: Image size must be a multiple of 512 bytes
|
||||
{'execute': 'job-dismiss', 'arguments': {'id': 'job0'}}
|
||||
{u'return': {}}
|
||||
|
||||
Testing: -blockdev driver=file,filename=TEST_DIR/t.IMGFMT,node-name=node0
|
||||
QMP_VERSION
|
||||
{"return": {}}
|
||||
{"error": {"class": "GenericError", "desc": "Image size must be a multiple of 512 bytes"}}
|
||||
{"error": {"class": "GenericError", "desc": "Could not resize image: Image size cannot be negative"}}
|
||||
{"error": {"class": "GenericError", "desc": "Could not resize image: Image size cannot be negative"}}
|
||||
{"error": {"class": "GenericError", "desc": "Could not resize image: Failed to grow the L1 table: File too large"}}
|
||||
{"return": {}}
|
||||
{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "SHUTDOWN", "data": {"guest": false}}
|
||||
{'execute': 'blockdev-create', 'arguments': {'job_id': 'job0', 'options': {'driver': 'qcow2', 'file': 'node0', 'size': 18446744073709551104L}}}
|
||||
{u'return': {}}
|
||||
Job failed: Could not resize image: Image size cannot be negative
|
||||
{'execute': 'job-dismiss', 'arguments': {'id': 'job0'}}
|
||||
{u'return': {}}
|
||||
|
||||
{'execute': 'blockdev-create', 'arguments': {'job_id': 'job0', 'options': {'driver': 'qcow2', 'file': 'node0', 'size': 9223372036854775808L}}}
|
||||
{u'return': {}}
|
||||
Job failed: Could not resize image: Image size cannot be negative
|
||||
{'execute': 'job-dismiss', 'arguments': {'id': 'job0'}}
|
||||
{u'return': {}}
|
||||
|
||||
{'execute': 'blockdev-create', 'arguments': {'job_id': 'job0', 'options': {'driver': 'qcow2', 'file': 'node0', 'size': 9223372036854775296}}}
|
||||
{u'return': {}}
|
||||
Job failed: Could not resize image: Failed to grow the L1 table: File too large
|
||||
{'execute': 'job-dismiss', 'arguments': {'id': 'job0'}}
|
||||
{u'return': {}}
|
||||
|
||||
=== Invalid version ===
|
||||
{'execute': 'blockdev-create', 'arguments': {'job_id': 'job0', 'options': {'version': 'v1', 'driver': 'qcow2', 'file': 'node0', 'size': 67108864}}}
|
||||
{u'error': {u'class': u'GenericError', u'desc': u"Invalid parameter 'v1'"}}
|
||||
|
||||
Testing: -blockdev driver=file,filename=TEST_DIR/t.IMGFMT,node-name=node0
|
||||
QMP_VERSION
|
||||
{"return": {}}
|
||||
{"error": {"class": "GenericError", "desc": "Invalid parameter 'v1'"}}
|
||||
{"error": {"class": "GenericError", "desc": "Lazy refcounts only supported with compatibility level 1.1 and above (use version=v3 or greater)"}}
|
||||
{"error": {"class": "GenericError", "desc": "Different refcount widths than 16 bits require compatibility level 1.1 or above (use version=v3 or greater)"}}
|
||||
{"return": {}}
|
||||
{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "SHUTDOWN", "data": {"guest": false}}
|
||||
{'execute': 'blockdev-create', 'arguments': {'job_id': 'job0', 'options': {'lazy-refcounts': True, 'version': 'v2', 'driver': 'qcow2', 'file': 'node0', 'size': 67108864}}}
|
||||
{u'return': {}}
|
||||
Job failed: Lazy refcounts only supported with compatibility level 1.1 and above (use version=v3 or greater)
|
||||
{'execute': 'job-dismiss', 'arguments': {'id': 'job0'}}
|
||||
{u'return': {}}
|
||||
|
||||
{'execute': 'blockdev-create', 'arguments': {'job_id': 'job0', 'options': {'refcount-bits': 8, 'version': 'v2', 'driver': 'qcow2', 'file': 'node0', 'size': 67108864}}}
|
||||
{u'return': {}}
|
||||
Job failed: Different refcount widths than 16 bits require compatibility level 1.1 or above (use version=v3 or greater)
|
||||
{'execute': 'job-dismiss', 'arguments': {'id': 'job0'}}
|
||||
{u'return': {}}
|
||||
|
||||
=== Invalid backing file options ===
|
||||
{'execute': 'blockdev-create', 'arguments': {'job_id': 'job0', 'options': {'preallocation': 'full', 'driver': 'qcow2', 'backing-file': '/dev/null', 'file': 'node0', 'size': 67108864}}}
|
||||
{u'return': {}}
|
||||
Job failed: Backing file and preallocation cannot be used at the same time
|
||||
{'execute': 'job-dismiss', 'arguments': {'id': 'job0'}}
|
||||
{u'return': {}}
|
||||
|
||||
Testing: -blockdev driver=file,filename=TEST_DIR/t.IMGFMT,node-name=node0
|
||||
QMP_VERSION
|
||||
{"return": {}}
|
||||
{"error": {"class": "GenericError", "desc": "Backing file and preallocation cannot be used at the same time"}}
|
||||
{"error": {"class": "GenericError", "desc": "Backing format cannot be used without backing file"}}
|
||||
{"return": {}}
|
||||
{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "SHUTDOWN", "data": {"guest": false}}
|
||||
|
||||
{'execute': 'blockdev-create', 'arguments': {'job_id': 'job0', 'options': {'backing-fmt': 'qcow2', 'driver': 'qcow2', 'file': 'node0', 'size': 67108864}}}
|
||||
{u'return': {}}
|
||||
Job failed: Backing format cannot be used without backing file
|
||||
{'execute': 'job-dismiss', 'arguments': {'id': 'job0'}}
|
||||
{u'return': {}}
|
||||
|
||||
=== Invalid cluster size ===
|
||||
{'execute': 'blockdev-create', 'arguments': {'job_id': 'job0', 'options': {'cluster-size': 1234, 'driver': 'qcow2', 'file': 'node0', 'size': 67108864}}}
|
||||
{u'return': {}}
|
||||
Job failed: Cluster size must be a power of two between 512 and 2048k
|
||||
{'execute': 'job-dismiss', 'arguments': {'id': 'job0'}}
|
||||
{u'return': {}}
|
||||
|
||||
Testing: -blockdev driver=file,filename=TEST_DIR/t.IMGFMT,node-name=node0
|
||||
QMP_VERSION
|
||||
{"return": {}}
|
||||
{"error": {"class": "GenericError", "desc": "Cluster size must be a power of two between 512 and 2048k"}}
|
||||
{"error": {"class": "GenericError", "desc": "Cluster size must be a power of two between 512 and 2048k"}}
|
||||
{"error": {"class": "GenericError", "desc": "Cluster size must be a power of two between 512 and 2048k"}}
|
||||
{"error": {"class": "GenericError", "desc": "Cluster size must be a power of two between 512 and 2048k"}}
|
||||
{"error": {"class": "GenericError", "desc": "Could not resize image: Failed to grow the L1 table: File too large"}}
|
||||
{"return": {}}
|
||||
{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "SHUTDOWN", "data": {"guest": false}}
|
||||
{'execute': 'blockdev-create', 'arguments': {'job_id': 'job0', 'options': {'cluster-size': 128, 'driver': 'qcow2', 'file': 'node0', 'size': 67108864}}}
|
||||
{u'return': {}}
|
||||
Job failed: Cluster size must be a power of two between 512 and 2048k
|
||||
{'execute': 'job-dismiss', 'arguments': {'id': 'job0'}}
|
||||
{u'return': {}}
|
||||
|
||||
{'execute': 'blockdev-create', 'arguments': {'job_id': 'job0', 'options': {'cluster-size': 4194304, 'driver': 'qcow2', 'file': 'node0', 'size': 67108864}}}
|
||||
{u'return': {}}
|
||||
Job failed: Cluster size must be a power of two between 512 and 2048k
|
||||
{'execute': 'job-dismiss', 'arguments': {'id': 'job0'}}
|
||||
{u'return': {}}
|
||||
|
||||
{'execute': 'blockdev-create', 'arguments': {'job_id': 'job0', 'options': {'cluster-size': 0, 'driver': 'qcow2', 'file': 'node0', 'size': 67108864}}}
|
||||
{u'return': {}}
|
||||
Job failed: Cluster size must be a power of two between 512 and 2048k
|
||||
{'execute': 'job-dismiss', 'arguments': {'id': 'job0'}}
|
||||
{u'return': {}}
|
||||
|
||||
{'execute': 'blockdev-create', 'arguments': {'job_id': 'job0', 'options': {'cluster-size': 512, 'driver': 'qcow2', 'file': 'node0', 'size': 281474976710656}}}
|
||||
{u'return': {}}
|
||||
Job failed: Could not resize image: Failed to grow the L1 table: File too large
|
||||
{'execute': 'job-dismiss', 'arguments': {'id': 'job0'}}
|
||||
{u'return': {}}
|
||||
|
||||
=== Invalid refcount width ===
|
||||
{'execute': 'blockdev-create', 'arguments': {'job_id': 'job0', 'options': {'refcount-bits': 128, 'driver': 'qcow2', 'file': 'node0', 'size': 67108864}}}
|
||||
{u'return': {}}
|
||||
Job failed: Refcount width must be a power of two and may not exceed 64 bits
|
||||
{'execute': 'job-dismiss', 'arguments': {'id': 'job0'}}
|
||||
{u'return': {}}
|
||||
|
||||
Testing: -blockdev driver=file,filename=TEST_DIR/t.IMGFMT,node-name=node0
|
||||
QMP_VERSION
|
||||
{"return": {}}
|
||||
{"error": {"class": "GenericError", "desc": "Refcount width must be a power of two and may not exceed 64 bits"}}
|
||||
{"error": {"class": "GenericError", "desc": "Refcount width must be a power of two and may not exceed 64 bits"}}
|
||||
{"error": {"class": "GenericError", "desc": "Refcount width must be a power of two and may not exceed 64 bits"}}
|
||||
{"return": {}}
|
||||
{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "SHUTDOWN", "data": {"guest": false}}
|
||||
{'execute': 'blockdev-create', 'arguments': {'job_id': 'job0', 'options': {'refcount-bits': 0, 'driver': 'qcow2', 'file': 'node0', 'size': 67108864}}}
|
||||
{u'return': {}}
|
||||
Job failed: Refcount width must be a power of two and may not exceed 64 bits
|
||||
{'execute': 'job-dismiss', 'arguments': {'id': 'job0'}}
|
||||
{u'return': {}}
|
||||
|
||||
{'execute': 'blockdev-create', 'arguments': {'job_id': 'job0', 'options': {'refcount-bits': 7, 'driver': 'qcow2', 'file': 'node0', 'size': 67108864}}}
|
||||
{u'return': {}}
|
||||
Job failed: Refcount width must be a power of two and may not exceed 64 bits
|
||||
{'execute': 'job-dismiss', 'arguments': {'id': 'job0'}}
|
||||
{u'return': {}}
|
||||
|
||||
*** done
|
||||
|
||||
+176
-220
@@ -1,9 +1,11 @@
|
||||
#!/bin/bash
|
||||
#!/usr/bin/env python
|
||||
#
|
||||
# Test ssh image creation
|
||||
#
|
||||
# Copyright (C) 2018 Red Hat, Inc.
|
||||
#
|
||||
# Creator/Owner: Kevin Wolf <kwolf@redhat.com>
|
||||
#
|
||||
# This program is free software; you can redistribute it and/or modify
|
||||
# it under the terms of the GNU General Public License as published by
|
||||
# the Free Software Foundation; either version 2 of the License, or
|
||||
@@ -18,244 +20,198 @@
|
||||
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
#
|
||||
|
||||
# creator
|
||||
owner=kwolf@redhat.com
|
||||
import iotests
|
||||
import subprocess
|
||||
import re
|
||||
|
||||
seq=`basename $0`
|
||||
echo "QA output created by $seq"
|
||||
iotests.verify_image_format(supported_fmts=['raw'])
|
||||
iotests.verify_protocol(supported=['ssh'])
|
||||
|
||||
here=`pwd`
|
||||
status=1 # failure is the default!
|
||||
def filter_hash(msg):
|
||||
return re.sub("'hash': '[0-9a-f]+'", "'hash': HASH", msg)
|
||||
|
||||
# get standard environment, filters and checks
|
||||
. ./common.rc
|
||||
. ./common.filter
|
||||
def blockdev_create(vm, options):
|
||||
result = vm.qmp_log('blockdev-create', job_id='job0', options=options,
|
||||
filters=[iotests.filter_testfiles, filter_hash])
|
||||
|
||||
_supported_fmt raw
|
||||
_supported_proto ssh
|
||||
_supported_os Linux
|
||||
if 'return' in result:
|
||||
assert result['return'] == {}
|
||||
vm.run_job('job0')
|
||||
iotests.log("")
|
||||
|
||||
function do_run_qemu()
|
||||
{
|
||||
echo Testing: "$@"
|
||||
$QEMU -nographic -qmp stdio -serial none "$@"
|
||||
echo
|
||||
}
|
||||
with iotests.FilePath('t.img') as disk_path, \
|
||||
iotests.VM() as vm:
|
||||
|
||||
function run_qemu()
|
||||
{
|
||||
do_run_qemu "$@" 2>&1 | _filter_testdir | _filter_qmp \
|
||||
| _filter_qemu | _filter_imgfmt \
|
||||
| _filter_actual_image_size
|
||||
}
|
||||
remote_path = iotests.remote_filename(disk_path)
|
||||
|
||||
echo
|
||||
echo "=== Successful image creation (defaults) ==="
|
||||
echo
|
||||
#
|
||||
# Successful image creation (defaults)
|
||||
#
|
||||
iotests.log("=== Successful image creation (defaults) ===")
|
||||
iotests.log("")
|
||||
|
||||
run_qemu <<EOF
|
||||
{ "execute": "qmp_capabilities" }
|
||||
{ "execute": "x-blockdev-create",
|
||||
"arguments": {
|
||||
"driver": "ssh",
|
||||
"location": {
|
||||
"path": "$TEST_IMG_FILE",
|
||||
"server": {
|
||||
"host": "127.0.0.1",
|
||||
"port": "22"
|
||||
}
|
||||
},
|
||||
"size": 4194304
|
||||
}
|
||||
}
|
||||
{ "execute": "quit" }
|
||||
EOF
|
||||
vm.launch()
|
||||
blockdev_create(vm, { 'driver': 'ssh',
|
||||
'location': {
|
||||
'path': disk_path,
|
||||
'server': {
|
||||
'host': '127.0.0.1',
|
||||
'port': '22'
|
||||
}
|
||||
},
|
||||
'size': 4194304 })
|
||||
vm.shutdown()
|
||||
|
||||
_img_info | _filter_img_info
|
||||
echo
|
||||
TEST_IMG=$TEST_IMG_FILE _img_info | _filter_img_info
|
||||
iotests.img_info_log(remote_path, filter_path=disk_path)
|
||||
iotests.log("")
|
||||
iotests.img_info_log(disk_path)
|
||||
|
||||
echo
|
||||
echo "=== Test host-key-check options ==="
|
||||
echo
|
||||
#
|
||||
# Test host-key-check options
|
||||
#
|
||||
iotests.log("=== Test host-key-check options ===")
|
||||
iotests.log("")
|
||||
|
||||
run_qemu <<EOF
|
||||
{ "execute": "qmp_capabilities" }
|
||||
{ "execute": "x-blockdev-create",
|
||||
"arguments": {
|
||||
"driver": "ssh",
|
||||
"location": {
|
||||
"path": "$TEST_IMG_FILE",
|
||||
"server": {
|
||||
"host": "127.0.0.1",
|
||||
"port": "22"
|
||||
},
|
||||
"host-key-check": {
|
||||
"mode": "none"
|
||||
}
|
||||
},
|
||||
"size": 8388608
|
||||
}
|
||||
}
|
||||
{ "execute": "quit" }
|
||||
EOF
|
||||
vm.launch()
|
||||
blockdev_create(vm, { 'driver': 'ssh',
|
||||
'location': {
|
||||
'path': disk_path,
|
||||
'server': {
|
||||
'host': '127.0.0.1',
|
||||
'port': '22'
|
||||
},
|
||||
'host-key-check': {
|
||||
'mode': 'none'
|
||||
}
|
||||
},
|
||||
'size': 8388608 })
|
||||
vm.shutdown()
|
||||
|
||||
_img_info | _filter_img_info
|
||||
iotests.img_info_log(remote_path, filter_path=disk_path)
|
||||
|
||||
run_qemu <<EOF
|
||||
{ "execute": "qmp_capabilities" }
|
||||
{ "execute": "x-blockdev-create",
|
||||
"arguments": {
|
||||
"driver": "ssh",
|
||||
"location": {
|
||||
"path": "$TEST_IMG_FILE",
|
||||
"server": {
|
||||
"host": "127.0.0.1",
|
||||
"port": "22"
|
||||
},
|
||||
"host-key-check": {
|
||||
"mode": "known_hosts"
|
||||
}
|
||||
},
|
||||
"size": 4194304
|
||||
}
|
||||
}
|
||||
{ "execute": "quit" }
|
||||
EOF
|
||||
vm.launch()
|
||||
blockdev_create(vm, { 'driver': 'ssh',
|
||||
'location': {
|
||||
'path': disk_path,
|
||||
'server': {
|
||||
'host': '127.0.0.1',
|
||||
'port': '22'
|
||||
},
|
||||
'host-key-check': {
|
||||
'mode': 'known_hosts'
|
||||
}
|
||||
},
|
||||
'size': 4194304 })
|
||||
vm.shutdown()
|
||||
|
||||
_img_info | _filter_img_info
|
||||
iotests.img_info_log(remote_path, filter_path=disk_path)
|
||||
|
||||
md5_key = subprocess.check_output(
|
||||
'ssh-keyscan -t rsa 127.0.0.1 2>/dev/null | grep -v "\\^#" | ' +
|
||||
'cut -d" " -f3 | base64 -d | md5sum -b | cut -d" " -f1',
|
||||
shell=True).rstrip()
|
||||
|
||||
key=$(ssh-keyscan -t rsa 127.0.0.1 2>/dev/null | grep -v "\\^#" |
|
||||
cut -d" " -f3 | base64 -d | md5sum -b | cut -d" " -f1)
|
||||
vm.launch()
|
||||
blockdev_create(vm, { 'driver': 'ssh',
|
||||
'location': {
|
||||
'path': disk_path,
|
||||
'server': {
|
||||
'host': '127.0.0.1',
|
||||
'port': '22'
|
||||
},
|
||||
'host-key-check': {
|
||||
'mode': 'hash',
|
||||
'type': 'md5',
|
||||
'hash': 'wrong',
|
||||
}
|
||||
},
|
||||
'size': 2097152 })
|
||||
blockdev_create(vm, { 'driver': 'ssh',
|
||||
'location': {
|
||||
'path': disk_path,
|
||||
'server': {
|
||||
'host': '127.0.0.1',
|
||||
'port': '22'
|
||||
},
|
||||
'host-key-check': {
|
||||
'mode': 'hash',
|
||||
'type': 'md5',
|
||||
'hash': md5_key,
|
||||
}
|
||||
},
|
||||
'size': 8388608 })
|
||||
vm.shutdown()
|
||||
|
||||
run_qemu <<EOF
|
||||
{ "execute": "qmp_capabilities" }
|
||||
{ "execute": "x-blockdev-create",
|
||||
"arguments": {
|
||||
"driver": "ssh",
|
||||
"location": {
|
||||
"path": "$TEST_IMG_FILE",
|
||||
"server": {
|
||||
"host": "127.0.0.1",
|
||||
"port": "22"
|
||||
},
|
||||
"host-key-check": {
|
||||
"mode": "hash",
|
||||
"type": "md5",
|
||||
"hash": "wrong"
|
||||
}
|
||||
},
|
||||
"size": 8388608
|
||||
}
|
||||
}
|
||||
{ "execute": "x-blockdev-create",
|
||||
"arguments": {
|
||||
"driver": "ssh",
|
||||
"location": {
|
||||
"path": "$TEST_IMG_FILE",
|
||||
"server": {
|
||||
"host": "127.0.0.1",
|
||||
"port": "22"
|
||||
},
|
||||
"host-key-check": {
|
||||
"mode": "hash",
|
||||
"type": "md5",
|
||||
"hash": "$key"
|
||||
}
|
||||
},
|
||||
"size": 8388608
|
||||
}
|
||||
}
|
||||
{ "execute": "quit" }
|
||||
EOF
|
||||
iotests.img_info_log(remote_path, filter_path=disk_path)
|
||||
|
||||
_img_info | _filter_img_info
|
||||
sha1_key = subprocess.check_output(
|
||||
'ssh-keyscan -t rsa 127.0.0.1 2>/dev/null | grep -v "\\^#" | ' +
|
||||
'cut -d" " -f3 | base64 -d | sha1sum -b | cut -d" " -f1',
|
||||
shell=True).rstrip()
|
||||
|
||||
vm.launch()
|
||||
blockdev_create(vm, { 'driver': 'ssh',
|
||||
'location': {
|
||||
'path': disk_path,
|
||||
'server': {
|
||||
'host': '127.0.0.1',
|
||||
'port': '22'
|
||||
},
|
||||
'host-key-check': {
|
||||
'mode': 'hash',
|
||||
'type': 'sha1',
|
||||
'hash': 'wrong',
|
||||
}
|
||||
},
|
||||
'size': 2097152 })
|
||||
blockdev_create(vm, { 'driver': 'ssh',
|
||||
'location': {
|
||||
'path': disk_path,
|
||||
'server': {
|
||||
'host': '127.0.0.1',
|
||||
'port': '22'
|
||||
},
|
||||
'host-key-check': {
|
||||
'mode': 'hash',
|
||||
'type': 'sha1',
|
||||
'hash': sha1_key,
|
||||
}
|
||||
},
|
||||
'size': 4194304 })
|
||||
vm.shutdown()
|
||||
|
||||
key=$(ssh-keyscan -t rsa 127.0.0.1 2>/dev/null | grep -v "\\^#" |
|
||||
cut -d" " -f3 | base64 -d | sha1sum -b | cut -d" " -f1)
|
||||
iotests.img_info_log(remote_path, filter_path=disk_path)
|
||||
|
||||
run_qemu <<EOF
|
||||
{ "execute": "qmp_capabilities" }
|
||||
{ "execute": "x-blockdev-create",
|
||||
"arguments": {
|
||||
"driver": "ssh",
|
||||
"location": {
|
||||
"path": "$TEST_IMG_FILE",
|
||||
"server": {
|
||||
"host": "127.0.0.1",
|
||||
"port": "22"
|
||||
},
|
||||
"host-key-check": {
|
||||
"mode": "hash",
|
||||
"type": "sha1",
|
||||
"hash": "wrong"
|
||||
}
|
||||
},
|
||||
"size": 4194304
|
||||
}
|
||||
}
|
||||
{ "execute": "x-blockdev-create",
|
||||
"arguments": {
|
||||
"driver": "ssh",
|
||||
"location": {
|
||||
"path": "$TEST_IMG_FILE",
|
||||
"server": {
|
||||
"host": "127.0.0.1",
|
||||
"port": "22"
|
||||
},
|
||||
"host-key-check": {
|
||||
"mode": "hash",
|
||||
"type": "sha1",
|
||||
"hash": "$key"
|
||||
}
|
||||
},
|
||||
"size": 4194304
|
||||
}
|
||||
}
|
||||
{ "execute": "quit" }
|
||||
EOF
|
||||
#
|
||||
# Invalid path and user
|
||||
#
|
||||
iotests.log("=== Invalid path and user ===")
|
||||
iotests.log("")
|
||||
|
||||
_img_info | _filter_img_info
|
||||
|
||||
echo
|
||||
echo "=== Invalid path and user ==="
|
||||
echo
|
||||
|
||||
run_qemu <<EOF
|
||||
{ "execute": "qmp_capabilities" }
|
||||
{ "execute": "x-blockdev-create",
|
||||
"arguments": {
|
||||
"driver": "ssh",
|
||||
"location": {
|
||||
"path": "/this/is/not/an/existing/path",
|
||||
"server": {
|
||||
"host": "127.0.0.1",
|
||||
"port": "22"
|
||||
}
|
||||
},
|
||||
"size": 4194304
|
||||
}
|
||||
}
|
||||
{ "execute": "x-blockdev-create",
|
||||
"arguments": {
|
||||
"driver": "ssh",
|
||||
"location": {
|
||||
"path": "$TEST_IMG_FILE",
|
||||
"user": "invalid user",
|
||||
"server": {
|
||||
"host": "127.0.0.1",
|
||||
"port": "22"
|
||||
}
|
||||
},
|
||||
"size": 4194304
|
||||
}
|
||||
}
|
||||
{ "execute": "quit" }
|
||||
EOF
|
||||
|
||||
# success, all done
|
||||
echo "*** done"
|
||||
rm -f $seq.full
|
||||
status=0
|
||||
vm.launch()
|
||||
blockdev_create(vm, { 'driver': 'ssh',
|
||||
'location': {
|
||||
'path': '/this/is/not/an/existing/path',
|
||||
'server': {
|
||||
'host': '127.0.0.1',
|
||||
'port': '22'
|
||||
},
|
||||
'host-key-check': {
|
||||
'mode': 'none'
|
||||
}
|
||||
},
|
||||
'size': 4194304 })
|
||||
blockdev_create(vm, { 'driver': 'ssh',
|
||||
'location': {
|
||||
'path': disk_path,
|
||||
'user': 'invalid user',
|
||||
'server': {
|
||||
'host': '127.0.0.1',
|
||||
'port': '22'
|
||||
},
|
||||
'host-key-check': {
|
||||
'mode': 'none'
|
||||
}
|
||||
},
|
||||
'size': 4194304 })
|
||||
vm.shutdown()
|
||||
|
||||
+53
-48
@@ -1,75 +1,80 @@
|
||||
QA output created by 207
|
||||
|
||||
=== Successful image creation (defaults) ===
|
||||
|
||||
Testing:
|
||||
QMP_VERSION
|
||||
{"return": {}}
|
||||
{"return": {}}
|
||||
{"return": {}}
|
||||
{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "SHUTDOWN", "data": {"guest": false}}
|
||||
{'execute': 'blockdev-create', 'arguments': {'job_id': 'job0', 'options': {'driver': 'ssh', 'location': {'path': 'TEST_DIR/PID-t.img', 'server': {'host': '127.0.0.1', 'port': '22'}}, 'size': 4194304}}}
|
||||
{u'return': {}}
|
||||
{'execute': 'job-dismiss', 'arguments': {'id': 'job0'}}
|
||||
{u'return': {}}
|
||||
|
||||
image: json:{"driver": "IMGFMT", "file": {"server.host": "127.0.0.1", "server.port": "22", "driver": "ssh", "path": "TEST_DIR/t.IMGFMT"}}
|
||||
image: json:{"driver": "IMGFMT", "file": {"server.host": "127.0.0.1", "server.port": "22", "driver": "ssh", "path": "TEST_IMG"}}
|
||||
file format: IMGFMT
|
||||
virtual size: 4.0M (4194304 bytes)
|
||||
|
||||
image: TEST_DIR/t.IMGFMT
|
||||
|
||||
image: TEST_IMG
|
||||
file format: IMGFMT
|
||||
virtual size: 4.0M (4194304 bytes)
|
||||
|
||||
=== Test host-key-check options ===
|
||||
|
||||
Testing:
|
||||
QMP_VERSION
|
||||
{"return": {}}
|
||||
{"return": {}}
|
||||
{"return": {}}
|
||||
{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "SHUTDOWN", "data": {"guest": false}}
|
||||
{'execute': 'blockdev-create', 'arguments': {'job_id': 'job0', 'options': {'driver': 'ssh', 'location': {'path': 'TEST_DIR/PID-t.img', 'host-key-check': {'mode': 'none'}, 'server': {'host': '127.0.0.1', 'port': '22'}}, 'size': 8388608}}}
|
||||
{u'return': {}}
|
||||
{'execute': 'job-dismiss', 'arguments': {'id': 'job0'}}
|
||||
{u'return': {}}
|
||||
|
||||
image: json:{"driver": "IMGFMT", "file": {"server.host": "127.0.0.1", "server.port": "22", "driver": "ssh", "path": "TEST_DIR/t.IMGFMT"}}
|
||||
image: json:{"driver": "IMGFMT", "file": {"server.host": "127.0.0.1", "server.port": "22", "driver": "ssh", "path": "TEST_IMG"}}
|
||||
file format: IMGFMT
|
||||
virtual size: 8.0M (8388608 bytes)
|
||||
Testing:
|
||||
QMP_VERSION
|
||||
{"return": {}}
|
||||
{"return": {}}
|
||||
{"return": {}}
|
||||
{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "SHUTDOWN", "data": {"guest": false}}
|
||||
|
||||
image: json:{"driver": "IMGFMT", "file": {"server.host": "127.0.0.1", "server.port": "22", "driver": "ssh", "path": "TEST_DIR/t.IMGFMT"}}
|
||||
{'execute': 'blockdev-create', 'arguments': {'job_id': 'job0', 'options': {'driver': 'ssh', 'location': {'path': 'TEST_DIR/PID-t.img', 'host-key-check': {'mode': 'known_hosts'}, 'server': {'host': '127.0.0.1', 'port': '22'}}, 'size': 4194304}}}
|
||||
{u'return': {}}
|
||||
{'execute': 'job-dismiss', 'arguments': {'id': 'job0'}}
|
||||
{u'return': {}}
|
||||
|
||||
image: json:{"driver": "IMGFMT", "file": {"server.host": "127.0.0.1", "server.port": "22", "driver": "ssh", "path": "TEST_IMG"}}
|
||||
file format: IMGFMT
|
||||
virtual size: 4.0M (4194304 bytes)
|
||||
Testing:
|
||||
QMP_VERSION
|
||||
{"return": {}}
|
||||
{"error": {"class": "GenericError", "desc": "remote host key does not match host_key_check 'wrong'"}}
|
||||
{"return": {}}
|
||||
{"return": {}}
|
||||
{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "SHUTDOWN", "data": {"guest": false}}
|
||||
|
||||
image: json:{"driver": "IMGFMT", "file": {"server.host": "127.0.0.1", "server.port": "22", "driver": "ssh", "path": "TEST_DIR/t.IMGFMT"}}
|
||||
{'execute': 'blockdev-create', 'arguments': {'job_id': 'job0', 'options': {'driver': 'ssh', 'location': {'path': 'TEST_DIR/PID-t.img', 'host-key-check': {'hash': 'wrong', 'type': 'md5', 'mode': 'hash'}, 'server': {'host': '127.0.0.1', 'port': '22'}}, 'size': 2097152}}}
|
||||
{u'return': {}}
|
||||
Job failed: remote host key does not match host_key_check 'wrong'
|
||||
{'execute': 'job-dismiss', 'arguments': {'id': 'job0'}}
|
||||
{u'return': {}}
|
||||
|
||||
{'execute': 'blockdev-create', 'arguments': {'job_id': 'job0', 'options': {'driver': 'ssh', 'location': {'path': 'TEST_DIR/PID-t.img', 'host-key-check': {'hash': HASH, 'type': 'md5', 'mode': 'hash'}, 'server': {'host': '127.0.0.1', 'port': '22'}}, 'size': 8388608}}}
|
||||
{u'return': {}}
|
||||
{'execute': 'job-dismiss', 'arguments': {'id': 'job0'}}
|
||||
{u'return': {}}
|
||||
|
||||
image: json:{"driver": "IMGFMT", "file": {"server.host": "127.0.0.1", "server.port": "22", "driver": "ssh", "path": "TEST_IMG"}}
|
||||
file format: IMGFMT
|
||||
virtual size: 8.0M (8388608 bytes)
|
||||
Testing:
|
||||
QMP_VERSION
|
||||
{"return": {}}
|
||||
{"error": {"class": "GenericError", "desc": "remote host key does not match host_key_check 'wrong'"}}
|
||||
{"return": {}}
|
||||
{"return": {}}
|
||||
{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "SHUTDOWN", "data": {"guest": false}}
|
||||
|
||||
image: json:{"driver": "IMGFMT", "file": {"server.host": "127.0.0.1", "server.port": "22", "driver": "ssh", "path": "TEST_DIR/t.IMGFMT"}}
|
||||
{'execute': 'blockdev-create', 'arguments': {'job_id': 'job0', 'options': {'driver': 'ssh', 'location': {'path': 'TEST_DIR/PID-t.img', 'host-key-check': {'hash': 'wrong', 'type': 'sha1', 'mode': 'hash'}, 'server': {'host': '127.0.0.1', 'port': '22'}}, 'size': 2097152}}}
|
||||
{u'return': {}}
|
||||
Job failed: remote host key does not match host_key_check 'wrong'
|
||||
{'execute': 'job-dismiss', 'arguments': {'id': 'job0'}}
|
||||
{u'return': {}}
|
||||
|
||||
{'execute': 'blockdev-create', 'arguments': {'job_id': 'job0', 'options': {'driver': 'ssh', 'location': {'path': 'TEST_DIR/PID-t.img', 'host-key-check': {'hash': HASH, 'type': 'sha1', 'mode': 'hash'}, 'server': {'host': '127.0.0.1', 'port': '22'}}, 'size': 4194304}}}
|
||||
{u'return': {}}
|
||||
{'execute': 'job-dismiss', 'arguments': {'id': 'job0'}}
|
||||
{u'return': {}}
|
||||
|
||||
image: json:{"driver": "IMGFMT", "file": {"server.host": "127.0.0.1", "server.port": "22", "driver": "ssh", "path": "TEST_IMG"}}
|
||||
file format: IMGFMT
|
||||
virtual size: 4.0M (4194304 bytes)
|
||||
|
||||
=== Invalid path and user ===
|
||||
|
||||
Testing:
|
||||
QMP_VERSION
|
||||
{"return": {}}
|
||||
{"error": {"class": "GenericError", "desc": "failed to open remote file '/this/is/not/an/existing/path': Failed opening remote file (libssh2 error code: -31)"}}
|
||||
{"error": {"class": "GenericError", "desc": "failed to authenticate using publickey authentication and the identities held by your ssh-agent"}}
|
||||
{"return": {}}
|
||||
{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "SHUTDOWN", "data": {"guest": false}}
|
||||
{'execute': 'blockdev-create', 'arguments': {'job_id': 'job0', 'options': {'driver': 'ssh', 'location': {'path': '/this/is/not/an/existing/path', 'host-key-check': {'mode': 'none'}, 'server': {'host': '127.0.0.1', 'port': '22'}}, 'size': 4194304}}}
|
||||
{u'return': {}}
|
||||
Job failed: failed to open remote file '/this/is/not/an/existing/path': Failed opening remote file (libssh2 error code: -31)
|
||||
{'execute': 'job-dismiss', 'arguments': {'id': 'job0'}}
|
||||
{u'return': {}}
|
||||
|
||||
{'execute': 'blockdev-create', 'arguments': {'job_id': 'job0', 'options': {'driver': 'ssh', 'location': {'path': 'TEST_DIR/PID-t.img', 'host-key-check': {'mode': 'none'}, 'user': 'invalid user', 'server': {'host': '127.0.0.1', 'port': '22'}}, 'size': 4194304}}}
|
||||
{u'return': {}}
|
||||
Job failed: failed to authenticate using publickey authentication and the identities held by your ssh-agent
|
||||
{'execute': 'job-dismiss', 'arguments': {'id': 'job0'}}
|
||||
{u'return': {}}
|
||||
|
||||
*** done
|
||||
|
||||
+137
-200
@@ -1,9 +1,11 @@
|
||||
#!/bin/bash
|
||||
#!/usr/bin/env python
|
||||
#
|
||||
# Test luks and file image creation
|
||||
#
|
||||
# Copyright (C) 2018 Red Hat, Inc.
|
||||
#
|
||||
# Creator/Owner: Kevin Wolf <kwolf@redhat.com>
|
||||
#
|
||||
# This program is free software; you can redistribute it and/or modify
|
||||
# it under the terms of the GNU General Public License as published by
|
||||
# the Free Software Foundation; either version 2 of the License, or
|
||||
@@ -18,230 +20,165 @@
|
||||
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
#
|
||||
|
||||
# creator
|
||||
owner=kwolf@redhat.com
|
||||
import iotests
|
||||
from iotests import imgfmt
|
||||
|
||||
seq=`basename $0`
|
||||
echo "QA output created by $seq"
|
||||
iotests.verify_image_format(supported_fmts=['luks'])
|
||||
iotests.verify_protocol(supported=['file'])
|
||||
|
||||
here=`pwd`
|
||||
status=1 # failure is the default!
|
||||
def blockdev_create(vm, options):
|
||||
result = vm.qmp_log('blockdev-create', job_id='job0', options=options)
|
||||
|
||||
# get standard environment, filters and checks
|
||||
. ./common.rc
|
||||
. ./common.filter
|
||||
if 'return' in result:
|
||||
assert result['return'] == {}
|
||||
vm.run_job('job0')
|
||||
iotests.log("")
|
||||
|
||||
_supported_fmt luks
|
||||
_supported_proto file
|
||||
_supported_os Linux
|
||||
with iotests.FilePath('t.luks') as disk_path, \
|
||||
iotests.VM() as vm:
|
||||
|
||||
function do_run_qemu()
|
||||
{
|
||||
echo Testing: "$@"
|
||||
$QEMU -nographic -qmp stdio -serial none "$@"
|
||||
echo
|
||||
}
|
||||
vm.add_object('secret,id=keysec0,data=foo')
|
||||
|
||||
function run_qemu()
|
||||
{
|
||||
do_run_qemu "$@" 2>&1 | _filter_testdir | _filter_qmp \
|
||||
| _filter_qemu | _filter_imgfmt \
|
||||
| _filter_actual_image_size
|
||||
}
|
||||
#
|
||||
# Successful image creation (defaults)
|
||||
#
|
||||
iotests.log("=== Successful image creation (defaults) ===")
|
||||
iotests.log("")
|
||||
|
||||
echo
|
||||
echo "=== Successful image creation (defaults) ==="
|
||||
echo
|
||||
size = 128 * 1024 * 1024
|
||||
|
||||
size=$((128 * 1024 * 1024))
|
||||
vm.launch()
|
||||
blockdev_create(vm, { 'driver': 'file',
|
||||
'filename': disk_path,
|
||||
'size': 0 })
|
||||
|
||||
run_qemu -object secret,id=keysec0,data="foo" <<EOF
|
||||
{ "execute": "qmp_capabilities" }
|
||||
{ "execute": "x-blockdev-create",
|
||||
"arguments": {
|
||||
"driver": "file",
|
||||
"filename": "$TEST_IMG_FILE",
|
||||
"size": 0
|
||||
}
|
||||
}
|
||||
{ "execute": "blockdev-add",
|
||||
"arguments": {
|
||||
"driver": "file",
|
||||
"node-name": "imgfile",
|
||||
"filename": "$TEST_IMG_FILE"
|
||||
}
|
||||
}
|
||||
{ "execute": "x-blockdev-create",
|
||||
"arguments": {
|
||||
"driver": "$IMGFMT",
|
||||
"file": "imgfile",
|
||||
"key-secret": "keysec0",
|
||||
"size": $size,
|
||||
"iter-time": 10
|
||||
}
|
||||
}
|
||||
{ "execute": "quit" }
|
||||
EOF
|
||||
vm.qmp_log('blockdev-add', driver='file', filename=disk_path,
|
||||
node_name='imgfile')
|
||||
|
||||
_img_info --format-specific | _filter_img_info --format-specific
|
||||
blockdev_create(vm, { 'driver': imgfmt,
|
||||
'file': 'imgfile',
|
||||
'key-secret': 'keysec0',
|
||||
'size': size,
|
||||
'iter-time': 10 })
|
||||
vm.shutdown()
|
||||
|
||||
echo
|
||||
echo "=== Successful image creation (with non-default options) ==="
|
||||
echo
|
||||
# TODO Proper support for images to be used with imgopts and/or protocols
|
||||
iotests.img_info_log(
|
||||
'driver=luks,file.driver=file,file.filename=%s,key-secret=keysec0' % (disk_path),
|
||||
filter_path=disk_path,
|
||||
extra_args=['--object', 'secret,id=keysec0,data=foo'],
|
||||
imgopts=True)
|
||||
|
||||
# Choose a different size to show that we got a new image
|
||||
size=$((64 * 1024 * 1024))
|
||||
#
|
||||
# Successful image creation (with non-default options)
|
||||
#
|
||||
iotests.log("=== Successful image creation (with non-default options) ===")
|
||||
iotests.log("")
|
||||
|
||||
run_qemu -object secret,id=keysec0,data="foo" <<EOF
|
||||
{ "execute": "qmp_capabilities" }
|
||||
{ "execute": "x-blockdev-create",
|
||||
"arguments": {
|
||||
"driver": "file",
|
||||
"filename": "$TEST_IMG_FILE",
|
||||
"size": 0
|
||||
}
|
||||
}
|
||||
{ "execute": "x-blockdev-create",
|
||||
"arguments": {
|
||||
"driver": "$IMGFMT",
|
||||
"file": {
|
||||
"driver": "file",
|
||||
"filename": "$TEST_IMG_FILE"
|
||||
},
|
||||
"size": $size,
|
||||
"key-secret": "keysec0",
|
||||
"cipher-alg": "twofish-128",
|
||||
"cipher-mode": "ctr",
|
||||
"ivgen-alg": "plain64",
|
||||
"ivgen-hash-alg": "md5",
|
||||
"hash-alg": "sha1",
|
||||
"iter-time": 10
|
||||
}
|
||||
}
|
||||
{ "execute": "quit" }
|
||||
EOF
|
||||
size = 64 * 1024 * 1024
|
||||
|
||||
_img_info --format-specific | _filter_img_info --format-specific
|
||||
vm.launch()
|
||||
blockdev_create(vm, { 'driver': 'file',
|
||||
'filename': disk_path,
|
||||
'size': 0 })
|
||||
blockdev_create(vm, { 'driver': imgfmt,
|
||||
'file': {
|
||||
'driver': 'file',
|
||||
'filename': disk_path,
|
||||
},
|
||||
'size': size,
|
||||
'key-secret': 'keysec0',
|
||||
'cipher-alg': 'twofish-128',
|
||||
'cipher-mode': 'ctr',
|
||||
'ivgen-alg': 'plain64',
|
||||
'ivgen-hash-alg': 'md5',
|
||||
'hash-alg': 'sha1',
|
||||
'iter-time': 10 })
|
||||
vm.shutdown()
|
||||
|
||||
echo
|
||||
echo "=== Invalid BlockdevRef ==="
|
||||
echo
|
||||
# TODO Proper support for images to be used with imgopts and/or protocols
|
||||
iotests.img_info_log(
|
||||
'driver=luks,file.driver=file,file.filename=%s,key-secret=keysec0' % (disk_path),
|
||||
filter_path=disk_path,
|
||||
extra_args=['--object', 'secret,id=keysec0,data=foo'],
|
||||
imgopts=True)
|
||||
|
||||
run_qemu <<EOF
|
||||
{ "execute": "qmp_capabilities" }
|
||||
{ "execute": "x-blockdev-create",
|
||||
"arguments": {
|
||||
"driver": "$IMGFMT",
|
||||
"file": "this doesn't exist",
|
||||
"size": $size
|
||||
}
|
||||
}
|
||||
{ "execute": "quit" }
|
||||
EOF
|
||||
#
|
||||
# Invalid BlockdevRef
|
||||
#
|
||||
iotests.log("=== Invalid BlockdevRef ===")
|
||||
iotests.log("")
|
||||
|
||||
echo
|
||||
echo "=== Zero size ==="
|
||||
echo
|
||||
size = 64 * 1024 * 1024
|
||||
|
||||
run_qemu -blockdev driver=file,filename="$TEST_IMG_FILE",node-name=node0 \
|
||||
-object secret,id=keysec0,data="foo" <<EOF
|
||||
{ "execute": "qmp_capabilities" }
|
||||
{ "execute": "x-blockdev-create",
|
||||
"arguments": {
|
||||
"driver": "$IMGFMT",
|
||||
"file": "node0",
|
||||
"key-secret": "keysec0",
|
||||
"size": 0,
|
||||
"iter-time": 10
|
||||
}
|
||||
}
|
||||
{ "execute": "quit" }
|
||||
EOF
|
||||
vm.launch()
|
||||
blockdev_create(vm, { 'driver': imgfmt,
|
||||
'file': "this doesn't exist",
|
||||
'size': size })
|
||||
vm.shutdown()
|
||||
|
||||
_img_info | _filter_img_info
|
||||
#
|
||||
# Zero size
|
||||
#
|
||||
iotests.log("=== Zero size ===")
|
||||
iotests.log("")
|
||||
|
||||
vm.add_blockdev('driver=file,filename=%s,node-name=node0' % (disk_path))
|
||||
vm.launch()
|
||||
blockdev_create(vm, { 'driver': imgfmt,
|
||||
'file': 'node0',
|
||||
'key-secret': 'keysec0',
|
||||
'size': 0,
|
||||
'iter-time': 10 })
|
||||
vm.shutdown()
|
||||
|
||||
echo
|
||||
echo "=== Invalid sizes ==="
|
||||
echo
|
||||
# TODO Proper support for images to be used with imgopts and/or protocols
|
||||
iotests.img_info_log(
|
||||
'driver=luks,file.driver=file,file.filename=%s,key-secret=keysec0' % (disk_path),
|
||||
filter_path=disk_path,
|
||||
extra_args=['--object', 'secret,id=keysec0,data=foo'],
|
||||
imgopts=True)
|
||||
|
||||
# TODO Negative image sizes aren't handled correctly, but this is a problem
|
||||
# with QAPI's implementation of the 'size' type and affects other commands as
|
||||
# well. Once this is fixed, we may want to add a test case here.
|
||||
#
|
||||
# Invalid sizes
|
||||
#
|
||||
|
||||
# 1. 2^64 - 512
|
||||
# 2. 2^63 = 8 EB (qemu-img enforces image sizes less than this)
|
||||
# 3. 2^63 - 512 (generally valid, but with the crypto header the file will
|
||||
# exceed 63 bits)
|
||||
# TODO Negative image sizes aren't handled correctly, but this is a problem
|
||||
# with QAPI's implementation of the 'size' type and affects other commands as
|
||||
# well. Once this is fixed, we may want to add a test case here.
|
||||
|
||||
run_qemu -blockdev driver=file,filename="$TEST_IMG_FILE",node-name=node0 \
|
||||
-object secret,id=keysec0,data="foo" <<EOF
|
||||
{ "execute": "qmp_capabilities" }
|
||||
{ "execute": "x-blockdev-create",
|
||||
"arguments": {
|
||||
"driver": "$IMGFMT",
|
||||
"file": "node0",
|
||||
"key-secret": "keysec0",
|
||||
"size": 18446744073709551104
|
||||
}
|
||||
}
|
||||
{ "execute": "x-blockdev-create",
|
||||
"arguments": {
|
||||
"driver": "$IMGFMT",
|
||||
"file": "node0",
|
||||
"key-secret": "keysec0",
|
||||
"size": 9223372036854775808
|
||||
}
|
||||
}
|
||||
{ "execute": "x-blockdev-create",
|
||||
"arguments": {
|
||||
"driver": "$IMGFMT",
|
||||
"file": "node0",
|
||||
"key-secret": "keysec0",
|
||||
"size": 9223372036854775296
|
||||
}
|
||||
}
|
||||
{ "execute": "quit" }
|
||||
EOF
|
||||
# 1. 2^64 - 512
|
||||
# 2. 2^63 = 8 EB (qemu-img enforces image sizes less than this)
|
||||
# 3. 2^63 - 512 (generally valid, but with the crypto header the file will
|
||||
# exceed 63 bits)
|
||||
iotests.log("=== Invalid sizes ===")
|
||||
iotests.log("")
|
||||
|
||||
echo
|
||||
echo "=== Resize image with invalid sizes ==="
|
||||
echo
|
||||
vm.launch()
|
||||
for size in [ 18446744073709551104, 9223372036854775808, 9223372036854775296 ]:
|
||||
blockdev_create(vm, { 'driver': imgfmt,
|
||||
'file': 'node0',
|
||||
'key-secret': 'keysec0',
|
||||
'size': size })
|
||||
vm.shutdown()
|
||||
|
||||
run_qemu -blockdev driver=file,filename="$TEST_IMG_FILE",node-name=node0 \
|
||||
-blockdev driver=luks,file=node0,key-secret=keysec0,node-name=node1 \
|
||||
-object secret,id=keysec0,data="foo" <<EOF
|
||||
{ "execute": "qmp_capabilities" }
|
||||
{ "execute": "block_resize",
|
||||
"arguments": {
|
||||
"node-name": "node1",
|
||||
"size": 9223372036854775296
|
||||
}
|
||||
}
|
||||
{ "execute": "block_resize",
|
||||
"arguments": {
|
||||
"node-name": "node1",
|
||||
"size": 9223372036854775808
|
||||
}
|
||||
}
|
||||
{ "execute": "block_resize",
|
||||
"arguments": {
|
||||
"node-name": "node1",
|
||||
"size": 18446744073709551104
|
||||
}
|
||||
}
|
||||
{ "execute": "block_resize",
|
||||
"arguments": {
|
||||
"node-name": "node1",
|
||||
"size": -9223372036854775808
|
||||
}
|
||||
}
|
||||
{ "execute": "quit" }
|
||||
EOF
|
||||
#
|
||||
# Resize image with invalid sizes
|
||||
#
|
||||
iotests.log("=== Resize image with invalid sizes ===")
|
||||
iotests.log("")
|
||||
|
||||
_img_info | _filter_img_info
|
||||
vm.add_blockdev('driver=luks,file=node0,key-secret=keysec0,node-name=node1')
|
||||
vm.launch()
|
||||
vm.qmp_log('block_resize', node_name='node1', size=9223372036854775296)
|
||||
vm.qmp_log('block_resize', node_name='node1', size=9223372036854775808)
|
||||
vm.qmp_log('block_resize', node_name='node1', size=18446744073709551104)
|
||||
vm.qmp_log('block_resize', node_name='node1', size=-9223372036854775808)
|
||||
vm.shutdown()
|
||||
|
||||
# success, all done
|
||||
echo "*** done"
|
||||
rm -f $seq.full
|
||||
status=0
|
||||
# TODO Proper support for images to be used with imgopts and/or protocols
|
||||
iotests.img_info_log(
|
||||
'driver=luks,file.driver=file,file.filename=%s,key-secret=keysec0' % (disk_path),
|
||||
filter_path=disk_path,
|
||||
extra_args=['--object', 'secret,id=keysec0,data=foo'],
|
||||
imgopts=True)
|
||||
|
||||
+138
-59
@@ -1,29 +1,31 @@
|
||||
QA output created by 210
|
||||
|
||||
=== Successful image creation (defaults) ===
|
||||
|
||||
Testing: -object secret,id=keysec0,data=foo
|
||||
QMP_VERSION
|
||||
{"return": {}}
|
||||
{"return": {}}
|
||||
{"return": {}}
|
||||
{"return": {}}
|
||||
{"return": {}}
|
||||
{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "SHUTDOWN", "data": {"guest": false}}
|
||||
{'execute': 'blockdev-create', 'arguments': {'job_id': 'job0', 'options': {'size': 0, 'driver': 'file', 'filename': 'TEST_DIR/PID-t.luks'}}}
|
||||
{u'return': {}}
|
||||
{'execute': 'job-dismiss', 'arguments': {'id': 'job0'}}
|
||||
{u'return': {}}
|
||||
|
||||
image: json:{"driver": "IMGFMT", "file": {"driver": "file", "filename": "TEST_DIR/t.IMGFMT"}, "key-secret": "keysec0"}
|
||||
{'execute': 'blockdev-add', 'arguments': {'node_name': 'imgfile', 'driver': 'file', 'filename': 'TEST_DIR/PID-t.luks'}}
|
||||
{u'return': {}}
|
||||
{'execute': 'blockdev-create', 'arguments': {'job_id': 'job0', 'options': {'key-secret': 'keysec0', 'iter-time': 10, 'driver': 'luks', 'file': 'imgfile', 'size': 134217728}}}
|
||||
{u'return': {}}
|
||||
{'execute': 'job-dismiss', 'arguments': {'id': 'job0'}}
|
||||
{u'return': {}}
|
||||
|
||||
image: json:{"driver": "IMGFMT", "file": {"driver": "file", "filename": "TEST_IMG"}, "key-secret": "keysec0"}
|
||||
file format: IMGFMT
|
||||
virtual size: 128M (134217728 bytes)
|
||||
encrypted: yes
|
||||
Format specific information:
|
||||
ivgen alg: plain64
|
||||
hash alg: sha256
|
||||
cipher alg: aes-256
|
||||
uuid: 00000000-0000-0000-0000-000000000000
|
||||
uuid: XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX
|
||||
cipher mode: xts
|
||||
slots:
|
||||
[0]:
|
||||
active: true
|
||||
iters: 1024
|
||||
iters: XXX
|
||||
key offset: 4096
|
||||
stripes: 4000
|
||||
[1]:
|
||||
@@ -48,31 +50,34 @@ Format specific information:
|
||||
active: false
|
||||
key offset: 1810432
|
||||
payload offset: 2068480
|
||||
master key iters: 1024
|
||||
master key iters: XXX
|
||||
|
||||
=== Successful image creation (with non-default options) ===
|
||||
|
||||
Testing: -object secret,id=keysec0,data=foo
|
||||
QMP_VERSION
|
||||
{"return": {}}
|
||||
{"return": {}}
|
||||
{"return": {}}
|
||||
{"return": {}}
|
||||
{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "SHUTDOWN", "data": {"guest": false}}
|
||||
{'execute': 'blockdev-create', 'arguments': {'job_id': 'job0', 'options': {'size': 0, 'driver': 'file', 'filename': 'TEST_DIR/PID-t.luks'}}}
|
||||
{u'return': {}}
|
||||
{'execute': 'job-dismiss', 'arguments': {'id': 'job0'}}
|
||||
{u'return': {}}
|
||||
|
||||
image: json:{"driver": "IMGFMT", "file": {"driver": "file", "filename": "TEST_DIR/t.IMGFMT"}, "key-secret": "keysec0"}
|
||||
{'execute': 'blockdev-create', 'arguments': {'job_id': 'job0', 'options': {'key-secret': 'keysec0', 'hash-alg': 'sha1', 'cipher-mode': 'ctr', 'cipher-alg': 'twofish-128', 'file': {'driver': 'file', 'filename': 'TEST_DIR/PID-t.luks'}, 'iter-time': 10, 'ivgen-alg': 'plain64', 'ivgen-hash-alg': 'md5', 'driver': 'luks', 'size': 67108864}}}
|
||||
{u'return': {}}
|
||||
{'execute': 'job-dismiss', 'arguments': {'id': 'job0'}}
|
||||
{u'return': {}}
|
||||
|
||||
image: json:{"driver": "IMGFMT", "file": {"driver": "file", "filename": "TEST_IMG"}, "key-secret": "keysec0"}
|
||||
file format: IMGFMT
|
||||
virtual size: 64M (67108864 bytes)
|
||||
encrypted: yes
|
||||
Format specific information:
|
||||
ivgen alg: plain64
|
||||
hash alg: sha1
|
||||
cipher alg: twofish-128
|
||||
uuid: 00000000-0000-0000-0000-000000000000
|
||||
uuid: XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX
|
||||
cipher mode: ctr
|
||||
slots:
|
||||
[0]:
|
||||
active: true
|
||||
iters: 1024
|
||||
iters: XXX
|
||||
key offset: 4096
|
||||
stripes: 4000
|
||||
[1]:
|
||||
@@ -97,56 +102,130 @@ Format specific information:
|
||||
active: false
|
||||
key offset: 462848
|
||||
payload offset: 528384
|
||||
master key iters: 1024
|
||||
master key iters: XXX
|
||||
|
||||
=== Invalid BlockdevRef ===
|
||||
|
||||
Testing:
|
||||
QMP_VERSION
|
||||
{"return": {}}
|
||||
{"error": {"class": "GenericError", "desc": "Cannot find device=this doesn't exist nor node_name=this doesn't exist"}}
|
||||
{"return": {}}
|
||||
{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "SHUTDOWN", "data": {"guest": false}}
|
||||
|
||||
{'execute': 'blockdev-create', 'arguments': {'job_id': 'job0', 'options': {'driver': 'luks', 'file': "this doesn't exist", 'size': 67108864}}}
|
||||
{u'return': {}}
|
||||
Job failed: Cannot find device=this doesn't exist nor node_name=this doesn't exist
|
||||
{'execute': 'job-dismiss', 'arguments': {'id': 'job0'}}
|
||||
{u'return': {}}
|
||||
|
||||
=== Zero size ===
|
||||
|
||||
Testing: -blockdev driver=file,filename=TEST_DIR/t.IMGFMT,node-name=node0 -object secret,id=keysec0,data=foo
|
||||
QMP_VERSION
|
||||
{"return": {}}
|
||||
{"return": {}}
|
||||
{"return": {}}
|
||||
{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "SHUTDOWN", "data": {"guest": false}}
|
||||
{'execute': 'blockdev-create', 'arguments': {'job_id': 'job0', 'options': {'key-secret': 'keysec0', 'iter-time': 10, 'driver': 'luks', 'file': 'node0', 'size': 0}}}
|
||||
{u'return': {}}
|
||||
{'execute': 'job-dismiss', 'arguments': {'id': 'job0'}}
|
||||
{u'return': {}}
|
||||
|
||||
image: json:{"driver": "IMGFMT", "file": {"driver": "file", "filename": "TEST_DIR/t.IMGFMT"}, "key-secret": "keysec0"}
|
||||
image: json:{"driver": "IMGFMT", "file": {"driver": "file", "filename": "TEST_IMG"}, "key-secret": "keysec0"}
|
||||
file format: IMGFMT
|
||||
virtual size: 0 (0 bytes)
|
||||
encrypted: yes
|
||||
Format specific information:
|
||||
ivgen alg: plain64
|
||||
hash alg: sha256
|
||||
cipher alg: aes-256
|
||||
uuid: XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX
|
||||
cipher mode: xts
|
||||
slots:
|
||||
[0]:
|
||||
active: true
|
||||
iters: XXX
|
||||
key offset: 4096
|
||||
stripes: 4000
|
||||
[1]:
|
||||
active: false
|
||||
key offset: 262144
|
||||
[2]:
|
||||
active: false
|
||||
key offset: 520192
|
||||
[3]:
|
||||
active: false
|
||||
key offset: 778240
|
||||
[4]:
|
||||
active: false
|
||||
key offset: 1036288
|
||||
[5]:
|
||||
active: false
|
||||
key offset: 1294336
|
||||
[6]:
|
||||
active: false
|
||||
key offset: 1552384
|
||||
[7]:
|
||||
active: false
|
||||
key offset: 1810432
|
||||
payload offset: 2068480
|
||||
master key iters: XXX
|
||||
|
||||
=== Invalid sizes ===
|
||||
|
||||
Testing: -blockdev driver=file,filename=TEST_DIR/t.IMGFMT,node-name=node0 -object secret,id=keysec0,data=foo
|
||||
QMP_VERSION
|
||||
{"return": {}}
|
||||
{"error": {"class": "GenericError", "desc": "The requested file size is too large"}}
|
||||
{"error": {"class": "GenericError", "desc": "The requested file size is too large"}}
|
||||
{"error": {"class": "GenericError", "desc": "The requested file size is too large"}}
|
||||
{"return": {}}
|
||||
{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "SHUTDOWN", "data": {"guest": false}}
|
||||
{'execute': 'blockdev-create', 'arguments': {'job_id': 'job0', 'options': {'key-secret': 'keysec0', 'driver': 'luks', 'file': 'node0', 'size': 18446744073709551104L}}}
|
||||
{u'return': {}}
|
||||
Job failed: The requested file size is too large
|
||||
{'execute': 'job-dismiss', 'arguments': {'id': 'job0'}}
|
||||
{u'return': {}}
|
||||
|
||||
{'execute': 'blockdev-create', 'arguments': {'job_id': 'job0', 'options': {'key-secret': 'keysec0', 'driver': 'luks', 'file': 'node0', 'size': 9223372036854775808L}}}
|
||||
{u'return': {}}
|
||||
Job failed: The requested file size is too large
|
||||
{'execute': 'job-dismiss', 'arguments': {'id': 'job0'}}
|
||||
{u'return': {}}
|
||||
|
||||
{'execute': 'blockdev-create', 'arguments': {'job_id': 'job0', 'options': {'key-secret': 'keysec0', 'driver': 'luks', 'file': 'node0', 'size': 9223372036854775296}}}
|
||||
{u'return': {}}
|
||||
Job failed: The requested file size is too large
|
||||
{'execute': 'job-dismiss', 'arguments': {'id': 'job0'}}
|
||||
{u'return': {}}
|
||||
|
||||
=== Resize image with invalid sizes ===
|
||||
|
||||
Testing: -blockdev driver=file,filename=TEST_DIR/t.IMGFMT,node-name=node0 -blockdev driver=IMGFMT,file=node0,key-secret=keysec0,node-name=node1 -object secret,id=keysec0,data=foo
|
||||
QMP_VERSION
|
||||
{"return": {}}
|
||||
{"error": {"class": "GenericError", "desc": "The requested file size is too large"}}
|
||||
{"error": {"class": "GenericError", "desc": "Invalid parameter type for 'size', expected: integer"}}
|
||||
{"error": {"class": "GenericError", "desc": "Invalid parameter type for 'size', expected: integer"}}
|
||||
{"error": {"class": "GenericError", "desc": "Parameter 'size' expects a >0 size"}}
|
||||
{"return": {}}
|
||||
{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "SHUTDOWN", "data": {"guest": false}}
|
||||
|
||||
image: json:{"driver": "IMGFMT", "file": {"driver": "file", "filename": "TEST_DIR/t.IMGFMT"}, "key-secret": "keysec0"}
|
||||
{'execute': 'block_resize', 'arguments': {'size': 9223372036854775296, 'node_name': 'node1'}}
|
||||
{u'error': {u'class': u'GenericError', u'desc': u'The requested file size is too large'}}
|
||||
{'execute': 'block_resize', 'arguments': {'size': 9223372036854775808L, 'node_name': 'node1'}}
|
||||
{u'error': {u'class': u'GenericError', u'desc': u"Invalid parameter type for 'size', expected: integer"}}
|
||||
{'execute': 'block_resize', 'arguments': {'size': 18446744073709551104L, 'node_name': 'node1'}}
|
||||
{u'error': {u'class': u'GenericError', u'desc': u"Invalid parameter type for 'size', expected: integer"}}
|
||||
{'execute': 'block_resize', 'arguments': {'size': -9223372036854775808, 'node_name': 'node1'}}
|
||||
{u'error': {u'class': u'GenericError', u'desc': u"Parameter 'size' expects a >0 size"}}
|
||||
image: json:{"driver": "IMGFMT", "file": {"driver": "file", "filename": "TEST_IMG"}, "key-secret": "keysec0"}
|
||||
file format: IMGFMT
|
||||
virtual size: 0 (0 bytes)
|
||||
*** done
|
||||
encrypted: yes
|
||||
Format specific information:
|
||||
ivgen alg: plain64
|
||||
hash alg: sha256
|
||||
cipher alg: aes-256
|
||||
uuid: XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX
|
||||
cipher mode: xts
|
||||
slots:
|
||||
[0]:
|
||||
active: true
|
||||
iters: XXX
|
||||
key offset: 4096
|
||||
stripes: 4000
|
||||
[1]:
|
||||
active: false
|
||||
key offset: 262144
|
||||
[2]:
|
||||
active: false
|
||||
key offset: 520192
|
||||
[3]:
|
||||
active: false
|
||||
key offset: 778240
|
||||
[4]:
|
||||
active: false
|
||||
key offset: 1036288
|
||||
[5]:
|
||||
active: false
|
||||
key offset: 1294336
|
||||
[6]:
|
||||
active: false
|
||||
key offset: 1552384
|
||||
[7]:
|
||||
active: false
|
||||
key offset: 1810432
|
||||
payload offset: 2068480
|
||||
master key iters: XXX
|
||||
|
||||
|
||||
+123
-196
@@ -1,9 +1,11 @@
|
||||
#!/bin/bash
|
||||
#!/usr/bin/env python
|
||||
#
|
||||
# Test VDI and file image creation
|
||||
#
|
||||
# Copyright (C) 2018 Red Hat, Inc.
|
||||
#
|
||||
# Creator/Owner: Kevin Wolf <kwolf@redhat.com>
|
||||
#
|
||||
# This program is free software; you can redistribute it and/or modify
|
||||
# it under the terms of the GNU General Public License as published by
|
||||
# the Free Software Foundation; either version 2 of the License, or
|
||||
@@ -18,229 +20,154 @@
|
||||
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
#
|
||||
|
||||
# creator
|
||||
owner=kwolf@redhat.com
|
||||
import iotests
|
||||
from iotests import imgfmt
|
||||
|
||||
seq=`basename $0`
|
||||
echo "QA output created by $seq"
|
||||
iotests.verify_image_format(supported_fmts=['vdi'])
|
||||
iotests.verify_protocol(supported=['file'])
|
||||
|
||||
here=`pwd`
|
||||
status=1 # failure is the default!
|
||||
def blockdev_create(vm, options):
|
||||
result = vm.qmp_log('blockdev-create', job_id='job0', options=options)
|
||||
|
||||
# get standard environment, filters and checks
|
||||
. ./common.rc
|
||||
. ./common.filter
|
||||
if 'return' in result:
|
||||
assert result['return'] == {}
|
||||
vm.run_job('job0')
|
||||
iotests.log("")
|
||||
|
||||
_supported_fmt vdi
|
||||
_supported_proto file
|
||||
_supported_os Linux
|
||||
with iotests.FilePath('t.vdi') as disk_path, \
|
||||
iotests.VM() as vm:
|
||||
|
||||
function do_run_qemu()
|
||||
{
|
||||
echo Testing: "$@"
|
||||
$QEMU -nographic -qmp stdio -serial none "$@"
|
||||
echo
|
||||
}
|
||||
#
|
||||
# Successful image creation (defaults)
|
||||
#
|
||||
iotests.log("=== Successful image creation (defaults) ===")
|
||||
iotests.log("")
|
||||
|
||||
function run_qemu()
|
||||
{
|
||||
do_run_qemu "$@" 2>&1 | _filter_testdir | _filter_qmp \
|
||||
| _filter_qemu | _filter_imgfmt \
|
||||
| _filter_actual_image_size
|
||||
}
|
||||
size = 128 * 1024 * 1024
|
||||
|
||||
echo
|
||||
echo "=== Successful image creation (defaults) ==="
|
||||
echo
|
||||
vm.launch()
|
||||
blockdev_create(vm, { 'driver': 'file',
|
||||
'filename': disk_path,
|
||||
'size': 0 })
|
||||
|
||||
size=$((128 * 1024 * 1024))
|
||||
vm.qmp_log('blockdev-add', driver='file', filename=disk_path,
|
||||
node_name='imgfile')
|
||||
|
||||
run_qemu <<EOF
|
||||
{ "execute": "qmp_capabilities" }
|
||||
{ "execute": "x-blockdev-create",
|
||||
"arguments": {
|
||||
"driver": "file",
|
||||
"filename": "$TEST_IMG",
|
||||
"size": 0
|
||||
}
|
||||
}
|
||||
{ "execute": "blockdev-add",
|
||||
"arguments": {
|
||||
"driver": "file",
|
||||
"node-name": "imgfile",
|
||||
"filename": "$TEST_IMG"
|
||||
}
|
||||
}
|
||||
{ "execute": "x-blockdev-create",
|
||||
"arguments": {
|
||||
"driver": "$IMGFMT",
|
||||
"file": "imgfile",
|
||||
"size": $size
|
||||
}
|
||||
}
|
||||
{ "execute": "quit" }
|
||||
EOF
|
||||
blockdev_create(vm, { 'driver': imgfmt,
|
||||
'file': 'imgfile',
|
||||
'size': size })
|
||||
vm.shutdown()
|
||||
|
||||
_img_info --format-specific | _filter_img_info --format-specific
|
||||
$QEMU_IMG map --output=json "$TEST_IMG" | _filter_qemu_img_map
|
||||
iotests.img_info_log(disk_path)
|
||||
iotests.log(iotests.qemu_img_pipe('map', '--output=json', disk_path))
|
||||
|
||||
echo
|
||||
echo "=== Successful image creation (explicit defaults) ==="
|
||||
echo
|
||||
#
|
||||
# Successful image creation (explicit defaults)
|
||||
#
|
||||
iotests.log("=== Successful image creation (explicit defaults) ===")
|
||||
iotests.log("")
|
||||
|
||||
# Choose a different size to show that we got a new image
|
||||
size=$((64 * 1024 * 1024))
|
||||
size = 64 * 1024 * 1024
|
||||
|
||||
run_qemu <<EOF
|
||||
{ "execute": "qmp_capabilities" }
|
||||
{ "execute": "x-blockdev-create",
|
||||
"arguments": {
|
||||
"driver": "file",
|
||||
"filename": "$TEST_IMG",
|
||||
"size": 0
|
||||
}
|
||||
}
|
||||
{ "execute": "x-blockdev-create",
|
||||
"arguments": {
|
||||
"driver": "$IMGFMT",
|
||||
"file": {
|
||||
"driver": "file",
|
||||
"filename": "$TEST_IMG"
|
||||
},
|
||||
"size": $size,
|
||||
"preallocation": "off"
|
||||
}
|
||||
}
|
||||
{ "execute": "quit" }
|
||||
EOF
|
||||
vm.launch()
|
||||
blockdev_create(vm, { 'driver': 'file',
|
||||
'filename': disk_path,
|
||||
'size': 0 })
|
||||
blockdev_create(vm, { 'driver': imgfmt,
|
||||
'file': {
|
||||
'driver': 'file',
|
||||
'filename': disk_path,
|
||||
},
|
||||
'size': size,
|
||||
'preallocation': 'off' })
|
||||
vm.shutdown()
|
||||
|
||||
_img_info --format-specific | _filter_img_info --format-specific
|
||||
$QEMU_IMG map --output=json "$TEST_IMG" | _filter_qemu_img_map
|
||||
iotests.img_info_log(disk_path)
|
||||
iotests.log(iotests.qemu_img_pipe('map', '--output=json', disk_path))
|
||||
|
||||
echo
|
||||
echo "=== Successful image creation (with non-default options) ==="
|
||||
echo
|
||||
#
|
||||
# Successful image creation (with non-default options)
|
||||
#
|
||||
iotests.log("=== Successful image creation (with non-default options) ===")
|
||||
iotests.log("")
|
||||
|
||||
# Choose a different size to show that we got a new image
|
||||
size=$((32 * 1024 * 1024))
|
||||
size = 32 * 1024 * 1024
|
||||
|
||||
run_qemu <<EOF
|
||||
{ "execute": "qmp_capabilities" }
|
||||
{ "execute": "x-blockdev-create",
|
||||
"arguments": {
|
||||
"driver": "file",
|
||||
"filename": "$TEST_IMG",
|
||||
"size": 0
|
||||
}
|
||||
}
|
||||
{ "execute": "x-blockdev-create",
|
||||
"arguments": {
|
||||
"driver": "$IMGFMT",
|
||||
"file": {
|
||||
"driver": "file",
|
||||
"filename": "$TEST_IMG"
|
||||
},
|
||||
"size": $size,
|
||||
"preallocation": "metadata"
|
||||
}
|
||||
}
|
||||
{ "execute": "quit" }
|
||||
EOF
|
||||
vm.launch()
|
||||
blockdev_create(vm, { 'driver': 'file',
|
||||
'filename': disk_path,
|
||||
'size': 0 })
|
||||
blockdev_create(vm, { 'driver': imgfmt,
|
||||
'file': {
|
||||
'driver': 'file',
|
||||
'filename': disk_path,
|
||||
},
|
||||
'size': size,
|
||||
'preallocation': 'metadata' })
|
||||
vm.shutdown()
|
||||
|
||||
_img_info --format-specific | _filter_img_info --format-specific
|
||||
$QEMU_IMG map --output=json "$TEST_IMG" | _filter_qemu_img_map
|
||||
iotests.img_info_log(disk_path)
|
||||
iotests.log(iotests.qemu_img_pipe('map', '--output=json', disk_path))
|
||||
|
||||
echo
|
||||
echo "=== Invalid BlockdevRef ==="
|
||||
echo
|
||||
#
|
||||
# Invalid BlockdevRef
|
||||
#
|
||||
iotests.log("=== Invalid BlockdevRef ===")
|
||||
iotests.log("")
|
||||
|
||||
run_qemu <<EOF
|
||||
{ "execute": "qmp_capabilities" }
|
||||
{ "execute": "x-blockdev-create",
|
||||
"arguments": {
|
||||
"driver": "$IMGFMT",
|
||||
"file": "this doesn't exist",
|
||||
"size": $size
|
||||
}
|
||||
}
|
||||
{ "execute": "quit" }
|
||||
EOF
|
||||
vm.launch()
|
||||
blockdev_create(vm, { 'driver': imgfmt,
|
||||
'file': "this doesn't exist",
|
||||
'size': size })
|
||||
vm.shutdown()
|
||||
|
||||
echo
|
||||
echo "=== Zero size ==="
|
||||
echo
|
||||
#
|
||||
# Zero size
|
||||
#
|
||||
iotests.log("=== Zero size ===")
|
||||
iotests.log("")
|
||||
|
||||
run_qemu -blockdev driver=file,filename="$TEST_IMG",node-name=node0 <<EOF
|
||||
{ "execute": "qmp_capabilities" }
|
||||
{ "execute": "x-blockdev-create",
|
||||
"arguments": {
|
||||
"driver": "$IMGFMT",
|
||||
"file": "node0",
|
||||
"size": 0
|
||||
}
|
||||
}
|
||||
{ "execute": "quit" }
|
||||
EOF
|
||||
vm.add_blockdev('driver=file,filename=%s,node-name=node0' % (disk_path))
|
||||
vm.launch()
|
||||
blockdev_create(vm, { 'driver': imgfmt,
|
||||
'file': 'node0',
|
||||
'size': 0 })
|
||||
vm.shutdown()
|
||||
|
||||
_img_info | _filter_img_info
|
||||
iotests.img_info_log(disk_path)
|
||||
|
||||
echo
|
||||
echo "=== Maximum size ==="
|
||||
echo
|
||||
#
|
||||
# Maximum size
|
||||
#
|
||||
iotests.log("=== Maximum size ===")
|
||||
iotests.log("")
|
||||
|
||||
run_qemu -blockdev driver=file,filename="$TEST_IMG",node-name=node0 <<EOF
|
||||
{ "execute": "qmp_capabilities" }
|
||||
{ "execute": "x-blockdev-create",
|
||||
"arguments": {
|
||||
"driver": "$IMGFMT",
|
||||
"file": "node0",
|
||||
"size": 562949819203584
|
||||
}
|
||||
}
|
||||
{ "execute": "quit" }
|
||||
EOF
|
||||
vm.launch()
|
||||
blockdev_create(vm, { 'driver': imgfmt,
|
||||
'file': 'node0',
|
||||
'size': 562949819203584 })
|
||||
vm.shutdown()
|
||||
|
||||
_img_info | _filter_img_info
|
||||
iotests.img_info_log(disk_path)
|
||||
|
||||
echo
|
||||
echo "=== Invalid sizes ==="
|
||||
echo
|
||||
#
|
||||
# Invalid sizes
|
||||
#
|
||||
|
||||
# TODO Negative image sizes aren't handled correctly, but this is a problem
|
||||
# with QAPI's implementation of the 'size' type and affects other commands as
|
||||
# well. Once this is fixed, we may want to add a test case here.
|
||||
# TODO Negative image sizes aren't handled correctly, but this is a problem
|
||||
# with QAPI's implementation of the 'size' type and affects other commands
|
||||
# as well. Once this is fixed, we may want to add a test case here.
|
||||
|
||||
# 1. 2^64 - 512
|
||||
# 2. 2^63 = 8 EB (qemu-img enforces image sizes less than this)
|
||||
# 3. 0x1fffff8000001 (one byte more than maximum image size for VDI)
|
||||
# 1. 2^64 - 512
|
||||
# 2. 2^63 = 8 EB (qemu-img enforces image sizes less than this)
|
||||
# 3. 0x1fffff8000001 (one byte more than maximum image size for VDI)
|
||||
|
||||
run_qemu -blockdev driver=file,filename="$TEST_IMG",node-name=node0 <<EOF
|
||||
{ "execute": "qmp_capabilities" }
|
||||
{ "execute": "x-blockdev-create",
|
||||
"arguments": {
|
||||
"driver": "$IMGFMT",
|
||||
"file": "node0",
|
||||
"size": 18446744073709551104
|
||||
}
|
||||
}
|
||||
{ "execute": "x-blockdev-create",
|
||||
"arguments": {
|
||||
"driver": "$IMGFMT",
|
||||
"file": "node0",
|
||||
"size": 9223372036854775808
|
||||
}
|
||||
}
|
||||
{ "execute": "x-blockdev-create",
|
||||
"arguments": {
|
||||
"driver": "$IMGFMT",
|
||||
"file": "node0",
|
||||
"size": 562949819203585
|
||||
}
|
||||
}
|
||||
{ "execute": "quit" }
|
||||
EOF
|
||||
iotests.log("=== Invalid sizes ===")
|
||||
iotests.log("")
|
||||
|
||||
# success, all done
|
||||
echo "*** done"
|
||||
rm -f $seq.full
|
||||
status=0
|
||||
vm.launch()
|
||||
for size in [ 18446744073709551104, 9223372036854775808, 562949819203585 ]:
|
||||
blockdev_create(vm, { 'driver': imgfmt,
|
||||
'file': 'node0',
|
||||
'size': size })
|
||||
vm.shutdown()
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user