?  search:
summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
first · prev · next
Revert "qapi: BlockExportRemoveMode: move comments to TODO"
2023-05-09 Markus ArmbrusterRevert "qapi: BlockExportRemoveMode: move comments...
Signed-off-by: Markus Armbruster <armbru@redhat.com>
...Id: <20230428105429.1687850-6-armbru@redhat.com>
 commit | commitdiff | tree
2023-05-09 Markus Armbrustermeson: Fix to make QAPI generator output depend on...
Signed-off-by: Markus Armbruster <armbru@redhat.com>
...Id: <20230428105429.1687850-5-armbru@redhat.com>
 commit | commitdiff | tree
2023-05-09 Markus Armbrusterqapi: Fix crash on stray double quote character
Signed-off-by: Markus Armbruster <armbru@redhat.com>
...Id: <20230428105429.1687850-4-armbru@redhat.com>
 commit | commitdiff | tree
2023-05-09 Markus Armbrusterdocs/devel/qapi-code-gen: Turn FIXME admonitions into...
Signed-off-by: Markus Armbruster <armbru@redhat.com>
...Id: <20230428105429.1687850-3-armbru@redhat.com>
 commit | commitdiff | tree
2023-05-09 Markus Armbrusterdocs/devel/qapi-code-gen: Clean up use of quotes a bit
Signed-off-by: Markus Armbruster <armbru@redhat.com>
...Id: <20230428105429.1687850-2-armbru@redhat.com>
 commit | commitdiff | tree
2023-04-28 Markus Armbrusterdocs/devel/qapi-code-gen: Describe some doc markup...
Signed-off-by: Markus Armbruster <armbru@redhat.com>
...Id: <20230427095346.1238913-1-armbru@redhat.com>
 commit | commitdiff | tree
2023-04-28 Markus Armbrusterqapi storage-daemon/qapi: Fix documentation section...
Signed-off-by: Markus Armbruster <armbru@redhat.com>
...Id: <20230425064223.820979-17-armbru@redhat.com>
 commit | commitdiff | tree
2023-04-28 Markus Armbrusterqapi: Format since information the conventional way...
Signed-off-by: Markus Armbruster <armbru@redhat.com>
...Id: <20230425064223.820979-16-armbru@redhat.com>
 commit | commitdiff | tree
2023-04-28 Markus Armbrusterqapi: Fix misspelled section tags in doc comments
Signed-off-by: Markus Armbruster <armbru@redhat.com>
...Id: <20230425064223.820979-15-armbru@redhat.com>
 commit | commitdiff | tree
2023-04-28 Markus Armbrusterqapi: Replace ad hoc "since" documentation by member...
Signed-off-by: Markus Armbruster <armbru@redhat.com>
...Id: <20230425064223.820979-14-armbru@redhat.com>
 commit | commitdiff | tree
2023-04-28 Markus Armbrusterqapi: Fix argument documentation markup
Signed-off-by: Markus Armbruster <armbru@redhat.com>
...Id: <20230425064223.820979-13-armbru@redhat.com>
 commit | commitdiff | tree
2023-04-28 Markus Armbrusterqga/qapi-schema: Fix member documentation markup
Signed-off-by: Markus Armbruster <armbru@redhat.com>
...Id: <20230425064223.820979-12-armbru@redhat.com>
 commit | commitdiff | tree
2023-04-28 Markus Armbrusterqapi: Fix unintended definition lists in documentation
Signed-off-by: Markus Armbruster <armbru@redhat.com>
...Id: <20230425064223.820979-11-armbru@redhat.com>
 commit | commitdiff | tree
2023-04-28 Markus Armbrusterqapi: Fix bullet list markup in documentation
Signed-off-by: Markus Armbruster <armbru@redhat.com>
...Id: <20230425064223.820979-10-armbru@redhat.com>
 commit | commitdiff | tree
