* [PATCH v5 0/8] user-mode: Prune build dependencies (part 2)
@ 2020-09-13 19:53 Philippe Mathieu-Daudé
2020-09-13 19:53 ` [PATCH v5 1/8] qapi: Restrict LostTickPolicy enum to machine code Philippe Mathieu-Daudé
` (9 more replies)
0 siblings, 10 replies; 21+ messages in thread
From: Philippe Mathieu-Daudé @ 2020-09-13 19:53 UTC (permalink / raw)
To: Markus Armbruster, qemu-devel; +Cc: Paolo Bonzini, Philippe Mathieu-Daudé
This is the second part of a series reducing user-mode
dependencies. By stripping out unused code, the build
and testing time is reduced (as is space used by objects).
Series is fully Acked.
Part 2:
- Extract code not related to user-mode from qapi/misc.json
Since v4:
- Rebased on "QOM boilerplate cleanup"
- Dropped patch #1 "target/i386: Restrict X86CPUFeatureWord"
- Added Paolo's A-b tag
Since v3:
- Rebased (Meson)
- Addressed Markus comments:
- Use g_assert_not_reached() in stub
- Add commit descriptions
- Extract ACPI / PCI
- MEMORY not extracted as no feedback from Igor/MST
Since v2:
- Addressed Igor review comments (move query-uuid to machine)
- Addressed David review comments (fix balloon documentation)
Since v1:
- Do not extract the 'add_client' command (elmarco)
CI:
https://gitlab.com/philmd/qemu/-/pipelines/189374631
Philippe Mathieu-Daudé (8):
qapi: Restrict LostTickPolicy enum to machine code
qapi: Correct balloon documentation
qapi: Restrict balloon-related commands to machine code
qapi: Restrict query-vm-generation-id command to machine code
qapi: Restrict query-uuid command to machine code
qapi: Restrict device memory commands to machine code
qapi: Extract ACPI commands to 'acpi.json'
qapi: Extract PCI commands to 'pci.json'
qapi/acpi.json | 141 +++++
qapi/machine.json | 388 +++++++++++++
qapi/misc.json | 820 ---------------------------
qapi/pci.json | 316 +++++++++++
qapi/qapi-schema.json | 2 +
include/hw/acpi/acpi_dev_interface.h | 2 +-
include/hw/mem/memory-device.h | 2 +-
include/hw/rtc/mc146818rtc.h | 2 +-
include/hw/virtio/virtio-pmem.h | 2 +-
include/sysemu/balloon.h | 2 +-
block/iscsi.c | 2 +-
hw/acpi/core.c | 2 +-
hw/acpi/cpu.c | 2 +-
hw/acpi/memory_hotplug.c | 3 +-
hw/acpi/vmgenid.c | 2 +-
hw/core/qdev-properties.c | 1 +
hw/i386/kvm/i8254.c | 2 +-
hw/pci/pci-stub.c | 2 +-
hw/pci/pci.c | 2 +-
hw/virtio/virtio-balloon.c | 2 +-
hw/virtio/virtio-mem-pci.c | 1 +
monitor/hmp-cmds.c | 2 +
monitor/qmp-cmds.c | 1 +
softmmu/balloon.c | 2 +-
stubs/uuid.c | 2 +-
stubs/vmgenid.c | 2 +-
MAINTAINERS | 2 +
qapi/meson.build | 2 +
28 files changed, 874 insertions(+), 837 deletions(-)
create mode 100644 qapi/acpi.json
create mode 100644 qapi/pci.json
--
2.26.2
^ permalink raw reply [flat|nested] 21+ messages in thread
* [PATCH v5 1/8] qapi: Restrict LostTickPolicy enum to machine code
2020-09-13 19:53 [PATCH v5 0/8] user-mode: Prune build dependencies (part 2) Philippe Mathieu-Daudé
@ 2020-09-13 19:53 ` Philippe Mathieu-Daudé
2020-09-14 9:14 ` Markus Armbruster
2020-09-13 19:53 ` [PATCH v5 2/8] qapi: Correct balloon documentation Philippe Mathieu-Daudé
` (8 subsequent siblings)
9 siblings, 1 reply; 21+ messages in thread
From: Philippe Mathieu-Daudé @ 2020-09-13 19:53 UTC (permalink / raw)
To: Markus Armbruster, qemu-devel; +Cc: Paolo Bonzini, Philippe Mathieu-Daudé
Acked-by: Markus Armbruster <armbru@redhat.com>
Acked-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
qapi/machine.json | 32 ++++++++++++++++++++++++++++++++
qapi/misc.json | 32 --------------------------------
include/hw/rtc/mc146818rtc.h | 2 +-
hw/core/qdev-properties.c | 1 +
hw/i386/kvm/i8254.c | 2 +-
5 files changed, 35 insertions(+), 34 deletions(-)
diff --git a/qapi/machine.json b/qapi/machine.json
index 0ac1880e4a4..b6396aa3fea 100644
--- a/qapi/machine.json
+++ b/qapi/machine.json
@@ -426,6 +426,38 @@
##
{ 'command': 'query-target', 'returns': 'TargetInfo' }
+##
+# @LostTickPolicy:
+#
+# Policy for handling lost ticks in timer devices. Ticks end up getting
+# lost when, for example, the guest is paused.
+#
+# @discard: throw away the missed ticks and continue with future injection
+# normally. The guest OS will see the timer jump ahead by a
+# potentially quite significant amount all at once, as if the
+# intervening chunk of time had simply not existed; needless to
+# say, such a sudden jump can easily confuse a guest OS which is
+# not specifically prepared to deal with it. Assuming the guest
+# OS can deal correctly with the time jump, the time in the guest
+# and in the host should now match.
+#
+# @delay: continue to deliver ticks at the normal rate. The guest OS will
+# not notice anything is amiss, as from its point of view time will
+# have continued to flow normally. The time in the guest should now
+# be behind the time in the host by exactly the amount of time during
+# which ticks have been missed.
+#
+# @slew: deliver ticks at a higher rate to catch up with the missed ticks.
+# The guest OS will not notice anything is amiss, as from its point
+# of view time will have continued to flow normally. Once the timer
+# has managed to catch up with all the missing ticks, the time in
+# the guest and in the host should match.
+#
+# Since: 2.0
+##
+{ 'enum': 'LostTickPolicy',
+ 'data': ['discard', 'delay', 'slew' ] }
+
##
# @NumaOptionsType:
#
diff --git a/qapi/misc.json b/qapi/misc.json
index 8cf6ebe67cb..b21963a176d 100644
--- a/qapi/misc.json
+++ b/qapi/misc.json
@@ -8,38 +8,6 @@
{ 'include': 'common.json' }
-##
-# @LostTickPolicy:
-#
-# Policy for handling lost ticks in timer devices. Ticks end up getting
-# lost when, for example, the guest is paused.
-#
-# @discard: throw away the missed ticks and continue with future injection
-# normally. The guest OS will see the timer jump ahead by a
-# potentially quite significant amount all at once, as if the
-# intervening chunk of time had simply not existed; needless to
-# say, such a sudden jump can easily confuse a guest OS which is
-# not specifically prepared to deal with it. Assuming the guest
-# OS can deal correctly with the time jump, the time in the guest
-# and in the host should now match.
-#
-# @delay: continue to deliver ticks at the normal rate. The guest OS will
-# not notice anything is amiss, as from its point of view time will
-# have continued to flow normally. The time in the guest should now
-# be behind the time in the host by exactly the amount of time during
-# which ticks have been missed.
-#
-# @slew: deliver ticks at a higher rate to catch up with the missed ticks.
-# The guest OS will not notice anything is amiss, as from its point
-# of view time will have continued to flow normally. Once the timer
-# has managed to catch up with all the missing ticks, the time in
-# the guest and in the host should match.
-#
-# Since: 2.0
-##
-{ 'enum': 'LostTickPolicy',
- 'data': ['discard', 'delay', 'slew' ] }
-
##
# @add_client:
#
diff --git a/include/hw/rtc/mc146818rtc.h b/include/hw/rtc/mc146818rtc.h
index e58e006d0d0..eb69182ca33 100644
--- a/include/hw/rtc/mc146818rtc.h
+++ b/include/hw/rtc/mc146818rtc.h
@@ -9,7 +9,7 @@
#ifndef HW_RTC_MC146818RTC_H
#define HW_RTC_MC146818RTC_H
-#include "qapi/qapi-types-misc.h"
+#include "qapi/qapi-types-machine.h"
#include "qemu/queue.h"
#include "qemu/timer.h"
#include "hw/isa/isa.h"
diff --git a/hw/core/qdev-properties.c b/hw/core/qdev-properties.c
index 098298c78e6..343c824da04 100644
--- a/hw/core/qdev-properties.c
+++ b/hw/core/qdev-properties.c
@@ -4,6 +4,7 @@
#include "qapi/error.h"
#include "hw/pci/pci.h"
#include "qapi/qapi-types-block.h"
+#include "qapi/qapi-types-machine.h"
#include "qapi/qapi-types-misc.h"
#include "qapi/qmp/qerror.h"
#include "qemu/ctype.h"
diff --git a/hw/i386/kvm/i8254.c b/hw/i386/kvm/i8254.c
index e18fd337fab..40d84734e7f 100644
--- a/hw/i386/kvm/i8254.c
+++ b/hw/i386/kvm/i8254.c
@@ -25,7 +25,7 @@
#include "qemu/osdep.h"
#include <linux/kvm.h>
-#include "qapi/qapi-types-misc.h"
+#include "qapi/qapi-types-machine.h"
#include "qapi/error.h"
#include "qemu/module.h"
#include "qemu/timer.h"
--
2.26.2
^ permalink raw reply related [flat|nested] 21+ messages in thread
* [PATCH v5 2/8] qapi: Correct balloon documentation
2020-09-13 19:53 [PATCH v5 0/8] user-mode: Prune build dependencies (part 2) Philippe Mathieu-Daudé
2020-09-13 19:53 ` [PATCH v5 1/8] qapi: Restrict LostTickPolicy enum to machine code Philippe Mathieu-Daudé
@ 2020-09-13 19:53 ` Philippe Mathieu-Daudé
2020-09-13 19:53 ` [PATCH v5 3/8] qapi: Restrict balloon-related commands to machine code Philippe Mathieu-Daudé
` (7 subsequent siblings)
9 siblings, 0 replies; 21+ messages in thread
From: Philippe Mathieu-Daudé @ 2020-09-13 19:53 UTC (permalink / raw)
To: Markus Armbruster, qemu-devel; +Cc: Paolo Bonzini, Philippe Mathieu-Daudé
The documentation incorrectly uses the "size of the balloon"
description when it should be "logical size of the VM". Fix it.
The relation between both values is:
logical_vm_size = vm_ram_size - balloon_size
Reported-by: David Hildenbrand <david@redhat.com>
Suggested-by: David Hildenbrand <david@redhat.com>
Reviewed-by: David Hildenbrand <david@redhat.com>
Acked-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
qapi/misc.json | 13 ++++++++++---
1 file changed, 10 insertions(+), 3 deletions(-)
diff --git a/qapi/misc.json b/qapi/misc.json
index b21963a176d..a667fdf03e5 100644
--- a/qapi/misc.json
+++ b/qapi/misc.json
@@ -192,7 +192,8 @@
#
# Information about the guest balloon device.
#
-# @actual: the number of bytes the balloon currently contains
+# @actual: the logical size of the VM in bytes
+# Formula used: logical_vm_size = vm_ram_size - balloon_size
#
# Since: 0.14.0
#
@@ -228,7 +229,8 @@
# Emitted when the guest changes the actual BALLOON level. This value is
# equivalent to the @actual field return by the 'query-balloon' command
#
-# @actual: actual level of the guest memory balloon in bytes
+# @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.
#
@@ -759,7 +761,10 @@
#
# Request the balloon driver to change its balloon size.
#
-# @value: the target size of the balloon in bytes
+# @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
@@ -777,6 +782,8 @@
# -> { "execute": "balloon", "arguments": { "value": 536870912 } }
# <- { "return": {} }
#
+# With a 2.5GiB guest this command inflated the balloon to 3GiB.
+#
##
{ 'command': 'balloon', 'data': {'value': 'int'} }
--
2.26.2
^ permalink raw reply related [flat|nested] 21+ messages in thread
* [PATCH v5 3/8] qapi: Restrict balloon-related commands to machine code
2020-09-13 19:53 [PATCH v5 0/8] user-mode: Prune build dependencies (part 2) Philippe Mathieu-Daudé
2020-09-13 19:53 ` [PATCH v5 1/8] qapi: Restrict LostTickPolicy enum to machine code Philippe Mathieu-Daudé
2020-09-13 19:53 ` [PATCH v5 2/8] qapi: Correct balloon documentation Philippe Mathieu-Daudé
@ 2020-09-13 19:53 ` Philippe Mathieu-Daudé
2020-09-14 9:16 ` Markus Armbruster
2020-09-13 19:53 ` [PATCH v5 4/8] qapi: Restrict query-vm-generation-id command " Philippe Mathieu-Daudé
` (6 subsequent siblings)
9 siblings, 1 reply; 21+ messages in thread
From: Philippe Mathieu-Daudé @ 2020-09-13 19:53 UTC (permalink / raw)
To: Markus Armbruster, qemu-devel; +Cc: Paolo Bonzini, Philippe Mathieu-Daudé
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
allows pulling less declarations/definitions to 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>
---
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 b6396aa3fea..04f0a907c75 100644
--- a/qapi/machine.json
+++ b/qapi/machine.json
@@ -969,3 +969,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 a667fdf03e5..7a14c50094d 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 20a2defe3aa..867687b73ac 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 22cb5df717b..b22b5beda3c 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 7711726fd22..de01ba20845 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 23452295cd9..e0e8969a4b9 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
^ permalink raw reply related [flat|nested] 21+ messages in thread
* [PATCH v5 4/8] qapi: Restrict query-vm-generation-id command to machine code
2020-09-13 19:53 [PATCH v5 0/8] user-mode: Prune build dependencies (part 2) Philippe Mathieu-Daudé
` (2 preceding siblings ...)
2020-09-13 19:53 ` [PATCH v5 3/8] qapi: Restrict balloon-related commands to machine code Philippe Mathieu-Daudé
@ 2020-09-13 19:53 ` Philippe Mathieu-Daudé
2020-09-13 19:53 ` [PATCH v5 5/8] qapi: Restrict query-uuid " Philippe Mathieu-Daudé
` (5 subsequent siblings)
9 siblings, 0 replies; 21+ messages in thread
From: Philippe Mathieu-Daudé @ 2020-09-13 19:53 UTC (permalink / raw)
To: Markus Armbruster, qemu-devel; +Cc: Paolo Bonzini, Philippe Mathieu-Daudé
Only qemu-system-FOO and qemu-storage-daemon provide QMP
monitors, therefore such declarations and definitions are
irrelevant for user-mode emulation.
Restricting the query-vm-generation-id command to machine.json
allows pulling less declarations/definitions to user-mode.
Acked-by: Igor Mammedov <imammedo@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>
---
qapi/machine.json | 20 ++++++++++++++++++++
qapi/misc.json | 21 ---------------------
hw/acpi/vmgenid.c | 2 +-
stubs/vmgenid.c | 2 +-
4 files changed, 22 insertions(+), 23 deletions(-)
diff --git a/qapi/machine.json b/qapi/machine.json
index 04f0a907c75..dd2815fa670 100644
--- a/qapi/machine.json
+++ b/qapi/machine.json
@@ -426,6 +426,26 @@
##
{ 'command': 'query-target', 'returns': 'TargetInfo' }
+##
+# @GuidInfo:
+#
+# GUID information.
+#
+# @guid: the globally unique identifier
+#
+# Since: 2.9
+##
+{ 'struct': 'GuidInfo', 'data': {'guid': 'str'} }
+
+##
+# @query-vm-generation-id:
+#
+# Show Virtual Machine Generation ID
+#
+# Since: 2.9
+##
+{ 'command': 'query-vm-generation-id', 'returns': 'GuidInfo' }
+
##
# @LostTickPolicy:
#
diff --git a/qapi/misc.json b/qapi/misc.json
index 7a14c50094d..edcc91e1060 100644
--- a/qapi/misc.json
+++ b/qapi/misc.json
@@ -1479,24 +1479,3 @@
#
##
{ 'command': 'xen-load-devices-state', 'data': {'filename': 'str'} }
-
-##
-# @GuidInfo:
-#
-# GUID information.
-#
-# @guid: the globally unique identifier
-#
-# Since: 2.9
-##
-{ 'struct': 'GuidInfo', 'data': {'guid': 'str'} }
-
-##
-# @query-vm-generation-id:
-#
-# Show Virtual Machine Generation ID
-#
-# Since: 2.9
-##
-{ 'command': 'query-vm-generation-id', 'returns': 'GuidInfo' }
-
diff --git a/hw/acpi/vmgenid.c b/hw/acpi/vmgenid.c
index 53db6af75d0..2c8152d5088 100644
--- a/hw/acpi/vmgenid.c
+++ b/hw/acpi/vmgenid.c
@@ -12,7 +12,7 @@
#include "qemu/osdep.h"
#include "qapi/error.h"
-#include "qapi/qapi-commands-misc.h"
+#include "qapi/qapi-commands-machine.h"
#include "qemu/module.h"
#include "hw/acpi/acpi.h"
#include "hw/acpi/aml-build.h"
diff --git a/stubs/vmgenid.c b/stubs/vmgenid.c
index 568e42b0648..bfad656c6cc 100644
--- a/stubs/vmgenid.c
+++ b/stubs/vmgenid.c
@@ -1,6 +1,6 @@
#include "qemu/osdep.h"
#include "qapi/error.h"
-#include "qapi/qapi-commands-misc.h"
+#include "qapi/qapi-commands-machine.h"
#include "qapi/qmp/qerror.h"
GuidInfo *qmp_query_vm_generation_id(Error **errp)
--
2.26.2
^ permalink raw reply related [flat|nested] 21+ messages in thread
* [PATCH v5 5/8] qapi: Restrict query-uuid command to machine code
2020-09-13 19:53 [PATCH v5 0/8] user-mode: Prune build dependencies (part 2) Philippe Mathieu-Daudé
` (3 preceding siblings ...)
2020-09-13 19:53 ` [PATCH v5 4/8] qapi: Restrict query-vm-generation-id command " Philippe Mathieu-Daudé
@ 2020-09-13 19:53 ` Philippe Mathieu-Daudé
2020-09-13 19:53 ` [PATCH v5 6/8] qapi: Restrict device memory commands " Philippe Mathieu-Daudé
` (4 subsequent siblings)
9 siblings, 0 replies; 21+ messages in thread
From: Philippe Mathieu-Daudé @ 2020-09-13 19:53 UTC (permalink / raw)
To: Markus Armbruster, qemu-devel; +Cc: Paolo Bonzini, Philippe Mathieu-Daudé
Only qemu-system-FOO and qemu-storage-daemon provide QMP
monitors, therefore such declarations and definitions are
irrelevant for user-mode emulation.
Restricting the query-uuid command to machine.json allows
pulling less declarations/definitions to user-mode.
Acked-by: Markus Armbruster <armbru@redhat.com>
Acked-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
qapi/machine.json | 30 ++++++++++++++++++++++++++++++
qapi/misc.json | 30 ------------------------------
block/iscsi.c | 2 +-
stubs/uuid.c | 2 +-
4 files changed, 32 insertions(+), 32 deletions(-)
diff --git a/qapi/machine.json b/qapi/machine.json
index dd2815fa670..9b849be2aa6 100644
--- a/qapi/machine.json
+++ b/qapi/machine.json
@@ -426,6 +426,36 @@
##
{ 'command': 'query-target', 'returns': 'TargetInfo' }
+##
+# @UuidInfo:
+#
+# Guest UUID information (Universally Unique Identifier).
+#
+# @UUID: the UUID of the guest
+#
+# Since: 0.14.0
+#
+# Notes: If no UUID was specified for the guest, a null UUID is returned.
+##
+{ 'struct': 'UuidInfo', 'data': {'UUID': 'str'} }
+
+##
+# @query-uuid:
+#
+# Query the guest UUID information.
+#
+# Returns: The @UuidInfo for the guest
+#
+# Since: 0.14.0
+#
+# Example:
+#
+# -> { "execute": "query-uuid" }
+# <- { "return": { "UUID": "550e8400-e29b-41d4-a716-446655440000" } }
+#
+##
+{ 'command': 'query-uuid', 'returns': 'UuidInfo', 'allow-preconfig': true }
+
##
# @GuidInfo:
#
diff --git a/qapi/misc.json b/qapi/misc.json
index edcc91e1060..05db6295fe0 100644
--- a/qapi/misc.json
+++ b/qapi/misc.json
@@ -98,36 +98,6 @@
##
{ 'command': 'query-kvm', 'returns': 'KvmInfo' }
-##
-# @UuidInfo:
-#
-# Guest UUID information (Universally Unique Identifier).
-#
-# @UUID: the UUID of the guest
-#
-# Since: 0.14.0
-#
-# Notes: If no UUID was specified for the guest, a null UUID is returned.
-##
-{ 'struct': 'UuidInfo', 'data': {'UUID': 'str'} }
-
-##
-# @query-uuid:
-#
-# Query the guest UUID information.
-#
-# Returns: The @UuidInfo for the guest
-#
-# Since: 0.14.0
-#
-# Example:
-#
-# -> { "execute": "query-uuid" }
-# <- { "return": { "UUID": "550e8400-e29b-41d4-a716-446655440000" } }
-#
-##
-{ 'command': 'query-uuid', 'returns': 'UuidInfo', 'allow-preconfig': true }
-
##
# @IOThreadInfo:
#
diff --git a/block/iscsi.c b/block/iscsi.c
index bd2122a3a44..e30a7e3606b 100644
--- a/block/iscsi.c
+++ b/block/iscsi.c
@@ -42,7 +42,7 @@
#include "qemu/uuid.h"
#include "sysemu/replay.h"
#include "qapi/error.h"
-#include "qapi/qapi-commands-misc.h"
+#include "qapi/qapi-commands-machine.h"
#include "qapi/qmp/qdict.h"
#include "qapi/qmp/qstring.h"
#include "crypto/secret.h"
diff --git a/stubs/uuid.c b/stubs/uuid.c
index 67f182fa3aa..e5112eb3f60 100644
--- a/stubs/uuid.c
+++ b/stubs/uuid.c
@@ -1,5 +1,5 @@
#include "qemu/osdep.h"
-#include "qapi/qapi-commands-misc.h"
+#include "qapi/qapi-commands-machine.h"
#include "qemu/uuid.h"
UuidInfo *qmp_query_uuid(Error **errp)
--
2.26.2
^ permalink raw reply related [flat|nested] 21+ messages in thread
* [PATCH v5 6/8] qapi: Restrict device memory commands to machine code
2020-09-13 19:53 [PATCH v5 0/8] user-mode: Prune build dependencies (part 2) Philippe Mathieu-Daudé
` (4 preceding siblings ...)
2020-09-13 19:53 ` [PATCH v5 5/8] qapi: Restrict query-uuid " Philippe Mathieu-Daudé
@ 2020-09-13 19:53 ` Philippe Mathieu-Daudé
2020-09-13 19:53 ` [PATCH v5 7/8] qapi: Extract ACPI commands to 'acpi.json' Philippe Mathieu-Daudé
` (3 subsequent siblings)
9 siblings, 0 replies; 21+ messages in thread
From: Philippe Mathieu-Daudé @ 2020-09-13 19:53 UTC (permalink / raw)
To: Markus Armbruster, qemu-devel; +Cc: Paolo Bonzini, Philippe Mathieu-Daudé
Only qemu-system-FOO and qemu-storage-daemon provide QMP
monitors, therefore such declarations and definitions are
irrelevant for user-mode emulation.
Restricting the memory commands to machine.json allows
pulling less declarations/definitions to user-mode.
Acked-by: Igor Mammedov <imammedo@redhat.com>
Acked-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
qapi/machine.json | 216 +++++++++++++++++++++++++++++++
qapi/misc.json | 217 --------------------------------
include/hw/mem/memory-device.h | 2 +-
include/hw/virtio/virtio-pmem.h | 2 +-
hw/acpi/memory_hotplug.c | 1 +
hw/virtio/virtio-mem-pci.c | 1 +
6 files changed, 220 insertions(+), 219 deletions(-)
diff --git a/qapi/machine.json b/qapi/machine.json
index 9b849be2aa6..39fbefb033b 100644
--- a/qapi/machine.json
+++ b/qapi/machine.json
@@ -1109,3 +1109,219 @@
##
{ 'event': 'BALLOON_CHANGE',
'data': { 'actual': 'int' } }
+
+##
+# @MemoryInfo:
+#
+# Actual memory information in bytes.
+#
+# @base-memory: size of "base" memory specified with command line
+# option -m.
+#
+# @plugged-memory: size of memory that can be hot-unplugged. This field
+# is omitted if target doesn't support memory hotplug
+# (i.e. CONFIG_MEM_DEVICE not defined at build time).
+#
+# Since: 2.11.0
+##
+{ 'struct': 'MemoryInfo',
+ 'data' : { 'base-memory': 'size', '*plugged-memory': 'size' } }
+
+##
+# @query-memory-size-summary:
+#
+# Return the amount of initially allocated and present hotpluggable (if
+# enabled) memory in bytes.
+#
+# Example:
+#
+# -> { "execute": "query-memory-size-summary" }
+# <- { "return": { "base-memory": 4294967296, "plugged-memory": 0 } }
+#
+# Since: 2.11.0
+##
+{ 'command': 'query-memory-size-summary', 'returns': 'MemoryInfo' }
+
+##
+# @PCDIMMDeviceInfo:
+#
+# PCDIMMDevice state information
+#
+# @id: device's ID
+#
+# @addr: physical address, where device is mapped
+#
+# @size: size of memory that the device provides
+#
+# @slot: slot number at which device is plugged in
+#
+# @node: NUMA node number where device is plugged in
+#
+# @memdev: memory backend linked with device
+#
+# @hotplugged: true if device was hotplugged
+#
+# @hotpluggable: true if device if could be added/removed while machine is running
+#
+# Since: 2.1
+##
+{ 'struct': 'PCDIMMDeviceInfo',
+ 'data': { '*id': 'str',
+ 'addr': 'int',
+ 'size': 'int',
+ 'slot': 'int',
+ 'node': 'int',
+ 'memdev': 'str',
+ 'hotplugged': 'bool',
+ 'hotpluggable': 'bool'
+ }
+}
+
+##
+# @VirtioPMEMDeviceInfo:
+#
+# VirtioPMEM state information
+#
+# @id: device's ID
+#
+# @memaddr: physical address in memory, where device is mapped
+#
+# @size: size of memory that the device provides
+#
+# @memdev: memory backend linked with device
+#
+# Since: 4.1
+##
+{ 'struct': 'VirtioPMEMDeviceInfo',
+ 'data': { '*id': 'str',
+ 'memaddr': 'size',
+ 'size': 'size',
+ 'memdev': 'str'
+ }
+}
+
+##
+# @VirtioMEMDeviceInfo:
+#
+# VirtioMEMDevice state information
+#
+# @id: device's ID
+#
+# @memaddr: physical address in memory, where device is mapped
+#
+# @requested-size: the user requested size of the device
+#
+# @size: the (current) size of memory that the device provides
+#
+# @max-size: the maximum size of memory that the device can provide
+#
+# @block-size: the block size of memory that the device provides
+#
+# @node: NUMA node number where device is assigned to
+#
+# @memdev: memory backend linked with the region
+#
+# Since: 5.1
+##
+{ 'struct': 'VirtioMEMDeviceInfo',
+ 'data': { '*id': 'str',
+ 'memaddr': 'size',
+ 'requested-size': 'size',
+ 'size': 'size',
+ 'max-size': 'size',
+ 'block-size': 'size',
+ 'node': 'int',
+ 'memdev': 'str'
+ }
+}
+
+##
+# @MemoryDeviceInfo:
+#
+# Union containing information about a memory device
+#
+# nvdimm is included since 2.12. virtio-pmem is included since 4.1.
+# virtio-mem is included since 5.1.
+#
+# Since: 2.1
+##
+{ 'union': 'MemoryDeviceInfo',
+ 'data': { 'dimm': 'PCDIMMDeviceInfo',
+ 'nvdimm': 'PCDIMMDeviceInfo',
+ 'virtio-pmem': 'VirtioPMEMDeviceInfo',
+ 'virtio-mem': 'VirtioMEMDeviceInfo'
+ }
+}
+
+##
+# @query-memory-devices:
+#
+# Lists available memory devices and their state
+#
+# Since: 2.1
+#
+# Example:
+#
+# -> { "execute": "query-memory-devices" }
+# <- { "return": [ { "data":
+# { "addr": 5368709120,
+# "hotpluggable": true,
+# "hotplugged": true,
+# "id": "d1",
+# "memdev": "/objects/memX",
+# "node": 0,
+# "size": 1073741824,
+# "slot": 0},
+# "type": "dimm"
+# } ] }
+#
+##
+{ 'command': 'query-memory-devices', 'returns': ['MemoryDeviceInfo'] }
+
+##
+# @MEMORY_DEVICE_SIZE_CHANGE:
+#
+# Emitted when the size of a memory device changes. Only emitted for memory
+# devices that can actually change the size (e.g., virtio-mem due to guest
+# action).
+#
+# @id: device's ID
+# @size: the new size of memory that the device provides
+#
+# Note: this event is rate-limited.
+#
+# Since: 5.1
+#
+# Example:
+#
+# <- { "event": "MEMORY_DEVICE_SIZE_CHANGE",
+# "data": { "id": "vm0", "size": 1073741824},
+# "timestamp": { "seconds": 1588168529, "microseconds": 201316 } }
+#
+##
+{ 'event': 'MEMORY_DEVICE_SIZE_CHANGE',
+ 'data': { '*id': 'str', 'size': 'size' } }
+
+
+##
+# @MEM_UNPLUG_ERROR:
+#
+# Emitted when memory hot unplug error occurs.
+#
+# @device: device name
+#
+# @msg: Informative message
+#
+# Since: 2.4
+#
+# Example:
+#
+# <- { "event": "MEM_UNPLUG_ERROR"
+# "data": { "device": "dimm1",
+# "msg": "acpi: device unplug for unsupported device"
+# },
+# "timestamp": { "seconds": 1265044230, "microseconds": 450486 } }
+#
+##
+{ 'event': 'MEM_UNPLUG_ERROR',
+ 'data': { 'device': 'str', 'msg': 'str' } }
diff --git a/qapi/misc.json b/qapi/misc.json
index 05db6295fe0..71d11365ead 100644
--- a/qapi/misc.json
+++ b/qapi/misc.json
@@ -826,39 +826,6 @@
##
{ 'command': 'closefd', 'data': {'fdname': 'str'} }
-##
-# @MemoryInfo:
-#
-# Actual memory information in bytes.
-#
-# @base-memory: size of "base" memory specified with command line
-# option -m.
-#
-# @plugged-memory: size of memory that can be hot-unplugged. This field
-# is omitted if target doesn't support memory hotplug
-# (i.e. CONFIG_MEM_DEVICE not defined at build time).
-#
-# Since: 2.11.0
-##
-{ 'struct': 'MemoryInfo',
- 'data' : { 'base-memory': 'size', '*plugged-memory': 'size' } }
-
-##
-# @query-memory-size-summary:
-#
-# Return the amount of initially allocated and present hotpluggable (if
-# enabled) memory in bytes.
-#
-# Example:
-#
-# -> { "execute": "query-memory-size-summary" }
-# <- { "return": { "base-memory": 4294967296, "plugged-memory": 0 } }
-#
-# Since: 2.11.0
-##
-{ 'command': 'query-memory-size-summary', 'returns': 'MemoryInfo' }
-
-
##
# @AddfdInfo:
#
@@ -1154,190 +1121,6 @@
'returns': ['CommandLineOptionInfo'],
'allow-preconfig': true }
-##
-# @PCDIMMDeviceInfo:
-#
-# PCDIMMDevice state information
-#
-# @id: device's ID
-#
-# @addr: physical address, where device is mapped
-#
-# @size: size of memory that the device provides
-#
-# @slot: slot number at which device is plugged in
-#
-# @node: NUMA node number where device is plugged in
-#
-# @memdev: memory backend linked with device
-#
-# @hotplugged: true if device was hotplugged
-#
-# @hotpluggable: true if device if could be added/removed while machine is running
-#
-# Since: 2.1
-##
-{ 'struct': 'PCDIMMDeviceInfo',
- 'data': { '*id': 'str',
- 'addr': 'int',
- 'size': 'int',
- 'slot': 'int',
- 'node': 'int',
- 'memdev': 'str',
- 'hotplugged': 'bool',
- 'hotpluggable': 'bool'
- }
-}
-
-##
-# @VirtioPMEMDeviceInfo:
-#
-# VirtioPMEM state information
-#
-# @id: device's ID
-#
-# @memaddr: physical address in memory, where device is mapped
-#
-# @size: size of memory that the device provides
-#
-# @memdev: memory backend linked with device
-#
-# Since: 4.1
-##
-{ 'struct': 'VirtioPMEMDeviceInfo',
- 'data': { '*id': 'str',
- 'memaddr': 'size',
- 'size': 'size',
- 'memdev': 'str'
- }
-}
-
-##
-# @VirtioMEMDeviceInfo:
-#
-# VirtioMEMDevice state information
-#
-# @id: device's ID
-#
-# @memaddr: physical address in memory, where device is mapped
-#
-# @requested-size: the user requested size of the device
-#
-# @size: the (current) size of memory that the device provides
-#
-# @max-size: the maximum size of memory that the device can provide
-#
-# @block-size: the block size of memory that the device provides
-#
-# @node: NUMA node number where device is assigned to
-#
-# @memdev: memory backend linked with the region
-#
-# Since: 5.1
-##
-{ 'struct': 'VirtioMEMDeviceInfo',
- 'data': { '*id': 'str',
- 'memaddr': 'size',
- 'requested-size': 'size',
- 'size': 'size',
- 'max-size': 'size',
- 'block-size': 'size',
- 'node': 'int',
- 'memdev': 'str'
- }
-}
-
-##
-# @MemoryDeviceInfo:
-#
-# Union containing information about a memory device
-#
-# nvdimm is included since 2.12. virtio-pmem is included since 4.1.
-# virtio-mem is included since 5.1.
-#
-# Since: 2.1
-##
-{ 'union': 'MemoryDeviceInfo',
- 'data': { 'dimm': 'PCDIMMDeviceInfo',
- 'nvdimm': 'PCDIMMDeviceInfo',
- 'virtio-pmem': 'VirtioPMEMDeviceInfo',
- 'virtio-mem': 'VirtioMEMDeviceInfo'
- }
-}
-
-##
-# @query-memory-devices:
-#
-# Lists available memory devices and their state
-#
-# Since: 2.1
-#
-# Example:
-#
-# -> { "execute": "query-memory-devices" }
-# <- { "return": [ { "data":
-# { "addr": 5368709120,
-# "hotpluggable": true,
-# "hotplugged": true,
-# "id": "d1",
-# "memdev": "/objects/memX",
-# "node": 0,
-# "size": 1073741824,
-# "slot": 0},
-# "type": "dimm"
-# } ] }
-#
-##
-{ 'command': 'query-memory-devices', 'returns': ['MemoryDeviceInfo'] }
-
-##
-# @MEMORY_DEVICE_SIZE_CHANGE:
-#
-# Emitted when the size of a memory device changes. Only emitted for memory
-# devices that can actually change the size (e.g., virtio-mem due to guest
-# action).
-#
-# @id: device's ID
-# @size: the new size of memory that the device provides
-#
-# Note: this event is rate-limited.
-#
-# Since: 5.1
-#
-# Example:
-#
-# <- { "event": "MEMORY_DEVICE_SIZE_CHANGE",
-# "data": { "id": "vm0", "size": 1073741824},
-# "timestamp": { "seconds": 1588168529, "microseconds": 201316 } }
-#
-##
-{ 'event': 'MEMORY_DEVICE_SIZE_CHANGE',
- 'data': { '*id': 'str', 'size': 'size' } }
-
-
-##
-# @MEM_UNPLUG_ERROR:
-#
-# Emitted when memory hot unplug error occurs.
-#
-# @device: device name
-#
-# @msg: Informative message
-#
-# Since: 2.4
-#
-# Example:
-#
-# <- { "event": "MEM_UNPLUG_ERROR"
-# "data": { "device": "dimm1",
-# "msg": "acpi: device unplug for unsupported device"
-# },
-# "timestamp": { "seconds": 1265044230, "microseconds": 450486 } }
-#
-##
-{ 'event': 'MEM_UNPLUG_ERROR',
- 'data': { 'device': 'str', 'msg': 'str' } }
-
##
# @ACPISlotType:
#
diff --git a/include/hw/mem/memory-device.h b/include/hw/mem/memory-device.h
index cde52e83c9a..30d7e99f52c 100644
--- a/include/hw/mem/memory-device.h
+++ b/include/hw/mem/memory-device.h
@@ -14,7 +14,7 @@
#define MEMORY_DEVICE_H
#include "hw/qdev-core.h"
-#include "qapi/qapi-types-misc.h"
+#include "qapi/qapi-types-machine.h"
#include "qom/object.h"
#define TYPE_MEMORY_DEVICE "memory-device"
diff --git a/include/hw/virtio/virtio-pmem.h b/include/hw/virtio/virtio-pmem.h
index 56df9a03cea..826ddd3d564 100644
--- a/include/hw/virtio/virtio-pmem.h
+++ b/include/hw/virtio/virtio-pmem.h
@@ -15,7 +15,7 @@
#define HW_VIRTIO_PMEM_H
#include "hw/virtio/virtio.h"
-#include "qapi/qapi-types-misc.h"
+#include "qapi/qapi-types-machine.h"
#include "qom/object.h"
#define TYPE_VIRTIO_PMEM "virtio-pmem"
diff --git a/hw/acpi/memory_hotplug.c b/hw/acpi/memory_hotplug.c
index 8d2e82240ff..dfe57af4292 100644
--- a/hw/acpi/memory_hotplug.c
+++ b/hw/acpi/memory_hotplug.c
@@ -7,6 +7,7 @@
#include "migration/vmstate.h"
#include "trace.h"
#include "qapi/error.h"
+#include "qapi/qapi-events-machine.h"
#include "qapi/qapi-events-misc.h"
#define MEMORY_SLOTS_NUMBER "MDNR"
diff --git a/hw/virtio/virtio-mem-pci.c b/hw/virtio/virtio-mem-pci.c
index 590cec041b4..913f4a33260 100644
--- a/hw/virtio/virtio-mem-pci.c
+++ b/hw/virtio/virtio-mem-pci.c
@@ -14,6 +14,7 @@
#include "virtio-mem-pci.h"
#include "hw/mem/memory-device.h"
#include "qapi/error.h"
+#include "qapi/qapi-events-machine.h"
#include "qapi/qapi-events-misc.h"
static void virtio_mem_pci_realize(VirtIOPCIProxy *vpci_dev, Error **errp)
--
2.26.2
^ permalink raw reply related [flat|nested] 21+ messages in thread
* [PATCH v5 7/8] qapi: Extract ACPI commands to 'acpi.json'
2020-09-13 19:53 [PATCH v5 0/8] user-mode: Prune build dependencies (part 2) Philippe Mathieu-Daudé
` (5 preceding siblings ...)
2020-09-13 19:53 ` [PATCH v5 6/8] qapi: Restrict device memory commands " Philippe Mathieu-Daudé
@ 2020-09-13 19:53 ` Philippe Mathieu-Daudé
2020-09-13 19:53 ` [PATCH v5 8/8] qapi: Extract PCI commands to 'pci.json' Philippe Mathieu-Daudé
` (2 subsequent siblings)
9 siblings, 0 replies; 21+ messages in thread
From: Philippe Mathieu-Daudé @ 2020-09-13 19:53 UTC (permalink / raw)
To: Markus Armbruster, qemu-devel; +Cc: Paolo Bonzini, Philippe Mathieu-Daudé
Only qemu-system-FOO and qemu-storage-daemon provide QMP
monitors, therefore such declarations and definitions are
irrelevant for user-mode emulation.
Extracting the ACPI commands to their own schema reduces
the size of the qapi-misc* headers generated, and allows
pulling less declarations/definitions to user-mode.
Suggested-by: Markus Armbruster <armbru@redhat.com>
Acked-by: Igor Mammedov <imammedo@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>
---
qapi/acpi.json | 141 +++++++++++++++++++++++++++
qapi/misc.json | 131 -------------------------
qapi/qapi-schema.json | 1 +
include/hw/acpi/acpi_dev_interface.h | 2 +-
hw/acpi/core.c | 2 +-
hw/acpi/cpu.c | 2 +-
hw/acpi/memory_hotplug.c | 2 +-
monitor/qmp-cmds.c | 1 +
MAINTAINERS | 1 +
qapi/meson.build | 1 +
10 files changed, 149 insertions(+), 135 deletions(-)
create mode 100644 qapi/acpi.json
diff --git a/qapi/acpi.json b/qapi/acpi.json
new file mode 100644
index 00000000000..51f0d55db73
--- /dev/null
+++ b/qapi/acpi.json
@@ -0,0 +1,141 @@
+# -*- Mode: Python -*-
+# vim: filetype=python
+#
+# This work is licensed under the terms of the GNU GPL, version 2 or later.
+# See the COPYING file in the top-level directory.
+# SPDX-License-Identifier: GPL-2.0-or-later
+
+##
+# = ACPI
+##
+
+##
+# @AcpiTableOptions:
+#
+# Specify an ACPI table on the command line to load.
+#
+# At most one of @file and @data can be specified. The list of files specified
+# by any one of them is loaded and concatenated in order. If both are omitted,
+# @data is implied.
+#
+# Other fields / optargs can be used to override fields of the generic ACPI
+# table header; refer to the ACPI specification 5.0, section 5.2.6 System
+# Description Table Header. If a header field is not overridden, then the
+# corresponding value from the concatenated blob is used (in case of @file), or
+# it is filled in with a hard-coded value (in case of @data).
+#
+# String fields are copied into the matching ACPI member from lowest address
+# upwards, and silently truncated / NUL-padded to length.
+#
+# @sig: table signature / identifier (4 bytes)
+#
+# @rev: table revision number (dependent on signature, 1 byte)
+#
+# @oem_id: OEM identifier (6 bytes)
+#
+# @oem_table_id: OEM table identifier (8 bytes)
+#
+# @oem_rev: OEM-supplied revision number (4 bytes)
+#
+# @asl_compiler_id: identifier of the utility that created the table
+# (4 bytes)
+#
+# @asl_compiler_rev: revision number of the utility that created the
+# table (4 bytes)
+#
+# @file: colon (:) separated list of pathnames to load and
+# concatenate as table data. The resultant binary blob is expected to
+# have an ACPI table header. At least one file is required. This field
+# excludes @data.
+#
+# @data: colon (:) separated list of pathnames to load and
+# concatenate as table data. The resultant binary blob must not have an
+# ACPI table header. At least one file is required. This field excludes
+# @file.
+#
+# Since: 1.5
+##
+{ 'struct': 'AcpiTableOptions',
+ 'data': {
+ '*sig': 'str',
+ '*rev': 'uint8',
+ '*oem_id': 'str',
+ '*oem_table_id': 'str',
+ '*oem_rev': 'uint32',
+ '*asl_compiler_id': 'str',
+ '*asl_compiler_rev': 'uint32',
+ '*file': 'str',
+ '*data': 'str' }}
+
+##
+# @ACPISlotType:
+#
+# @DIMM: memory slot
+# @CPU: logical CPU slot (since 2.7)
+##
+{ 'enum': 'ACPISlotType', 'data': [ 'DIMM', 'CPU' ] }
+
+##
+# @ACPIOSTInfo:
+#
+# OSPM Status Indication for a device
+# For description of possible values of @source and @status fields
+# see "_OST (OSPM Status Indication)" chapter of ACPI5.0 spec.
+#
+# @device: device ID associated with slot
+#
+# @slot: slot ID, unique per slot of a given @slot-type
+#
+# @slot-type: type of the slot
+#
+# @source: an integer containing the source event
+#
+# @status: an integer containing the status code
+#
+# Since: 2.1
+##
+{ 'struct': 'ACPIOSTInfo',
+ 'data' : { '*device': 'str',
+ 'slot': 'str',
+ 'slot-type': 'ACPISlotType',
+ 'source': 'int',
+ 'status': 'int' } }
+
+##
+# @query-acpi-ospm-status:
+#
+# Return a list of ACPIOSTInfo for devices that support status
+# reporting via ACPI _OST method.
+#
+# Since: 2.1
+#
+# Example:
+#
+# -> { "execute": "query-acpi-ospm-status" }
+# <- { "return": [ { "device": "d1", "slot": "0", "slot-type": "DIMM", "source": 1, "status": 0},
+# { "slot": "1", "slot-type": "DIMM", "source": 0, "status": 0},
+# { "slot": "2", "slot-type": "DIMM", "source": 0, "status": 0},
+# { "slot": "3", "slot-type": "DIMM", "source": 0, "status": 0}
+# ]}
+#
+##
+{ 'command': 'query-acpi-ospm-status', 'returns': ['ACPIOSTInfo'] }
+
+##
+# @ACPI_DEVICE_OST:
+#
+# Emitted when guest executes ACPI _OST method.
+#
+# @info: OSPM Status Indication
+#
+# Since: 2.1
+#
+# Example:
+#
+# <- { "event": "ACPI_DEVICE_OST",
+# "data": { "device": "d1", "slot": "0",
+# "slot-type": "DIMM", "source": 1, "status": 0 } }
+#
+##
+{ 'event': 'ACPI_DEVICE_OST',
+ 'data': { 'info': 'ACPIOSTInfo' } }
diff --git a/qapi/misc.json b/qapi/misc.json
index 71d11365ead..4b00b18e547 100644
--- a/qapi/misc.json
+++ b/qapi/misc.json
@@ -970,64 +970,6 @@
##
{ 'command': 'query-fdsets', 'returns': ['FdsetInfo'] }
-##
-# @AcpiTableOptions:
-#
-# Specify an ACPI table on the command line to load.
-#
-# At most one of @file and @data can be specified. The list of files specified
-# by any one of them is loaded and concatenated in order. If both are omitted,
-# @data is implied.
-#
-# Other fields / optargs can be used to override fields of the generic ACPI
-# table header; refer to the ACPI specification 5.0, section 5.2.6 System
-# Description Table Header. If a header field is not overridden, then the
-# corresponding value from the concatenated blob is used (in case of @file), or
-# it is filled in with a hard-coded value (in case of @data).
-#
-# String fields are copied into the matching ACPI member from lowest address
-# upwards, and silently truncated / NUL-padded to length.
-#
-# @sig: table signature / identifier (4 bytes)
-#
-# @rev: table revision number (dependent on signature, 1 byte)
-#
-# @oem_id: OEM identifier (6 bytes)
-#
-# @oem_table_id: OEM table identifier (8 bytes)
-#
-# @oem_rev: OEM-supplied revision number (4 bytes)
-#
-# @asl_compiler_id: identifier of the utility that created the table
-# (4 bytes)
-#
-# @asl_compiler_rev: revision number of the utility that created the
-# table (4 bytes)
-#
-# @file: colon (:) separated list of pathnames to load and
-# concatenate as table data. The resultant binary blob is expected to
-# have an ACPI table header. At least one file is required. This field
-# excludes @data.
-#
-# @data: colon (:) separated list of pathnames to load and
-# concatenate as table data. The resultant binary blob must not have an
-# ACPI table header. At least one file is required. This field excludes
-# @file.
-#
-# Since: 1.5
-##
-{ 'struct': 'AcpiTableOptions',
- 'data': {
- '*sig': 'str',
- '*rev': 'uint8',
- '*oem_id': 'str',
- '*oem_table_id': 'str',
- '*oem_rev': 'uint32',
- '*asl_compiler_id': 'str',
- '*asl_compiler_rev': 'uint32',
- '*file': 'str',
- '*data': 'str' }}
-
##
# @CommandLineParameterType:
#
@@ -1121,79 +1063,6 @@
'returns': ['CommandLineOptionInfo'],
'allow-preconfig': true }
-##
-# @ACPISlotType:
-#
-# @DIMM: memory slot
-# @CPU: logical CPU slot (since 2.7)
-##
-{ 'enum': 'ACPISlotType', 'data': [ 'DIMM', 'CPU' ] }
-
-##
-# @ACPIOSTInfo:
-#
-# OSPM Status Indication for a device
-# For description of possible values of @source and @status fields
-# see "_OST (OSPM Status Indication)" chapter of ACPI5.0 spec.
-#
-# @device: device ID associated with slot
-#
-# @slot: slot ID, unique per slot of a given @slot-type
-#
-# @slot-type: type of the slot
-#
-# @source: an integer containing the source event
-#
-# @status: an integer containing the status code
-#
-# Since: 2.1
-##
-{ 'struct': 'ACPIOSTInfo',
- 'data' : { '*device': 'str',
- 'slot': 'str',
- 'slot-type': 'ACPISlotType',
- 'source': 'int',
- 'status': 'int' } }
-
-##
-# @query-acpi-ospm-status:
-#
-# Return a list of ACPIOSTInfo for devices that support status
-# reporting via ACPI _OST method.
-#
-# Since: 2.1
-#
-# Example:
-#
-# -> { "execute": "query-acpi-ospm-status" }
-# <- { "return": [ { "device": "d1", "slot": "0", "slot-type": "DIMM", "source": 1, "status": 0},
-# { "slot": "1", "slot-type": "DIMM", "source": 0, "status": 0},
-# { "slot": "2", "slot-type": "DIMM", "source": 0, "status": 0},
-# { "slot": "3", "slot-type": "DIMM", "source": 0, "status": 0}
-# ]}
-#
-##
-{ 'command': 'query-acpi-ospm-status', 'returns': ['ACPIOSTInfo'] }
-
-##
-# @ACPI_DEVICE_OST:
-#
-# Emitted when guest executes ACPI _OST method.
-#
-# @info: OSPM Status Indication
-#
-# Since: 2.1
-#
-# Example:
-#
-# <- { "event": "ACPI_DEVICE_OST",
-# "data": { "device": "d1", "slot": "0",
-# "slot-type": "DIMM", "source": 1, "status": 0 } }
-#
-##
-{ 'event': 'ACPI_DEVICE_OST',
- 'data': { 'info': 'ACPIOSTInfo' } }
-
##
# @ReplayMode:
#
diff --git a/qapi/qapi-schema.json b/qapi/qapi-schema.json
index f03ff91ceb5..4d8b3a9afe2 100644
--- a/qapi/qapi-schema.json
+++ b/qapi/qapi-schema.json
@@ -85,3 +85,4 @@
{ 'include': 'misc.json' }
{ 'include': 'misc-target.json' }
{ 'include': 'audio.json' }
+{ 'include': 'acpi.json' }
diff --git a/include/hw/acpi/acpi_dev_interface.h b/include/hw/acpi/acpi_dev_interface.h
index 9adf1e47067..769ff55c7ee 100644
--- a/include/hw/acpi/acpi_dev_interface.h
+++ b/include/hw/acpi/acpi_dev_interface.h
@@ -1,7 +1,7 @@
#ifndef ACPI_DEV_INTERFACE_H
#define ACPI_DEV_INTERFACE_H
-#include "qapi/qapi-types-misc.h"
+#include "qapi/qapi-types-acpi.h"
#include "qom/object.h"
#include "hw/boards.h"
#include "hw/qdev-core.h"
diff --git a/hw/acpi/core.c b/hw/acpi/core.c
index ac06db34504..ade9158cbf1 100644
--- a/hw/acpi/core.c
+++ b/hw/acpi/core.c
@@ -27,7 +27,7 @@
#include "qapi/error.h"
#include "qapi/opts-visitor.h"
#include "qapi/qapi-events-run-state.h"
-#include "qapi/qapi-visit-misc.h"
+#include "qapi/qapi-visit-acpi.h"
#include "qemu/error-report.h"
#include "qemu/module.h"
#include "qemu/option.h"
diff --git a/hw/acpi/cpu.c b/hw/acpi/cpu.c
index 3d6a500fb7e..2d4ee1a7a44 100644
--- a/hw/acpi/cpu.c
+++ b/hw/acpi/cpu.c
@@ -3,7 +3,7 @@
#include "migration/vmstate.h"
#include "hw/acpi/cpu.h"
#include "qapi/error.h"
-#include "qapi/qapi-events-misc.h"
+#include "qapi/qapi-events-acpi.h"
#include "trace.h"
#include "sysemu/numa.h"
diff --git a/hw/acpi/memory_hotplug.c b/hw/acpi/memory_hotplug.c
index dfe57af4292..f2552b2a462 100644
--- a/hw/acpi/memory_hotplug.c
+++ b/hw/acpi/memory_hotplug.c
@@ -7,8 +7,8 @@
#include "migration/vmstate.h"
#include "trace.h"
#include "qapi/error.h"
+#include "qapi/qapi-events-acpi.h"
#include "qapi/qapi-events-machine.h"
-#include "qapi/qapi-events-misc.h"
#define MEMORY_SLOTS_NUMBER "MDNR"
#define MEMORY_HOTPLUG_IO_REGION "HPMR"
diff --git a/monitor/qmp-cmds.c b/monitor/qmp-cmds.c
index 864cbfa32e6..0ab5b785805 100644
--- a/monitor/qmp-cmds.c
+++ b/monitor/qmp-cmds.c
@@ -30,6 +30,7 @@
#include "sysemu/blockdev.h"
#include "sysemu/block-backend.h"
#include "qapi/error.h"
+#include "qapi/qapi-commands-acpi.h"
#include "qapi/qapi-commands-block.h"
#include "qapi/qapi-commands-control.h"
#include "qapi/qapi-commands-machine.h"
diff --git a/MAINTAINERS b/MAINTAINERS
index cf96fa83795..5ce0ccad49b 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1613,6 +1613,7 @@ F: hw/acpi/*
F: hw/smbios/*
F: hw/i386/acpi-build.[hc]
F: hw/arm/virt-acpi-build.c
+F: qapi/acpi.json
F: tests/qtest/bios-tables-test*
F: tests/qtest/acpi-utils.[hc]
F: tests/data/acpi/
diff --git a/qapi/meson.build b/qapi/meson.build
index 2b2872a41d8..f57acc24026 100644
--- a/qapi/meson.build
+++ b/qapi/meson.build
@@ -14,6 +14,7 @@ util_ss.add(files(
))
qapi_all_modules = [
+ 'acpi',
'audio',
'authz',
'block-core',
--
2.26.2
^ permalink raw reply related [flat|nested] 21+ messages in thread
* [PATCH v5 8/8] qapi: Extract PCI commands to 'pci.json'
2020-09-13 19:53 [PATCH v5 0/8] user-mode: Prune build dependencies (part 2) Philippe Mathieu-Daudé
` (6 preceding siblings ...)
2020-09-13 19:53 ` [PATCH v5 7/8] qapi: Extract ACPI commands to 'acpi.json' Philippe Mathieu-Daudé
@ 2020-09-13 19:53 ` Philippe Mathieu-Daudé
2020-09-15 6:29 ` [PATCH v5 0/8] user-mode: Prune build dependencies (part 2) Markus Armbruster
2020-09-15 8:52 ` Markus Armbruster
9 siblings, 0 replies; 21+ messages in thread
From: Philippe Mathieu-Daudé @ 2020-09-13 19:53 UTC (permalink / raw)
To: Markus Armbruster, qemu-devel; +Cc: Paolo Bonzini, Philippe Mathieu-Daudé
Only qemu-system-FOO and qemu-storage-daemon provide QMP
monitors, therefore such declarations and definitions are
irrelevant for user-mode emulation.
Extracting the PCI commands to their own schema reduces
the size of the qapi-misc* headers generated, and allows
pulling less declarations/definitions to user-mode.
Suggested-by: Markus Armbruster <armbru@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>
---
qapi/misc.json | 306 ----------------------------------------
qapi/pci.json | 316 ++++++++++++++++++++++++++++++++++++++++++
qapi/qapi-schema.json | 1 +
hw/pci/pci-stub.c | 2 +-
hw/pci/pci.c | 2 +-
monitor/hmp-cmds.c | 1 +
MAINTAINERS | 1 +
qapi/meson.build | 1 +
8 files changed, 322 insertions(+), 308 deletions(-)
create mode 100644 qapi/pci.json
diff --git a/qapi/misc.json b/qapi/misc.json
index 4b00b18e547..694d2142f37 100644
--- a/qapi/misc.json
+++ b/qapi/misc.json
@@ -157,312 +157,6 @@
{ 'command': 'query-iothreads', 'returns': ['IOThreadInfo'],
'allow-preconfig': true }
-##
-# @PciMemoryRange:
-#
-# A PCI device memory region
-#
-# @base: the starting address (guest physical)
-#
-# @limit: the ending address (guest physical)
-#
-# Since: 0.14.0
-##
-{ 'struct': 'PciMemoryRange', 'data': {'base': 'int', 'limit': 'int'} }
-
-##
-# @PciMemoryRegion:
-#
-# Information about a PCI device I/O region.
-#
-# @bar: the index of the Base Address Register for this region
-#
-# @type: - 'io' if the region is a PIO region
-# - 'memory' if the region is a MMIO region
-#
-# @size: memory size
-#
-# @prefetch: if @type is 'memory', true if the memory is prefetchable
-#
-# @mem_type_64: if @type is 'memory', true if the BAR is 64-bit
-#
-# Since: 0.14.0
-##
-{ 'struct': 'PciMemoryRegion',
- 'data': {'bar': 'int', 'type': 'str', 'address': 'int', 'size': 'int',
- '*prefetch': 'bool', '*mem_type_64': 'bool' } }
-
-##
-# @PciBusInfo:
-#
-# Information about a bus of a PCI Bridge device
-#
-# @number: primary bus interface number. This should be the number of the
-# bus the device resides on.
-#
-# @secondary: secondary bus interface number. This is the number of the
-# main bus for the bridge
-#
-# @subordinate: This is the highest number bus that resides below the
-# bridge.
-#
-# @io_range: The PIO range for all devices on this bridge
-#
-# @memory_range: The MMIO range for all devices on this bridge
-#
-# @prefetchable_range: The range of prefetchable MMIO for all devices on
-# this bridge
-#
-# Since: 2.4
-##
-{ 'struct': 'PciBusInfo',
- 'data': {'number': 'int', 'secondary': 'int', 'subordinate': 'int',
- 'io_range': 'PciMemoryRange',
- 'memory_range': 'PciMemoryRange',
- 'prefetchable_range': 'PciMemoryRange' } }
-
-##
-# @PciBridgeInfo:
-#
-# Information about a PCI Bridge device
-#
-# @bus: information about the bus the device resides on
-#
-# @devices: a list of @PciDeviceInfo for each device on this bridge
-#
-# Since: 0.14.0
-##
-{ 'struct': 'PciBridgeInfo',
- 'data': {'bus': 'PciBusInfo', '*devices': ['PciDeviceInfo']} }
-
-##
-# @PciDeviceClass:
-#
-# Information about the Class of a PCI device
-#
-# @desc: a string description of the device's class
-#
-# @class: the class code of the device
-#
-# Since: 2.4
-##
-{ 'struct': 'PciDeviceClass',
- 'data': {'*desc': 'str', 'class': 'int'} }
-
-##
-# @PciDeviceId:
-#
-# Information about the Id of a PCI device
-#
-# @device: the PCI device id
-#
-# @vendor: the PCI vendor id
-#
-# @subsystem: the PCI subsystem id (since 3.1)
-#
-# @subsystem-vendor: the PCI subsystem vendor id (since 3.1)
-#
-# Since: 2.4
-##
-{ 'struct': 'PciDeviceId',
- 'data': {'device': 'int', 'vendor': 'int', '*subsystem': 'int',
- '*subsystem-vendor': 'int'} }
-
-##
-# @PciDeviceInfo:
-#
-# Information about a PCI device
-#
-# @bus: the bus number of the device
-#
-# @slot: the slot the device is located in
-#
-# @function: the function of the slot used by the device
-#
-# @class_info: the class of the device
-#
-# @id: the PCI device id
-#
-# @irq: if an IRQ is assigned to the device, the IRQ number
-#
-# @irq_pin: the IRQ pin, zero means no IRQ (since 5.1)
-#
-# @qdev_id: the device name of the PCI device
-#
-# @pci_bridge: if the device is a PCI bridge, the bridge information
-#
-# @regions: a list of the PCI I/O regions associated with the device
-#
-# Notes: the contents of @class_info.desc are not stable and should only be
-# treated as informational.
-#
-# Since: 0.14.0
-##
-{ 'struct': 'PciDeviceInfo',
- 'data': {'bus': 'int', 'slot': 'int', 'function': 'int',
- 'class_info': 'PciDeviceClass', 'id': 'PciDeviceId',
- '*irq': 'int', 'irq_pin': 'int', 'qdev_id': 'str',
- '*pci_bridge': 'PciBridgeInfo', 'regions': ['PciMemoryRegion'] }}
-
-##
-# @PciInfo:
-#
-# Information about a PCI bus
-#
-# @bus: the bus index
-#
-# @devices: a list of devices on this bus
-#
-# Since: 0.14.0
-##
-{ 'struct': 'PciInfo', 'data': {'bus': 'int', 'devices': ['PciDeviceInfo']} }
-
-##
-# @query-pci:
-#
-# Return information about the PCI bus topology of the guest.
-#
-# Returns: a list of @PciInfo for each PCI bus. Each bus is
-# represented by a json-object, which has a key with a json-array of
-# all PCI devices attached to it. Each device is represented by a
-# json-object.
-#
-# Since: 0.14.0
-#
-# Example:
-#
-# -> { "execute": "query-pci" }
-# <- { "return": [
-# {
-# "bus": 0,
-# "devices": [
-# {
-# "bus": 0,
-# "qdev_id": "",
-# "slot": 0,
-# "class_info": {
-# "class": 1536,
-# "desc": "Host bridge"
-# },
-# "id": {
-# "device": 32902,
-# "vendor": 4663
-# },
-# "function": 0,
-# "regions": [
-# ]
-# },
-# {
-# "bus": 0,
-# "qdev_id": "",
-# "slot": 1,
-# "class_info": {
-# "class": 1537,
-# "desc": "ISA bridge"
-# },
-# "id": {
-# "device": 32902,
-# "vendor": 28672
-# },
-# "function": 0,
-# "regions": [
-# ]
-# },
-# {
-# "bus": 0,
-# "qdev_id": "",
-# "slot": 1,
-# "class_info": {
-# "class": 257,
-# "desc": "IDE controller"
-# },
-# "id": {
-# "device": 32902,
-# "vendor": 28688
-# },
-# "function": 1,
-# "regions": [
-# {
-# "bar": 4,
-# "size": 16,
-# "address": 49152,
-# "type": "io"
-# }
-# ]
-# },
-# {
-# "bus": 0,
-# "qdev_id": "",
-# "slot": 2,
-# "class_info": {
-# "class": 768,
-# "desc": "VGA controller"
-# },
-# "id": {
-# "device": 4115,
-# "vendor": 184
-# },
-# "function": 0,
-# "regions": [
-# {
-# "prefetch": true,
-# "mem_type_64": false,
-# "bar": 0,
-# "size": 33554432,
-# "address": 4026531840,
-# "type": "memory"
-# },
-# {
-# "prefetch": false,
-# "mem_type_64": false,
-# "bar": 1,
-# "size": 4096,
-# "address": 4060086272,
-# "type": "memory"
-# },
-# {
-# "prefetch": false,
-# "mem_type_64": false,
-# "bar": 6,
-# "size": 65536,
-# "address": -1,
-# "type": "memory"
-# }
-# ]
-# },
-# {
-# "bus": 0,
-# "qdev_id": "",
-# "irq": 11,
-# "slot": 4,
-# "class_info": {
-# "class": 1280,
-# "desc": "RAM controller"
-# },
-# "id": {
-# "device": 6900,
-# "vendor": 4098
-# },
-# "function": 0,
-# "regions": [
-# {
-# "bar": 0,
-# "size": 32,
-# "address": 49280,
-# "type": "io"
-# }
-# ]
-# }
-# ]
-# }
-# ]
-# }
-#
-# Note: This example has been shortened as the real response is too long.
-#
-##
-{ 'command': 'query-pci', 'returns': ['PciInfo'] }
-
##
# @stop:
#
diff --git a/qapi/pci.json b/qapi/pci.json
new file mode 100644
index 00000000000..b79cbd787be
--- /dev/null
+++ b/qapi/pci.json
@@ -0,0 +1,316 @@
+# -*- Mode: Python -*-
+# vim: filetype=python
+#
+# This work is licensed under the terms of the GNU GPL, version 2 or later.
+# See the COPYING file in the top-level directory.
+# SPDX-License-Identifier: GPL-2.0-or-later
+
+##
+# = PCI
+##
+
+##
+# @PciMemoryRange:
+#
+# A PCI device memory region
+#
+# @base: the starting address (guest physical)
+#
+# @limit: the ending address (guest physical)
+#
+# Since: 0.14.0
+##
+{ 'struct': 'PciMemoryRange', 'data': {'base': 'int', 'limit': 'int'} }
+
+##
+# @PciMemoryRegion:
+#
+# Information about a PCI device I/O region.
+#
+# @bar: the index of the Base Address Register for this region
+#
+# @type: - 'io' if the region is a PIO region
+# - 'memory' if the region is a MMIO region
+#
+# @size: memory size
+#
+# @prefetch: if @type is 'memory', true if the memory is prefetchable
+#
+# @mem_type_64: if @type is 'memory', true if the BAR is 64-bit
+#
+# Since: 0.14.0
+##
+{ 'struct': 'PciMemoryRegion',
+ 'data': {'bar': 'int', 'type': 'str', 'address': 'int', 'size': 'int',
+ '*prefetch': 'bool', '*mem_type_64': 'bool' } }
+
+##
+# @PciBusInfo:
+#
+# Information about a bus of a PCI Bridge device
+#
+# @number: primary bus interface number. This should be the number of the
+# bus the device resides on.
+#
+# @secondary: secondary bus interface number. This is the number of the
+# main bus for the bridge
+#
+# @subordinate: This is the highest number bus that resides below the
+# bridge.
+#
+# @io_range: The PIO range for all devices on this bridge
+#
+# @memory_range: The MMIO range for all devices on this bridge
+#
+# @prefetchable_range: The range of prefetchable MMIO for all devices on
+# this bridge
+#
+# Since: 2.4
+##
+{ 'struct': 'PciBusInfo',
+ 'data': {'number': 'int', 'secondary': 'int', 'subordinate': 'int',
+ 'io_range': 'PciMemoryRange',
+ 'memory_range': 'PciMemoryRange',
+ 'prefetchable_range': 'PciMemoryRange' } }
+
+##
+# @PciBridgeInfo:
+#
+# Information about a PCI Bridge device
+#
+# @bus: information about the bus the device resides on
+#
+# @devices: a list of @PciDeviceInfo for each device on this bridge
+#
+# Since: 0.14.0
+##
+{ 'struct': 'PciBridgeInfo',
+ 'data': {'bus': 'PciBusInfo', '*devices': ['PciDeviceInfo']} }
+
+##
+# @PciDeviceClass:
+#
+# Information about the Class of a PCI device
+#
+# @desc: a string description of the device's class
+#
+# @class: the class code of the device
+#
+# Since: 2.4
+##
+{ 'struct': 'PciDeviceClass',
+ 'data': {'*desc': 'str', 'class': 'int'} }
+
+##
+# @PciDeviceId:
+#
+# Information about the Id of a PCI device
+#
+# @device: the PCI device id
+#
+# @vendor: the PCI vendor id
+#
+# @subsystem: the PCI subsystem id (since 3.1)
+#
+# @subsystem-vendor: the PCI subsystem vendor id (since 3.1)
+#
+# Since: 2.4
+##
+{ 'struct': 'PciDeviceId',
+ 'data': {'device': 'int', 'vendor': 'int', '*subsystem': 'int',
+ '*subsystem-vendor': 'int'} }
+
+##
+# @PciDeviceInfo:
+#
+# Information about a PCI device
+#
+# @bus: the bus number of the device
+#
+# @slot: the slot the device is located in
+#
+# @function: the function of the slot used by the device
+#
+# @class_info: the class of the device
+#
+# @id: the PCI device id
+#
+# @irq: if an IRQ is assigned to the device, the IRQ number
+#
+# @irq_pin: the IRQ pin, zero means no IRQ (since 5.1)
+#
+# @qdev_id: the device name of the PCI device
+#
+# @pci_bridge: if the device is a PCI bridge, the bridge information
+#
+# @regions: a list of the PCI I/O regions associated with the device
+#
+# Notes: the contents of @class_info.desc are not stable and should only be
+# treated as informational.
+#
+# Since: 0.14.0
+##
+{ 'struct': 'PciDeviceInfo',
+ 'data': {'bus': 'int', 'slot': 'int', 'function': 'int',
+ 'class_info': 'PciDeviceClass', 'id': 'PciDeviceId',
+ '*irq': 'int', 'irq_pin': 'int', 'qdev_id': 'str',
+ '*pci_bridge': 'PciBridgeInfo', 'regions': ['PciMemoryRegion'] }}
+
+##
+# @PciInfo:
+#
+# Information about a PCI bus
+#
+# @bus: the bus index
+#
+# @devices: a list of devices on this bus
+#
+# Since: 0.14.0
+##
+{ 'struct': 'PciInfo', 'data': {'bus': 'int', 'devices': ['PciDeviceInfo']} }
+
+##
+# @query-pci:
+#
+# Return information about the PCI bus topology of the guest.
+#
+# Returns: a list of @PciInfo for each PCI bus. Each bus is
+# represented by a json-object, which has a key with a json-array of
+# all PCI devices attached to it. Each device is represented by a
+# json-object.
+#
+# Since: 0.14.0
+#
+# Example:
+#
+# -> { "execute": "query-pci" }
+# <- { "return": [
+# {
+# "bus": 0,
+# "devices": [
+# {
+# "bus": 0,
+# "qdev_id": "",
+# "slot": 0,
+# "class_info": {
+# "class": 1536,
+# "desc": "Host bridge"
+# },
+# "id": {
+# "device": 32902,
+# "vendor": 4663
+# },
+# "function": 0,
+# "regions": [
+# ]
+# },
+# {
+# "bus": 0,
+# "qdev_id": "",
+# "slot": 1,
+# "class_info": {
+# "class": 1537,
+# "desc": "ISA bridge"
+# },
+# "id": {
+# "device": 32902,
+# "vendor": 28672
+# },
+# "function": 0,
+# "regions": [
+# ]
+# },
+# {
+# "bus": 0,
+# "qdev_id": "",
+# "slot": 1,
+# "class_info": {
+# "class": 257,
+# "desc": "IDE controller"
+# },
+# "id": {
+# "device": 32902,
+# "vendor": 28688
+# },
+# "function": 1,
+# "regions": [
+# {
+# "bar": 4,
+# "size": 16,
+# "address": 49152,
+# "type": "io"
+# }
+# ]
+# },
+# {
+# "bus": 0,
+# "qdev_id": "",
+# "slot": 2,
+# "class_info": {
+# "class": 768,
+# "desc": "VGA controller"
+# },
+# "id": {
+# "device": 4115,
+# "vendor": 184
+# },
+# "function": 0,
+# "regions": [
+# {
+# "prefetch": true,
+# "mem_type_64": false,
+# "bar": 0,
+# "size": 33554432,
+# "address": 4026531840,
+# "type": "memory"
+# },
+# {
+# "prefetch": false,
+# "mem_type_64": false,
+# "bar": 1,
+# "size": 4096,
+# "address": 4060086272,
+# "type": "memory"
+# },
+# {
+# "prefetch": false,
+# "mem_type_64": false,
+# "bar": 6,
+# "size": 65536,
+# "address": -1,
+# "type": "memory"
+# }
+# ]
+# },
+# {
+# "bus": 0,
+# "qdev_id": "",
+# "irq": 11,
+# "slot": 4,
+# "class_info": {
+# "class": 1280,
+# "desc": "RAM controller"
+# },
+# "id": {
+# "device": 6900,
+# "vendor": 4098
+# },
+# "function": 0,
+# "regions": [
+# {
+# "bar": 0,
+# "size": 32,
+# "address": 49280,
+# "type": "io"
+# }
+# ]
+# }
+# ]
+# }
+# ]
+# }
+#
+# Note: This example has been shortened as the real response is too long.
+#
+##
+{ 'command': 'query-pci', 'returns': ['PciInfo'] }
diff --git a/qapi/qapi-schema.json b/qapi/qapi-schema.json
index 4d8b3a9afe2..54c8ba64441 100644
--- a/qapi/qapi-schema.json
+++ b/qapi/qapi-schema.json
@@ -86,3 +86,4 @@
{ 'include': 'misc-target.json' }
{ 'include': 'audio.json' }
{ 'include': 'acpi.json' }
+{ 'include': 'pci.json' }
diff --git a/hw/pci/pci-stub.c b/hw/pci/pci-stub.c
index cc2a2e1f735..3a027c42e43 100644
--- a/hw/pci/pci-stub.c
+++ b/hw/pci/pci-stub.c
@@ -22,7 +22,7 @@
#include "sysemu/sysemu.h"
#include "monitor/monitor.h"
#include "qapi/error.h"
-#include "qapi/qapi-commands-misc.h"
+#include "qapi/qapi-commands-pci.h"
#include "qapi/qmp/qerror.h"
#include "hw/pci/pci.h"
#include "hw/pci/msi.h"
diff --git a/hw/pci/pci.c b/hw/pci/pci.c
index de0fae10ab9..e950e72d848 100644
--- a/hw/pci/pci.c
+++ b/hw/pci/pci.c
@@ -46,7 +46,7 @@
#include "hw/hotplug.h"
#include "hw/boards.h"
#include "qapi/error.h"
-#include "qapi/qapi-commands-misc.h"
+#include "qapi/qapi-commands-pci.h"
#include "qemu/cutils.h"
//#define DEBUG_PCI
diff --git a/monitor/hmp-cmds.c b/monitor/hmp-cmds.c
index de01ba20845..dc0de392196 100644
--- a/monitor/hmp-cmds.c
+++ b/monitor/hmp-cmds.c
@@ -36,6 +36,7 @@
#include "qapi/qapi-commands-migration.h"
#include "qapi/qapi-commands-misc.h"
#include "qapi/qapi-commands-net.h"
+#include "qapi/qapi-commands-pci.h"
#include "qapi/qapi-commands-rocker.h"
#include "qapi/qapi-commands-run-state.h"
#include "qapi/qapi-commands-tpm.h"
diff --git a/MAINTAINERS b/MAINTAINERS
index 5ce0ccad49b..4d912cf0e98 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1598,6 +1598,7 @@ F: include/hw/pci/*
F: hw/misc/pci-testdev.c
F: hw/pci/*
F: hw/pci-bridge/*
+F: qapi/pci.json
F: docs/pci*
F: docs/specs/*pci*
F: default-configs/pci.mak
diff --git a/qapi/meson.build b/qapi/meson.build
index f57acc24026..298b510492b 100644
--- a/qapi/meson.build
+++ b/qapi/meson.build
@@ -35,6 +35,7 @@ qapi_all_modules = [
'net',
'pragma',
'qdev',
+ 'pci',
'qom',
'rdma',
'rocker',
--
2.26.2
^ permalink raw reply related [flat|nested] 21+ messages in thread
* Re: [PATCH v5 1/8] qapi: Restrict LostTickPolicy enum to machine code
2020-09-13 19:53 ` [PATCH v5 1/8] qapi: Restrict LostTickPolicy enum to machine code Philippe Mathieu-Daudé
@ 2020-09-14 9:14 ` Markus Armbruster
2020-09-14 9:37 ` Philippe Mathieu-Daudé
0 siblings, 1 reply; 21+ messages in thread
From: Markus Armbruster @ 2020-09-14 9:14 UTC (permalink / raw)
To: Philippe Mathieu-Daudé; +Cc: Paolo Bonzini, qemu-devel
Philippe Mathieu-Daudé <philmd@redhat.com> writes:
> Acked-by: Markus Armbruster <armbru@redhat.com>
> Acked-by: Paolo Bonzini <pbonzini@redhat.com>
> Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Unlike the other patches that move code out of misc.json, this one
doesn't say "allows pulling less declarations/definitions to user-mode."
Intentional?
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [PATCH v5 3/8] qapi: Restrict balloon-related commands to machine code
2020-09-13 19:53 ` [PATCH v5 3/8] qapi: Restrict balloon-related commands to machine code Philippe Mathieu-Daudé
@ 2020-09-14 9:16 ` Markus Armbruster
2020-09-14 9:42 ` Philippe Mathieu-Daudé
0 siblings, 1 reply; 21+ messages in thread
From: Markus Armbruster @ 2020-09-14 9:16 UTC (permalink / raw)
To: Philippe Mathieu-Daudé; +Cc: Paolo Bonzini, qemu-devel
Philippe Mathieu-Daudé <philmd@redhat.com> writes:
> 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
> allows pulling less declarations/definitions to user-mode.
How this affects user mode is not obvious to (ignorant) me. Can you
provide a clue?
[...]
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [PATCH v5 1/8] qapi: Restrict LostTickPolicy enum to machine code
2020-09-14 9:14 ` Markus Armbruster
@ 2020-09-14 9:37 ` Philippe Mathieu-Daudé
2020-09-15 6:27 ` Markus Armbruster
0 siblings, 1 reply; 21+ messages in thread
From: Philippe Mathieu-Daudé @ 2020-09-14 9:37 UTC (permalink / raw)
To: Markus Armbruster; +Cc: Paolo Bonzini, qemu-devel, Qemu-block, Laurent Vivier
+Laurent + qemu-block@
On 9/14/20 11:14 AM, Markus Armbruster wrote:
> Philippe Mathieu-Daudé <philmd@redhat.com> writes:
>
>> Acked-by: Markus Armbruster <armbru@redhat.com>
>> Acked-by: Paolo Bonzini <pbonzini@redhat.com>
>> Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
>
> Unlike the other patches that move code out of misc.json, this one
> doesn't say "allows pulling less declarations/definitions to user-mode."
> Intentional?
TBH I don't remember as this is 6months old.
IIUC the "tick lost" feature is only meaningful when running
virtualized with a RTC profile, so this is pointless for
user-mode binaries and tools.
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [PATCH v5 3/8] qapi: Restrict balloon-related commands to machine code
2020-09-14 9:16 ` Markus Armbruster
@ 2020-09-14 9:42 ` Philippe Mathieu-Daudé
2020-09-14 9:48 ` David Hildenbrand
0 siblings, 1 reply; 21+ messages in thread
From: Philippe Mathieu-Daudé @ 2020-09-14 9:42 UTC (permalink / raw)
To: Markus Armbruster
Cc: Paolo Bonzini, David Hildenbrand, qemu-devel, Laurent Vivier
+Laurent and David
On 9/14/20 11:16 AM, Markus Armbruster wrote:
> Philippe Mathieu-Daudé <philmd@redhat.com> writes:
>
>> 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
>> allows pulling less declarations/definitions to user-mode.
>
> How this affects user mode is not obvious to (ignorant) me. Can you
> provide a clue?
I guess this was discussed with David at some point.
Maybe the QMP commands are not exposed via HMP, making this
code unreachable?
Anyhow user-mode binaries don't use the memory ballooning feature,
this is specific to system-mode emulation.
Laurent/David, do you have some more trivial explanation?
Thanks,
Phil.
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [PATCH v5 3/8] qapi: Restrict balloon-related commands to machine code
2020-09-14 9:42 ` Philippe Mathieu-Daudé
@ 2020-09-14 9:48 ` David Hildenbrand
2020-09-14 11:21 ` Markus Armbruster
0 siblings, 1 reply; 21+ messages in thread
From: David Hildenbrand @ 2020-09-14 9:48 UTC (permalink / raw)
To: Philippe Mathieu-Daudé
Cc: Paolo Bonzini, David Hildenbrand, Laurent Vivier,
Markus Armbruster, qemu-devel
> Am 14.09.2020 um 11:42 schrieb Philippe Mathieu-Daudé <philmd@redhat.com>:
>
> +Laurent and David
>
>> On 9/14/20 11:16 AM, Markus Armbruster wrote:
>> Philippe Mathieu-Daudé <philmd@redhat.com> writes:
>>
>>> 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
>>> allows pulling less declarations/definitions to user-mode.
>>
>> How this affects user mode is not obvious to (ignorant) me. Can you
>> provide a clue?
>
> I guess this was discussed with David at some point.
>
> Maybe the QMP commands are not exposed via HMP, making this
> code unreachable?
>
> Anyhow user-mode binaries don't use the memory ballooning feature,
> this is specific to system-mode emulation.
>
> Laurent/David, do you have some more trivial explanation?
Agreed.
No memory ballooning device -> no memory ballooning :)
>
> Thanks,
>
> Phil.
>
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [PATCH v5 3/8] qapi: Restrict balloon-related commands to machine code
2020-09-14 9:48 ` David Hildenbrand
@ 2020-09-14 11:21 ` Markus Armbruster
2020-09-14 12:15 ` Philippe Mathieu-Daudé
0 siblings, 1 reply; 21+ messages in thread
From: Markus Armbruster @ 2020-09-14 11:21 UTC (permalink / raw)
To: David Hildenbrand
Cc: Paolo Bonzini, Philippe Mathieu-Daudé, Laurent Vivier, qemu-devel
David Hildenbrand <david@redhat.com> writes:
>> Am 14.09.2020 um 11:42 schrieb Philippe Mathieu-Daudé <philmd@redhat.com>:
>>
>> +Laurent and David
>>
>>> On 9/14/20 11:16 AM, Markus Armbruster wrote:
>>> Philippe Mathieu-Daudé <philmd@redhat.com> writes:
>>>
>>>> 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
>>>> allows pulling less declarations/definitions to user-mode.
>>>
>>> How this affects user mode is not obvious to (ignorant) me. Can you
>>> provide a clue?
>>
>> I guess this was discussed with David at some point.
>>
>> Maybe the QMP commands are not exposed via HMP, making this
>> code unreachable?
>>
>> Anyhow user-mode binaries don't use the memory ballooning feature,
>> this is specific to system-mode emulation.
>>
>> Laurent/David, do you have some more trivial explanation?
>
> Agreed.
>
> No memory ballooning device -> no memory ballooning :)
I understand why user mode doesn't need device models. What I don't
understand offhand is how balloon-related stuff in misc.json ends up
pulling "declarations/definitions to user-mode". What exactly is being
pulled where before the series, and no more afterwards?
Is it just the code generated for the QAPI stuff you move, or is it
more?
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [PATCH v5 3/8] qapi: Restrict balloon-related commands to machine code
2020-09-14 11:21 ` Markus Armbruster
@ 2020-09-14 12:15 ` Philippe Mathieu-Daudé
2020-09-15 6:24 ` Markus Armbruster
0 siblings, 1 reply; 21+ messages in thread
From: Philippe Mathieu-Daudé @ 2020-09-14 12:15 UTC (permalink / raw)
To: Markus Armbruster, David Hildenbrand
Cc: Paolo Bonzini, Laurent Vivier, qemu-devel
On 9/14/20 1:21 PM, Markus Armbruster wrote:
> David Hildenbrand <david@redhat.com> writes:
>
>>> Am 14.09.2020 um 11:42 schrieb Philippe Mathieu-Daudé <philmd@redhat.com>:
>>>
>>> +Laurent and David
>>>
>>>> On 9/14/20 11:16 AM, Markus Armbruster wrote:
>>>> Philippe Mathieu-Daudé <philmd@redhat.com> writes:
>>>>
>>>>> 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
>>>>> allows pulling less declarations/definitions to user-mode.
>>>>
>>>> How this affects user mode is not obvious to (ignorant) me. Can you
>>>> provide a clue?
>>>
>>> I guess this was discussed with David at some point.
>>>
>>> Maybe the QMP commands are not exposed via HMP, making this
>>> code unreachable?
>>>
>>> Anyhow user-mode binaries don't use the memory ballooning feature,
>>> this is specific to system-mode emulation.
>>>
>>> Laurent/David, do you have some more trivial explanation?
>>
>> Agreed.
>>
>> No memory ballooning device -> no memory ballooning :)
>
> I understand why user mode doesn't need device models. What I don't
> understand offhand is how balloon-related stuff in misc.json ends up
> pulling "declarations/definitions to user-mode". What exactly is being
> pulled where before the series, and no more afterwards?
>
> Is it just the code generated for the QAPI stuff you move, or is it
> more?
As of this series, this is only QAPI generated code.
(code which pulls in unwanted declarations/definitions
that should be poisoned, but we can't because of this).
I didn't feel the need to enumerate what is removed from
user-mode, because from the diff (and no link failure)
I thought it was obvious. I can do, but that would be
simply copy/pasting the QAPI changes.
Part 3 start to remove things, but I kept that separated.
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [PATCH v5 3/8] qapi: Restrict balloon-related commands to machine code
2020-09-14 12:15 ` Philippe Mathieu-Daudé
@ 2020-09-15 6:24 ` Markus Armbruster
0 siblings, 0 replies; 21+ messages in thread
From: Markus Armbruster @ 2020-09-15 6:24 UTC (permalink / raw)
To: Philippe Mathieu-Daudé
Cc: qemu-devel, Paolo Bonzini, Laurent Vivier, David Hildenbrand
Philippe Mathieu-Daudé <philmd@redhat.com> writes:
> On 9/14/20 1:21 PM, Markus Armbruster wrote:
>> David Hildenbrand <david@redhat.com> writes:
>>
>>>> Am 14.09.2020 um 11:42 schrieb Philippe Mathieu-Daudé <philmd@redhat.com>:
>>>>
>>>> +Laurent and David
>>>>
>>>>> On 9/14/20 11:16 AM, Markus Armbruster wrote:
>>>>> Philippe Mathieu-Daudé <philmd@redhat.com> writes:
>>>>>
>>>>>> 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
>>>>>> allows pulling less declarations/definitions to user-mode.
>>>>>
>>>>> How this affects user mode is not obvious to (ignorant) me. Can you
>>>>> provide a clue?
>>>>
>>>> I guess this was discussed with David at some point.
>>>>
>>>> Maybe the QMP commands are not exposed via HMP, making this
>>>> code unreachable?
>>>>
>>>> Anyhow user-mode binaries don't use the memory ballooning feature,
>>>> this is specific to system-mode emulation.
>>>>
>>>> Laurent/David, do you have some more trivial explanation?
>>>
>>> Agreed.
>>>
>>> No memory ballooning device -> no memory ballooning :)
>>
>> I understand why user mode doesn't need device models. What I don't
>> understand offhand is how balloon-related stuff in misc.json ends up
>> pulling "declarations/definitions to user-mode". What exactly is being
>> pulled where before the series, and no more afterwards?
>>
>> Is it just the code generated for the QAPI stuff you move, or is it
>> more?
>
> As of this series, this is only QAPI generated code.
> (code which pulls in unwanted declarations/definitions
> that should be poisoned, but we can't because of this).
>
> I didn't feel the need to enumerate what is removed from
> user-mode, because from the diff (and no link failure)
> I thought it was obvious. I can do, but that would be
> simply copy/pasting the QAPI changes.
Suggest to replace "pulling less declarations/definitions to user-mode"
by "pulling less QAPI-generated code into user-mode" in all the commit
messages.
> Part 3 start to remove things, but I kept that separated.
That's okay.
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [PATCH v5 1/8] qapi: Restrict LostTickPolicy enum to machine code
2020-09-14 9:37 ` Philippe Mathieu-Daudé
@ 2020-09-15 6:27 ` Markus Armbruster
0 siblings, 0 replies; 21+ messages in thread
From: Markus Armbruster @ 2020-09-15 6:27 UTC (permalink / raw)
To: Philippe Mathieu-Daudé
Cc: Paolo Bonzini, qemu-devel, Qemu-block, Laurent Vivier
Philippe Mathieu-Daudé <philmd@redhat.com> writes:
> +Laurent + qemu-block@
>
> On 9/14/20 11:14 AM, Markus Armbruster wrote:
>> Philippe Mathieu-Daudé <philmd@redhat.com> writes:
>>
>>> Acked-by: Markus Armbruster <armbru@redhat.com>
>>> Acked-by: Paolo Bonzini <pbonzini@redhat.com>
>>> Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
>>
>> Unlike the other patches that move code out of misc.json, this one
>> doesn't say "allows pulling less declarations/definitions to user-mode."
>> Intentional?
>
> TBH I don't remember as this is 6months old.
>
> IIUC the "tick lost" feature is only meaningful when running
> virtualized with a RTC profile, so this is pointless for
> user-mode binaries and tools.
Your reply to my question on PATCH 3 "What exactly is being pulled
where before the series, and no more afterwards?" leads me to believe
this patch is no different. Suggest to add the same rationale to this
commit message.
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [PATCH v5 0/8] user-mode: Prune build dependencies (part 2)
2020-09-13 19:53 [PATCH v5 0/8] user-mode: Prune build dependencies (part 2) Philippe Mathieu-Daudé
` (7 preceding siblings ...)
2020-09-13 19:53 ` [PATCH v5 8/8] qapi: Extract PCI commands to 'pci.json' Philippe Mathieu-Daudé
@ 2020-09-15 6:29 ` Markus Armbruster
2020-09-15 7:09 ` Philippe Mathieu-Daudé
2020-09-15 8:52 ` Markus Armbruster
9 siblings, 1 reply; 21+ messages in thread
From: Markus Armbruster @ 2020-09-15 6:29 UTC (permalink / raw)
To: Philippe Mathieu-Daudé; +Cc: Paolo Bonzini, qemu-devel
Philippe Mathieu-Daudé <philmd@redhat.com> writes:
> This is the second part of a series reducing user-mode
> dependencies. By stripping out unused code, the build
> and testing time is reduced (as is space used by objects).
>
> Series is fully Acked.
One more:
Acked-by: Markus Armbruster <armbru@redhat.com>
I suggested commit message tweaks. Happy to do them in my tree, if you
agree.
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [PATCH v5 0/8] user-mode: Prune build dependencies (part 2)
2020-09-15 6:29 ` [PATCH v5 0/8] user-mode: Prune build dependencies (part 2) Markus Armbruster
@ 2020-09-15 7:09 ` Philippe Mathieu-Daudé
0 siblings, 0 replies; 21+ messages in thread
From: Philippe Mathieu-Daudé @ 2020-09-15 7:09 UTC (permalink / raw)
To: Markus Armbruster; +Cc: Paolo Bonzini, qemu-devel
On 9/15/20 8:29 AM, Markus Armbruster wrote:
> Philippe Mathieu-Daudé <philmd@redhat.com> writes:
>
>> This is the second part of a series reducing user-mode
>> dependencies. By stripping out unused code, the build
>> and testing time is reduced (as is space used by objects).
>>
>> Series is fully Acked.
>
> One more:
> Acked-by: Markus Armbruster <armbru@redhat.com>
>
> I suggested commit message tweaks. Happy to do them in my tree, if you
> agree.
Sure, no problem!
Thanks :)
Phil.
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [PATCH v5 0/8] user-mode: Prune build dependencies (part 2)
2020-09-13 19:53 [PATCH v5 0/8] user-mode: Prune build dependencies (part 2) Philippe Mathieu-Daudé
` (8 preceding siblings ...)
2020-09-15 6:29 ` [PATCH v5 0/8] user-mode: Prune build dependencies (part 2) Markus Armbruster
@ 2020-09-15 8:52 ` Markus Armbruster
9 siblings, 0 replies; 21+ messages in thread
From: Markus Armbruster @ 2020-09-15 8:52 UTC (permalink / raw)
To: Philippe Mathieu-Daudé; +Cc: Paolo Bonzini, qemu-devel
Philippe Mathieu-Daudé <philmd@redhat.com> writes:
> This is the second part of a series reducing user-mode
> dependencies. By stripping out unused code, the build
> and testing time is reduced (as is space used by objects).
>
> Series is fully Acked.
Queued, thanks!
^ permalink raw reply [flat|nested] 21+ messages in thread
end of thread, other threads:[~2020-09-15 8:53 UTC | newest]
Thread overview: 21+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-09-13 19:53 [PATCH v5 0/8] user-mode: Prune build dependencies (part 2) Philippe Mathieu-Daudé
2020-09-13 19:53 ` [PATCH v5 1/8] qapi: Restrict LostTickPolicy enum to machine code Philippe Mathieu-Daudé
2020-09-14 9:14 ` Markus Armbruster
2020-09-14 9:37 ` Philippe Mathieu-Daudé
2020-09-15 6:27 ` Markus Armbruster
2020-09-13 19:53 ` [PATCH v5 2/8] qapi: Correct balloon documentation Philippe Mathieu-Daudé
2020-09-13 19:53 ` [PATCH v5 3/8] qapi: Restrict balloon-related commands to machine code Philippe Mathieu-Daudé
2020-09-14 9:16 ` Markus Armbruster
2020-09-14 9:42 ` Philippe Mathieu-Daudé
2020-09-14 9:48 ` David Hildenbrand
2020-09-14 11:21 ` Markus Armbruster
2020-09-14 12:15 ` Philippe Mathieu-Daudé
2020-09-15 6:24 ` Markus Armbruster
2020-09-13 19:53 ` [PATCH v5 4/8] qapi: Restrict query-vm-generation-id command " Philippe Mathieu-Daudé
2020-09-13 19:53 ` [PATCH v5 5/8] qapi: Restrict query-uuid " Philippe Mathieu-Daudé
2020-09-13 19:53 ` [PATCH v5 6/8] qapi: Restrict device memory commands " Philippe Mathieu-Daudé
2020-09-13 19:53 ` [PATCH v5 7/8] qapi: Extract ACPI commands to 'acpi.json' Philippe Mathieu-Daudé
2020-09-13 19:53 ` [PATCH v5 8/8] qapi: Extract PCI commands to 'pci.json' Philippe Mathieu-Daudé
2020-09-15 6:29 ` [PATCH v5 0/8] user-mode: Prune build dependencies (part 2) Markus Armbruster
2020-09-15 7:09 ` Philippe Mathieu-Daudé
2020-09-15 8:52 ` Markus Armbruster
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.