aboutsummaryrefslogtreecommitdiff
path: root/block/nbd.c
diff options
context:
space:
mode:
authorAnthony Liguori <aliguori@us.ibm.com>2013-04-22 08:08:22 -0500
committerAnthony Liguori <aliguori@us.ibm.com>2013-04-22 08:08:22 -0500
commitf1ab7a5acf08dcc11638b22660ed87d5f6d633c2 (patch)
tree4feebf5c7cb407a13225d4c3cf1870914140a719 /block/nbd.c
parent25690739f1f067b6d8b2e616d87b1d976db0db92 (diff)
parent7da94ca741e01a80afd65e107cc2cee160d1b2d2 (diff)
downloadqemu-f1ab7a5acf08dcc11638b22660ed87d5f6d633c2.zip
qemu-f1ab7a5acf08dcc11638b22660ed87d5f6d633c2.tar.gz
qemu-f1ab7a5acf08dcc11638b22660ed87d5f6d633c2.tar.bz2
Merge remote-tracking branch 'kwolf/for-anthony' into staging
# By Kevin Wolf (16) and Stefan Hajnoczi (4) # Via Kevin Wolf * kwolf/for-anthony: qemu-iotests: add 053 unaligned compressed image size test block: Allow overriding backing.file.filename block: Remove filename parameter from .bdrv_file_open() vvfat: Use bdrv_open options instead of filename sheepdog: Use bdrv_open options instead of filename rbd: Use bdrv_open options instead of filename iscsi: Use bdrv_open options instead of filename gluster: Use bdrv_open options instead of filename curl: Use bdrv_open options instead of filename blkverify: Use bdrv_open options instead of filename blkdebug: Use bdrv_open options instead of filename raw-win32: Use bdrv_open options instead of filename raw-posix: Use bdrv_open options instead of filename block: Enable filename option block: Add driver-specific options for backing files block: Fail gracefully when using a format driver on protocol level qemu-iotests: Fix _filter_qemu qemu-img: do not zero-pad the compressed write buffer qcow: allow sub-cluster compressed write to last cluster qcow2: allow sub-cluster compressed write to last cluster Message-id: 1366630294-18984-1-git-send-email-kwolf@redhat.com Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'block/nbd.c')
-rw-r--r--block/nbd.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/block/nbd.c b/block/nbd.c
index d9dc454..fab114b 100644
--- a/block/nbd.c
+++ b/block/nbd.c
@@ -454,8 +454,7 @@ static void nbd_teardown_connection(BlockDriverState *bs)
closesocket(s->sock);
}
-static int nbd_open(BlockDriverState *bs, const char* filename,
- QDict *options, int flags)
+static int nbd_open(BlockDriverState *bs, QDict *options, int flags)
{
BDRVNBDState *s = bs->opaque;
int result;