2023-04-28 Markus Armbrusterqapi: Delete largely misleading "Stability Considerations"
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Message-Id: <20230425064223.820979-9-armbru@redhat.com>
 commit | commitdiff | tree
2023-04-28 Markus Armbrusterqapi: Tidy up examples
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Message-Id: <20230425064223.820979-8-armbru@redhat.com>
 commit | commitdiff | tree
2023-04-28 Markus Armbrusterqapi: @foo should be used to reference, not ``foo``
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Message-Id: <20230425064223.820979-7-armbru@redhat.com>
 commit | commitdiff | tree
2023-04-28 Markus Armbrusterqapi/block-core: Clean up after removal of dirty bitmap...
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Message-Id: <20230425064223.820979-6-armbru@redhat.com>
 commit | commitdiff | tree
2023-04-28 Markus Armbrusterqapi: Fix up references to long gone error classes
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Message-Id: <20230425064223.820979-5-armbru@redhat.com>
 commit | commitdiff | tree
2023-04-28 Markus Armbrusterqapi: Fix misspelled references
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Message-Id: <20230425064223.820979-4-armbru@redhat.com>
 commit | commitdiff | tree
2023-04-28 Markus Armbrusterqga/qapi-schema: Fix a misspelled reference
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Message-Id: <20230425064223.820979-3-armbru@redhat.com>
 commit | commitdiff | tree
2023-04-28 Markus Armbrusterqga/qapi-schema: Tidy up documentation of guest-fsfreeze...
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Message-Id: <20230425064223.820979-2-armbru@redhat.com>
 commit | commitdiff | tree
2023-04-26 Daniel P. Berrangéqapi: allow unions to contain further unions
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
 commit | commitdiff | tree
2023-04-26 Markus Armbrusterqapi: Improve specificity of type/member descriptions
Signed-off-by: Markus Armbruster <armbru@redhat.com>
 commit | commitdiff | tree
2023-04-25 Daniel P. Berrangéqapi: support updating expected test output via make
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
 commit | commitdiff | tree
2023-04-24 Markus Armbrusterqapi: Require boxed for conditional command and event...
Signed-off-by: Markus Armbruster <armbru@redhat.com>
...Id: <20230316071325.492471-15-armbru@redhat.com>
 commit | commitdiff | tree
2023-04-24 Markus Armbrusterqapi: Fix code generated for optional conditional struct...
Signed-off-by: Markus Armbruster <armbru@redhat.com>
...Id: <20230316071325.492471-14-armbru@redhat.com>
 commit | commitdiff | tree
2023-04-24 Markus Armbrustertests/qapi-schema: Cover optional conditional struct...
Signed-off-by: Markus Armbruster <armbru@redhat.com>
...Id: <20230316071325.492471-13-armbru@redhat.com>
 commit | commitdiff | tree
2023-04-24 Markus Armbrustertests/qapi-schema: Clean up positive test for conditionals
Signed-off-by: Markus Armbruster <armbru@redhat.com>
...Id: <20230316071325.492471-12-armbru@redhat.com>
 commit | commitdiff | tree
2023-04-24 Markus Armbrustertests/qapi-schema: Rename a few conditionals
Signed-off-by: Markus Armbruster <armbru@redhat.com>
...Id: <20230316071325.492471-11-armbru@redhat.com>
 commit | commitdiff | tree
2023-04-24 Markus Armbrustertests/qapi-schema: Improve union discriminator coverage
Signed-off-by: Markus Armbruster <armbru@redhat.com>
...Id: <20230316071325.492471-10-armbru@redhat.com
 commit | commitdiff | tree
2023-04-24 Markus Armbrusterqapi: Fix to reject 'data': 'mumble' in struct
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Message-Id: <20230316071325.492471-9-armbru@redhat.com>
 commit | commitdiff | tree
2023-04-24 Markus Armbrusterqapi: Fix error message when type name or array is...
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Message-Id: <20230316071325.492471-8-armbru@redhat.com>
 commit | commitdiff | tree
