[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 45/53] ipmi: remove IPMI_CHECK_RESERVATION() macro
From: |
Michael S. Tsirkin |
Subject: |
[Qemu-devel] [PULL 45/53] ipmi: remove IPMI_CHECK_RESERVATION() macro |
Date: |
Fri, 11 Mar 2016 17:10:12 +0200 |
From: Cédric Le Goater <address@hidden>
Some IPMI command handlers in the BMC simulator use a macro
IPMI_CHECK_RESERVATION() to check a SDR reservation but the macro
implicitly uses local variables. This patch simply removes it.
Signed-off-by: Cédric Le Goater <address@hidden>
Acked-by: Corey Minyard <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>
---
hw/ipmi/ipmi_bmc_sim.c | 33 +++++++++++++++++++--------------
1 file changed, 19 insertions(+), 14 deletions(-)
diff --git a/hw/ipmi/ipmi_bmc_sim.c b/hw/ipmi/ipmi_bmc_sim.c
index 1b615f6..3089bfe 100644
--- a/hw/ipmi/ipmi_bmc_sim.c
+++ b/hw/ipmi/ipmi_bmc_sim.c
@@ -292,16 +292,6 @@ static inline void rsp_buffer_pushmore(RspBuffer *rsp,
uint8_t *bytes,
rsp->len += n;
}
-/* Check that the reservation in the command is valid. */
-#define IPMI_CHECK_RESERVATION(off, r) \
- do { \
- if ((cmd[off] | (cmd[off + 1] << 8)) != r) { \
- rsp->buffer[2] = IPMI_CC_INVALID_RESERVATION; \
- return; \
- } \
- } while (0)
-
-
static void ipmi_sim_handle_timeout(IPMIBmcSim *ibs);
static void ipmi_gettime(struct ipmi_time *time)
@@ -1226,8 +1216,12 @@ static void get_sdr(IPMIBmcSim *ibs,
struct ipmi_sdr_header *sdrh;
if (cmd[6]) {
- IPMI_CHECK_RESERVATION(2, ibs->sdr.reservation);
+ if ((cmd[2] | (cmd[3] << 8)) != ibs->sdr.reservation) {
+ rsp->buffer[2] = IPMI_CC_INVALID_RESERVATION;
+ return;
+ }
}
+
pos = 0;
if (sdr_find_entry(&ibs->sdr, cmd[4] | (cmd[5] << 8),
&pos, &nextrec)) {
@@ -1276,7 +1270,11 @@ static void clear_sdr_rep(IPMIBmcSim *ibs,
uint8_t *cmd, unsigned int cmd_len,
RspBuffer *rsp)
{
- IPMI_CHECK_RESERVATION(2, ibs->sdr.reservation);
+ if ((cmd[2] | (cmd[3] << 8)) != ibs->sdr.reservation) {
+ rsp->buffer[2] = IPMI_CC_INVALID_RESERVATION;
+ return;
+ }
+
if (cmd[4] != 'C' || cmd[5] != 'L' || cmd[6] != 'R') {
rsp->buffer[2] = IPMI_CC_INVALID_DATA_FIELD;
return;
@@ -1332,7 +1330,10 @@ static void get_sel_entry(IPMIBmcSim *ibs,
unsigned int val;
if (cmd[6]) {
- IPMI_CHECK_RESERVATION(2, ibs->sel.reservation);
+ if ((cmd[2] | (cmd[3] << 8)) != ibs->sel.reservation) {
+ rsp->buffer[2] = IPMI_CC_INVALID_RESERVATION;
+ return;
+ }
}
if (ibs->sel.next_free == 0) {
rsp->buffer[2] = IPMI_CC_REQ_ENTRY_NOT_PRESENT;
@@ -1387,7 +1388,11 @@ static void clear_sel(IPMIBmcSim *ibs,
uint8_t *cmd, unsigned int cmd_len,
RspBuffer *rsp)
{
- IPMI_CHECK_RESERVATION(2, ibs->sel.reservation);
+ if ((cmd[2] | (cmd[3] << 8)) != ibs->sel.reservation) {
+ rsp->buffer[2] = IPMI_CC_INVALID_RESERVATION;
+ return;
+ }
+
if (cmd[4] != 'C' || cmd[5] != 'L' || cmd[6] != 'R') {
rsp->buffer[2] = IPMI_CC_INVALID_DATA_FIELD;
return;
--
MST
- [Qemu-devel] [PULL 35/53] pc: acpi: cleanup qdev_get_machine() calls, (continued)
- [Qemu-devel] [PULL 35/53] pc: acpi: cleanup qdev_get_machine() calls, Michael S. Tsirkin, 2016/03/11
- [Qemu-devel] [PULL 36/53] pc: acpi: SRAT: create only valid processor lapic entries, Michael S. Tsirkin, 2016/03/11
- [Qemu-devel] [PULL 38/53] pc: acpi: create Processor and Notify objects only for valid lapics, Michael S. Tsirkin, 2016/03/11
- [Qemu-devel] [PULL 37/53] pc: acpi: create MADT.lapic entries only for valid lapics, Michael S. Tsirkin, 2016/03/11
- [Qemu-devel] [PULL 39/53] pc: acpi: drop cpu->found_cpus bitmap, Michael S. Tsirkin, 2016/03/11
- [Qemu-devel] [PULL 40/53] pc: acpi: clarify why possible LAPIC entries must be present in MADT, Michael S. Tsirkin, 2016/03/11
- [Qemu-devel] [PULL 41/53] MAINTAINERS: Add an entry for virtio header files, Michael S. Tsirkin, 2016/03/11
- [Qemu-devel] [PULL 42/53] MAINTAINERS: machine core, Michael S. Tsirkin, 2016/03/11
- [Qemu-devel] [PULL 43/53] ipmi: remove IPMI_CHECK_CMD_LEN() macro, Michael S. Tsirkin, 2016/03/11
- [Qemu-devel] [PULL 44/53] ipmi: replace IPMI_ADD_RSP_DATA() macro with inline helpers, Michael S. Tsirkin, 2016/03/11
- [Qemu-devel] [PULL 45/53] ipmi: remove IPMI_CHECK_RESERVATION() macro,
Michael S. Tsirkin <=
- [Qemu-devel] [PULL 46/53] ipmi: add rsp_buffer_set_error() helper, Michael S. Tsirkin, 2016/03/11
- [Qemu-devel] [PULL 48/53] ipmi: use a function to initialize the SDR table, Michael S. Tsirkin, 2016/03/11
- [Qemu-devel] [PULL 47/53] ipmi: add a realize function to the device class, Michael S. Tsirkin, 2016/03/11
- [Qemu-devel] [PULL 49/53] ipmi: remove the need of an ending record in the SDR table, Michael S. Tsirkin, 2016/03/11
- [Qemu-devel] [PULL 50/53] ipmi: add some local variables in ipmi_sdr_init, Michael S. Tsirkin, 2016/03/11
- [Qemu-devel] [PULL 51/53] ipmi: use a file to load SDRs, Michael S. Tsirkin, 2016/03/11
- [Qemu-devel] [PULL 52/53] ipmi: provide support for FRUs, Michael S. Tsirkin, 2016/03/11
- [Qemu-devel] [PULL 53/53] fw-cfg: support writeable blobs, Michael S. Tsirkin, 2016/03/11
- Re: [Qemu-devel] [PULL 00/53] vhost, virtio, pci, pc, acpi, Peter Maydell, 2016/03/14