From: Thomas Huth <thuth@redhat.com>
To: qemu-devel@nongnu.org
Cc: "Richard Henderson" <richard.henderson@linaro.org>,
"Philippe Mathieu-Daudé" <philmd@linaro.org>,
"Eric Farman" <farman@linux.ibm.com>
Subject: [PULL 14/17] hw/s390x: Include missing 'cpu.h' header
Date: Wed, 24 Apr 2024 09:57:32 +0200 [thread overview]
Message-ID: <20240424075735.248041-15-thuth@redhat.com> (raw)
In-Reply-To: <20240424075735.248041-1-thuth@redhat.com>
From: Philippe Mathieu-Daudé <philmd@linaro.org>
"cpu.h" is implicitly included. Include it explicitly to
avoid the following error when refactoring headers:
hw/s390x/s390-stattrib.c:86:40: error: use of undeclared identifier 'TARGET_PAGE_SIZE'
len = sac->peek_stattr(sas, addr / TARGET_PAGE_SIZE, buflen, vals);
^
hw/s390x/s390-stattrib.c:94:58: error: use of undeclared identifier 'TARGET_PAGE_MASK'
addr / TARGET_PAGE_SIZE, len, addr & ~TARGET_PAGE_MASK);
^
hw/s390x/s390-stattrib.c:224:40: error: use of undeclared identifier 'TARGET_PAGE_BITS'
qemu_put_be64(f, (start_gfn << TARGET_PAGE_BITS) | STATTR_FLAG_MORE);
^
In file included from hw/s390x/s390-virtio-ccw.c:17:
hw/s390x/s390-virtio-hcall.h:22:27: error: unknown type name 'CPUS390XState'
int s390_virtio_hypercall(CPUS390XState *env);
^
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Acked-by: Eric Farman <farman@linux.ibm.com>
Message-ID: <20240322162822.7391-1-philmd@linaro.org>
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
hw/s390x/s390-virtio-hcall.h | 2 ++
hw/s390x/s390-stattrib.c | 1 +
2 files changed, 3 insertions(+)
diff --git a/hw/s390x/s390-virtio-hcall.h b/hw/s390x/s390-virtio-hcall.h
index 9800c4b351..3ae6d6ae3a 100644
--- a/hw/s390x/s390-virtio-hcall.h
+++ b/hw/s390x/s390-virtio-hcall.h
@@ -13,6 +13,7 @@
#define HW_S390_VIRTIO_HCALL_H
#include "standard-headers/asm-s390/virtio-ccw.h"
+#include "cpu.h"
/* The only thing that we need from the old kvm_virtio.h file */
#define KVM_S390_VIRTIO_NOTIFY 0
@@ -20,4 +21,5 @@
typedef int (*s390_virtio_fn)(const uint64_t *args);
void s390_register_virtio_hypercall(uint64_t code, s390_virtio_fn fn);
int s390_virtio_hypercall(CPUS390XState *env);
+
#endif /* HW_S390_VIRTIO_HCALL_H */
diff --git a/hw/s390x/s390-stattrib.c b/hw/s390x/s390-stattrib.c
index c483b62a9b..aaf48ac73f 100644
--- a/hw/s390x/s390-stattrib.c
+++ b/hw/s390x/s390-stattrib.c
@@ -19,6 +19,7 @@
#include "exec/ram_addr.h"
#include "qapi/error.h"
#include "qapi/qmp/qdict.h"
+#include "cpu.h"
/* 512KiB cover 2GB of guest memory */
#define CMMA_BLOCK_SIZE (512 * KiB)
--
2.44.0
next prev parent reply other threads:[~2024-04-24 8:00 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-04-24 7:57 [PULL 00/17] CI job updates, header cleanups and other misc patches Thomas Huth
2024-04-24 7:57 ` [PULL 01/17] MAINTAINERS: update email of Peter Lieven Thomas Huth
2024-04-24 7:57 ` [PULL 02/17] tests/qtest : Use `g_assert_cmphex` instead of `g_assert_cmpuint` Thomas Huth
2024-04-24 7:57 ` [PULL 03/17] docs: i386: pc: Update maximum CPU numbers for PC Q35 Thomas Huth
2024-04-24 7:57 ` [PULL 04/17] tests/vm: update openbsd image to 7.5 Thomas Huth
2024-04-24 7:57 ` [PULL 05/17] Revert ".travis.yml: Cache Avocado cache" Thomas Huth
2024-04-24 7:57 ` [PULL 06/17] .travis.yml: Remove the unused UNRELIABLE environment variable Thomas Huth
2024-04-24 7:57 ` [PULL 07/17] .travis.yml: Update the jobs to Ubuntu 22.04 Thomas Huth
2024-04-24 7:57 ` [PULL 08/17] .travis.yml: Do some more testing with Clang Thomas Huth
2024-04-24 7:57 ` [PULL 09/17] tests: Remove Ubuntu 20.04 container Thomas Huth
2024-04-24 7:57 ` [PULL 10/17] tests/lcitool/libvirt-ci: Update to the latest master branch Thomas Huth
2024-04-24 7:57 ` [PULL 11/17] tests/docker/dockerfiles: Run lcitool-refresh after the lcitool update Thomas Huth
2024-04-24 7:57 ` [PULL 12/17] tests: Update our CI to use CentOS Stream 9 instead of 8 Thomas Huth
2024-04-24 16:19 ` Richard Henderson
2024-04-25 5:02 ` Thomas Huth
2024-04-24 7:57 ` [PULL 13/17] ci: move external build environment setups to CentOS Stream 9 Thomas Huth
2024-04-24 7:57 ` Thomas Huth [this message]
2024-04-24 7:57 ` [PULL 15/17] docs/devel: fix minor typo in submitting-a-patch.rst Thomas Huth
2024-04-24 7:57 ` [PULL 16/17] tests/unit: Remove debug statements in test-nested-aio-poll.c Thomas Huth
2024-04-24 7:57 ` [PULL 17/17] target/s390x: Remove KVM stubs in cpu_models.h Thomas Huth
2024-04-24 16:21 ` [PULL 00/17] CI job updates, header cleanups and other misc patches Richard Henderson
2024-04-25 5:11 ` Thomas Huth
2024-04-25 7:55 ` Daniel P. Berrangé
2024-04-25 12:56 ` Fabiano Rosas
2024-04-25 15:04 ` Richard Henderson
2024-04-25 15:14 ` Thomas Huth
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=20240424075735.248041-15-thuth@redhat.com \
--to=thuth@redhat.com \
--cc=farman@linux.ibm.com \
--cc=philmd@linaro.org \
--cc=qemu-devel@nongnu.org \
--cc=richard.henderson@linaro.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.