From patchwork Mon Jun 2 07:49:33 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Auger Eric X-Patchwork-Id: 31259 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-pd0-f198.google.com (mail-pd0-f198.google.com [209.85.192.198]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 7448220AE6 for ; Mon, 2 Jun 2014 07:50:36 +0000 (UTC) Received: by mail-pd0-f198.google.com with SMTP id w10sf14774834pde.1 for ; Mon, 02 Jun 2014 00:50:35 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:cc:subject :date:message-id:in-reply-to:references:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :list-post:list-help:list-archive:list-unsubscribe; bh=zz7wDTku5RlYnxk8bzD8WlzRtzjglr8Om1offtekKTY=; b=RwLxb9/dycQZj23v8tTBxEiqUgNvZI4x/UiJXMpxkWe0SgzGHKVzbR6OwaQAsuFKO0 QM7MLRRuksWzOdtqgf7LeCZCTx3UWW2BD8zWVWKb9BVwP2Q772umaFaD8I1gLA7MsoKs XI0Iu44EIRFLVrxTA48R5jjWYM41++Tnby8LOdK82BFgdkbI+7mipgkObBxnPFBQUncP qCaYbg7VC81wAS8PG4XXZcgLJ+H/0Duu9l5j2lOzx0jATW0uKxr4vlbJaJWB3YuWscvC HVyT2uiWlI9gwRbkfDEzmoAUyeZvoGnCHT3Ue1f1btCg8Ymrc+ELJKpgWa29lMSXEimt q0ng== X-Gm-Message-State: ALoCoQnjOL5L5HP3xIwZJqezToY1dzCyDIJUomgu/PxcAYx5PZLLdWvt+/lep16M0VYyMNb5wfSB X-Received: by 10.66.173.75 with SMTP id bi11mr14973964pac.4.1401695435710; Mon, 02 Jun 2014 00:50:35 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.89.203 with SMTP id v69ls1900088qgd.6.gmail; Mon, 02 Jun 2014 00:50:35 -0700 (PDT) X-Received: by 10.52.99.168 with SMTP id er8mr24388117vdb.26.1401695435595; Mon, 02 Jun 2014 00:50:35 -0700 (PDT) Received: from mail-ve0-f178.google.com (mail-ve0-f178.google.com [209.85.128.178]) by mx.google.com with ESMTPS id ui7si7510265vcb.92.2014.06.02.00.50.35 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 02 Jun 2014 00:50:35 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.128.178 as permitted sender) client-ip=209.85.128.178; Received: by mail-ve0-f178.google.com with SMTP id sa20so4871293veb.9 for ; Mon, 02 Jun 2014 00:50:35 -0700 (PDT) X-Received: by 10.58.19.138 with SMTP id f10mr10608450vee.12.1401695435531; Mon, 02 Jun 2014 00:50:35 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patches@linaro.org Received: by 10.220.221.72 with SMTP id ib8csp78780vcb; Mon, 2 Jun 2014 00:50:35 -0700 (PDT) X-Received: by 10.180.94.98 with SMTP id db2mr19867497wib.1.1401695434186; Mon, 02 Jun 2014 00:50:34 -0700 (PDT) Received: from mail-we0-f181.google.com (mail-we0-f181.google.com [74.125.82.181]) by mx.google.com with ESMTPS id bz9si737225wib.30.2014.06.02.00.50.33 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 02 Jun 2014 00:50:34 -0700 (PDT) Received-SPF: pass (google.com: domain of eric.auger@linaro.org designates 74.125.82.181 as permitted sender) client-ip=74.125.82.181; Received: by mail-we0-f181.google.com with SMTP id w61so4655848wes.40 for ; Mon, 02 Jun 2014 00:50:33 -0700 (PDT) X-Received: by 10.180.78.225 with SMTP id e1mr19907697wix.17.1401695433600; Mon, 02 Jun 2014 00:50:33 -0700 (PDT) Received: from midway01-04-00.lavalab ([88.98.47.97]) by mx.google.com with ESMTPSA id je7sm30286772wic.14.2014.06.02.00.50.32 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 02 Jun 2014 00:50:32 -0700 (PDT) From: Eric Auger To: eric.auger@st.com, christoffer.dall@linaro.org, qemu-devel@nongnu.org, kim.phillips@freescale.com, a.rigo@virtualopensystems.com Cc: eric.auger@linaro.org, christophe.barnichon@st.com, kvmarm@lists.cs.columbia.edu, alex.williamson@redhat.com, agraf@suse.de, peter.maydell@linaro.org, stuart.yoder@freescale.com, a.motakis@virtualopensystems.com, patches@linaro.org Subject: [RFC v3 09/10] Always use eventfd as notifying mechanism Date: Mon, 2 Jun 2014 08:49:33 +0100 Message-Id: <1401695374-4287-10-git-send-email-eric.auger@linaro.org> X-Mailer: git-send-email 1.8.3.2 In-Reply-To: <1401695374-4287-1-git-send-email-eric.auger@linaro.org> References: <1401695374-4287-1-git-send-email-eric.auger@linaro.org> X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: eric.auger@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.128.178 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Precedence: list Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org List-ID: X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , From: Alvise Rigo When eventfd is not configured the method event_notifier_init fallbacks to the pipe/pipe2 system call, causing an error in VFIO_DEVICE_SET_IRQS since we pass to the kernel a file descriptor which is not created by eventfd. Signed-off-by: Alvise Rigo --- hw/vfio/platform.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/hw/vfio/platform.c b/hw/vfio/platform.c index 377783b..56dde5f 100644 --- a/hw/vfio/platform.c +++ b/hw/vfio/platform.c @@ -346,6 +346,11 @@ static int vfio_enable_intp(VFIODevice *vdev, unsigned int index) sysbus_init_irq(sbdev, &intp->qemuirq); ret = event_notifier_init(&intp->interrupt, 0); + if (!ret && (intp->interrupt.rfd != intp->interrupt.wfd)) { + /* event_notifier_init created a pipe instead of eventfd */ + ret = -1; + } + if (ret) { error_report("vfio: Error: event_notifier_init failed "); return ret;