Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/2218734/?format=api
{ "id": 2218734, "url": "http://patchwork.ozlabs.org/api/patches/2218734/?format=api", "web_url": "http://patchwork.ozlabs.org/project/qemu-devel/patch/20260401201753.92290-3-philmd@linaro.org/", "project": { "id": 14, "url": "http://patchwork.ozlabs.org/api/projects/14/?format=api", "name": "QEMU Development", "link_name": "qemu-devel", "list_id": "qemu-devel.nongnu.org", "list_email": "qemu-devel@nongnu.org", "web_url": "", "scm_url": "", "webscm_url": "", "list_archive_url": "", "list_archive_url_format": "", "commit_url_format": "" }, "msgid": "<20260401201753.92290-3-philmd@linaro.org>", "list_archive_url": null, "date": "2026-04-01T20:17:46", "name": "[PATCH-for-11.1,2/8] accel/kvm: Remove TARGET_KVM_HAVE_GUEST_DEBUG", "commit_ref": null, "pull_url": null, "state": "new", "archived": false, "hash": "2a0b9d2a0ebb963f11560439e7375f2803ffd192", "submitter": { "id": 85046, "url": "http://patchwork.ozlabs.org/api/people/85046/?format=api", "name": "Philippe Mathieu-Daudé", "email": "philmd@linaro.org" }, "delegate": null, "mbox": "http://patchwork.ozlabs.org/project/qemu-devel/patch/20260401201753.92290-3-philmd@linaro.org/mbox/", "series": [ { "id": 498384, "url": "http://patchwork.ozlabs.org/api/series/498384/?format=api", "web_url": "http://patchwork.ozlabs.org/project/qemu-devel/list/?series=498384", "date": "2026-04-01T20:17:44", "name": "target/arm: Compile accelerator-related objects as common code", "version": 1, "mbox": "http://patchwork.ozlabs.org/series/498384/mbox/" } ], "comments": "http://patchwork.ozlabs.org/api/patches/2218734/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/2218734/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>", "X-Original-To": "incoming@patchwork.ozlabs.org", "Delivered-To": "patchwork-incoming@legolas.ozlabs.org", "Authentication-Results": [ "legolas.ozlabs.org;\n\tdkim=pass (2048-bit key;\n unprotected) header.d=linaro.org header.i=@linaro.org header.a=rsa-sha256\n header.s=google header.b=kSyvrP/N;\n\tdkim-atps=neutral", "legolas.ozlabs.org;\n spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org\n (client-ip=209.51.188.17; helo=lists.gnu.org;\n envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org;\n receiver=patchwork.ozlabs.org)" ], "Received": [ "from lists.gnu.org (lists.gnu.org [209.51.188.17])\n\t(using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits))\n\t(No client certificate requested)\n\tby legolas.ozlabs.org (Postfix) with ESMTPS id 4fmGXR0qfMz1yCs\n\tfor <incoming@patchwork.ozlabs.org>; Thu, 02 Apr 2026 07:18:45 +1100 (AEDT)", "from localhost ([::1] helo=lists1p.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.90_1)\n\t(envelope-from <qemu-devel-bounces@nongnu.org>)\n\tid 1w8215-00035r-Go; Wed, 01 Apr 2026 16:18:19 -0400", "from eggs.gnu.org ([2001:470:142:3::10])\n by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)\n (Exim 4.90_1) (envelope-from <philmd@linaro.org>) id 1w8213-0002x8-Fo\n for qemu-devel@nongnu.org; Wed, 01 Apr 2026 16:18:17 -0400", "from mail-wm1-x32d.google.com ([2a00:1450:4864:20::32d])\n by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128)\n (Exim 4.90_1) (envelope-from <philmd@linaro.org>) id 1w8210-0001aQ-8h\n for qemu-devel@nongnu.org; Wed, 01 Apr 2026 16:18:17 -0400", "by mail-wm1-x32d.google.com with SMTP id\n 5b1f17b1804b1-4887f49ec5aso1574945e9.1\n for <qemu-devel@nongnu.org>; Wed, 01 Apr 2026 13:18:13 -0700 (PDT)", "from localhost.localdomain (88-187-86-199.subs.proxad.net.\n [88.187.86.199]) by smtp.gmail.com with ESMTPSA id\n 5b1f17b1804b1-4888955d711sm39365835e9.9.2026.04.01.13.18.10\n (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256);\n Wed, 01 Apr 2026 13:18:11 -0700 (PDT)" ], "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n d=linaro.org; s=google; t=1775074692; x=1775679492; darn=nongnu.org;\n h=content-transfer-encoding:mime-version:references:in-reply-to\n :message-id:date:subject:cc:to:from:from:to:cc:subject:date\n :message-id:reply-to;\n bh=S1TEVy+T6k35I4U9/R8HmPKI1jXLjO9MCcFaUnfIfQ4=;\n b=kSyvrP/NsiKo+7FNADxkKcjvYuC5DQ4VfDPYCZjoHQQ/cC8FWzV0K+09cWOuTRUSLx\n tYXigCpweFBSSwXsd0q/uH+JlfDwGHi+6CkqrdAuq/eb6qtDhjTZl5nvstvnP706sR9Z\n qDoiId8RseSFrj4iy8TBT8fAeMEZyUJmB3bMzMl9uqASrfYkKlzI17+zwAhWLUEDtDfP\n UMsAJoe3Zg98N7fCogm3g81RWyQwH5UGRkRBWh/XC68xcs57KVEBgb/YMc1zPGatweoo\n XW7RzMcN9HSxkQNDoawBiwXF48tpL5B4YCC+bH7z115ITegIIpV11jmn8oHKbBhPD6Gq\n lMqQ==", "X-Google-DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n d=1e100.net; s=20251104; t=1775074692; x=1775679492;\n h=content-transfer-encoding:mime-version:references:in-reply-to\n :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from\n :to:cc:subject:date:message-id:reply-to;\n bh=S1TEVy+T6k35I4U9/R8HmPKI1jXLjO9MCcFaUnfIfQ4=;\n b=eqr2Z6l1Bur5OpyAiVCbMVYrwsKW5d/13tJW2KRr6/zE5fM9rfG69/xxBGtV2XeFtr\n 1s4pPw7MeZQvQRvOnHOWqqa/pmyOx8+DNzg+uKjmplAO/JoYd4DANQANODuBKLz0Bj3r\n kiTliGlY+mKN7y4G10m427QvK4qzd45GUdDKWVXoXiF40y4QHid77s+FlCkDeFzQWDt0\n EJ2xPHtluHVvrXmDj811d6JYHuYaFc0700h9NNh+HBn+R7vNffTi86jQ1eCBE9YhlynZ\n cxPjJgpx1uec34ozcFtKlMkp0Ex7l70ioT+dhnaJre9/kUnAjgAvEoaaSOVsL9aTXh/D\n iGew==", "X-Gm-Message-State": "AOJu0YwRhhDKJihXLSzzI3B6fV61I+LbD1pSWHh3OpPJUBnVrPy8x1ol\n LixYsl/DqtmEArjFQ448WiMIbnMQT7dPI+wXt+v/kLVO5MBU8WN4H4qmUgYLpwTlGcmlUDSpxyt\n d22QKhb4=", "X-Gm-Gg": "ATEYQzzuX1wA7YcQBU+PcWqfU+BFMppTMgSw3XP+GNp/pyvvuMR2B3prpOsLNOFix76\n ZaoW11aD72LZrRo3Bn7G+pl4qVusBr+a814k7wfiI2aVJ3I4299AK1EGZ+6YWtcOmKlE2Ei8veC\n NKcmyr4qFHc5jBRY0tKBwaTn0RwuZiuzhJmRBtVg/dk1IAMA4sJkdDdCJerkfUFi3JhE9/CYPEn\n j6UtTn/Fqj+g3+simdW0D8fQ207RUQnFLxXq1UzhXE/064cd3IxWPlp5omOBaiMhyr54BNyV1mP\n 6I4OtRvDSd05zn2URpxg7tJ6Wxp+7EXtlT/4xSEU+kWRHnDueXTm9WfyMeeiVV5/Hy/KEsiVshx\n /jHz8uNezguGjkHM6Y8z4CLnGLQYgdl3/F0K8jQ+85ghGvQ/pBF/766+HdY7VfaU5eY5iLgkaOR\n BoUrRjprFOpoMfZWeyhJD/96AuWBEaMqhUcT0/4R3chHcnuutp6GZ8ZCa355MWyiPTI5kCYCCH", "X-Received": "by 2002:a05:600c:34c4:b0:485:3b9e:caa7 with SMTP id\n 5b1f17b1804b1-48883597b55mr94970015e9.23.1775074692245;\n Wed, 01 Apr 2026 13:18:12 -0700 (PDT)", "From": "=?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= <philmd@linaro.org>", "To": "qemu-devel@nongnu.org", "Cc": "Eric Farman <farman@linux.ibm.com>,\n Alistair Francis <alistair.francis@wdc.com>,\n Palmer Dabbelt <palmer@dabbelt.com>, Paolo Bonzini <pbonzini@redhat.com>,\n Matthew Rosato <mjrosato@linux.ibm.com>,\n Daniel Henrique Barboza <daniel.barboza@oss.qualcomm.com>,\n Pierrick Bouvier <pierrick.bouvier@linaro.org>, kvm@vger.kernel.org,\n Peter Maydell <peter.maydell@linaro.org>,\n Huacai Chen <chenhuacai@kernel.org>, qemu-riscv@nongnu.org,\n Alexander Graf <agraf@csgraf.de>, Pedro Barbuda <pbarbuda@microsoft.com>,\n Anton Johansson <anjo@rev.ng>, Song Gao <gaosong@loongson.cn>,\n Weiwei Li <liwei1518@gmail.com>, Aleksandar Rikalo <arikalo@gmail.com>,\n Liu Zhiwei <zhiwei_liu@linux.alibaba.com>, Cornelia Huck <cohuck@redhat.com>,\n qemu-s390x@nongnu.org, Chao Liu <chao.liu.zevorn@gmail.com>,\n Bibo Mao <maobibo@loongson.cn>, qemu-arm@nongnu.org,\n Jiaxun Yang <jiaxun.yang@flygoat.com>,\n Mohamed Mediouni <mohamed@unpredictable.fr>, Zhao Liu <zhao1.liu@intel.com>,\n\t=?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= <philmd@linaro.org>,\n Aurelien Jarno <aurelien@aurel32.net>", "Subject": "[PATCH-for-11.1 2/8] accel/kvm: Remove TARGET_KVM_HAVE_GUEST_DEBUG", "Date": "Wed, 1 Apr 2026 22:17:46 +0200", "Message-ID": "<20260401201753.92290-3-philmd@linaro.org>", "X-Mailer": "git-send-email 2.53.0", "In-Reply-To": "<20260401201753.92290-1-philmd@linaro.org>", "References": "<20260401201753.92290-1-philmd@linaro.org>", "MIME-Version": "1.0", "Content-Type": "text/plain; charset=UTF-8", "Content-Transfer-Encoding": "8bit", "Received-SPF": "pass client-ip=2a00:1450:4864:20::32d;\n envelope-from=philmd@linaro.org; helo=mail-wm1-x32d.google.com", "X-Spam_score_int": "-20", "X-Spam_score": "-2.1", "X-Spam_bar": "--", "X-Spam_report": "(-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1,\n DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1,\n RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001,\n SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no", "X-Spam_action": "no action", "X-BeenThere": "qemu-devel@nongnu.org", "X-Mailman-Version": "2.1.29", "Precedence": "list", "List-Id": "qemu development <qemu-devel.nongnu.org>", "List-Unsubscribe": "<https://lists.nongnu.org/mailman/options/qemu-devel>,\n <mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>", "List-Archive": "<https://lists.nongnu.org/archive/html/qemu-devel>", "List-Post": "<mailto:qemu-devel@nongnu.org>", "List-Help": "<mailto:qemu-devel-request@nongnu.org?subject=help>", "List-Subscribe": "<https://lists.nongnu.org/mailman/listinfo/qemu-devel>,\n <mailto:qemu-devel-request@nongnu.org?subject=subscribe>", "Errors-To": "qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org", "Sender": "qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org" }, "content": "All targets except MIPS have TARGET_KVM_HAVE_GUEST_DEBUG=y.\nDeclare the kvm_update_guest_debug() stub to MIPS and have\nTARGET_KVM_HAVE_GUEST_DEBUG be the default.\n\nSigned-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>\n---\n configs/targets/aarch64-softmmu.mak | 1 -\n configs/targets/i386-softmmu.mak | 1 -\n configs/targets/loongarch64-softmmu.mak | 1 -\n configs/targets/ppc-softmmu.mak | 1 -\n configs/targets/ppc64-softmmu.mak | 1 -\n configs/targets/riscv64-softmmu.mak | 1 -\n configs/targets/s390x-softmmu.mak | 1 -\n configs/targets/x86_64-softmmu.mak | 1 -\n include/system/kvm.h | 7 -------\n include/system/kvm_int.h | 2 --\n accel/kvm/kvm-accel-ops.c | 4 ----\n accel/kvm/kvm-all.c | 13 ++-----------\n target/mips/kvm.c | 5 +++++\n 13 files changed, 7 insertions(+), 32 deletions(-)", "diff": "diff --git a/configs/targets/aarch64-softmmu.mak b/configs/targets/aarch64-softmmu.mak\nindex d34aead41c4..6f60ca6505c 100644\n--- a/configs/targets/aarch64-softmmu.mak\n+++ b/configs/targets/aarch64-softmmu.mak\n@@ -1,6 +1,5 @@\n TARGET_ARCH=aarch64\n TARGET_BASE_ARCH=arm\n-TARGET_KVM_HAVE_GUEST_DEBUG=y\n TARGET_XML_FILES= aarch64-core.xml aarch64-fpu.xml arm-core.xml arm-vfp.xml arm-vfp3.xml arm-vfp-sysregs.xml arm-neon.xml arm-m-profile.xml arm-m-profile-mve.xml aarch64-pauth.xml aarch64-sme2.xml\n # needed by boot.c\n TARGET_NEED_FDT=y\ndiff --git a/configs/targets/i386-softmmu.mak b/configs/targets/i386-softmmu.mak\nindex 38a8f85201f..2eef68dc55e 100644\n--- a/configs/targets/i386-softmmu.mak\n+++ b/configs/targets/i386-softmmu.mak\n@@ -1,5 +1,4 @@\n TARGET_ARCH=i386\n-TARGET_KVM_HAVE_GUEST_DEBUG=y\n TARGET_KVM_HAVE_RESET_PARKED_VCPU=y\n TARGET_XML_FILES= i386-32bit.xml\n TARGET_LONG_BITS=32\ndiff --git a/configs/targets/loongarch64-softmmu.mak b/configs/targets/loongarch64-softmmu.mak\nindex 476407f9413..7e0b1ab5d05 100644\n--- a/configs/targets/loongarch64-softmmu.mak\n+++ b/configs/targets/loongarch64-softmmu.mak\n@@ -1,6 +1,5 @@\n TARGET_ARCH=loongarch64\n TARGET_BASE_ARCH=loongarch\n-TARGET_KVM_HAVE_GUEST_DEBUG=y\n TARGET_XML_FILES= loongarch-base32.xml loongarch-base64.xml loongarch-fpu.xml loongarch-lsx.xml loongarch-lasx.xml\n # all boards require libfdt\n TARGET_NEED_FDT=y\ndiff --git a/configs/targets/ppc-softmmu.mak b/configs/targets/ppc-softmmu.mak\nindex 867898bd47c..c47887f8992 100644\n--- a/configs/targets/ppc-softmmu.mak\n+++ b/configs/targets/ppc-softmmu.mak\n@@ -1,5 +1,4 @@\n TARGET_ARCH=ppc\n TARGET_BIG_ENDIAN=y\n-TARGET_KVM_HAVE_GUEST_DEBUG=y\n TARGET_XML_FILES= power-core.xml power-fpu.xml power-altivec.xml power-spe.xml\n TARGET_LONG_BITS=32\ndiff --git a/configs/targets/ppc64-softmmu.mak b/configs/targets/ppc64-softmmu.mak\nindex 10d7a2681e7..8c6dc84b821 100644\n--- a/configs/targets/ppc64-softmmu.mak\n+++ b/configs/targets/ppc64-softmmu.mak\n@@ -1,7 +1,6 @@\n TARGET_ARCH=ppc64\n TARGET_BASE_ARCH=ppc\n TARGET_BIG_ENDIAN=y\n-TARGET_KVM_HAVE_GUEST_DEBUG=y\n TARGET_XML_FILES= power64-core.xml power-fpu.xml power-altivec.xml power-spe.xml power-vsx.xml\n # all boards require libfdt\n TARGET_NEED_FDT=y\ndiff --git a/configs/targets/riscv64-softmmu.mak b/configs/targets/riscv64-softmmu.mak\nindex 5059c550480..e0d2c7032d6 100644\n--- a/configs/targets/riscv64-softmmu.mak\n+++ b/configs/targets/riscv64-softmmu.mak\n@@ -1,6 +1,5 @@\n TARGET_ARCH=riscv64\n TARGET_BASE_ARCH=riscv\n-TARGET_KVM_HAVE_GUEST_DEBUG=y\n TARGET_XML_FILES= riscv-64bit-cpu.xml riscv-32bit-fpu.xml riscv-64bit-fpu.xml riscv-64bit-virtual.xml riscv-32bit-cpu.xml riscv-32bit-virtual.xml\n # needed by boot.c\n TARGET_NEED_FDT=y\ndiff --git a/configs/targets/s390x-softmmu.mak b/configs/targets/s390x-softmmu.mak\nindex e273075f1a9..699e5ced96f 100644\n--- a/configs/targets/s390x-softmmu.mak\n+++ b/configs/targets/s390x-softmmu.mak\n@@ -1,6 +1,5 @@\n TARGET_ARCH=s390x\n TARGET_BIG_ENDIAN=y\n-TARGET_KVM_HAVE_GUEST_DEBUG=y\n TARGET_XML_FILES= s390x-core64.xml s390-acr.xml s390-fpr.xml s390-vx.xml s390-cr.xml s390-virt.xml s390-virt-kvm.xml s390-gs.xml\n TARGET_LONG_BITS=64\n TARGET_NOT_USING_LEGACY_NATIVE_ENDIAN_API=y\ndiff --git a/configs/targets/x86_64-softmmu.mak b/configs/targets/x86_64-softmmu.mak\nindex c7f8746b4f5..491173df466 100644\n--- a/configs/targets/x86_64-softmmu.mak\n+++ b/configs/targets/x86_64-softmmu.mak\n@@ -1,6 +1,5 @@\n TARGET_ARCH=x86_64\n TARGET_BASE_ARCH=i386\n-TARGET_KVM_HAVE_GUEST_DEBUG=y\n TARGET_KVM_HAVE_RESET_PARKED_VCPU=y\n TARGET_XML_FILES= i386-64bit.xml i386-64bit-apx.xml\n TARGET_LONG_BITS=64\ndiff --git a/include/system/kvm.h b/include/system/kvm.h\nindex 12f7fc8fb58..a2463a3ac3f 100644\n--- a/include/system/kvm.h\n+++ b/include/system/kvm.h\n@@ -236,14 +236,7 @@ void kvm_irqchip_change_notify(void);\n * calling down to kvm_arch_update_guest_debug after the generic\n * fields have been set.\n */\n-#ifdef TARGET_KVM_HAVE_GUEST_DEBUG\n int kvm_update_guest_debug(CPUState *cpu, unsigned long reinject_trap);\n-#else\n-static inline int kvm_update_guest_debug(CPUState *cpu, unsigned long reinject_trap)\n-{\n- return -EINVAL;\n-}\n-#endif\n \n /* internal API */\n \ndiff --git a/include/system/kvm_int.h b/include/system/kvm_int.h\nindex 0876aac938d..9d1d3fd3deb 100644\n--- a/include/system/kvm_int.h\n+++ b/include/system/kvm_int.h\n@@ -113,9 +113,7 @@ struct KVMState\n struct kvm_coalesced_mmio_ring *coalesced_mmio_ring;\n bool coalesced_flush_in_progress;\n int vcpu_events;\n-#ifdef TARGET_KVM_HAVE_GUEST_DEBUG\n QTAILQ_HEAD(, kvm_sw_breakpoint) kvm_sw_breakpoints;\n-#endif\n int max_nested_state_len;\n int kvm_shadow_mem;\n bool kernel_irqchip_allowed;\ndiff --git a/accel/kvm/kvm-accel-ops.c b/accel/kvm/kvm-accel-ops.c\nindex 6d9140e549f..d4af6b416c3 100644\n--- a/accel/kvm/kvm-accel-ops.c\n+++ b/accel/kvm/kvm-accel-ops.c\n@@ -85,12 +85,10 @@ static bool kvm_cpus_are_resettable(void)\n return !kvm_enabled() || !kvm_state->guest_state_protected;\n }\n \n-#ifdef TARGET_KVM_HAVE_GUEST_DEBUG\n static int kvm_update_guest_debug_ops(CPUState *cpu)\n {\n return kvm_update_guest_debug(cpu, 0);\n }\n-#endif\n \n static void kvm_accel_ops_class_init(ObjectClass *oc, const void *data)\n {\n@@ -105,13 +103,11 @@ static void kvm_accel_ops_class_init(ObjectClass *oc, const void *data)\n ops->synchronize_pre_loadvm = kvm_cpu_synchronize_pre_loadvm;\n ops->handle_interrupt = generic_handle_interrupt;\n \n-#ifdef TARGET_KVM_HAVE_GUEST_DEBUG\n ops->update_guest_debug = kvm_update_guest_debug_ops;\n ops->supports_guest_debug = kvm_supports_guest_debug;\n ops->insert_breakpoint = kvm_insert_breakpoint;\n ops->remove_breakpoint = kvm_remove_breakpoint;\n ops->remove_all_breakpoints = kvm_remove_all_breakpoints;\n-#endif\n }\n \n static const TypeInfo kvm_accel_ops_type = {\ndiff --git a/accel/kvm/kvm-all.c b/accel/kvm/kvm-all.c\nindex 774499d34f8..9a46a61b7f5 100644\n--- a/accel/kvm/kvm-all.c\n+++ b/accel/kvm/kvm-all.c\n@@ -2919,9 +2919,7 @@ static int kvm_init(AccelState *as, MachineState *ms)\n s->sigmask_len = 8;\n accel_blocker_init();\n \n-#ifdef TARGET_KVM_HAVE_GUEST_DEBUG\n QTAILQ_INIT(&s->kvm_sw_breakpoints);\n-#endif\n QLIST_INIT(&s->kvm_parked_vcpus);\n s->fd = qemu_open_old(s->device ?: \"/dev/kvm\", O_RDWR);\n if (s->fd == -1) {\n@@ -3032,23 +3030,19 @@ static int kvm_init(AccelState *as, MachineState *ms)\n kvm_vm_attributes_allowed =\n (kvm_check_extension(s, KVM_CAP_VM_ATTRIBUTES) > 0);\n \n-#ifdef TARGET_KVM_HAVE_GUEST_DEBUG\n kvm_has_guest_debug =\n (kvm_check_extension(s, KVM_CAP_SET_GUEST_DEBUG) > 0);\n-#endif\n \n kvm_sstep_flags = 0;\n if (kvm_has_guest_debug) {\n- kvm_sstep_flags = SSTEP_ENABLE;\n-\n-#if defined TARGET_KVM_HAVE_GUEST_DEBUG\n int guest_debug_flags =\n kvm_check_extension(s, KVM_CAP_SET_GUEST_DEBUG2);\n \n+ kvm_sstep_flags = SSTEP_ENABLE;\n+\n if (guest_debug_flags & KVM_GUESTDBG_BLOCKIRQ) {\n kvm_sstep_flags |= SSTEP_NOIRQ;\n }\n-#endif\n }\n \n kvm_state = s;\n@@ -3781,7 +3775,6 @@ bool kvm_arm_supports_user_irq(void)\n return kvm_check_extension(kvm_state, KVM_CAP_ARM_USER_IRQ);\n }\n \n-#ifdef TARGET_KVM_HAVE_GUEST_DEBUG\n struct kvm_sw_breakpoint *kvm_find_sw_breakpoint(CPUState *cpu, vaddr pc)\n {\n struct kvm_sw_breakpoint *bp;\n@@ -3941,8 +3934,6 @@ void kvm_remove_all_breakpoints(CPUState *cpu)\n }\n }\n \n-#endif /* !TARGET_KVM_HAVE_GUEST_DEBUG */\n-\n static int kvm_set_signal_mask(CPUState *cpu, const sigset_t *sigset)\n {\n KVMState *s = kvm_state;\ndiff --git a/target/mips/kvm.c b/target/mips/kvm.c\nindex a85e162409c..49bff68b137 100644\n--- a/target/mips/kvm.c\n+++ b/target/mips/kvm.c\n@@ -1262,6 +1262,11 @@ int kvm_arch_msi_data_to_gsi(uint32_t data)\n abort();\n }\n \n+int kvm_update_guest_debug(CPUState *cpu, unsigned long reinject_trap)\n+{\n+ return -EINVAL;\n+}\n+\n int kvm_arch_get_default_type(MachineState *machine)\n {\n #if defined(KVM_CAP_MIPS_VZ)\n", "prefixes": [ "PATCH-for-11.1", "2/8" ] }