diff options
| author | Anthony Liguori <anthony@codemonkey.ws> | 2013-09-11 14:45:57 -0500 |
|---|---|---|
| committer | Anthony Liguori <anthony@codemonkey.ws> | 2013-09-11 14:45:57 -0500 |
| commit | 97fdb9410bb5398fd33f51a37e637d697ace9f73 (patch) | |
| tree | 4ef6c9bacf43f9da6aadd5168220a7203dd29b35 /hw | |
| parent | 964737ea195de1560f3bcf55b8b6d4f7d0d4a619 (diff) | |
| parent | 254c12825f93f405658ca3366cd34f8a8ad23511 (diff) | |
| download | qemu-97fdb9410bb5398fd33f51a37e637d697ace9f73.tar.gz qemu-97fdb9410bb5398fd33f51a37e637d697ace9f73.tar.bz2 qemu-97fdb9410bb5398fd33f51a37e637d697ace9f73.zip | |
Merge remote-tracking branch 'sstabellini/xen-2013-09-09' into staging
# By Anthony PERARD
# Via Stefano Stabellini
* sstabellini/xen-2013-09-09:
pc_q35: Initialize Xen.
pc: Initializing ram_memory under Xen.
Message-id: alpine.DEB.2.02.1309091718030.6397@kaball.uk.xensource.com
Signed-off-by: Anthony Liguori <anthony@codemonkey.ws>
Diffstat (limited to 'hw')
| -rw-r--r-- | hw/i386/pc_piix.c | 2 | ||||
| -rw-r--r-- | hw/i386/pc_q35.c | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c index 147d08cf23..907792b721 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -89,7 +89,7 @@ static void pc_init1(QEMUMachineInitArgs *args, FWCfgState *fw_cfg = NULL; PcGuestInfo *guest_info; - if (xen_enabled() && xen_hvm_init() != 0) { + if (xen_enabled() && xen_hvm_init(&ram_memory) != 0) { fprintf(stderr, "xen hardware virtual machine initialisation failed\n"); exit(1); } diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c index b4b5155d89..ca84e1c04c 100644 --- a/hw/i386/pc_q35.c +++ b/hw/i386/pc_q35.c @@ -76,6 +76,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); |