All of lore.kernel.org
 help / color / mirror / Atom feed
From: Paolo Bonzini <pbonzini@redhat.com>
To: qemu-devel@nongnu.org
Cc: "Philippe Mathieu-Daudé" <philmd@redhat.com>
Subject: [PULL 35/40] hw/i386/sgx: Move qmp_query_sgx() and hmp_info_sgx() to hw/i386/sgx.c
Date: Wed, 13 Oct 2021 11:07:23 +0200	[thread overview]
Message-ID: <20211013090728.309365-36-pbonzini@redhat.com> (raw)
In-Reply-To: <20211013090728.309365-1-pbonzini@redhat.com>

From: Philippe Mathieu-Daudé <philmd@redhat.com>

Move qmp_query_sgx() and hmp_info_sgx() from target/i386/monitor.c
to hw/i386/sgx.c, removing the sgx_get_info() indirection and the
"hw/i386/sgx.h" header.

Suggested-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Message-Id: <20211007175612.496366-5-philmd@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
 hw/i386/sgx-stub.c    | 10 ++++++++--
 hw/i386/sgx.c         | 26 ++++++++++++++++++++++++--
 include/hw/i386/sgx.h | 11 -----------
 target/i386/monitor.c | 27 ---------------------------
 4 files changed, 32 insertions(+), 42 deletions(-)
 delete mode 100644 include/hw/i386/sgx.h

diff --git a/hw/i386/sgx-stub.c b/hw/i386/sgx-stub.c
index 3749656db1..c9b379e665 100644
--- a/hw/i386/sgx-stub.c
+++ b/hw/i386/sgx-stub.c
@@ -1,11 +1,12 @@
 #include "qemu/osdep.h"
+#include "monitor/monitor.h"
+#include "monitor/hmp-target.h"
 #include "hw/i386/pc.h"
 #include "hw/i386/sgx-epc.h"
-#include "hw/i386/sgx.h"
 #include "qapi/error.h"
 #include "qapi/qapi-commands-misc-target.h"
 
-SGXInfo *sgx_get_info(Error **errp)
+SGXInfo *qmp_query_sgx(Error **errp)
 {
     error_setg(errp, "SGX support is not compiled in");
     return NULL;
@@ -17,6 +18,11 @@ SGXInfo *qmp_query_sgx_capabilities(Error **errp)
     return NULL;
 }
 
+void hmp_info_sgx(Monitor *mon, const QDict *qdict)
+{
+    monitor_printf(mon, "SGX is not available in this QEMU\n");
+}
+
 void pc_machine_init_sgx_epc(PCMachineState *pcms)
 {
     memset(&pcms->sgx_epc, 0, sizeof(SGXEPCState));
diff --git a/hw/i386/sgx.c b/hw/i386/sgx.c
index 713f136343..11607568b6 100644
--- a/hw/i386/sgx.c
+++ b/hw/i386/sgx.c
@@ -15,10 +15,11 @@
 #include "hw/i386/sgx-epc.h"
 #include "hw/mem/memory-device.h"
 #include "monitor/qdev.h"
+#include "monitor/monitor.h"
+#include "monitor/hmp-target.h"
 #include "qapi/error.h"
 #include "qapi/qapi-commands-misc-target.h"
 #include "exec/address-spaces.h"
-#include "hw/i386/sgx.h"
 #include "sysemu/hw_accel.h"
 
 #define SGX_MAX_EPC_SECTIONS            8
@@ -86,7 +87,7 @@ SGXInfo *qmp_query_sgx_capabilities(Error **errp)
     return info;
 }
 
-SGXInfo *sgx_get_info(Error **errp)
+SGXInfo *qmp_query_sgx(Error **errp)
 {
     SGXInfo *info = NULL;
     X86MachineState *x86ms;
@@ -116,6 +117,27 @@ SGXInfo *sgx_get_info(Error **errp)
     return info;
 }
 
