[Qemu-commits] [qemu/qemu] 27e7de: qga: Correct loop count in qmp_guest_get_vcpus()

[Peter Maydell]

  Branch: refs/heads/staging
  Home:   https://github.com/qemu/qemu
  Commit: 27e7de3ca740cffbdfc06e9cb138f3339d14dda7
      
https://github.com/qemu/qemu/commit/27e7de3ca740cffbdfc06e9cb138f3339d14dda7
  Author: Lin Ma <lma@suse.com>
  Date:   2021-03-16 (Tue, 16 Mar 2021)

  Changed paths:
    M qga/commands-posix.c

  Log Message:
  -----------
  qga: Correct loop count in qmp_guest_get_vcpus()

The guest-get-vcpus returns incorrect vcpu info in case we hotunplug vcpus(not
the last one).
e.g.:
A VM has 4 VCPUs: cpu0 + 3 hotunpluggable online vcpus(cpu1, cpu2 and cpu3).
Hotunplug cpu2,  Now only cpu0, cpu1 and cpu3 are present & online.

./qmp-shell /tmp/qmp-monitor.sock
(QEMU) query-hotpluggable-cpus
{"return": [
{"props": {"core-id": 0, "thread-id": 0, "socket-id": 3}, "vcpus-count": 1,
 "qom-path": "/machine/peripheral/cpu3", "type": "host-x86_64-cpu"},
{"props": {"core-id": 0, "thread-id": 0, "socket-id": 2}, "vcpus-count": 1,
 "qom-path": "/machine/peripheral/cpu2", "type": "host-x86_64-cpu"},
{"props": {"core-id": 0, "thread-id": 0, "socket-id": 1}, "vcpus-count": 1,
 "qom-path": "/machine/peripheral/cpu1", "type": "host-x86_64-cpu"},
{"props": {"core-id": 0, "thread-id": 0, "socket-id": 0}, "vcpus-count": 1,
 "qom-path": "/machine/unattached/device[0]", "type": "host-x86_64-cpu"}
]}

(QEMU) device_del id=cpu2
{"return": {}}

(QEMU) query-hotpluggable-cpus
{"return": [
{"props": {"core-id": 0, "thread-id": 0, "socket-id": 3}, "vcpus-count": 1,
 "qom-path": "/machine/peripheral/cpu3", "type": "host-x86_64-cpu"},
{"props": {"core-id": 0, "thread-id": 0, "socket-id": 2}, "vcpus-count": 1,
 "type": "host-x86_64-cpu"},
{"props": {"core-id": 0, "thread-id": 0, "socket-id": 1}, "vcpus-count": 1,
 "qom-path": "/machine/peripheral/cpu1", "type": "host-x86_64-cpu"},
{"props": {"core-id": 0, "thread-id": 0, "socket-id": 0}, "vcpus-count": 1,
 "qom-path": "/machine/unattached/device[0]", "type": "host-x86_64-cpu"}
]}

Before:
./qmp-shell -N /tmp/qmp-ga.sock
Welcome to the QMP low-level shell!
Connected
(QEMU) guest-get-vcpus
{"return": [
{"online": true, "can-offline": false, "logical-id": 0},
{"online": true, "can-offline": true, "logical-id": 1}]}

After:
./qmp-shell -N /tmp/qmp-ga.sock
Welcome to the QMP low-level shell!
Connected
(QEMU) guest-get-vcpus
{"return": [
{"online": true, "can-offline": false, "logical-id": 0},
{"online": true, "can-offline": true, "logical-id": 1},
{"online": true, "can-offline": true, "logical-id": 3}]}

Signed-off-by: Lin Ma <lma@suse.com>
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
*fix build breakage by using PRId64 for sscanf
Signed-off-by: Michael Roth <michael.roth@amd.com>


  Commit: 0697e9ed291c67f7f65f7006f4917cc6177ac180
      
https://github.com/qemu/qemu/commit/0697e9ed291c67f7f65f7006f4917cc6177ac180
  Author: AlexChen <alex.chen@huawei.com>
  Date:   2021-03-16 (Tue, 16 Mar 2021)

  Changed paths:
    M qga/channel-win32.c
    M qga/commands-posix.c
    M qga/commands-win32.c
    M qga/commands.c
    M qga/main.c

  Log Message:
  -----------
  qga: Add spaces around operator

Reported-by: Euler Robot <euler.robot@huawei.com>
Signed-off-by: AlexChen <alex.chen@huawei.com>
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
*fix 80+ char violation while we're here
*fix w32 build breakage from changing INVALID_SET_FILE_POINTER
 definition from a cast to a subtraction
