From nobody Mon Apr 29 02:21:47 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1582131585; cv=none; d=zohomail.com; s=zohoarc; b=m1gxu3SEgMHidcjoL6NJZu2TT76yVJRvHB5N5pqKzVx15RsyAjBLt4+x4VQcGHf0kUt3/80CJhmgyHT8v7yIVNGC2LfvlFSGJwmpW2VA+EtyzH1uLj2/+Se9fazTXo/a/dMtCY75t0mURkf8oB4kFIghunHgDqAQkK4QcvFhymU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1582131585; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=ycKK3EZ7C0Wdt+5RE3QVwYTEvg2h7ONgXeE2mgOLxJg=; b=CqXh03ad1rFHPz7HtzILMgz9wu9gRTX7piRibH6dym+bcXAs4M3c+H39VcR5IWrIAKIqEzuGGLZbssEQIMktsG6sFR4zn58fb5DV5f4wgEUUVNW4L3MBSsKHbVRnE2yDE8GHDhp50XYkCH7uEIzA5rA7RQefzfABxU+K/UHk4hs= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1582131585036796.642302046212; Wed, 19 Feb 2020 08:59:45 -0800 (PST) Received: from localhost ([::1]:56596 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j4ShL-0003Hq-R6 for importer@patchew.org; Wed, 19 Feb 2020 11:59:43 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:41186) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j4SIT-0007Ou-5p for qemu-devel@nongnu.org; Wed, 19 Feb 2020 11:34:02 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1j4SIR-0003TP-TJ for qemu-devel@nongnu.org; Wed, 19 Feb 2020 11:34:01 -0500 Received: from us-smtp-2.mimecast.com ([205.139.110.61]:58135 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1j4SIR-0003T6-Os for qemu-devel@nongnu.org; Wed, 19 Feb 2020 11:33:59 -0500 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-214-uMpzDTJxMjGwzNImdCmXpA-1; Wed, 19 Feb 2020 11:33:53 -0500 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 47953101FC67 for ; Wed, 19 Feb 2020 16:33:52 +0000 (UTC) Received: from kh066.redhat.com (ovpn-205-79.brq.redhat.com [10.40.205.79]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8090560BE1; Wed, 19 Feb 2020 16:33:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1582130039; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=ycKK3EZ7C0Wdt+5RE3QVwYTEvg2h7ONgXeE2mgOLxJg=; b=CiBvmbq+jpYwAsNHvcUfE5+nJv+RG0wzGA4b70Y3v/865y3MMCJyeqRHFqXOW4LnRDlRwj Eo/DBITy+jwGrFmPIdB8gFN3ROeL/TQ7Zw39FAk2F4z3Ml78eUMO7CFFzr8kc355tbRQii geZgLaxt4MFNUtx0H5aB1C/haRK3A2g= From: Oksana Vohchana To: qemu-devel@nongnu.org Subject: [PATCH 1/3] Adding functions _send_fds and _recv_fds Date: Wed, 19 Feb 2020 18:33:42 +0200 Message-Id: <20200219163344.27651-2-ovoshcha@redhat.com> In-Reply-To: <20200219163344.27651-1-ovoshcha@redhat.com> References: <20200219163344.27651-1-ovoshcha@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-MC-Unique: uMpzDTJxMjGwzNImdCmXpA-1 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 205.139.110.61 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: philmd@redhat.com, ehabkost@redhat.com, wainersm@redhat.com, crosa@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" It provides new possibilities to send or receive data through the Unix doma= in socket file descriptor. This is useful for obtaining a socket that belongs to a different network namespace. Signed-off-by: Oksana Vohchana --- python/qemu/machine.py | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/python/qemu/machine.py b/python/qemu/machine.py index 183d8f3d38..8c5bd64795 100644 --- a/python/qemu/machine.py +++ b/python/qemu/machine.py @@ -24,6 +24,7 @@ import subprocess import shutil import socket import tempfile +import array =20 from . import qmp =20 @@ -155,6 +156,23 @@ class QEMUMachine(object): self._args.append(','.join(options)) return self =20 + def _recv_fds(self, sock, msglen=3D8192, maxfds=3D4096): + """ + Function from https://docs.python.org/3/library/socket.html#socket= .socket.recvmsg + """ + fds =3D array.array("i") + msg, ancdata, flags, addr =3D sock.recvmsg(msglen, socket.CMSG_LEN= (maxfds * fds.itemsize)) + for cmsg_level, cmsg_type, cmsg_data in ancdata: + if cmsg_level =3D=3D socket.SOL_SOCKET and cmsg_type =3D=3D so= cket.SCM_RIGHTS: + fds.frombytes(cmsg_data[:len(cmsg_data) - (len(cmsg_data) = % fds.itemsize)]) + return msg, list(fds) + + def _send_fds(self, sock, msg, fds): + """ + Function from https://docs.python.org/3/library/socket.html#socket= .socket.sendmsg + """ + return sock.sendmsg([msg], [(socket.SOL_SOCKET, socket.SCM_RIGHTS,= array.array("i", fds))]) + def send_fd_scm(self, fd=3DNone, file_path=3DNone): """ Send an fd or file_path to socket_scm_helper. --=20 2.21.1 From nobody Mon Apr 29 02:21:47 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1582131743; cv=none; d=zohomail.com; s=zohoarc; b=FfrLL4U4ARzm4q+TCAOSpDoa4ezoYwr4n0oC4kRId81C/oQq4nH7ldjJaPZSel9sbtDugns8CJDODKvQ31BNzCxXqzhjS3Cu+TaQzg30UMdWwCwH81lNm6tZGYbsIVuCJqVVNxpI9d3TzEzBxaYrGM3CFxgej0Uinq8z46+Z+AE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1582131743; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=y5ND+7Foj/vfBWx9tZOlgNPfHZDV86R3yGWjbV5M09s=; b=UTjU0TjJMyab5HwTg5p6gAaieGeKbLGuvt+keuxefbjG7dlq5G45eDZPwkvOgU7qW8heKLsVWWPaHC+07nFQ1v7fkdBA1QlJuh46/v55W7eC4zYrnhL9Z+4SP09qHxunKqXTWMrlxIBr5EdmqbMqq5Lbe5cbbYonKFKSXWgTDHI= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1582131743807475.2040605258003; Wed, 19 Feb 2020 09:02:23 -0800 (PST) Received: from localhost ([::1]:56760 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j4Sjt-0007aD-Mo for importer@patchew.org; Wed, 19 Feb 2020 12:02:21 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:41220) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j4SIW-0007Wc-Q3 for qemu-devel@nongnu.org; Wed, 19 Feb 2020 11:34:06 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1j4SIV-0003Vu-Hp for qemu-devel@nongnu.org; Wed, 19 Feb 2020 11:34:04 -0500 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:50011 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1j4SIV-0003Vk-DS for qemu-devel@nongnu.org; Wed, 19 Feb 2020 11:34:03 -0500 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-320-8IqnUWF0N-i32me2zDJGQA-1; Wed, 19 Feb 2020 11:33:55 -0500 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 522EF1005512 for ; Wed, 19 Feb 2020 16:33:54 +0000 (UTC) Received: from kh066.redhat.com (ovpn-205-79.brq.redhat.com [10.40.205.79]) by smtp.corp.redhat.com (Postfix) with ESMTP id BE28560BE1; Wed, 19 Feb 2020 16:33:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1582130043; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=y5ND+7Foj/vfBWx9tZOlgNPfHZDV86R3yGWjbV5M09s=; b=CrBTwGqcCclDWABegx5p/kzyPJcK1QkUqFGaNR7imvqZF/VZ7+ZxNE9YLe9oALLZtaTmpW HTZ2gcOKbovbaVZ1rEVFPSSWH77TbRecaEyKO7RLZjVVMeNdZCKqfd62mTqmhzY5CqoAzS MTq+mw8qmVA7OtGbzLAKB0cNX6g9eJI= From: Oksana Vohchana To: qemu-devel@nongnu.org Subject: [PATCH 2/3] Updates send_fd_scm function Date: Wed, 19 Feb 2020 18:33:43 +0200 Message-Id: <20200219163344.27651-3-ovoshcha@redhat.com> In-Reply-To: <20200219163344.27651-1-ovoshcha@redhat.com> References: <20200219163344.27651-1-ovoshcha@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-MC-Unique: 8IqnUWF0N-i32me2zDJGQA-1 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 205.139.110.120 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: philmd@redhat.com, ehabkost@redhat.com, wainersm@redhat.com, crosa@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" A qemu-iotest uses for FD-migration test a helper program "socket_scm_helpe= r". And it makes some problems if you didn't build it with a QEMU. And now we c= an use new methods for the socket that allow us to send a file/socket descript= or (with access and permissions) from one process to another. Signed-off-by: Oksana Vohchana --- python/qemu/machine.py | 56 +++++++++++++++++++++++++----------------- 1 file changed, 34 insertions(+), 22 deletions(-) diff --git a/python/qemu/machine.py b/python/qemu/machine.py index 8c5bd64795..0936b71856 100644 --- a/python/qemu/machine.py +++ b/python/qemu/machine.py @@ -173,19 +173,24 @@ class QEMUMachine(object): """ return sock.sendmsg([msg], [(socket.SOL_SOCKET, socket.SCM_RIGHTS,= array.array("i", fds))]) =20 - def send_fd_scm(self, fd=3DNone, file_path=3DNone): + def send_fd_scm(self, fd=3DNone, file_path=3DNone, data=3DNone): """ - Send an fd or file_path to socket_scm_helper. + Can be used in two different cases. + Send an fd or file_path to socket_scm_helper or + provide data and fd to send it to the socket. =20 - Exactly one of fd and file_path must be given. + Exactly one of fd and file_path must be given to the case of socke= t_scm_helper If it is file_path, the helper will open that file and pass its ow= n fd. + + To second case need adds data that include a QMP request and fd """ # In iotest.py, the qmp should always use unix socket. assert self._qmp.is_scm_available() - if self._socket_scm_helper is None: - raise QEMUMachineError("No path to socket_scm_helper set") - if not os.path.exists(self._socket_scm_helper): - raise QEMUMachineError("%s does not exist" % + if data is None: + if self._socket_scm_helper is None: + raise QEMUMachineError("No path to socket_scm_helper set o= r data not provided") + if not os.path.exists(self._socket_scm_helper): + raise QEMUMachineError("%s does not exist" % self._socket_scm_helper) =20 # This did not exist before 3.4, but since then it is @@ -195,24 +200,31 @@ class QEMUMachine(object): if fd is not None: os.set_inheritable(fd, True) =20 - fd_param =3D ["%s" % self._socket_scm_helper, - "%d" % self._qmp.get_sock_fd()] + if data is None: + fd_param =3D ["%s" % self._socket_scm_helper, + "%d" % self._qmp.get_sock_fd()] + if file_path is not None: + assert fd is None + fd_param.append(file_path) + else: + assert fd is not None + fd_param.append(str(fd)) =20 - if file_path is not None: - assert fd is None - fd_param.append(file_path) - else: - assert fd is not None - fd_param.append(str(fd)) + devnull =3D open(os.path.devnull, 'rb') + proc =3D subprocess.Popen(fd_param, stdin=3Ddevnull, stdout=3D= subprocess.PIPE, + stderr=3Dsubprocess.STDOUT, close_fds= =3DFalse) + output =3D proc.communicate()[0] + if output: + LOG.debug(output) =20 - devnull =3D open(os.path.devnull, 'rb') - proc =3D subprocess.Popen(fd_param, stdin=3Ddevnull, stdout=3Dsubp= rocess.PIPE, - stderr=3Dsubprocess.STDOUT, close_fds=3DFa= lse) - output =3D proc.communicate()[0] - if output: - LOG.debug(output) + return proc.returncode =20 - return proc.returncode + else: + sock_fd =3D socket.fromfd(self._qmp.get_sock_fd(), socket.AF_U= NIX, socket.SOCK_STREAM) + fds_param =3D [fd, self._qmp.get_sock_fd()] + self._send_fds(sock_fd, data, fds_param) + self._recv_fds(sock_fd) + return self =20 @staticmethod def _remove_if_exists(path): --=20 2.21.1 From nobody Mon Apr 29 02:21:47 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1582131284; cv=none; d=zohomail.com; s=zohoarc; b=OLagWI+eUxyyuoS3XNF6J2M5D4CnT3Ud5iKWlfhN/Rc7Nace1V12W7P3ucnR9PO55rwAO6kfuHe86MgsYJbrrgHtmAXx6KyWbZ62dGFO9bq+jqcxINSb4febyP3uGUQRuk4OHE7LyzcfDahdkoSXSgksKhZQX4T9/VWGQii4o/g= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1582131284; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=OD/wZeidx0VQVUbh9TK6tiB+tGCEedJMHHLeIb6e7sc=; b=KyzTANRc2Xk4kvJPsD1u42Y00B7rYEzYOfB4cJklBFYbrT4mR1Dpk7kz3hbirIgcNzJljwxbcZ3gaUwPK98dFzaJlZgkNuySYbqvPMBbstokyYxiq7AOQYsv0mwbG7VMkJd6ndRFvYyDtmbz4k3dK5++uMFDQRHUeXvEWAl5XRM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1582131284137916.0837834993764; Wed, 19 Feb 2020 08:54:44 -0800 (PST) Received: from localhost ([::1]:56476 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j4ScV-0001d6-13 for importer@patchew.org; Wed, 19 Feb 2020 11:54:43 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:41193) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j4SIT-0007Q2-JY for qemu-devel@nongnu.org; Wed, 19 Feb 2020 11:34:02 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1j4SIS-0003Tt-J8 for qemu-devel@nongnu.org; Wed, 19 Feb 2020 11:34:01 -0500 Received: from us-smtp-2.mimecast.com ([205.139.110.61]:49348 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1j4SIS-0003TY-FI for qemu-devel@nongnu.org; Wed, 19 Feb 2020 11:34:00 -0500 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-354-iWQX4vtNM8CBx_ydobEltQ-1; Wed, 19 Feb 2020 11:33:57 -0500 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id AA1E3800D55 for ; Wed, 19 Feb 2020 16:33:56 +0000 (UTC) Received: from kh066.redhat.com (ovpn-205-79.brq.redhat.com [10.40.205.79]) by smtp.corp.redhat.com (Postfix) with ESMTP id E374D60BE1; Wed, 19 Feb 2020 16:33:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1582130040; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=OD/wZeidx0VQVUbh9TK6tiB+tGCEedJMHHLeIb6e7sc=; b=KusA6Yww6jR0p5rK9xeAWlXMk5b8lh+3cT/nNKTNbJnR6yjeBtapp4CDJA1P1hDe5GMHms 4US6lCede6DKStezveIhx7t3QUXXQkBks15cG09o1ge2BLmbr5eW12l0rQYbwz68JrDtTV 45TVqnse3gwrjPo6I8xMcvXfOgBu4q0= From: Oksana Vohchana To: qemu-devel@nongnu.org Subject: [PATCH 3/3] Acceptance test: FD migration Date: Wed, 19 Feb 2020 18:33:44 +0200 Message-Id: <20200219163344.27651-4-ovoshcha@redhat.com> In-Reply-To: <20200219163344.27651-1-ovoshcha@redhat.com> References: <20200219163344.27651-1-ovoshcha@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-MC-Unique: iWQX4vtNM8CBx_ydobEltQ-1 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 205.139.110.61 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: philmd@redhat.com, ehabkost@redhat.com, wainersm@redhat.com, crosa@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" Adds a new migration test through the file descriptor. Signed-off-by: Oksana Vohchana --- tests/acceptance/migration.py | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/tests/acceptance/migration.py b/tests/acceptance/migration.py index a8367ca023..b96a897f3b 100644 --- a/tests/acceptance/migration.py +++ b/tests/acceptance/migration.py @@ -10,7 +10,10 @@ # later. See the COPYING file in the top-level directory. =20 =20 +import os import tempfile +from socket import socketpair, AF_UNIX, SOCK_STREAM + from avocado_qemu import Test from avocado import skipUnless =20 @@ -75,3 +78,20 @@ class Migration(Test): """ free_port =3D self._get_free_port() dest_uri =3D 'exec:nc -l localhost %u' % free_port + + def test_migration_with_fd(self): + opaque =3D 'fd-migration' + data_to_send =3D b"{\"execute\": \"getfd\", \"arguments\": {\"fdn= ame\": \"fd-migration\"}}" + send_socket, recv_socket =3D socketpair(AF_UNIX, SOCK_STREAM) + fd1 =3D send_socket.fileno() + fd2 =3D recv_socket.fileno() + os.set_inheritable(fd2, True) + + source_vm =3D self.get_vm() + source_vm.launch() + source_vm.send_fd_scm(fd=3Dfd1, data=3Ddata_to_send) + + dest_vm =3D self.get_vm('-incoming', 'fd:%s' % fd2) + dest_vm.launch() + source_vm.qmp('migrate', uri=3D'fd:%s' % opaque) + self.assert_migration(source_vm, dest_vm) --=20 2.21.1