2023-04-24 Markus Armbrusterqapi: Simplify code a bit after previous commits
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Message-Id: <20230316071325.492471-7-armbru@redhat.com>
 commit | commitdiff | tree
2023-04-24 Markus Armbrusterqapi: Improve error message for unexpected array types
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Message-Id: <20230316071325.492471-6-armbru@redhat.com>
 commit | commitdiff | tree
2023-04-24 Markus Armbrusterqapi: Split up check_type()
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Message-Id: <20230316071325.492471-5-armbru@redhat.com>
 commit | commitdiff | tree
2023-04-24 Markus Armbrusterqapi: Clean up after removal of simple unions
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Message-Id: <20230316071325.492471-4-armbru@redhat.com>
 commit | commitdiff | tree
2023-04-24 Markus Armbrusterqapi/schema: Use super()
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Message-Id: <20230316071325.492471-3-armbru@redhat.com>
 commit | commitdiff | tree
2023-04-24 Markus Armbrusterqapi: Fix error message format regression
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Message-Id: <20230316071325.492471-2-armbru@redhat.com>
 commit | commitdiff | tree
2023-03-02 Philippe Mathieu... target/ppc: Restrict 'qapi-commands-machine.h' to system...
Signed-off-by: Markus Armbruster <armbru@redhat.com>
 commit | commitdiff | tree
2023-03-02 Philippe Mathieu... target/loongarch: Restrict 'qapi-commands-machine.h...
Signed-off-by: Markus Armbruster <armbru@redhat.com>
 commit | commitdiff | tree
2023-03-02 Philippe Mathieu... target/i386: Restrict 'qapi-commands-machine.h' to...
Signed-off-by: Markus Armbruster <armbru@redhat.com>
 commit | commitdiff | tree
2023-03-02 Philippe Mathieu... target/arm: Restrict 'qapi-commands-machine.h' to system...
Signed-off-by: Markus Armbruster <armbru@redhat.com>
 commit | commitdiff | tree
2023-03-01 Dongli Zhangreadline: fix hmp completion issue
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
 commit | commitdiff | tree
2023-02-23 Markus Armbrusterrocker: Tweak stubbed out monitor commands' error messages
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Message-Id: <20230207075115.1525-13-armbru@redhat.com>
 commit | commitdiff | tree
2023-02-23 Markus Armbrustermigration/colo: Improve an x-colo-lost-heartbeat error...
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Message-Id: <20230207075115.1525-12-armbru@redhat.com>
 commit | commitdiff | tree
2023-02-23 Markus Armbrusterhw/core: Improve the query-hotpluggable-cpus error...
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Message-Id: <20230207075115.1525-11-armbru@redhat.com>
 commit | commitdiff | tree
2023-02-23 Markus Armbrusterreplay: Simplify setting replay blockers
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Message-Id: <20230207075115.1525-10-armbru@redhat.com>
 commit | commitdiff | tree
2023-02-23 Markus Armbrusterqga: Drop dangling reference to QERR_QGA_LOGGING_DISABLED
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Message-Id: <20230207075115.1525-9-armbru@redhat.com>
 commit | commitdiff | tree
2023-02-23 Markus Armbrusterhw/acpi: Move QMP command to hw/core/
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Message-Id: <20230207075115.1525-8-armbru@redhat.com>
 commit | commitdiff | tree
2023-02-23 Markus Armbrusterhw/acpi: Dumb down acpi_table_add() stub
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Message-Id: <20230207075115.1525-7-armbru@redhat.com>
 commit | commitdiff | tree
2023-02-23 Markus Armbrusterhw/smbios: Dumb down smbios_entry_add() stub
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Message-Id: <20230207075115.1525-6-armbru@redhat.com>
 commit | commitdiff | tree
