From: Claudio Fontana <cfontana@suse.de>
To: Cornelia Huck <cohuck@redhat.com>, Thomas Huth <thuth@redhat.com>,
Richard Henderson <richard.henderson@linaro.org>
Cc: David Hildenbrand <david@redhat.com>,
qemu-devel@nongnu.org, Halil Pasic <pasic@linux.ibm.com>,
Christian Borntraeger <borntraeger@de.ibm.com>,
qemu-s390x@nongnu.org, Claudio Fontana <cfontana@suse.de>,
Paolo Bonzini <pbonzini@redhat.com>
Subject: [RFC v1 1/5] hw/s390x: only build qemu-tod from the CONFIG_TCG build
Date: Mon, 22 Mar 2021 20:15:47 +0100 [thread overview]
Message-ID: <20210322191551.25752-2-cfontana@suse.de> (raw)
In-Reply-To: <20210322191551.25752-1-cfontana@suse.de>
this allows to remove unneeded stubs for target/s390x.
Signed-off-by: Claudio Fontana <cfontana@suse.de>
---
hw/s390x/tod.c | 9 ++++++++-
hw/s390x/meson.build | 5 ++++-
2 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/hw/s390x/tod.c b/hw/s390x/tod.c
index 3c2979175e..322732d7fd 100644
--- a/hw/s390x/tod.c
+++ b/hw/s390x/tod.c
@@ -14,6 +14,8 @@
#include "qemu/error-report.h"
#include "qemu/module.h"
#include "sysemu/kvm.h"
+#include "sysemu/tcg.h"
+#include "sysemu/qtest.h"
#include "migration/qemu-file-types.h"
#include "migration/register.h"
@@ -23,8 +25,13 @@ void s390_init_tod(void)
if (kvm_enabled()) {
obj = object_new(TYPE_KVM_S390_TOD);
- } else {
+ } else if (tcg_enabled()) {
obj = object_new(TYPE_QEMU_S390_TOD);
+ } else if (qtest_enabled()) {
+ return;
+ } else {
+ warn_report("current accelerator not handled in s390_init_tod!");
+ return;
}
object_property_add_child(qdev_get_machine(), TYPE_S390_TOD, obj);
object_unref(obj);
diff --git a/hw/s390x/meson.build b/hw/s390x/meson.build
index 91495b5631..7f31f9e5d5 100644
--- a/hw/s390x/meson.build
+++ b/hw/s390x/meson.build
@@ -16,7 +16,6 @@ s390x_ss.add(files(
'sclp.c',
'sclpcpu.c',
'sclpquiesce.c',
- 'tod-qemu.c',
'tod.c',
))
s390x_ss.add(when: 'CONFIG_KVM', if_true: files(
@@ -25,6 +24,10 @@ s390x_ss.add(when: 'CONFIG_KVM', if_true: files(
's390-stattrib-kvm.c',
'pv.c',
))
+s390x_ss.add(when: 'CONFIG_TCG', if_true: files(
+ 'tod-qemu.c',
+))
+
s390x_ss.add(when: 'CONFIG_S390_CCW_VIRTIO', if_true: files('s390-virtio-ccw.c'))
s390x_ss.add(when: 'CONFIG_TERMINAL3270', if_true: files('3270-ccw.c'))
s390x_ss.add(when: 'CONFIG_VFIO', if_true: files('s390-pci-vfio.c'))
--
2.26.2
next prev parent reply other threads:[~2021-03-22 19:19 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-03-22 19:15 [RFC v1 0/5] s390x cleanup Claudio Fontana
2021-03-22 19:15 ` Claudio Fontana [this message]
2021-03-31 11:07 ` [RFC v1 1/5] hw/s390x: only build qemu-tod from the CONFIG_TCG build Cornelia Huck
2021-04-19 9:11 ` Claudio Fontana
2021-04-19 16:12 ` Claudio Fontana
2021-04-19 16:20 ` Cornelia Huck
2021-04-19 16:24 ` Claudio Fontana
2021-04-19 16:30 ` Cornelia Huck
2021-03-22 19:15 ` [RFC v1 2/5] target/s390x: start moving TCG-only code to tcg/ Claudio Fontana
2021-03-22 19:15 ` [RFC v1 3/5] target/s390x: move sysemu-only code out to cpu-sysemu.c Claudio Fontana
2021-03-22 19:15 ` [RFC v1 4/5] target/s390x: split cpu-dump from helper.c Claudio Fontana
2021-03-22 19:15 ` [RFC v1 5/5] target/s390x: make helper.c sysemu-only Claudio Fontana
2021-03-23 19:30 ` [RFC v1 0/5] s390x cleanup Claudio Fontana
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=20210322191551.25752-2-cfontana@suse.de \
--to=cfontana@suse.de \
--cc=borntraeger@de.ibm.com \
--cc=cohuck@redhat.com \
--cc=david@redhat.com \
--cc=pasic@linux.ibm.com \
--cc=pbonzini@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=qemu-s390x@nongnu.org \
--cc=richard.henderson@linaro.org \
--cc=thuth@redhat.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: 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.