From mboxrd@z Thu Jan 1 00:00:00 1970 Received: by 2002:a17:906:724b:b0:a35:eedd:80b0 with SMTP id n11csp1423002ejk; Wed, 31 Jan 2024 04:01:11 -0800 (PST) X-Google-Smtp-Source: AGHT+IGDUzjdrsrAJYXz2f7zQypoFOR0sF4ZiF5dM1uYbguILmg1RtmSVtlGd7Tpf2VRi9sYKsDk X-Received: by 2002:a05:622a:181:b0:42a:b1af:9a60 with SMTP id s1-20020a05622a018100b0042ab1af9a60mr1466375qtw.1.1706702471766; Wed, 31 Jan 2024 04:01:11 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1706702471; cv=none; d=google.com; s=arc-20160816; b=GxTctbzfQ7fS2tGkmt/cLcsJly+l0GrERW+uT//Z9Hj5zUh5u1chTLxc9nRPkyOwdi 2GvyACzcPRg4UpblVkoaayDn9qyegfYWH3NLz1Tk++1DpUCYAz/9fOTdeIuLSYOJsghh HK3RbCQzmekUGck9J+IxRdN3pyqCWiujWFFHAS/+2R6gGs8GkFmvTJKvhpEAKNfIpqAB jU9gh+YMKV+/8swHszpRinNua3EsNQOvJkfw9tWPCqwBiv3rrOUHgBnTE24O+7SLpJ+s pwO95tBV3RVxKxH1N08V5Jyjn3UVpNUZuCxliKti8q0KYlBFWQO57oRCgBoZk7hoCDJ6 xaCA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :content-language:in-reply-to:autocrypt:from:references:cc:to :subject:user-agent:mime-version:date:message-id:dkim-signature; bh=yFNgRz4XN/r1kegOurShcrU2SXLxYs6hWAdLWmlNpCU=; fh=Vh8giTLL5TkFx1gvf4YhsI444Fgmecji41NSbcjAz/s=; b=zFHwheTQGMUQGfBJwE6vEEEkTqcMRPBmECig+oi3xTK7lz5kQ0+XK2DW6F+z9M7Nfw J9OgEgSP2DR+KfwMG6YTO2VHfoHXFT0h3dd6n9fz1dCAG5N1cecFtiQpyRn6U+WsyWii /UfvIxxVY0rqk11Rd1BjVAIbp9TRAG0vBMIblDs7NfWaLOuVofaeEbyrV090TIlFxohh nWcG65MDl5m6mCBfMgcKYzlx6iSsyNyKeV137ATgoBhINcEuCRDdajiLV2a8Y2eImVZV idXbpa9ilexZb0/mgsRQ3GayvCDVfFDH5vM8TEcy+gUwbCfYWh85L/LJXNj0jtzMeshH AhZA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=VWPjxvnp; spf=pass (google.com: domain of qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id c14-20020a05622a024e00b0042be3214e66si1811815qtx.91.2024.01.31.04.01.11 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 31 Jan 2024 04:01:11 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=VWPjxvnp; spf=pass (google.com: domain of qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rV9H6-0000hQ-Bf; Wed, 31 Jan 2024 07:01:06 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rV9GO-0008LB-FL for qemu-arm@nongnu.org; Wed, 31 Jan 2024 07:00:21 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rV9GG-0004jL-C7 for qemu-arm@nongnu.org; Wed, 31 Jan 2024 07:00:20 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1706702410; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:autocrypt:autocrypt; bh=yFNgRz4XN/r1kegOurShcrU2SXLxYs6hWAdLWmlNpCU=; b=VWPjxvnpmyfgw3I/vvlnPkoXknMwVlbbYeAav0Dh4hEk5X27B3Lr+cQhgWuvDVWdYSZEth /CPNFe8/Yw5HBmIQr3idDegyZ+nFqts5kUAvby4lCQjpCaF9QNZFI48uEcoIFUUE+secpS iTkhY56JH2Lu7EqpW/TTUPJcMTxefds= Received: from mail-vs1-f72.google.com (mail-vs1-f72.google.com [209.85.217.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-339-MA82-S0ZMHSo-FrWsO06Nw-1; Wed, 31 Jan 2024 07:00:09 -0500 X-MC-Unique: MA82-S0ZMHSo-FrWsO06Nw-1 Received: by mail-vs1-f72.google.com with SMTP id ada2fe7eead31-46b44a1edd6so1014664137.1 for ; Wed, 31 Jan 2024 04:00:09 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1706702409; x=1707307209; h=content-transfer-encoding:in-reply-to:autocrypt:from:references:cc :to:content-language:subject:user-agent:mime-version:date:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=yFNgRz4XN/r1kegOurShcrU2SXLxYs6hWAdLWmlNpCU=; b=frOWqWniYwjW/hNKmR4rkBXgcl50ipgZWqwAK+gMTJUOXpu1yF865CXJ5qfFNhoMJt rI2ezOLbpYtqpg/ghJHmRFT2mB9H/graZYu+YSc0K9hondECwBQS2u6tk5BLc4+NJpYT A5vl3/ACSXbIiNbnQRwve8wWN4puLUkaR/MVTrBMTrdQWLTEe2QK90oyJ4qss0iTpNvU caR2wBg+DqC1h4E8B2K0Q2/nC4CTTI+kCwAOSzPxdly8hs0s0W6Wu7Ubc2aGazmICdk1 C9T/z9BUvQ9ZAb05iMzm9iO+j22LgsPv/6APjNguZsldTkxY7vvjF+5cEyIDA7zkMPon 6hRg== X-Gm-Message-State: AOJu0Yy6nJ1RydDLD/uCVjQkjoxDMHuXplsUeughkJJvG34LOEmtvPPR m/60d4MoSMaENh6rdTr0xR5jYDZKDasYtnamm/SqrnT0wp9BSMBfLr/rWF8wAx+21Hdo7WBcXRy 9z356pWfzWI2DdruesDtc5JycrAGjcJ3bR7uW51yjqAO/8oh7iA== X-Received: by 2002:a05:6102:240d:b0:46b:4655:4c5e with SMTP id j13-20020a056102240d00b0046b46554c5emr1122488vsi.21.1706702409043; Wed, 31 Jan 2024 04:00:09 -0800 (PST) X-Received: by 2002:a05:6102:240d:b0:46b:4655:4c5e with SMTP id j13-20020a056102240d00b0046b46554c5emr1122398vsi.21.1706702408371; Wed, 31 Jan 2024 04:00:08 -0800 (PST) Received: from [192.168.0.9] (ip-109-43-177-196.web.vodafone.de. [109.43.177.196]) by smtp.gmail.com with ESMTPSA id mf13-20020a0562145d8d00b0068681793468sm66353qvb.36.2024.01.31.03.59.54 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 31 Jan 2024 04:00:07 -0800 (PST) Message-ID: <2f1fae32-b476-453d-94fe-45ca74b13d97@redhat.com> Date: Wed, 31 Jan 2024 12:59:52 +0100 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH v4 37/47] hw/net/lasi_i82596: Re-enable build To: David Woodhouse , qemu-devel@nongnu.org, =?UTF-8?Q?Marc-Andr=C3=A9_Lureau?= Cc: Richard Henderson , Beniamino Galvani , Peter Maydell , Strahinja Jankovic , Niek Linnenbank , =?UTF-8?Q?C=C3=A9dric_Le_Goater?= , Andrew Jeffery , Joel Stanley , Igor Mitsyanko , Jean-Christophe Dubois , Andrey Smirnov , =?UTF-8?Q?Philippe_Mathieu-Daud=C3=A9?= , Rob Herring , Subbaraya Sundeep , Jan Kiszka , Tyrone Ting , Hao Wu , Radoslaw Biernacki , Leif Lindholm , Marcin Juszkiewicz , "Edgar E. Iglesias" , Alistair Francis , Helge Deller , Paolo Bonzini , Eduardo Habkost , "Michael S. Tsirkin" , Marcel Apfelbaum , Song Gao , Thomas Huth , Laurent Vivier , Huacai Chen , Jiaxun Yang , =?UTF-8?Q?Herv=C3=A9_Poussineau?= , Aleksandar Rikalo , Aurelien Jarno , Jason Wang , Jia Liu , Stafford Horne , Mark Cave-Ayland , Nicholas Piggin , Daniel Henrique Barboza , David Gibson , Harsh Prateek Bora , Bin Meng , Palmer Dabbelt , Weiwei Li , Liu Zhiwei , Halil Pasic , Christian Borntraeger , Eric Farman , David Hildenbrand , Ilya Leoshkevich , Yoshinori Sato , Magnus Damm , Artyom Tarasenko , Stefano Stabellini , Anthony Perard , Paul Durrant , Max Filippov , qemu-arm@nongnu.org, qemu-ppc@nongnu.org, qemu-riscv@nongnu.org, David Woodhouse References: <20240126173228.394202-1-dwmw2@infradead.org> <20240126173228.394202-38-dwmw2@infradead.org> From: Thomas Huth Autocrypt: addr=thuth@redhat.com; keydata= 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 In-Reply-To: <20240126173228.394202-38-dwmw2@infradead.org> X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Language: en-US Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit Received-SPF: pass client-ip=170.10.129.124; envelope-from=thuth@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: 0 X-Spam_score: -0.1 X-Spam_bar: / X-Spam_report: (-0.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1.292, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_SBL_CSS=3.335, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01, T_SPF_HELO_TEMPERROR=0.01 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-arm@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org Sender: qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org X-TUID: azKo+uGM0/O4 On 26/01/2024 18.25, David Woodhouse wrote: > From: David Woodhouse > > When converting to the shiny build-system-du-jour, a typo prevented the > last_i82596 driver from being built. Correct the config option name to > re-enable the build. And include "sysemu/sysemu.h" so it actually builds. > > Fixes: b1419fa66558 ("meson: convert hw/net") > Signed-off-by: David Woodhouse > --- > hw/net/lasi_i82596.c | 1 + > hw/net/meson.build | 2 +- > 2 files changed, 2 insertions(+), 1 deletion(-) > > diff --git a/hw/net/lasi_i82596.c b/hw/net/lasi_i82596.c > index 6a3147fe2d..09e830ba5f 100644 > --- a/hw/net/lasi_i82596.c > +++ b/hw/net/lasi_i82596.c > @@ -14,6 +14,7 @@ > #include "qapi/error.h" > #include "qemu/timer.h" > #include "hw/sysbus.h" > +#include "sysemu/sysemu.h" > #include "net/eth.h" > #include "hw/net/lasi_82596.h" > #include "hw/net/i82596.h" > diff --git a/hw/net/meson.build b/hw/net/meson.build > index 9afceb0619..2b426d3d5a 100644 > --- a/hw/net/meson.build > +++ b/hw/net/meson.build > @@ -33,7 +33,7 @@ system_ss.add(when: 'CONFIG_MARVELL_88W8618', if_true: files('mv88w8618_eth.c')) > system_ss.add(when: 'CONFIG_CADENCE', if_true: files('cadence_gem.c')) > system_ss.add(when: 'CONFIG_STELLARIS_ENET', if_true: files('stellaris_enet.c')) > system_ss.add(when: 'CONFIG_LANCE', if_true: files('lance.c')) > -system_ss.add(when: 'CONFIG_LASI_I82596', if_true: files('lasi_i82596.c')) > +system_ss.add(when: 'CONFIG_LASI_82596', if_true: files('lasi_i82596.c')) > system_ss.add(when: 'CONFIG_I82596_COMMON', if_true: files('i82596.c')) > system_ss.add(when: 'CONFIG_SUNHME', if_true: files('sunhme.c')) > system_ss.add(when: 'CONFIG_FTGMAC100', if_true: files('ftgmac100.c')) I'm surprised that it even did not bitrot much further! Reviewed-by: Thomas Huth