From nobody Mon Feb 9 06:34:04 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1534176156839954.4731839948296; Mon, 13 Aug 2018 09:02:36 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id B696FA8C18; Mon, 13 Aug 2018 16:02:34 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 5873B6FDC3; Mon, 13 Aug 2018 16:02:34 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id EF2CE18037FE; Mon, 13 Aug 2018 16:02:33 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w7DG1AP7001607 for ; Mon, 13 Aug 2018 12:01:11 -0400 Received: by smtp.corp.redhat.com (Postfix) id D93562166BA5; Mon, 13 Aug 2018 16:01:10 +0000 (UTC) Received: from angien.brq.redhat.com (unknown [10.43.2.136]) by smtp.corp.redhat.com (Postfix) with ESMTP id 771192166BA0 for ; Mon, 13 Aug 2018 16:01:10 +0000 (UTC) From: Peter Krempa To: libvir-list@redhat.com Date: Mon, 13 Aug 2018 18:00:16 +0200 Message-Id: In-Reply-To: References: In-Reply-To: References: X-Scanned-By: MIMEDefang 2.78 on 10.11.54.6 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCHv2 42/62] qemu: monitor: Handle BLOCK_IO_ERROR event properly with -blockdev X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.39]); Mon, 13 Aug 2018 16:02:35 +0000 (UTC) X-ZohoMail: RDMRC_0 RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Use the 'node-name' provided in the event if 'device' is empty to look up the disk. Signed-off-by: Peter Krempa --- src/qemu/qemu_monitor.c | 3 ++- src/qemu/qemu_monitor.h | 2 ++ src/qemu/qemu_monitor_json.c | 5 ++++- src/qemu/qemu_process.c | 12 +++++++++++- 4 files changed, 19 insertions(+), 3 deletions(-) diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c index cdfcbcea0b..49dc478f5b 100644 --- a/src/qemu/qemu_monitor.c +++ b/src/qemu/qemu_monitor.c @@ -1421,6 +1421,7 @@ qemuMonitorEmitWatchdog(qemuMonitorPtr mon, int actio= n) int qemuMonitorEmitIOError(qemuMonitorPtr mon, const char *diskAlias, + const char *nodename, int action, const char *reason) { @@ -1428,7 +1429,7 @@ qemuMonitorEmitIOError(qemuMonitorPtr mon, VIR_DEBUG("mon=3D%p", mon); QEMU_MONITOR_CALLBACK(mon, ret, domainIOError, mon->vm, - diskAlias, action, reason); + diskAlias, nodename, action, reason); return ret; } diff --git a/src/qemu/qemu_monitor.h b/src/qemu/qemu_monitor.h index 1c66459e69..70854497b2 100644 --- a/src/qemu/qemu_monitor.h +++ b/src/qemu/qemu_monitor.h @@ -155,6 +155,7 @@ typedef int (*qemuMonitorDomainWatchdogCallback)(qemuMo= nitorPtr mon, typedef int (*qemuMonitorDomainIOErrorCallback)(qemuMonitorPtr mon, virDomainObjPtr vm, const char *diskAlias, + const char *nodename, int action, const char *reason, void *opaque); @@ -383,6 +384,7 @@ int qemuMonitorEmitRTCChange(qemuMonitorPtr mon, long l= ong offset); int qemuMonitorEmitWatchdog(qemuMonitorPtr mon, int action); int qemuMonitorEmitIOError(qemuMonitorPtr mon, const char *diskAlias, + const char *nodename, int action, const char *reason); int qemuMonitorEmitGraphics(qemuMonitorPtr mon, diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c index 537cdfd19a..2b168d96c2 100644 --- a/src/qemu/qemu_monitor_json.c +++ b/src/qemu/qemu_monitor_json.c @@ -765,6 +765,7 @@ static void qemuMonitorJSONHandleIOError(qemuMonitorPtr mon, virJSONValuePtr data) { const char *device; + const char *nodename; const char *action; const char *reason =3D ""; bool nospc =3D false; @@ -782,6 +783,8 @@ qemuMonitorJSONHandleIOError(qemuMonitorPtr mon, virJSO= NValuePtr data) if ((device =3D virJSONValueObjectGetString(data, "device")) =3D=3D NU= LL) VIR_WARN("missing device in disk io error event"); + nodename =3D virJSONValueObjectGetString(data, "node-name"); + if (virJSONValueObjectGetBoolean(data, "nospace", &nospc) =3D=3D 0 && = nospc) reason =3D "enospc"; @@ -790,7 +793,7 @@ qemuMonitorJSONHandleIOError(qemuMonitorPtr mon, virJSO= NValuePtr data) actionID =3D VIR_DOMAIN_EVENT_IO_ERROR_NONE; } - qemuMonitorEmitIOError(mon, device, actionID, reason); + qemuMonitorEmitIOError(mon, device, nodename, actionID, reason); } diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 40e2589b37..6e0b4b0027 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -855,6 +855,7 @@ static int qemuProcessHandleIOError(qemuMonitorPtr mon ATTRIBUTE_UNUSED, virDomainObjPtr vm, const char *diskAlias, + const char *nodename, int action, const char *reason, void *opaque) @@ -869,7 +870,16 @@ qemuProcessHandleIOError(qemuMonitorPtr mon ATTRIBUTE_= UNUSED, virQEMUDriverConfigPtr cfg =3D virQEMUDriverGetConfig(driver); virObjectLock(vm); - disk =3D qemuProcessFindDomainDiskByAliasOrQOM(vm, diskAlias, NULL); + + if (*diskAlias =3D=3D '\0') + diskAlias =3D NULL; + + if (diskAlias) + disk =3D qemuProcessFindDomainDiskByAliasOrQOM(vm, diskAlias, NULL= ); + else if (nodename) + disk =3D qemuDomainDiskLookupByNodename(vm->def, nodename, NULL, N= ULL); + else + disk =3D NULL; if (disk) { srcPath =3D virDomainDiskGetSource(disk); --=20 2.16.2 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list