Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/1.0/patches/2197710/?format=api
{ "id": 2197710, "url": "http://patchwork.ozlabs.org/api/1.0/patches/2197710/?format=api", "project": { "id": 14, "url": "http://patchwork.ozlabs.org/api/1.0/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": "" }, "msgid": "<20260218114233.266178-15-anisinha@redhat.com>", "date": "2026-02-18T11:42:07", "name": "[v5,14/34] accel/kvm: rebind current VCPUs to the new KVM VM file descriptor upon reset", "commit_ref": null, "pull_url": null, "state": "new", "archived": false, "hash": "383bf4bddf41272fbad8337ca759513485781598", "submitter": { "id": 86030, "url": "http://patchwork.ozlabs.org/api/1.0/people/86030/?format=api", "name": "Ani Sinha", "email": "anisinha@redhat.com" }, "delegate": null, "mbox": "http://patchwork.ozlabs.org/project/qemu-devel/patch/20260218114233.266178-15-anisinha@redhat.com/mbox/", "series": [ { "id": 492541, "url": "http://patchwork.ozlabs.org/api/1.0/series/492541/?format=api", "date": "2026-02-18T11:41:56", "name": "Introduce support for confidential guest reset (x86)", "version": 5, "mbox": "http://patchwork.ozlabs.org/series/492541/mbox/" } ], "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/2197710/checks/", "tags": {}, "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 (1024-bit key;\n unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256\n header.s=mimecast20190719 header.b=HyrQ7uKl;\n\tdkim=pass (2048-bit key;\n unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256\n header.s=google header.b=sk/3JawQ;\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 4fGF746b6rz1xpl\n\tfor <incoming@patchwork.ozlabs.org>; Wed, 18 Feb 2026 22:45:04 +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 1vsfxz-0003LX-2X; Wed, 18 Feb 2026 06:43:39 -0500", "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 <anisinha@redhat.com>)\n id 1vsfxv-0003KJ-F7\n for qemu-devel@nongnu.org; Wed, 18 Feb 2026 06:43:35 -0500", "from us-smtp-delivery-124.mimecast.com ([170.10.129.124])\n by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)\n (Exim 4.90_1) (envelope-from <anisinha@redhat.com>)\n id 1vsfxt-0007st-5L\n for qemu-devel@nongnu.org; Wed, 18 Feb 2026 06:43:34 -0500", "from mail-pl1-f200.google.com (mail-pl1-f200.google.com\n [209.85.214.200]) by relay.mimecast.com with ESMTP with STARTTLS\n (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id\n us-mta-623-kh7nKkT3PdC5EwyWQ_YQaw-1; Wed, 18 Feb 2026 06:43:31 -0500", "by mail-pl1-f200.google.com with SMTP id\n d9443c01a7336-2aaf2f3bef6so64011495ad.0\n for <qemu-devel@nongnu.org>; Wed, 18 Feb 2026 03:43:30 -0800 (PST)", "from rhel9-box.lan ([117.99.83.54])\n by smtp.googlemail.com with ESMTPSA id\n d9443c01a7336-2ad1aaeab38sm127803425ad.82.2026.02.18.03.43.26\n (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n Wed, 18 Feb 2026 03:43:28 -0800 (PST)" ], "DKIM-Signature": [ "v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com;\n s=mimecast20190719; t=1771415012;\n h=from:from:reply-to:subject:subject:date:date:message-id:message-id:\n to:to:cc:cc:mime-version:mime-version:\n content-transfer-encoding:content-transfer-encoding:\n in-reply-to:in-reply-to:references:references;\n bh=2XVbEovrezKjrEojVg5R7mES5JyammScR5/FG80a+a8=;\n b=HyrQ7uKlnonMW2ogOjUxSWVld7Lv00ChtEEjAcBP0F9fp0l8xIn/uoNHwEAk3AVr2yi7vW\n U+X6IDYrRRI7JDPbvM5iAH3Juzj20YQJVFy7hylATmeB1nTzTTFDCrrf6YjhZ/mjoAFyGC\n qT3zHzB3SX1/nqqju9P1bt7BG2m1lI8=", "v=1; a=rsa-sha256; c=relaxed/relaxed;\n d=redhat.com; s=google; t=1771415009; x=1772019809; 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=2XVbEovrezKjrEojVg5R7mES5JyammScR5/FG80a+a8=;\n b=sk/3JawQbAzRU3ft4NZ2fr0wsEcDu9DE314EvjYWcfsT1/sZd6+Z64V+grPrw7UQAJ\n GfFJYe9eRX2QUY1jvA1UvmrmIdGIxidvfr9ebrgKe0spaWJxEPNvQeiAiVwjBIOnnqeh\n op/vlOvXMYhECmp6o4kgfGB0LJZt1OMzHac5uX3QcyNekUoCn1pJwE1wrylUKr6sQEnU\n GUjVH8N4qDmBCKz7fiU5OkJfBv/2yxxbQ3D0CsLPGo+EA7t6/aq89Oc0hisNPqTalfjg\n 1QzGpZdUHrNen8RoeWON40HrOwKO/JCx6XYsKN9eZyNFLlN89u8OFJg/amh71iJ2gz00\n r6Lg==" ], "X-MC-Unique": "kh7nKkT3PdC5EwyWQ_YQaw-1", "X-Mimecast-MFC-AGG-ID": "kh7nKkT3PdC5EwyWQ_YQaw_1771415009", "X-Google-DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n d=1e100.net; s=20230601; t=1771415009; x=1772019809;\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=2XVbEovrezKjrEojVg5R7mES5JyammScR5/FG80a+a8=;\n b=iRdH6dnK3rJ+X479sVbFtDMek0sMDMm/pjPQDplUdrmrnvWW7pgP3FsBJf6bifoU/r\n WDDNf/gP9dsfUvKpY+6OUbiFvjgAr6TlFJQtVSfxwuL8bkJLUQiJ5npxAyn+L09LzvrE\n PjF+4Ho9c6WkEjiN+2ZQGPgJzFayngkubILhf1y1HiynCMowjGPv9vlwO2wjRlQOlidL\n C+VjCw0e5MKdY/vrOGaYuZABO8h0TgEHfaU7RDHLWaVgXDAlVV1TSkaYfx2lldUc41e5\n LA1Qc5I5/6uHLZguH53wSigahBInqAtG2zqExVZsWYzHi8br+mL0QddUy2wy6GVq1Hw/\n TNnA==", "X-Forwarded-Encrypted": "i=1;\n AJvYcCUO98MNXsFXNZAo0ndef9LdD3KNTpFtXOKbfz2NnrBiGeXQrS8ool+BXCoBIK1f/W5Vqg+0tKNNOPNT@nongnu.org", "X-Gm-Message-State": "AOJu0YxR5SzNiAdzzc2ttW4F8fFZzqRCkfKFKtIZTbzBu75EwvrA9wxF\n 4mjXguZplV/joKe2wsSKr6JX77UhxpJM//qNqkuSvmH3HvHp0x+gdnjVPTpb2wNHeDdp63qokh3\n ZCYnNjQQlCMJRQPMY8iVw17B7xJ/taxbRS8h/8Ius2MGeZdoOSnDwrFYx", "X-Gm-Gg": "AZuq6aLk9uWxV3fl3dCeDs1g2jr7C3ocSQICB7LaX96G528z2JIRFtLyQ88fiS8P+Fb\n 0dfNkA80GuM9jKZ2HOvj1YT7KDA97jhR1mLqpvhg44VV0msq8Tjd43fVorObOLDfKyQkCSjEWSW\n MqS3hmL0OIkBmnnNytUDMlpwffEsM/5uWkeaoUEXN9risOAZAvCYChOwusldNDRA6RIduPnUB1u\n S5CrW731tSAYTn/HoJ9yACK+2bDdSYzgZNyIMFug5XV4ZY1hxQKZoDDpmb0UP5rWvej0yjqt+oZ\n jwg+mp+PiICQp0v2D4zlYL1E76ekaOe0ZueT0m83TvpdbICrsLp6S6yBx7rc7i2U/tKjsuhRR8j\n cCBL12m0+HNtlZ+9gq4jiz1tftgbZMEQFEa1r4rLME7U5bN8Ze9GH", "X-Received": [ "by 2002:a17:903:f90:b0:2aa:e3c7:6048 with SMTP id\n d9443c01a7336-2ad1746c179mr142629065ad.23.1771415009305;\n Wed, 18 Feb 2026 03:43:29 -0800 (PST)", "by 2002:a17:903:f90:b0:2aa:e3c7:6048 with SMTP id\n d9443c01a7336-2ad1746c179mr142628965ad.23.1771415008927;\n Wed, 18 Feb 2026 03:43:28 -0800 (PST)" ], "From": "Ani Sinha <anisinha@redhat.com>", "To": "Paolo Bonzini <pbonzini@redhat.com>", "Cc": "Ani Sinha <anisinha@redhat.com>, kraxel@redhat.com, kvm@vger.kernel.org,\n qemu-devel@nongnu.org", "Subject": "[PATCH v5 14/34] accel/kvm: rebind current VCPUs to the new KVM VM\n file descriptor upon reset", "Date": "Wed, 18 Feb 2026 17:12:07 +0530", "Message-ID": "<20260218114233.266178-15-anisinha@redhat.com>", "X-Mailer": "git-send-email 2.42.0", "In-Reply-To": "<20260218114233.266178-1-anisinha@redhat.com>", "References": "<20260218114233.266178-1-anisinha@redhat.com>", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "Received-SPF": "pass client-ip=170.10.129.124;\n envelope-from=anisinha@redhat.com;\n helo=us-smtp-delivery-124.mimecast.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, DKIMWL_WL_HIGH=-0.043,\n DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1,\n RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001,\n RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001,\n SPF_HELO_PASS=-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.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": "Confidential guests needs to generate a new KVM file descriptor upon virtual\nmachine reset. Existing VCPUs needs to be reattached to this new\nKVM VM file descriptor. As a part of this, new VCPU file descriptors against\nthis new KVM VM file descriptor needs to be created and re-initialized.\nResources allocated against the old VCPU fds needs to be released. This change\nmakes this happen.\n\nSigned-off-by: Ani Sinha <anisinha@redhat.com>\n---\n accel/kvm/kvm-all.c | 215 +++++++++++++++++++++++++++++++++--------\n accel/kvm/trace-events | 1 +\n 2 files changed, 174 insertions(+), 42 deletions(-)", "diff": "diff --git a/accel/kvm/kvm-all.c b/accel/kvm/kvm-all.c\nindex 47589f92e2..7be39111bb 100644\n--- a/accel/kvm/kvm-all.c\n+++ b/accel/kvm/kvm-all.c\n@@ -127,6 +127,10 @@ static NotifierList kvm_irqchip_change_notifiers =\n static NotifierWithReturnList register_vmfd_changed_notifiers =\n NOTIFIER_WITH_RETURN_LIST_INITIALIZER(register_vmfd_changed_notifiers);\n \n+static int map_kvm_run(KVMState *s, CPUState *cpu, Error **errp);\n+static int map_kvm_dirty_gfns(KVMState *s, CPUState *cpu, Error **errp);\n+static int vcpu_unmap_regions(KVMState *s, CPUState *cpu);\n+\n struct KVMResampleFd {\n int gsi;\n EventNotifier *resample_event;\n@@ -420,6 +424,90 @@ err:\n return ret;\n }\n \n+static void kvm_create_vcpu_internal(CPUState *cpu, KVMState *s, int kvm_fd)\n+{\n+ cpu->kvm_fd = kvm_fd;\n+ cpu->kvm_state = s;\n+ if (!s->guest_state_protected) {\n+ cpu->vcpu_dirty = true;\n+ }\n+ cpu->dirty_pages = 0;\n+ cpu->throttle_us_per_full = 0;\n+\n+ return;\n+}\n+\n+static int kvm_rebind_vcpus(Error **errp)\n+{\n+ CPUState *cpu;\n+ unsigned long vcpu_id;\n+ KVMState *s = kvm_state;\n+ int kvm_fd, ret = 0;\n+\n+ CPU_FOREACH(cpu) {\n+ vcpu_id = kvm_arch_vcpu_id(cpu);\n+\n+ if (cpu->kvm_fd) {\n+ close(cpu->kvm_fd);\n+ }\n+\n+ ret = kvm_arch_destroy_vcpu(cpu);\n+ if (ret < 0) {\n+ goto err;\n+ }\n+\n+ if (s->coalesced_mmio_ring == (void *)cpu->kvm_run + PAGE_SIZE) {\n+ s->coalesced_mmio_ring = NULL;\n+ }\n+\n+ ret = vcpu_unmap_regions(s, cpu);\n+ if (ret < 0) {\n+ goto err;\n+ }\n+\n+ ret = kvm_arch_pre_create_vcpu(cpu, errp);\n+ if (ret < 0) {\n+ goto err;\n+ }\n+\n+ kvm_fd = kvm_vm_ioctl(s, KVM_CREATE_VCPU, vcpu_id);\n+ if (kvm_fd < 0) {\n+ error_report(\"KVM_CREATE_VCPU IOCTL failed for vCPU %lu (%s)\",\n+ vcpu_id, strerror(kvm_fd));\n+ return kvm_fd;\n+ }\n+\n+ kvm_create_vcpu_internal(cpu, s, kvm_fd);\n+\n+ ret = map_kvm_run(s, cpu, errp);\n+ if (ret < 0) {\n+ goto err;\n+ }\n+\n+ if (s->kvm_dirty_ring_size) {\n+ ret = map_kvm_dirty_gfns(s, cpu, errp);\n+ if (ret < 0) {\n+ goto err;\n+ }\n+ }\n+\n+ ret = kvm_arch_init_vcpu(cpu);\n+ if (ret < 0) {\n+ error_setg_errno(errp, -ret,\n+ \"kvm_init_vcpu: kvm_arch_init_vcpu failed (%lu)\",\n+ vcpu_id);\n+ }\n+\n+ close(cpu->kvm_vcpu_stats_fd);\n+ cpu->kvm_vcpu_stats_fd = kvm_vcpu_ioctl(cpu, KVM_GET_STATS_FD, NULL);\n+ kvm_init_cpu_signals(cpu);\n+ }\n+ trace_kvm_rebind_vcpus();\n+\n+ err:\n+ return ret;\n+}\n+\n static void kvm_park_vcpu(CPUState *cpu)\n {\n struct KVMParkedVcpu *vcpu;\n@@ -483,13 +571,7 @@ static int kvm_create_vcpu(CPUState *cpu)\n }\n }\n \n- cpu->kvm_fd = kvm_fd;\n- cpu->kvm_state = s;\n- if (!s->guest_state_protected) {\n- cpu->vcpu_dirty = true;\n- }\n- cpu->dirty_pages = 0;\n- cpu->throttle_us_per_full = 0;\n+ kvm_create_vcpu_internal(cpu, s, kvm_fd);\n \n trace_kvm_create_vcpu(cpu->cpu_index, vcpu_id, kvm_fd);\n \n@@ -508,19 +590,11 @@ int kvm_create_and_park_vcpu(CPUState *cpu)\n return ret;\n }\n \n-static int do_kvm_destroy_vcpu(CPUState *cpu)\n+static int vcpu_unmap_regions(KVMState *s, CPUState *cpu)\n {\n- KVMState *s = kvm_state;\n int mmap_size;\n int ret = 0;\n \n- trace_kvm_destroy_vcpu(cpu->cpu_index, kvm_arch_vcpu_id(cpu));\n-\n- ret = kvm_arch_destroy_vcpu(cpu);\n- if (ret < 0) {\n- goto err;\n- }\n-\n mmap_size = kvm_ioctl(s, KVM_GET_VCPU_MMAP_SIZE, 0);\n if (mmap_size < 0) {\n ret = mmap_size;\n@@ -548,39 +622,47 @@ static int do_kvm_destroy_vcpu(CPUState *cpu)\n cpu->kvm_dirty_gfns = NULL;\n }\n \n- kvm_park_vcpu(cpu);\n-err:\n+ err:\n return ret;\n }\n \n-void kvm_destroy_vcpu(CPUState *cpu)\n-{\n- if (do_kvm_destroy_vcpu(cpu) < 0) {\n- error_report(\"kvm_destroy_vcpu failed\");\n- exit(EXIT_FAILURE);\n- }\n-}\n-\n-int kvm_init_vcpu(CPUState *cpu, Error **errp)\n+static int do_kvm_destroy_vcpu(CPUState *cpu)\n {\n KVMState *s = kvm_state;\n- int mmap_size;\n- int ret;\n+ int ret = 0;\n \n- trace_kvm_init_vcpu(cpu->cpu_index, kvm_arch_vcpu_id(cpu));\n+ trace_kvm_destroy_vcpu(cpu->cpu_index, kvm_arch_vcpu_id(cpu));\n \n- ret = kvm_arch_pre_create_vcpu(cpu, errp);\n+ ret = kvm_arch_destroy_vcpu(cpu);\n if (ret < 0) {\n goto err;\n }\n \n- ret = kvm_create_vcpu(cpu);\n+ /* If I am the CPU that created coalesced_mmio_ring, then discard it */\n+ if (s->coalesced_mmio_ring == (void *)cpu->kvm_run + PAGE_SIZE) {\n+ s->coalesced_mmio_ring = NULL;\n+ }\n+\n+ ret = vcpu_unmap_regions(s, cpu);\n if (ret < 0) {\n- error_setg_errno(errp, -ret,\n- \"kvm_init_vcpu: kvm_create_vcpu failed (%lu)\",\n- kvm_arch_vcpu_id(cpu));\n goto err;\n }\n+ kvm_park_vcpu(cpu);\n+err:\n+ return ret;\n+}\n+\n+void kvm_destroy_vcpu(CPUState *cpu)\n+{\n+ if (do_kvm_destroy_vcpu(cpu) < 0) {\n+ error_report(\"kvm_destroy_vcpu failed\");\n+ exit(EXIT_FAILURE);\n+ }\n+}\n+\n+static int map_kvm_run(KVMState *s, CPUState *cpu, Error **errp)\n+{\n+ int mmap_size, ret = 0;\n \n mmap_size = kvm_ioctl(s, KVM_GET_VCPU_MMAP_SIZE, 0);\n if (mmap_size < 0) {\n@@ -605,14 +687,53 @@ int kvm_init_vcpu(CPUState *cpu, Error **errp)\n (void *)cpu->kvm_run + s->coalesced_mmio * PAGE_SIZE;\n }\n \n+ err:\n+ return ret;\n+}\n+\n+static int map_kvm_dirty_gfns(KVMState *s, CPUState *cpu, Error **errp)\n+{\n+ int ret = 0;\n+ /* Use MAP_SHARED to share pages with the kernel */\n+ cpu->kvm_dirty_gfns = mmap(NULL, s->kvm_dirty_ring_bytes,\n+ PROT_READ | PROT_WRITE, MAP_SHARED,\n+ cpu->kvm_fd,\n+ PAGE_SIZE * KVM_DIRTY_LOG_PAGE_OFFSET);\n+ if (cpu->kvm_dirty_gfns == MAP_FAILED) {\n+ ret = -errno;\n+ }\n+\n+ return ret;\n+}\n+\n+int kvm_init_vcpu(CPUState *cpu, Error **errp)\n+{\n+ KVMState *s = kvm_state;\n+ int ret;\n+\n+ trace_kvm_init_vcpu(cpu->cpu_index, kvm_arch_vcpu_id(cpu));\n+\n+ ret = kvm_arch_pre_create_vcpu(cpu, errp);\n+ if (ret < 0) {\n+ goto err;\n+ }\n+\n+ ret = kvm_create_vcpu(cpu);\n+ if (ret < 0) {\n+ error_setg_errno(errp, -ret,\n+ \"kvm_init_vcpu: kvm_create_vcpu failed (%lu)\",\n+ kvm_arch_vcpu_id(cpu));\n+ goto err;\n+ }\n+\n+ ret = map_kvm_run(s, cpu, errp);\n+ if (ret < 0) {\n+ goto err;\n+ }\n+\n if (s->kvm_dirty_ring_size) {\n- /* Use MAP_SHARED to share pages with the kernel */\n- cpu->kvm_dirty_gfns = mmap(NULL, s->kvm_dirty_ring_bytes,\n- PROT_READ | PROT_WRITE, MAP_SHARED,\n- cpu->kvm_fd,\n- PAGE_SIZE * KVM_DIRTY_LOG_PAGE_OFFSET);\n- if (cpu->kvm_dirty_gfns == MAP_FAILED) {\n- ret = -errno;\n+ ret = map_kvm_dirty_gfns(s, cpu, errp);\n+ if (ret < 0) {\n goto err;\n }\n }\n@@ -2707,6 +2828,16 @@ static int kvm_reset_vmfd(MachineState *ms)\n }\n assert(!err);\n \n+ /*\n+ * rebind new vcpu fds with the new kvm fds\n+ * These can only be called after kvm_arch_on_vmfd_change()\n+ */\n+ ret = kvm_rebind_vcpus(&err);\n+ if (ret < 0) {\n+ return ret;\n+ }\n+ assert(!err);\n+\n /* these can be only called after ram_block_rebind() */\n memory_listener_register(&kml->listener, &address_space_memory);\n memory_listener_register(&kvm_io_listener, &address_space_io);\ndiff --git a/accel/kvm/trace-events b/accel/kvm/trace-events\nindex e4beda0148..4a8921c632 100644\n--- a/accel/kvm/trace-events\n+++ b/accel/kvm/trace-events\n@@ -15,6 +15,7 @@ kvm_park_vcpu(int cpu_index, unsigned long arch_cpu_id) \"index: %d id: %lu\"\n kvm_unpark_vcpu(unsigned long arch_cpu_id, const char *msg) \"id: %lu %s\"\n kvm_irqchip_commit_routes(void) \"\"\n kvm_reset_vmfd(void) \"\"\n+kvm_rebind_vcpus(void) \"\"\n kvm_irqchip_add_msi_route(char *name, int vector, int virq) \"dev %s vector %d virq %d\"\n kvm_irqchip_update_msi_route(int virq) \"Updating MSI route virq=%d\"\n kvm_irqchip_release_virq(int virq) \"virq %d\"\n", "prefixes": [ "v5", "14/34" ] }