From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58441) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xr960-0007Wg-1E for qemu-devel@nongnu.org; Wed, 19 Nov 2014 12:31:18 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Xr95r-000830-7I for qemu-devel@nongnu.org; Wed, 19 Nov 2014 12:31:11 -0500 Received: from fldsmtpe04.verizon.com ([140.108.26.143]:12209) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xr95q-000821-SC for qemu-devel@nongnu.org; Wed, 19 Nov 2014 12:31:03 -0500 From: Don Slutz Date: Wed, 19 Nov 2014 12:30:57 -0500 Message-Id: <1416418257-10166-1-git-send-email-dslutz@verizon.com> Subject: [Qemu-devel] [BUGFIX][PATCH for 2.2 1/1] hw/i386/pc_piix.c: Also pass vmport=off for xenfv machine List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org, "Dr. David Alan Gilbert" , "Michael S. Tsirkin" , Paolo Bonzini , Eduardo Habkost Cc: Michael Tokarev , Don Slutz , Anthony Liguori , Stefan Hajnoczi c/s 9b23cfb76b3a5e9eb5cc899eaf2f46bc46d33ba4 or c/s b154537ad07598377ebf98252fb7d2aff127983b moved the testing of xen_enabled() from pc_init1() to pc_machine_initfn(). xen_enabled() does not return the correct value in pc_machine_initfn() so add vmport=off to xenfv machine to correctly turn off vmport for xen. Drop the call to xen_enabled() in pc_machine_initfn() to reduce potential confusion. Signed-off-by: Don Slutz --- The 1st version of "-machine vmport=off: Allow..." patch did not have this issue. It was the adjusting to the QOM that introduced it. hw/i386/pc.c | 2 +- hw/i386/pc_piix.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/hw/i386/pc.c b/hw/i386/pc.c index 1205db8..5bfece8 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -1737,7 +1737,7 @@ static void pc_machine_initfn(Object *obj) pc_machine_get_max_ram_below_4g, pc_machine_set_max_ram_below_4g, NULL, NULL, NULL); - pcms->vmport = !xen_enabled(); + pcms->vmport = true; object_property_add_bool(obj, PC_MACHINE_VMPORT, pc_machine_get_vmport, pc_machine_set_vmport, diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c index 7bb97a4..3268c29 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -914,7 +914,7 @@ static QEMUMachine xenfv_machine = { .desc = "Xen Fully-virtualized PC", .init = pc_xen_hvm_init, .max_cpus = HVM_MAX_VCPUS, - .default_machine_opts = "accel=xen", + .default_machine_opts = "accel=xen,vmport=off", .hot_add_cpu = pc_hot_add_cpu, }; #endif -- 1.8.4