[PATCH 32/80] qemu: Remove legacy block job event processing handler
Previous patches removed the job submission for the handler so now even
the handler itself can be removed.
Signed-off-by: Peter Krempa <pkrempa(a)redhat.com>
---
src/qemu/qemu_domain.c | 1 -
src/qemu/qemu_domain.h | 1 -
src/qemu/qemu_driver.c | 45 ------------------------------------------
3 files changed, 47 deletions(-)
diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
index d45c5d30a9..7403b2584b 100644
--- a/src/qemu/qemu_domain.c
+++ b/src/qemu/qemu_domain.c
@@ -11126,7 +11126,6 @@ qemuProcessEventFree(struct qemuProcessEvent *event)
case QEMU_PROCESS_EVENT_DEVICE_DELETED:
case QEMU_PROCESS_EVENT_NIC_RX_FILTER_CHANGED:
case QEMU_PROCESS_EVENT_SERIAL_CHANGED:
- case QEMU_PROCESS_EVENT_BLOCK_JOB:
case QEMU_PROCESS_EVENT_MONITOR_EOF:
case QEMU_PROCESS_EVENT_GUEST_CRASHLOADED:
g_free(event->data);
diff --git a/src/qemu/qemu_domain.h b/src/qemu/qemu_domain.h
index 4680df1098..66188ed003 100644
--- a/src/qemu/qemu_domain.h
+++ b/src/qemu/qemu_domain.h
@@ -418,7 +418,6 @@ typedef enum {
QEMU_PROCESS_EVENT_DEVICE_DELETED,
QEMU_PROCESS_EVENT_NIC_RX_FILTER_CHANGED,
QEMU_PROCESS_EVENT_SERIAL_CHANGED,
- QEMU_PROCESS_EVENT_BLOCK_JOB,
QEMU_PROCESS_EVENT_JOB_STATUS_CHANGE,
QEMU_PROCESS_EVENT_MONITOR_EOF,
QEMU_PROCESS_EVENT_PR_DISCONNECT,
diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index d5a3181c0d..1e7f17b750 100644
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -4031,45 +4031,6 @@ processSerialChangedEvent(virQEMUDriver *driver,
}
-static void
-processBlockJobEvent(virQEMUDriver *driver,
- virDomainObj *vm,
- const char *diskAlias,
- int type,
- int status)
-{
- virDomainDiskDef *disk;
- g_autoptr(qemuBlockJobData) job = NULL;
-
- if (qemuDomainObjBeginJob(driver, vm, VIR_JOB_MODIFY) < 0)
- return;
-
- if (!virDomainObjIsActive(vm)) {
- VIR_DEBUG("Domain is not running");
- goto endjob;
- }
-
- if (!(disk = qemuProcessFindDomainDiskByAliasOrQOM(vm, diskAlias, NULL))) {
- VIR_DEBUG("disk %s not found", diskAlias);
- goto endjob;
- }
-
- if (!(job = qemuBlockJobDiskGetJob(disk))) {
- VIR_DEBUG("creating new block job object for '%s'",
diskAlias);
- if (!(job = qemuBlockJobDiskNew(vm, disk, type, diskAlias)))
- goto endjob;
- job->state = QEMU_BLOCKJOB_STATE_RUNNING;
- }
-
- job->newstate = status;
-
- qemuBlockJobUpdate(vm, job, VIR_ASYNC_JOB_NONE);
-
- endjob:
- qemuDomainObjEndJob(vm);
-}
-
-
static void
processJobStatusChangeEvent(virQEMUDriver *driver,
virDomainObj *vm,
@@ -4279,12 +4240,6 @@ static void qemuProcessEventHandler(void *data, void *opaque)
processSerialChangedEvent(driver, vm, processEvent->data,
processEvent->action);
break;
- case QEMU_PROCESS_EVENT_BLOCK_JOB:
- processBlockJobEvent(driver, vm,
- processEvent->data,
- processEvent->action,
- processEvent->status);
- break;
case QEMU_PROCESS_EVENT_JOB_STATUS_CHANGE:
processJobStatusChangeEvent(driver, vm, processEvent->data);
break;
--
2.36.1