2023-02-23 Markus Armbrusterhw/core: Improve error message when machine doesn't...
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Message-Id: <20230207075115.1525-5-armbru@redhat.com>
 commit | commitdiff | tree
2023-02-23 Markus Armbrusterdump: Assert cpu_get_note_size() can't fail
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Message-Id: <20230207075115.1525-4-armbru@redhat.com>
 commit | commitdiff | tree
2023-02-23 Markus Armbrusterdump: Improve error message when target doesn't support...
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Message-Id: <20230207075115.1525-3-armbru@redhat.com>
 commit | commitdiff | tree
2023-02-23 Markus Armbrustererror: Drop superfluous #include "qapi/qmp/qerror.h"
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Message-Id: <20230207075115.1525-2-armbru@redhat.com>
 commit | commitdiff | tree
2023-02-23 John Snowqapi: remove JSON value FIXME
Reviewed-by: Markus Armbruster <armbru@redhat.com>
 commit | commitdiff | tree
2023-02-23 John Snowqapi: remove _JSONObject
Reviewed-by: Markus Armbruster <armbru@redhat.com>
 commit | commitdiff | tree
2023-02-23 John Snowqapi/parser: add QAPIExpression type
Reviewed-by: Markus Armbruster <armbru@redhat.com>
 commit | commitdiff | tree
2023-02-23 John Snowqapi: Add minor typing workaround for 3.6
Reviewed-by: Markus Armbruster <armbru@redhat.com>
 commit | commitdiff | tree
2023-02-23 John Snowqapi: update pylint configuration
Reviewed-by: Markus Armbruster <armbru@redhat.com>
 commit | commitdiff | tree
2023-02-23 John Snowqapi: Update flake8 config
Reviewed-by: Markus Armbruster <armbru@redhat.com>
 commit | commitdiff | tree
2023-02-23 Markus Armbrusterdocs/devel/qapi-code-gen: Fix a missing 'may', clarify...
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Message-Id: <20230213132009.918801-3-armbru@redhat.com>
 commit | commitdiff | tree
2023-02-23 Markus Armbrusterdocs/devel/qapi-code-gen: Belatedly update features...
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Message-Id: <20230213132009.918801-2-armbru@redhat.com>
 commit | commitdiff | tree
2023-02-08 Markus ArmbrusterDrop duplicate #include
Signed-off-by: Markus Armbruster <armbru@redhat.com>
...Id: <20230202133830.2152150-21-armbru@redhat.com>
 commit | commitdiff | tree
2023-02-08 Markus ArmbrusterDon't include headers already included by qemu/osdep.h
Signed-off-by: Markus Armbruster <armbru@redhat.com>
...Id: <20230202133830.2152150-19-armbru@redhat.com>
 commit | commitdiff | tree
2023-02-08 Markus ArmbrusterFix non-first inclusions of qemu/osdep.h
Signed-off-by: Markus Armbruster <armbru@redhat.com>
...Id: <20230202133830.2152150-18-armbru@redhat.com>
 commit | commitdiff | tree
2023-02-08 Markus Armbrusteraccel: Clean up includes
Signed-off-by: Markus Armbruster <armbru@redhat.com>
...Id: <20230202133830.2152150-17-armbru@redhat.com>
 commit | commitdiff | tree
2023-02-08 Markus Armbrusterblock: Clean up includes
Signed-off-by: Markus Armbruster <armbru@redhat.com>
...Id: <20230202133830.2152150-16-armbru@redhat.com>
 commit | commitdiff | tree
2023-02-08 Markus Armbrusterriscv: Clean up includes
Signed-off-by: Markus Armbruster <armbru@redhat.com>
...Id: <20230202133830.2152150-15-armbru@redhat.com>
 commit | commitdiff | tree
2023-02-08 Markus Armbrustertarget/hexagon: Clean up includes
Signed-off-by: Markus Armbruster <armbru@redhat.com>
...Id: <20230202133830.2152150-14-armbru@redhat.com>
 commit | commitdiff | tree
