From patchwork Tue Jun 14 21:07:42 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Akihiko Odaki X-Patchwork-Id: 12881608 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 CE13EC43334 for ; Tue, 14 Jun 2022 21:09:32 +0000 (UTC) Received: from localhost ([::1]:42422 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1o1Dn1-0007hQ-Bj for qemu-devel@archiver.kernel.org; Tue, 14 Jun 2022 17:09:31 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44816) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1o1DlY-0005IO-QK for qemu-devel@nongnu.org; Tue, 14 Jun 2022 17:08:00 -0400 Received: from mail-pg1-x529.google.com ([2607:f8b0:4864:20::529]:37486) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1o1DlX-0007kT-4C for qemu-devel@nongnu.org; Tue, 14 Jun 2022 17:08:00 -0400 Received: by mail-pg1-x529.google.com with SMTP id h192so9614938pgc.4 for ; Tue, 14 Jun 2022 14:07:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=Np4QMwKnIjMhuykyfSZBf5qL+iF0ja/nS2DZ5Fp8Sck=; b=X43BiOowh648gVXkZ3betws7u/eSjiIOyIwwvXxKJ6BtDVo/t7/TKNV99DtnCRRemb jpJvVVaRDd3gTHfh9fAObqf3wd33eaWl7b71uZOQGwYyZeEaGY3gOIVsCx0dUb92VxeG MTavluoOHqwLZVDKiHM/rrKQch7gxB+eGYUJh4faGuMynnhrS5wzuSzIDCRJsBLyPDuK gVoect+MJNrSJAEo6BLu1IXuXEOA9P58DP7F/VKHDpCxxM9KhYXoxexGDRcJMloSkN/e JuUuF6DP0wcQ6CuU5fbHagVKzNBNw//Lc+rXxgpzOw3mskGdk3DMPpVvRZYx2iZfq1R3 vUcQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=Np4QMwKnIjMhuykyfSZBf5qL+iF0ja/nS2DZ5Fp8Sck=; b=w6RkZx01ezdNfn83zgzdbqxSJhbsi4L5GzFTDVXUKO6r1A1KHQXnlZQNyVckL7IpGA esQr+fxuMirxBQ3XrSrR2JV04fDOvxiV1JxBQpOTS5gf8LB6WuJxR3r5/bsjHmQpU1GD b3ImTAmnsIqnpaC2SIwUmebhNJue3+mRQCdkyd/yPWUHWIkfvnP4KcnaSKsVzFsImvKo GZjAJlpV0wJCegShB8drgcFHWx+7ta6IWArzw10KKegd92a6woJfynbExrisX9Mmmr1A hbXMxNc3y2zghCdN2vTUd3gSat5m5aOtUabV1Rje32UP3s57QypBUhydls4DyH8JmRP6 J+1Q== X-Gm-Message-State: AOAM5334NBtuE2/J3KYjM6hzMUzU5hZ4Fs4hP7UMWzkrpUA3RrF9Pz67 MroEchlbuF2yi5YkT6Th13I= X-Google-Smtp-Source: ABdhPJwzhYruXWYYLqoegc1dcI5b4uhTvYj1A4bmBQnxDgW8dDp71HSCMYf47SyhS1o7clqC+9rKKQ== X-Received: by 2002:a05:6a00:1c4e:b0:51b:ebf1:53c4 with SMTP id s14-20020a056a001c4e00b0051bebf153c4mr6393895pfw.49.1655240876909; Tue, 14 Jun 2022 14:07:56 -0700 (PDT) Received: from localhost.localdomain ([2400:4050:c360:8200:d5aa:1806:cce3:7773]) by smtp.gmail.com with ESMTPSA id h65-20020a62de44000000b0050dc762813csm8129456pfg.22.2022.06.14.14.07.54 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 14 Jun 2022 14:07:56 -0700 (PDT) From: Akihiko Odaki To: Cc: Peter Maydell , Jason Wang , qemu-devel@nongnu.org, Programmingkid , =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?q?=C3=A9?= , Gerd Hoffmann , =?utf-8?q?Daniel_P_=2E_Berrang=C3=A9?= , Akihiko Odaki Subject: [PATCH v4 0/4] cutils: Introduce bundle mechanism Date: Wed, 15 Jun 2022 06:07:42 +0900 Message-Id: <20220614210746.78911-1-akihiko.odaki@gmail.com> X-Mailer: git-send-email 2.32.1 (Apple Git-133) MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::529; envelope-from=akihiko.odaki@gmail.com; helo=mail-pg1-x529.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham 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: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Developers often run QEMU without installing. The bundle mechanism allows to look up files which should be present in installation even in such a situation. It is a general mechanism and can find any files located relative to the installation tree. The build tree must have a new directory, qemu-bundle, to represent what files the installation tree would have for reference by the executables. v4: * Add Daniel P. Berrangé to CC. Hopefully this helps merging his patch: https://mail.gnu.org/archive/html/qemu-devel/2022-06/msg02276.html * Rebased to the latest QEMU. v3: * Note that the bundle mechanism is for any files located relative to the installation tree including but not limited to datadir. (Peter Maydell) * Fix "bridge" typo (Philippe Mathieu-Daudé) v2: Rebased to the latest QEMU. Akihiko Odaki (4): cutils: Introduce bundle mechanism datadir: Use bundle mechanism ui/icons: Use bundle mechanism net: Use bundle mechanism .travis.yml | 2 +- include/net/net.h | 2 +- include/qemu/cutils.h | 19 +++++++++++++++++++ meson.build | 13 ++++++++++--- net/tap.c | 6 +++++- pc-bios/keymaps/meson.build | 3 +++ pc-bios/meson.build | 17 +++++++++-------- qemu-options.hx | 4 ++-- scripts/oss-fuzz/build.sh | 2 +- softmmu/datadir.c | 35 ++++++++++++----------------------- tests/qtest/fuzz/fuzz.c | 15 --------------- tests/vm/fedora | 2 +- tests/vm/freebsd | 2 +- tests/vm/netbsd | 2 +- tests/vm/openbsd | 2 +- ui/cocoa.m | 29 ++++++++++++++++------------- ui/gtk.c | 6 +++++- ui/icons/meson.build | 36 ++++++++++++++++++++++++++++-------- ui/sdl2.c | 18 +++++++++++------- util/cutils.c | 33 +++++++++++++++++++++++++++++++++ 20 files changed, 160 insertions(+), 88 deletions(-)