qemu: Build command line for the new address format
For any disk controller model which is not "lsilogic", the command
line will be like:
-drive file=/dev/sda,if=none,id=drive-scsi0-0-3-0,format=raw \
-device scsi-disk,bus=scsi0.0,channel=0,scsi-id=3,lun=0,i\
drive=drive-scsi0-0-3-0,id=scsi0-0-3-0
The relationship between the libvirt address attrs and the qdev
properties are (controller model is not "lsilogic"; strings
inside <> represent libvirt adress attrs):
bus=scsi<controller>.0
channel=<bus>
scsi-id=<target>
lun=<unit>
* src/qemu/qemu_command.h: (New param "virDomainDefPtr def"
for function qemuBuildDriveDevStr; new param "virDomainDefPtr
vmdef" for function qemuAssignDeviceDiskAlias. Both for
virDomainDiskFindControllerModel's use).
* src/qemu/qemu_command.c:
- New param "virDomainDefPtr def" for qemuAssignDeviceDiskAliasCustom.
For virDomainDiskFindControllerModel's use, if the disk bus is "scsi"
and the controller model is not "lsilogic", "target" is one part of
the alias name.
- According change on qemuAssignDeviceDiskAlias and qemuBuildDriveDevStr
* src/qemu/qemu_hotplug.c:
- Changes to be consistent with declarations of qemuAssignDeviceDiskAlias
qemuBuildDriveDevStr, and qemuBuildControllerDevStr.
* tests/qemuxml2argvdata/qemuxml2argv-pseries-vio-user-assigned.args,
tests/qemuxml2argvdata/qemuxml2argv-pseries-vio.args: Update the
generated command line.
2012-02-28 03:39:43 +00:00
|
|
|
LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu-system-ppc64 \
|
|
|
|
|
-S -M pseries -m 512 -smp 1 -nographic -nodefconfig -nodefaults \
|
|
|
|
|
-chardev socket,id=charmonitor,path=/tmp/test-monitor,server,nowait \
|
|
|
|
|
-mon chardev=charmonitor,id=monitor,mode=readline -no-acpi -boot c \
|
|
|
|
|
-device spapr-vscsi,id=scsi0,reg=0x2000 \
|
|
|
|
|
-device spapr-vscsi,id=scsi1,reg=0x30000000 \
|
|
|
|
|
-drive file=/tmp/scsidisk.img,if=none,id=drive-scsi1-0-0-0 \
|
|
|
|
|
-device scsi-disk,bus=scsi1.0,channel=0,scsi-id=0,lun=0,drive=drive-scsi1-0-0-0,id=scsi1-0-0-0 \
|
|
|
|
|
-chardev pty,id=charserial0 \
|
|
|
|
|
-device spapr-vty,chardev=charserial0,reg=0x20000000 \
|
|
|
|
|
-chardev pty,id=charserial1 \
|
|
|
|
|
-device spapr-vty,chardev=charserial1,reg=0x30001000 -usb
|