From nobody Tue Sep 10 04:29:59 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 4X2rMq4QY9z5WcmR; Tue, 10 Sep 2024 04:29:59 +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 4X2rMq2XVPz518B; Tue, 10 Sep 2024 04:29:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1725942599; 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=ejPLCJf5hffgGeca3Vpt2DDjfKQq8nwZeVShrwyYrrg=; b=plCEt4w+93aYoP33/YFThfEpvMX43RUFQZKljJFt+1SzjTI1bcrowNQy6upCn+x18BcBlG SQKBJft7dEkfi5ZO2bDjuXsZFENc/41vZ0PRiMkLqenEihUtNsw4yLiZWv+FPtoPRbViF1 dN514tP8KQK60G7BkYoQ4kDouO0Cu6HlzT/3ZUUPbYtDbDT0bL7p0PNdI78rCUgqcybBfS vdATl/XfpW/fqNssbdzk0HusiRrO5AFE0498hJjVBw/JFW++GGV+ej1lByMr4sxeJIKNCT lpC6oj/FKFy71yquMrOqFuN3uXHQEXNslBIWix+SYxNN+MPhbEe+/KZhsJUiSg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1725942599; a=rsa-sha256; cv=none; b=Yb1f0x8zFPdrrTmrqVbn38dUWuN4lQPtjYulfSF2Ih7qxFngr9KoTWW/ICJXR8dQXfm7gA 5QLnF9KaMjY2RaN0ZSos3WyPsmoIqdCEvjw+HHplq6mud0PFNO2OT/R29ktVXq5fY5m7mf 5Sgtj73n3PMnZ2uBx7cIR1ziqGdK9jbIOFrnJFyFKQp0xi7oRxLjkQCGyuXGmUQsu8Gp3A 2sPvYMHtgghWUHhAWSsKM5G9QzK6ai2JfcAf8VdJZMq2JROXNGpH1i917j9MBD67K21Wqk bdq9Hfui1AImYQphyLbQ4D0Gz3j/+Dovl3THprCFe4xCZb4fqUntO85F9IC0Ig== 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=1725942599; 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=ejPLCJf5hffgGeca3Vpt2DDjfKQq8nwZeVShrwyYrrg=; b=AjJyvGjRlMm03bqNxNHgBOOfC0ywgs9UNojahuK8Me7DU8mpPE1qv1RIySky29rtaPy0hD x94KzvbeD+6AzqCZZRiVUx961sRIkPFaJIYUcB0KTs9JVAf7sII4rEv3UUOHdHPTQ8M/KX iiboPH7OJ5xFAe+VJp9k3Mgax2sl9Een/YUPvJPb7TwjSj72giRuR2KwQLnSM0YC1E0Crj pyFedRv3i5xkkyWr8wbkIgg4kKWYhUxOMUC+l05LcRRQXs0E505e3R08LKEC2DHlFzZSpj O3Viv1sMi+vsVbdvabNeHBUmSfbuZPp40hT5XEwQV69xqumCaXDu3bqYHPZ0dw== 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 4X2rMq21ltzYSZ; Tue, 10 Sep 2024 04:29:59 +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 48A4Txu8006020; Tue, 10 Sep 2024 04:29:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 48A4TxF0006017; Tue, 10 Sep 2024 04:29:59 GMT (envelope-from git) Date: Tue, 10 Sep 2024 04:29:59 GMT Message-Id: <202409100429.48A4TxF0006017@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Xin LI Subject: git: 5297156047f2 - stable/14 - 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/stable/14 X-Git-Reftype: branch X-Git-Commit: 5297156047f29274c9b6e68a514e72a858059890 Auto-Submitted: auto-generated The branch stable/14 has been updated by delphij: URL: https://cgit.FreeBSD.org/src/commit/?id=5297156047f29274c9b6e68a514e72a858059890 commit 5297156047f29274c9b6e68a514e72a858059890 Author: Bram Ton AuthorDate: 2024-07-17 07:23:30 +0000 Commit: Xin LI CommitDate: 2024-09-10 04:29:34 +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 Pull Request: https://github.com/freebsd/freebsd-src/pull/1330 (cherry picked from commit c7dd97ec99687996de49ec0b1a23bf007e5199b9) --- 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 48da1343a71c..c86c335087f5 100644 --- a/usr.bin/vmstat/vmstat.c +++ b/usr.bin/vmstat/vmstat.c @@ -79,7 +79,7 @@ static char sccsid[] = "@(#)vmstat.c 8.1 (Berkeley) 6/6/93"; #include #include -#define VMSTAT_XO_VERSION "1" +#define VMSTAT_XO_VERSION "2" static char da[] = "da"; @@ -295,6 +295,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) @@ -396,6 +397,7 @@ nlist_ok: dointr(interval, reps); if (todo & VMSTAT) dovmstat(interval, reps); + xo_close_container("vmstat"); xo_finish(); exit(0); }