From nobody Wed Mar 12 17:38:00 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) client-ip=8.43.85.245; envelope-from=devel-bounces@lists.libvirt.org; helo=lists.libvirt.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=pass(p=reject dis=none) header.from=lists.libvirt.org ARC-Seal: i=1; a=rsa-sha256; t=1741215094; cv=none; d=zohomail.com; s=zohoarc; b=gfHt0whga00BKLnM4PJR9BCKHpMhh8NQMlXAb7X+8LxmyMAjJtcgYLrnI6raWkk0X59hN1a/zKWGsF8oXcXfr2vo3nFfg6m/4qlNRDShjlabE19C4fFi8mVsrSKybCfc0yB68gd53eWyAGjbhVmdmIXCMsANySuXUkx8kLaWMTA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1741215094; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:Reply-To:References:Subject:Subject:To:To:Message-Id; bh=iMubqa3hV1lCxkHXfC7Zc6Oac1l+6t+wIgkh7v5aPhU=; b=lGE25vBIcm5TgN3OiBmTSXoIKgF+OUypyH3nGE2PR9rP9swGqeBNDHKvaoMTRg+kMkRhxy95Z8bsCCpN8KUSQ0nzfVJDB4gwHStTV8qZMm9buA0Jycn+OTziMxBaytG1QIQecZB18FElXcKSCm/Vtk9erihKHSDltTQ+AAUylIM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=pass header.from= (p=reject dis=none) Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 1741215094758281.3233775739516; Wed, 5 Mar 2025 14:51:34 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 996) id B0B7013DF; Wed, 5 Mar 2025 17:51:33 -0500 (EST) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id BD856162A; Wed, 5 Mar 2025 17:50:10 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 996) id 410F4150F; Wed, 5 Mar 2025 17:50:05 -0500 (EST) Received: from mail-ed1-f47.google.com (mail-ed1-f47.google.com [209.85.208.47]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id 8003413AD for ; Wed, 5 Mar 2025 17:50:04 -0500 (EST) Received: by mail-ed1-f47.google.com with SMTP id 4fb4d7f45d1cf-5e058ca6806so12287356a12.3 for ; Wed, 05 Mar 2025 14:50:04 -0800 (PST) Received: from localhost (205-201-32-8.scinternet.net. [205.201.32.8]) by smtp.gmail.com with UTF8SMTPSA id d2e1a72fcca58-73638e4ab93sm9485408b3a.103.2025.03.05.14.50.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 05 Mar 2025 14:50:02 -0800 (PST) X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=-0.8 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H2, RCVD_IN_VALIDITY_RPBL_BLOCKED,RCVD_IN_VALIDITY_SAFE_BLOCKED, SPF_HELO_NONE autolearn=unavailable autolearn_force=no version=3.4.4 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=google; t=1741215003; x=1741819803; darn=lists.libvirt.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=cdQWvdl+Oh9/fYMS2A6hXXLmXZqsjA6zgZFWPKVe0Y4=; b=WrMrXQIFuqkGTaoYACBb5QkJy8z8xj4XGhkdKoF1iW53IMji7D87GU8Apq2aA/0FzQ 10MNUNR1cpZegNwyQ6fJuYvEvcWfxqVp1m+xaZbDccntlVXg5J5NDKqukN2GT/qqpG8l sJ/1cuf4H2ykzVWZ0KQ+d2I4nKcy9wXYYYhE2NDYTUZkMGjz5ELiOJU552O0kEBNMEh5 CvqZu8Rw3COxZCiV9U/aeubPE4mVIfXLJsfG799vz0aNy3XxTd0xme57P1VK3G1vYD3V 6MUBJ4GQ/cBCraWr8/4fAdF8XxVv49qgxvFMwwKf0BgHSDF0a9+uHR8atgPY1RTkBc0I U/FA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741215003; x=1741819803; 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:message-id:reply-to; bh=cdQWvdl+Oh9/fYMS2A6hXXLmXZqsjA6zgZFWPKVe0Y4=; b=ZVXnayf0KSB044C3ulXe866iwshBBUNRyEus1YZd3j0GAh2bkbY3b703/Uys1qSteJ RMwApzaNQOrqorKzUy8EPXqSN+SceUGI2iz44hkPITFaqPjVczr4xTiHn8KCSKA42jME E2ooDT7bwoi6oyq7tLam5uz5Tqg/0/3JrW9iOgp7T/Y+Ce0UIbbdNK/Gf353vUjVW5vJ dZ+oAXzWPJu5e67lS2BOL6Rd/6IorUkucTE0OVp69GNapBE9J1Nd7UVIzAKx/ixOoFbt JZ04DdeN/iGW3WiOpEVK2g8IwYhnqNRt95B0pHuDdWrypcIXxc0Rp2ACpp9BWSXEFDxl WktA== X-Gm-Message-State: AOJu0YzhgVhhEvaTESoEbRhCy5qHeM/A/OlsKI29jCjUuAiEpr9ryOw5 4g6JQJR9RzAyQkvTTAdaoEoNa432Z/gbmSh4uguQC8WA+A4nQYH3JD7pn1X+1J8PqSS+FRgosoU R X-Gm-Gg: ASbGnct6y3Cw+W2d2nomgg0dNt0vDqCJfdzKuM4aPJkbX+LXK7gf6Ur54XFMil7j4EZ L6lOyimmr4hZVpIn2pX02dDq4vraGwadAxP56tiiy+U7uSpHTVkm1o8pLckT63GrzDorMZiT4x+ 6kiipJbWoFnRoM6MFrHxpehL4n5JqzIzPnGC3Tn+uERCTsV6UIoQ9RWqUrlUiffnDXeFsNZIx90 r7Pl1WdndiDeQ4J2jRbNYHvnjDrX7xWDsVkWBkGP6Aj2vQdzdOF66L9BhVzvaSLECtsWWF3WTQO gAkY36ucs96+yj2+5s4xELrCXVoFu3s/lRmRgawmufrQsbj502ly6cY7Dn9/4rg= X-Google-Smtp-Source: AGHT+IHCf/l5bb/kJ/89yCNmaolbI4WLZ2PLIsHN+ui8/NvuapVLzo/Xk2/ujq42ijR+B+9HPWOZfA== X-Received: by 2002:a17:906:f5a9:b0:abf:4550:9764 with SMTP id a640c23a62f3a-ac20db11abemr425351666b.24.1741215003349; Wed, 05 Mar 2025 14:50:03 -0800 (PST) To: devel@lists.libvirt.org Subject: [PATCH V4 02/18] qemu: Add function to get FDPass object from monitor Date: Wed, 5 Mar 2025 15:48:11 -0700 Message-ID: <20250305224957.5369-3-jfehlig@suse.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250305224957.5369-1-jfehlig@suse.com> References: <20250305224957.5369-1-jfehlig@suse.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Message-ID-Hash: XMWI3QES37A2SLMALK6O2LPYU7FIXGUT X-Message-ID-Hash: XMWI3QES37A2SLMALK6O2LPYU7FIXGUT X-MailFrom: jfehlig@suse.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-config-1; header-match-config-2; header-match-config-3; header-match-devel.lists.libvirt.org-0; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; suspicious-header CC: farosas@suse.de X-Mailman-Version: 3.2.2 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: List-Post: List-Subscribe: List-Unsubscribe: From: Jim Fehlig via Devel Reply-To: Jim Fehlig X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1741215096875019100 Content-Type: text/plain; charset="utf-8" Add new function qemuFDPassNewFromMonitor to get an fdset previously passed to qemu, based on the 'prefix' provided when the qemuFDPass object was initially created. Signed-off-by: Jim Fehlig --- src/qemu/qemu_fd.c | 46 ++++++++++++++++++++++++++++++++++++++++++++++ src/qemu/qemu_fd.h | 4 ++++ 2 files changed, 50 insertions(+) diff --git a/src/qemu/qemu_fd.c b/src/qemu/qemu_fd.c index e847056573..333f9b128e 100644 --- a/src/qemu/qemu_fd.c +++ b/src/qemu/qemu_fd.c @@ -115,6 +115,52 @@ qemuFDPassNewPassed(unsigned int fdSetID) } =20 =20 +/** + * qemuFDPassNewFromMonitor: + * @prefix: Prefix of an FDset which was already passed to qemu + * @mon: monitor object + * + * Query the monitor for already passed FDsets and return a new qemuFDPass + * object if one is found to contain an fd with associated @prefix. Returns + * NULL on failure or if no matching FDset is found. Similar to + * qemuFDPassNewPassed, this is useful along with qemuFDPassTransferMonito= rRollback + * when only knowing the qemuFDPass prefix. + */ +qemuFDPass * +qemuFDPassNewFromMonitor(const char *prefix, qemuMonitor *mon) +{ + g_autoptr(qemuMonitorFdsets) fdsets =3D NULL; + qemuFDPass *fdpass =3D NULL; + size_t i; + + VIR_DEBUG("prefix =3D %s", prefix); + + if (qemuMonitorQueryFdsets(mon, &fdsets) < 0) + return NULL; + + for (i =3D 0; i < fdsets->nfdsets; i++) { + qemuMonitorFdsetInfo fdset =3D fdsets->fdsets[i]; + size_t j; + + for (j =3D 0; j < fdset.nfds; j++) { + qemuMonitorFdsetFdInfo fdinfo =3D fdset.fds[j]; + + VIR_DEBUG("fdinfo opaque =3D %s", fdinfo.opaque); + if (STRPREFIX(prefix, fdinfo.opaque)) { + fdpass =3D g_new0(qemuFDPass, 1); + + fdpass->fdSetID =3D fdset.id; + fdpass->prefix =3D g_strdup(prefix); + fdpass->path =3D g_strdup_printf("/dev/fdset/%u", fdset.id= ); + fdpass->passed =3D true; + } + } + } + + return fdpass; +} + + /** * qemuFDPassIsPassed: * @fdpass: The fd passing helper struct diff --git a/src/qemu/qemu_fd.h b/src/qemu/qemu_fd.h index cd0ff2c690..d873e110a8 100644 --- a/src/qemu/qemu_fd.h +++ b/src/qemu/qemu_fd.h @@ -34,6 +34,10 @@ qemuFDPassNew(const char *prefix, qemuFDPass * qemuFDPassNewPassed(unsigned int fdSetID); =20 +qemuFDPass * +qemuFDPassNewFromMonitor(const char *prefix, qemuMonitor *mon) + ATTRIBUTE_NONNULL(1); + bool qemuFDPassIsPassed(qemuFDPass *fdpass, unsigned *id); --=20 2.43.0