GitHub user DaanHoogland opened a pull request:
https://github.com/apache/cloudstack/pull/1141
libvirt fix forward merge
@remibergsma @karuturi can you check
You can merge this pull request into a Git repository by running:
$ git pull https://github.com/DaanHoogland/cloudstack master
Alternatively you can review and apply these changes as the patch at:
https://github.com/apache/cloudstack/pull/1141.patch
To close this pull request, make a commit to your master/trunk branch
with (at least) the following in the commit message:
This closes #1141
----
commit 12c395b56052af36901ab3ed1a366ed8985740eb
Author: Rohit Yadav <[email protected]>
Date: 2015-11-25T09:07:40Z
CLOUDSTACK-9083: Add disk serial to kvm virt xml
Adds disk serial ids based on volume uuids to the virt xml. This may be
useful
for appliances/software that needs some serial ids on the VM disks. This
does not
impact existing/running VMs, the vm virt xmls will be updates for running
VMs
the next time they are stopped/started.
For testing, disk serial (of debian based systemvm) in the virt xml matched
that
in /sys/devices/pci0000:00:0000:00:07.0/virtio4/block/vda/serial.
We currently don't support scsi-blcok devices for which serial is not
supported,
for this we've added a DeviceType (LUN) which may be used in future and a
check
to not add the serial to the xml if disk type is LUN.
Refer: https://libvirt.org/formatdomain.html#elementsDisks
Signed-off-by: Rohit Yadav <[email protected]>
commit 7dcc6540e76db06fe51e8f33803260762ffaa826
Author: Rohit Yadav <[email protected]>
Date: 2015-11-30T09:40:31Z
Merge pull request #1121 from shapeblue/4.6-cloudstack-9083
[4.6] CLOUDSTACK-9083: Add disk serial to kvm virt xmlAdds disk serial ids
based on volume uuids to the virt xml. This may be useful
for appliances/software that needs some serial ids on the VM disks. This
does not
impact existing/running VMs, the vm virt xmls will be updates for running
VMs
the next time they are stopped/started.
For testing, disk serial (of debian based systemvm) in the virt xml matched
that
in /sys/devices/pci0000:00:0000:00:07.0/virtio4/block/vda/serial.
We currently don't support scsi-blcok devices for which serial is not
supported,
for this we've added a DeviceType (LUN) which may be used in future and a
check
to not add the serial to the xml if disk type is LUN.
Refer: https://libvirt.org/formatdomain.html#elementsDisks
* pr/1121:
CLOUDSTACK-9083: Add disk serial to kvm virt xml
Signed-off-by: Rohit Yadav <[email protected]>
commit f29d8caac8fd1bdf28b4eeed50b804194daef17c
Author: Daan Hoogland <[email protected]>
Date: 2015-11-30T09:49:08Z
Merge release branch 4.6 to master
* 4.6:
CLOUDSTACK-9083: Add disk serial to kvm virt xml
----
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at [email protected] or file a JIRA ticket
with INFRA.
---
