/[gentoo-x86]/app-emulation/qemu-kvm/files/qemu-kvm-9999-fix-nonkvm-arches.patch
Gentoo

Contents of /app-emulation/qemu-kvm/files/qemu-kvm-9999-fix-nonkvm-arches.patch

Parent Directory Parent Directory | Revision Log Revision Log


Revision 1.2 - (show annotations) (download)
Mon Jan 30 06:32:59 2012 UTC (3 years, 3 months ago) by slyfox
Branch: MAIN
Changes since 1.1: +3 -4 lines
Update patch against current upstream.

(Portage version: 2.2.0_alpha84_p47/cvs/Linux x86_64)

1 Fix build failure caused by KVM-specific code in arches not supporting KVM:
2 LINK alpha-softmmu/qemu-system-alpha
3 i8259.o: In function `kvm_i8259_set_irq':
4 /tmp/portage/app-emulation/qemu-kvm-9999/work/qemu-kvm-9999/hw/i8259.c:689: undefined reference to `apic_set_irq_delivered'
5 diff --git a/hw/i8259.c b/hw/i8259.c
6 index 21a4efc..bb3bb18 100644
7 --- a/hw/i8259.c
8 +++ b/hw/i8259.c
9 @@ -21,6 +21,7 @@
10 * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
11 * THE SOFTWARE.
12 */
13 +#include "apic.h"
14 #include "hw.h"
15 #include "pc.h"
16 #include "isa.h"
17 @@ -591,11 +592,13 @@ static int kvm_kernel_pic_load_from_user(PICCommonState *s)
18
19 static void kvm_i8259_set_irq(void *opaque, int irq, int level)
20 {
21 +#ifdef CONFIG_KVM
22 int pic_ret;
23 if (kvm_set_irq(irq, level, &pic_ret)) {
24 apic_report_irq_delivered(pic_ret);
25 return;
26 }
27 +#endif
28 }
29
30 device_init(pic_register)

  ViewVC Help
Powered by ViewVC 1.1.20