[PULL 0/3] Guest Agent patches 2022-07-13

[PULL 0/3] Guest Agent patches 2022-07-13

[Konstantin Kostiuk]

The following changes since commit 08c8a31214e8ca29e05b9f6c3ee942b28ec58457:

  Merge tag 'pull-tcg-20220712' of https://gitlab.com/rth7680/qemu into staging (2022-07-12 11:52:11 +0530)

are available in the Git repository at:

  git@github.com:kostyanf14/qemu.git tags/qga-win32-pull-2022-07-13

for you to fetch changes up to 1db8a0b0ea2fb72ecab36bd3143a9715c083d5d3:

  qga: add command 'guest-get-cpustats' (2022-07-13 12:19:18 +0300)

----------------------------------------------------------------
qga-win32-pull-2022-07-13

----------------------------------------------------------------
Konstantin Kostiuk (1):
      MAINTAINERS: Add myself as Guest Agent reviewer

Zhenwei Pi (2):
      qapi: Avoid generating C identifier 'linux'
      qga: add command 'guest-get-cpustats'

 MAINTAINERS            |  1 +
 qga/commands-posix.c   | 89 ++++++++++++++++++++++++++++++++++++++++++++++++++
 qga/commands-win32.c   |  6 ++++
 qga/qapi-schema.json   | 81 +++++++++++++++++++++++++++++++++++++++++++++
 scripts/qapi/common.py |  2 +-
 5 files changed, 178 insertions(+), 1 deletion(-)


--
2.25.1

[PULL 1/3] MAINTAINERS: Add myself as Guest Agent reviewer

[Konstantin Kostiuk]

Signed-off-by: Konstantin Kostiuk <kkostiuk@redhat.com>
Message-Id: <20220712092715.2136898-1-kkostiuk@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Signed-off-by: Konstantin Kostiuk <kkostiuk@redhat.com>
---
 MAINTAINERS | 1 +
 1 file changed, 1 insertion(+)

diff --git a/MAINTAINERS b/MAINTAINERS
index 450abd0252..b1e73d99f3 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2880,6 +2880,7 @@ T: git https://repo.or.cz/qemu/armbru.git qapi-next
 
 QEMU Guest Agent
 M: Michael Roth <michael.roth@amd.com>
+R: Konstantin Kostiuk <kkostiuk@redhat.com>
 S: Maintained
 F: qga/
 F: docs/interop/qemu-ga.rst
-- 
2.25.1

[PULL 2/3] qapi: Avoid generating C identifier 'linux'

[Konstantin Kostiuk]

From: zhenwei pi <pizhenwei@bytedance.com>

'linux' is not usable as identifier, because C compilers targeting
Linux predefine it as a macro expanding to 1.  Add it to
@polluted_words. 'unix' is already there.

Suggested-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: zhenwei pi <pizhenwei@bytedance.com>
Message-Id: <20220707005602.696557-2-pizhenwei@bytedance.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Konstantin Kostiuk <kkostiuk@redhat.com>
---
 scripts/qapi/common.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/qapi/common.py b/scripts/qapi/common.py
index 489273574a..737b059e62 100644
--- a/scripts/qapi/common.py
+++ b/scripts/qapi/common.py
@@ -114,7 +114,7 @@ def c_name(name: str, protect: bool = True) -> str:
                      'and', 'and_eq', 'bitand', 'bitor', 'compl', 'not',
                      'not_eq', 'or', 'or_eq', 'xor', 'xor_eq'])
     # namespace pollution:
-    polluted_words = set(['unix', 'errno', 'mips', 'sparc', 'i386'])
+    polluted_words = set(['unix', 'errno', 'mips', 'sparc', 'i386', 'linux'])
     name = re.sub(r'[^A-Za-z0-9_]', '_', name)
     if protect and (name in (c89_words | c99_words | c11_words | gcc_words
                              | cpp_words | polluted_words)
-- 
2.25.1

[PULL 3/3] qga: add command 'guest-get-cpustats'

[Konstantin Kostiuk]

From: zhenwei pi <pizhenwei@bytedance.com>

A vCPU thread always reaches 100% utilization when:
- guest uses idle=poll
- disable HLT vm-exit
- enable MWAIT

Add new guest agent command 'guest-get-cpustats' to get guest CPU
statistics, we can know the guest workload and how busy the CPU is.

Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: zhenwei pi <pizhenwei@bytedance.com>
Message-Id: <20220707005602.696557-3-pizhenwei@bytedance.com>
Reviewed-by: Konstantin Kostiuk <kkostiuk@redhat.com>
Signed-off-by: Konstantin Kostiuk <kkostiuk@redhat.com>
---
 qga/commands-posix.c | 89 ++++++++++++++++++++++++++++++++++++++++++++
 qga/commands-win32.c |  6 +++
 qga/qapi-schema.json | 81 ++++++++++++++++++++++++++++++++++++++++
 3 files changed, 176 insertions(+)

diff --git a/qga/commands-posix.c b/qga/commands-posix.c
index 0469dc409d..f18530d85f 100644
--- a/qga/commands-posix.c
+++ b/qga/commands-posix.c
@@ -2893,6 +2893,90 @@ GuestDiskStatsInfoList *qmp_guest_get_diskstats(Error **errp)
     return guest_get_diskstats(errp);
 }
 
