From nobody Sat May 18 10:07:53 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1623088234; cv=none; d=zohomail.com; s=zohoarc; b=HYsX36m5S4XizjMSx8oLHdLOTQpBRu8aCsA/tXnembGMRltmKdwDDPSOgS2gjIjsaXiWmWYkH+uewruaAsZqWtwlGQ/TT3QrH9UJ0FeS0/KYfYcm8GiwatIAr2yLsoVeaeDuTZn7wUI/0Yi2CJuYeZBq+mg/9zWuyJeluXk3cGs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1623088234; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=i1TVAADkI/cdPTRzvsXFG0rl+ETi8JbcrWDKPqHFnvE=; b=W8spMI/Ax/nDje0lQHU4fJM0aFu+lK5mDd1+MOehQVMkHJr7/69XnHKm+3EVJO1jtf6jy7ls/Uy2PqGbWeIIA0LtmdXK3ZjjjBppzNzX5JEY65o6b5LgqjMJgxKu25yH8iFZhX99bEYBwTvvXpARyyzVSJCydDVU1RqQ3z8LLsg= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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=pass 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 1623088234352562.8760315824467; Mon, 7 Jun 2021 10:50:34 -0700 (PDT) Received: from localhost ([::1]:35770 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lqJOT-0002W5-BC for importer@patchew.org; Mon, 07 Jun 2021 13:50:33 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36786) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lqIyC-0002Tz-Ds for qemu-devel@nongnu.org; Mon, 07 Jun 2021 13:23:24 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:41220) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lqIy7-0001Lj-IQ for qemu-devel@nongnu.org; Mon, 07 Jun 2021 13:23:23 -0400 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-318-Fap85uZAPfyqIj_j8Wxysg-1; Mon, 07 Jun 2021 13:23:16 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id C11D6180FD64; Mon, 7 Jun 2021 17:23:15 +0000 (UTC) Received: from thuth.com (ovpn-112-83.ams2.redhat.com [10.36.112.83]) by smtp.corp.redhat.com (Postfix) with ESMTP id B5A1C5D6D3; Mon, 7 Jun 2021 17:23:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1623086598; 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; bh=i1TVAADkI/cdPTRzvsXFG0rl+ETi8JbcrWDKPqHFnvE=; b=I+e27/gaqgPVUwQ5JbcxtP0Cf9JjJfGZTG+DFOfol8FBXMkj9jTep2N8LtBsHDBy8pIKnv VBZ3QQtXeyoNE+Wmm1gglgBA1ZwAlmOLAQ4T9x3VJMMJVVbdzxYJwZzxhXbS7ov4ZuZX6u QePtApS4pOVpxND/9urHrmmGzzAA01o= X-MC-Unique: Fap85uZAPfyqIj_j8Wxysg-1 From: Thomas Huth To: qemu-devel@nongnu.org Subject: [PATCH] docs/interop/live-block-operations: Do not hard-code the QEMU binary name Date: Mon, 7 Jun 2021 19:23:11 +0200 Message-Id: <20210607172311.915385-1-thuth@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=thuth@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable 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; Received-SPF: pass client-ip=170.10.133.124; envelope-from=thuth@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -29 X-Spam_score: -3.0 X-Spam_bar: --- X-Spam_report: (-3.0 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.2, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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: qemu-trivial@nongnu.org, qemu-block@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" In downstream, we want to use a different name for the QEMU binary, and some people might also use the docs for non-x86 binaries, that's why we already created the |qemu_system| placeholder in the past. Use it now in the live-block-operations doc, too. Signed-off-by: Thomas Huth Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- docs/interop/live-block-operations.rst | 32 +++++++++++++++----------- 1 file changed, 18 insertions(+), 14 deletions(-) diff --git a/docs/interop/live-block-operations.rst b/docs/interop/live-blo= ck-operations.rst index 1073b930dc..477d085f54 100644 --- a/docs/interop/live-block-operations.rst +++ b/docs/interop/live-block-operations.rst @@ -127,13 +127,15 @@ Interacting with a QEMU instance =20 To show some example invocations of command-line, we will use the following invocation of QEMU, with a QMP server running over UNIX -socket:: +socket: =20 - $ ./qemu-system-x86_64 -display none -no-user-config \ - -M q35 -nodefaults -m 512 \ - -blockdev node-name=3Dnode-A,driver=3Dqcow2,file.driver=3Dfile,fil= e.node-name=3Dfile,file.filename=3D./a.qcow2 \ - -device virtio-blk,drive=3Dnode-A,id=3Dvirtio0 \ - -monitor stdio -qmp unix:/tmp/qmp-sock,server=3Don,wait=3Doff +.. parsed-literal:: + + $ |qemu_system| -display none -no-user-config -nodefaults \\ + -m 512 -blockdev \\ + node-name=3Dnode-A,driver=3Dqcow2,file.driver=3Dfile,file.node-name=3D= file,file.filename=3D./a.qcow2 \\ + -device virtio-blk,drive=3Dnode-A,id=3Dvirtio0 \\ + -monitor stdio -qmp unix:/tmp/qmp-sock,server=3Don,wait=3Doff =20 The ``-blockdev`` command-line option, used above, is available from QEMU 2.9 onwards. In the above invocation, notice the ``node-name`` @@ -692,14 +694,16 @@ And start the destination QEMU (we already have the s= ource QEMU running -- discussed in the section: `Interacting with a QEMU instance`_) instance, with the following invocation. (As noted earlier, for simplicity's sake, the destination QEMU is started on the same host, but -it could be located elsewhere):: - - $ ./qemu-system-x86_64 -display none -no-user-config \ - -M q35 -nodefaults -m 512 \ - -blockdev node-name=3Dnode-TargetDisk,driver=3Dqcow2,file.driver= =3Dfile,file.node-name=3Dfile,file.filename=3D./target-disk.qcow2 \ - -device virtio-blk,drive=3Dnode-TargetDisk,id=3Dvirtio0 \ - -S -monitor stdio -qmp unix:./qmp-sock2,server=3Don,wait=3Doff \ - -incoming tcp:localhost:6666 +it could be located elsewhere): + +.. parsed-literal:: + + $ |qemu_system| -display none -no-user-config -nodefaults \\ + -m 512 -blockdev \\ + node-name=3Dnode-TargetDisk,driver=3Dqcow2,file.driver=3Dfile,file.nod= e-name=3Dfile,file.filename=3D./target-disk.qcow2 \\ + -device virtio-blk,drive=3Dnode-TargetDisk,id=3Dvirtio0 \\ + -S -monitor stdio -qmp unix:./qmp-sock2,server=3Don,wait=3Doff \\ + -incoming tcp:localhost:6666 =20 Given the disk image chain on source QEMU:: =20 --=20 2.27.0