From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([208.118.235.92]:36719)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <paolo.bonzini@gmail.com>) id 1Sc0jM-0002Mf-2J
	for qemu-devel@nongnu.org; Tue, 05 Jun 2012 16:51:57 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <paolo.bonzini@gmail.com>) id 1Sc0jK-0000rJ-A6
	for qemu-devel@nongnu.org; Tue, 05 Jun 2012 16:51:55 -0400
Received: from mail-pz0-f45.google.com ([209.85.210.45]:49963)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <paolo.bonzini@gmail.com>) id 1Sc0jK-0000rD-0c
	for qemu-devel@nongnu.org; Tue, 05 Jun 2012 16:51:54 -0400
Received: by dadv2 with SMTP id v2so8447490dad.4
	for <qemu-devel@nongnu.org>; Tue, 05 Jun 2012 13:51:51 -0700 (PDT)
Sender: Paolo Bonzini <paolo.bonzini@gmail.com>
Message-ID: <4FCE7162.3060600@redhat.com>
Date: Tue, 05 Jun 2012 22:51:46 +0200
From: Paolo Bonzini <pbonzini@redhat.com>
MIME-Version: 1.0
References: <1337683555-13301-1-git-send-email-lersek@redhat.com>
	<1337683555-13301-11-git-send-email-lersek@redhat.com>
In-Reply-To: <1337683555-13301-11-git-send-email-lersek@redhat.com>
Content-Type: text/plain; charset=ISO-8859-15
Content-Transfer-Encoding: 7bit
Subject: Re: [Qemu-devel] [PATCH 10/16] convert net_init_dump() to
	NetClientOptions
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: Laszlo Ersek <lersek@redhat.com>
Cc: qemu-devel@nongnu.org

Il 22/05/2012 12:45, Laszlo Ersek ha scritto:
> Signed-off-by: Laszlo Ersek <lersek@redhat.com>
> ---
>  net/dump.c |   21 +++++++++++++++++----
>  1 files changed, 17 insertions(+), 4 deletions(-)
> 
> diff --git a/net/dump.c b/net/dump.c
> index 27e9528..a1de09e 100644
> --- a/net/dump.c
> +++ b/net/dump.c
> @@ -144,22 +144,35 @@ static int net_dump_init(VLANState *vlan, const char *device,
>      return 0;
>  }
>  
> -int net_init_dump(QemuOpts *opts, const NetClientOptions *new_opts,
> +int net_init_dump(QemuOpts *old_opts, const NetClientOptions *opts,
>                    const char *name, VLANState *vlan)
>  {
>      int len;
>      const char *file;
>      char def_file[128];
> +    const NetdevDumpOptions *dump;
> +
> +    assert(opts->kind == NET_CLIENT_OPTIONS_KIND_DUMP);
> +    dump = opts->dump;
>  
>      assert(vlan);
>  
> -    file = qemu_opt_get(opts, "file");
> -    if (!file) {
> +    if (dump->has_file) {
> +        file = dump->file;
> +    } else {
>          snprintf(def_file, sizeof(def_file), "qemu-vlan%d.pcap", vlan->id);
>          file = def_file;
>      }
>  
> -    len = qemu_opt_get_size(opts, "len", 65536);
> +    if (dump->has_len) {
> +        if (dump->len > INT_MAX) {
> +            error_report("invalid length: %"PRId64, dump->len);

Nice attention to detail. :)

But why not test < 0 too since we're at it?

Paolo

> +            return -1;
> +        }
> +        len = dump->len;
> +    } else {
> +        len = 65536;
> +    }
>  
>      return net_dump_init(vlan, "dump", name, file, len);
>  }