+GuestCpuStatsList *qmp_guest_get_cpustats(Error **errp)
+{
+    GuestCpuStatsList *head = NULL, **tail = &head;
+    const char *cpustats = "/proc/stat";
+    int clk_tck = sysconf(_SC_CLK_TCK);
+    FILE *fp;
+    size_t n;
+    char *line = NULL;
+
+    fp = fopen(cpustats, "r");
+    if (fp  == NULL) {
+        error_setg_errno(errp, errno, "open(\"%s\")", cpustats);
+        return NULL;
+    }
+
+    while (getline(&line, &n, fp) != -1) {
+        GuestCpuStats *cpustat = NULL;
+        GuestLinuxCpuStats *linuxcpustat;
+        int i;
+        unsigned long user, system, idle, iowait, irq, softirq, steal, guest;
+        unsigned long nice, guest_nice;
+        char name[64];
+
+        i = sscanf(line, "%s %lu %lu %lu %lu %lu %lu %lu %lu %lu %lu",
+                   name, &user, &nice, &system, &idle, &iowait, &irq, &softirq,
+                   &steal, &guest, &guest_nice);
+
+        /* drop "cpu 1 2 3 ...", get "cpuX 1 2 3 ..." only */
+        if ((i == EOF) || strncmp(name, "cpu", 3) || (name[3] == '\0')) {
+            continue;
+        }
+
+        if (i < 5) {
+            slog("Parsing cpu stat from %s failed, see \"man proc\"", cpustats);
+            break;
+        }
+
+        cpustat = g_new0(GuestCpuStats, 1);
+        cpustat->type = GUEST_CPU_STATS_TYPE_LINUX;
+
+        linuxcpustat = &cpustat->u.q_linux;
+        linuxcpustat->cpu = atoi(&name[3]);
+        linuxcpustat->user = user * 1000 / clk_tck;
+        linuxcpustat->nice = nice * 1000 / clk_tck;
+        linuxcpustat->system = system * 1000 / clk_tck;
+        linuxcpustat->idle = idle * 1000 / clk_tck;
+
+        if (i > 5) {
+            linuxcpustat->has_iowait = true;
+            linuxcpustat->iowait = iowait * 1000 / clk_tck;
+        }
+
+        if (i > 6) {
+            linuxcpustat->has_irq = true;
+            linuxcpustat->irq = irq * 1000 / clk_tck;
+            linuxcpustat->has_softirq = true;
+            linuxcpustat->softirq = softirq * 1000 / clk_tck;
+        }
+
+        if (i > 8) {
+            linuxcpustat->has_steal = true;
+            linuxcpustat->steal = steal * 1000 / clk_tck;
+        }
+
+        if (i > 9) {
+            linuxcpustat->has_guest = true;
+            linuxcpustat->guest = guest * 1000 / clk_tck;
+        }
+
+        if (i > 10) {
+            linuxcpustat->has_guest = true;
+            linuxcpustat->guest = guest * 1000 / clk_tck;
+            linuxcpustat->has_guestnice = true;
+            linuxcpustat->guestnice = guest_nice * 1000 / clk_tck;
+        }
+
+        QAPI_LIST_APPEND(tail, cpustat);
+    }
+
+    free(line);
+    fclose(fp);
+    return head;
+}
+
 #else /* defined(__linux__) */
 
 void qmp_guest_suspend_disk(Error **errp)
@@ -3247,6 +3331,11 @@ GuestDiskStatsInfoList *qmp_guest_get_diskstats(Error **errp)
     return NULL;
 }
 
+GuestCpuStatsList *qmp_guest_get_cpustats(Error **errp)
+{
+    error_setg(errp, QERR_UNSUPPORTED);
+    return NULL;
+}
 
 #endif /* CONFIG_FSFREEZE */
 
