From: "Michael S. Tsirkin" <mst@redhat.com>
To: qemu-devel@nongnu.org
Cc: "Peter Maydell" <peter.maydell@linaro.org>,
"Eduardo Habkost" <ehabkost@redhat.com>,
"Corey Minyard" <cminyard@mvista.com>,
=?UTF-8?q?C=C3=A9dric=20Le=20Goater?= <clg@fr.ibm.com>,
"Marcel Apfelbaum" <marcel@redhat.com>,
"Greg Kurz" <gkurz@linux.vnet.ibm.com>
Subject: [Qemu-devel] [PULL v2 19/45] ipmi: replace *_MAXCMD defines
Date: Sat, 6 Feb 2016 21:13:24 +0200 [thread overview]
Message-ID: <1454784308-21177-20-git-send-email-mst@redhat.com> (raw)
In-Reply-To: <1454784308-21177-1-git-send-email-mst@redhat.com>
From: Cédric Le Goater <clg@fr.ibm.com>
ARRAY_SIZE() is simple to use and removes the need to pre-define
the size of the command arrays.
Signed-off-by: Cédric Le Goater <clg@fr.ibm.com>
Reviewed-by: Greg Kurz <gkurz@linux.vnet.ibm.com>
Acked-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
---
hw/ipmi/ipmi_bmc_sim.c | 21 ++++++++-------------
1 file changed, 8 insertions(+), 13 deletions(-)
diff --git a/hw/ipmi/ipmi_bmc_sim.c b/hw/ipmi/ipmi_bmc_sim.c
index 1f06dfc..f7e87b4 100644
--- a/hw/ipmi/ipmi_bmc_sim.c
+++ b/hw/ipmi/ipmi_bmc_sim.c
@@ -28,14 +28,12 @@
#include "qemu/error-report.h"
#define IPMI_NETFN_CHASSIS 0x00
-#define IPMI_NETFN_CHASSIS_MAXCMD 0x03
#define IPMI_CMD_GET_CHASSIS_CAPABILITIES 0x00
#define IPMI_CMD_GET_CHASSIS_STATUS 0x01
#define IPMI_CMD_CHASSIS_CONTROL 0x02
#define IPMI_NETFN_SENSOR_EVENT 0x04
-#define IPMI_NETFN_SENSOR_EVENT_MAXCMD 0x2e
#define IPMI_CMD_SET_SENSOR_EVT_ENABLE 0x28
#define IPMI_CMD_GET_SENSOR_EVT_ENABLE 0x29
@@ -44,7 +42,6 @@
#define IPMI_CMD_GET_SENSOR_READING 0x2d
/* #define IPMI_NETFN_APP 0x06 In ipmi.h */
-#define IPMI_NETFN_APP_MAXCMD 0x36
#define IPMI_CMD_GET_DEVICE_ID 0x01
#define IPMI_CMD_COLD_RESET 0x02
@@ -61,7 +58,6 @@
#define IPMI_CMD_READ_EVT_MSG_BUF 0x35
#define IPMI_NETFN_STORAGE 0x0a
-#define IPMI_NETFN_STORAGE_MAXCMD 0x4a
#define IPMI_CMD_GET_SDR_REP_INFO 0x20
#define IPMI_CMD_GET_SDR_REP_ALLOC_INFO 0x21
@@ -1516,18 +1512,17 @@ static void get_sensor_reading(IPMIBmcSim *ibs,
}
}
-static const IPMICmdHandler chassis_cmds[IPMI_NETFN_CHASSIS_MAXCMD] = {
+static const IPMICmdHandler chassis_cmds[] = {
[IPMI_CMD_GET_CHASSIS_CAPABILITIES] = chassis_capabilities,
[IPMI_CMD_GET_CHASSIS_STATUS] = chassis_status,
[IPMI_CMD_CHASSIS_CONTROL] = chassis_control
};
static const IPMINetfn chassis_netfn = {
- .cmd_nums = IPMI_NETFN_CHASSIS_MAXCMD,
+ .cmd_nums = ARRAY_SIZE(chassis_cmds),
.cmd_handlers = chassis_cmds
};
-static const IPMICmdHandler
-sensor_event_cmds[IPMI_NETFN_SENSOR_EVENT_MAXCMD] = {
+static const IPMICmdHandler sensor_event_cmds[] = {
[IPMI_CMD_SET_SENSOR_EVT_ENABLE] = set_sensor_evt_enable,
[IPMI_CMD_GET_SENSOR_EVT_ENABLE] = get_sensor_evt_enable,
[IPMI_CMD_REARM_SENSOR_EVTS] = rearm_sensor_evts,
@@ -1535,11 +1530,11 @@ sensor_event_cmds[IPMI_NETFN_SENSOR_EVENT_MAXCMD] = {
[IPMI_CMD_GET_SENSOR_READING] = get_sensor_reading
};
static const IPMINetfn sensor_event_netfn = {
- .cmd_nums = IPMI_NETFN_SENSOR_EVENT_MAXCMD,
+ .cmd_nums = ARRAY_SIZE(sensor_event_cmds),
.cmd_handlers = sensor_event_cmds
};
-static const IPMICmdHandler app_cmds[IPMI_NETFN_APP_MAXCMD] = {
+static const IPMICmdHandler app_cmds[] = {
[IPMI_CMD_GET_DEVICE_ID] = get_device_id,
[IPMI_CMD_COLD_RESET] = cold_reset,
[IPMI_CMD_WARM_RESET] = warm_reset,
@@ -1555,11 +1550,11 @@ static const IPMICmdHandler app_cmds[IPMI_NETFN_APP_MAXCMD] = {
[IPMI_CMD_GET_WATCHDOG_TIMER] = get_watchdog_timer,
};
static const IPMINetfn app_netfn = {
- .cmd_nums = IPMI_NETFN_APP_MAXCMD,
+ .cmd_nums = ARRAY_SIZE(app_cmds),
.cmd_handlers = app_cmds
};
-static const IPMICmdHandler storage_cmds[IPMI_NETFN_STORAGE_MAXCMD] = {
+static const IPMICmdHandler storage_cmds[] = {
[IPMI_CMD_GET_SDR_REP_INFO] = get_sdr_rep_info,
[IPMI_CMD_RESERVE_SDR_REP] = reserve_sdr_rep,
[IPMI_CMD_GET_SDR] = get_sdr,
@@ -1575,7 +1570,7 @@ static const IPMICmdHandler storage_cmds[IPMI_NETFN_STORAGE_MAXCMD] = {
};
static const IPMINetfn storage_netfn = {
- .cmd_nums = IPMI_NETFN_STORAGE_MAXCMD,
+ .cmd_nums = ARRAY_SIZE(storage_cmds),
.cmd_handlers = storage_cmds
};
--
MST
next prev parent reply other threads:[~2016-02-06 19:13 UTC|newest]
Thread overview: 50+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-02-06 19:12 [Qemu-devel] [PULL v2 00/45] pc and misc cleanups and fixes, virtio optimizations Michael S. Tsirkin
2016-02-06 19:12 ` [Qemu-devel] [PULL v2 01/45] Fix virtio migration Michael S. Tsirkin
2016-02-06 19:12 ` [Qemu-devel] [PULL v2 02/45] pc: acpi: merge SSDT into DSDT Michael S. Tsirkin
2016-02-06 19:12 ` [Qemu-devel] [PULL v2 03/45] tests: pc: acpi: drop not needed 'expected SSDT' blobs Michael S. Tsirkin
2016-02-06 19:12 ` [Qemu-devel] [PULL v2 04/45] tests: pc: acpi: add expected DSDT.bridge blobs and update DSDT blobs Michael S. Tsirkin
2016-02-06 19:12 ` [Qemu-devel] [PULL v2 05/45] virtio: move VirtQueueElement at the beginning of the structs Michael S. Tsirkin
2016-02-06 19:12 ` [Qemu-devel] [PULL v2 06/45] virtio: move allocation to virtqueue_pop/vring_pop Michael S. Tsirkin
2016-02-06 19:12 ` [Qemu-devel] [PULL v2 07/45] virtio: introduce qemu_get/put_virtqueue_element Michael S. Tsirkin
2016-02-06 19:12 ` [Qemu-devel] [PULL v2 08/45] virtio: introduce virtqueue_alloc_element Michael S. Tsirkin
2016-02-06 19:12 ` [Qemu-devel] [PULL v2 09/45] virtio: slim down allocation of VirtQueueElements Michael S. Tsirkin
2016-02-06 19:12 ` [Qemu-devel] [PULL v2 10/45] vring: " Michael S. Tsirkin
2016-02-06 19:12 ` [Qemu-devel] [PULL v2 11/45] virtio: combine the read of a descriptor Michael S. Tsirkin
2016-02-06 19:12 ` [Qemu-devel] [PULL v2 12/45] virtio: cache used_idx in a VirtQueue field Michael S. Tsirkin
2016-02-06 19:13 ` [Qemu-devel] [PULL v2 13/45] virtio: read avail_idx from VQ only when necessary Michael S. Tsirkin
2016-02-06 19:13 ` [Qemu-devel] [PULL v2 14/45] virtio: combine write of an entry into used ring Michael S. Tsirkin
2016-02-06 19:13 ` [Qemu-devel] [PULL v2 15/45] hw/pxb: add pxb devices to the bridge category Michael S. Tsirkin
2016-02-06 19:13 ` [Qemu-devel] [PULL v2 16/45] vhost-user-test: use correct ROM to speed up and avoid spurious failures Michael S. Tsirkin
2016-02-06 19:13 ` [Qemu-devel] [PULL v2 17/45] hw/pci: ensure that only PCI/PCIe bridges can be attached to pxb/pxb-pcie devices Michael S. Tsirkin
2016-02-06 19:13 ` [Qemu-devel] [PULL v2 18/45] ipmi: replace goto by a return statement Michael S. Tsirkin
2016-02-06 19:13 ` Michael S. Tsirkin [this message]
2016-02-06 19:13 ` [Qemu-devel] [PULL v2 20/45] ipmi: cleanup error_report messages Michael S. Tsirkin
2016-02-06 19:13 ` [Qemu-devel] [PULL v2 21/45] ipmi: fix SDR length value Michael S. Tsirkin
2016-02-06 19:13 ` [Qemu-devel] [PULL v2 22/45] ipmi: introduce a struct ipmi_sdr_compact Michael S. Tsirkin
2016-02-16 7:45 ` Paolo Bonzini
2016-02-16 8:11 ` Cédric Le Goater
2016-02-06 19:13 ` [Qemu-devel] [PULL v2 23/45] ipmi: add get and set SENSOR_TYPE commands Michael S. Tsirkin
2016-02-06 19:13 ` [Qemu-devel] [PULL v2 24/45] ipmi: add GET_SYS_RESTART_CAUSE chassis command Michael S. Tsirkin
2016-02-06 19:13 ` [Qemu-devel] [PULL v2 25/45] ipmi: add ACPI power and GUID commands Michael S. Tsirkin
2016-02-06 19:13 ` [Qemu-devel] [PULL v2 26/45] pc: Move PcGuestInfo declaration to top of file Michael S. Tsirkin
2016-02-06 19:13 ` [Qemu-devel] [PULL v2 27/45] pc: Eliminate struct PcGuestInfoState Michael S. Tsirkin
2016-02-06 19:13 ` [Qemu-devel] [PULL v2 28/45] pc: Simplify pc_memory_init() signature Michael S. Tsirkin
2016-02-06 19:14 ` [Qemu-devel] [PULL v2 29/45] pc: Simplify xen_load_linux() signature Michael S. Tsirkin
2016-02-06 19:14 ` [Qemu-devel] [PULL v2 30/45] acpi: Remove guest_info parameters from functions Michael S. Tsirkin
2016-02-06 19:14 ` [Qemu-devel] [PULL v2 31/45] acpi: Don't save PcGuestInfo on AcpiBuildState Michael S. Tsirkin
2016-02-06 19:14 ` [Qemu-devel] [PULL v2 32/45] pc: Remove compat fields from PcGuestInfo Michael S. Tsirkin
2016-02-06 19:14 ` [Qemu-devel] [PULL v2 33/45] pc: Remove RAM size " Michael S. Tsirkin
2016-02-06 19:14 ` [Qemu-devel] [PULL v2 34/45] pc: Remove PcGuestInfo.isapc_ram_fw field Michael S. Tsirkin
2016-02-06 19:14 ` [Qemu-devel] [PULL v2 35/45] pc: Move PcGuestInfo.fw_cfg to PCMachineState Michael S. Tsirkin
2016-02-06 19:14 ` [Qemu-devel] [PULL v2 36/45] pc: Move APIC and NUMA data from PcGuestInfo " Michael S. Tsirkin
2016-02-06 19:14 ` [Qemu-devel] [PULL v2 37/45] pc: Eliminate PcGuestInfo struct Michael S. Tsirkin
2016-02-06 19:14 ` [Qemu-devel] [PULL v2 38/45] acpi: take oem_id in build_header(), optionally Michael S. Tsirkin
2016-02-06 19:14 ` [Qemu-devel] [PULL v2 39/45] acpi: expose oem_id and oem_table_id in build_rsdt() Michael S. Tsirkin
2016-02-06 19:14 ` [Qemu-devel] [PULL v2 40/45] acpi: add function to extract oem_id and oem_table_id from the user's SLIC Michael S. Tsirkin
2016-02-06 19:14 ` [Qemu-devel] [PULL v2 41/45] pc: set the OEM fields in the RSDT and the FADT from the SLIC Michael S. Tsirkin
2016-02-06 19:15 ` [Qemu-devel] [PULL v2 42/45] dimm: Correct type of MemoryHotplugState->base Michael S. Tsirkin
2016-02-06 19:15 ` [Qemu-devel] [PULL v2 43/45] intel_iommu: large page support Michael S. Tsirkin
2016-02-06 19:15 ` [Qemu-devel] [PULL v2 44/45] fix MSI injection on Xen Michael S. Tsirkin
2016-02-12 21:55 ` Daniel P. Berrange
2016-02-06 19:15 ` [Qemu-devel] [PULL v2 45/45] net: set endianness on all backend devices Michael S. Tsirkin
2016-02-08 12:32 ` [Qemu-devel] [PULL v2 00/45] pc and misc cleanups and fixes, virtio optimizations Peter Maydell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1454784308-21177-20-git-send-email-mst@redhat.com \
--to=mst@redhat.com \
--cc=clg@fr.ibm.com \
--cc=cminyard@mvista.com \
--cc=ehabkost@redhat.com \
--cc=gkurz@linux.vnet.ibm.com \
--cc=marcel@redhat.com \
--cc=peter.maydell@linaro.org \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).