From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53913) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1adYxN-0005y1-SX for qemu-devel@nongnu.org; Wed, 09 Mar 2016 02:55:01 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1adYxK-0005Q9-ME for qemu-devel@nongnu.org; Wed, 09 Mar 2016 02:54:57 -0500 Received: from mail-wm0-x233.google.com ([2a00:1450:400c:c09::233]:38669) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1adYxK-0005Pt-Fc for qemu-devel@nongnu.org; Wed, 09 Mar 2016 02:54:54 -0500 Received: by mail-wm0-x233.google.com with SMTP id l68so59055299wml.1 for ; Tue, 08 Mar 2016 23:54:54 -0800 (PST) Sender: Paolo Bonzini References: <1457503932-31763-1-git-send-email-peterx@redhat.com> From: Paolo Bonzini Message-ID: <56DFD6CB.90906@redhat.com> Date: Wed, 9 Mar 2016 08:54:51 +0100 MIME-Version: 1.0 In-Reply-To: <1457503932-31763-1-git-send-email-peterx@redhat.com> Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH] migration: fix warning for source_return_path_thread List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Peter Xu , qemu-devel@nongnu.org Cc: amit.shah@redhat.com, quintela@redhat.com On 09/03/2016 07:12, Peter Xu wrote: > max_len is not necessary, while it brings a warning during compilation > when specify "-Wstack-usage=1000000". Replacing using sizeof(). > > Signed-off-by: Peter Xu > --- > migration/migration.c | 5 ++--- > 1 file changed, 2 insertions(+), 3 deletions(-) > > diff --git a/migration/migration.c b/migration/migration.c > index 0129d9f..6680d95 100644 > --- a/migration/migration.c > +++ b/migration/migration.c > @@ -1268,8 +1268,7 @@ static void *source_return_path_thread(void *opaque) > MigrationState *ms = opaque; > QEMUFile *rp = ms->rp_state.from_dst_file; > uint16_t header_len, header_type; > - const int max_len = 512; > - uint8_t buf[max_len]; > + uint8_t buf[512]; > uint32_t tmp32, sibling_error; > ram_addr_t start = 0; /* =0 to silence warning */ > size_t len = 0, expected_len; > @@ -1292,7 +1291,7 @@ static void *source_return_path_thread(void *opaque) > > if ((rp_cmd_args[header_type].len != -1 && > header_len != rp_cmd_args[header_type].len) || > - header_len > max_len) { > + header_len > sizeof(buf)) { sizeof works fine because buf is an array of bytes, but ARRAY_SIZE is better because it works for any type of buffer. Paolo > error_report("RP: Received '%s' message (0x%04x) with" > "incorrect length %d expecting %zu", > rp_cmd_args[header_type].name, header_type, header_len, >