Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 701B3EB64DA for ; Wed, 12 Jul 2023 13:07:53 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qJZZ8-0002Dz-SS; Wed, 12 Jul 2023 09:07:34 -0400 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 1qJZZ6-0002DN-Vu for qemu-devel@nongnu.org; Wed, 12 Jul 2023 09:07:33 -0400 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 1qJZZ1-0001z3-1X for qemu-devel@nongnu.org; Wed, 12 Jul 2023 09:07:32 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1689167244; h=from:from:reply-to: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; bh=UCGSANwUElJqj9da5GvHJFtOvAyM1FxGkC6CijiAty8=; b=XYKCw+HhbEBVu8AAv+Df7q9G7cSSn3AjFQeZDZZANQ+/meLZ798NlGCRtJQmNs43rKpd7Z yDL/swPiDSzpm8z6ORpdI+hc05Wr4VJIyYitBfNCn7nXrvrxQ3Nk/K9fQfUeMdOWYbGvb1 U4MSnhS7quUbYXIZtugpgD+ZRwqt8HY= Received: from mimecast-mx02.redhat.com (66.187.233.73 [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-663-ut_VsKlwMuiTW-FIauyRYQ-1; Wed, 12 Jul 2023 09:07:21 -0400 X-MC-Unique: ut_VsKlwMuiTW-FIauyRYQ-1 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id B02273C0012A; Wed, 12 Jul 2023 13:07:20 +0000 (UTC) Received: from redhat.com (unknown [10.42.28.36]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 45528F66C0; Wed, 12 Jul 2023 13:07:19 +0000 (UTC) Date: Wed, 12 Jul 2023 14:07:17 +0100 From: Daniel =?utf-8?B?UC4gQmVycmFuZ8Op?= To: Philippe =?utf-8?Q?Mathieu-Daud=C3=A9?= Cc: Erik Skultety , qemu-devel@nongnu.org, Thomas Huth , Warner Losh , Alex =?utf-8?Q?Benn=C3=A9e?= , Ed Maste , Wainer dos Santos Moschetta , Kyle Evans , Li-Wen Hsu , Beraldo Leal Subject: Re: [PATCH v3 2/4] tests/lcitool: Refresh generated files Message-ID: References: <20230711144922.67491-1-philmd@linaro.org> <20230711144922.67491-3-philmd@linaro.org> <41ae7db7-8d80-1749-c89d-025ee30bd73d@linaro.org> <30d49562-451e-b4c6-679e-0f8d1e0abe72@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <30d49562-451e-b4c6-679e-0f8d1e0abe72@linaro.org> User-Agent: Mutt/2.2.9 (2022-11-12) X-Scanned-By: MIMEDefang 3.1 on 10.11.54.5 Received-SPF: pass client-ip=170.10.129.124; envelope-from=berrange@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -16 X-Spam_score: -1.7 X-Spam_bar: - X-Spam_report: (-1.7 / 5.0 requ) BAYES_00=-1.9, DKIM_INVALID=0.1, DKIM_SIGNED=0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: Daniel =?utf-8?B?UC4gQmVycmFuZ8Op?= Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org On Wed, Jul 12, 2023 at 02:55:10PM +0200, Philippe Mathieu-Daudé wrote: > On 12/7/23 13:12, Daniel P. Berrangé wrote: > > On Wed, Jul 12, 2023 at 01:00:38PM +0200, Philippe Mathieu-Daudé wrote: > > > On 11/7/23 19:58, Daniel P. Berrangé wrote: > > > > On Tue, Jul 11, 2023 at 04:49:20PM +0200, Philippe Mathieu-Daudé wrote: > > > > > Refresh the generated files by running: > > > > > > > > > > $ make lcitool-refresh > > > > > > > > > > Signed-off-by: Philippe Mathieu-Daudé > > > > > --- > > > > > tests/docker/dockerfiles/debian-amd64.docker | 2 - > > > > > tests/docker/dockerfiles/ubuntu2004.docker | 2 - > > > > > tests/docker/dockerfiles/ubuntu2204.docker | 2 - > > > > > > > > I don't know why this would be removing xen/pmem from these files. If > > > > I run 'lcitool-refresh' on current git master that doesn't happen > > > > > > > > Do you have any other local changes on top ? > > (I just noticed manually updating the libvirt-ci submodule is > pointless because the 'lcitool-refresh' rule does that) > > > > diff --git a/tests/docker/dockerfiles/ubuntu2204.docker > > > b/tests/docker/dockerfiles/ubuntu2204.docker > > > index 1d442cdfe6..5162927016 100644 > > > --- a/tests/docker/dockerfiles/ubuntu2204.docker > > > +++ b/tests/docker/dockerfiles/ubuntu2204.docker > > > @@ -73 +72,0 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ > > > - libpmem-dev \ > > > @@ -99 +97,0 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ > > > - libxen-dev \ > > > > What architecture are you running from ? I'm suspecting it is a non > > x86_64 architecture as these pacakges are both arch conditionalized. > > My host is Darwin aarch64, but how is this relevant to what we > generate for guests? Are we missing specifying the target arch > somewhere? (This is not the '--cross-arch' argument, because we > don't want to cross-build). These dockerfiles always targeted x86_64, > in particular the debian-amd64.docker one... This is an unfortunate design choice of lcitool. If you give '--cross-arch' it will always spit out the dockerfile suitable for cross-compiling to that arch. If you omit '--cross-arch' it will always spit out the dockerfile suitable for compiling on the *current* host arch. When we're committing the dockerfiles to qemu (or any libvirt project using lcitool), we've got an implicit assumption that the non-cross dockerfiles were for x86_64, and hence an implicit assumption that the person who ran 'lcitool' was also on x86_64. This is clearly a bad design choice mistake in retrospect as people are increasingly likely to be using aarch64 for day-to-day dev work. So I guess we need to come up with a more explicit way to say give me a native container for x86_64. With regards, Daniel -- |: https://berrange.com -o- https://www.flickr.com/photos/dberrange :| |: https://libvirt.org -o- https://fstop138.berrange.com :| |: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|