+void hmp_info_sgx(Monitor *mon, const QDict *qdict)
+{
+    Error *err = NULL;
+    g_autoptr(SGXInfo) info = qmp_query_sgx(&err);
+
+    if (err) {
+        error_report_err(err);
+        return;
+    }
+    monitor_printf(mon, "SGX support: %s\n",
+                   info->sgx ? "enabled" : "disabled");
+    monitor_printf(mon, "SGX1 support: %s\n",
+                   info->sgx1 ? "enabled" : "disabled");
+    monitor_printf(mon, "SGX2 support: %s\n",
+                   info->sgx2 ? "enabled" : "disabled");
+    monitor_printf(mon, "FLC support: %s\n",
+                   info->flc ? "enabled" : "disabled");
+    monitor_printf(mon, "size: %" PRIu64 "\n",
+                   info->section_size);
+}
+
 bool sgx_epc_get_section(int section_nr, uint64_t *addr, uint64_t *size)
 {
     PCMachineState *pcms = PC_MACHINE(qdev_get_machine());
diff --git a/include/hw/i386/sgx.h b/include/hw/i386/sgx.h
deleted file mode 100644
index 2bf90b3f4f..0000000000
--- a/include/hw/i386/sgx.h
+++ /dev/null
@@ -1,11 +0,0 @@
-#ifndef QEMU_SGX_H
-#define QEMU_SGX_H
-
-#include "qom/object.h"
-#include "qapi/error.h"
-#include "qemu/error-report.h"
-#include "qapi/qapi-types-misc-target.h"
-
-SGXInfo *sgx_get_info(Error **errp);
-
-#endif
diff --git a/target/i386/monitor.c b/target/i386/monitor.c
index 84fba47f19..8166e17693 100644
--- a/target/i386/monitor.c
+++ b/target/i386/monitor.c
@@ -34,7 +34,6 @@
 #include "qapi/qapi-commands-misc-target.h"
 #include "qapi/qapi-commands-misc.h"
 #include "hw/i386/pc.h"
-#include "hw/i386/sgx.h"
 
 /* Perform linear address sign extension */
 static hwaddr addr_canonical(CPUArchState *env, hwaddr addr)
@@ -674,29 +673,3 @@ void hmp_info_io_apic(Monitor *mon, const QDict *qdict)
     monitor_printf(mon, "This command is obsolete and will be "
                    "removed soon. Please use 'info pic' instead.\n");
 }
-
-SGXInfo *qmp_query_sgx(Error **errp)
-{
-    return sgx_get_info(errp);
-}
-
-void hmp_info_sgx(Monitor *mon, const QDict *qdict)
-{
-    Error *err = NULL;
-    g_autoptr(SGXInfo) info = qmp_query_sgx(&err);
-
-    if (err) {
-        error_report_err(err);
-        return;
-    }
-    monitor_printf(mon, "SGX support: %s\n",
-                   info->sgx ? "enabled" : "disabled");
-    monitor_printf(mon, "SGX1 support: %s\n",
-                   info->sgx1 ? "enabled" : "disabled");
-    monitor_printf(mon, "SGX2 support: %s\n",
-                   info->sgx2 ? "enabled" : "disabled");
-    monitor_printf(mon, "FLC support: %s\n",
-                   info->flc ? "enabled" : "disabled");
-    monitor_printf(mon, "size: %" PRIu64 "\n",
-                   info->section_size);
-}
-- 
2.31.1




  parent reply	other threads:[~2021-10-13  9:36 UTC|newest]

