[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 14/18] qapi: Rename target.json to misc-target.json
From: |
Markus Armbruster |
Subject: |
[Qemu-devel] [PULL 14/18] qapi: Rename target.json to misc-target.json |
Date: |
Tue, 2 Jul 2019 12:47:12 +0200 |
Signed-off-by: Markus Armbruster <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: Daniel P. Berrangé <address@hidden>
---
hw/ppc/spapr_rtc.c | 2 +-
hw/s390x/s390-skeys.c | 2 +-
hw/timer/mc146818rtc.c | 4 ++--
qapi/Makefile.objs | 2 +-
qapi/{target.json => misc-target.json} | 4 ----
qapi/qapi-schema.json | 2 +-
target/arm/monitor.c | 2 +-
target/i386/sev_i386.h | 2 +-
8 files changed, 8 insertions(+), 12 deletions(-)
rename qapi/{target.json => misc-target.json} (99%)
diff --git a/hw/ppc/spapr_rtc.c b/hw/ppc/spapr_rtc.c
index af1ef30a53..6cf0113b34 100644
--- a/hw/ppc/spapr_rtc.c
+++ b/hw/ppc/spapr_rtc.c
@@ -32,7 +32,7 @@
#include "sysemu/sysemu.h"
#include "hw/ppc/spapr.h"
#include "qapi/error.h"
-#include "qapi/qapi-events-target.h"
+#include "qapi/qapi-events-misc-target.h"
#include "qemu/cutils.h"
#include "qemu/module.h"
diff --git a/hw/s390x/s390-skeys.c b/hw/s390x/s390-skeys.c
index daac936698..e5bd92c0c7 100644
--- a/hw/s390x/s390-skeys.c
+++ b/hw/s390x/s390-skeys.c
@@ -14,7 +14,7 @@
#include "hw/boards.h"
#include "hw/s390x/storage-keys.h"
#include "qapi/error.h"
-#include "qapi/qapi-commands-target.h"
+#include "qapi/qapi-commands-misc-target.h"
#include "qapi/qmp/qdict.h"
#include "qemu/error-report.h"
#include "sysemu/kvm.h"
diff --git a/hw/timer/mc146818rtc.c b/hw/timer/mc146818rtc.c
index 0d79e000d2..ce4550b6f2 100644
--- a/hw/timer/mc146818rtc.c
+++ b/hw/timer/mc146818rtc.c
@@ -33,8 +33,8 @@
#include "sysemu/replay.h"
#include "hw/timer/mc146818rtc.h"
#include "qapi/error.h"
-#include "qapi/qapi-commands-target.h"
-#include "qapi/qapi-events-target.h"
+#include "qapi/qapi-commands-misc-target.h"
+#include "qapi/qapi-events-misc-target.h"
#include "qapi/visitor.h"
#include "exec/address-spaces.h"
diff --git a/qapi/Makefile.objs b/qapi/Makefile.objs
index 4e87bef6e1..c0be6fcd3e 100644
--- a/qapi/Makefile.objs
+++ b/qapi/Makefile.objs
@@ -9,7 +9,7 @@ QAPI_COMMON_MODULES = audio authz block-core block char common
crypto
QAPI_COMMON_MODULES += introspect job machine migration misc net
QAPI_COMMON_MODULES += qdev qom rdma rocker run-state sockets tpm
QAPI_COMMON_MODULES += trace transaction ui
-QAPI_TARGET_MODULES = machine-target target
+QAPI_TARGET_MODULES = machine-target misc-target
QAPI_MODULES = $(QAPI_COMMON_MODULES) $(QAPI_TARGET_MODULES)
util-obj-y += qapi-builtin-types.o
diff --git a/qapi/target.json b/qapi/misc-target.json
similarity index 99%
rename from qapi/target.json
rename to qapi/misc-target.json
index e0a73581d8..a00fd821eb 100644
--- a/qapi/target.json
+++ b/qapi/misc-target.json
@@ -1,10 +1,6 @@
# -*- Mode: Python -*-
#
-##
-# = Target-specific commands & events
-##
-
##
# @RTC_CHANGE:
#
diff --git a/qapi/qapi-schema.json b/qapi/qapi-schema.json
index 8dc82fde31..bcfac85074 100644
--- a/qapi/qapi-schema.json
+++ b/qapi/qapi-schema.json
@@ -102,5 +102,5 @@
{ 'include': 'machine.json' }
{ 'include': 'machine-target.json' }
{ 'include': 'misc.json' }
-{ 'include': 'target.json' }
+{ 'include': 'misc-target.json' }
{ 'include': 'audio.json' }
diff --git a/target/arm/monitor.c b/target/arm/monitor.c
index 41b32b94b2..6ec6dd04ac 100644
--- a/target/arm/monitor.c
+++ b/target/arm/monitor.c
@@ -23,7 +23,7 @@
#include "qemu/osdep.h"
#include "hw/boards.h"
#include "kvm_arm.h"
-#include "qapi/qapi-commands-target.h"
+#include "qapi/qapi-commands-misc-target.h"
static GICCapability *gic_cap_new(int version)
{
diff --git a/target/i386/sev_i386.h b/target/i386/sev_i386.h
index c0f9373beb..55313441ae 100644
--- a/target/i386/sev_i386.h
+++ b/target/i386/sev_i386.h
@@ -19,7 +19,7 @@
#include "sysemu/kvm.h"
#include "sysemu/sev.h"
#include "qemu/error-report.h"
-#include "qapi/qapi-commands-target.h"
+#include "qapi/qapi-commands-misc-target.h"
#define SEV_POLICY_NODBG 0x1
#define SEV_POLICY_NOKS 0x2
--
2.21.0
- [Qemu-devel] [PULL 00/18] Monitor patches for 2019-07-02, Markus Armbruster, 2019/07/02
- [Qemu-devel] [PULL 02/18] MAINTAINERS: Make section "QOM" cover qdev as well, Markus Armbruster, 2019/07/02
- [Qemu-devel] [PULL 04/18] hmp: Move hmp.h to include/monitor/, Markus Armbruster, 2019/07/02
- [Qemu-devel] [PULL 01/18] MAINTAINERS: new maintainers for QOM, Markus Armbruster, 2019/07/02
- [Qemu-devel] [PULL 06/18] qom: Move QMP command handlers to qom/, Markus Armbruster, 2019/07/02
- [Qemu-devel] [PULL 17/18] MAINTAINERS: Add Windows dump to section "Dump", Markus Armbruster, 2019/07/02
- [Qemu-devel] [PULL 14/18] qapi: Rename target.json to misc-target.json,
Markus Armbruster <=
- [Qemu-devel] [PULL 13/18] qapi: Split machine-target.json off target.json and misc.json, Markus Armbruster, 2019/07/02
- [Qemu-devel] [PULL 10/18] hw/core: Move numa.c to hw/core/, Markus Armbruster, 2019/07/02
- [Qemu-devel] [PULL 16/18] dump: Move the code to dump/, Markus Armbruster, 2019/07/02
- [Qemu-devel] [PULL 03/18] Makefile: Don't add monitor/ twice to common-obj-y, Markus Armbruster, 2019/07/02
- [Qemu-devel] [PULL 07/18] qom: Move HMP command handlers to qom/, Markus Armbruster, 2019/07/02
- [Qemu-devel] [PULL 12/18] hw/core: Collect HMP command handlers in hw/core/, Markus Armbruster, 2019/07/02
- [Qemu-devel] [PULL 08/18] MAINTAINERS: Merge sections CPU, NUMA into Machine core, Markus Armbruster, 2019/07/02
- [Qemu-devel] [PULL 15/18] qapi: Split dump.json off misc.json, Markus Armbruster, 2019/07/02
- [Qemu-devel] [PULL 11/18] hw/core: Collect QMP command handlers in hw/core/, Markus Armbruster, 2019/07/02
- [Qemu-devel] [PULL 05/18] qapi: Split qom.json and qdev.json off misc.json, Markus Armbruster, 2019/07/02