From nobody Sun Feb 8 18:10:41 2026 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 1516291588433476.69946619455027; Thu, 18 Jan 2018 08:06:28 -0800 (PST) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 92DD0C05972A; Thu, 18 Jan 2018 16:06:26 +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 45D7A18AC3; Thu, 18 Jan 2018 16:06:15 +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 9B62218033EE; Thu, 18 Jan 2018 16:06:15 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w0IG5W1Z023768 for ; Thu, 18 Jan 2018 11:05:32 -0500 Received: by smtp.corp.redhat.com (Postfix) id 01F324A8; Thu, 18 Jan 2018 16:05:32 +0000 (UTC) Received: from moe.brq.redhat.com (unknown [10.43.2.192]) by smtp.corp.redhat.com (Postfix) with ESMTP id 59D2A51893; Thu, 18 Jan 2018 16:05:29 +0000 (UTC) From: Michal Privoznik To: libvir-list@redhat.com Date: Thu, 18 Jan 2018 17:04:39 +0100 Message-Id: In-Reply-To: References: In-Reply-To: References: X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-loop: libvir-list@redhat.com Cc: pbonzini@redhat.com Subject: [libvirt] [PATCH 07/14] qemu: Generate cmd line at startup 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.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.32]); Thu, 18 Jan 2018 16:06:27 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" This is the easier part. All we need to do here is put -object pr-manger-helper,id=3D$alias,path=3D$socketPath and then just reference the object in -drive file.pr-manger=3D$alias. Signed-off-by: Michal Privoznik --- src/qemu/qemu_command.c | 59 ++++++++++++++++++= ++++ .../disk-virtio-scsi-reservations-not-managed.args | 28 ++++++++++ .../disk-virtio-scsi-reservations.args | 29 +++++++++++ tests/qemuxml2argvtest.c | 8 +++ 4 files changed, 124 insertions(+) create mode 100644 tests/qemuxml2argvdata/disk-virtio-scsi-reservations-no= t-managed.args create mode 100644 tests/qemuxml2argvdata/disk-virtio-scsi-reservations.ar= gs diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index b8aede32d..13f2e4fd0 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -1515,6 +1515,20 @@ qemuDiskSourceGetProps(virStorageSourcePtr src) } =20 =20 +static void +qemuBuildDriveSourcePR(virBufferPtr buf, + virStorageSourcePtr src) +{ + qemuDomainStorageSourcePrivatePtr srcPriv =3D QEMU_DOMAIN_STORAGE_SOUR= CE_PRIVATE(src); + + if (!src->pr || + src->pr->enabled !=3D VIR_TRISTATE_BOOL_YES) + return; + + virBufferAsprintf(buf, ",file.pr-manager=3D%s", srcPriv->prAlias); +} + + static int qemuBuildDriveSourceStr(virDomainDiskDefPtr disk, virQEMUCapsPtr qemuCaps, @@ -1591,6 +1605,8 @@ qemuBuildDriveSourceStr(virDomainDiskDefPtr disk, =20 if (disk->src->debug) virBufferAsprintf(buf, ",file.debug=3D%d", disk->src->debugLev= el); + + qemuBuildDriveSourcePR(buf, disk->src); } else { if (!(source =3D virQEMUBuildDriveCommandlineFromJSON(srcprops))) goto cleanup; @@ -10033,6 +10049,46 @@ qemuBuildPanicCommandLine(virCommandPtr cmd, } =20 =20 +struct qemuBuildMasterPRCommandLineData { + virCommandPtr cmd; +}; + + +static int +qemuBuildMasterPRCommandLineHelper(void *payload, + const void *name, + void *opaque) +{ + qemuDomainDiskPRObjectPtr obj =3D payload; + struct qemuBuildMasterPRCommandLineData *data =3D opaque; + virBuffer buf =3D VIR_BUFFER_INITIALIZER; + const char *alias =3D name; + + virBufferAsprintf(&buf, "pr-manager-helper,id=3D%s,path=3D%s", alias, = obj->path); + virCommandAddArg(data->cmd, "-object"); + virCommandAddArgBuffer(data->cmd, &buf); + return 0; +} + + +static int +qemuBuildMasterPRCommandLine(virCommandPtr cmd, + qemuDomainObjPrivatePtr priv) +{ + struct qemuBuildMasterPRCommandLineData data =3D {.cmd =3D cmd }; + int ret =3D -1; + + if (priv->prHelpers && + virHashForEach(priv->prHelpers, + qemuBuildMasterPRCommandLineHelper, &data) < 0) + goto cleanup; + + ret =3D 0; + cleanup: + return ret; +} + + /** * qemuBuildCommandLineValidate: * @@ -10185,6 +10241,9 @@ qemuBuildCommandLine(virQEMUDriverPtr driver, if (qemuBuildMasterKeyCommandLine(cmd, priv) < 0) goto error; =20 + if (qemuBuildMasterPRCommandLine(cmd, priv) < 0) + goto error; + if (enableFips) virCommandAddArg(cmd, "-enable-fips"); =20 diff --git a/tests/qemuxml2argvdata/disk-virtio-scsi-reservations-not-manag= ed.args b/tests/qemuxml2argvdata/disk-virtio-scsi-reservations-not-managed.= args new file mode 100644 index 000000000..387432c18 --- /dev/null +++ b/tests/qemuxml2argvdata/disk-virtio-scsi-reservations-not-managed.args @@ -0,0 +1,28 @@ +LC_ALL=3DC \ +PATH=3D/bin \ +HOME=3D/home/test \ +USER=3Dtest \ +LOGNAME=3Dtest \ +QEMU_AUDIO_DRV=3Dnone \ +/usr/bin/qemu-system-i686 \ +-name QEMUGuest1 \ +-S \ +-object pr-manager-helper,id=3Dpr-helper-sdb,path=3D/path/to/qemu-pr-helpe= r.sock \ +-M pc \ +-m 214 \ +-smp 8,sockets=3D8,cores=3D1,threads=3D1 \ +-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ +-nographic \ +-nodefaults \ +-chardev socket,id=3Dcharmonitor,path=3D/tmp/lib/domain--1-QEMUGuest1/moni= tor.sock,\ +server,nowait \ +-mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dreadline \ +-no-acpi \ +-boot c \ +-device virtio-scsi-pci,id=3Dscsi0,num_queues=3D8,bus=3Dpci.0,addr=3D0x3 \ +-usb \ +-drive file=3D/dev/HostVG/QEMUGuest1,file.pr-manager=3Dpr-helper-sdb,forma= t=3Draw,\ +if=3Dnone,id=3Ddrive-scsi0-0-0-0,boot=3Don \ +-device scsi-block,bus=3Dscsi0.0,channel=3D0,scsi-id=3D0,lun=3D0,\ +drive=3Ddrive-scsi0-0-0-0,id=3Dscsi0-0-0-0 \ +-device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x4 diff --git a/tests/qemuxml2argvdata/disk-virtio-scsi-reservations.args b/te= sts/qemuxml2argvdata/disk-virtio-scsi-reservations.args new file mode 100644 index 000000000..2dc53cf05 --- /dev/null +++ b/tests/qemuxml2argvdata/disk-virtio-scsi-reservations.args @@ -0,0 +1,29 @@ +LC_ALL=3DC \ +PATH=3D/bin \ +HOME=3D/home/test \ +USER=3Dtest \ +LOGNAME=3Dtest \ +QEMU_AUDIO_DRV=3Dnone \ +/usr/bin/qemu-system-i686 \ +-name QEMUGuest1 \ +-S \ +-object pr-manager-helper,id=3Dpr-helper0,\ +path=3D/tmp/lib/domain--1-QEMUGuest1/pr-helper0.sock \ +-M pc \ +-m 214 \ +-smp 8,sockets=3D8,cores=3D1,threads=3D1 \ +-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ +-nographic \ +-nodefaults \ +-chardev socket,id=3Dcharmonitor,path=3D/tmp/lib/domain--1-QEMUGuest1/moni= tor.sock,\ +server,nowait \ +-mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dreadline \ +-no-acpi \ +-boot c \ +-device virtio-scsi-pci,id=3Dscsi0,num_queues=3D8,bus=3Dpci.0,addr=3D0x3 \ +-usb \ +-drive file=3D/dev/HostVG/QEMUGuest1,file.pr-manager=3Dpr-helper0,format= =3Draw,\ +if=3Dnone,id=3Ddrive-scsi0-0-0-0,boot=3Don \ +-device scsi-block,bus=3Dscsi0.0,channel=3D0,scsi-id=3D0,lun=3D0,\ +drive=3Ddrive-scsi0-0-0-0,id=3Dscsi0-0-0-0 \ +-device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x4 diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index be32d891e..153098e8c 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -2959,6 +2959,14 @@ mymain(void) QEMU_CAPS_HDA_DUPLEX); DO_TEST("user-aliases2", QEMU_CAPS_DEVICE_IOH3420, QEMU_CAPS_ICH9_AHCI= ); =20 + DO_TEST("disk-virtio-scsi-reservations", + QEMU_CAPS_DRIVE_BOOT, QEMU_CAPS_VIRTIO_SCSI, + QEMU_CAPS_SCSI_BLOCK, QEMU_CAPS_PR_MANAGER_HELPER); + + DO_TEST("disk-virtio-scsi-reservations-not-managed", + QEMU_CAPS_DRIVE_BOOT, QEMU_CAPS_VIRTIO_SCSI, + QEMU_CAPS_SCSI_BLOCK, QEMU_CAPS_PR_MANAGER_HELPER); + if (getenv("LIBVIRT_SKIP_CLEANUP") =3D=3D NULL) virFileDeleteTree(fakerootdir); =20 --=20 2.13.6 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list