Patchwork [v5,2/2] i386/pc: introducing compat_props for pc-1.6

login
register
mail settings
Submitter Vincenzo Maffione
Date July 31, 2013, 8:13 a.m.
Message ID <1375258430-2120-3-git-send-email-v.maffione@gmail.com>
Download mbox | patch
Permalink /patch/263636/
State New
Headers show

Comments

Vincenzo Maffione - July 31, 2013, 8:13 a.m.
PC_COMPAT_1_6 macro introduced in order to set the e1000
"mitigation" property off for pc-i440fx-1.6 and pc-q35-1.6
machines.

Signed-off-by: Vincenzo Maffione <v.maffione@gmail.com>
---
 hw/i386/pc_piix.c    | 4 ++++
 hw/i386/pc_q35.c     | 4 ++++
 include/hw/i386/pc.h | 7 +++++++
 3 files changed, 15 insertions(+)
Andreas Färber - July 31, 2013, 10 a.m.
Am 31.07.2013 10:13, schrieb Vincenzo Maffione:
> diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h
> index 3a0c4e3..812df4d 100644
> --- a/include/hw/i386/pc.h
> +++ b/include/hw/i386/pc.h
> @@ -214,6 +214,13 @@ void pvpanic_init(ISABus *bus);
>  
>  int e820_add_entry(uint64_t, uint64_t, uint32_t);
>  
> +#define PC_COMPAT_1_6 \
> +        {\
> +            .driver   = "e1000",\
> +            .property = "mitigation",\
> +            .value    = "off",\
> +        }
> +
>  #define PC_COMPAT_1_5 \

           PC_COMPAT_1_6, \

>          {\
>              .driver   = "Conroe-" TYPE_X86_CPU,\

Not just 1.6 needs the compatibility property.

Regards,
Andreas

Patch

diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c
index ab25458..f039377 100644
--- a/hw/i386/pc_piix.c
+++ b/hw/i386/pc_piix.c
@@ -343,6 +343,10 @@  static QEMUMachine pc_i440fx_machine_v1_6 = {
     .init = pc_init_pci,
     .hot_add_cpu = pc_hot_add_cpu,
     .max_cpus = 255,
+    .compat_props = (GlobalProperty[]) {
+        PC_COMPAT_1_6,
+        { /* end of list */ }
+    },
     .is_default = 1,
     DEFAULT_MACHINE_OPTIONS,
 };
diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c
index 2f35d12..807b9ef 100644
--- a/hw/i386/pc_q35.c
+++ b/hw/i386/pc_q35.c
@@ -237,6 +237,10 @@  static QEMUMachine pc_q35_machine_v1_6 = {
     .init = pc_q35_init,
     .hot_add_cpu = pc_hot_add_cpu,
     .max_cpus = 255,
+    .compat_props = (GlobalProperty[]) {
+        PC_COMPAT_1_6,
+        { /* end of list */ }
+    },
     DEFAULT_MACHINE_OPTIONS,
 };
 
diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h
index 3a0c4e3..812df4d 100644
--- a/include/hw/i386/pc.h
+++ b/include/hw/i386/pc.h
@@ -214,6 +214,13 @@  void pvpanic_init(ISABus *bus);
 
 int e820_add_entry(uint64_t, uint64_t, uint32_t);
 
+#define PC_COMPAT_1_6 \
+        {\
+            .driver   = "e1000",\
+            .property = "mitigation",\
+            .value    = "off",\
+        }
+
 #define PC_COMPAT_1_5 \
         {\
             .driver   = "Conroe-" TYPE_X86_CPU,\