From patchwork Wed Mar 3 18:22:08 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 12114033 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2BE16C433E0 for ; Wed, 3 Mar 2021 18:30:13 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id B88E964EBD for ; Wed, 3 Mar 2021 18:30:12 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org B88E964EBD Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:48952 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lHWGB-0008Mb-OQ for qemu-devel@archiver.kernel.org; Wed, 03 Mar 2021 13:30:11 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:56146) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lHW9V-0005pM-V2 for qemu-devel@nongnu.org; Wed, 03 Mar 2021 13:23:17 -0500 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:59457) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1lHW9T-0000fB-OH for qemu-devel@nongnu.org; Wed, 03 Mar 2021 13:23:17 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1614795795; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=gcmU4EwKx07Tin9L5OLokG4d2/Qw/rC/JleGsw0pME0=; b=FAXPyh/vCevIQO1McSdA2XjF5P8wjrVJFe+kA+HKf+Nj1y64rktIJbe/opDifn4y59jMco Tgsgmz4n370aGOfM7Md3SBfWtpE1f7VqI52WtoIX14bRwzJuR7q/7dSmBrhSDo8onHGq0w IQi1dhIg3Ywj6B2zlrznaDoZurn/Fuo= Received: from mail-wm1-f70.google.com (mail-wm1-f70.google.com [209.85.128.70]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-396-YQXUE0qmMkykkr9R8ZH0cg-1; Wed, 03 Mar 2021 13:23:13 -0500 X-MC-Unique: YQXUE0qmMkykkr9R8ZH0cg-1 Received: by mail-wm1-f70.google.com with SMTP id h20so2159928wmq.9 for ; Wed, 03 Mar 2021 10:23:13 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=gcmU4EwKx07Tin9L5OLokG4d2/Qw/rC/JleGsw0pME0=; b=Yju87NBsxeysrx1f9mav6yq/zdsl37JZ0ABtT/RUXxdtJS+CLMAqIT7LOYs2/ZCYHL D71BFmba/leHmewsea7CqXIHyYfZnViS16+LqIxDMQhCsx0WABdmqPEGZVw8fNDkhmrp Tfm23dRt5aZhNkvAdox/8dM2gF6gvCyjoKWp+6yqD5NAwUWfAmFc+J9/MZw3dz5sN+HL tCLALxHiMZS+1QB+5zGEGNO42pWpSo4IydSuaagqlM9UCchhGTvvbFoN62HXYJSAkHyo qaIbQwTInF51m/4fSWPV0ztoGt7byaSUqxTBFnbH7cvGvIPH1D1WIB/oX9DtwnGO3Y42 3RwA== X-Gm-Message-State: AOAM530LHjS2ezBGz1G/nCZdmI+aEYQ4VeULJmVMvMmmX3+Duc/EbgEP tWLQQ2MFOWeXx1Sbdp8fV/1xRCkqjmMHtoMQk1SnpqsNHYoKl4tOejMMGo2xBngHqMucOa7kiyB 6ga++t7bFqyWhhBTzPw6Jfm1GSRDzx91M+JrQXaHDPrfYxkp/MVGMAjih41FSUdIj X-Received: by 2002:adf:f512:: with SMTP id q18mr28690262wro.61.1614795792420; Wed, 03 Mar 2021 10:23:12 -0800 (PST) X-Google-Smtp-Source: ABdhPJzsuKFTfGdNl3JrpUfwyW5A/mzww+ew2G6b3+YznKtRBqmyC0QveUl42fP3vSv4XPE27dPvRA== X-Received: by 2002:adf:f512:: with SMTP id q18mr28690224wro.61.1614795792253; Wed, 03 Mar 2021 10:23:12 -0800 (PST) Received: from x1w.redhat.com (68.red-83-57-175.dynamicip.rima-tde.net. [83.57.175.68]) by smtp.gmail.com with ESMTPSA id l22sm34033345wrb.4.2021.03.03.10.23.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 03 Mar 2021 10:23:11 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [RFC PATCH 08/19] accel/whpx: Use 'accel_vcpu' generic pointer Date: Wed, 3 Mar 2021 19:22:08 +0100 Message-Id: <20210303182219.1631042-9-philmd@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210303182219.1631042-1-philmd@redhat.com> References: <20210303182219.1631042-1-philmd@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=philmd@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Received-SPF: pass client-ip=63.128.21.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, 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.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Maydell , Cornelia Huck , kvm@vger.kernel.org, David Hildenbrand , haxm-team@intel.com, Colin Xu , Halil Pasic , Christian Borntraeger , Claudio Fontana , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Thomas Huth , Eduardo Habkost , Richard Henderson , Greg Kurz , Cameron Esfahani , Roman Bolshakov , qemu-arm@nongnu.org, Sunil Muthuswamy , David Gibson , Marcelo Tosatti , qemu-s390x@nongnu.org, qemu-ppc@nongnu.org, Wenchao Wang , Paolo Bonzini Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Instead of naming the HAX accelerator in WHPX, use the 'accel_vcpu' field which is meant for accelerators. Signed-off-by: Philippe Mathieu-Daudé --- target/i386/whpx/whpx-all.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/target/i386/whpx/whpx-all.c b/target/i386/whpx/whpx-all.c index f0b3266114d..56ec82076cc 100644 --- a/target/i386/whpx/whpx-all.c +++ b/target/i386/whpx/whpx-all.c @@ -177,7 +177,7 @@ struct WHPDispatch whp_dispatch; static whpx_vcpu *get_whpx_vcpu(CPUState *cpu) { - return (whpx_vcpu *)cpu->hax_vcpu; + return cpu->accel_vcpu; } static WHV_X64_SEGMENT_REGISTER whpx_seg_q2h(const SegmentCache *qs, int v86, @@ -1439,7 +1439,7 @@ int whpx_init_vcpu(CPUState *cpu) vcpu->interruptable = true; cpu->vcpu_dirty = true; - cpu->hax_vcpu = (struct hax_vcpu_state *)vcpu; + cpu->accel_vcpu = vcpu; max_vcpu_index = max(max_vcpu_index, cpu->cpu_index); qemu_add_vm_change_state_handler(whpx_cpu_update_state, cpu->env_ptr); @@ -1481,7 +1481,7 @@ void whpx_destroy_vcpu(CPUState *cpu) whp_dispatch.WHvDeleteVirtualProcessor(whpx->partition, cpu->cpu_index); whp_dispatch.WHvEmulatorDestroyEmulator(vcpu->emulator); - g_free(cpu->hax_vcpu); + g_free(cpu->accel_vcpu); return; }