ea4bfdf52a
The s390 kernel does not compile if virtio console is enabled, but guest
support is disabled:
LD .tmp_vmlinux1
arch/s390/kernel/built-in.o: In function `setup_arch':
/space/linux-2.5/arch/s390/kernel/setup.c:773: undefined reference to
`s390_virtio_console_init'
The fix is related to
commit 99e65c92f2
Author: Christian Borntraeger <borntraeger@de.ibm.com>
Date: Fri Jul 25 15:50:04 2008 +0200
KVM: s390: Fix guest kconfig
Which changed the build process to build kvm_virtio.c only if CONFIG_S390_GUEST
is set. We must ifdef the prototype in the header file accordingly.
Reported-by: Heiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
64 lines
1.6 KiB
C
64 lines
1.6 KiB
C
/*
|
|
* kvm_virtio.h - definition for virtio for kvm on s390
|
|
*
|
|
* Copyright IBM Corp. 2008
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License (version 2 only)
|
|
* as published by the Free Software Foundation.
|
|
*
|
|
* Author(s): Christian Borntraeger <borntraeger@de.ibm.com>
|
|
*/
|
|
|
|
#ifndef __KVM_S390_VIRTIO_H
|
|
#define __KVM_S390_VIRTIO_H
|
|
|
|
#include <linux/types.h>
|
|
|
|
struct kvm_device_desc {
|
|
/* The device type: console, network, disk etc. Type 0 terminates. */
|
|
__u8 type;
|
|
/* The number of virtqueues (first in config array) */
|
|
__u8 num_vq;
|
|
/*
|
|
* The number of bytes of feature bits. Multiply by 2: one for host
|
|
* features and one for guest acknowledgements.
|
|
*/
|
|
__u8 feature_len;
|
|
/* The number of bytes of the config array after virtqueues. */
|
|
__u8 config_len;
|
|
/* A status byte, written by the Guest. */
|
|
__u8 status;
|
|
__u8 config[0];
|
|
};
|
|
|
|
/*
|
|
* This is how we expect the device configuration field for a virtqueue
|
|
* to be laid out in config space.
|
|
*/
|
|
struct kvm_vqconfig {
|
|
/* The token returned with an interrupt. Set by the guest */
|
|
__u64 token;
|
|
/* The address of the virtio ring */
|
|
__u64 address;
|
|
/* The number of entries in the virtio_ring */
|
|
__u16 num;
|
|
|
|
};
|
|
|
|
#define KVM_S390_VIRTIO_NOTIFY 0
|
|
#define KVM_S390_VIRTIO_RESET 1
|
|
#define KVM_S390_VIRTIO_SET_STATUS 2
|
|
|
|
#ifdef __KERNEL__
|
|
/* early virtio console setup */
|
|
#ifdef CONFIG_S390_GUEST
|
|
extern void s390_virtio_console_init(void);
|
|
#else
|
|
static inline void s390_virtio_console_init(void)
|
|
{
|
|
}
|
|
#endif /* CONFIG_VIRTIO_CONSOLE */
|
|
#endif /* __KERNEL__ */
|
|
#endif
|