From nobody Sat Feb 7 12:32:25 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=fail(p=none dis=none) header.from=citrix.com ARC-Seal: i=1; a=rsa-sha256; t=1594825910; cv=none; d=zohomail.com; s=zohoarc; b=QrZ/jIxpD3TTsM4k5mTsYG+rkjN4LQa06EMLUw99ybqkwj1YWTGybcJDyL7R+uwNg8SjF7eIhWynLQPOx4v+9LsgdmIHLUB3xhGABdKqo8rLW8xtfPRFJ6RMD3mqxh8pyQ8a5UNq9KxUUW6M/IArQMQ9ZfQoqiqgvEiEauAlYSc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594825910; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=acsFWCitv/e+P9MHvBEtLbpvhphyVqqJ9s9vNRxVw4Y=; b=dJVcYyYLdaRuhIwZFj83JMU+mPsaWSu5XVx0wAjdOtPC/XC2hAm+MDYtBfTIDWlJv6tfR7aqzt/2XbF1VwNqg+9uwTJgjt8jQ3NqmR6vrmr88psSQ+9VpBwnSg3uY5zPOopK0cg+If8mS3HlLz8PE/5xPTpwgRV6wn3HtF3Me3E= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 15948259109031015.1952735818816; Wed, 15 Jul 2020 08:11:50 -0700 (PDT) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jvj4J-0003ee-VG; Wed, 15 Jul 2020 15:11:35 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jvj4I-0003eS-TX for xen-devel@lists.xenproject.org; Wed, 15 Jul 2020 15:11:34 +0000 Received: from esa6.hc3370-68.iphmx.com (unknown [216.71.155.175]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id 784095e2-c6ad-11ea-bca7-bc764e2007e4; Wed, 15 Jul 2020 15:11:34 +0000 (UTC) X-Inumbo-ID: 784095e2-c6ad-11ea-bca7-bc764e2007e4 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=citrix.com; s=securemail; t=1594825894; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=K1owBnRIAVTLefyKeo/+v16BnObQDQqtz+nCvF/ExPk=; b=KDGMtsEu6pA+66JLREo8V4CXgbfH7TK7LDW8ABX/moM2KGARVQkDE+Up 1F/Gw/ZAnGqt/8lGy+zQ/3+c1pJL/Z96PvRToG+YcLGOw+AgMY6gkIbfT 7KNDo5317R7qjCO+Dn86VaNQNeQqaqKly5AXMjArbTk8eLJ5SJIG5KatN M=; Authentication-Results: esa6.hc3370-68.iphmx.com; dkim=none (message not signed) header.i=none IronPort-SDR: CzHeqjY9VbefBM2DJ6NxvUrHVDQlZCRk4LRNwhjRMWOHZTVopogD3gmx0tv/NAbChMfShjV0sV swl7+jP9sy8lFDCCUMPh1rjCwkezY7wfm7+/7h5h2b3iAxIm7vmZUJcbLcTV6UwtAxIHvq3HJ5 WoJGFVYbuarawQyJlvJiK9XSHZdouH2uviZeoPe/ykm5VJTfn+GdG7F0MnFflPa0Qb4V1iEraG /AbqG9psoN1pnKYGRF9U3MZaAly4Q4I29pAR/ff8u6hrPNNSWL7undOQzm7jroEW0CL8jRz0RL cD4= X-SBRS: 2.7 X-MesageID: 22775216 X-Ironport-Server: esa6.hc3370-68.iphmx.com X-Remote-IP: 162.221.158.21 X-Policy: $RELAYED X-IronPort-AV: E=Sophos;i="5.75,355,1589256000"; d="scan'208";a="22775216" From: =?UTF-8?q?Edwin=20T=C3=B6r=C3=B6k?= To: Subject: [PATCH v1 1/1] oxenstored: fix ABI breakage introduced in Xen 4.9.0 Date: Wed, 15 Jul 2020 16:10:56 +0100 Message-ID: <6fcfdb706cc2f666069c1d0bbc59d22f660fc81d.1594825512.git.edvin.torok@citrix.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-BeenThere: xen-devel@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Cc: Igor Druzhinin , Wei Liu , Ian Jackson , =?UTF-8?q?Edwin=20T=C3=B6r=C3=B6k?= , David Scott , Christian Lindig Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) dbc84d2983969bb47d294131ed9e6bbbdc2aec49 (Xen >=3D 4.9.0) deleted XS_RESTRI= CT from oxenstored, which caused all the following opcodes to be shifted by 1: reset_watches became off-by-one compared to the C version of xenstored. Looking at the C code the opcode for reset watches needs: XS_RESET_WATCHES =3D XS_SET_TARGET + 2 So add the placeholder `Invalid` in the OCaml<->C mapping list. (Note that the code here doesn't simply convert the OCaml constructor to an integer, so we don't need to introduce a dummy constructor). Igor says that with a suitably patched xenopsd to enable watch reset, we now see `reset watches` during kdump of a guest in xenstored-access.log. Signed-off-by: Edwin T=C3=B6r=C3=B6k Tested-by: Igor Druzhinin Acked-by: Christian Lindig --- tools/ocaml/libs/xb/op.ml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/ocaml/libs/xb/op.ml b/tools/ocaml/libs/xb/op.ml index d4f1f08185..9bcab0f38c 100644 --- a/tools/ocaml/libs/xb/op.ml +++ b/tools/ocaml/libs/xb/op.ml @@ -28,7 +28,7 @@ let operation_c_mapping =3D Transaction_end; Introduce; Release; Getdomainpath; Write; Mkdir; Rm; Setperms; Watchevent; Error; Isintroduced; - Resume; Set_target; Reset_watches |] + Resume; Set_target; Invalid; Reset_watches |] let size =3D Array.length operation_c_mapping =20 let array_search el a =3D --=20 2.25.1