[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-block] [PATCH COLO-Block v5 10/15] NBD client: connect to nbd serv
From: |
Wen Congyang |
Subject: |
[Qemu-block] [PATCH COLO-Block v5 10/15] NBD client: connect to nbd server later |
Date: |
Thu, 21 May 2015 12:53:03 +0800 |
The secondary qemu starts later than the primary qemu, so we
cannot connect to nbd server in bdrv_open(). Introduce a new
open flags to control it.
Signed-off-by: Wen Congyang <address@hidden>
Signed-off-by: zhanghailiang <address@hidden>
Signed-off-by: Gonglei <address@hidden>
---
block/nbd.c | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
diff --git a/block/nbd.c b/block/nbd.c
index bc9477a..4964cf8 100644
--- a/block/nbd.c
+++ b/block/nbd.c
@@ -298,11 +298,13 @@ static int nbd_open(BlockDriverState *bs, QDict *options,
int flags,
return -EINVAL;
}
- nbd_connect_server(bs, &local_err);
- if (local_err) {
- error_propagate(errp, local_err);
- g_free(s->export);
- return -EINVAL;
+ if (!(flags & BDRV_O_NO_CONNECT)) {
+ nbd_connect_server(bs, &local_err);
+ if (local_err) {
+ error_propagate(errp, local_err);
+ g_free(s->export);
+ return -EINVAL;
+ }
}
return 0;
--
2.1.0
- [Qemu-block] [PATCH COLO-Block v5 00/15] Block replication for continuous checkpoints, Wen Congyang, 2015/05/21
- [Qemu-block] [PATCH COLO-Block v5 02/15] allow writing to the backing file, Wen Congyang, 2015/05/21
- [Qemu-block] [PATCH COLO-Block v5 01/15] docs: block replication's description, Wen Congyang, 2015/05/21
- [Qemu-block] [PATCH COLO-Block v5 04/15] block: Parse "backing_reference" option to reference existing BDS, Wen Congyang, 2015/05/21
- [Qemu-block] [PATCH COLO-Block v5 06/15] Don't allow a disk use backing reference target, Wen Congyang, 2015/05/21
- [Qemu-block] [PATCH COLO-Block v5 03/15] Allow creating backup jobs when opening BDS, Wen Congyang, 2015/05/21
- [Qemu-block] [PATCH COLO-Block v5 07/15] Add new block driver interface to connect/disconnect the remote target, Wen Congyang, 2015/05/21
- [Qemu-block] [PATCH COLO-Block v5 09/15] Introduce a new -drive option to control whether to connect to remote target, Wen Congyang, 2015/05/21
- [Qemu-block] [PATCH COLO-Block v5 08/15] NBD client: implement block driver interfaces to connect/disconnect NBD server, Wen Congyang, 2015/05/21
- [Qemu-block] [PATCH COLO-Block v5 10/15] NBD client: connect to nbd server later,
Wen Congyang <=
- [Qemu-block] [PATCH COLO-Block v5 12/15] skip nbd_target when starting block replication, Wen Congyang, 2015/05/21
- [Qemu-block] [PATCH COLO-Block v5 11/15] Add new block driver interfaces to control block replication, Wen Congyang, 2015/05/21
- [Qemu-block] [PATCH COLO-Block v5 13/15] quorum: implement block driver interfaces for block replication, Wen Congyang, 2015/05/21
- [Qemu-block] [PATCH COLO-Block v5 14/15] quorum: allow ignoring child errors, Wen Congyang, 2015/05/21
- [Qemu-block] [PATCH COLO-Block v5 15/15] Implement new driver for block replication, Wen Congyang, 2015/05/21
- [Qemu-block] [PATCH COLO-Block v5 05/15] Backup: clear all bitmap when doing block checkpoint, Wen Congyang, 2015/05/21
- Re: [Qemu-block] [PATCH COLO-Block v5 00/15] Block replication for continuous checkpoints, Wen Congyang, 2015/05/21
- Re: [Qemu-block] [PATCH COLO-Block v5 00/15] Block replication for continuous checkpoints, Wen Congyang, 2015/05/28