From patchwork Wed Oct 12 06:45:22 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?b?SsO8cmdlbiBHcm/Dnw==?= X-Patchwork-Id: 13004737 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id E63E5C433FE for ; Wed, 12 Oct 2022 06:45:40 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.420779.665790 (Exim 4.92) (envelope-from ) id 1oiVUd-0000JS-HX; Wed, 12 Oct 2022 06:45:27 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 420779.665790; Wed, 12 Oct 2022 06:45:27 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oiVUd-0000JK-EU; Wed, 12 Oct 2022 06:45:27 +0000 Received: by outflank-mailman (input) for mailman id 420779; Wed, 12 Oct 2022 06:45:25 +0000 Received: from se1-gles-flk1-in.inumbo.com ([94.247.172.50] helo=se1-gles-flk1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oiVUb-0000JA-LT for xen-devel@lists.xenproject.org; Wed, 12 Oct 2022 06:45:25 +0000 Received: from smtp-out1.suse.de (smtp-out1.suse.de [195.135.220.28]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id 730e5eb8-49f9-11ed-8fd0-01056ac49cbb; Wed, 12 Oct 2022 08:45:24 +0200 (CEST) Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by smtp-out1.suse.de (Postfix) with ESMTPS id 3B71C22529; Wed, 12 Oct 2022 06:45:24 +0000 (UTC) Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by imap2.suse-dmz.suse.de (Postfix) with ESMTPS id 0744813A5C; Wed, 12 Oct 2022 06:45:24 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id 4tpkAIRiRmO3LAAAMHmgww (envelope-from ); Wed, 12 Oct 2022 06:45:24 +0000 X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 730e5eb8-49f9-11ed-8fd0-01056ac49cbb DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=susede1; t=1665557124; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=pfSBOvu1OjtBmklXcnPKbzHd/cYxESBbfDXDCYhcEtE=; b=kzVeL9jJSSEXJ7XZEyVllcu9uwCi6gWxGyYSmMqxxFFCUwMpR2IwVQFjnbhA0jR5kY59md CSWj4VG/hD7hJ1Em2z17jbV8rNs9glyE8ebi5oYAqcvpnhriYa890kJyrbbKmla7tAWKS0 y8PBYs50+IxWHiiVGU03h+mh6fmXwWU= From: Juergen Gross To: xen-devel@lists.xenproject.org Cc: Juergen Gross , Ian Jackson , Wei Liu Subject: [PATCH-for-4.15] tools/tests: fix wrong backport of upstream commit 52daa6a8483e4 Date: Wed, 12 Oct 2022 08:45:22 +0200 Message-Id: <20221012064522.6827-1-jgross@suse.com> X-Mailer: git-send-email 2.35.3 MIME-Version: 1.0 The backport of upstream commit 52daa6a8483e4 had a bug, correct it. Fixes: 3ac64b375183 ("xen/gnttab: fix gnttab_acquire_resource()") Signed-off-by: Juergen Gross Reviewed-by: Jan Beulich --- tools/tests/resource/test-resource.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/tests/resource/test-resource.c b/tools/tests/resource/test-resource.c index bf485baff2..51a8f4a000 100644 --- a/tools/tests/resource/test-resource.c +++ b/tools/tests/resource/test-resource.c @@ -71,7 +71,7 @@ static void test_gnttab(uint32_t domid, unsigned int nr_frames) res = xenforeignmemory_map_resource( fh, domid, XENMEM_resource_grant_table, XENMEM_resource_grant_table_id_status, 0, 1, - (void **)&gnttab, PROT_READ | PROT_WRITE, 0); + &addr, PROT_READ | PROT_WRITE, 0); if ( res ) {