From nobody Tue Sep 03 01:22:48 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4WySY46Wvdz5VPF2; Tue, 03 Sep 2024 01:22:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4WySY44VTkz4t3V; Tue, 3 Sep 2024 01:22:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1725326568; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XgGbLL/nSsjeMBU766Hz65/wJj3ZoKQJkYkdlmtEcpk=; b=ccSCkSfvK29jCIht8ctdY+mVXfshm3sGqpERq/lUvT3yzI1/4UcbJZg14yYpZHufh1Q6Z+ a4RWiIODFre/wiIvtL5icZBLsG4yoscBd2RpXMSGWsgAuKOqbQ93qV34J+jNvlvX4KSAdl Y5cM4s1Qnn9jMAXCOCKqX5XbcnxgfZGKKjSXcHmtqoED0KhY0KSysDLVYUgRst5uPUZfQO 45LcHu9uqKa/T0QgX24Vog+IoT6WeuG8aL+yS2jpTjg/EPsqlhfyoyzPNjm1vMIICnI05n QTamE03oB2EqkGU/FwPUu3IhDfo7c72heV3gddE2hI6mqi0GtWe+/kSCG3lx3Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1725326568; a=rsa-sha256; cv=none; b=KcDjAzjtNo7B3T5Q8K2ZYOhgkDwV9PtY26DCgBIQISygUyxeYT2lUxR0d1OlwDjCAfji8N 3T9NtV1X4GyISgjK5KeqIElX6QPa2edm7XDbuFp/8jIl3ICTfmbxZROzLoq20X/BSOUxAz bf7VBNZYXIGPf+a3JKC+4D414lCoNFYatJAQLG4eup03SJR9M/9c1jiJ3rrqNDxwyH7uZN ltDRU14fNZ9pMvSsR3K94ynpBoJm89jB9M+wpXjrsbsTw17wkM5HFXmUFBQrB6n/f/EH5K p81P/PVBP82ZBXkuSbiZg8e24fMxhtUfaaC11FWF3zbRP7g11XynbjOxwgMFZA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1725326568; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XgGbLL/nSsjeMBU766Hz65/wJj3ZoKQJkYkdlmtEcpk=; b=H4Y2jx5j8iJPaYLjn2RJH1ZwbTmFtHDYDbM2tN36tnG6qT9Rq0yZcumuUAqqcQdaMTNktw k0/npf1alJLvOwK/k2ml+eSZaQz40kdOQ/vqKxiKt8QhA/71liPYT5ZDuWJ0i1AcUMn7IN yfWF1AwJcLI3jfWfTjyThqcEf4rfWX8H911Ru1W9YoYGp01U+/6tBibVs/bLlJdaWojOir SU0W9aAofCLPQTbg6soI+VQ3J+dFtBHk2gcifakFB9vxy4j2YlNHxlg8Z/m3uBYS1pD35u XaoDer8dsTXWmKzjkKHZiqoOLG69o2CSz1AvhSnbXq5e1qIFwguXAmhpchGXIw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4WySY43j8hzL1L; Tue, 3 Sep 2024 01:22:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4831MmFK091683; Tue, 3 Sep 2024 01:22:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4831MmOO091680; Tue, 3 Sep 2024 01:22:48 GMT (envelope-from git) Date: Tue, 3 Sep 2024 01:22:48 GMT Message-Id: <202409030122.4831MmOO091680@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Xin LI Subject: git: c7dd97ec9968 - main - vmstat: Add root element to libxo output List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: delphij X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c7dd97ec99687996de49ec0b1a23bf007e5199b9 Auto-Submitted: auto-generated The branch main has been updated by delphij: URL: https://cgit.FreeBSD.org/src/commit/?id=c7dd97ec99687996de49ec0b1a23bf007e5199b9 commit c7dd97ec99687996de49ec0b1a23bf007e5199b9 Author: Bram Ton AuthorDate: 2024-07-17 07:23:30 +0000 Commit: Xin LI CommitDate: 2024-09-03 01:22:14 +0000 vmstat: Add root element to libxo output Current libxo output does not have a root element. Valid XML requires a single root element. This commit adds this root element. The libxo output version bumped accordingly. PR: 254635 MFC after: 1 week Pull Request: https://github.com/freebsd/freebsd-src/pull/1330 --- usr.bin/vmstat/vmstat.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/usr.bin/vmstat/vmstat.c b/usr.bin/vmstat/vmstat.c index 21068d632a8c..e7790ad6e2f6 100644 --- a/usr.bin/vmstat/vmstat.c +++ b/usr.bin/vmstat/vmstat.c @@ -66,7 +66,7 @@ #include #include -#define VMSTAT_XO_VERSION "1" +#define VMSTAT_XO_VERSION "2" static char da[] = "da"; @@ -282,6 +282,7 @@ main(int argc, char *argv[]) argv += optind; xo_set_version(VMSTAT_XO_VERSION); + xo_open_container("vmstat"); if (!hflag) xo_set_options(NULL, "no-humanize"); if (todo == 0) @@ -383,6 +384,7 @@ nlist_ok: dointr(interval, reps); if (todo & VMSTAT) dovmstat(interval, reps); + xo_close_container("vmstat"); xo_finish(); exit(0); }