From patchwork Tue Jun 16 08:10:54 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: chenfan X-Patchwork-Id: 484833 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id B93CF1400A0 for ; Tue, 16 Jun 2015 18:18:26 +1000 (AEST) Received: from localhost ([::1]:38575 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z4m4e-0004jU-RX for incoming@patchwork.ozlabs.org; Tue, 16 Jun 2015 04:18:24 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52336) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z4lza-0004Pr-HU for qemu-devel@nongnu.org; Tue, 16 Jun 2015 04:13:11 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Z4lzZ-0004ft-Fo for qemu-devel@nongnu.org; Tue, 16 Jun 2015 04:13:10 -0400 Received: from [59.151.112.132] (port=55292 helo=heian.cn.fujitsu.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z4lzY-0004Q8-Ep for qemu-devel@nongnu.org; Tue, 16 Jun 2015 04:13:09 -0400 X-IronPort-AV: E=Sophos;i="5.13,622,1427731200"; d="scan'208";a="97125625" Received: from unknown (HELO edo.cn.fujitsu.com) ([10.167.33.5]) by heian.cn.fujitsu.com with ESMTP; 16 Jun 2015 16:17:07 +0800 Received: from G08CNEXCHPEKD02.g08.fujitsu.local (localhost.localdomain [127.0.0.1]) by edo.cn.fujitsu.com (8.14.3/8.13.1) with ESMTP id t5G8BLAx021059; Tue, 16 Jun 2015 16:11:21 +0800 Received: from G08FNSTD131468.g08.fujitsu.local (10.167.226.78) by G08CNEXCHPEKD02.g08.fujitsu.local (10.167.33.89) with Microsoft SMTP Server (TLS) id 14.3.181.6; Tue, 16 Jun 2015 16:12:59 +0800 From: Chen Fan To: Date: Tue, 16 Jun 2015 16:10:54 +0800 Message-ID: X-Mailer: git-send-email 1.9.3 In-Reply-To: References: MIME-Version: 1.0 X-Originating-IP: [10.167.226.78] X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 59.151.112.132 Cc: izumi.taku@jp.fujitsu.com, alex.williamson@redhat.com Subject: [Qemu-devel] [RFC v10 10/19] vfio: improve vfio_get_group to support adding as is NULL. X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Signed-off-by: Chen Fan --- hw/vfio/common.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/hw/vfio/common.c b/hw/vfio/common.c index df3171d..15f19a2 100644 --- a/hw/vfio/common.c +++ b/hw/vfio/common.c @@ -808,11 +808,18 @@ VFIOGroup *vfio_get_group(int groupid, AddressSpace *as) VFIOGroup *group; char path[32]; struct vfio_group_status status = { .argsz = sizeof(status) }; + int ret; QLIST_FOREACH(group, &vfio_group_list, next) { if (group->groupid == groupid) { /* Found it. Now is it already in the right context? */ - if (group->container->space->as == as) { + if (as && !group->container->space->as) { + ret = vfio_register_container_listener(group->container, as); + if (ret) { + return NULL; + } + } + if (!as || group->container->space->as == as) { group->ref++; return group; } else {