[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-block] [Qemu-devel] [PATCH] hw/block/nvme: Simplify if-stateme
From: |
Peter Maydell |
Subject: |
Re: [Qemu-block] [Qemu-devel] [PATCH] hw/block/nvme: Simplify if-statements a little bit |
Date: |
Wed, 12 Oct 2016 16:27:35 +0100 |
On 12 October 2016 at 16:18, Thomas Huth <address@hidden> wrote:
> The condition '!A || (A && B)' is equivalent to '!A || B'.
>
> Buglink: https://bugs.launchpad.net/qemu/+bug/1464611
> Signed-off-by: Thomas Huth <address@hidden>
> ---
> hw/block/nvme.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/hw/block/nvme.c b/hw/block/nvme.c
> index cef3bb4..53d9d2e 100644
> --- a/hw/block/nvme.c
> +++ b/hw/block/nvme.c
> @@ -373,7 +373,7 @@ static uint16_t nvme_create_sq(NvmeCtrl *n, NvmeCmd *cmd)
> if (!cqid || nvme_check_cqid(n, cqid)) {
> return NVME_INVALID_CQID | NVME_DNR;
> }
> - if (!sqid || (sqid && !nvme_check_sqid(n, sqid))) {
> + if (!sqid || !nvme_check_sqid(n, sqid)) {
> return NVME_INVALID_QID | NVME_DNR;
> }
> if (!qsize || qsize > NVME_CAP_MQES(n->bar.cap)) {
> @@ -447,7 +447,7 @@ static uint16_t nvme_create_cq(NvmeCtrl *n, NvmeCmd *cmd)
> uint16_t qflags = le16_to_cpu(c->cq_flags);
> uint64_t prp1 = le64_to_cpu(c->prp1);
>
> - if (!cqid || (cqid && !nvme_check_cqid(n, cqid))) {
> + if (!cqid || !nvme_check_cqid(n, cqid)) {
> return NVME_INVALID_CQID | NVME_DNR;
> }
> if (!qsize || qsize > NVME_CAP_MQES(n->bar.cap)) {
Reviewed-by: Peter Maydell <address@hidden>
thanks
-- PMM