From nobody Mon Nov 25 16:55:01 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) client-ip=63.128.21.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1600868107; cv=none; d=zohomail.com; s=zohoarc; b=f43csaVwe58Zdv7LP/zGLgyec1QDdi+ZHUJrJSZOyQjzE4XJM9d6m3HWEyzH20D1GdvLV4rmTzeLjPWlHh7yX6aj9CPUAhdv8Tcrrlk7W+MRvi6J1spu/z98ofZM3LY+iBUzGNkqllOtlDOecws+5WzYAp0k3ghHxAU6vJ45bxg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1600868107; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=sxGnnUEw1pislmJCMufLCMR7v0vLkNoXhBin1dQ0Bnc=; b=apaH1D6B+8++JOiWnkZVnx99EJJYG2Yo0IAzOodjwfnQxFKUlReFWpZikH7Kws1TM1XilEfB1DFxrya/+mUHdr7XZ0uBe4p3fskn/RPNu6B/q6y8u4WjlO86C/uQDMX2sWL9uARIDpFjpH+J+uS5ED7bDyciYzMhkUfltOZ4qe8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [63.128.21.124]) by mx.zohomail.com with SMTPS id 1600868107056987.5497324254742; Wed, 23 Sep 2020 06:35:07 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-168-OPrGh5x3O5eCC_cm6ewU_g-1; Wed, 23 Sep 2020 09:34:10 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 72096801AF2; Wed, 23 Sep 2020 13:34:03 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 492B9100239F; Wed, 23 Sep 2020 13:34:03 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 141E28C7D5; Wed, 23 Sep 2020 13:34:03 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 08NDXrsR013871 for ; Wed, 23 Sep 2020 09:33:53 -0400 Received: by smtp.corp.redhat.com (Postfix) id 2AECE10021AA; Wed, 23 Sep 2020 13:33:53 +0000 (UTC) Received: from speedmetal.redhat.com (unknown [10.40.208.55]) by smtp.corp.redhat.com (Postfix) with ESMTP id 859D310027A5 for ; Wed, 23 Sep 2020 13:33:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1600868105; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=sxGnnUEw1pislmJCMufLCMR7v0vLkNoXhBin1dQ0Bnc=; b=ZH7b3skexM+zGRCjXOBCuEdmLNfWZfOugxrCniIpvCEBP7AfKcjLyyT4wF8xzYliNYwF6f q+RTGD7Zv3Ue3RsPzHwixvKJ4VHpbT2eSVH8+zHEqiqQB3+f6Nyh2Qrfaz/jm8C2L3prKi V+pwKQPUCx2t8NuQrkyCsByuaLAOHwA= X-MC-Unique: OPrGh5x3O5eCC_cm6ewU_g-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 03/13] qemuDomainBlockRebase: Replace ternary operator with if/else Date: Wed, 23 Sep 2020 15:33:34 +0200 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-loop: libvir-list@redhat.com X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Signed-off-by: Peter Krempa Reviewed-by: J=C3=A1n Tomko --- src/qemu/qemu_driver.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 9b5ff3a65c..40d11aced6 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -15292,8 +15292,10 @@ qemuDomainBlockRebase(virDomainPtr dom, const char= *path, const char *base, /* If we got here, we are doing a block copy rebase. */ dest =3D virStorageSourceNew(); - dest->type =3D (flags & VIR_DOMAIN_BLOCK_REBASE_COPY_DEV) ? - VIR_STORAGE_TYPE_BLOCK : VIR_STORAGE_TYPE_FILE; + if (flags & VIR_DOMAIN_BLOCK_REBASE_COPY_DEV) + dest->type =3D VIR_STORAGE_TYPE_BLOCK; + else + dest->type =3D VIR_STORAGE_TYPE_FILE; dest->path =3D g_strdup(base); if (flags & VIR_DOMAIN_BLOCK_REBASE_COPY_RAW) dest->format =3D VIR_STORAGE_FILE_RAW; --=20 2.26.2