External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-03-07 17:28:15 +00:00
Code

qemuDomainPrepareHostdev: base hostdev secret object names on backend alias

Browse Source 
The secret object is used to pass data to the backend so it's better
fitting to base the secret object name on the SCSI host device backend
name.

Since we store the object alias in the status XML this modification is
safe in regards to existing guests.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
This commit is contained in:
Peter Krempa 2020-09-10 15:39:49 +02:00
parent ca495825a3
commit a669d68336
3 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/qemu/qemu_domain.c
View File

@ -10426,8 +10426,11 @@ qemuDomainPrepareHostdev(virDomainHostdevDefPtr hostdev,
}
if (src) {
const char *backendalias = hostdev->info->alias;
if (virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_BLOCKDEV_HOSTDEV_SCSI)) {
src->nodestorage = g_strdup_printf("libvirt-%s-backend", hostdev->info->alias);
backendalias = src->nodestorage;
}
if (src->auth) {
@ -10441,7 +10444,7 @@ qemuDomainPrepareHostdev(virDomainHostdevDefPtr hostdev,
&src->auth->seclookupdef);
} else {
srcPriv->secinfo = qemuDomainSecretAESSetupFromSecret(priv,
hostdev->info->alias,
backendalias,
NULL,
usageType,
src->auth->username,

8
tests/qemuxml2argvdata/hostdev-scsi-lsi.x86_64-latest.args
View File

@ -52,21 +52,21 @@ id=hostdev2 \
"node-name":"libvirt-hostdev3-backend","read-only":false}' \
-device scsi-generic,bus=scsi0.0,scsi-id=5,drive=libvirt-hostdev3-backend,\
id=hostdev3 \
-object secret,id=hostdev4-secret0,\
-object secret,id=libvirt-hostdev4-backend-secret0,\
data=9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1,\
keyid=masterKey0,iv=AAECAwQFBgcICQoLDA0ODw==,format=base64 \
-blockdev '{"driver":"iscsi","portal":"example.org:3260",\
"target":"iqn.1992-01.com.example:storage","lun":1,"transport":"tcp",\
"user":"myname","password-secret":"hostdev4-secret0",\
"user":"myname","password-secret":"libvirt-hostdev4-backend-secret0",\
"node-name":"libvirt-hostdev4-backend","read-only":false}' \
-device scsi-generic,bus=scsi0.0,scsi-id=3,drive=libvirt-hostdev4-backend,\
id=hostdev4 \
-object secret,id=hostdev5-secret0,\
-object secret,id=libvirt-hostdev5-backend-secret0,\
data=9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1,\
keyid=masterKey0,iv=AAECAwQFBgcICQoLDA0ODw==,format=base64 \
-blockdev '{"driver":"iscsi","portal":"example.org:3260",\
"target":"iqn.1992-01.com.example:storage","lun":2,"transport":"tcp",\
"user":"myname","password-secret":"hostdev5-secret0",\
"user":"myname","password-secret":"libvirt-hostdev5-backend-secret0",\
"node-name":"libvirt-hostdev5-backend","read-only":false}' \
-device scsi-generic,bus=scsi0.0,scsi-id=2,drive=libvirt-hostdev5-backend,\
id=hostdev5 \

8
tests/qemuxml2argvdata/hostdev-scsi-virtio-scsi.x86_64-latest.args
View File

@ -56,21 +56,21 @@ drive=libvirt-hostdev2-backend,id=hostdev2 \
"node-name":"libvirt-hostdev3-backend","read-only":false}' \
-device scsi-generic,bus=scsi0.0,channel=0,scsi-id=2,lun=5,\
drive=libvirt-hostdev3-backend,id=hostdev3 \
-object secret,id=hostdev4-secret0,\
-object secret,id=libvirt-hostdev4-backend-secret0,\
data=9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1,\
keyid=masterKey0,iv=AAECAwQFBgcICQoLDA0ODw==,format=base64 \
-blockdev '{"driver":"iscsi","portal":"example.org:3260",\
"target":"iqn.1992-01.com.example:storage","lun":1,"transport":"tcp",\
"user":"myname","password-secret":"hostdev4-secret0",\
"user":"myname","password-secret":"libvirt-hostdev4-backend-secret0",\
"node-name":"libvirt-hostdev4-backend","read-only":false}' \
-device scsi-generic,bus=scsi0.0,channel=0,scsi-id=3,lun=4,\
drive=libvirt-hostdev4-backend,id=hostdev4 \
-object secret,id=hostdev5-secret0,\
-object secret,id=libvirt-hostdev5-backend-secret0,\
data=9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1,\
keyid=masterKey0,iv=AAECAwQFBgcICQoLDA0ODw==,format=base64 \
-blockdev '{"driver":"iscsi","portal":"example.org:3260",\
"target":"iqn.1992-01.com.example:storage","lun":2,"transport":"tcp",\
"user":"myname","password-secret":"hostdev5-secret0",\
"user":"myname","password-secret":"libvirt-hostdev5-backend-secret0",\
"initiator-name":"iqn.2020-07.com.example:test",\
"node-name":"libvirt-hostdev5-backend","read-only":false}' \
-device scsi-generic,bus=scsi0.0,channel=0,scsi-id=3,lun=5,\