From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41284) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Whf7s-0004sn-Go for qemu-devel@nongnu.org; Tue, 06 May 2014 09:09:46 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Whf7m-0007Ei-2I for qemu-devel@nongnu.org; Tue, 06 May 2014 09:09:40 -0400 Received: from mx1.redhat.com ([209.132.183.28]:43385) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Whf7l-0007ET-J4 for qemu-devel@nongnu.org; Tue, 06 May 2014 09:09:33 -0400 Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id s46D9Xb5005218 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Tue, 6 May 2014 09:09:33 -0400 From: Igor Mammedov Date: Tue, 6 May 2014 15:09:04 +0200 Message-Id: <1399381744-28873-1-git-send-email-imammedo@redhat.com> Subject: [Qemu-devel] [PATCH] pc: q35: disable CPU hotplug handler on machines less than 2.0 List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: mst@redhat.com CPU hotplug handling for Q35 machine types was added only since 2.0 but commit wrongly c649983b58 added CPU hotplug handler to Q35 1.5 machine without adding ACPI support for it. As result user can create VCPU but guest couldn't use it since it hasn't any data on it (missing ACPI implementation). Signed-off-by: Igor Mammedov --- hw/i386/pc_q35.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c index c844dc2..687a397 100644 --- a/hw/i386/pc_q35.c +++ b/hw/i386/pc_q35.c @@ -308,7 +308,9 @@ static QEMUMachine pc_q35_machine_v2_0 = { .init = pc_q35_init, }; -#define PC_Q35_1_7_MACHINE_OPTIONS PC_Q35_MACHINE_OPTIONS +#define PC_Q35_1_7_MACHINE_OPTIONS \ + PC_Q35_MACHINE_OPTIONS, \ + .hot_add_cpu = NULL static QEMUMachine pc_q35_machine_v1_7 = { PC_Q35_1_7_MACHINE_OPTIONS, @@ -342,9 +344,7 @@ static QEMUMachine pc_q35_machine_v1_5 = { }, }; -#define PC_Q35_1_4_MACHINE_OPTIONS \ - PC_Q35_1_6_MACHINE_OPTIONS, \ - .hot_add_cpu = NULL +#define PC_Q35_1_4_MACHINE_OPTIONS PC_Q35_1_6_MACHINE_OPTIONS static QEMUMachine pc_q35_machine_v1_4 = { PC_Q35_1_4_MACHINE_OPTIONS, -- 1.7.1