[Qemu-devel] [PATCH] pc: q35: disable CPU hotplug handler on machines less than 2.0

[Qemu-devel] [PATCH] pc: q35: disable CPU hotplug handler on machines less than 2.0

[Igor Mammedov]

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 <imammedo@redhat.com>
---
 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

Re: [Qemu-devel] [PATCH] pc: q35: disable CPU hotplug handler on machines less than 2.0

[Hu Tao]

On Tue, May 06, 2014 at 03:09:04PM +0200, Igor Mammedov wrote:
> 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 <imammedo@redhat.com>
> ---
>  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

If I'm looking at the correct code, pc-q35-1.6 still enables cpu
hotplug:

  #define PC_Q35_1_6_MACHINE_OPTIONS PC_Q35_MACHINE_OPTIONS

You can remove PC_Q35_1_6_MACHINE_OPTIONS and use
PC_Q35_1_7_MACHINE_OPTIONS in all versions less then 1.7.

>  
>  static QEMUMachine pc_q35_machine_v1_4 = {
>      PC_Q35_1_4_MACHINE_OPTIONS,
> -- 
> 1.7.1
>