From nobody Sun May 19 21:56:44 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.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; spf=pass (zoho.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=1563974030; cv=none; d=zoho.com; s=zohoarc; b=O8eF/owiKJrRoKCNjMEC413M+Kzn8pXhGqh3ylAsmyudhLXkBTZwcEaMOHtbdVwrDME0YutKxY/4kHao29hZPv/rG1F9q6BeeC+ZBJBGEB2FqMQ0gdzgatRzMrAkmu8PPZPXPAgCivqUXprZqQ6Wz+4onv0lWT/hKL2J/nedelQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1563974030; 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:ARC-Authentication-Results; bh=9bVhNv4zG2Lwo2QpRCuYxQEmY6qxU+aEsvloF46DX4I=; b=a7Fpu11IC9PDLbuWhKNtVI3WlhF9PxjPMh+ETP7xYqv8Rmj2Fxdp8Nm0wFnSnRXYV/UT52xcM6W9BYVS1w5xPkJpEF++NvYR0Qmwpwn6BwiIaBT/6yepMmlvLx19F89gCnVszMlQY+FzSfL58qh2hiKN1WGnXo7PvASRr2qFox0= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.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 1563974030043533.2334490107736; Wed, 24 Jul 2019 06:13:50 -0700 (PDT) Received: from localhost ([::1]:51591 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hqH5W-0006dQ-A3 for importer@patchew.org; Wed, 24 Jul 2019 09:13:46 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:35295) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hqH50-0005GY-S5 for qemu-devel@nongnu.org; Wed, 24 Jul 2019 09:13:16 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hqH4z-0007ux-JX for qemu-devel@nongnu.org; Wed, 24 Jul 2019 09:13:14 -0400 Received: from mx1.redhat.com ([209.132.183.28]:47216) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hqH4z-0007uI-BX for qemu-devel@nongnu.org; Wed, 24 Jul 2019 09:13:13 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 9A7F330917AB; Wed, 24 Jul 2019 13:13:12 +0000 (UTC) Received: from donizetti.redhat.com (ovpn-112-43.ams2.redhat.com [10.36.112.43]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8D72C5C225; Wed, 24 Jul 2019 13:13:11 +0000 (UTC) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Wed, 24 Jul 2019 15:13:07 +0200 Message-Id: <20190724131309.1378-2-pbonzini@redhat.com> In-Reply-To: <20190724131309.1378-1-pbonzini@redhat.com> References: <20190724131309.1378-1-pbonzini@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.41]); Wed, 24 Jul 2019 13:13:12 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PULL 1/3] virtio-scsi: fixed virtio_scsi_ctx_check failed when detaching scsi disk 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: Zhengui li Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" From: Zhengui li commit a6f230c move blockbackend back to main AioContext on unplug. It set = the AioContext of SCSIDevice to the main AioContex, but s->ctx is still the iothread AioConte= x=C3=AF=C2=BC=CB=86if the scsi controller is configure with iothread=C3=AF=C2=BC=E2=80=B0. So if there are having in-= flight requests during unplug, a failing assertion happend. The bt is below: (gdb) bt #0 0x0000ffff86aacbd0 in raise () from /lib64/libc.so.6 #1 0x0000ffff86aadf7c in abort () from /lib64/libc.so.6 #2 0x0000ffff86aa6124 in __assert_fail_base () from /lib64/libc.so.6 #3 0x0000ffff86aa61a4 in __assert_fail () from /lib64/libc.so.6 #4 0x0000000000529118 in virtio_scsi_ctx_check (d=3D, s=3D<= optimized out>, s=3D) at /home/qemu-4.0.0/hw/scsi/virtio-scs= i.c:246 #5 0x0000000000529ec4 in virtio_scsi_handle_cmd_req_prepare (s=3D0x2779ec0= 0, req=3D0xffff740397d0) at /home/qemu-4.0.0/hw/scsi/virtio-scsi.c:559 #6 0x000000000052a228 in virtio_scsi_handle_cmd_vq (s=3D0x2779ec00, vq=3D0= xffff7c6d7110) at /home/qemu-4.0.0/hw/scsi/virtio-scsi.c:603 #7 0x000000000052afa8 in virtio_scsi_data_plane_handle_cmd (vdev=3D, vq=3D0xffff7c6d7110) at /home/qemu-4.0.0/hw/scsi/virtio-scsi-data= plane.c:59 #8 0x000000000054d94c in virtio_queue_host_notifier_aio_poll (opaque=3D) at /home/qemu-4.0.0/hw/virtio/virtio.c:2452 assert(blk_get_aio_context(d->conf.blk) =3D=3D s->ctx) failed. To avoid assertion failed, moving the "if" after qdev_simple_device_unplug= _cb. In addition, to avoid another qemu crash below, add aio_disable_external be= fore qdev_simple_device_unplug_cb, which disable the further processing of exter= nal clients when doing qdev_simple_device_unplug_cb. (gdb) bt #0 scsi_req_unref (req=3D0xffff6802c6f0) at hw/scsi/scsi-bus.c:1283 #1 0x00000000005294a4 in virtio_scsi_handle_cmd_req_submit (req=3D, s=3D) at /home/qemu-4.0.0/hw/scsi/virtio-scsi.c:589 #2 0x000000000052a2a8 in virtio_scsi_handle_cmd_vq (s=3Ds@entry=3D0x9c90e9= 0, vq=3Dvq@entry=3D0xffff7c05f110) at /home/qemu-4.0.0/hw/scsi/virtio-scsi= .c:625 #3 0x000000000052afd8 in virtio_scsi_data_plane_handle_cmd (vdev=3D, vq=3D0xffff7c05f110) at /home/qemu-4.0.0/hw/scsi/virtio-scsi-dataplane.= c:60 #4 0x000000000054d97c in virtio_queue_host_notifier_aio_poll (opaque=3D) at /home/qemu-4.0.0/hw/virtio/virtio.c:2447 #5 0x00000000009b204c in run_poll_handlers_once (ctx=3Dctx@entry=3D0x6efea= 40, timeout=3Dtimeout@entry=3D0xffff7d7f7308) at util/aio-posix.c:521 #6 0x00000000009b2b64 in run_poll_handlers (ctx=3Dctx@entry=3D0x6efea40, max_ns=3Dmax_ns@entry=3D4000, timeout=3Dtimeout@entry=3D0xffff7d7f7308)= at util/aio-posix.c:559 #7 0x00000000009b2ca0 in try_poll_mode (ctx=3Dctx@entry=3D0x6efea40, timeo= ut=3D0xffff7d7f7308, timeout@entry=3D0xffff7d7f7348) at util/aio-posix.c:594 #8 0x00000000009b31b8 in aio_poll (ctx=3D0x6efea40, blocking=3Dblocking@en= try=3Dtrue) at util/aio-posix.c:636 #9 0x00000000006973cc in iothread_run (opaque=3D0x6ebd800) at iothread.c:75 #10 0x00000000009b592c in qemu_thread_start (args=3D0x6efef60) at util/qemu= -thread-posix.c:502 #11 0x0000ffff8057f8bc in start_thread () from /lib64/libpthread.so.0 #12 0x0000ffff804e5f8c in thread_start () from /lib64/libc.so.6 (gdb) p bus $1 =3D (SCSIBus *) 0x0 Signed-off-by: Zhengui li Message-Id: <1563696502-7972-1-git-send-email-lizhengui@huawei.com> Signed-off-by: Paolo Bonzini Message-Id: <1563829520-17525-1-git-send-email-pbonzini@redhat.com> Signed-off-by: Paolo Bonzini --- hw/scsi/virtio-scsi.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/hw/scsi/virtio-scsi.c b/hw/scsi/virtio-scsi.c index d0bdbff090..8b9e5e2b49 100644 --- a/hw/scsi/virtio-scsi.c +++ b/hw/scsi/virtio-scsi.c @@ -832,6 +832,7 @@ static void virtio_scsi_hotunplug(HotplugHandler *hotpl= ug_dev, DeviceState *dev, VirtIODevice *vdev =3D VIRTIO_DEVICE(hotplug_dev); VirtIOSCSI *s =3D VIRTIO_SCSI(vdev); SCSIDevice *sd =3D SCSI_DEVICE(dev); + AioContext *ctx =3D s->ctx ?: qemu_get_aio_context(); =20 if (virtio_vdev_has_feature(vdev, VIRTIO_SCSI_F_HOTPLUG)) { virtio_scsi_acquire(s); @@ -841,14 +842,16 @@ static void virtio_scsi_hotunplug(HotplugHandler *hot= plug_dev, DeviceState *dev, virtio_scsi_release(s); } =20 + aio_disable_external(ctx); + qdev_simple_device_unplug_cb(hotplug_dev, dev, errp); + aio_enable_external(ctx); + if (s->ctx) { virtio_scsi_acquire(s); /* If other users keep the BlockBackend in the iothread, that's ok= */ blk_set_aio_context(sd->conf.blk, qemu_get_aio_context(), NULL); virtio_scsi_release(s); } - - qdev_simple_device_unplug_cb(hotplug_dev, dev, errp); } =20 static struct SCSIBusInfo virtio_scsi_scsi_info =3D { --=20 2.21.0 From nobody Sun May 19 21:56:44 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.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; spf=pass (zoho.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=1563974048; cv=none; d=zoho.com; s=zohoarc; b=lKDbEHTwslEaUxEWOlNZRIIsIIho2KFeEA2ffMPRa9wK0UvS9nrpIRVuTcSlahNbtQNXBD9OQQ4agNiSfV+QxpVfXfOtaIBZVzlHO+XE40NZQEjd+054/5AgrtSkuUU1NCYpsoKrBOmPe9NjEOxXlQ6xEP4fZELs9eBIFiS6wsU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1563974048; h=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:ARC-Authentication-Results; bh=S9KESTYrcgPINX7UL1BC6YevFbL50sbGlmw8FkjyLSo=; b=VmwmGs1eignXcQvcOuoKUNG8gTNm3XUQyBsy6XQOwXOr0K8cW2eiCnNVQGzE8Of4B5J+Hcp+G5nueZurjSuIfJJTsH0bUgPZEWBLVa4fIZQ52hB0GWSRlWmnqwSEFdH9z7gI/pBBo3q9cMLda/AsvkjwlwO/45t7RaxE3Vo+xe8= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.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 1563974048374359.777984502687; Wed, 24 Jul 2019 06:14:08 -0700 (PDT) Received: from localhost ([::1]:51604 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hqH5r-0008QJ-C4 for importer@patchew.org; Wed, 24 Jul 2019 09:14:07 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:35311) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hqH51-0005Jf-S2 for qemu-devel@nongnu.org; Wed, 24 Jul 2019 09:13:16 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hqH50-0007vj-Tv for qemu-devel@nongnu.org; Wed, 24 Jul 2019 09:13:15 -0400 Received: from mx1.redhat.com ([209.132.183.28]:54468) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hqH50-0007vI-OQ for qemu-devel@nongnu.org; Wed, 24 Jul 2019 09:13:14 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id F36E3300D1CA; Wed, 24 Jul 2019 13:13:13 +0000 (UTC) Received: from donizetti.redhat.com (ovpn-112-43.ams2.redhat.com [10.36.112.43]) by smtp.corp.redhat.com (Postfix) with ESMTP id F1A315C225; Wed, 24 Jul 2019 13:13:12 +0000 (UTC) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Wed, 24 Jul 2019 15:13:08 +0200 Message-Id: <20190724131309.1378-3-pbonzini@redhat.com> In-Reply-To: <20190724131309.1378-1-pbonzini@redhat.com> References: <20190724131309.1378-1-pbonzini@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.40]); Wed, 24 Jul 2019 13:13:14 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PULL 2/3] i386/kvm: Do not sync nested state during runtime 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: Jan Kiszka Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" From: Jan Kiszka Writing the nested state e.g. after a vmport access can invalidate important parts of the kernel-internal state, and it is not needed as well. So leave this out from KVM_PUT_RUNTIME_STATE. Suggested-by: Paolo Bonzini Signed-off-by: Jan Kiszka Message-Id: Signed-off-by: Paolo Bonzini --- target/i386/kvm.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/target/i386/kvm.c b/target/i386/kvm.c index ada89d27cc..dbbb13772a 100644 --- a/target/i386/kvm.c +++ b/target/i386/kvm.c @@ -3563,12 +3563,12 @@ int kvm_arch_put_registers(CPUState *cpu, int level) =20 assert(cpu_is_stopped(cpu) || qemu_cpu_is_self(cpu)); =20 - ret =3D kvm_put_nested_state(x86_cpu); - if (ret < 0) { - return ret; - } - if (level >=3D KVM_PUT_RESET_STATE) { + ret =3D kvm_put_nested_state(x86_cpu); + if (ret < 0) { + return ret; + } + ret =3D kvm_put_msr_feature_control(x86_cpu); if (ret < 0) { return ret; --=20 2.21.0 From nobody Sun May 19 21:56:44 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.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; spf=pass (zoho.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=1563974034; cv=none; d=zoho.com; s=zohoarc; b=El0R1HbG/xfLuwKs6cDHxOu9GBI4FcbepvVXechUgGTzjry59Xq5fdX8lJA9I3tPJ4i1TieJB4nWzuwRr6cXcwh1O/f9EVUGirsOnABKHnIf0a95l6sSGzI4LT5K23lQb91nwB9m/FB3qbYu++CknrQrTsc/8RGWEfFnPrPnRGo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1563974034; 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:ARC-Authentication-Results; bh=uPrScZrSdO6k5YKJkfFSXqS7HpEl8p3ZG3+7ixT9y5Y=; b=PNHF48XwJuZ5eamNZYy2lEBGutpoMuZn2ZrrznPRYtDG9aUJl6ygMwM41cY4YJEm3ESPM3OEYL/lit3sVgZOhQt/rli5EbJzGyhLQX0xFwhxlrZE4sqj91iLLhUPuX8EtPSJU6XpYCjsh7/kXMivZu6xiflDWa4nFWlAMz33NZU= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.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 1563974034106549.0931082106854; Wed, 24 Jul 2019 06:13:54 -0700 (PDT) Received: from localhost ([::1]:51592 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hqH5b-00071D-Af for importer@patchew.org; Wed, 24 Jul 2019 09:13:51 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:35349) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hqH55-0005Uc-C3 for qemu-devel@nongnu.org; Wed, 24 Jul 2019 09:13:20 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hqH54-0007x9-8B for qemu-devel@nongnu.org; Wed, 24 Jul 2019 09:13:19 -0400 Received: from mx1.redhat.com ([209.132.183.28]:56142) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hqH54-0007wn-2o for qemu-devel@nongnu.org; Wed, 24 Jul 2019 09:13:18 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 6566430C26A8 for ; Wed, 24 Jul 2019 13:13:17 +0000 (UTC) Received: from donizetti.redhat.com (ovpn-112-43.ams2.redhat.com [10.36.112.43]) by smtp.corp.redhat.com (Postfix) with ESMTP id 67A215C225; Wed, 24 Jul 2019 13:13:14 +0000 (UTC) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Wed, 24 Jul 2019 15:13:09 +0200 Message-Id: <20190724131309.1378-4-pbonzini@redhat.com> In-Reply-To: <20190724131309.1378-1-pbonzini@redhat.com> References: <20190724131309.1378-1-pbonzini@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.47]); Wed, 24 Jul 2019 13:13:17 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PULL 3/3] docs: correct kconfig option 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: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" From: Marc-Andr=C3=A9 Lureau Signed-off-by: Marc-Andr=C3=A9 Lureau Message-Id: <20190723120804.29565-1-marcandre.lureau@redhat.com> Signed-off-by: Paolo Bonzini --- docs/devel/kconfig.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/devel/kconfig.rst b/docs/devel/kconfig.rst index d6f8eb0977..b7bca44704 100644 --- a/docs/devel/kconfig.rst +++ b/docs/devel/kconfig.rst @@ -267,7 +267,7 @@ the default configuration by uncommenting lines in the = first group, or commenting out lines in the second group. =20 It is also possible to run QEMU's configure script with the -``--with-default-devices`` option. When this is done, everything defaults +``--without-default-devices`` option. When this is done, everything defau= lts to ``n`` unless it is ``select``ed or explicitly switched on in the ``.mak`` files. In other words, ``default`` and ``imply`` directives are disabled. When QEMU is built with this option, the user will probably --=20 2.21.0