diff mbox

[v2,03/10] ipmi: remove IPMI_CHECK_RESERVATION() macro

Message ID 1456913698-11452-4-git-send-email-clg@fr.ibm.com (mailing list archive)
State New, archived
Headers show

Commit Message

Cédric Le Goater March 2, 2016, 10:14 a.m. UTC 
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 <clg@fr.ibm.com>
---
 hw/ipmi/ipmi_bmc_sim.c | 33 +++++++++++++++++++--------------
 1 file changed, 19 insertions(+), 14 deletions(-)

Comments

Corey Minyard March 2, 2016, 3:40 p.m. UTC | #1 
On 03/02/2016 04:14 AM, Cédric Le Goater wrote:
> 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 <clg@fr.ibm.com>

Acked-by: Corey Minyard <cminyard@mvista.com>

> ---
>   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 32efb87c8232..72166a7da291 100644
> --- a/hw/ipmi/ipmi_bmc_sim.c
> +++ b/hw/ipmi/ipmi_bmc_sim.c
> @@ -293,16 +293,6 @@ static inline void rsp_buffer_pushmore(struct rsp_buffer *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)
> @@ -1210,8 +1200,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)) {
> @@ -1260,7 +1254,11 @@ static void clear_sdr_rep(IPMIBmcSim *ibs,
>                             uint8_t *cmd, unsigned int cmd_len,
>                             struct rsp_buffer *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;
> @@ -1316,7 +1314,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;
> @@ -1371,7 +1372,11 @@ static void clear_sel(IPMIBmcSim *ibs,
>                         uint8_t *cmd, unsigned int cmd_len,
>                         struct rsp_buffer *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;
diff mbox

Patch

diff --git a/hw/ipmi/ipmi_bmc_sim.c b/hw/ipmi/ipmi_bmc_sim.c
index 32efb87c8232..72166a7da291 100644
--- a/hw/ipmi/ipmi_bmc_sim.c
+++ b/hw/ipmi/ipmi_bmc_sim.c
@@ -293,16 +293,6 @@  static inline void rsp_buffer_pushmore(struct rsp_buffer *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)
@@ -1210,8 +1200,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)) {
@@ -1260,7 +1254,11 @@  static void clear_sdr_rep(IPMIBmcSim *ibs,
                           uint8_t *cmd, unsigned int cmd_len,
                           struct rsp_buffer *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;
@@ -1316,7 +1314,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;
@@ -1371,7 +1372,11 @@  static void clear_sel(IPMIBmcSim *ibs,
                       uint8_t *cmd, unsigned int cmd_len,
                       struct rsp_buffer *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;