mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2025-01-21 20:15:17 +00:00
qemu: command: align disk serial check to schema
Disk serial schema has extra '.+' allowed characters in comparison with check in code. Looks like there is no reason for that as qemu allows any character AFAIK for serial. This discrepancy is originated in commit id '85d15b51' where the ability to add serial was added. Alter the disk-serial test to add a disk with all the possible characters listed as the serial value.
This commit is contained in:
parent
dc4c2f75ab
commit
cc6d43bb49
@ -475,7 +475,7 @@ qemuBuildIoEventFdStr(virBufferPtr buf,
|
||||
}
|
||||
|
||||
#define QEMU_SERIAL_PARAM_ACCEPTED_CHARS \
|
||||
"abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-_ "
|
||||
"abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-_ .+"
|
||||
|
||||
static int
|
||||
qemuSafeSerialParamValue(const char *value)
|
||||
|
@ -22,4 +22,7 @@ server,nowait \
|
||||
-drive 'file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-1,\
|
||||
serial=\ \ WD-WMAP9A966149' \
|
||||
-device ide-drive,bus=ide.0,unit=1,drive=drive-ide0-0-1,id=ide0-0-1 \
|
||||
-drive 'file=/dev/HostVG/AllSerialChars,format=raw,if=none,id=drive-ide0-0-2,\
|
||||
serial=abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-_\ .+' \
|
||||
-device ide-drive,bus=ide.0,unit=2,drive=drive-ide0-0-2,id=ide0-0-2 \
|
||||
-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
|
||||
|
@ -20,6 +20,12 @@
|
||||
<serial> WD-WMAP9A966149</serial>
|
||||
<address type='drive' controller='0' bus='0' target='0' unit='1'/>
|
||||
</disk>
|
||||
<disk type='block' device='disk'>
|
||||
<source dev='/dev/HostVG/AllSerialChars'/>
|
||||
<target dev='hdb' bus='ide'/>
|
||||
<serial>abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-_ .+</serial>
|
||||
<address type='drive' controller='0' bus='0' target='0' unit='2'/>
|
||||
</disk>
|
||||
<controller type='usb' index='0'/>
|
||||
<controller type='ide' index='0'/>
|
||||
<memballoon model='virtio'/>
|
||||
|
Loading…
x
Reference in New Issue
Block a user