From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52660) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b5WZg-0003Jc-Rz for qemu-devel@nongnu.org; Wed, 25 May 2016 07:02:09 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1b5WZc-0002yM-HQ for qemu-devel@nongnu.org; Wed, 25 May 2016 07:02:04 -0400 Received: from mx1.redhat.com ([209.132.183.28]:45828) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b5WZc-0002xW-9D for qemu-devel@nongnu.org; Wed, 25 May 2016 07:02:00 -0400 References: <1464076197-8574-1-git-send-email-jasowang@redhat.com> <57455C94.70604@redhat.com> <02F257B6-4170-4503-BF4C-270D831740B1@daynix.com> From: Jason Wang Message-ID: <57458623.8010301@redhat.com> Date: Wed, 25 May 2016 19:01:55 +0800 MIME-Version: 1.0 In-Reply-To: <02F257B6-4170-4503-BF4C-270D831740B1@daynix.com> Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: quoted-printable Subject: Re: [Qemu-devel] [PULL V2 00/20] Net patches List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Dmitry Fleytman Cc: Peter Maydell , QEMU Developers On 2016=E5=B9=B405=E6=9C=8825=E6=97=A5 16:31, Dmitry Fleytman wrote: >> On 25 May 2016, at 11:04 AM, Jason Wang wrote: >> >> >> >> On 2016=E5=B9=B405=E6=9C=8824=E6=97=A5 21:41, Peter Maydell wrote: >>> On 24 May 2016 at 08:49, Jason Wang wrote: >>>> The following changes since commit 3a2da52a99582ac2c0e29e548bb1fc28e= 2cdb84a: >>>> >>>> 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 f99d30aaf53e5b501dd3405007232db963ba6= 5c6: >>>> >>>> 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/e1= 000e.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=3Dclang). 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. A= fter 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 c= lang (3.4.2) and it produces build error as reported by Peter. Aha, I see. > > The problematic patch is =E2=80=9Cnet: Introduce e1000e device emulatio= n" > > Fix is simple: > > 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? I will amend it myself. Thanks > > Thanks, > Dmitry > >> Thanks >> >> >