diff options
Diffstat (limited to 'testing/config/kvm')
-rw-r--r-- | testing/config/kvm/alice.xml | 4 | ||||
-rw-r--r-- | testing/config/kvm/bob.xml | 3 | ||||
-rw-r--r-- | testing/config/kvm/carol.xml | 3 | ||||
-rw-r--r-- | testing/config/kvm/dave.xml | 3 | ||||
-rw-r--r-- | testing/config/kvm/moon.xml | 4 | ||||
-rw-r--r-- | testing/config/kvm/sun.xml | 4 | ||||
-rw-r--r-- | testing/config/kvm/venus.xml | 3 | ||||
-rw-r--r-- | testing/config/kvm/vnet1.xml | 2 | ||||
-rw-r--r-- | testing/config/kvm/vnet2.xml | 2 | ||||
-rw-r--r-- | testing/config/kvm/vnet3.xml | 2 | ||||
-rw-r--r-- | testing/config/kvm/winnetou.xml | 3 |
11 files changed, 22 insertions, 11 deletions
diff --git a/testing/config/kvm/alice.xml b/testing/config/kvm/alice.xml index 6ca78f861..620ce5116 100644 --- a/testing/config/kvm/alice.xml +++ b/testing/config/kvm/alice.xml @@ -5,7 +5,7 @@ <currentMemory unit='KiB'>131072</currentMemory> <vcpu placement='static'>1</vcpu> <os> - <type arch='x86_64' machine='pc-1.1'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <kernel>/var/run/kvm-swan-kernel</kernel> <cmdline>root=/dev/vda1 loglevel=1</cmdline> <boot dev='hd'/> @@ -38,12 +38,14 @@ <interface type='network'> <mac address='52:54:00:9a:e2:de'/> <source network='vnet2'/> + <target dev='alice-eth0'/> <model type='virtio'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/> </interface> <interface type='network'> <mac address='52:54:00:3b:0c:d7'/> <source network='vnet1'/> + <target dev='alice-eth1'/> <model type='virtio'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x05' function='0x0'/> </interface> diff --git a/testing/config/kvm/bob.xml b/testing/config/kvm/bob.xml index d9a9b4c05..caa1631cf 100644 --- a/testing/config/kvm/bob.xml +++ b/testing/config/kvm/bob.xml @@ -5,7 +5,7 @@ <currentMemory unit='KiB'>131072</currentMemory> <vcpu placement='static'>1</vcpu> <os> - <type arch='x86_64' machine='pc-1.1'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <kernel>/var/run/kvm-swan-kernel</kernel> <cmdline>root=/dev/vda1 loglevel=1</cmdline> <boot dev='hd'/> @@ -38,6 +38,7 @@ <interface type='network'> <mac address='52:54:00:40:85:6b'/> <source network='vnet3'/> + <target dev='bob-eth0'/> <model type='virtio'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/> </interface> diff --git a/testing/config/kvm/carol.xml b/testing/config/kvm/carol.xml index fbdabe2e4..8f768ff5c 100644 --- a/testing/config/kvm/carol.xml +++ b/testing/config/kvm/carol.xml @@ -5,7 +5,7 @@ <currentMemory unit='KiB'>131072</currentMemory> <vcpu placement='static'>1</vcpu> <os> - <type arch='x86_64' machine='pc-1.1'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <kernel>/var/run/kvm-swan-kernel</kernel> <cmdline>root=/dev/vda1 loglevel=1</cmdline> <boot dev='hd'/> @@ -38,6 +38,7 @@ <interface type='network'> <mac address='52:54:00:ae:f1:f8'/> <source network='vnet1'/> + <target dev='carol-eth0'/> <model type='virtio'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/> </interface> diff --git a/testing/config/kvm/dave.xml b/testing/config/kvm/dave.xml index bfebe9b60..3ae1da021 100644 --- a/testing/config/kvm/dave.xml +++ b/testing/config/kvm/dave.xml @@ -5,7 +5,7 @@ <currentMemory unit='KiB'>131072</currentMemory> <vcpu placement='static'>1</vcpu> <os> - <type arch='x86_64' machine='pc-1.1'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <kernel>/var/run/kvm-swan-kernel</kernel> <cmdline>root=/dev/vda1 loglevel=1</cmdline> <boot dev='hd'/> @@ -38,6 +38,7 @@ <interface type='network'> <mac address='52:54:00:b9:15:a9'/> <source network='vnet1'/> + <target dev='dave-eth0'/> <model type='virtio'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/> </interface> diff --git a/testing/config/kvm/moon.xml b/testing/config/kvm/moon.xml index e019fcea5..975e3cec6 100644 --- a/testing/config/kvm/moon.xml +++ b/testing/config/kvm/moon.xml @@ -5,7 +5,7 @@ <currentMemory unit='KiB'>131072</currentMemory> <vcpu placement='static'>1</vcpu> <os> - <type arch='x86_64' machine='pc-1.1'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <kernel>/var/run/kvm-swan-kernel</kernel> <cmdline>root=/dev/vda1 loglevel=1</cmdline> <boot dev='hd'/> @@ -38,12 +38,14 @@ <interface type='network'> <mac address='52:54:00:43:e3:35'/> <source network='vnet2'/> + <target dev='moon-eth1'/> <model type='virtio'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x05' function='0x0'/> </interface> <interface type='network'> <mac address='52:54:00:c7:b8:b0'/> <source network='vnet1'/> + <target dev='moon-eth0'/> <model type='virtio'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/> </interface> diff --git a/testing/config/kvm/sun.xml b/testing/config/kvm/sun.xml index 5ed1a47ea..9d05027f9 100644 --- a/testing/config/kvm/sun.xml +++ b/testing/config/kvm/sun.xml @@ -5,7 +5,7 @@ <currentMemory unit='KiB'>131072</currentMemory> <vcpu placement='static'>1</vcpu> <os> - <type arch='x86_64' machine='pc-1.1'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <kernel>/var/run/kvm-swan-kernel</kernel> <cmdline>root=/dev/vda1 loglevel=1</cmdline> <boot dev='hd'/> @@ -38,12 +38,14 @@ <interface type='network'> <mac address='52:54:00:77:43:ea'/> <source network='vnet1'/> + <target dev='sun-eth0'/> <model type='virtio'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/> </interface> <interface type='network'> <mac address='52:54:00:0f:97:db'/> <source network='vnet3'/> + <target dev='sun-eth1'/> <model type='virtio'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x05' function='0x0'/> </interface> diff --git a/testing/config/kvm/venus.xml b/testing/config/kvm/venus.xml index 77a333655..7a65ace75 100644 --- a/testing/config/kvm/venus.xml +++ b/testing/config/kvm/venus.xml @@ -5,7 +5,7 @@ <currentMemory unit='KiB'>131072</currentMemory> <vcpu placement='static'>1</vcpu> <os> - <type arch='x86_64' machine='pc-1.1'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <kernel>/var/run/kvm-swan-kernel</kernel> <cmdline>root=/dev/vda1 loglevel=1</cmdline> <boot dev='hd'/> @@ -38,6 +38,7 @@ <interface type='network'> <mac address='52:54:00:69:d3:80'/> <source network='vnet2'/> + <target dev='venus-eth0'/> <model type='virtio'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/> </interface> diff --git a/testing/config/kvm/vnet1.xml b/testing/config/kvm/vnet1.xml index f9d979be1..94097ab6f 100644 --- a/testing/config/kvm/vnet1.xml +++ b/testing/config/kvm/vnet1.xml @@ -4,7 +4,7 @@ <forward dev='lo' mode='route'> <interface dev='lo'/> </forward> - <bridge name='virbr1' stp='on' delay='0' /> + <bridge name='test-br0' stp='on' delay='0' /> <mac address='52:54:00:97:F9:FD'/> <ip address='192.168.0.254' netmask='255.255.255.0'> </ip> diff --git a/testing/config/kvm/vnet2.xml b/testing/config/kvm/vnet2.xml index 7d125bfc6..b21e7ed1f 100644 --- a/testing/config/kvm/vnet2.xml +++ b/testing/config/kvm/vnet2.xml @@ -4,7 +4,7 @@ <forward dev='lo' mode='route'> <interface dev='lo'/> </forward> - <bridge name='virbr2' stp='on' delay='0' /> + <bridge name='test-br1' stp='on' delay='0' /> <mac address='52:54:00:05:F3:34'/> <ip address='10.1.0.254' netmask='255.255.0.0'> </ip> diff --git a/testing/config/kvm/vnet3.xml b/testing/config/kvm/vnet3.xml index 1da06c448..f46d9ec09 100644 --- a/testing/config/kvm/vnet3.xml +++ b/testing/config/kvm/vnet3.xml @@ -4,7 +4,7 @@ <forward dev='lo' mode='route'> <interface dev='lo'/> </forward> - <bridge name='virbr3' stp='on' delay='0' /> + <bridge name='test-br2' stp='on' delay='0' /> <mac address='52:54:00:62:4C:69'/> <ip address='10.2.0.254' netmask='255.255.0.0'> </ip> diff --git a/testing/config/kvm/winnetou.xml b/testing/config/kvm/winnetou.xml index 99d5deb99..9410c73b8 100644 --- a/testing/config/kvm/winnetou.xml +++ b/testing/config/kvm/winnetou.xml @@ -5,7 +5,7 @@ <currentMemory unit='KiB'>131072</currentMemory> <vcpu placement='static'>1</vcpu> <os> - <type arch='x86_64' machine='pc-1.1'>hvm</type> + <type arch='x86_64' machine='pc'>hvm</type> <kernel>/var/run/kvm-swan-kernel</kernel> <cmdline>root=/dev/vda1 loglevel=1</cmdline> <boot dev='hd'/> @@ -38,6 +38,7 @@ <interface type='network'> <mac address='52:54:00:4b:23:fa'/> <source network='vnet1'/> + <target dev='winnetou-eth0'/> <model type='virtio'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/> </interface> |