shaba/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-02-28 13:57:42 +03:00
Code Releases Activity

conf, qemu: Add newer shmem models

Browse Source 
The old ivshmem is deprecated in QEMU, so let's use the better
ivshmem-{plain,doorbell} variants instead.

Signed-off-by: Martin Kletzander <mkletzan@redhat.com>
This commit is contained in:
Martin Kletzander 2016-08-19 14:58:35 +02:00
parent 64530a9c66
commit 3c06aa7b30
8 changed files with 147 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
docs/formatdomain.html.in
View File

@ -6826,10 +6826,11 @@ qemu-kvm -net nic,model=? /dev/null
...
&lt;devices&gt;
&lt;shmem name='my_shmem0'&gt;
&lt;model type='ivshmem-plain'/&gt;
&lt;size unit='M'&gt;4&lt;/size&gt;
&lt;/shmem&gt;
&lt;shmem name='shmem_server'&gt;
&lt;model type='ivshmem'/&gt;
&lt;model type='ivshmem-doorbell'/&gt;
&lt;size unit='M'&gt;2&lt;/size&gt;
&lt;server path='/tmp/socket-shmem'/&gt;
&lt;msi vectors='32' ioeventfd='on'/&gt;
@ -6848,8 +6849,11 @@ qemu-kvm -net nic,model=? /dev/null
<dd>
Attribute <code>type</code> of the optional element <code>model</code>
specifies the model of the underlying device providing the
<code>shmem</code> device. Currently the only supported model is
<code>ivshmem</code>.
<code>shmem</code> device. The models currently supported are
<code>ivshmem</code> (supports both server and server-less shmem, but is
deprecated by newer QEMU in favour of the -plain and -doorbell variants),
<code>ivshmem-plain</code> (only for server-less shmem) and
<code>ivshmem-doorbell</code> (only for shmem with the server).
</dd>
<dt><code>size</code></dt>
<dd>

2
docs/schemas/domaincommon.rng
View File

@ -3596,6 +3596,8 @@
<attribute name="type">
<choice>
<value>ivshmem</value>
<value>ivshmem-plain</value>
<value>ivshmem-doorbell</value>
</choice>
</attribute>
</element>

4
src/conf/domain_conf.c
View File

@ -845,7 +845,9 @@ VIR_ENUM_IMPL(virDomainMemoryModel, VIR_DOMAIN_MEMORY_MODEL_LAST,
"", "dimm")
VIR_ENUM_IMPL(virDomainShmemModel, VIR_DOMAIN_SHMEM_MODEL_LAST,
"ivshmem")
"ivshmem",
"ivshmem-plain",
"ivshmem-doorbell")
static virClassPtr virDomainObjClass;
static virClassPtr virDomainXMLOptionClass;

2
src/conf/domain_conf.h
View File

@ -1564,6 +1564,8 @@ struct _virDomainNVRAMDef {
typedef enum {
VIR_DOMAIN_SHMEM_MODEL_IVSHMEM,
VIR_DOMAIN_SHMEM_MODEL_IVSHMEM_PLAIN,
VIR_DOMAIN_SHMEM_MODEL_IVSHMEM_DOORBELL,
VIR_DOMAIN_SHMEM_MODEL_LAST
} virDomainShmemModel;

7
src/qemu/qemu_command.c
View File

@ -8530,6 +8530,13 @@ qemuBuildShmemCommandLine(virLogManagerPtr logManager,
devstr = qemuBuildShmemDevLegacyStr(def, shmem, qemuCaps);
break;
case VIR_DOMAIN_SHMEM_MODEL_IVSHMEM_PLAIN:
case VIR_DOMAIN_SHMEM_MODEL_IVSHMEM_DOORBELL:
virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
_("%s device is not supported with this QEMU binary"),
virDomainShmemModelTypeToString(shmem->model));
break;
case VIR_DOMAIN_SHMEM_MODEL_LAST:
break;
}

58
tests/qemuxml2argvdata/qemuxml2argv-shmem-plain-doorbell.xml Normal file
View File

