On 04/17/2013 07:23 AM, Osier Yang wrote:
The recent qemu requires "0x" prefix for the disk wwn, this
patch
changes virValidateWWN to allow the prefix, and prepend "0x" if
it's not specified. E.g.
qemu-kvm: -device scsi-hd,bus=scsi0.0,channel=0,scsi-id=0,lun=0,\
drive=drive-scsi0-0-0-0,id=scsi0-0-0-0,wwn=6000c60016ea71ad:
Property 'scsi-hd.wwn' doesn't take value '6000c60016ea71ad'
---
docs/schemas/basictypes.rng | 2 +-
src/qemu/qemu_command.c | 8 ++++++--
src/util/virutil.c | 12 +++++++++---
tests/qemuxml2argvdata/qemuxml2argv-disk-ide-wwn.args | 2 +-
tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-disk-wwn.args | 4 ++--
tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-disk-wwn.xml | 2 +-
6 files changed, 20 insertions(+), 10 deletions(-)
ACK.
--
Eric Blake eblake redhat com +1-919-301-3266
Libvirt virtualization library
http://libvirt.org