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: 12114995 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=-18.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,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 36001C433E6 for ; Thu, 4 Mar 2021 00:30:36 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 1187364EEE for ; Thu, 4 Mar 2021 00:30:36 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1451147AbhCDAaZ (ORCPT ); Wed, 3 Mar 2021 19:30:25 -0500 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:26265 "EHLO us-smtp-delivery-124.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1377403AbhCCS2g (ORCPT ); Wed, 3 Mar 2021 13:28:36 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1614796023; 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=eTXm+p6HyC5IiFjAahH/VNaruOzitGAwz+bOU6Y5ibO8jGXFyacPLJJGx8mYTGhZ1Gndtm G3rNvUd4eyEe39ukU472IFgmI+7kijlnlXm4vlqc8l4X5EHb9WEv1GKstAjHJ5IhA0Kk+O bTnUUH7nw+tRvhqKSvl2XPENlwRLF3s= Received: from mail-wm1-f71.google.com (mail-wm1-f71.google.com [209.85.128.71]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-296-TeVkghTIPSeiIOMe4k0tKw-1; Wed, 03 Mar 2021 13:23:13 -0500 X-MC-Unique: TeVkghTIPSeiIOMe4k0tKw-1 Received: by mail-wm1-f71.google.com with SMTP id j8so2169374wmq.6 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=LYQwA5Uo02ce3hRYVjxX105V796I0Ub0QEwZiN5XSWRrNb2Z2u2fbU5posO94C8ag6 Wrzd5bHDi/kRDUBorC43p62puDjbLoofkc1rXEvyeguD5VCxbaf+XBysmZpdaQyOl4rj w6b56qHgI4lwYJ5ojlvjjc01hqKx6njij5d7cfsGSm69kGvmQu6c2uTT9AmORt9NPTE0 WWl31BqtkS1VLFtgULFZbz+7c5zx5oBFVMx5SDHUJAJFgpdCC5Qc6LhuXA8Nuyv5jirt MDO2k6gPzRvLUFJwOFe2+F9V0gj73QSK7PyuEN6RnEE3msLACQWP7MIt91j1z8B0Kk31 D7Zw== X-Gm-Message-State: AOAM531gFMYJbYNHrIGFUBn7fS4m5oNWAfnOv5KiPxnTjij3BmNydAVF dRd1ei++2IsLRKzFh25IopmHoS90fGN9Mecc5QH0s89/hOrdpL5T+KHcjmqftG7B08mR3o80SH2 ZvOQacNTNE8X2 X-Received: by 2002:adf:f512:: with SMTP id q18mr28690255wro.61.1614795792401; 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 Cc: Eduardo Habkost , Cornelia Huck , Richard Henderson , Sunil Muthuswamy , Marcelo Tosatti , David Gibson , Marcel Apfelbaum , kvm@vger.kernel.org, Wenchao Wang , Thomas Huth , Cameron Esfahani , Paolo Bonzini , David Hildenbrand , Roman Bolshakov , Peter Maydell , Greg Kurz , qemu-arm@nongnu.org, Halil Pasic , Colin Xu , Claudio Fontana , qemu-ppc@nongnu.org, Christian Borntraeger , qemu-s390x@nongnu.org, haxm-team@intel.com, =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?q?=C3=A9?= 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 Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org 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; }