From nobody Tue Nov 4 15:26:23 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1530216879338844.0012916621174; Thu, 28 Jun 2018 13:14:39 -0700 (PDT) Received: from localhost ([::1]:38322 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fYdJO-0006LQ-GG for importer@patchew.org; Thu, 28 Jun 2018 16:14:38 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37971) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fYdAb-0007CB-1m for qemu-devel@nongnu.org; Thu, 28 Jun 2018 16:05:36 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fYdAZ-0000Na-06 for qemu-devel@nongnu.org; Thu, 28 Jun 2018 16:05:32 -0400 Received: from mail-wr0-x241.google.com ([2a00:1450:400c:c0c::241]:43832) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fYdAY-0000MV-IW for qemu-devel@nongnu.org; Thu, 28 Jun 2018 16:05:30 -0400 Received: by mail-wr0-x241.google.com with SMTP id c5-v6so6681106wrs.10 for ; Thu, 28 Jun 2018 13:05:30 -0700 (PDT) Received: from 640k.lan ([82.84.124.111]) by smtp.gmail.com with ESMTPSA id 127-v6sm6211110wmd.18.2018.06.28.13.05.28 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 28 Jun 2018 13:05:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=k4U0DeNL4LEPg5UIzmSZdI2Mn4wyplZmbJei5YIj3hI=; b=e5GK+drx0wT+Z91aej1Xn6j2thedGxwzc43Sra8pm+7wY4x82OIpCUps7xMwzMFyoy Vbwr5B1aDVUAGK8nA0Oq4M96JdsQU+aY5C87QUQ03wQwoV7D90lYaCcWFO6dDm8sw1DK Rw14gtRyZTUkZPuClE8RpsUGW1xjw3oDYuqYRgSEs80DlNc8GkXzM+wGm7P9i4uP9M5y 2wiXvpD+4+Af5r9/uheKtC6GRArhTlmPLAghOgAMc5MpLn8rAAqhr/ZpZgt5Gd8TKb9K wQy1cKG2iXJPMmucDAOR3dSbLvQYknC+3UHe9TVY6xg2WMpDelIAsQwBV0T7GjkjcP1j mnCQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=k4U0DeNL4LEPg5UIzmSZdI2Mn4wyplZmbJei5YIj3hI=; b=hwUNIvBiESVL7pcD8BJSVP4cNFl5QBoIsfhskNGGFULDT3hPxfC7EHdW2f7IuCtZMP sE1nNoreEjIeM59VSG+3xMHN7KqWUuVr7lfy57FGV8i5AYKKyvt5HWGCpK1wN2Zd0oMc 8WBlTwh7ha+mPcRfRRoPhOFiuaZFaK36Tk/oL6GID4eiADIsb/ocwD7v9I2oMQuQxsLp 0mHaWKCD/HXz1qWf9omoMV3CmVJ55FJNNAg47RPh+Z/aIeg9Tp+x6Dj0hGQVlCuDjMik NLdT9d2bweZlJS9TraXwahQ5aJoeX4Gpk35Lbd6E8+pEe/jG85Et5HWj3xmDzKN4WWQb EJaQ== X-Gm-Message-State: APt69E2yTVxf4KKrMHNbcbC+ej3wkp107ewLiCLcHeLoDlmQYC+mx2Mz 8RLhpirrNtELDo20caFO0rhju+Kv X-Google-Smtp-Source: AAOMgpfAlZZLSI55x/TXtxXzC9IKZHQA1xsFsgZXTtd5Xevi7VRxeydB1sh0AW8oV+PhEbVxWNJ43A== X-Received: by 2002:adf:d4c5:: with SMTP id w5-v6mr9561269wrk.185.1530216329028; Thu, 28 Jun 2018 13:05:29 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Thu, 28 Jun 2018 22:04:25 +0200 Message-Id: <1530216310-52873-16-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1530216310-52873-1-git-send-email-pbonzini@redhat.com> References: <1530216310-52873-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:400c:c0c::241 Subject: [Qemu-devel] [PULL 15/60] Replace '-enable-kvm' with '-accel kvm' in docs and help texts X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Thomas Huth Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Thomas Huth The preferred way to select the KVM accelerator is to use "-accel kvm" these days, so let's be consistent in our documentation and help texts. Signed-off-by: Thomas Huth Message-Id: <1528866321-23886-3-git-send-email-thuth@redhat.com> Signed-off-by: Paolo Bonzini --- docs/COLO-FT.txt | 8 ++++---- docs/can.txt | 4 ++-- docs/multi-thread-compression.txt | 2 +- docs/multiseat.txt | 2 +- docs/specs/tpm.txt | 8 ++++---- hw/block/dataplane/virtio-blk.c | 4 ++-- hw/scsi/virtio-scsi-dataplane.c | 4 ++-- 7 files changed, 16 insertions(+), 16 deletions(-) diff --git a/docs/COLO-FT.txt b/docs/COLO-FT.txt index e289be2..d7c7dcd 100644 --- a/docs/COLO-FT.txt +++ b/docs/COLO-FT.txt @@ -113,16 +113,16 @@ by using 'x-colo-lost-heartbeat' command. =3D=3D Test procedure =3D=3D 1. Startup qemu Primary: -# qemu-kvm -enable-kvm -m 2048 -smp 2 -qmp stdio -vnc :7 -name primary \ - -device piix3-usb-uhci \ +# qemu-system-x86_64 -accel kvm -m 2048 -smp 2 -qmp stdio -name primary \ + -device piix3-usb-uhci -vnc :7 \ -device usb-tablet -netdev tap,id=3Dhn0,vhost=3Doff \ -device virtio-net-pci,id=3Dnet-pci0,netdev=3Dhn0 \ -drive if=3Dvirtio,id=3Dprimary-disk0,driver=3Dquorum,read-pattern=3Dfif= o,vote-threshold=3D1,\ children.0.file.filename=3D1.raw,\ children.0.driver=3Draw -S Secondary: -# qemu-kvm -enable-kvm -m 2048 -smp 2 -qmp stdio -vnc :7 -name secondary \ - -device piix3-usb-uhci \ +# qemu-system-x86_64 -accel kvm -m 2048 -smp 2 -qmp stdio -name secondary \ + -device piix3-usb-uhci -vnc :7 \ -device usb-tablet -netdev tap,id=3Dhn0,vhost=3Doff \ -device virtio-net-pci,id=3Dnet-pci0,netdev=3Dhn0 \ -drive if=3Dnone,id=3Dsecondary-disk0,file.filename=3D1.raw,driver=3Draw= ,node-name=3Dnode0 \ diff --git a/docs/can.txt b/docs/can.txt index a357105..7ba23b2 100644 --- a/docs/can.txt +++ b/docs/can.txt @@ -52,7 +52,7 @@ The ''kvaser_pci'' board/device model is compatible with = and has been tested wit The tested setup was Linux 4.9 kernel on the host and guest side. Example for qemu-system-x86_64: =20 - qemu-system-x86_64 -enable-kvm -kernel /boot/vmlinuz-4.9.0-4-amd64 \ + qemu-system-x86_64 -accel kvm -kernel /boot/vmlinuz-4.9.0-4-amd64 \ -initrd ramdisk.cpio \ -virtfs local,path=3Dshareddir,security_model=3Dnone,mount_tag=3Dsha= reddir \ -object can-bus,id=3Dcanbus0 \ @@ -104,4 +104,4 @@ Links to other resources Slides http://rtime.felk.cvut.cz/publications/public/rtlws2015-qemu-can-slid= es.pdf (5) Linux SocketCAN utilities - https://github.com/linux-can/can-utils/ \ No newline at end of file + https://github.com/linux-can/can-utils/ diff --git a/docs/multi-thread-compression.txt b/docs/multi-thread-compress= ion.txt index d0caaf7..bb88c6b 100644 --- a/docs/multi-thread-compression.txt +++ b/docs/multi-thread-compression.txt @@ -62,7 +62,7 @@ RAM: 128G NIC: Intel I350 (10/100/1000Mbps) Host OS: CentOS 7 64-bit Guest OS: RHEL 6.5 64-bit -Parameter: qemu-system-x86_64 -enable-kvm -smp 4 -m 4096 +Parameter: qemu-system-x86_64 -accel kvm -smp 4 -m 4096 /share/ia32e_rhel6u5.qcow -monitor stdio =20 There is no additional application is running on the guest when doing diff --git a/docs/multiseat.txt b/docs/multiseat.txt index 807518c..dc28cdb 100644 --- a/docs/multiseat.txt +++ b/docs/multiseat.txt @@ -18,7 +18,7 @@ or =20 Next put together the qemu command line (sdk/gtk): =20 -qemu -enable-kvm -usb $memory $disk $whatever \ +qemu -accel kvm -usb $memory $disk $whatever \ -display [ sdl | gtk ] \ -vga std \ -device usb-tablet diff --git a/docs/specs/tpm.txt b/docs/specs/tpm.txt index c230c4c..70ad4a0 100644 --- a/docs/specs/tpm.txt +++ b/docs/specs/tpm.txt @@ -98,7 +98,7 @@ QEMU files related to the TPM passthrough device: Command line to start QEMU with the TPM passthrough device using the host's hardware TPM /dev/tpm0: =20 -qemu-system-x86_64 -display sdl -enable-kvm \ +qemu-system-x86_64 -display sdl -accel kvm \ -m 1024 -boot d -bios bios-256k.bin -boot menu=3Don \ -tpmdev passthrough,id=3Dtpm0,path=3D/dev/tpm0 \ -device tpm-tis,tpmdev=3Dtpm0 test.img @@ -164,7 +164,7 @@ swtpm socket --tpmstate dir=3D/tmp/mytpm1 \ Command line to start QEMU with the TPM emulator device communicating with the swtpm: =20 -qemu-system-x86_64 -display sdl -enable-kvm \ +qemu-system-x86_64 -display sdl -accel kvm \ -m 1024 -boot d -bios bios-256k.bin -boot menu=3Don \ -chardev socket,id=3Dchrtpm,path=3D/tmp/mytpm1/swtpm-sock \ -tpmdev emulator,id=3Dtpm0,chardev=3Dchrtpm \ @@ -222,7 +222,7 @@ swtpm socket --tpmstate dir=3D/tmp/mytpm1 \ =20 In a 2nd terminal start the VM: =20 -qemu-system-x86_64 -display sdl -enable-kvm \ +qemu-system-x86_64 -display sdl -accel kvm \ -m 1024 -boot d -bios bios-256k.bin -boot menu=3Don \ -chardev socket,id=3Dchrtpm,path=3D/tmp/mytpm1/swtpm-sock \ -tpmdev emulator,id=3Dtpm0,chardev=3Dchrtpm \ @@ -255,7 +255,7 @@ swtpm socket --tpmstate dir=3D/tmp/mytpm1 \ In the 2nd terminal restore the state of the VM using the additonal '-incoming' option. =20 -qemu-system-x86_64 -display sdl -enable-kvm \ +qemu-system-x86_64 -display sdl -accel kvm \ -m 1024 -boot d -bios bios-256k.bin -boot menu=3Don \ -chardev socket,id=3Dchrtpm,path=3D/tmp/mytpm1/swtpm-sock \ -tpmdev emulator,id=3Dtpm0,chardev=3Dchrtpm \ diff --git a/hw/block/dataplane/virtio-blk.c b/hw/block/dataplane/virtio-bl= k.c index d648aeb..8c37bd3 100644 --- a/hw/block/dataplane/virtio-blk.c +++ b/hw/block/dataplane/virtio-blk.c @@ -190,8 +190,8 @@ int virtio_blk_data_plane_start(VirtIODevice *vdev) /* Set up guest notifier (irq) */ r =3D k->set_guest_notifiers(qbus->parent, nvqs, true); if (r !=3D 0) { - fprintf(stderr, "virtio-blk failed to set guest notifier (%d), " - "ensure -enable-kvm is set\n", r); + error_report("virtio-blk failed to set guest notifier (%d), " + "ensure -accel kvm is set.", r); goto fail_guest_notifiers; } =20 diff --git a/hw/scsi/virtio-scsi-dataplane.c b/hw/scsi/virtio-scsi-dataplan= e.c index 912e500..b995bab 100644 --- a/hw/scsi/virtio-scsi-dataplane.c +++ b/hw/scsi/virtio-scsi-dataplane.c @@ -142,8 +142,8 @@ int virtio_scsi_dataplane_start(VirtIODevice *vdev) /* Set up guest notifier (irq) */ rc =3D k->set_guest_notifiers(qbus->parent, vs->conf.num_queues + 2, t= rue); if (rc !=3D 0) { - fprintf(stderr, "virtio-scsi: Failed to set guest notifiers (%d), " - "ensure -enable-kvm is set\n", rc); + error_report("virtio-scsi: Failed to set guest notifiers (%d), " + "ensure -accel kvm is set.", rc); goto fail_guest_notifiers; } =20 --=20 1.8.3.1