Commit 19c69829 authored Sep 13, 2017 by David Hildenbrand Committed by Cornelia Huck Sep 19, 2017

s390x: move subsystem_reset() to s390-virtio-ccw.h



Implemented in s390-virtio-ccw.c, so move it to the right header.
We can also drop the extern. Fix up one include.

Reviewed-by: Thomas Huth <thuth@redhat.com>
Acked-by: Christian Borntraeger <borntraeger@de.ibm.com>
Signed-off-by: David Hildenbrand <david@redhat.com>
Message-Id: <20170913132417.24384-7-david@redhat.com>
Signed-off-by: Cornelia Huck <cohuck@redhat.com>

parent 2c98a6c1

include/hw/s390x/s390-virtio-ccw.h

+2 −0

Original line number	Diff line number	Diff line
		@@ -56,4 +56,6 @@ bool gs_allowed(void);
		*/
		bool css_migration_enabled(void);

		void subsystem_reset(void);

		#endif

target/s390x/cpu.h

+0 −1

Original line number	Diff line number	Diff line
		@@ -721,7 +721,6 @@ int s390_cpu_virt_mem_rw(S390CPU cpu, vaddr laddr, uint8_t ar, void hostbuf,

		/* outside of target/s390x/ */
		S390CPU *s390_cpu_addr2state(uint16_t cpu_addr);
		extern void subsystem_reset(void);
		int sclp_service_call(CPUS390XState *env, uint64_t sccb, uint32_t code);

		#endif

target/s390x/diag.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -20,6 +20,7 @@
		#include "hw/watchdog/wdt_diag288.h"
		#include "sysemu/cpus.h"
		#include "hw/s390x/ipl.h"
		#include "hw/s390x/s390-virtio-ccw.h"

		static int modified_clear_reset(S390CPU *cpu)
		{