2023-02-08 Markus Armbrusternet: Clean up includes
Signed-off-by: Markus Armbruster <armbru@redhat.com>
...Id: <20230202133830.2152150-13-armbru@redhat.com>
 commit | commitdiff | tree
2023-02-08 Markus Armbrustermigration: Clean up includes
Signed-off-by: Markus Armbruster <armbru@redhat.com>
...Id: <20230202133830.2152150-12-armbru@redhat.com>
 commit | commitdiff | tree
2023-02-08 Markus Armbrusterqga: Clean up includes
Signed-off-by: Markus Armbruster <armbru@redhat.com>
...Id: <20230202133830.2152150-11-armbru@redhat.com>
 commit | commitdiff | tree
2023-02-08 Markus Armbrusterhw/tricore: Clean up includes
Signed-off-by: Markus Armbruster <armbru@redhat.com>
...Id: <20230202133830.2152150-10-armbru@redhat.com>
 commit | commitdiff | tree
2023-02-08 Markus Armbrusterhw/input: Clean up includes
Signed-off-by: Markus Armbruster <armbru@redhat.com>
...Id: <20230202133830.2152150-9-armbru@redhat.com>
 commit | commitdiff | tree
2023-02-08 Markus Armbrusterhw/cxl: Clean up includes
Signed-off-by: Markus Armbruster <armbru@redhat.com>
...Id: <20230202133830.2152150-8-armbru@redhat.com>
 commit | commitdiff | tree
2023-02-08 Markus Armbrustercrypto: Clean up includes
Signed-off-by: Markus Armbruster <armbru@redhat.com>
...Id: <20230202133830.2152150-7-armbru@redhat.com>
 commit | commitdiff | tree
2023-02-08 Markus Armbrusterbsd-user: Clean up includes
Signed-off-by: Markus Armbruster <armbru@redhat.com>
...Id: <20230202133830.2152150-6-armbru@redhat.com>
 commit | commitdiff | tree
2023-02-08 Markus Armbrusterscripts/clean-includes: Improve --git commit message
Signed-off-by: Markus Armbruster <armbru@redhat.com>
...Id: <20230202133830.2152150-5-armbru@redhat.com>
 commit | commitdiff | tree
2023-02-08 Markus Armbrusterscripts/clean-includes: Skip symbolic links
Signed-off-by: Markus Armbruster <armbru@redhat.com>
...Id: <20230202133830.2152150-4-armbru@redhat.com>
 commit | commitdiff | tree
2023-02-08 Markus Armbrusterscripts/clean-includes: Don't claim duplicate headers...
Signed-off-by: Markus Armbruster <armbru@redhat.com>
...Id: <20230202133830.2152150-3-armbru@redhat.com>
 commit | commitdiff | tree
2023-02-08 Markus Armbrusterscripts/clean-includes: Fully skip / ignore files
Signed-off-by: Markus Armbruster <armbru@redhat.com>
...Id: <20230202133830.2152150-2-armbru@redhat.com>
 commit | commitdiff | tree
2023-02-04 Markus Armbrustermonitor: Rename misc.c to hmp-target.c
Signed-off-by: Markus Armbruster <armbru@redhat.com>
...Id: <20230124121946.1139465-33-armbru@redhat.com>
 commit | commitdiff | tree
2023-02-04 Markus Armbrustermonitor: Loosen coupling between misc.c and monitor...
Signed-off-by: Markus Armbruster <armbru@redhat.com>
...Id: <20230124121946.1139465-32-armbru@redhat.com>
 commit | commitdiff | tree
2023-02-04 Markus Armbrustermonitor: Move remaining QMP stuff from misc.c to qmp...
Signed-off-by: Markus Armbruster <armbru@redhat.com>
...Id: <20230124121946.1139465-31-armbru@redhat.com>
 commit | commitdiff | tree
