From nobody Thu May 15 09:47:10 2025 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.zohomail.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 1511198785064930.4986128929972; Mon, 20 Nov 2017 09:26:25 -0800 (PST) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 43DBA231; Mon, 20 Nov 2017 17:26:23 +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 1DD6F60C89; Mon, 20 Nov 2017 17:26:23 +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 74F6E1802127; Mon, 20 Nov 2017 17:26:22 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id vAKHQBXb024879 for ; Mon, 20 Nov 2017 12:26:11 -0500 Received: by smtp.corp.redhat.com (Postfix) id 5D9E8600CC; Mon, 20 Nov 2017 17:26:11 +0000 (UTC) Received: from angien.brq.redhat.com (unknown [10.43.2.136]) by smtp.corp.redhat.com (Postfix) with ESMTP id 9A09B6A823; Mon, 20 Nov 2017 17:26:07 +0000 (UTC) From: Peter Krempa To: libvir-list@redhat.com Date: Mon, 20 Nov 2017 18:25:26 +0100 Message-Id: <640433b28b381631d3f70e06561dbbbc4878d25c.1511198532.git.pkrempa@redhat.com> In-Reply-To: References: In-Reply-To: References: X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-loop: libvir-list@redhat.com Cc: Peter Krempa Subject: [libvirt] [PATCH 09/12] qemu: command: Move formatting of disk io error policy from -drive 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.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.25]); Mon, 20 Nov 2017 17:26:24 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" That's a disk frontend attribute. Move the code to a separate function since it's non-trivial and call it from the frontend attribute formatter. --- src/qemu/qemu_command.c | 62 +++++++++++++-----= ---- ...uxml2argv-disk-drive-error-policy-enospace.args | 5 +- .../qemuxml2argv-disk-drive-error-policy-stop.args | 5 +- ...gv-disk-drive-error-policy-wreport-rignore.args | 5 +- 4 files changed, 46 insertions(+), 31 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 6ae738020d..03a2e6855a 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -1649,6 +1649,41 @@ qemuBuildDiskThrottling(virDomainDiskDefPtr disk, } +static void +qemuBuildDiskFrontendAttributeErrorPolicy(virDomainDiskDefPtr disk, + virQEMUCapsPtr qemuCaps, + virBufferPtr buf) +{ + const char *wpolicy =3D NULL; + const char *rpolicy =3D NULL; + + if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_MONITOR_JSON)) + return; + + if (disk->error_policy) + wpolicy =3D virDomainDiskErrorPolicyTypeToString(disk->error_polic= y); + + if (disk->rerror_policy) + rpolicy =3D virDomainDiskErrorPolicyTypeToString(disk->rerror_poli= cy); + + if (disk->error_policy =3D=3D VIR_DOMAIN_DISK_ERROR_POLICY_ENOSPACE) { + /* in the case of enospace, the option is spelled + * differently in qemu, and it's only valid for werror, + * not for rerror, so leave rerror NULL. + */ + wpolicy =3D "enospc"; + } else if (!rpolicy) { + /* for other policies, rpolicy can match wpolicy */ + rpolicy =3D wpolicy; + } + + if (wpolicy) + virBufferAsprintf(buf, ",werror=3D%s", wpolicy); + if (rpolicy) + virBufferAsprintf(buf, ",rerror=3D%s", rpolicy); +} + + static void qemuBuildDiskFrontendAttributes(virDomainDiskDefPtr disk, virQEMUCapsPtr qemuCaps, @@ -1673,6 +1708,8 @@ qemuBuildDiskFrontendAttributes(virDomainDiskDefPtr d= isk, virBufferAddLit(buf, ",serial=3D"); virBufferEscape(buf, '\\', " ", "%s", disk->serial); } + + qemuBuildDiskFrontendAttributeErrorPolicy(disk, qemuCaps, buf); } @@ -1771,31 +1808,6 @@ qemuBuildDriveStr(virDomainDiskDefPtr disk, virDomainDiskDetectZeroesTypeToString(detect_zer= oes)); } - if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_MONITOR_JSON)) { - const char *wpolicy =3D NULL, *rpolicy =3D NULL; - - if (disk->error_policy) - wpolicy =3D virDomainDiskErrorPolicyTypeToString(disk->error_p= olicy); - if (disk->rerror_policy) - rpolicy =3D virDomainDiskErrorPolicyTypeToString(disk->rerror_= policy); - - if (disk->error_policy =3D=3D VIR_DOMAIN_DISK_ERROR_POLICY_ENOSPAC= E) { - /* in the case of enospace, the option is spelled - * differently in qemu, and it's only valid for werror, - * not for rerror, so leave rerror NULL. - */ - wpolicy =3D "enospc"; - } else if (!rpolicy) { - /* for other policies, rpolicy can match wpolicy */ - rpolicy =3D wpolicy; - } - - if (wpolicy) - virBufferAsprintf(&opt, ",werror=3D%s", wpolicy); - if (rpolicy) - virBufferAsprintf(&opt, ",rerror=3D%s", rpolicy); - } - if (disk->iomode) { virBufferAsprintf(&opt, ",aio=3D%s", virDomainDiskIoTypeToString(disk->iomode)); diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-error-policy-en= ospace.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-error-policy-e= nospace.args index 704a571dd3..80422a8c88 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-error-policy-enospace.= args +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-error-policy-enospace.= args @@ -20,8 +20,9 @@ server,nowait \ -boot c \ -usb \ -drive file=3D/dev/HostVG/QEMUGuest1,format=3Dqcow2,if=3Dnone,id=3Ddrive-i= de0-0-0,\ -cache=3Dnone,werror=3Denospc \ --device ide-drive,bus=3Dide.0,unit=3D0,drive=3Ddrive-ide0-0-0,id=3Dide0-0-= 0 \ +cache=3Dnone \ +-device ide-drive,bus=3Dide.0,unit=3D0,drive=3Ddrive-ide0-0-0,id=3Dide0-0-= 0,\ +werror=3Denospc \ -drive file=3D/dev/HostVG/QEMUGuest2,format=3Draw,if=3Dnone,id=3Ddrive-ide= 0-1-0,\ media=3Dcdrom,readonly=3Don \ -device ide-drive,bus=3Dide.1,unit=3D0,drive=3Ddrive-ide0-1-0,id=3Dide0-1-0 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-error-policy-st= op.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-error-policy-stop.= args index 2e87d727fb..bcac9f2a8e 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-error-policy-stop.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-error-policy-stop.args @@ -20,8 +20,9 @@ server,nowait \ -boot c \ -usb \ -drive file=3D/dev/HostVG/QEMUGuest1,format=3Dqcow2,if=3Dnone,id=3Ddrive-i= de0-0-0,\ -cache=3Dnone,werror=3Dstop,rerror=3Dstop \ --device ide-drive,bus=3Dide.0,unit=3D0,drive=3Ddrive-ide0-0-0,id=3Dide0-0-= 0 \ +cache=3Dnone \ +-device ide-drive,bus=3Dide.0,unit=3D0,drive=3Ddrive-ide0-0-0,id=3Dide0-0-= 0,\ +werror=3Dstop,rerror=3Dstop \ -drive file=3D/dev/HostVG/QEMUGuest2,format=3Draw,if=3Dnone,id=3Ddrive-ide= 0-1-0,\ media=3Dcdrom,readonly=3Don \ -device ide-drive,bus=3Dide.1,unit=3D0,drive=3Ddrive-ide0-1-0,id=3Dide0-1-0 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-error-policy-wr= eport-rignore.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-error-p= olicy-wreport-rignore.args index d3a9ec45eb..f558477230 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-error-policy-wreport-r= ignore.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-error-policy-wreport-r= ignore.args @@ -20,8 +20,9 @@ server,nowait \ -boot c \ -usb \ -drive file=3D/dev/HostVG/QEMUGuest1,format=3Dqcow2,if=3Dnone,id=3Ddrive-i= de0-0-0,\ -cache=3Dnone,werror=3Dreport,rerror=3Dignore \ --device ide-drive,bus=3Dide.0,unit=3D0,drive=3Ddrive-ide0-0-0,id=3Dide0-0-= 0 \ +cache=3Dnone \ +-device ide-drive,bus=3Dide.0,unit=3D0,drive=3Ddrive-ide0-0-0,id=3Dide0-0-= 0,\ +werror=3Dreport,rerror=3Dignore \ -drive file=3D/dev/HostVG/QEMUGuest2,format=3Draw,if=3Dnone,id=3Ddrive-ide= 0-1-0,\ media=3Dcdrom,readonly=3Don \ -device ide-drive,bus=3Dide.1,unit=3D0,drive=3Ddrive-ide0-1-0,id=3Dide0-1-0 --=20 2.14.3 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list