From nobody Thu May 16 05:34:45 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1561053035; cv=none; d=zoho.com; s=zohoarc; b=aq/+hkfGNDwXelmXxNRQb1hB833mAA2hXIDl4TxWnZuabl6WK3HLmyKC3F8ms3GRys2Gjea86Pk8m/aQgKBhbJXSQ3rBYuqrkAa/e1vD0x+I017sLeMbn2dcKp673h697En3oYLBxZULStjwkF2H/RIPU8UzKM2rEIPqv+rPYwk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1561053035; h=Content-Transfer-Encoding:Cc: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:ARC-Authentication-Results; bh=smC0vLhp1PLhqBrj4l0vu9NWar/1aepyNRQ9zi4qkek=; b=f+4Owha3Xmk6FnFbWXCsiF1TUfPEA19vZc9Jp0jS6DPmUSMJq0Dnw+Mzn71n+KrOFVK3i/8ZnHxST5JPiJe2wSA4gag5ZsTiXpC4VUzS/GzjCnUm6MccTu+J6TqNUyvMK0/khdOtnWJ+K1aSbmtR5ZGHLct5DrjjBYndkZeCNbo= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1561053035894571.9238049411349; Thu, 20 Jun 2019 10:50:35 -0700 (PDT) Received: from localhost ([::1]:51906 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1he1Ck-0001KX-P9 for importer@patchew.org; Thu, 20 Jun 2019 13:50:34 -0400 Received: from eggs.gnu.org ([209.51.188.92]:34839) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1he19O-0007Gv-Q9 for qemu-devel@nongnu.org; Thu, 20 Jun 2019 13:47:08 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1he109-0004hb-Fl for qemu-devel@nongnu.org; Thu, 20 Jun 2019 13:37:34 -0400 Received: from mx1.redhat.com ([209.132.183.28]:53936) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1he109-0004ez-8f for qemu-devel@nongnu.org; Thu, 20 Jun 2019 13:37:33 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 25FCA223879; Thu, 20 Jun 2019 17:37:31 +0000 (UTC) Received: from localhost (ovpn-116-108.ams2.redhat.com [10.36.116.108]) by smtp.corp.redhat.com (Postfix) with ESMTP id C23AE5C1A1; Thu, 20 Jun 2019 17:37:25 +0000 (UTC) From: Stefan Hajnoczi To: qemu-devel@nongnu.org Date: Thu, 20 Jun 2019 18:37:07 +0100 Message-Id: <20190620173709.14753-2-stefanha@redhat.com> In-Reply-To: <20190620173709.14753-1-stefanha@redhat.com> References: <20190620173709.14753-1-stefanha@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.39]); Thu, 20 Jun 2019 17:37:31 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v5 1/3] vl: add qemu_add_vm_change_state_handler_prio() X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kevin Wolf , Paolo Bonzini , Fam Zheng , Stefan Hajnoczi , "Michael S. Tsirkin" Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" Add an API for registering vm change state handlers with a well-defined ordering. This is necessary when handlers depend on each other. Small coding style fixes are included to make checkpatch.pl happy. Signed-off-by: Stefan Hajnoczi --- include/sysemu/sysemu.h | 2 ++ vl.c | 59 ++++++++++++++++++++++++++++++++--------- 2 files changed, 49 insertions(+), 12 deletions(-) diff --git a/include/sysemu/sysemu.h b/include/sysemu/sysemu.h index 61579ae71e..984c439ac9 100644 --- a/include/sysemu/sysemu.h +++ b/include/sysemu/sysemu.h @@ -29,6 +29,8 @@ typedef void VMChangeStateHandler(void *opaque, int runni= ng, RunState state); =20 VMChangeStateEntry *qemu_add_vm_change_state_handler(VMChangeStateHandler = *cb, void *opaque); +VMChangeStateEntry *qemu_add_vm_change_state_handler_prio( + VMChangeStateHandler *cb, void *opaque, int priority); void qemu_del_vm_change_state_handler(VMChangeStateEntry *e); void vm_state_notify(int running, RunState state); =20 diff --git a/vl.c b/vl.c index 99a56b5556..7fac2ae7ca 100644 --- a/vl.c +++ b/vl.c @@ -1471,28 +1471,57 @@ static int machine_help_func(QemuOpts *opts, Machin= eState *machine) struct vm_change_state_entry { VMChangeStateHandler *cb; void *opaque; - QLIST_ENTRY (vm_change_state_entry) entries; + QTAILQ_ENTRY(vm_change_state_entry) entries; + int priority; }; =20 -static QLIST_HEAD(, vm_change_state_entry) vm_change_state_head; +static QTAILQ_HEAD(, vm_change_state_entry) vm_change_state_head; =20 -VMChangeStateEntry *qemu_add_vm_change_state_handler(VMChangeStateHandler = *cb, - void *opaque) +/** + * qemu_add_vm_change_state_handler_prio: + * @cb: the callback to invoke + * @opaque: user data passed to the callback + * @priority: low priorities execute first when the vm runs and the revers= e is + * true when the vm stops + * + * Register a callback function that is invoked when the vm starts or stops + * running. + * + * Returns: an entry to be freed using qemu_del_vm_change_state_handler() + */ +VMChangeStateEntry *qemu_add_vm_change_state_handler_prio( + VMChangeStateHandler *cb, void *opaque, int priority) { VMChangeStateEntry *e; + VMChangeStateEntry *other; =20 - e =3D g_malloc0(sizeof (*e)); - + e =3D g_malloc0(sizeof(*e)); e->cb =3D cb; e->opaque =3D opaque; - QLIST_INSERT_HEAD(&vm_change_state_head, e, entries); + e->priority =3D priority; + + /* Keep list sorted in ascending priority order */ + QTAILQ_FOREACH(other, &vm_change_state_head, entries) { + if (priority < other->priority) { + QTAILQ_INSERT_BEFORE(other, e, entries); + return e; + } + } + + QTAILQ_INSERT_TAIL(&vm_change_state_head, e, entries); return e; } =20 +VMChangeStateEntry *qemu_add_vm_change_state_handler(VMChangeStateHandler = *cb, + void *opaque) +{ + return qemu_add_vm_change_state_handler_prio(cb, opaque, 0); +} + void qemu_del_vm_change_state_handler(VMChangeStateEntry *e) { - QLIST_REMOVE (e, entries); - g_free (e); + QTAILQ_REMOVE(&vm_change_state_head, e, entries); + g_free(e); } =20 void vm_state_notify(int running, RunState state) @@ -1501,8 +1530,14 @@ void vm_state_notify(int running, RunState state) =20 trace_vm_state_notify(running, state, RunState_str(state)); =20 - QLIST_FOREACH_SAFE(e, &vm_change_state_head, entries, next) { - e->cb(e->opaque, running, state); + if (running) { + QTAILQ_FOREACH_SAFE(e, &vm_change_state_head, entries, next) { + e->cb(e->opaque, running, state); + } + } else { + QTAILQ_FOREACH_REVERSE_SAFE(e, &vm_change_state_head, entries, nex= t) { + e->cb(e->opaque, running, state); + } } } =20 @@ -3025,7 +3060,7 @@ int main(int argc, char **argv, char **envp) exit(1); } =20 - QLIST_INIT (&vm_change_state_head); + QTAILQ_INIT(&vm_change_state_head); os_setup_early_signal_handling(); =20 cpu_option =3D NULL; --=20 2.21.0 From nobody Thu May 16 05:34:45 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1561053035; cv=none; d=zoho.com; s=zohoarc; b=VqRSrGzHgkLdghfdBADVZH3Yt+OjVihky3pSt0FXDrwd5iKyfL4lKyiOsbay5fm2vfm1xNjh1HnmZxPpU5gPIr0JUilXZL4RC0voGpje5GBtsXwW5l2oPqc5zA7ZF76K6tvuidLOeHyUZWhbRbtwb9dWh9n4i31CVTMLVgrXR6U= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1561053035; h=Content-Transfer-Encoding:Cc: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:ARC-Authentication-Results; bh=yLF4kv1aVicP6a0gbSwuDgsJYt/Q8JpAXlTc5GElo0M=; b=WTuHy/DNFrvIUGT4U2A6/hXzYRr8sGvSYAL39t9bwM1Ns0Bqk5Uijr9cDfe7SqheBQ/8vR/pKO7zmBt9l1rxGClxKvvUQvPeDNxNJggsTx1wfxBkSBCoICwyU6x4CU0s8s77OQwlzXonUoKGVz8A72OgNT8yOWYMioAK1xKrFgg= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1561053035245744.2904681691665; Thu, 20 Jun 2019 10:50:35 -0700 (PDT) Received: from localhost ([::1]:51902 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1he1Cj-0001IB-OZ for importer@patchew.org; Thu, 20 Jun 2019 13:50:33 -0400 Received: from eggs.gnu.org ([209.51.188.92]:34981) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1he19O-0007LJ-Pa for qemu-devel@nongnu.org; Thu, 20 Jun 2019 13:47:08 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1he10F-0004oL-8O for qemu-devel@nongnu.org; Thu, 20 Jun 2019 13:37:41 -0400 Received: from mx1.redhat.com ([209.132.183.28]:54142) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1he10E-0004nK-P9 for qemu-devel@nongnu.org; Thu, 20 Jun 2019 13:37:39 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 2090F86679; Thu, 20 Jun 2019 17:37:38 +0000 (UTC) Received: from localhost (ovpn-116-108.ams2.redhat.com [10.36.116.108]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8D785604A3; Thu, 20 Jun 2019 17:37:33 +0000 (UTC) From: Stefan Hajnoczi To: qemu-devel@nongnu.org Date: Thu, 20 Jun 2019 18:37:08 +0100 Message-Id: <20190620173709.14753-3-stefanha@redhat.com> In-Reply-To: <20190620173709.14753-1-stefanha@redhat.com> References: <20190620173709.14753-1-stefanha@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.26]); Thu, 20 Jun 2019 17:37:38 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v5 2/3] qdev: add qdev_add_vm_change_state_handler() X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kevin Wolf , Paolo Bonzini , Fam Zheng , Stefan Hajnoczi , "Michael S. Tsirkin" Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" Children sometimes depend on their parent's vm change state handler having completed. Add a vm change state handler API for devices that guarantees tree depth ordering. Signed-off-by: Stefan Hajnoczi --- hw/core/Makefile.objs | 1 + include/hw/qdev-core.h | 5 +++ hw/core/vm-change-state-handler.c | 61 +++++++++++++++++++++++++++++++ 3 files changed, 67 insertions(+) create mode 100644 hw/core/vm-change-state-handler.c diff --git a/hw/core/Makefile.objs b/hw/core/Makefile.objs index a799c83815..dc0895ee9a 100644 --- a/hw/core/Makefile.objs +++ b/hw/core/Makefile.objs @@ -7,6 +7,7 @@ common-obj-$(CONFIG_SOFTMMU) +=3D fw-path-provider.o common-obj-y +=3D irq.o common-obj-y +=3D hotplug.o common-obj-$(CONFIG_SOFTMMU) +=3D nmi.o +common-obj-$(CONFIG_SOFTMMU) +=3D vm-change-state-handler.o =20 common-obj-$(CONFIG_EMPTY_SLOT) +=3D empty_slot.o common-obj-$(CONFIG_XILINX_AXI) +=3D stream.o diff --git a/include/hw/qdev-core.h b/include/hw/qdev-core.h index fa55dc10ae..e157fc4acd 100644 --- a/include/hw/qdev-core.h +++ b/include/hw/qdev-core.h @@ -6,6 +6,7 @@ #include "qom/object.h" #include "hw/irq.h" #include "hw/hotplug.h" +#include "sysemu/sysemu.h" =20 enum { DEV_NVECTORS_UNSPECIFIED =3D -1, @@ -450,4 +451,8 @@ static inline bool qbus_is_hotpluggable(BusState *bus) void device_listener_register(DeviceListener *listener); void device_listener_unregister(DeviceListener *listener); =20 +VMChangeStateEntry *qdev_add_vm_change_state_handler(DeviceState *dev, + VMChangeStateHandler = *cb, + void *opaque); + #endif diff --git a/hw/core/vm-change-state-handler.c b/hw/core/vm-change-state-ha= ndler.c new file mode 100644 index 0000000000..f814813bdd --- /dev/null +++ b/hw/core/vm-change-state-handler.c @@ -0,0 +1,61 @@ +/* + * qdev vm change state handlers + * + * 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 (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, see . + */ + +#include "qemu/osdep.h" +#include "hw/qdev.h" + +static int qdev_get_dev_tree_depth(DeviceState *dev) +{ + int depth; + + for (depth =3D 0; dev; depth++) { + BusState *bus =3D dev->parent_bus; + + if (!bus) { + break; + } + + dev =3D bus->parent; + } + + return depth; +} + +/** + * qdev_add_vm_change_state_handler: + * @dev: the device that owns this handler + * @cb: the callback function to be invoked + * @opaque: user data passed to the callback function + * + * This function works like qemu_add_vm_change_state_handler() except call= backs + * are invoked in qdev tree depth order. Ordering is desirable when callb= acks + * of children depend on their parent's callback having completed first. + * + * For example, when qdev_add_vm_change_state_handler() is used, a host + * controller's callback is invoked before the children on its bus when th= e VM + * starts running. The order is reversed when the VM stops running. + * + * Returns: an entry to be freed with qemu_del_vm_change_state_handler() + */ +VMChangeStateEntry *qdev_add_vm_change_state_handler(DeviceState *dev, + VMChangeStateHandler = *cb, + void *opaque) +{ + int depth =3D qdev_get_dev_tree_depth(dev); + + return qemu_add_vm_change_state_handler_prio(cb, opaque, depth); +} --=20 2.21.0 From nobody Thu May 16 05:34:45 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1561053240; cv=none; d=zoho.com; s=zohoarc; b=NXAB5K3iy56KOrjVVQWmHdR/QlMZx5SVNHPypqAc+OfVaGnjk957vMkGfRZt6tYGyLn/U6FZ36f0PfBB/97CEyEX0qb/LEvdCzREzXINgs8q0NvlSAYBFB3jaEoXj5l7rokawrzJkvQvkcBCt6PSEf3ZHhL/a4qd2Z1RB5DMZBA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1561053240; h=Content-Transfer-Encoding:Cc: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:ARC-Authentication-Results; bh=lVb+KNkZb4Mf4RanskrSClg1Iu4fvY/yVFGUTsnM/oU=; b=d4TZRmZmThPxQjf+j3im+VI7ub4GcwjjrHo3bKpJTLJ8p7szo7BqQKtWaOETc1BdOCrxxi86xqx4WCBhEb7DSRpdjbCy/tm88c+Sg8jYb1JfGEcybm9u9gga3ant3/EnsOLlizgY+m/7zBP2Pim3HaMH43Ve7idI+FL3+1jeCbg= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (209.51.188.17 [209.51.188.17]) by mx.zohomail.com with SMTPS id 1561053240350672.4271336593158; Thu, 20 Jun 2019 10:54:00 -0700 (PDT) Received: from localhost ([::1]:51934 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1he1Fy-0004bG-04 for importer@patchew.org; Thu, 20 Jun 2019 13:53:54 -0400 Received: from eggs.gnu.org ([209.51.188.92]:34919) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1he19O-0007IG-Ou for qemu-devel@nongnu.org; Thu, 20 Jun 2019 13:47:08 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1he10I-0004rK-1Z for qemu-devel@nongnu.org; Thu, 20 Jun 2019 13:37:43 -0400 Received: from mx1.redhat.com ([209.132.183.28]:44948) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1he10H-0004qM-RC for qemu-devel@nongnu.org; Thu, 20 Jun 2019 13:37:41 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id EFD1B90C77; Thu, 20 Jun 2019 17:37:40 +0000 (UTC) Received: from localhost (ovpn-116-108.ams2.redhat.com [10.36.116.108]) by smtp.corp.redhat.com (Postfix) with ESMTP id 83E6B5C1A1; Thu, 20 Jun 2019 17:37:40 +0000 (UTC) From: Stefan Hajnoczi To: qemu-devel@nongnu.org Date: Thu, 20 Jun 2019 18:37:09 +0100 Message-Id: <20190620173709.14753-4-stefanha@redhat.com> In-Reply-To: <20190620173709.14753-1-stefanha@redhat.com> References: <20190620173709.14753-1-stefanha@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.29]); Thu, 20 Jun 2019 17:37:41 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v5 3/3] virtio-scsi: restart DMA after iothread X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kevin Wolf , Paolo Bonzini , Fam Zheng , Stefan Hajnoczi , "Michael S. Tsirkin" Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" When the 'cont' command resumes guest execution the vm change state handlers are invoked. Unfortunately there is no explicit ordering between classic qemu_add_vm_change_state_handler() callbacks. When two layers of code both use vm change state handlers, we don't control which handler runs first. virtio-scsi with iothreads hits a deadlock when a failed SCSI command is restarted and completes before the iothread is re-initialized. This patch uses the new qdev_add_vm_change_state_handler() API to guarantee that virtio-scsi's virtio change state handler executes before the SCSI bus children. This way DMA is restarted after the iothread has re-initialized. Signed-off-by: Stefan Hajnoczi --- hw/scsi/scsi-bus.c | 4 ++-- hw/virtio/virtio.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/hw/scsi/scsi-bus.c b/hw/scsi/scsi-bus.c index 196136a307..fdc3a0e4e0 100644 --- a/hw/scsi/scsi-bus.c +++ b/hw/scsi/scsi-bus.c @@ -207,8 +207,8 @@ static void scsi_qdev_realize(DeviceState *qdev, Error = **errp) error_propagate(errp, local_err); return; } - dev->vmsentry =3D qemu_add_vm_change_state_handler(scsi_dma_restart_cb, - dev); + dev->vmsentry =3D qdev_add_vm_change_state_handler(DEVICE(dev), + scsi_dma_restart_cb, dev); } =20 static void scsi_qdev_unrealize(DeviceState *qdev, Error **errp) diff --git a/hw/virtio/virtio.c b/hw/virtio/virtio.c index e1e90fcfd6..e42e6710d2 100644 --- a/hw/virtio/virtio.c +++ b/hw/virtio/virtio.c @@ -2354,8 +2354,8 @@ void virtio_init(VirtIODevice *vdev, const char *name, } else { vdev->config =3D NULL; } - vdev->vmstate =3D qemu_add_vm_change_state_handler(virtio_vmstate_chan= ge, - vdev); + vdev->vmstate =3D qdev_add_vm_change_state_handler(DEVICE(vdev), + virtio_vmstate_change, vdev); vdev->device_endian =3D virtio_default_endian(); vdev->use_guest_notifier_mask =3D true; } --=20 2.21.0