diff --git a/qga/commands-win32.c b/qga/commands-win32.c
index 36f94c0f9c..7ed7664715 100644
--- a/qga/commands-win32.c
+++ b/qga/commands-win32.c
@@ -2543,3 +2543,9 @@ GuestDiskStatsInfoList *qmp_guest_get_diskstats(Error **errp)
     error_setg(errp, QERR_UNSUPPORTED);
     return NULL;
 }
+
+GuestCpuStatsList *qmp_guest_get_cpustats(Error **errp)
+{
+    error_setg(errp, QERR_UNSUPPORTED);
+    return NULL;
+}
diff --git a/qga/qapi-schema.json b/qga/qapi-schema.json
index 9fa20e791b..869399ea1a 100644
--- a/qga/qapi-schema.json
+++ b/qga/qapi-schema.json
@@ -1576,3 +1576,84 @@
 { 'command': 'guest-get-diskstats',
   'returns': ['GuestDiskStatsInfo']
 }
+
+##
+# @GuestCpuStatsType:
+#
+# An enumeration of OS type
+#
+# Since: 7.1
+##
+{ 'enum': 'GuestCpuStatsType',
+  'data': [ 'linux' ] }
+
+
+##
+# @GuestLinuxCpuStats:
+#
+# CPU statistics of Linux
+#
+# @cpu: CPU index in guest OS
+#
+# @user: Time spent in user mode
+#
+# @nice: Time spent in user mode with low priority (nice)
+#
+# @system: Time spent in system mode
+#
+# @idle: Time spent in the idle task
+#
+# @iowait: Time waiting for I/O to complete (since Linux 2.5.41)
+#
+# @irq: Time servicing interrupts (since Linux 2.6.0-test4)
+#
+# @softirq: Time servicing softirqs (since Linux 2.6.0-test4)
+#
+# @steal: Stolen time by host (since Linux 2.6.11)
+#
+# @guest: ime spent running a virtual CPU for guest operating systems under
+#         the  control of the Linux kernel (since Linux 2.6.24)
+#
+# @guestnice: Time spent running a niced guest (since Linux 2.6.33)
+#
+# Since: 7.1
+##
+{ 'struct': 'GuestLinuxCpuStats',
+  'data': {'cpu': 'int',
+           'user': 'uint64',
+           'nice': 'uint64',
+           'system': 'uint64',
+           'idle': 'uint64',
+           '*iowait': 'uint64',
+           '*irq': 'uint64',
+           '*softirq': 'uint64',
+           '*steal': 'uint64',
+           '*guest': 'uint64',
+           '*guestnice': 'uint64'
+           } }
+
+##
+# @GuestCpuStats:
+#
+# Get statistics of each CPU in millisecond.
+#
+# - @linux: Linux style CPU statistics
+#
+# Since: 7.1
+##
+{ 'union': 'GuestCpuStats',
+  'base': { 'type': 'GuestCpuStatsType' },
+  'discriminator': 'type',
+  'data': { 'linux': 'GuestLinuxCpuStats' } }
+
+##
+# @guest-get-cpustats:
+#
+# Retrieve information about CPU stats.
+# Returns: List of CPU stats of guest.
+#
+# Since: 7.1
+##
+{ 'command': 'guest-get-cpustats',
+  'returns': ['GuestCpuStats']
+}
-- 
2.25.1

Re: [PULL 1/3] MAINTAINERS: Add myself as Guest Agent reviewer

[Daniel P. Berrangé]

On Wed, Jul 13, 2022 at 01:19:06PM +0300, Konstantin Kostiuk wrote:
> Signed-off-by: Konstantin Kostiuk <kkostiuk@redhat.com>
> Message-Id: <20220712092715.2136898-1-kkostiuk@redhat.com>
> Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
> Signed-off-by: Konstantin Kostiuk <kkostiuk@redhat.com>
> ---
>  MAINTAINERS | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/MAINTAINERS b/MAINTAINERS
> index 450abd0252..b1e73d99f3 100644
> --- a/MAINTAINERS
> +++ b/MAINTAINERS
> @@ -2880,6 +2880,7 @@ T: git https://repo.or.cz/qemu/armbru.git qapi-next
>  
>  QEMU Guest Agent
>  M: Michael Roth <michael.roth@amd.com>
> +R: Konstantin Kostiuk <kkostiuk@redhat.com>

This pull request contains functional changes under qga/, which
suggests you're acting as a (co-)maintainer for QGA, not merely
a reviewer. I wouldn't normally expect reviewers to send pull
requests for a subsystem. As such should this be "M:", to
indicate co-maintainership and have an explicit ACK from
Michael Roth.

>  S: Maintained
>  F: qga/
>  F: docs/interop/qemu-ga.rst