@ -0,0 +1,58 @@
<domain type='qemu'>
<name>QEMUGuest1</name>
<uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
<memory unit='KiB'>219136</memory>
<currentMemory unit='KiB'>219136</currentMemory>
<vcpu placement='static'>1</vcpu>
<os>
<type arch='i686' machine='pc'>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</emulator>
<controller type='usb' index='0'/>
<controller type='pci' index='0' model='pci-root'/>
<input type='mouse' bus='ps2'/>
<input type='keyboard' bus='ps2'/>
<memballoon model='none'/>
<shmem name='shmem0'>
<model type='ivshmem-plain'/>
</shmem>
<shmem name='shmem1'>
<model type='ivshmem-plain'/>
<size unit='M'>128</size>
</shmem>
<shmem name='shmem2'>
<model type='ivshmem-plain'/>
<size unit='M'>256</size>
<address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x0'/>
</shmem>
<shmem name='shmem3'>
<model type='ivshmem-doorbell'/>
<server/>
</shmem>
<shmem name='shmem4'>
<model type='ivshmem-doorbell'/>
<server path='/tmp/shmem4-sock'/>
</shmem>
<shmem name='shmem5'>
<model type='ivshmem-doorbell'/>
<server path='/tmp/shmem5-sock'/>
<msi ioeventfd='off'/>
</shmem>
<shmem name='shmem6'>
<model type='ivshmem-doorbell'/>
<server path='/tmp/shmem6-sock'/>
<msi vectors='16'/>
</shmem>
<shmem name='shmem7'>
<model type='ivshmem-doorbell'/>
<server path='/tmp/shmem7-sock'/>
<msi vectors='32' ioeventfd='on'/>
</shmem>
</devices>
</domain>

67
tests/qemuxml2xmloutdata/qemuxml2xmlout-shmem-plain-doorbell.xml Normal file
View File

@ -0,0 +1,67 @@
<domain type='qemu'>
<name>QEMUGuest1</name>
<uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
<memory unit='KiB'>219136</memory>
<currentMemory unit='KiB'>219136</currentMemory>
<vcpu placement='static'>1</vcpu>
<os>
<type arch='i686' machine='pc'>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</emulator>
<controller type='usb' index='0'>
<address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
</controller>
<controller type='pci' index='0' model='pci-root'/>
<input type='mouse' bus='ps2'/>
<input type='keyboard' bus='ps2'/>
<memballoon model='none'/>
<shmem name='shmem0'>
<model type='ivshmem-plain'/>
<address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/>
</shmem>
<shmem name='shmem1'>
<model type='ivshmem-plain'/>
<size unit='M'>128</size>
<address type='pci' domain='0x0000' bus='0x00' slot='0x05' function='0x0'/>
</shmem>
<shmem name='shmem2'>
<model type='ivshmem-plain'/>
<size unit='M'>256</size>
<address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x0'/>
</shmem>
<shmem name='shmem3'>
<model type='ivshmem-doorbell'/>
<server/>
<address type='pci' domain='0x0000' bus='0x00' slot='0x06' function='0x0'/>
</shmem>
<shmem name='shmem4'>
<model type='ivshmem-doorbell'/>
<server path='/tmp/shmem4-sock'/>
<address type='pci' domain='0x0000' bus='0x00' slot='0x07' function='0x0'/>
</shmem>
<shmem name='shmem5'>
<model type='ivshmem-doorbell'/>
<server path='/tmp/shmem5-sock'/>
<msi ioeventfd='off'/>
<address type='pci' domain='0x0000' bus='0x00' slot='0x08' function='0x0'/>
</shmem>
<shmem name='shmem6'>
<model type='ivshmem-doorbell'/>
<server path='/tmp/shmem6-sock'/>
<msi vectors='16'/>
<address type='pci' domain='0x0000' bus='0x00' slot='0x09' function='0x0'/>
</shmem>
<shmem name='shmem7'>
<model type='ivshmem-doorbell'/>
<server path='/tmp/shmem7-sock'/>
<msi vectors='32' ioeventfd='on'/>
<address type='pci' domain='0x0000' bus='0x00' slot='0x0a' function='0x0'/>
</shmem>
</devices>
</domain>

1
tests/qemuxml2xmltest.c
View File

@ -822,6 +822,7 @@ mymain(void)
DO_TEST("tap-vhost", NONE);
DO_TEST("tap-vhost-incorrect", NONE);
DO_TEST("shmem", NONE);
DO_TEST("shmem-plain-doorbell", NONE);
DO_TEST("smbios", NONE);
DO_TEST("smbios-multiple-type2", NONE);