From patchwork Sun Mar 24 07:41:15 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Liu Yuan X-Patchwork-Id: 230378 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id AA8DD2C00C0 for ; Sun, 24 Mar 2013 18:41:48 +1100 (EST) Received: from localhost ([::1]:36192 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UJfYo-0007r1-P9 for incoming@patchwork.ozlabs.org; Sun, 24 Mar 2013 03:41:46 -0400 Received: from eggs.gnu.org ([208.118.235.92]:59549) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UJfYZ-0007qe-OU for qemu-devel@nongnu.org; Sun, 24 Mar 2013 03:41:32 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UJfYY-0006Dm-Sq for qemu-devel@nongnu.org; Sun, 24 Mar 2013 03:41:31 -0400 Received: from mail-pb0-f44.google.com ([209.85.160.44]:61526) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UJfYY-0006Da-Lo for qemu-devel@nongnu.org; Sun, 24 Mar 2013 03:41:30 -0400 Received: by mail-pb0-f44.google.com with SMTP id wz17so215851pbc.3 for ; Sun, 24 Mar 2013 00:41:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=x-received:from:to:cc:subject:date:message-id:x-mailer; bh=vz7cfslTQBSTXh+FTw3JQHiCd4LDO+henpVaKQ9n7Ks=; b=DOb3Cza8dW5AewRHQ9l09PEjvgZAX6KsJgTSSfniutVcmUZj1TLVG+HJs6F7pUSjOR sKQLMZ9M2/jnKoymSkiVvuLmOIYsXtTCkF7T/sI8usuxdaxHVNauGoZkeadSXG/fBXcR neAJOafi1gsM01XO6p1QEBNjPe5vWuqr1OA3B6MZLM8/SffBRw2VN85vF7iF/7qCJIKc dymTz2N+LzoT949hhMo5ySGLJTMx7pOrVAk1/kvlK0/JDRSFamCYhc/l7l/pyeZWCn1B V2PF2P8+BmBn4SyPYHcGw6KkNwtyg8D+IprqlrJaGlPJFaOVcaMV/D/RUh2fWLZlYyIT mtdQ== X-Received: by 10.68.225.195 with SMTP id rm3mr11058276pbc.188.1364110888854; Sun, 24 Mar 2013 00:41:28 -0700 (PDT) Received: from localhost.localdomain ([123.119.187.89]) by mx.google.com with ESMTPS id pg7sm8839772pbc.5.2013.03.24.00.41.23 (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Sun, 24 Mar 2013 00:41:27 -0700 (PDT) From: Liu Yuan To: qemu-devel@nongnu.org Date: Sun, 24 Mar 2013 15:41:15 +0800 Message-Id: <1364110875-7074-1-git-send-email-namei.unix@gmail.com> X-Mailer: git-send-email 1.7.9.5 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [fuzzy] X-Received-From: 209.85.160.44 Cc: Kevin Wolf , Stefan Hajnoczi Subject: [Qemu-devel] [PATCH] rbd: fix compile error 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 From: Liu Yuan Commit 787e4a85 [block: Add options QDict to bdrv_file_open() prototypes] didn't update rbd.c accordingly. Cc: Kevin Wolf Cc: Stefan Hajnoczi Signed-off-by: Liu Yuan Reviewed-by: Stefan Weil --- block/rbd.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/block/rbd.c b/block/rbd.c index 8cd10a7..1a8ea6d 100644 --- a/block/rbd.c +++ b/block/rbd.c @@ -441,7 +441,8 @@ static int qemu_rbd_aio_flush_cb(void *opaque) return (s->qemu_aio_count > 0); } -static int qemu_rbd_open(BlockDriverState *bs, const char *filename, int flags) +static int qemu_rbd_open(BlockDriverState *bs, const char *filename, + QDict *options, int flags) { BDRVRBDState *s = bs->opaque; char pool[RBD_MAX_POOL_NAME_SIZE];