From: Markus Armbruster <armbru@redhat.com>
To: qemu-devel@nongnu.org
Cc: peter.maydell@linaro.org, "Paolo Bonzini" <pbonzini@redhat.com>,
"Philippe Mathieu-Daudé" <philmd@redhat.com>,
"David Hildenbrand" <david@redhat.com>
Subject: [PULL 03/29] qapi: Restrict balloon-related commands to machine code
Date: Tue, 29 Sep 2020 22:19:00 +0200 [thread overview]
Message-ID: <20200929201926.2155622-4-armbru@redhat.com> (raw)
In-Reply-To: <20200929201926.2155622-1-armbru@redhat.com>
From: Philippe Mathieu-Daudé <philmd@redhat.com>
Only qemu-system-FOO and qemu-storage-daemon provide QMP
monitors, therefore such declarations and definitions are
irrelevant for user-mode emulation.
Restricting the balloon-related commands to machine.json pulls less
QAPI-generated code into user-mode.
Reviewed-by: David Hildenbrand <david@redhat.com>
Acked-by: Markus Armbruster <armbru@redhat.com>
Acked-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Message-Id: <20200913195348.1064154-4-philmd@redhat.com>
[Commit message tweaked]
Signed-off-by: Markus Armbruster <armbru@redhat.com>
---
qapi/machine.json | 90 ++++++++++++++++++++++++++++++++++++++
qapi/misc.json | 90 --------------------------------------
include/sysemu/balloon.h | 2 +-
hw/virtio/virtio-balloon.c | 2 +-
monitor/hmp-cmds.c | 1 +
softmmu/balloon.c | 2 +-
6 files changed, 94 insertions(+), 93 deletions(-)
diff --git a/qapi/machine.json b/qapi/machine.json
index 8e2164a0b6..2accb3c4d2 100644
--- a/qapi/machine.json
+++ b/qapi/machine.json
@@ -945,3 +945,93 @@
'data': 'NumaOptions',
'allow-preconfig': true
}
+
+##
+# @balloon:
+#
+# Request the balloon driver to change its balloon size.
+#
+# @value: the target logical size of the VM in bytes
+# We can deduce the size of the balloon using this formula:
+# logical_vm_size = vm_ram_size - balloon_size
+# From it we have: balloon_size = vm_ram_size - @value
+#
+# Returns: - Nothing on success
+# - If the balloon driver is enabled but not functional because the KVM
+# kernel module cannot support it, KvmMissingCap
+# - If no balloon device is present, DeviceNotActive
+#
+# Notes: This command just issues a request to the guest. When it returns,
+# the balloon size may not have changed. A guest can change the balloon
+# size independent of this command.
+#
+# Since: 0.14.0
+#
+# Example:
+#
+# -> { "execute": "balloon", "arguments": { "value": 536870912 } }
+# <- { "return": {} }
+#
+# With a 2.5GiB guest this command inflated the ballon to 3GiB.
+#
+##
+{ 'command': 'balloon', 'data': {'value': 'int'} }
+
+##
+# @BalloonInfo:
+#
+# Information about the guest balloon device.
+#
+# @actual: the logical size of the VM in bytes
+# Formula used: logical_vm_size = vm_ram_size - balloon_size
+#
+# Since: 0.14.0
+#
+##
+{ 'struct': 'BalloonInfo', 'data': {'actual': 'int' } }
+
+##
+# @query-balloon:
+#
+# Return information about the balloon device.
+#
+# Returns: - @BalloonInfo on success
+# - If the balloon driver is enabled but not functional because the KVM
+# kernel module cannot support it, KvmMissingCap
+# - If no balloon device is present, DeviceNotActive
+#
+# Since: 0.14.0
+#
+# Example:
+#
+# -> { "execute": "query-balloon" }
+# <- { "return": {
+# "actual": 1073741824,
+# }
+# }
+#
+##
+{ 'command': 'query-balloon', 'returns': 'BalloonInfo' }
+
+##
+# @BALLOON_CHANGE:
+#
+# Emitted when the guest changes the actual BALLOON level. This value is
+# equivalent to the @actual field return by the 'query-balloon' command
+#
+# @actual: the logical size of the VM in bytes
+# Formula used: logical_vm_size = vm_ram_size - balloon_size
+#
+# Note: this event is rate-limited.
+#
+# Since: 1.2
+#
+# Example:
+#
+# <- { "event": "BALLOON_CHANGE",
+# "data": { "actual": 944766976 },
+# "timestamp": { "seconds": 1267020223, "microseconds": 435656 } }
+#
+##
+{ 'event': 'BALLOON_CHANGE',
+ 'data': { 'actual': 'int' } }
diff --git a/qapi/misc.json b/qapi/misc.json
index a667fdf03e..7a14c50094 100644
--- a/qapi/misc.json
+++ b/qapi/misc.json
@@ -187,65 +187,6 @@
{ 'command': 'query-iothreads', 'returns': ['IOThreadInfo'],
'allow-preconfig': true }
-##
-# @BalloonInfo:
-#
-# Information about the guest balloon device.
-#
-# @actual: the logical size of the VM in bytes
-# Formula used: logical_vm_size = vm_ram_size - balloon_size
-#
-# Since: 0.14.0
-#
-##
-{ 'struct': 'BalloonInfo', 'data': {'actual': 'int' } }
-
-##
-# @query-balloon:
-#
-# Return information about the balloon device.
-#
-# Returns: - @BalloonInfo on success
-# - If the balloon driver is enabled but not functional because the KVM
-# kernel module cannot support it, KvmMissingCap
-# - If no balloon device is present, DeviceNotActive
-#
-# Since: 0.14.0
-#
-# Example:
-#
-# -> { "execute": "query-balloon" }
-# <- { "return": {
-# "actual": 1073741824,
-# }
-# }
-#
-##
-{ 'command': 'query-balloon', 'returns': 'BalloonInfo' }
-
-##
-# @BALLOON_CHANGE:
-#
-# Emitted when the guest changes the actual BALLOON level. This value is
-# equivalent to the @actual field return by the 'query-balloon' command
-#
-# @actual: the logical size of the VM in bytes
-# Formula used: logical_vm_size = vm_ram_size - balloon_size
-#
-# Note: this event is rate-limited.
-#
-# Since: 1.2
-#
-# Example:
-#
-# <- { "event": "BALLOON_CHANGE",
-# "data": { "actual": 944766976 },
-# "timestamp": { "seconds": 1267020223, "microseconds": 435656 } }
-#
-##
-{ 'event': 'BALLOON_CHANGE',
- 'data': { 'actual': 'int' } }
-
##
# @PciMemoryRange:
#
@@ -756,37 +697,6 @@
##
{ 'command': 'inject-nmi' }
-##
-# @balloon:
-#
-# Request the balloon driver to change its balloon size.
-#
-# @value: the target logical size of the VM in bytes
-# We can deduce the size of the balloon using this formula:
-# logical_vm_size = vm_ram_size - balloon_size
-# From it we have: balloon_size = vm_ram_size - @value
-#
-# Returns: - Nothing on success
-# - If the balloon driver is enabled but not functional because the KVM
-# kernel module cannot support it, KvmMissingCap
-# - If no balloon device is present, DeviceNotActive
-#
-# Notes: This command just issues a request to the guest. When it returns,
-# the balloon size may not have changed. A guest can change the balloon
-# size independent of this command.
-#
-# Since: 0.14.0
-#
-# Example:
-#
-# -> { "execute": "balloon", "arguments": { "value": 536870912 } }
-# <- { "return": {} }
-#
-# With a 2.5GiB guest this command inflated the balloon to 3GiB.
-#
-##
-{ 'command': 'balloon', 'data': {'value': 'int'} }
-
##
# @human-monitor-command:
#
diff --git a/include/sysemu/balloon.h b/include/sysemu/balloon.h
index 20a2defe3a..867687b73a 100644
--- a/include/sysemu/balloon.h
+++ b/include/sysemu/balloon.h
@@ -15,7 +15,7 @@
#define QEMU_BALLOON_H
#include "exec/cpu-common.h"
-#include "qapi/qapi-types-misc.h"
+#include "qapi/qapi-types-machine.h"
typedef void (QEMUBalloonEvent)(void *opaque, ram_addr_t target);
typedef void (QEMUBalloonStatus)(void *opaque, BalloonInfo *info);
diff --git a/hw/virtio/virtio-balloon.c b/hw/virtio/virtio-balloon.c
index 22cb5df717..b22b5beda3 100644
--- a/hw/virtio/virtio-balloon.c
+++ b/hw/virtio/virtio-balloon.c
@@ -24,7 +24,7 @@
#include "hw/virtio/virtio-balloon.h"
#include "exec/address-spaces.h"
#include "qapi/error.h"
-#include "qapi/qapi-events-misc.h"
+#include "qapi/qapi-events-machine.h"
#include "qapi/visitor.h"
#include "trace.h"
#include "qemu/error-report.h"
diff --git a/monitor/hmp-cmds.c b/monitor/hmp-cmds.c
index 7711726fd2..de01ba2084 100644
--- a/monitor/hmp-cmds.c
+++ b/monitor/hmp-cmds.c
@@ -32,6 +32,7 @@
#include "qapi/qapi-commands-block.h"
#include "qapi/qapi-commands-char.h"
#include "qapi/qapi-commands-control.h"
+#include "qapi/qapi-commands-machine.h"
#include "qapi/qapi-commands-migration.h"
#include "qapi/qapi-commands-misc.h"
#include "qapi/qapi-commands-net.h"
diff --git a/softmmu/balloon.c b/softmmu/balloon.c
index 23452295cd..e0e8969a4b 100644
--- a/softmmu/balloon.c
+++ b/softmmu/balloon.c
@@ -29,7 +29,7 @@
#include "sysemu/kvm.h"
#include "sysemu/balloon.h"
#include "qapi/error.h"
-#include "qapi/qapi-commands-misc.h"
+#include "qapi/qapi-commands-machine.h"
#include "qapi/qmp/qerror.h"
#include "trace.h"
--
2.26.2
next prev parent reply other threads:[~2020-09-29 20:27 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-09-29 20:18 [PULL 00/29] QAPI patches patches for 2020-09-29 Markus Armbruster
2020-09-29 20:18 ` [PULL 01/29] qapi: Restrict LostTickPolicy enum to machine code Markus Armbruster
2020-09-29 20:18 ` [PULL 02/29] qapi: Correct balloon documentation Markus Armbruster
2020-09-29 20:19 ` Markus Armbruster [this message]
2020-09-29 20:19 ` [PULL 04/29] qapi: Restrict query-vm-generation-id command to machine code Markus Armbruster
2020-09-29 20:19 ` [PULL 05/29] qapi: Restrict query-uuid " Markus Armbruster
2020-09-29 20:19 ` [PULL 06/29] qapi: Restrict device memory commands " Markus Armbruster
2020-09-29 20:19 ` [PULL 07/29] qapi: Extract ACPI commands to 'acpi.json' Markus Armbruster
2020-09-29 20:19 ` [PULL 08/29] qapi: Extract PCI commands to 'pci.json' Markus Armbruster
2020-09-29 20:19 ` [PULL 09/29] qapi: Fix doc comment indentation again Markus Armbruster
2020-09-29 20:19 ` [PULL 10/29] qapi/block.json: Add newline after "Example:" for block-latency-histogram-set Markus Armbruster
2020-09-29 20:19 ` [PULL 11/29] tests/qapi/doc-good.json: Prepare for qapi-doc Sphinx extension Markus Armbruster
2020-09-29 20:19 ` [PULL 12/29] scripts/qapi: Move doc-comment whitespace stripping to doc.py Markus Armbruster
2020-09-29 20:19 ` [PULL 13/29] scripts/qapi/parser.py: improve doc comment indent handling Markus Armbruster
2020-09-29 20:19 ` [PULL 14/29] qapi/machine.json: Escape a literal '*' in doc comment Markus Armbruster
2020-09-29 20:19 ` [PULL 15/29] docs/sphinx: Add new qapi-doc Sphinx extension Markus Armbruster
2020-09-29 20:19 ` [PULL 16/29] docs/interop: Convert qemu-ga-ref to rST Markus Armbruster
2020-09-29 20:19 ` [PULL 17/29] docs/interop: Convert qemu-qmp-ref " Markus Armbruster
2020-09-29 20:19 ` [PULL 18/29] qapi: Use rST markup for literal blocks Markus Armbruster
2020-09-29 20:19 ` [PULL 19/29] qga/qapi-schema.json: Add some headings Markus Armbruster
2020-09-29 20:19 ` [PULL 20/29] tests/qapi-schema: Convert doc-good.json to rST-style strong/emphasis Markus Armbruster
2020-09-29 20:19 ` [PULL 21/29] meson.build: Move SPHINX_ARGS to top level meson.build file Markus Armbruster
2020-09-29 20:19 ` [PULL 22/29] meson.build: Make manuals depend on source to Sphinx extensions Markus Armbruster
2020-09-29 20:19 ` [PULL 23/29] tests/qapi-schema: Add test of the rST QAPI doc-comment output Markus Armbruster
2020-09-29 20:19 ` [PULL 24/29] scripts/qapi: Remove texinfo generation support Markus Armbruster
2020-09-29 20:19 ` [PULL 25/29] docs/devel/qapi-code-gen.txt: Update to new rST backend conventions Markus Armbruster
2020-09-29 20:19 ` [PULL 26/29] scripts/texi2pod: Delete unused script Markus Armbruster
2020-09-29 20:19 ` [PULL 27/29] Remove Texinfo related line from git.orderfile Markus Armbruster
2020-09-29 20:19 ` [PULL 28/29] configure: Drop texinfo requirement Markus Armbruster
2020-09-29 20:19 ` [PULL 29/29] Remove texinfo dependency from docker and CI configs Markus Armbruster
2020-09-30 10:27 ` [PULL 00/29] QAPI patches patches for 2020-09-29 Peter Maydell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200929201926.2155622-4-armbru@redhat.com \
--to=armbru@redhat.com \
--cc=david@redhat.com \
--cc=pbonzini@redhat.com \
--cc=peter.maydell@linaro.org \
--cc=philmd@redhat.com \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).