With regards,
Daniel
-- 
|: https://berrange.com      -o-    https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org         -o-            https://fstop138.berrange.com :|
|: https://entangle-photo.org    -o-    https://www.instagram.com/dberrange :|

Re: [PULL 1/3] MAINTAINERS: Add myself as Guest Agent reviewer

[Konstantin Kostiuk]

[-- Attachment #1: Type: text/plain, Size: 1881 bytes --]

On Wed, Jul 13, 2022 at 1:38 PM Daniel P. Berrangé <berrange@redhat.com>
wrote:

> On Wed, Jul 13, 2022 at 01:19:06PM +0300, Konstantin Kostiuk wrote:
> > Signed-off-by: Konstantin Kostiuk <kkostiuk@redhat.com>
> > Message-Id: <20220712092715.2136898-1-kkostiuk@redhat.com>
> > Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
> > Signed-off-by: Konstantin Kostiuk <kkostiuk@redhat.com>
> > ---
> >  MAINTAINERS | 1 +
> >  1 file changed, 1 insertion(+)
> >
> > diff --git a/MAINTAINERS b/MAINTAINERS
> > index 450abd0252..b1e73d99f3 100644
> > --- a/MAINTAINERS
> > +++ b/MAINTAINERS
> > @@ -2880,6 +2880,7 @@ T: git https://repo.or.cz/qemu/armbru.git
> qapi-next
> >
> >  QEMU Guest Agent
> >  M: Michael Roth <michael.roth@amd.com>
> > +R: Konstantin Kostiuk <kkostiuk@redhat.com>
>
> This pull request contains functional changes under qga/, which
> suggests you're acting as a (co-)maintainer for QGA, not merely
> a reviewer. I wouldn't normally expect reviewers to send pull
> requests for a subsystem. As such should this be "M:", to
> indicate co-maintainership and have an explicit ACK from
> Michael Roth.
>

As the maintainer of the Windows part of the Guest Agent, I have added
myself
as a reviewer so I don't miss out on general patches for the Guest Agent.
Some time ago, I asked Michael Roth if I could submit PRs for all guest
agent components and he allow me to do this.
If need I can add myself as a co-maintainer to Guest Agent not only
Guest Agent Windows.


>
> >  S: Maintained
> >  F: qga/
> >  F: docs/interop/qemu-ga.rst
>
>
> With regards,
> Daniel
> --
> |: https://berrange.com      -o-
> https://www.flickr.com/photos/dberrange :|
> |: https://libvirt.org         -o-
> https://fstop138.berrange.com :|
> |: https://entangle-photo.org    -o-
> https://www.instagram.com/dberrange :|
>
>

[-- Attachment #2: Type: text/html, Size: 3522 bytes --]

Re: [PULL 1/3] MAINTAINERS: Add myself as Guest Agent reviewer

[Daniel P. Berrangé]

On Wed, Jul 13, 2022 at 02:31:08PM +0300, Konstantin Kostiuk wrote:
> On Wed, Jul 13, 2022 at 1:38 PM Daniel P. Berrangé <berrange@redhat.com>
> wrote:
> 
> > On Wed, Jul 13, 2022 at 01:19:06PM +0300, Konstantin Kostiuk wrote:
> > > Signed-off-by: Konstantin Kostiuk <kkostiuk@redhat.com>
> > > Message-Id: <20220712092715.2136898-1-kkostiuk@redhat.com>
> > > Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
> > > Signed-off-by: Konstantin Kostiuk <kkostiuk@redhat.com>
> > > ---
> > >  MAINTAINERS | 1 +
> > >  1 file changed, 1 insertion(+)
> > >
> > > diff --git a/MAINTAINERS b/MAINTAINERS
> > > index 450abd0252..b1e73d99f3 100644
> > > --- a/MAINTAINERS
> > > +++ b/MAINTAINERS
> > > @@ -2880,6 +2880,7 @@ T: git https://repo.or.cz/qemu/armbru.git
> > qapi-next
> > >
> > >  QEMU Guest Agent
> > >  M: Michael Roth <michael.roth@amd.com>
> > > +R: Konstantin Kostiuk <kkostiuk@redhat.com>
> >
> > This pull request contains functional changes under qga/, which
> > suggests you're acting as a (co-)maintainer for QGA, not merely
> > a reviewer. I wouldn't normally expect reviewers to send pull
> > requests for a subsystem. As such should this be "M:", to
> > indicate co-maintainership and have an explicit ACK from
> > Michael Roth.
> >
> 
> As the maintainer of the Windows part of the Guest Agent, I have added
> myself
> as a reviewer so I don't miss out on general patches for the Guest Agent.
> Some time ago, I asked Michael Roth if I could submit PRs for all guest
> agent components and he allow me to do this.
> If need I can add myself as a co-maintainer to Guest Agent not only
> Guest Agent Windows.

It sounds like you're defacto a co-maintainer already then and
might as well ackowledge this in MAINTAINERS.

With regards,
Daniel
-- 
|: https://berrange.com      -o-    https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org         -o-            https://fstop138.berrange.com :|
|: https://entangle-photo.org    -o-    https://www.instagram.com/dberrange :|

Re: [PULL 1/3] MAINTAINERS: Add myself as Guest Agent reviewer

[Konstantin Kostiuk]

[-- Attachment #1: Type: text/plain, Size: 2269 bytes --]

On Wed, Jul 13, 2022 at 2:55 PM Daniel P. Berrangé <berrange@redhat.com>
wrote:

> On Wed, Jul 13, 2022 at 02:31:08PM +0300, Konstantin Kostiuk wrote:
> > On Wed, Jul 13, 2022 at 1:38 PM Daniel P. Berrangé <berrange@redhat.com>
> > wrote:
> >
> > > On Wed, Jul 13, 2022 at 01:19:06PM +0300, Konstantin Kostiuk wrote:
> > > > Signed-off-by: Konstantin Kostiuk <kkostiuk@redhat.com>
> > > > Message-Id: <20220712092715.2136898-1-kkostiuk@redhat.com>
> > > > Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
> > > > Signed-off-by: Konstantin Kostiuk <kkostiuk@redhat.com>
> > > > ---
> > > >  MAINTAINERS | 1 +
> > > >  1 file changed, 1 insertion(+)
> > > >
> > > > diff --git a/MAINTAINERS b/MAINTAINERS
> > > > index 450abd0252..b1e73d99f3 100644
> > > > --- a/MAINTAINERS
> > > > +++ b/MAINTAINERS
> > > > @@ -2880,6 +2880,7 @@ T: git https://repo.or.cz/qemu/armbru.git
> > > qapi-next
> > > >
> > > >  QEMU Guest Agent
> > > >  M: Michael Roth <michael.roth@amd.com>
> > > > +R: Konstantin Kostiuk <kkostiuk@redhat.com>
> > >
> > > This pull request contains functional changes under qga/, which
> > > suggests you're acting as a (co-)maintainer for QGA, not merely
> > > a reviewer. I wouldn't normally expect reviewers to send pull
> > > requests for a subsystem. As such should this be "M:", to
> > > indicate co-maintainership and have an explicit ACK from
> > > Michael Roth.
> > >
> >
> > As the maintainer of the Windows part of the Guest Agent, I have added
> > myself
> > as a reviewer so I don't miss out on general patches for the Guest Agent.
> > Some time ago, I asked Michael Roth if I could submit PRs for all guest
> > agent components and he allow me to do this.
> > If need I can add myself as a co-maintainer to Guest Agent not only
> > Guest Agent Windows.
>
> It sounds like you're defacto a co-maintainer already then and
> might as well ackowledge this in MAINTAINERS.
>

Ok. Will resend patch and pull.


>
> With regards,
> Daniel
> --
> |: https://berrange.com      -o-
> https://www.flickr.com/photos/dberrange :|
> |: https://libvirt.org         -o-
> https://fstop138.berrange.com :|
> |: https://entangle-photo.org    -o-
> https://www.instagram.com/dberrange :|
>
>

[-- Attachment #2: Type: text/html, Size: 4147 bytes --]

Re: [PULL 0/3] Guest Agent patches 2022-07-13

[Peter Maydell]

On Wed, 13 Jul 2022 at 11:19, Konstantin Kostiuk <kkostiuk@redhat.com> wrote:
>
> The following changes since commit 08c8a31214e8ca29e05b9f6c3ee942b28ec58457:
>
>   Merge tag 'pull-tcg-20220712' of https://gitlab.com/rth7680/qemu into staging (2022-07-12 11:52:11 +0530)
>
> are available in the Git repository at:
>
>   git@github.com:kostyanf14/qemu.git tags/qga-win32-pull-2022-07-13
>
> for you to fetch changes up to 1db8a0b0ea2fb72ecab36bd3143a9715c083d5d3:
>
>   qga: add command 'guest-get-cpustats' (2022-07-13 12:19:18 +0300)
>
> ----------------------------------------------------------------
> qga-win32-pull-2022-07-13
>
> ----------------------------------------------------------------


Applied, thanks.

Please update the changelog at https://wiki.qemu.org/ChangeLog/7.1
for any user-visible changes.

-- PMM