mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2024-12-22 17:34:18 +03:00
virsh domxml-from-native to treat SCSI as the bus type for pseries by default
The bus type IDE being enum Zero, the bus type on pseries system appears as IDE for all the -hda/-cdrom and for disk drives with if="none" type. Pseries platform needs this to appear as SCSI instead of IDE. The ide being not supported, the explicit requests for ide devices will return an error. Signed-off-by: Shivaprasad G Bhat <sbhat@linux.vnet.ibm.com>
This commit is contained in:
parent
f5580bd6d6
commit
ec1c34498b
@ -10032,6 +10032,7 @@ error:
|
||||
static virDomainDiskDefPtr
|
||||
qemuParseCommandLineDisk(virDomainXMLOptionPtr xmlopt,
|
||||
const char *val,
|
||||
virDomainDefPtr dom,
|
||||
int nvirtiodisk,
|
||||
bool old_style_ceph_args)
|
||||
{
|
||||
@ -10055,7 +10056,11 @@ qemuParseCommandLineDisk(virDomainXMLOptionPtr xmlopt,
|
||||
if (VIR_ALLOC(def) < 0)
|
||||
goto cleanup;
|
||||
|
||||
def->bus = VIR_DOMAIN_DISK_BUS_IDE;
|
||||
if (((dom->os.arch == VIR_ARCH_PPC64) &&
|
||||
dom->os.machine && STREQ(dom->os.machine, "pseries")))
|
||||
def->bus = VIR_DOMAIN_DISK_BUS_SCSI;
|
||||
else
|
||||
def->bus = VIR_DOMAIN_DISK_BUS_IDE;
|
||||
def->device = VIR_DOMAIN_DISK_DEVICE_DISK;
|
||||
def->type = VIR_DOMAIN_DISK_TYPE_FILE;
|
||||
|
||||
@ -10140,9 +10145,15 @@ qemuParseCommandLineDisk(virDomainXMLOptionPtr xmlopt,
|
||||
def->type = VIR_DOMAIN_DISK_TYPE_FILE;
|
||||
}
|
||||
} else if (STREQ(keywords[i], "if")) {
|
||||
if (STREQ(values[i], "ide"))
|
||||
if (STREQ(values[i], "ide")) {
|
||||
def->bus = VIR_DOMAIN_DISK_BUS_IDE;
|
||||
else if (STREQ(values[i], "scsi"))
|
||||
if (((dom->os.arch == VIR_ARCH_PPC64) &&
|
||||
dom->os.machine && STREQ(dom->os.machine, "pseries"))) {
|
||||
virReportError(VIR_ERR_INTERNAL_ERROR,
|
||||
_("pseries systems do not support ide devices '%s'"), val);
|
||||
goto error;
|
||||
}
|
||||
} else if (STREQ(values[i], "scsi"))
|
||||
def->bus = VIR_DOMAIN_DISK_BUS_SCSI;
|
||||
else if (STREQ(values[i], "virtio"))
|
||||
def->bus = VIR_DOMAIN_DISK_BUS_VIRTIO;
|
||||
@ -11368,6 +11379,9 @@ qemuParseCommandLine(virCapsPtr qemuCaps,
|
||||
disk->type = VIR_DOMAIN_DISK_TYPE_FILE;
|
||||
if (STREQ(arg, "-cdrom")) {
|
||||
disk->device = VIR_DOMAIN_DISK_DEVICE_CDROM;
|
||||
if (((def->os.arch == VIR_ARCH_PPC64) &&
|
||||
def->os.machine && STREQ(def->os.machine, "pseries")))
|
||||
disk->bus = VIR_DOMAIN_DISK_BUS_SCSI;
|
||||
if (VIR_STRDUP(disk->dst, "hdc") < 0)
|
||||
goto error;
|
||||
disk->readonly = true;
|
||||
@ -11381,6 +11395,9 @@ qemuParseCommandLine(virCapsPtr qemuCaps,
|
||||
disk->bus = VIR_DOMAIN_DISK_BUS_IDE;
|
||||
else
|
||||
disk->bus = VIR_DOMAIN_DISK_BUS_SCSI;
|
||||
if (((def->os.arch == VIR_ARCH_PPC64) &&
|
||||
def->os.machine && STREQ(def->os.machine, "pseries")))
|
||||
disk->bus = VIR_DOMAIN_DISK_BUS_SCSI;
|
||||
}
|
||||
if (VIR_STRDUP(disk->dst, arg + 1) < 0)
|
||||
goto error;
|
||||
@ -11672,7 +11689,7 @@ qemuParseCommandLine(virCapsPtr qemuCaps,
|
||||
}
|
||||
} else if (STREQ(arg, "-drive")) {
|
||||
WANT_VALUE();
|
||||
if (!(disk = qemuParseCommandLineDisk(xmlopt, val,
|
||||
if (!(disk = qemuParseCommandLineDisk(xmlopt, val, def,
|
||||
nvirtiodisk,
|
||||
ceph_args != NULL)))
|
||||
goto error;
|
||||
|
@ -249,6 +249,7 @@ mymain(void)
|
||||
DO_TEST("hyperv");
|
||||
|
||||
DO_TEST("pseries-nvram");
|
||||
DO_TEST("pseries-disk");
|
||||
|
||||
DO_TEST("nosharepages");
|
||||
|
||||
|
5
tests/qemuxml2argvdata/qemuxml2argv-pseries-disk.args
Normal file
5
tests/qemuxml2argvdata/qemuxml2argv-pseries-disk.args
Normal file
@ -0,0 +1,5 @@
|
||||
LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \
|
||||
/usr/bin/qemu-system-ppc64 \
|
||||
-S -M pseries -m 512 -smp 1 \
|
||||
-no-acpi -boot c -usb \
|
||||
-boot c -hda /dev/HostVG/QEMUGuest1 -cdrom /root/boot.iso
|
40
tests/qemuxml2argvdata/qemuxml2argv-pseries-disk.xml
Normal file
40
tests/qemuxml2argvdata/qemuxml2argv-pseries-disk.xml
Normal file
@ -0,0 +1,40 @@
|
||||
<domain type='qemu'>
|
||||
<name>QEMUGuest1</name>
|
||||
<uuid>87eedafe-eedc-4336-8130-ed9fe5dc90c8</uuid>
|
||||
<memory unit='KiB'>524288</memory>
|
||||
<currentMemory unit='KiB'>524288</currentMemory>
|
||||
<vcpu placement='static'>1</vcpu>
|
||||
<os>
|
||||
<type arch='ppc64' machine='pseries'>hvm</type>
|
||||
<boot dev='hd'/>
|
||||
</os>
|
||||
<clock offset='utc'/>
|
||||
<on_poweroff>destroy</on_poweroff>
|
||||
<on_reboot>restart</on_reboot>
|
||||
<on_crash>destroy</on_crash>
|
||||
<devices>
|
||||
<emulator>/usr/bin/qemu-system-ppc64</emulator>
|
||||
<disk type='block' device='disk'>
|
||||
<driver name='qemu' type='raw'/>
|
||||
<source dev='/dev/HostVG/QEMUGuest1'/>
|
||||
<target dev='hda' bus='scsi'/>
|
||||
<address type='drive' controller='0' bus='0' target='0' unit='0'/>
|
||||
</disk>
|
||||
<disk type='file' device='cdrom'>
|
||||
<driver name='qemu' type='raw'/>
|
||||
<source file='/root/boot.iso'/>
|
||||
<target dev='hdc' bus='scsi'/>
|
||||
<readonly/>
|
||||
<address type='drive' controller='0' bus='0' target='0' unit='2'/>
|
||||
</disk>
|
||||
<controller type='usb' index='0'/>
|
||||
<controller type='scsi' index='0'/>
|
||||
<controller type='pci' index='0' model='pci-root'/>
|
||||
<input type='mouse' bus='ps2'/>
|
||||
<graphics type='sdl'/>
|
||||
<video>
|
||||
<model type='cirrus' vram='9216' heads='1'/>
|
||||
</video>
|
||||
<memballoon model='virtio'/>
|
||||
</devices>
|
||||
</domain>
|
Loading…
Reference in New Issue
Block a user