Re: [Qemu-devel] [PATCH v4 2/3] Extract code to nbd_setup function to be used for many purposes

2011-12-09 Thread Stefan Hajnoczi
On Fri, Dec 9, 2011 at 8:31 AM, Chunyan Liu wrote: > Thanks for your suggestions. Revision. > > Add -f option to qemu-nbd. > > Signed-off-by: Chunyan Liu > --- >  qemu-nbd.c |   76 ++- >  1 files changed, 54 insertions(+), 22 deletions(-) L

Re: [Qemu-devel] [PATCH v4 2/3] Extract code to nbd_setup function to be used for many purposes

2011-12-09 Thread Chunyan Liu
Thanks for your suggestions. Revision. Add -f option to qemu-nbd. Signed-off-by: Chunyan Liu --- qemu-nbd.c | 76 ++- 1 files changed, 54 insertions(+), 22 deletions(-) diff --git a/qemu-nbd.c b/qemu-nbd.c index 291cba2..2dc0742 100644

Re: [Qemu-devel] [PATCH v4 2/3] Extract code to nbd_setup function to be used for many purposes

2011-12-08 Thread Stefan Hajnoczi
On Wed, Dec 7, 2011 at 4:23 AM, Chunyan Liu wrote: Overall looks good, some suggestions: > @@ -53,7 +53,7 @@ static void usage(const char *name) >  "  -o, --offset=OFFSET  offset into the image\n" >  "  -b, --bind=IFACE interface to bind to (default `0.0.0.0')\n" >  "  -k, --socket=PATH    p

Re: [Qemu-devel] [PATCH v4 2/3] Extract code to nbd_setup function to be used for many purposes

2011-12-07 Thread Paolo Bonzini
On 12/07/2011 05:23 AM, Chunyan Liu wrote: Add -f option to qemu-nbd. New implementation. Do not need nbd_setup. Tested and worked. Signed-off-by: Chunyan Liu mailto:cy...@suse.com>> --- qemu-nbd.c | 71 +-- 1 files changed, 49 inserti

Re: [Qemu-devel] [PATCH v4 2/3] Extract code to nbd_setup function to be used for many purposes

2011-12-06 Thread Chunyan Liu
Add -f option to qemu-nbd. New implementation. Do not need nbd_setup. Tested and worked. Signed-off-by: Chunyan Liu --- qemu-nbd.c | 71 +-- 1 files changed, 49 insertions(+), 22 deletions(-) diff --git a/qemu-nbd.c b/qemu-nbd.c index 29

Re: [Qemu-devel] [PATCH v4 2/3] Extract code to nbd_setup function to be used for many purposes

2011-12-06 Thread Chunyan Liu
2011/12/6 Paolo Bonzini > On 12/06/2011 09:42 AM, Chunyan Liu wrote: > >> >>I do not understand why you cannot simply do it like this: >> >>- in the server thread, do everything as it is now >> >> Nope. When device changes, both client thread and server thread should >> be refreshed. sock

Re: [Qemu-devel] [PATCH v4 2/3] Extract code to nbd_setup function to be used for many purposes

2011-12-06 Thread Paolo Bonzini
On 12/06/2011 09:42 AM, Chunyan Liu wrote: I do not understand why you cannot simply do it like this: - in the server thread, do everything as it is now Nope. When device changes, both client thread and server thread should be refreshed. sockpath and sharing_fds[] is changed with diffe

Re: [Qemu-devel] [PATCH v4 2/3] Extract code to nbd_setup function to be used for many purposes

2011-12-06 Thread Chunyan Liu
2011/12/6 Paolo Bonzini > On 12/06/2011 07:56 AM, Chunyan Liu wrote: > >> >> Currently, the nbd_setup needs parameters: device, srcpath, flags, >> partition, dev_offset, nbdflags, sockpath, bindto, port, shared, >> persistent, verbose, sigterm_rfd. More than 10 parameters. I still >> didn't find

Re: [Qemu-devel] [PATCH v4 2/3] Extract code to nbd_setup function to be used for many purposes

2011-12-06 Thread Paolo Bonzini
On 12/06/2011 07:56 AM, Chunyan Liu wrote: Currently, the nbd_setup needs parameters: device, srcpath, flags, partition, dev_offset, nbdflags, sockpath, bindto, port, shared, persistent, verbose, sigterm_rfd. More than 10 parameters. I still didn't find a better way to reduce parameters. Making

Re: [Qemu-devel] [PATCH v4 2/3] Extract code to nbd_setup function to be used for many purposes

2011-12-05 Thread Chunyan Liu
2011/12/5 Stefan Hajnoczi > On Mon, Dec 5, 2011 at 5:46 AM, Chunyan Liu wrote: > > 2011/12/3 Paolo Bonzini > >> > >> On 12/02/2011 04:27 PM, Chunyan Liu wrote: > >>> > >>> @@ -42,6 +42,18 @@ static int verbose; > >>> static char *device; > >>> static char *srcpath; > >>> static char *sockpat

Re: [Qemu-devel] [PATCH v4 2/3] Extract code to nbd_setup function to be used for many purposes

2011-12-05 Thread Stefan Hajnoczi
On Mon, Dec 5, 2011 at 5:46 AM, Chunyan Liu wrote: > 2011/12/3 Paolo Bonzini >> >> On 12/02/2011 04:27 PM, Chunyan Liu wrote: >>> >>> @@ -42,6 +42,18 @@ static int verbose; >>>  static char *device; >>>  static char *srcpath; >>>  static char *sockpath; >>> +static int is_sockpath_option; >>> +st

Re: [Qemu-devel] [PATCH v4 2/3] Extract code to nbd_setup function to be used for many purposes

2011-12-04 Thread Chunyan Liu
2011/12/3 Paolo Bonzini > On 12/02/2011 04:27 PM, Chunyan Liu wrote: > >> @@ -42,6 +42,18 @@ static int verbose; >> static char *device; >> static char *srcpath; >> static char *sockpath; >> +static int is_sockpath_option; >> +static int sigterm_fd[2]; >> +static off_t dev_offset; >> +static u

Re: [Qemu-devel] [PATCH v4 2/3] Extract code to nbd_setup function to be used for many purposes

2011-12-02 Thread Paolo Bonzini
On 12/02/2011 04:27 PM, Chunyan Liu wrote: @@ -42,6 +42,18 @@ static int verbose; static char *device; static char *srcpath; static char *sockpath; +static int is_sockpath_option; +static int sigterm_fd[2]; +static off_t dev_offset; +static uint32_t nbdflags; +static bool disconnect; +stati

[Qemu-devel] [PATCH v4 2/3] Extract code to nbd_setup function to be used for many purposes

2011-12-02 Thread Chunyan Liu
According to Stefan's suggestion, will loop over /dev/nbd%d to do "qemu-nbd -f disk.img", if fails, try next device. To make "qemu-nbd -c" and "qemu-nbd -f" share codes as more as possible, extract the shared codes to a function nbd_setup(). Current qemu-nbd functions work well still. Signed-off-