From nobody Mon Apr 29 05:00:37 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zoho.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1498112459457394.3684074392287; Wed, 21 Jun 2017 23:20:59 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id D20EC7DCE9; Thu, 22 Jun 2017 06:20:56 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 056AE5D964; Thu, 22 Jun 2017 06:20:56 +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 47CAC184383F; Thu, 22 Jun 2017 06:20:53 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id v5M6KpAP004169 for ; Thu, 22 Jun 2017 02:20:51 -0400 Received: by smtp.corp.redhat.com (Postfix) id C5F555D6AE; Thu, 22 Jun 2017 06:20:51 +0000 (UTC) Received: from inaba.usersys.redhat.com (ovpn-12-121.pek2.redhat.com [10.72.12.121]) by smtp.corp.redhat.com (Postfix) with ESMTPS id D509E61F26 for ; Thu, 22 Jun 2017 06:20:48 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com D20EC7DCE9 Authentication-Results: ext-mx03.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx03.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=libvir-list-bounces@redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com D20EC7DCE9 From: Andrea Bolognani To: libvir-list@redhat.com Date: Thu, 22 Jun 2017 14:20:43 +0800 Message-Id: <1498112443-8885-1-git-send-email-abologna@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH] qemu: Remove duplicated code in qemuBuildSerialChrDeviceStr() 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: , MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.27]); Thu, 22 Jun 2017 06:20:58 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" The call to qemuBuildDeviceAddressStr() happens no matter what, so we can move it outside of the switch. We can also move the call to virBufferAsprintf() closer to it to avoid having formatting - error checking - more formatting. Signed-off-by: Andrea Bolognani --- src/qemu/qemu_command.c | 20 +++++++------------- 1 file changed, 7 insertions(+), 13 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index c53ab97..9bb0163 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -10296,10 +10296,6 @@ qemuBuildSerialChrDeviceStr(char **deviceStr, goto error; } } else { - virBufferAsprintf(&cmd, "%s,chardev=3Dchar%s,id=3D%s", - virDomainChrSerialTargetTypeToString(serial->tar= getType), - serial->info.alias, serial->info.alias); - switch (serial->targetType) { case VIR_DOMAIN_CHR_SERIAL_TARGET_TYPE_USB: if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE_USB_SERIAL)) { @@ -10314,9 +10310,6 @@ qemuBuildSerialChrDeviceStr(char **deviceStr, _("usb-serial requires address of usb type"= )); goto error; } - - if (qemuBuildDeviceAddressStr(&cmd, def, &serial->info, qemuCa= ps) < 0) - goto error; break; =20 case VIR_DOMAIN_CHR_SERIAL_TARGET_TYPE_ISA: @@ -10326,9 +10319,6 @@ qemuBuildSerialChrDeviceStr(char **deviceStr, _("isa-serial requires address of isa type"= )); goto error; } - - if (qemuBuildDeviceAddressStr(&cmd, def, &serial->info, qemuCa= ps) < 0) - goto error; break; =20 case VIR_DOMAIN_CHR_SERIAL_TARGET_TYPE_PCI: @@ -10344,11 +10334,15 @@ qemuBuildSerialChrDeviceStr(char **deviceStr, _("pci-serial requires address of pci type"= )); goto error; } - - if (qemuBuildDeviceAddressStr(&cmd, def, &serial->info, qemuCa= ps) < 0) - goto error; break; } + + virBufferAsprintf(&cmd, "%s,chardev=3Dchar%s,id=3D%s", + virDomainChrSerialTargetTypeToString(serial->tar= getType), + serial->info.alias, serial->info.alias); + + if (qemuBuildDeviceAddressStr(&cmd, def, &serial->info, qemuCaps) = < 0) + goto error; } =20 if (virBufferCheckError(&cmd) < 0) --=20 2.7.5 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list