From: "Philippe Mathieu-Daudé" <philmd@redhat.com> To: qemu-devel@nongnu.org Cc: "Eduardo Habkost" <ehabkost@redhat.com>, "Cornelia Huck" <cohuck@redhat.com>, "Richard Henderson" <richard.henderson@linaro.org>, "Sunil Muthuswamy" <sunilmut@microsoft.com>, "Marcelo Tosatti" <mtosatti@redhat.com>, "David Gibson" <david@gibson.dropbear.id.au>, "Marcel Apfelbaum" <marcel.apfelbaum@gmail.com>, kvm@vger.kernel.org, "Wenchao Wang" <wenchao.wang@intel.com>, "Thomas Huth" <thuth@redhat.com>, "Cameron Esfahani" <dirty@apple.com>, "Paolo Bonzini" <pbonzini@redhat.com>, "David Hildenbrand" <david@redhat.com>, "Roman Bolshakov" <r.bolshakov@yadro.com>, "Peter Maydell" <peter.maydell@linaro.org>, "Greg Kurz" <groug@kaod.org>, qemu-arm@nongnu.org, "Halil Pasic" <pasic@linux.ibm.com>, "Colin Xu" <colin.xu@intel.com>, "Claudio Fontana" <cfontana@suse.de>, qemu-ppc@nongnu.org, "Christian Borntraeger" <borntraeger@de.ibm.com>, qemu-s390x@nongnu.org, haxm-team@intel.com, "Philippe Mathieu-Daudé" <philmd@redhat.com> Subject: [RFC PATCH 18/19] accel/hvf: Declare and allocate AccelvCPUState struct Date: Wed, 3 Mar 2021 19:22:18 +0100 [thread overview] Message-ID: <20210303182219.1631042-19-philmd@redhat.com> (raw) In-Reply-To: <20210303182219.1631042-1-philmd@redhat.com> In preparation of moving HVF-specific fields from CPUState to the accelerator-specific AccelvCPUState structure, first declare it empty and allocate it. This will make the following commits easier to review. Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com> --- target/i386/hvf/hvf-i386.h | 3 +++ target/i386/hvf/hvf.c | 4 +++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/target/i386/hvf/hvf-i386.h b/target/i386/hvf/hvf-i386.h index 59cfca8875e..1f12eb647a0 100644 --- a/target/i386/hvf/hvf-i386.h +++ b/target/i386/hvf/hvf-i386.h @@ -51,6 +51,9 @@ struct HVFState { }; extern HVFState *hvf_state; +struct AccelvCPUState { +}; + void hvf_set_phys_mem(MemoryRegionSection *, bool); void hvf_handle_io(CPUArchState *, uint16_t, void *, int, int, int); hvf_slot *hvf_find_overlap_slot(uint64_t, uint64_t); diff --git a/target/i386/hvf/hvf.c b/target/i386/hvf/hvf.c index effee39ee9b..342659f1e15 100644 --- a/target/i386/hvf/hvf.c +++ b/target/i386/hvf/hvf.c @@ -451,6 +451,7 @@ void hvf_vcpu_destroy(CPUState *cpu) hv_return_t ret = hv_vcpu_destroy((hv_vcpuid_t)cpu->hvf_fd); g_free(env->hvf_mmio_buf); assert_hvf_ok(ret); + g_free(cpu->accel_vcpu); } static void dummy_signal(int sig) @@ -534,9 +535,10 @@ int hvf_init_vcpu(CPUState *cpu) } r = hv_vcpu_create(&hvf_fd, HV_VCPU_DEFAULT); - cpu->vcpu_dirty = true; assert_hvf_ok(r); + cpu->accel_vcpu = g_new(struct AccelvCPUState, 1); cpu->hvf_fd = (int)hvf_fd + cpu->vcpu_dirty = true; if (hv_vmx_read_capability(HV_VMX_CAP_PINBASED, &hvf_state->hvf_caps->vmx_cap_pinbased)) { -- 2.26.2
WARNING: multiple messages have this Message-ID (diff)
From: "Philippe Mathieu-Daudé" <philmd@redhat.com> To: qemu-devel@nongnu.org Cc: "Peter Maydell" <peter.maydell@linaro.org>, "Cornelia Huck" <cohuck@redhat.com>, kvm@vger.kernel.org, "David Hildenbrand" <david@redhat.com>, haxm-team@intel.com, "Colin Xu" <colin.xu@intel.com>, "Halil Pasic" <pasic@linux.ibm.com>, "Christian Borntraeger" <borntraeger@de.ibm.com>, "Claudio Fontana" <cfontana@suse.de>, "Philippe Mathieu-Daudé" <philmd@redhat.com>, "Thomas Huth" <thuth@redhat.com>, "Eduardo Habkost" <ehabkost@redhat.com>, "Richard Henderson" <richard.henderson@linaro.org>, "Greg Kurz" <groug@kaod.org>, "Cameron Esfahani" <dirty@apple.com>, "Roman Bolshakov" <r.bolshakov@yadro.com>, qemu-arm@nongnu.org, "Sunil Muthuswamy" <sunilmut@microsoft.com>, "David Gibson" <david@gibson.dropbear.id.au>, "Marcelo Tosatti" <mtosatti@redhat.com>, qemu-s390x@nongnu.org, qemu-ppc@nongnu.org, "Wenchao Wang" <wenchao.wang@intel.com>, "Paolo Bonzini" <pbonzini@redhat.com> Subject: [RFC PATCH 18/19] accel/hvf: Declare and allocate AccelvCPUState struct Date: Wed, 3 Mar 2021 19:22:18 +0100 [thread overview] Message-ID: <20210303182219.1631042-19-philmd@redhat.com> (raw) In-Reply-To: <20210303182219.1631042-1-philmd@redhat.com> In preparation of moving HVF-specific fields from CPUState to the accelerator-specific AccelvCPUState structure, first declare it empty and allocate it. This will make the following commits easier to review. Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com> --- target/i386/hvf/hvf-i386.h | 3 +++ target/i386/hvf/hvf.c | 4 +++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/target/i386/hvf/hvf-i386.h b/target/i386/hvf/hvf-i386.h index 59cfca8875e..1f12eb647a0 100644 --- a/target/i386/hvf/hvf-i386.h +++ b/target/i386/hvf/hvf-i386.h @@ -51,6 +51,9 @@ struct HVFState { }; extern HVFState *hvf_state; +struct AccelvCPUState { +}; + void hvf_set_phys_mem(MemoryRegionSection *, bool); void hvf_handle_io(CPUArchState *, uint16_t, void *, int, int, int); hvf_slot *hvf_find_overlap_slot(uint64_t, uint64_t); diff --git a/target/i386/hvf/hvf.c b/target/i386/hvf/hvf.c index effee39ee9b..342659f1e15 100644 --- a/target/i386/hvf/hvf.c +++ b/target/i386/hvf/hvf.c @@ -451,6 +451,7 @@ void hvf_vcpu_destroy(CPUState *cpu) hv_return_t ret = hv_vcpu_destroy((hv_vcpuid_t)cpu->hvf_fd); g_free(env->hvf_mmio_buf); assert_hvf_ok(ret); + g_free(cpu->accel_vcpu); } static void dummy_signal(int sig) @@ -534,9 +535,10 @@ int hvf_init_vcpu(CPUState *cpu) } r = hv_vcpu_create(&hvf_fd, HV_VCPU_DEFAULT); - cpu->vcpu_dirty = true; assert_hvf_ok(r); + cpu->accel_vcpu = g_new(struct AccelvCPUState, 1); cpu->hvf_fd = (int)hvf_fd + cpu->vcpu_dirty = true; if (hv_vmx_read_capability(HV_VMX_CAP_PINBASED, &hvf_state->hvf_caps->vmx_cap_pinbased)) { -- 2.26.2
next prev parent reply other threads:[~2021-03-04 0:32 UTC|newest] Thread overview: 54+ messages / expand[flat|nested] mbox.gz Atom feed top 2021-03-03 18:22 [RFC PATCH 00/19] accel: Introduce AccelvCPUState opaque structure Philippe Mathieu-Daudé 2021-03-03 18:22 ` Philippe Mathieu-Daudé 2021-03-03 18:22 ` [PATCH 01/19] target/i386/hvf: Use boolean value for vcpu_dirty Philippe Mathieu-Daudé 2021-03-03 18:22 ` Philippe Mathieu-Daudé 2021-03-03 18:22 ` [PATCH 02/19] target/s390x/kvm: Simplify debug code Philippe Mathieu-Daudé 2021-03-03 18:22 ` Philippe Mathieu-Daudé 2021-03-04 6:24 ` Thomas Huth 2021-03-04 6:24 ` Thomas Huth 2021-03-04 16:05 ` Cornelia Huck 2021-03-04 16:05 ` Cornelia Huck 2021-03-03 18:22 ` [PATCH 03/19] target/s390x/kvm: Reduce deref by declaring 'struct kvm_run' on stack Philippe Mathieu-Daudé 2021-03-03 18:22 ` Philippe Mathieu-Daudé 2021-03-03 18:22 ` [PATCH 04/19] cpu: Croup accelerator-specific fields altogether Philippe Mathieu-Daudé 2021-03-03 18:22 ` Philippe Mathieu-Daudé 2021-03-04 13:26 ` Philippe Mathieu-Daudé 2021-03-04 13:26 ` Philippe Mathieu-Daudé 2021-03-03 18:22 ` [RFC PATCH 05/19] cpu: Introduce AccelvCPUState opaque structure Philippe Mathieu-Daudé 2021-03-03 18:22 ` Philippe Mathieu-Daudé 2021-03-03 18:22 ` [RFC PATCH 06/19] accel/whpx: Add typedef for 'struct whpx_vcpu' Philippe Mathieu-Daudé 2021-03-03 18:22 ` Philippe Mathieu-Daudé 2021-03-03 18:22 ` [RFC PATCH 07/19] accel/whpx: Rename struct whpx_vcpu -> AccelvCPUState Philippe Mathieu-Daudé 2021-03-03 18:22 ` Philippe Mathieu-Daudé 2021-03-03 18:22 ` [RFC PATCH 08/19] accel/whpx: Use 'accel_vcpu' generic pointer Philippe Mathieu-Daudé 2021-03-03 18:22 ` Philippe Mathieu-Daudé 2021-03-03 18:22 ` [RFC PATCH 09/19] accel/hax: Add typedef for 'struct hax_vcpu_state' Philippe Mathieu-Daudé 2021-03-03 18:22 ` Philippe Mathieu-Daudé 2021-03-03 18:22 ` [RFC PATCH 10/19] accel/hax: Use 'accel_vcpu' generic pointer Philippe Mathieu-Daudé 2021-03-03 18:22 ` Philippe Mathieu-Daudé 2021-03-03 18:22 ` [RFC PATCH 11/19] accel/kvm: Introduce kvm_vcpu_state() helper Philippe Mathieu-Daudé 2021-03-03 18:22 ` Philippe Mathieu-Daudé 2021-03-03 18:22 ` [RFC PATCH 12/19] accel/kvm: Use kvm_vcpu_state() when possible Philippe Mathieu-Daudé 2021-03-03 18:22 ` Philippe Mathieu-Daudé 2021-03-03 18:22 ` [RFC PATCH 13/19] accel/kvm: Declare and allocate AccelvCPUState struct Philippe Mathieu-Daudé 2021-03-03 18:22 ` Philippe Mathieu-Daudé 2021-03-03 18:22 ` [RFC PATCH 14/19] accel/kvm: Move the 'kvm_fd' field to AccelvCPUState Philippe Mathieu-Daudé 2021-03-03 18:22 ` Philippe Mathieu-Daudé 2021-03-03 18:22 ` [RFC PATCH 15/19] accel/kvm: Move the 'kvm_state' " Philippe Mathieu-Daudé 2021-03-03 18:22 ` Philippe Mathieu-Daudé 2021-03-03 18:22 ` [RFC PATCH 16/19] accel/kvm: Move the 'kvm_run' " Philippe Mathieu-Daudé 2021-03-03 18:22 ` Philippe Mathieu-Daudé 2021-03-03 18:22 ` [RFC PATCH 17/19] accel/hvf: Reduce deref by declaring 'hv_vcpuid_t hvf_fd' on stack Philippe Mathieu-Daudé 2021-03-03 18:22 ` Philippe Mathieu-Daudé 2021-03-03 18:22 ` Philippe Mathieu-Daudé [this message] 2021-03-03 18:22 ` [RFC PATCH 18/19] accel/hvf: Declare and allocate AccelvCPUState struct Philippe Mathieu-Daudé 2021-03-03 18:22 ` [RFC PATCH 19/19] accel/hvf: Move the 'hvf_fd' field to AccelvCPUState Philippe Mathieu-Daudé 2021-03-03 18:22 ` Philippe Mathieu-Daudé 2021-03-04 13:56 ` [RFC PATCH 00/19] accel: Introduce AccelvCPUState opaque structure Paolo Bonzini 2021-03-04 13:56 ` Paolo Bonzini 2021-03-04 14:54 ` Philippe Mathieu-Daudé 2021-03-04 14:54 ` Philippe Mathieu-Daudé 2021-03-04 15:40 ` Paolo Bonzini 2021-03-04 15:40 ` Paolo Bonzini 2021-03-04 16:42 ` Philippe Mathieu-Daudé 2021-03-04 16:42 ` Philippe Mathieu-Daudé
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20210303182219.1631042-19-philmd@redhat.com \ --to=philmd@redhat.com \ --cc=borntraeger@de.ibm.com \ --cc=cfontana@suse.de \ --cc=cohuck@redhat.com \ --cc=colin.xu@intel.com \ --cc=david@gibson.dropbear.id.au \ --cc=david@redhat.com \ --cc=dirty@apple.com \ --cc=ehabkost@redhat.com \ --cc=groug@kaod.org \ --cc=haxm-team@intel.com \ --cc=kvm@vger.kernel.org \ --cc=marcel.apfelbaum@gmail.com \ --cc=mtosatti@redhat.com \ --cc=pasic@linux.ibm.com \ --cc=pbonzini@redhat.com \ --cc=peter.maydell@linaro.org \ --cc=qemu-arm@nongnu.org \ --cc=qemu-devel@nongnu.org \ --cc=qemu-ppc@nongnu.org \ --cc=qemu-s390x@nongnu.org \ --cc=r.bolshakov@yadro.com \ --cc=richard.henderson@linaro.org \ --cc=sunilmut@microsoft.com \ --cc=thuth@redhat.com \ --cc=wenchao.wang@intel.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.