[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 08/14] blockjobs: hide internal jobs from management
From: |
Jeff Cody |
Subject: |
[Qemu-devel] [PULL 08/14] blockjobs: hide internal jobs from management API |
Date: |
Mon, 31 Oct 2016 15:22:55 -0400 |
From: John Snow <address@hidden>
If jobs are not created directly by the user, do not allow them to be
seen by the user/management utility. At the moment, 'internal' jobs are
those that do not have an ID. As of this patch it is impossible to
create such jobs.
Signed-off-by: John Snow <address@hidden>
Message-id: address@hidden
Signed-off-by: Jeff Cody <address@hidden>
---
blockdev.c | 17 +++++++++++++----
blockjob.c | 41 ++++++++++++++++++++++++++++++++++-------
include/block/blockjob.h | 12 ++++++++++--
3 files changed, 57 insertions(+), 13 deletions(-)
diff --git a/blockdev.c b/blockdev.c
index d11a74f..d141fb5 100644
--- a/blockdev.c
+++ b/blockdev.c
@@ -3915,13 +3915,22 @@ BlockJobInfoList *qmp_query_block_jobs(Error **errp)
BlockJob *job;
for (job = block_job_next(NULL); job; job = block_job_next(job)) {
- BlockJobInfoList *elem = g_new0(BlockJobInfoList, 1);
- AioContext *aio_context = blk_get_aio_context(job->blk);
+ BlockJobInfoList *elem;
+ AioContext *aio_context;
+ if (block_job_is_internal(job)) {
+ continue;
+ }
+ elem = g_new0(BlockJobInfoList, 1);
+ aio_context = blk_get_aio_context(job->blk);
aio_context_acquire(aio_context);
- elem->value = block_job_query(job);
+ elem->value = block_job_query(job, errp);
aio_context_release(aio_context);
-
+ if (!elem->value) {
+ g_free(elem);
+ qapi_free_BlockJobInfoList(head);
+ return NULL;
+ }
*p_next = elem;
p_next = &elem->next;
}
diff --git a/blockjob.c b/blockjob.c
index 7c88b30..38f69a0 100644
--- a/blockjob.c
+++ b/blockjob.c
@@ -66,7 +66,7 @@ BlockJob *block_job_get(const char *id)
BlockJob *job;
QLIST_FOREACH(job, &block_jobs, job_list) {
- if (!strcmp(id, job->id)) {
+ if (job->id && !strcmp(id, job->id)) {
return job;
}
}
@@ -181,6 +181,11 @@ void *block_job_create(const char *job_id, const
BlockJobDriver *driver,
return job;
}
+bool block_job_is_internal(BlockJob *job)
+{
+ return (job->id == NULL);
+}
+
void block_job_ref(BlockJob *job)
{
++job->refcnt;
@@ -317,6 +322,8 @@ void block_job_set_speed(BlockJob *job, int64_t speed,
Error **errp)
void block_job_complete(BlockJob *job, Error **errp)
{
+ /* Should not be reachable via external interface for internal jobs */
+ assert(job->id);
if (job->pause_count || job->cancelled || !job->driver->complete) {
error_setg(errp, "The active block job '%s' cannot be completed",
job->id);
@@ -497,9 +504,15 @@ void block_job_yield(BlockJob *job)
block_job_pause_point(job);
}
-BlockJobInfo *block_job_query(BlockJob *job)
+BlockJobInfo *block_job_query(BlockJob *job, Error **errp)
{
- BlockJobInfo *info = g_new0(BlockJobInfo, 1);
+ BlockJobInfo *info;
+
+ if (block_job_is_internal(job)) {
+ error_setg(errp, "Cannot query QEMU internal jobs");
+ return NULL;
+ }
+ info = g_new0(BlockJobInfo, 1);
info->type = g_strdup(BlockJobType_lookup[job->driver->job_type]);
info->device = g_strdup(job->id);
info->len = job->len;
@@ -522,6 +535,10 @@ static void block_job_iostatus_set_err(BlockJob *job, int
error)
void block_job_event_cancelled(BlockJob *job)
{
+ if (block_job_is_internal(job)) {
+ return;
+ }
+
qapi_event_send_block_job_cancelled(job->driver->job_type,
job->id,
job->len,
@@ -532,6 +549,10 @@ void block_job_event_cancelled(BlockJob *job)
void block_job_event_completed(BlockJob *job, const char *msg)
{
+ if (block_job_is_internal(job)) {
+ return;
+ }
+
qapi_event_send_block_job_completed(job->driver->job_type,
job->id,
job->len,
@@ -546,6 +567,10 @@ void block_job_event_ready(BlockJob *job)
{
job->ready = true;
+ if (block_job_is_internal(job)) {
+ return;
+ }
+
qapi_event_send_block_job_ready(job->driver->job_type,
job->id,
job->len,
@@ -576,10 +601,12 @@ BlockErrorAction block_job_error_action(BlockJob *job,
BlockdevOnError on_err,
default:
abort();
}
- qapi_event_send_block_job_error(job->id,
- is_read ? IO_OPERATION_TYPE_READ :
- IO_OPERATION_TYPE_WRITE,
- action, &error_abort);
+ if (!block_job_is_internal(job)) {
+ qapi_event_send_block_job_error(job->id,
+ is_read ? IO_OPERATION_TYPE_READ :
+ IO_OPERATION_TYPE_WRITE,
+ action, &error_abort);
+ }
if (action == BLOCK_ERROR_ACTION_STOP) {
/* make the pause user visible, which will be resumed from QMP. */
job->user_paused = true;
diff --git a/include/block/blockjob.h b/include/block/blockjob.h
index 2bb39f4..2f60aff 100644
--- a/include/block/blockjob.h
+++ b/include/block/blockjob.h
@@ -114,7 +114,7 @@ struct BlockJob {
BlockBackend *blk;
/**
- * The ID of the block job.
+ * The ID of the block job. May be NULL for internal jobs.
*/
char *id;
@@ -340,7 +340,7 @@ bool block_job_is_cancelled(BlockJob *job);
*
* Return information about a job.
*/
-BlockJobInfo *block_job_query(BlockJob *job);
+BlockJobInfo *block_job_query(BlockJob *job, Error **errp);
/**
* block_job_pause_point:
@@ -511,4 +511,12 @@ void block_job_txn_unref(BlockJobTxn *txn);
*/
void block_job_txn_add_job(BlockJobTxn *txn, BlockJob *job);
+/**
+ * block_job_is_internal:
+ * @job: The job to determine if it is user-visible or not.
+ *
+ * Returns true if the job should not be visible to the management layer.
+ */
+bool block_job_is_internal(BlockJob *job);
+
#endif
--
2.7.4
- [Qemu-devel] [PULL 00/14] Block patches for 2.8, Jeff Cody, 2016/10/31
- [Qemu-devel] [PULL 01/14] qapi: add release designator to gluster logfile option, Jeff Cody, 2016/10/31
- [Qemu-devel] [PULL 02/14] rbd: make the code more readable, Jeff Cody, 2016/10/31
- [Qemu-devel] [PULL 03/14] block: add gluster ifdef guard checks for SEEK_DATA/SEEK_HOLE support, Jeff Cody, 2016/10/31
- [Qemu-devel] [PULL 04/14] block/gluster: memory usage: use one glfs instance per volume, Jeff Cody, 2016/10/31
- [Qemu-devel] [PULL 07/14] block/gluster: fix port type in the QAPI options list, Jeff Cody, 2016/10/31
- [Qemu-devel] [PULL 06/14] block/gluster: improve defense over string to int conversion, Jeff Cody, 2016/10/31
- [Qemu-devel] [PULL 05/14] block: Turn on "unmap" in active commit, Jeff Cody, 2016/10/31
- [Qemu-devel] [PULL 08/14] blockjobs: hide internal jobs from management API,
Jeff Cody <=
- [Qemu-devel] [PULL 09/14] blockjobs: Allow creating internal jobs, Jeff Cody, 2016/10/31
- [Qemu-devel] [PULL 10/14] Replication/Blockjobs: Create replication jobs as internal, Jeff Cody, 2016/10/31
- [Qemu-devel] [PULL 12/14] Blockjobs: Internalize user_pause logic, Jeff Cody, 2016/10/31
- [Qemu-devel] [PULL 11/14] blockjob: centralize QMP event emissions, Jeff Cody, 2016/10/31
- [Qemu-devel] [PULL 14/14] blockjobs: fix documentation, Jeff Cody, 2016/10/31
- [Qemu-devel] [PULL 13/14] blockjobs: split interface into public/private, Part 1, Jeff Cody, 2016/10/31