2983660f65
CVE-2013-4377: Fix crash when unplugging virtio devices (bz #1012633, bz #1012641) Fix 'new snapshot' slowness after the first snap (bz #988436) Fix 9pfs xattrs on kernel 3.11 (bz #1013676) CVE-2013-4344: buffer overflow in scsi_target_emulate_report_luns (bz #1015274, bz #1007330)
32 lines
1.1 KiB
Diff
32 lines
1.1 KiB
Diff
From 41900b0857df9bd33e465a6c72d7a3072dc448f4 Mon Sep 17 00:00:00 2001
|
|
From: Anthony PERARD <anthony.perard@citrix.com>
|
|
Date: Mon, 9 Sep 2013 16:15:53 +0000
|
|
Subject: [PATCH] pc_q35: Initialize Xen.
|
|
|
|
Signed-off-by: Anthony PERARD <anthony.perard@citrix.com>
|
|
Signed-off-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
|
|
Acked-by: Michael S. Tsirkin <mst@redhat.com>
|
|
(cherry picked from commit 254c12825f93f405658ca3366cd34f8a8ad23511)
|
|
|
|
Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
|
|
---
|
|
hw/i386/pc_q35.c | 5 +++++
|
|
1 file changed, 5 insertions(+)
|
|
|
|
diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c
|
|
index 10e770e..dd13130 100644
|
|
--- a/hw/i386/pc_q35.c
|
|
+++ b/hw/i386/pc_q35.c
|
|
@@ -81,6 +81,11 @@ static void pc_q35_init(QEMUMachineInitArgs *args)
|
|
DeviceState *icc_bridge;
|
|
PcGuestInfo *guest_info;
|
|
|
|
+ if (xen_enabled() && xen_hvm_init(&ram_memory) != 0) {
|
|
+ fprintf(stderr, "xen hardware virtual machine initialisation failed\n");
|
|
+ exit(1);
|
|
+ }
|
|
+
|
|
icc_bridge = qdev_create(NULL, TYPE_ICC_BRIDGE);
|
|
object_property_add_child(qdev_get_machine(), "icc-bridge",
|
|
OBJECT(icc_bridge), NULL);
|