aboutsummaryrefslogtreecommitdiff
path: root/block
diff options
context:
space:
mode:
authorSage Weil <sage@newdream.net>2011-09-15 14:11:08 -0700
committerKevin Wolf <kwolf@redhat.com>2011-09-20 12:27:44 +0200
commitf9fe18ec772d2852caaa7ca3cb72720d6822edca (patch)
tree0fd40b15efd237a1de32aef32a17d4360c54482d /block
parenta26a13da687f757c07e2a5c26fa411840405e6d7 (diff)
downloadqemu-f9fe18ec772d2852caaa7ca3cb72720d6822edca.zip
qemu-f9fe18ec772d2852caaa7ca3cb72720d6822edca.tar.gz
qemu-f9fe18ec772d2852caaa7ca3cb72720d6822edca.tar.bz2
rbd: ignore failures when reading from default conf location
If we are reading from the default config location, ignore any failures. It is perfectly legal for the user to specify exactly the options they need and to not rely on any config file. Signed-off-by: Sage Weil <sage@newdream.net> Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Diffstat (limited to 'block')
-rw-r--r--block/rbd.c14
1 files changed, 4 insertions, 10 deletions
diff --git a/block/rbd.c b/block/rbd.c
index 1b78d51..f64b2e0 100644
--- a/block/rbd.c
+++ b/block/rbd.c
@@ -298,11 +298,8 @@ static int qemu_rbd_create(const char *filename, QEMUOptionParameter *options)
}
if (strstr(conf, "conf=") == NULL) {
- if (rados_conf_read_file(cluster, NULL) < 0) {
- error_report("error reading config file");
- rados_shutdown(cluster);
- return -EIO;
- }
+ /* try default location, but ignore failure */
+ rados_conf_read_file(cluster, NULL);
}
if (conf[0] != '\0' &&
@@ -441,11 +438,8 @@ static int qemu_rbd_open(BlockDriverState *bs, const char *filename, int flags)
}
if (strstr(conf, "conf=") == NULL) {
- r = rados_conf_read_file(s->cluster, NULL);
- if (r < 0) {
- error_report("error reading config file");
- goto failed_shutdown;
- }
+ /* try default location, but ignore failure */
+ rados_conf_read_file(s->cluster, NULL);
}
if (conf[0] != '\0') {