From patchwork Wed May 25 08:31:52 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Dmitry Fleytman X-Patchwork-Id: 9134989 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 50097607D7 for ; Wed, 25 May 2016 08:32:29 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3EEC6282DA for ; Wed, 25 May 2016 08:32:29 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 339BD282DD; Wed, 25 May 2016 08:32:29 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 90ED3282DA for ; Wed, 25 May 2016 08:32:28 +0000 (UTC) Received: from localhost ([::1]:58161 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b5UEt-00072e-3h for patchwork-qemu-devel@patchwork.kernel.org; Wed, 25 May 2016 04:32:27 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:39441) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b5UEV-00070U-IV for qemu-devel@nongnu.org; Wed, 25 May 2016 04:32:04 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1b5UER-0007ns-C8 for qemu-devel@nongnu.org; Wed, 25 May 2016 04:32:02 -0400 Received: from mail-wm0-x244.google.com ([2a00:1450:400c:c09::244]:35282) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b5UEQ-0007nd-Is for qemu-devel@nongnu.org; Wed, 25 May 2016 04:31:59 -0400 Received: by mail-wm0-x244.google.com with SMTP id f75so13141749wmf.2 for ; Wed, 25 May 2016 01:31:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=daynix-com.20150623.gappssmtp.com; s=20150623; h=mime-version:subject:from:in-reply-to:date:cc :content-transfer-encoding:message-id:references:to; bh=53kRhN1VPcTVNy8PxF0wT/PsFyVJCD3Ppbjs+QqCNgQ=; b=oIFJSfrDry8+PHdg3TobgyYNWsiSwH/xrlzSgsJO7+9+5b20ouN0vTlapsNzfWL79c PPxFMVWOWN06DbtjxYEu18wOT59+6MQgIYM9qe5oBO8DNgTHEyY8bCCzDqWNOkbZtI7k a/WrG/oODRwEnWxaGVlbIedOo0Ko83NkrbJ/GatV5d1lv4T8NkbLp8rywrBflEu6XX8M 5/2cehEnnex1WZCaK2+xE1tngX8lEaTps1gNR3R7LMHh2DUMImM9sKDfsRBRrFYObXFQ 3MzQ0QAoalIfUlRCLsWu5PPBX7vOz9SjES3jlwrdHlUgZrOVwQ3YkAWOShb+N1KaksxS /b1g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:subject:from:in-reply-to:date:cc :content-transfer-encoding:message-id:references:to; bh=53kRhN1VPcTVNy8PxF0wT/PsFyVJCD3Ppbjs+QqCNgQ=; b=VAN4vw/bJZj9sUj+eE6hEIBbS09efJU8VLzkvBxXFLnGpOKzqz6AZlQ+440NJbWrjJ jrHIF8zXQCS0IFf6DQAqVl+gmGSgbfGjR2cz3Elx59KhArjqWbT9PLExwPa8wy6bozfq POF6Hj9VdNHQaM8g2EwfsNVwdYTrgmqedC5XsSBNpaWl+N8lgQrWsFfWXInCObAiNZS8 8R9n4Vc6m6Sghr5lffGHDX7Ni297vTNZVhxI9Nu+FhoK8U4wivmd7XwJZ5AcYcCnHNKf pkIFSeKkU/alLvgAoekmZ3qTsqMyei+fqeD1gq3y1/4ahp0/GfC3ZN6xwvgiCUP0MZkD C5vg== X-Gm-Message-State: ALyK8tJtBcMiQFPV6Hr6nqL+a23NraCUekfX79KYa2rxtWPQAzrAleK7lHtRkmg4bLYaEA== X-Received: by 10.28.14.2 with SMTP id 2mr2237730wmo.14.1464165115499; Wed, 25 May 2016 01:31:55 -0700 (PDT) Received: from [10.0.1.86] ([5.102.236.99]) by smtp.gmail.com with ESMTPSA id b189sm7928315wmh.5.2016.05.25.01.31.53 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 25 May 2016 01:31:54 -0700 (PDT) Mime-Version: 1.0 (Mac OS X Mail 9.3 \(3124\)) From: Dmitry Fleytman In-Reply-To: <57455C94.70604@redhat.com> Date: Wed, 25 May 2016 11:31:52 +0300 Message-Id: <02F257B6-4170-4503-BF4C-270D831740B1@daynix.com> References: <1464076197-8574-1-git-send-email-jasowang@redhat.com> <57455C94.70604@redhat.com> To: Jason Wang X-Mailer: Apple Mail (2.3124) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2a00:1450:400c:c09::244 Subject: Re: [Qemu-devel] [PULL V2 00/20] Net patches X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Dmitry Fleytman , Peter Maydell , QEMU Developers Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP > On 25 May 2016, at 11:04 AM, Jason Wang wrote: > > > > On 2016年05月24日 21:41, Peter Maydell wrote: >> On 24 May 2016 at 08:49, Jason Wang wrote: >>> The following changes since commit 3a2da52a99582ac2c0e29e548bb1fc28e2cdb84a: >>> >>> net/tap: Allocating Large sized arrays to heap (2016-05-24 15:30:41 +0800) >>> >>> are available in the git repository at: >>> >>> https://github.com/jasowang/qemu.git tags/net-pull-request >>> >>> for you to fetch changes up to f99d30aaf53e5b501dd3405007232db963ba65c6: >>> >>> net/net: Add SocketReadState for reuse codes (2016-05-24 15:30:42 +0800) >>> >>> ---------------------------------------------------------------- >>> >>> Main changes: >>> - e1000e emulation >>> - convet vmxnet3 to use DMA api >>> Changes from V1: >>> - fix 32bit build >> Hi; I'm afraid this doesn't build on clang, which dislikes duplicate >> typedefs: >> >> In file included from /home/petmay01/linaro/qemu-for-merges/hw/net/e1000e.c:47: >> /home/petmay01/linaro/qemu-for-merges/hw/net/e1000e_core.h:110:3: >> error: redefinition of typedef 'E1000ECore' is a C11 feature >> [-Werror,-Wtypedef-redefinition] >> } E1000ECore; >> ^ >> /home/petmay01/linaro/qemu-for-merges/hw/net/e1000e_core.h:43:29: >> note: previous definition is here >> typedef struct E1000Core_st E1000ECore; >> ^ >> >> thanks >> -- PMM >> > > Have a try on my machine, but looks like it works for me (./configure --cc=clang). version is > > clang version 3.8.0-2ubuntu3 (tags/RELEASE_380/final) > Target: x86_64-pc-linux-gnu > Thread model: posix > InstalledDir: /usr/bin > Found candidate GCC installation: /usr/bin/../lib/gcc/x86_64-linux-gnu/5.3.1 > Found candidate GCC installation: /usr/bin/../lib/gcc/x86_64-linux-gnu/6.0.0 > Found candidate GCC installation: /usr/lib/gcc/x86_64-linux-gnu/5.3.1 > Found candidate GCC installation: /usr/lib/gcc/x86_64-linux-gnu/6.0.0 > Selected GCC installation: /usr/bin/../lib/gcc/x86_64-linux-gnu/5.3.1 > Candidate multilib: .;@m64 > Selected multilib: .;@m64 > > Looks like "-Werror,-Wtypedef-redefinition" was not used by default. After I add them to extra_cflags, e1000e can still build successfully. > > Is there anything I missed? Hi Jason, My clang 3.7.0 compiles this code fine as well. I just tried an older clang (3.4.2) and it produces build error as reported by Peter. The problematic patch is “net: Introduce e1000e device emulation" Fix is simple: Thanks, Dmitry > > Thanks > > diff --git a/hw/net/e1000e_core.h b/hw/net/e1000e_core.h index ff0ffbe..7a885e4 100644 --- a/hw/net/e1000e_core.h +++ b/hw/net/e1000e_core.h @@ -55,7 +55,7 @@ typedef struct E1000IntrDelayTimer_st { E1000ECore *core; } E1000IntrDelayTimer; -typedef struct E1000Core_st { +struct E1000Core_st { uint32_t mac[E1000E_MAC_SIZE]; uint16_t phy[E1000E_PHY_PAGES][E1000E_PHY_PAGE_SIZE]; uint16_t eeprom[E1000E_EEPROM_SIZE]; @@ -107,7 +107,7 @@ typedef struct E1000Core_st { NICState *owner_nic; PCIDevice *owner; void (*owner_start_recv)(PCIDevice *d); -} E1000ECore; +}; Would you amend it yourself or should we send updated series?