External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-07-11 12:25:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

qemu: add default panic device to S390 guests

Browse Source 
This patch adds by default a panic device with model s390 to S390 guests.

Signed-off-by: Boris Fiuczynski <fiuczy@linux.vnet.ibm.com>
This commit is contained in:
Boris Fiuczynski 2016-04-29 15:23:42 +02:00 committed by Andrea Bolognani
parent d855465452
commit 73e4e10e62
8 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/qemu/qemu_domain.c
View File

@ -1796,6 +1796,7 @@ qemuDomainDefAddDefaultDevices(virDomainDefPtr def,
case VIR_ARCH_S390:
case VIR_ARCH_S390X:
addDefaultUSB = false;
addPanicDevice = true;
break;
case VIR_ARCH_SPARC:
@ -1874,7 +1875,10 @@ qemuDomainDefAddDefaultDevices(virDomainDefPtr def,
size_t j;
for (j = 0; j < def->npanics; j++) {
if (def->panics[j]->model == VIR_DOMAIN_PANIC_MODEL_DEFAULT ||
def->panics[j]->model == VIR_DOMAIN_PANIC_MODEL_PSERIES)
(ARCH_IS_PPC64(def->os.arch) &&
def->panics[j]->model == VIR_DOMAIN_PANIC_MODEL_PSERIES) ||
(ARCH_IS_S390(def->os.arch) &&
def->panics[j]->model == VIR_DOMAIN_PANIC_MODEL_S390))
break;
}

1
tests/qemuargv2xmldata/qemuargv2xml-machine-aeskeywrap-off-argv.xml
View File

@ -20,6 +20,7 @@
<target dev='vda' bus='virtio'/>
</disk>
<memballoon model='none'/>
<panic model='s390'/>
</devices>
<keywrap>
<cipher name='aes' state='off'/>

1
tests/qemuargv2xmldata/qemuargv2xml-machine-aeskeywrap-on-argv.xml
View File

@ -20,6 +20,7 @@
<target dev='vda' bus='virtio'/>
</disk>
<memballoon model='none'/>
<panic model='s390'/>
</devices>
<keywrap>
<cipher name='aes' state='on'/>

1
tests/qemuargv2xmldata/qemuargv2xml-machine-deakeywrap-off-argv.xml
View File

@ -20,6 +20,7 @@
<target dev='vda' bus='virtio'/>
</disk>
<memballoon model='none'/>
<panic model='s390'/>
</devices>
<keywrap>
<cipher name='dea' state='off'/>

1
tests/qemuargv2xmldata/qemuargv2xml-machine-deakeywrap-on-argv.xml
View File

@ -20,6 +20,7 @@
<target dev='vda' bus='virtio'/>
</disk>
<memballoon model='none'/>
<panic model='s390'/>
</devices>
<keywrap>
<cipher name='dea' state='on'/>

1
tests/qemuargv2xmldata/qemuargv2xml-machine-keywrap-none-argv.xml
View File

@ -20,5 +20,6 @@
<target dev='vda' bus='virtio'/>
</disk>
<memballoon model='none'/>
<panic model='s390'/>
</devices>
</domain>

1
tests/qemuxml2xmloutdata/qemuxml2xmlout-iothreads-disk-virtio-ccw.xml
View File

@ -31,5 +31,6 @@
<memballoon model='virtio'>
<address type='ccw' cssid='0xfe' ssid='0x0' devno='0x000a'/>
</memballoon>
<panic model='s390'/>
</devices>
</domain>

1
tests/qemuxml2xmloutdata/qemuxml2xmlout-s390-defaultconsole.xml
View File

@ -20,5 +20,6 @@
<target type='virtio' port='0'/>
</console>
<memballoon model='none'/>
<panic model='s390'/>
</devices>
</domain>