From mboxrd@z Thu Jan 1 00:00:00 1970 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on atuin.qyliss.net X-Spam-Level: X-Spam-Status: No, score=-1.1 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE,SPF_HELO_NONE autolearn=unavailable autolearn_force=no version=3.4.6 Received: from atuin.qyliss.net (localhost [IPv6:::1]) by atuin.qyliss.net (Postfix) with ESMTP id 74B3D87E1C; Fri, 30 Sep 2022 12:50:31 +0000 (UTC) Received: by atuin.qyliss.net (Postfix, from userid 496) id BFA9A87CF4; Fri, 30 Sep 2022 12:50:25 +0000 (UTC) Received: from mail-ej1-x633.google.com (mail-ej1-x633.google.com [IPv6:2a00:1450:4864:20::633]) by atuin.qyliss.net (Postfix) with ESMTPS id B924687CEC for ; Fri, 30 Sep 2022 12:50:21 +0000 (UTC) Received: by mail-ej1-x633.google.com with SMTP id a26so8826469ejc.4 for ; Fri, 30 Sep 2022 05:50:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=unikie.com; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date; bh=708U/YkovB3gQ7dnDtAiptOQmRngm4IEnrE1iinrCxo=; b=h8C9DetJg9VMeRmw6gr4duzJEkMpsOppQ6BWqMrpj65nMHxsMuslveVhORYZjSBQgS IjlNWhD5cMmGI3Y5S2hs4kcjJYACkkPCmaXmCiOh54gdqyaghUdeu3l0JxOQjohyK0U+ GL2vYNiP222f9WcFCFy98jhbMpvzBv4MZ4u6ocEh46R6DS2nWut4YNyJzHGs0sGLgkg1 ECqC/8TTBKGK6fC8s7iE1zQv5BAtLUsp3xKlb2/h5jEdFjxjNzS3z/TM5Np9Xyhahzfs 0ASTgsl9hh8+MZBde+3FceM6NN9Mr2HFj6WuFWC6M60Hap9fr/l/bi2Z9Nh6K6HoB5VT +KUQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date; bh=708U/YkovB3gQ7dnDtAiptOQmRngm4IEnrE1iinrCxo=; b=wckEc3+84rpNfN9jd+f5VvyXZS6LQSpFXB57KwnMrXdmP4udSNg22HKL8kdGOAa3Iu rOhunplcCNkAB73V/ds95SxJDN5AKUMjyM+CHw4lMBwk8LTIBML/40cV40M+MtH499es k66CVOLLvAv77gu9TjF03d3Rg5zA0wTEoMeYgVDRn+RSdxQGOi0WfiWWdQTicbwuP+0u BLWKjLdHPDJPkI2+wwKTwrXe/1D2E1OQPSv97Q8QGsOrOxOgnVMmIzroqOYUWZ1qB2LP scNOJv7tkElYG7v18eI7Vt3PDNYBQXIPMdsf4B3dvo+CuCAdAOJQtGxQEeGJhjQoKlRd 2fMw== X-Gm-Message-State: ACrzQf3kbrMo9tmymSLJOZGOS7Zf6Fr9Cx+6CTW9SH3rPClwLD5toJRq XrYn4znrTEpIKNIHyEd4zoSwtg== X-Google-Smtp-Source: AMsMyM7xh8DkNWr8vg3/pQCcDk1rTpnfYK4afR+ltrPsfFVT4fG6VbP5idl6NEgcvkiT6w/V2q4B6w== X-Received: by 2002:a17:907:9714:b0:783:954a:5056 with SMTP id jg20-20020a170907971400b00783954a5056mr6332306ejc.318.1664542221369; Fri, 30 Sep 2022 05:50:21 -0700 (PDT) Received: from x220.qyliss.net (p54b8e692.dip0.t-ipconnect.de. [84.184.230.146]) by smtp.gmail.com with ESMTPSA id i30-20020a0564020f1e00b00452e7ae2214sm1645501eda.42.2022.09.30.05.50.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 30 Sep 2022 05:50:20 -0700 (PDT) Received: by x220.qyliss.net (Postfix, from userid 1000) id 2406C4FB; Fri, 30 Sep 2022 12:49:49 +0000 (UTC) From: Alyssa Ross To: devel@spectrum-os.org Subject: [RFC PATCH 07/10] host/start-vm: factor out VM definition path Date: Fri, 30 Sep 2022 12:49:37 +0000 Message-Id: <20220930124940.1013577-8-alyssa.ross@unikie.com> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20220930124940.1013577-1-alyssa.ross@unikie.com> References: <20220930124940.1013577-1-alyssa.ross@unikie.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Message-ID-Hash: LLUTC2OFW6CEEBSQCNTLEDQM2NWLOLNP X-Message-ID-Hash: LLUTC2OFW6CEEBSQCNTLEDQM2NWLOLNP X-MailFrom: alyssa.ross@unikie.com X-Mailman-Rule-Hits: header-match-devel.spectrum-os.org-0 X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-config-1 CC: Puck Meerburg , Ville Ilvonen X-Mailman-Version: 3.3.5 Precedence: list List-Id: Patches and low-level development discussion Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: Signed-off-by: Alyssa Ross --- host/start-vm/start-vm.rs | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/host/start-vm/start-vm.rs b/host/start-vm/start-vm.rs index b2cccc8..41a4fbc 100644 --- a/host/start-vm/start-vm.rs +++ b/host/start-vm/start-vm.rs @@ -1,5 +1,6 @@ // SPDX-License-Identifier: EUPL-1.2+ // SPDX-FileCopyrightText: 2022 Alyssa Ross +// SPDX-FileCopyrightText: 2022 Unikie mod ch; mod net; @@ -33,11 +34,11 @@ fn vm_command(dir: PathBuf) -> Result { command.args(&["--memory", "size=128M,shared=on"]); command.args(&["--console", "pty"]); - let mut net_providers_dir = PathBuf::new(); - net_providers_dir.push("/ext/svc/data"); - net_providers_dir.push(vm_name); - net_providers_dir.push("providers/net"); + let mut definition_path = PathBuf::new(); + definition_path.push("/ext/svc/data"); + definition_path.push(vm_name); + let net_providers_dir = definition_path.join("providers/net"); match net_providers_dir.read_dir() { Ok(entries) => { for r in entries { @@ -78,10 +79,7 @@ fn vm_command(dir: PathBuf) -> Result { command.arg("--disk"); - let mut blk_dir = PathBuf::new(); - blk_dir.push("/ext/svc/data"); - blk_dir.push(vm_name); - blk_dir.push("blk"); + let blk_dir = definition_path.join("blk"); match blk_dir.read_dir() { Ok(entries) => { for result in entries { -- 2.37.1