From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:55301) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QkeqR-0004iz-LX for qemu-devel@nongnu.org; Sat, 23 Jul 2011 12:14:28 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QkeqQ-0000dw-9T for qemu-devel@nongnu.org; Sat, 23 Jul 2011 12:14:27 -0400 Received: from mail-gx0-f173.google.com ([209.85.161.173]:51829) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QkeqQ-0000dq-5W for qemu-devel@nongnu.org; Sat, 23 Jul 2011 12:14:26 -0400 Received: by gxk26 with SMTP id 26so2014614gxk.4 for ; Sat, 23 Jul 2011 09:14:25 -0700 (PDT) Message-ID: <4E2AF35E.6010007@codemonkey.ws> Date: Sat, 23 Jul 2011 11:14:22 -0500 From: Anthony Liguori MIME-Version: 1.0 References: <1309939437-2248-1-git-send-email-adam@os.inf.tu-dresden.de> In-Reply-To: <1309939437-2248-1-git-send-email-adam@os.inf.tu-dresden.de> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH] multiboot: Support commas in module parameters List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Adam Lackorzynski Cc: qemu-devel@nongnu.org On 07/06/2011 03:03 AM, Adam Lackorzynski wrote: > Support commas in the parameter list of multiboot modules as well as for the > kernel command line, by using double commas (via get_opt_value()). > > Signed-off-by: Adam Lackorzynski > Reviewed-by: Kevin Wolf Applied. Thanks. Regards, Anthony Liguori > --- > hw/multiboot.c | 18 +++++++++--------- > 1 files changed, 9 insertions(+), 9 deletions(-) > > diff --git a/hw/multiboot.c b/hw/multiboot.c > index 6e6cfb9..2426e84 100644 > --- a/hw/multiboot.c > +++ b/hw/multiboot.c > @@ -97,11 +97,11 @@ typedef struct { > > static uint32_t mb_add_cmdline(MultibootState *s, const char *cmdline) > { > - int len = strlen(cmdline) + 1; > target_phys_addr_t p = s->offset_cmdlines; > + char *b = (char *)s->mb_buf + p; > > - pstrcpy((char *)s->mb_buf + p, len, cmdline); > - s->offset_cmdlines += len; > + get_opt_value(b, strlen(cmdline) + 1, cmdline); > + s->offset_cmdlines += strlen(b) + 1; > return s->mb_buf_phys + p; > } > > @@ -238,7 +238,7 @@ int load_multiboot(void *fw_cfg, > const char *r = initrd_filename; > mbs.mb_buf_size += strlen(r) + 1; > mbs.mb_mods_avail = 1; > - while ((r = strchr(r, ','))) { > + while (*(r = get_opt_value(NULL, 0, r))) { > mbs.mb_mods_avail++; > r++; > } > @@ -252,7 +252,7 @@ int load_multiboot(void *fw_cfg, > mbs.offset_cmdlines = mbs.offset_mbinfo + mbs.mb_mods_avail * MB_MOD_SIZE; > > if (initrd_filename) { > - char *next_initrd; > + char *next_initrd, not_last; > > mbs.offset_mods = mbs.mb_buf_size; > > @@ -261,9 +261,9 @@ int load_multiboot(void *fw_cfg, > int mb_mod_length; > uint32_t offs = mbs.mb_buf_size; > > - next_initrd = strchr(initrd_filename, ','); > - if (next_initrd) > - *next_initrd = '\0'; > + next_initrd = (char *)get_opt_value(NULL, 0, initrd_filename); > + not_last = *next_initrd; > + *next_initrd = '\0'; > /* if a space comes after the module filename, treat everything > after that as parameters */ > target_phys_addr_t c = mb_add_cmdline(&mbs, initrd_filename); > @@ -287,7 +287,7 @@ int load_multiboot(void *fw_cfg, > (char *)mbs.mb_buf + offs, > (char *)mbs.mb_buf + offs + mb_mod_length, c); > initrd_filename = next_initrd+1; > - } while (next_initrd); > + } while (not_last); > } > > /* Commandline support */