From nobody Mon Dec 15 23:05:19 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1658846524; cv=none; d=zohomail.com; s=zohoarc; b=YGpwqWeSNZ2/9HvWqZ/M3PX7h+80XO3aR4mBSfPWMYw55QFqfMoFjDmTnrp2IuV1sB25DxIy7Hk76aScRrb+WCH+egKT8/J9qTxzH/LQyymOzykjOb3x5wrA7K6rKlR60T+iw+/uLA0RMEJA/mSq5q9PF75kiU6woa0NNu25/MI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1658846524; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=a90WWFtDfU2e9hUlQdcSEYTpLWapJljjyjbsXFDWoZA=; b=H45Q8f1+nHTbBxD8RfcMbvwgO/f0RnTdPAFu5eoclz4pF/cYyqijWPh+2UOAN+N2506tbXokKHyAsm8E5kX0kVCEeCjl48AMXYXm+V2aWWBqo+65gr5pCWBUS2sV8RCLrt5wYCUak2MMit3a6G26nQdvANJAmeBXjhygUffqVlE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mx.zohomail.com with SMTPS id 1658846524404627.3934363946196; Tue, 26 Jul 2022 07:42:04 -0700 (PDT) Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-184-bZ-6swlYOl2_3x_HYNoDqw-1; Tue, 26 Jul 2022 10:38:53 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.rdu2.redhat.com [10.11.54.7]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 1AE88280F2AE; Tue, 26 Jul 2022 14:38:39 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 05A0A140EBE3; Tue, 26 Jul 2022 14:38:39 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id A6BC61945DBF; Tue, 26 Jul 2022 14:38:38 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id EAC7A1947054 for ; Tue, 26 Jul 2022 14:38:33 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id DC5E940D0160; Tue, 26 Jul 2022 14:38:33 +0000 (UTC) Received: from speedmetal.lan (unknown [10.40.208.32]) by smtp.corp.redhat.com (Postfix) with ESMTP id 60EDF40D016F for ; Tue, 26 Jul 2022 14:38:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1658846522; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=a90WWFtDfU2e9hUlQdcSEYTpLWapJljjyjbsXFDWoZA=; b=izsj+wlokjM3Y5WexZqDf+xGOzBhwWc4ywwSJWmmsqu39rsCm6rVtZ8NGpS6/kOFScEdR1 VXUwwY9PLqataznJOldNB6WbMLSEVProRYVQ8QW9GOtDzZeBaLxY4jjk765ElPeFstKwCS YQ0JmRB9P6wnISJ0LDhnFcsGCpIdO+E= X-MC-Unique: bZ-6swlYOl2_3x_HYNoDqw-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 33/80] qemu: monitor: Remove infrastructure for BLOCK_JOB_* events Date: Tue, 26 Jul 2022 16:37:11 +0200 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.11.54.1 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 2.85 on 10.11.54.7 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1658846526398100001 Content-Type: text/plain; charset="utf-8" We no longer need it as we use the more modern job events. Signed-off-by: Peter Krempa Reviewed-by: Pavel Hrdina --- src/qemu/qemu_monitor.c | 14 ------ src/qemu/qemu_monitor.h | 12 ----- src/qemu/qemu_monitor_json.c | 90 ------------------------------------ 3 files changed, 116 deletions(-) diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c index b575eaae06..a58aa5622f 100644 --- a/src/qemu/qemu_monitor.c +++ b/src/qemu/qemu_monitor.c @@ -1255,20 +1255,6 @@ qemuMonitorEmitPMSuspendDisk(qemuMonitor *mon) } -void -qemuMonitorEmitBlockJob(qemuMonitor *mon, - const char *diskAlias, - int type, - int status, - const char *error) -{ - VIR_DEBUG("mon=3D%p", mon); - - QEMU_MONITOR_CALLBACK(mon, domainBlockJob, mon->vm, - diskAlias, type, status, error); -} - - void qemuMonitorEmitJobStatusChange(qemuMonitor *mon, const char *jobname, diff --git a/src/qemu/qemu_monitor.h b/src/qemu/qemu_monitor.h index 916a86f423..0e3640c1da 100644 --- a/src/qemu/qemu_monitor.h +++ b/src/qemu/qemu_monitor.h @@ -222,12 +222,6 @@ typedef void (*qemuMonitorDomainGraphicsCallback)(qemu= Monitor *mon, const char *authScheme, const char *x509dname, const char *saslUsername= ); -typedef void (*qemuMonitorDomainBlockJobCallback)(qemuMonitor *mon, - virDomainObj *vm, - const char *diskAlias, - int type, - int status, - const char *error); typedef void (*qemuMonitorDomainJobStatusChangeCallback)(qemuMonitor *mon, virDomainObj *vm, const char *jobna= me, @@ -381,7 +375,6 @@ struct _qemuMonitorCallbacks { qemuMonitorDomainWatchdogCallback domainWatchdog; qemuMonitorDomainIOErrorCallback domainIOError; qemuMonitorDomainGraphicsCallback domainGraphics; - qemuMonitorDomainBlockJobCallback domainBlockJob; qemuMonitorDomainJobStatusChangeCallback jobStatusChange; qemuMonitorDomainTrayChangeCallback domainTrayChange; qemuMonitorDomainPMWakeupCallback domainPMWakeup; @@ -476,11 +469,6 @@ void qemuMonitorEmitTrayChange(qemuMonitor *mon, int reason); void qemuMonitorEmitPMWakeup(qemuMonitor *mon); void qemuMonitorEmitPMSuspend(qemuMonitor *mon); -void qemuMonitorEmitBlockJob(qemuMonitor *mon, - const char *diskAlias, - int type, - int status, - const char *error); void qemuMonitorEmitJobStatusChange(qemuMonitor *mon, const char *jobname, qemuMonitorJobStatus status); diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c index 8cda6f36b7..4584786872 100644 --- a/src/qemu/qemu_monitor_json.c +++ b/src/qemu/qemu_monitor_json.c @@ -65,9 +65,6 @@ static void qemuMonitorJSONHandleSPICEDisconnect(qemuMoni= tor *mon, virJSONValue static void qemuMonitorJSONHandleTrayChange(qemuMonitor *mon, virJSONValue= *data); static void qemuMonitorJSONHandlePMWakeup(qemuMonitor *mon, virJSONValue *= data); static void qemuMonitorJSONHandlePMSuspend(qemuMonitor *mon, virJSONValue = *data); -static void qemuMonitorJSONHandleBlockJobCompleted(qemuMonitor *mon, virJS= ONValue *data); -static void qemuMonitorJSONHandleBlockJobCanceled(qemuMonitor *mon, virJSO= NValue *data); -static void qemuMonitorJSONHandleBlockJobReady(qemuMonitor *mon, virJSONVa= lue *data); static void qemuMonitorJSONHandleJobStatusChange(qemuMonitor *mon, virJSON= Value *data); static void qemuMonitorJSONHandleBalloonChange(qemuMonitor *mon, virJSONVa= lue *data); static void qemuMonitorJSONHandlePMSuspendDisk(qemuMonitor *mon, virJSONVa= lue *data); @@ -97,9 +94,6 @@ static qemuEventHandler eventHandlers[] =3D { { "ACPI_DEVICE_OST", qemuMonitorJSONHandleAcpiOstInfo, }, { "BALLOON_CHANGE", qemuMonitorJSONHandleBalloonChange, }, { "BLOCK_IO_ERROR", qemuMonitorJSONHandleIOError, }, - { "BLOCK_JOB_CANCELLED", qemuMonitorJSONHandleBlockJobCanceled, }, - { "BLOCK_JOB_COMPLETED", qemuMonitorJSONHandleBlockJobCompleted, }, - { "BLOCK_JOB_READY", qemuMonitorJSONHandleBlockJobReady, }, { "BLOCK_WRITE_THRESHOLD", qemuMonitorJSONHandleBlockThreshold, }, { "DEVICE_DELETED", qemuMonitorJSONHandleDeviceDeleted, }, { "DEVICE_TRAY_MOVED", qemuMonitorJSONHandleTrayChange, }, @@ -895,67 +889,6 @@ static void qemuMonitorJSONHandleSPICEDisconnect(qemuM= onitor *mon, virJSONValue qemuMonitorJSONHandleGraphicsSPICE(mon, data, VIR_DOMAIN_EVENT_GRAPHIC= S_DISCONNECT); } -static void -qemuMonitorJSONHandleBlockJobImpl(qemuMonitor *mon, - virJSONValue *data, - int event) -{ - const char *device; - const char *type_str; - const char *error =3D NULL; - int type =3D VIR_DOMAIN_BLOCK_JOB_TYPE_UNKNOWN; - unsigned long long offset, len; - - if ((device =3D virJSONValueObjectGetString(data, "device")) =3D=3D NU= LL) { - VIR_WARN("missing device in block job event"); - goto out; - } - - if (virJSONValueObjectGetNumberUlong(data, "offset", &offset) < 0) { - VIR_WARN("missing offset in block job event"); - goto out; - } - - if (virJSONValueObjectGetNumberUlong(data, "len", &len) < 0) { - VIR_WARN("missing len in block job event"); - goto out; - } - - if ((type_str =3D virJSONValueObjectGetString(data, "type")) =3D=3D NU= LL) { - VIR_WARN("missing type in block job event"); - goto out; - } - - if (STREQ(type_str, "stream")) - type =3D VIR_DOMAIN_BLOCK_JOB_TYPE_PULL; - else if (STREQ(type_str, "commit")) - type =3D VIR_DOMAIN_BLOCK_JOB_TYPE_COMMIT; - else if (STREQ(type_str, "mirror")) - type =3D VIR_DOMAIN_BLOCK_JOB_TYPE_COPY; - else if (STREQ(type_str, "backup")) - type =3D VIR_DOMAIN_BLOCK_JOB_TYPE_BACKUP; - - switch ((virConnectDomainEventBlockJobStatus) event) { - case VIR_DOMAIN_BLOCK_JOB_COMPLETED: - error =3D virJSONValueObjectGetString(data, "error"); - /* Make sure the whole device has been processed */ - if (offset !=3D len || error) - event =3D VIR_DOMAIN_BLOCK_JOB_FAILED; - break; - case VIR_DOMAIN_BLOCK_JOB_CANCELED: - case VIR_DOMAIN_BLOCK_JOB_READY: - break; - case VIR_DOMAIN_BLOCK_JOB_FAILED: - case VIR_DOMAIN_BLOCK_JOB_LAST: - VIR_DEBUG("should not get here"); - break; - } - - out: - qemuMonitorEmitBlockJob(mon, device, type, event, error); -} - - static void qemuMonitorJSONHandleJobStatusChange(qemuMonitor *mon, virJSONValue *data) @@ -1024,29 +957,6 @@ qemuMonitorJSONHandlePMSuspend(qemuMonitor *mon, qemuMonitorEmitPMSuspend(mon); } -static void -qemuMonitorJSONHandleBlockJobCompleted(qemuMonitor *mon, - virJSONValue *data) -{ - qemuMonitorJSONHandleBlockJobImpl(mon, data, - VIR_DOMAIN_BLOCK_JOB_COMPLETED); -} - -static void -qemuMonitorJSONHandleBlockJobCanceled(qemuMonitor *mon, - virJSONValue *data) -{ - qemuMonitorJSONHandleBlockJobImpl(mon, data, - VIR_DOMAIN_BLOCK_JOB_CANCELED); -} - -static void -qemuMonitorJSONHandleBlockJobReady(qemuMonitor *mon, - virJSONValue *data) -{ - qemuMonitorJSONHandleBlockJobImpl(mon, data, - VIR_DOMAIN_BLOCK_JOB_READY); -} static void qemuMonitorJSONHandleBalloonChange(qemuMonitor *mon, --=20 2.36.1