From patchwork Tue Mar 15 12:20:18 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wido den Hollander X-Patchwork-Id: 636031 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id p2FCKNQf014624 for ; Tue, 15 Mar 2011 12:20:23 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757550Ab1COMUW (ORCPT ); Tue, 15 Mar 2011 08:20:22 -0400 Received: from smtp02.mail.pcextreme.nl ([109.72.87.138]:49010 "EHLO smtp02.mail.pcextreme.nl" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757548Ab1COMUV (ORCPT ); Tue, 15 Mar 2011 08:20:21 -0400 Received: from [IPv6:2a00:f10:113:1:224:1dff:fedd:9061] (unknown [IPv6:2a00:f10:113:1:224:1dff:fedd:9061]) by smtp02.mail.pcextreme.nl (Postfix) with ESMTPSA id 7CDDF4267C for ; Tue, 15 Mar 2011 13:20:19 +0100 (CET) Subject: [Qemu] Passing config options to librados From: Wido den Hollander To: ceph-devel@vger.kernel.org Date: Tue, 15 Mar 2011 13:20:18 +0100 Message-ID: <1300191618.2434.27.camel@wido-desktop> Mime-Version: 1.0 X-Mailer: Evolution 2.28.3 Sender: ceph-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: ceph-devel@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Tue, 15 Mar 2011 12:20:23 +0000 (UTC) diff --git a/block/rbd.c b/block/rbd.c index f722cb4..7cd12f4 100644 --- a/block/rbd.c +++ b/block/rbd.c @@ -222,6 +222,11 @@ static int qemu_rbd_create(const char *filename, QEMUOptionParameter *options) return -EIO; } + if (rados_conf_read_file(cluster, "/etc/ceph/ceph.conf") < 0) { + error_report("error reading configuration file"); + return -EIO; + } + if (rados_connect(cluster) < 0) { error_report("error connecting");