[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 05/11] s390x/css: Clean up unnecessary CONFIG_USER_ON
From: |
Cornelia Huck |
Subject: |
[Qemu-devel] [PULL 05/11] s390x/css: Clean up unnecessary CONFIG_USER_ONLY wrappers |
Date: |
Mon, 15 Dec 2014 12:35:26 +0100 |
From: Thomas Huth <address@hidden>
The css functions are only used from ioinst.c and other files that are
only built for CONFIG_SOFTMMU. So we do not need the dummy wrappers for
the CONFIG_USER_ONLY target in the cpu.h header.
Signed-off-by: Thomas Huth <address@hidden>
Signed-off-by: Jens Freimann <address@hidden>
Reviewed-by: Jason J. Herne <address@hidden>
Acked-by: Cornelia Huck <address@hidden>
Signed-off-by: Cornelia Huck <address@hidden>
---
target-s390x/cpu.h | 81 ----------------------------------------------------
1 file changed, 81 deletions(-)
diff --git a/target-s390x/cpu.h b/target-s390x/cpu.h
index fe2f95d..23ad336 100644
--- a/target-s390x/cpu.h
+++ b/target-s390x/cpu.h
@@ -457,87 +457,6 @@ int css_enable_mss(void);
int css_do_rsch(SubchDev *sch);
int css_do_rchp(uint8_t cssid, uint8_t chpid);
bool css_present(uint8_t cssid);
-#else
-static inline SubchDev *css_find_subch(uint8_t m, uint8_t cssid, uint8_t ssid,
- uint16_t schid)
-{
- return NULL;
-}
-static inline bool css_subch_visible(SubchDev *sch)
-{
- return false;
-}
-static inline void css_conditional_io_interrupt(SubchDev *sch)
-{
-}
-static inline int css_do_stsch(SubchDev *sch, SCHIB *schib)
-{
- return -ENODEV;
-}
-static inline bool css_schid_final(uint8_t cssid, uint8_t ssid, uint16_t schid)
-{
- return true;
-}
-static inline int css_do_msch(SubchDev *sch, SCHIB *schib)
-{
- return -ENODEV;
-}
-static inline int css_do_xsch(SubchDev *sch)
-{
- return -ENODEV;
-}
-static inline int css_do_csch(SubchDev *sch)
-{
- return -ENODEV;
-}
-static inline int css_do_hsch(SubchDev *sch)
-{
- return -ENODEV;
-}
-static inline int css_do_ssch(SubchDev *sch, ORB *orb)
-{
- return -ENODEV;
-}
-static inline int css_do_tsch(SubchDev *sch, IRB *irb)
-{
- return -ENODEV;
-}
-static inline int css_do_stcrw(CRW *crw)
-{
- return 1;
-}
-static inline int css_do_tpi(IOIntCode *int_code, int lowcore)
-{
- return 0;
-}
-static inline int css_collect_chp_desc(int m, uint8_t cssid, uint8_t f_chpid,
- int rfmt, uint8_t l_chpid, void *buf)
-{
- return 0;
-}
-static inline void css_do_schm(uint8_t mbk, int update, int dct, uint64_t mbo)
-{
-}
-static inline int css_enable_mss(void)
-{
- return -EINVAL;
-}
-static inline int css_enable_mcsse(void)
-{
- return -EINVAL;
-}
-static inline int css_do_rsch(SubchDev *sch)
-{
- return -ENODEV;
-}
-static inline int css_do_rchp(uint8_t cssid, uint8_t chpid)
-{
- return -ENODEV;
-}
-static inline bool css_present(uint8_t cssid)
-{
- return false;
-}
#endif
#define cpu_init(model) (&cpu_s390x_init(model)->env)
--
1.7.9.5
- [Qemu-devel] [PULL 00/11] s390x changes for 2.3, Cornelia Huck, 2014/12/15
- [Qemu-devel] [PULL 03/11] kvm: extend kvm_irqchip_add_msi_route to work on s390, Cornelia Huck, 2014/12/15
- [Qemu-devel] [PULL 01/11] s390: Add PCI bus support, Cornelia Huck, 2014/12/15
- [Qemu-devel] [PULL 04/11] s390x/ccw: fix oddity in machine class init, Cornelia Huck, 2014/12/15
- [Qemu-devel] [PULL 07/11] s390x/kvm: avoid syscalls by syncing registers with kvm_run, Cornelia Huck, 2014/12/15
- [Qemu-devel] [PULL 08/11] s390/pci: add error event support, Cornelia Huck, 2014/12/15
- [Qemu-devel] [PULL 05/11] s390x/css: Clean up unnecessary CONFIG_USER_ONLY wrappers,
Cornelia Huck <=
- [Qemu-devel] [PULL 02/11] s390: implement pci instructions, Cornelia Huck, 2014/12/15
- [Qemu-devel] [PULL 06/11] s390x/kvm: sync register support helper function, Cornelia Huck, 2014/12/15
- [Qemu-devel] [PULL 09/11] s390/pci: implement stpcifc instruction, Cornelia Huck, 2014/12/15
- [Qemu-devel] [PULL 10/11] s390/pci: remove unnecessary cpu_synchronize_state, Cornelia Huck, 2014/12/15
- [Qemu-devel] [PULL 11/11] s390x: update MAINTAINERS, Cornelia Huck, 2014/12/15
- Re: [Qemu-devel] [PULL 00/11] s390x changes for 2.3, Peter Maydell, 2014/12/15