From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from atuin.qyliss.net (localhost [IPv6:::1]) by atuin.qyliss.net (Postfix) with ESMTP id F238F17970 for ; Sun, 25 Aug 2024 18:22:09 +0000 (UTC) Received: by atuin.qyliss.net (Postfix, from userid 993) id 50A1C17968; Sun, 25 Aug 2024 18:22:07 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 4.0.1 (2024-03-26) on atuin.qyliss.net X-Spam-Level: * X-Spam-Status: No, score=1.8 required=5.0 tests=DMARC_REJECT, RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,T_SCC_BODY_TEXT_LINE autolearn=no autolearn_force=no version=4.0.1 Received: from mail.cyberchaos.dev (mail.cyberchaos.dev [195.39.247.168]) by atuin.qyliss.net (Postfix) with ESMTPS id 6CC8E17966 for ; Sun, 25 Aug 2024 18:22:05 +0000 (UTC) From: Yureka DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yuka.dev; s=mail; t=1724610118; bh=YADL0+Si9mFUzgQqBPVuTEwqEJF/u+GbxqZI2gSeOww=; h=From:To:Cc:Subject:Date; b=ftQImgTkl+NL6C8K67Gm66SBh5GHEppqG3UA2xti2/H2KHFqketB22Rw7C8RSzLIj gRpXNT2TEA/n8OiIxWsn06S8KY7EdrZmsraXa08M+JpNViSAIe98o7YO8ELBBpMEfV oReMukVLMnLn46i2VzwotLvH0ClZyb32yGWtwP5Y= To: devel@spectrum-os.org Subject: [PATCH v2] host/start-vmm: replace jq calls with miniserde Date: Sun, 25 Aug 2024 20:21:56 +0200 Message-ID: <20240825182156.328694-1-yuka@yuka.dev> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Message-ID-Hash: 2EXPRDIYRQZQLNV3CIUY3VNPIKDMCCXI X-Message-ID-Hash: 2EXPRDIYRQZQLNV3CIUY3VNPIKDMCCXI X-MailFrom: yuka@yuka.dev X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-devel.spectrum-os.org-0; header-match-devel.spectrum-os.org-1; header-match-devel.spectrum-os.org-2; header-match-devel.spectrum-os.org-3; header-match-devel.spectrum-os.org-4; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header CC: Yureka X-Mailman-Version: 3.3.9 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: Yureka --- host/start-vmm/ch.rs | 39 ++++++++++++++++----------------------- 1 file changed, 16 insertions(+), 23 deletions(-) diff --git a/host/start-vmm/ch.rs b/host/start-vmm/ch.rs index cf164c6..46b198a 100644 --- a/host/start-vmm/ch.rs +++ b/host/start-vmm/ch.rs @@ -1,5 +1,6 @@ // SPDX-License-Identifier: EUPL-1.2+ // SPDX-FileCopyrightText: 2022-2024 Alyssa Ross +// SPDX-FileCopyrightText: 2024 Yureka use std::ffi::{CStr, OsStr, OsString}; use std::io::Write; @@ -9,7 +10,7 @@ use std::os::raw::{c_char, c_int}; use std::os::unix::prelude::*; use std::process::{Command, Stdio}; -use miniserde::{json, Serialize}; +use miniserde::{json, Deserialize, Serialize}; use crate::net::MacAddress; @@ -126,34 +127,26 @@ pub fn create_vm(vm_name: &str, mut config: VmConfig) -> Result<(), String> { } pub fn add_net(vm_name: &str, net: &NetConfig) -> Result { - let mut ch_remote = command(vm_name, "add-net") + let ch_output = command(vm_name, "add-net") .arg(format!("fd={},mac={}", net.fd, net.mac)) - .stdout(Stdio::piped()) .spawn() - .or(Err(EPERM))?; + .or(Err(EPERM))? + .wait_with_output() + .or(Err(EPROTO))?; - let jq_out = match Command::new("jq") - .args(["-j", ".id"]) - .stdin(ch_remote.stdout.take().unwrap()) - .stderr(Stdio::inherit()) - .output() - { - Ok(o) => o, - Err(_) => { - // Try not to leave a zombie. - let _ = ch_remote.kill(); - let _ = ch_remote.wait(); - return Err(EPERM); - } - }; + if !ch_output.status.success() { + return Err(EPROTO); + } - if let Ok(ch_remote_status) = ch_remote.wait() { - if ch_remote_status.success() && jq_out.status.success() { - return Ok(OsString::from_vec(jq_out.stdout)); - } + #[derive(Deserialize)] + struct AddNetOutput { + id: String, } - Err(EPROTO) + let output_str = std::str::from_utf8(&ch_output.stdout).map_err(|_| EPROTO)?; + let output_parsed: AddNetOutput = json::from_str(output_str).map_err(|_| EPROTO)?; + + Ok(OsString::from_vec(output_parsed.id.into())) } pub fn remove_device(vm_name: &str, device_id: &OsStr) -> Result<(), NonZeroI32> { -- 2.45.2