2023-02-04 Markus Armbrustermonitor: Move remaining HMP commands from misc.c to...
Signed-off-by: Markus Armbruster <armbru@redhat.com>
...Id: <20230124121946.1139465-30-armbru@redhat.com>
 commit | commitdiff | tree
2023-02-04 Markus Armbrustermonitor: Move target-dependent HMP commands to hmp...
Signed-off-by: Markus Armbruster <armbru@redhat.com>
...Id: <20230124121946.1139465-29-armbru@redhat.com>
 commit | commitdiff | tree
2023-02-04 Markus Armbrustermonitor: Move monitor_putc() next to monitor_puts ...
Signed-off-by: Markus Armbruster <armbru@redhat.com>
...Id: <20230124121946.1139465-28-armbru@redhat.com>
 commit | commitdiff | tree
2023-02-04 Markus Armbrustermonitor: Split file descriptor passing stuff off misc.c
Signed-off-by: Markus Armbruster <armbru@redhat.com>
...Id: <20230124121946.1139465-27-armbru@redhat.com>
 commit | commitdiff | tree
2023-02-04 Markus Armbrusterqdev: Move HMP command completion from monitor to softmmu/
Signed-off-by: Markus Armbruster <armbru@redhat.com>
...Id: <20230124121946.1139465-26-armbru@redhat.com>
 commit | commitdiff | tree
2023-02-04 Markus Armbrusteracpi: Move the QMP command from monitor/ to hw/acpi/
Signed-off-by: Markus Armbruster <armbru@redhat.com>
...Id: <20230124121946.1139465-25-armbru@redhat.com>
 commit | commitdiff | tree
2023-02-04 Markus Armbrusterstats: Move HMP commands from monitor/ to stats/
Signed-off-by: Markus Armbruster <armbru@redhat.com>
...Id: <20230124121946.1139465-24-armbru@redhat.com>
 commit | commitdiff | tree
2023-02-04 Markus Armbrusterstats: Move QMP commands from monitor/ to stats/
Signed-off-by: Markus Armbruster <armbru@redhat.com>
...Id: <20230124121946.1139465-23-armbru@redhat.com>
 commit | commitdiff | tree
2023-02-04 Markus Armbrusterrunstate: Move HMP commands from monitor/ to softmmu/
Signed-off-by: Markus Armbruster <armbru@redhat.com>
...Id: <20230124121946.1139465-22-armbru@redhat.com>
 commit | commitdiff | tree
2023-02-04 Markus Armbrustertpm: Move HMP commands from monitor/ to softmmu/
Signed-off-by: Markus Armbruster <armbru@redhat.com>
...Id: <20230124121946.1139465-21-armbru@redhat.com>
 commit | commitdiff | tree
2023-02-04 Markus Armbrustervirtio: Move HMP commands from monitor/ to hw/virtio/
Signed-off-by: Markus Armbruster <armbru@redhat.com>
...Id: <20230124121946.1139465-20-armbru@redhat.com>
 commit | commitdiff | tree
2023-02-04 Markus Armbrustermigration: Move the QMP command from monitor/ to migration/
Signed-off-by: Markus Armbruster <armbru@redhat.com>
...Id: <20230124121946.1139465-19-armbru@redhat.com>
 commit | commitdiff | tree
2023-02-04 Markus Armbrustermigration: Move HMP commands from monitor/ to migration/
Signed-off-by: Markus Armbruster <armbru@redhat.com>
...Id: <20230124121946.1139465-18-armbru@redhat.com>
 commit | commitdiff | tree
2023-02-04 Markus Armbrusternet: Move hmp_info_network() to net-hmp-cmds.c
Signed-off-by: Markus Armbruster <armbru@redhat.com>
...Id: <20230124121946.1139465-17-armbru@redhat.com>
 commit | commitdiff | tree
next
armbru's QEMU hackery