@@ -327,3 +327,30 @@ def test_dedicated(self):
'/bin/cat /sys/devices/system/cpu/dispatching', '0')
self.check_topology(0, 0, 0, 0, 'high', True)
+
+ def test_socket_full(self):
+ """
+ This test verifies that QEMU does not accept to overload a socket.
+ The socket-id 0 on book-id 0 already contains CPUs 0 and 1 and can
+ not accept any new CPU while socket-id 0 on book-id 1 is free.
+
+ :avocado: tags=arch:s390x
+ :avocado: tags=machine:s390-ccw-virtio
+ """
+ self.kernel_init()
+ self.vm.add_args('-smp',
+ '1,drawers=2,books=2,sockets=3,cores=2,maxcpus=24')
+ self.vm.add_args('-device', 'z14-s390x-cpu,core-id=1')
+ self.vm.add_args('-device', 'z14-s390x-cpu,core-id=2')
+ self.vm.launch()
+ self.wait_for_console_pattern('no job control')
+
+ self.system_init()
+
+ res = self.vm.qmp('set-cpu-topology',
+ {'core-id': 2, 'socket-id': 0, 'book-id': 0})
+ self.assertEqual(res['error']['class'], 'GenericError')
+
+ res = self.vm.qmp('set-cpu-topology',
+ {'core-id': 2, 'socket-id': 0, 'book-id': 1})
+ self.assertEqual(res['return'], {})
This test verifies that QMP set-cpu-topology does not accept to overload a socket. Signed-off-by: Pierre Morel <pmorel@linux.ibm.com> --- tests/avocado/s390_topology.py | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+)