Thread overview: 48+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-10-13  9:06 [PULL 00/40] Misc patches for 2021-10-13 Paolo Bonzini
2021-10-13  9:06 ` [PULL 01/40] MAINTAINERS: Add myself as reviewer of the 'Memory API' Paolo Bonzini
2021-10-13  9:06 ` [PULL 02/40] tests: add missing dependency for check-block Paolo Bonzini
2021-10-13  9:06 ` [PULL 03/40] build: fix "make check" without earlier "make" Paolo Bonzini
2021-10-13  9:06 ` [PULL 04/40] qemu-iotests: flush after every test Paolo Bonzini
2021-10-13  9:06 ` [PULL 05/40] util/compatfd.c: use libc signalfd wrapper instead of raw syscall Paolo Bonzini
2021-10-13  9:06 ` [PULL 06/40] qapi/misc-target: Wrap long 'SEV Attestation Report' long lines Paolo Bonzini
2021-10-13  9:06 ` [PULL 07/40] qapi/misc-target: Group SEV QAPI definitions Paolo Bonzini
2021-10-13  9:06 ` [PULL 08/40] target/i386/kvm: Introduce i386_softmmu_kvm Meson source set Paolo Bonzini
2021-10-13  9:06 ` [PULL 09/40] target/i386/kvm: Restrict SEV stubs to x86 architecture Paolo Bonzini
2021-10-13  9:06 ` [PULL 10/40] target/i386/sev: Prefix QMP errors with 'SEV' Paolo Bonzini
2021-10-13  9:06 ` [PULL 11/40] target/i386/monitor: Return QMP error when SEV is not enabled for guest Paolo Bonzini
2021-10-13  9:07 ` [PULL 12/40] target/i386/cpu: Add missing 'qapi/error.h' header Paolo Bonzini
2021-10-13  9:07 ` [PULL 13/40] target/i386/sev_i386.h: Remove unused headers Paolo Bonzini
2021-10-13  9:07 ` [PULL 14/40] target/i386/sev: Remove sev_get_me_mask() Paolo Bonzini
2021-10-13  9:07 ` [PULL 15/40] target/i386/sev: Mark unreachable code with g_assert_not_reached() Paolo Bonzini
2021-10-13  9:07 ` [PULL 16/40] target/i386/sev: sev_get_attestation_report use g_autofree Paolo Bonzini
2021-10-13  9:07 ` [PULL 17/40] target/i386/sev: Use g_autofree in sev_launch_get_measure() Paolo Bonzini
2021-10-13  9:07 ` [PULL 18/40] target/i386/sev: Restrict SEV to system emulation Paolo Bonzini
2021-10-13  9:07 ` [PULL 19/40] target/i386/sev: Rename sev_i386.h -> sev.h Paolo Bonzini
2021-10-13  9:07 ` [PULL 20/40] target/i386/sev: Declare system-specific functions in 'sev.h' Paolo Bonzini
2021-10-13  9:07 ` [PULL 21/40] target/i386/sev: Remove stubs by using code elision Paolo Bonzini
2021-10-13  9:07 ` [PULL 22/40] target/i386/sev: Move qmp_query_sev_attestation_report() to sev.c Paolo Bonzini
2021-10-13  9:07 ` [PULL 23/40] target/i386/sev: Move qmp_sev_inject_launch_secret() " Paolo Bonzini
2021-10-13  9:07 ` [PULL 24/40] target/i386/sev: Move qmp_query_sev_capabilities() " Paolo Bonzini
2021-10-13  9:07 ` [PULL 25/40] target/i386/sev: Move qmp_query_sev_launch_measure() " Paolo Bonzini
2021-10-13  9:07 ` [PULL 26/40] target/i386/sev: Move qmp_query_sev() & hmp_info_sev() " Paolo Bonzini
2021-10-13  9:07 ` [PULL 27/40] monitor: Reduce hmp_info_sev() declaration Paolo Bonzini
2021-10-13  9:07 ` [PULL 28/40] MAINTAINERS: Cover SEV-related files with X86/KVM section Paolo Bonzini
2021-10-13  9:07 ` [PULL 29/40] qapi: Make some ObjectTypes depend on the build settings Paolo Bonzini
2021-10-13  9:07 ` [PULL 30/40] tests: tcg: Fix PVH test with binutils 2.36+ Paolo Bonzini
2021-10-13  9:07 ` [PULL 31/40] hvf: Determine slot count from struct layout Paolo Bonzini
2021-10-13  9:07 ` [PULL 32/40] MAINTAINERS: Cover SGX documentation file with X86/KVM section Paolo Bonzini
2021-10-13  9:07 ` [PULL 33/40] hw/i386/sgx: Have sgx_epc_get_section() return a boolean Paolo Bonzini
2021-10-13  9:07 ` [PULL 34/40] hw/i386/sgx: Move qmp_query_sgx_capabilities() to hw/i386/sgx.c Paolo Bonzini
2021-10-13  9:07 ` Paolo Bonzini [this message]
2021-10-13  9:07 ` [PULL 36/40] Revert "hw/misc: applesmc: use host osk as default on macs" Paolo Bonzini
2021-10-13  9:07 ` [PULL 37/40] monitor: Tidy up find_device_state() Paolo Bonzini
2021-10-15 11:08   ` Christian Borntraeger
2021-10-15 19:15     ` Richard Henderson
2021-10-18 10:08       ` regression on s390: was " Christian Borntraeger
2021-10-18 12:42         ` Markus Armbruster
2021-10-18 12:03     ` Markus Armbruster
2021-10-19  9:05       ` Markus Armbruster
2021-10-13  9:07 ` [PULL 38/40] target/i386/sev: Use local variable for kvm_sev_launch_start Paolo Bonzini
2021-10-13  9:07 ` [PULL 39/40] target/i386/sev: Use local variable for kvm_sev_launch_measure Paolo Bonzini
2021-10-13  9:07 ` [PULL 40/40] ebpf: really include it only in system emulators Paolo Bonzini
2021-10-13 17:28 ` [PULL 00/40] Misc patches for 2021-10-13 Richard Henderson

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=20211013090728.309365-36-pbonzini@redhat.com \
    --to=pbonzini@redhat.com \
    --cc=philmd@redhat.com \
    --cc=qemu-devel@nongnu.org \
    /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: link
Be 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.