Signed-off-by: Michael Roth <michael.roth@amd.com>


  Commit: 55b53dabb5b40a797a0c6ec60965da188382d64c
      
https://github.com/qemu/qemu/commit/55b53dabb5b40a797a0c6ec60965da188382d64c
  Author: AlexChen <alex.chen@huawei.com>
  Date:   2021-03-16 (Tue, 16 Mar 2021)

  Changed paths:
    M qga/commands-win32.c

  Log Message:
  -----------
  qga: Delete redundant spaces

Reported-by: Euler Robot <euler.robot@huawei.com>
Signed-off-by: AlexChen <alex.chen@huawei.com>
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Michael Roth <michael.roth@amd.com>


  Commit: aaaed19972e6cd9ca4d3618d3bdf9ddae780d7b8
      
https://github.com/qemu/qemu/commit/aaaed19972e6cd9ca4d3618d3bdf9ddae780d7b8
  Author: AlexChen <alex.chen@huawei.com>
  Date:   2021-03-16 (Tue, 16 Mar 2021)

  Changed paths:
    M qga/main.c

  Log Message:
  -----------
  qga: Open brace '{' following struct go on the same

Reported-by: Euler Robot <euler.robot@huawei.com>
Signed-off-by: AlexChen <alex.chen@huawei.com>
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Michael Roth <michael.roth@amd.com>


  Commit: 86dc17d4d01eb836ee56eb9435c6d63a72d3c7d4
      
https://github.com/qemu/qemu/commit/86dc17d4d01eb836ee56eb9435c6d63a72d3c7d4
  Author: AlexChen <alex.chen@huawei.com>
  Date:   2021-03-16 (Tue, 16 Mar 2021)

  Changed paths:
    M qga/main.c

  Log Message:
  -----------
  qga: Switch and case should be at the same indent

Reported-by: Euler Robot <euler.robot@huawei.com>
Signed-off-by: AlexChen <alex.chen@huawei.com>
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Michael Roth <michael.roth@amd.com>


  Commit: c98939daeca3beb21c85560acede8d3529e363d9
      
https://github.com/qemu/qemu/commit/c98939daeca3beb21c85560acede8d3529e363d9
  Author: Marc-André Lureau <marcandre.lureau@redhat.com>
  Date:   2021-03-16 (Tue, 16 Mar 2021)

  Changed paths:
    M include/qapi/qmp/dispatch.h
    M qapi/qmp-dispatch.c
    M qapi/qmp-registry.c
    M qga/main.c

  Log Message:
  -----------
  qga: return a more explicit error on why a command is disabled

qmp_disable_command() now takes an optional error string to return a
more explicit error message.

Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1928806

Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
*fix up 80+ char line
Signed-off-by: Michael Roth <michael.roth@amd.com>


  Commit: 7286d62d4e259be8cecf3dc2deea80ecc14489a5
      
https://github.com/qemu/qemu/commit/7286d62d4e259be8cecf3dc2deea80ecc14489a5
  Author: Peter Maydell <peter.maydell@linaro.org>
  Date:   2021-03-18 (Thu, 18 Mar 2021)

  Changed paths:
    M include/qapi/qmp/dispatch.h
    M qapi/qmp-dispatch.c
    M qapi/qmp-registry.c
    M qga/channel-win32.c
    M qga/commands-posix.c
    M qga/commands-win32.c
    M qga/commands.c
    M qga/main.c

  Log Message:
  -----------
  Merge remote-tracking branch 'remotes/mdroth/tags/qga-pull-2021-03-16-tag' 
into staging

qemu-ga patch queue for soft-freeze

* fix guest-get-vcpus reporting after vcpu unplug
* coding style fix-ups
* report a reason for disabled commands

# gpg: Signature made Wed 17 Mar 2021 03:12:41 GMT
# gpg:                using RSA key CEACC9E15534EBABB82D3FA03353C9CEF108B584
# gpg: Good signature from "Michael Roth <flukshun@gmail.com>" [full]
# gpg:                 aka "Michael Roth <mdroth@utexas.edu>" [full]
# gpg:                 aka "Michael Roth <mdroth@linux.vnet.ibm.com>" [full]
# Primary key fingerprint: CEAC C9E1 5534 EBAB B82D  3FA0 3353 C9CE F108 B584

* remotes/mdroth/tags/qga-pull-2021-03-16-tag:
  qga: return a more explicit error on why a command is disabled
  qga: Switch and case should be at the same indent
  qga: Open brace '{' following struct go on the same
  qga: Delete redundant spaces
  qga: Add spaces around operator
  qga: Correct loop count in qmp_guest_get_vcpus()

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>


Compare: https://github.com/qemu/qemu/compare/b12498fc575f...7286d62d4e25