All of lore.kernel.org
 help / color / mirror / Atom feed
* [Qemu-devel] [PATCH for-4.1] hw: add compat machines for 4.1
@ 2019-04-11 10:20 ` Cornelia Huck
  0 siblings, 0 replies; 15+ messages in thread
From: Cornelia Huck @ 2019-04-11 10:20 UTC (permalink / raw)
  To: Peter Maydell, Eduardo Habkost, Marcel Apfelbaum,
	Michael S . Tsirkin, Paolo Bonzini, Richard Henderson,
	David Gibson, David Hildenbrand, Halil Pasic,
	Christian Borntraeger
  Cc: qemu-arm, qemu-devel, qemu-ppc, qemu-s390x, Cornelia Huck

Add 4.1 machine types for arm/i440fx/q35/s390x/spapr.

Signed-off-by: Cornelia Huck <cohuck@redhat.com>
---

IIRC, we agreed last time that we want to merge a patch introducing
the new compat machines first thing in a new development cycle. So
here's that patch for 4.1.

---
 hw/arm/virt.c              |  9 ++++++++-
 hw/core/machine.c          |  3 +++
 hw/i386/pc.c               |  3 +++
 hw/i386/pc_piix.c          | 14 +++++++++++++-
 hw/i386/pc_q35.c           | 13 ++++++++++++-
 hw/ppc/spapr.c             | 15 +++++++++++++--
 hw/s390x/s390-virtio-ccw.c | 14 +++++++++++++-
 include/hw/boards.h        |  3 +++
 include/hw/i386/pc.h       |  3 +++
 9 files changed, 71 insertions(+), 6 deletions(-)

diff --git a/hw/arm/virt.c b/hw/arm/virt.c
index ce2664a30b7f..16ba67f7a768 100644
--- a/hw/arm/virt.c
+++ b/hw/arm/virt.c
@@ -1978,10 +1978,17 @@ static void machvirt_machine_init(void)
 }
 type_init(machvirt_machine_init);
 
+static void virt_machine_4_1_options(MachineClass *mc)
+{
+}
+DEFINE_VIRT_MACHINE_AS_LATEST(4, 1)
+
 static void virt_machine_4_0_options(MachineClass *mc)
 {
+    virt_machine_4_1_options(mc);
+    compat_props_add(mc->compat_props, hw_compat_4_0, hw_compat_4_0_len);
 }
-DEFINE_VIRT_MACHINE_AS_LATEST(4, 0)
+DEFINE_VIRT_MACHINE(4, 0)
 
 static void virt_machine_3_1_options(MachineClass *mc)
 {
diff --git a/hw/core/machine.c b/hw/core/machine.c
index 743fef28982c..5d046a43e3d2 100644
--- a/hw/core/machine.c
+++ b/hw/core/machine.c
@@ -24,6 +24,9 @@
 #include "hw/pci/pci.h"
 #include "hw/mem/nvdimm.h"
 
+GlobalProperty hw_compat_4_0[] = {};
+const size_t hw_compat_4_0_len = G_N_ELEMENTS(hw_compat_4_0);
+
 GlobalProperty hw_compat_3_1[] = {
     { "pcie-root-port", "x-speed", "2_5" },
     { "pcie-root-port", "x-width", "1" },
diff --git a/hw/i386/pc.c b/hw/i386/pc.c
index f2c15bf1f2c3..868303cf6427 100644
--- a/hw/i386/pc.c
+++ b/hw/i386/pc.c
@@ -115,6 +115,9 @@ struct hpet_fw_config hpet_cfg = {.count = UINT8_MAX};
 /* Physical Address of PVH entry point read from kernel ELF NOTE */
 static size_t pvh_start_addr;
 
+GlobalProperty pc_compat_4_0[] ={};
+const size_t pc_compat_4_0_len = G_N_ELEMENTS(pc_compat_4_0);
+
 GlobalProperty pc_compat_3_1[] = {
     { "intel-iommu", "dma-drain", "off" },
     { "Opteron_G3" "-" TYPE_X86_CPU, "rdtscp", "off" },
diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c
index 8ad8e885c6b1..2a7700b564d3 100644
--- a/hw/i386/pc_piix.c
+++ b/hw/i386/pc_piix.c
@@ -428,13 +428,25 @@ static void pc_i440fx_machine_options(MachineClass *m)
     machine_class_allow_dynamic_sysbus_dev(m, TYPE_RAMFB_DEVICE);
 }
 
-static void pc_i440fx_4_0_machine_options(MachineClass *m)
+static void pc_i440fx_4_1_machine_options(MachineClass *m)
 {
     pc_i440fx_machine_options(m);
     m->alias = "pc";
     m->is_default = 1;
 }
 
+DEFINE_I440FX_MACHINE(v4_1, "pc-i440fx-4.1", NULL,
+                      pc_i440fx_4_1_machine_options);
+
+static void pc_i440fx_4_0_machine_options(MachineClass *m)
+{
+    pc_i440fx_4_1_machine_options(m);
+    m->alias = NULL;
+    m->is_default = 0;
+    compat_props_add(m->compat_props, hw_compat_4_0, hw_compat_4_0_len);
+    compat_props_add(m->compat_props, pc_compat_4_0, pc_compat_4_0_len);
+}
+
 DEFINE_I440FX_MACHINE(v4_0, "pc-i440fx-4.0", NULL,
                       pc_i440fx_4_0_machine_options);
 
diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c
index 372c6b73bebd..37dd350511a9 100644
--- a/hw/i386/pc_q35.c
+++ b/hw/i386/pc_q35.c
@@ -365,12 +365,23 @@ static void pc_q35_machine_options(MachineClass *m)
     m->max_cpus = 288;
 }
 
-static void pc_q35_4_0_machine_options(MachineClass *m)
+static void pc_q35_4_1_machine_options(MachineClass *m)
 {
     pc_q35_machine_options(m);
     m->alias = "q35";
 }
 
+DEFINE_Q35_MACHINE(v4_1, "pc-q35-4.1", NULL,
+                   pc_q35_4_1_machine_options);
+
+static void pc_q35_4_0_machine_options(MachineClass *m)
+{
+    pc_q35_4_1_machine_options(m);
+    m->alias = NULL;
+    compat_props_add(m->compat_props, hw_compat_4_0, hw_compat_4_0_len);
+    compat_props_add(m->compat_props, pc_compat_4_0, pc_compat_4_0_len);
+}
+
 DEFINE_Q35_MACHINE(v4_0, "pc-q35-4.0", NULL,
                    pc_q35_4_0_machine_options);
 
diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c
index b52b82d298ef..8438741ec23c 100644
--- a/hw/ppc/spapr.c
+++ b/hw/ppc/spapr.c
@@ -4344,15 +4344,26 @@ static const TypeInfo spapr_machine_info = {
     }                                                                \
     type_init(spapr_machine_register_##suffix)
 
+/*
+ * pseries-4.1
+ */
+static void spapr_machine_4_1_class_options(MachineClass *mc)
+{
+    /* Defaults for the latest behaviour inherited from the base class */
+}
+
+DEFINE_SPAPR_MACHINE(4_1, "4.1", true);
+
 /*
  * pseries-4.0
  */
 static void spapr_machine_4_0_class_options(MachineClass *mc)
 {
-    /* Defaults for the latest behaviour inherited from the base class */
+    spapr_machine_4_1_class_options(mc);
+    compat_props_add(mc->compat_props, hw_compat_4_0, hw_compat_4_0_len);
 }
 
-DEFINE_SPAPR_MACHINE(4_0, "4.0", true);
+DEFINE_SPAPR_MACHINE(4_0, "4.0", false);
 
 /*
  * pseries-3.1
diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c
index d11069b860b4..02470e78c74d 100644
--- a/hw/s390x/s390-virtio-ccw.c
+++ b/hw/s390x/s390-virtio-ccw.c
@@ -646,14 +646,26 @@ bool css_migration_enabled(void)
     }                                                                         \
     type_init(ccw_machine_register_##suffix)
 
+static void ccw_machine_4_1_instance_options(MachineState *machine)
+{
+}
+
+static void ccw_machine_4_1_class_options(MachineClass *mc)
+{
+}
+DEFINE_CCW_MACHINE(4_1, "4.1", true);
+
 static void ccw_machine_4_0_instance_options(MachineState *machine)
 {
+    ccw_machine_4_1_instance_options(machine);
 }
 
 static void ccw_machine_4_0_class_options(MachineClass *mc)
 {
+    ccw_machine_4_1_class_options(mc);
+    compat_props_add(mc->compat_props, hw_compat_4_0, hw_compat_4_0_len);
 }
-DEFINE_CCW_MACHINE(4_0, "4.0", true);
+DEFINE_CCW_MACHINE(4_0, "4.0", false);
 
 static void ccw_machine_3_1_instance_options(MachineState *machine)
 {
diff --git a/include/hw/boards.h b/include/hw/boards.h
index e231860666a1..fe1885cbffa0 100644
--- a/include/hw/boards.h
+++ b/include/hw/boards.h
@@ -293,6 +293,9 @@ struct MachineState {
     } \
     type_init(machine_initfn##_register_types)
 
+extern GlobalProperty hw_compat_4_0[];
+extern const size_t hw_compat_4_0_len;
+
 extern GlobalProperty hw_compat_3_1[];
 extern const size_t hw_compat_3_1_len;
 
diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h
index ca65ef18afb4..43df7230a22b 100644
--- a/include/hw/i386/pc.h
+++ b/include/hw/i386/pc.h
@@ -293,6 +293,9 @@ int e820_add_entry(uint64_t, uint64_t, uint32_t);
 int e820_get_num_entries(void);
 bool e820_get_entry(int, uint32_t, uint64_t *, uint64_t *);
 
+extern GlobalProperty pc_compat_4_0[];
+extern const size_t pc_compat_4_0_len;
+
 extern GlobalProperty pc_compat_3_1[];
 extern const size_t pc_compat_3_1_len;
 
-- 
2.17.2

^ permalink raw reply related	[flat|nested] 15+ messages in thread
* [Qemu-devel] [PATCH for-4.1] hw: add compat machines for 4.1
@ 2019-04-11 10:20 ` Cornelia Huck
  0 siblings, 0 replies; 15+ messages in thread
From: Cornelia Huck @ 2019-04-11 10:20 UTC (permalink / raw)
  To: Peter Maydell, Eduardo Habkost, Marcel Apfelbaum,
	Michael S . Tsirkin, Paolo Bonzini, Richard Henderson,
	David Gibson, David Hildenbrand, Halil Pasic,
	Christian Borntraeger
  Cc: qemu-s390x, qemu-arm, qemu-ppc, qemu-devel, Cornelia Huck

Add 4.1 machine types for arm/i440fx/q35/s390x/spapr.

Signed-off-by: Cornelia Huck <cohuck@redhat.com>
---

IIRC, we agreed last time that we want to merge a patch introducing
the new compat machines first thing in a new development cycle. So
here's that patch for 4.1.

---
 hw/arm/virt.c              |  9 ++++++++-
 hw/core/machine.c          |  3 +++
 hw/i386/pc.c               |  3 +++
 hw/i386/pc_piix.c          | 14 +++++++++++++-
 hw/i386/pc_q35.c           | 13 ++++++++++++-
 hw/ppc/spapr.c             | 15 +++++++++++++--
 hw/s390x/s390-virtio-ccw.c | 14 +++++++++++++-
 include/hw/boards.h        |  3 +++
 include/hw/i386/pc.h       |  3 +++
 9 files changed, 71 insertions(+), 6 deletions(-)

diff --git a/hw/arm/virt.c b/hw/arm/virt.c
index ce2664a30b7f..16ba67f7a768 100644
--- a/hw/arm/virt.c
+++ b/hw/arm/virt.c
@@ -1978,10 +1978,17 @@ static void machvirt_machine_init(void)
 }
 type_init(machvirt_machine_init);
 
+static void virt_machine_4_1_options(MachineClass *mc)
+{
+}
+DEFINE_VIRT_MACHINE_AS_LATEST(4, 1)
+
 static void virt_machine_4_0_options(MachineClass *mc)
 {
+    virt_machine_4_1_options(mc);
+    compat_props_add(mc->compat_props, hw_compat_4_0, hw_compat_4_0_len);
 }
-DEFINE_VIRT_MACHINE_AS_LATEST(4, 0)
+DEFINE_VIRT_MACHINE(4, 0)
 
 static void virt_machine_3_1_options(MachineClass *mc)
 {
diff --git a/hw/core/machine.c b/hw/core/machine.c
index 743fef28982c..5d046a43e3d2 100644
--- a/hw/core/machine.c
+++ b/hw/core/machine.c
@@ -24,6 +24,9 @@
 #include "hw/pci/pci.h"
 #include "hw/mem/nvdimm.h"
 
+GlobalProperty hw_compat_4_0[] = {};
+const size_t hw_compat_4_0_len = G_N_ELEMENTS(hw_compat_4_0);
+
 GlobalProperty hw_compat_3_1[] = {
     { "pcie-root-port", "x-speed", "2_5" },
     { "pcie-root-port", "x-width", "1" },
diff --git a/hw/i386/pc.c b/hw/i386/pc.c
index f2c15bf1f2c3..868303cf6427 100644
--- a/hw/i386/pc.c
+++ b/hw/i386/pc.c
@@ -115,6 +115,9 @@ struct hpet_fw_config hpet_cfg = {.count = UINT8_MAX};
 /* Physical Address of PVH entry point read from kernel ELF NOTE */
 static size_t pvh_start_addr;
 
+GlobalProperty pc_compat_4_0[] ={};
+const size_t pc_compat_4_0_len = G_N_ELEMENTS(pc_compat_4_0);
+
 GlobalProperty pc_compat_3_1[] = {
     { "intel-iommu", "dma-drain", "off" },
     { "Opteron_G3" "-" TYPE_X86_CPU, "rdtscp", "off" },
diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c
index 8ad8e885c6b1..2a7700b564d3 100644
--- a/hw/i386/pc_piix.c
+++ b/hw/i386/pc_piix.c
@@ -428,13 +428,25 @@ static void pc_i440fx_machine_options(MachineClass *m)
     machine_class_allow_dynamic_sysbus_dev(m, TYPE_RAMFB_DEVICE);
 }
 
-static void pc_i440fx_4_0_machine_options(MachineClass *m)
+static void pc_i440fx_4_1_machine_options(MachineClass *m)
 {
     pc_i440fx_machine_options(m);
     m->alias = "pc";
     m->is_default = 1;
 }
 
+DEFINE_I440FX_MACHINE(v4_1, "pc-i440fx-4.1", NULL,
+                      pc_i440fx_4_1_machine_options);
+
+static void pc_i440fx_4_0_machine_options(MachineClass *m)
+{
+    pc_i440fx_4_1_machine_options(m);
+    m->alias = NULL;
+    m->is_default = 0;
+    compat_props_add(m->compat_props, hw_compat_4_0, hw_compat_4_0_len);
+    compat_props_add(m->compat_props, pc_compat_4_0, pc_compat_4_0_len);
+}
+
 DEFINE_I440FX_MACHINE(v4_0, "pc-i440fx-4.0", NULL,
                       pc_i440fx_4_0_machine_options);
 
diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c
index 372c6b73bebd..37dd350511a9 100644
--- a/hw/i386/pc_q35.c
+++ b/hw/i386/pc_q35.c
@@ -365,12 +365,23 @@ static void pc_q35_machine_options(MachineClass *m)
     m->max_cpus = 288;
 }
 
-static void pc_q35_4_0_machine_options(MachineClass *m)
+static void pc_q35_4_1_machine_options(MachineClass *m)
 {
     pc_q35_machine_options(m);
     m->alias = "q35";
 }
 
+DEFINE_Q35_MACHINE(v4_1, "pc-q35-4.1", NULL,
+                   pc_q35_4_1_machine_options);
+
+static void pc_q35_4_0_machine_options(MachineClass *m)
+{
+    pc_q35_4_1_machine_options(m);
+    m->alias = NULL;
+    compat_props_add(m->compat_props, hw_compat_4_0, hw_compat_4_0_len);
+    compat_props_add(m->compat_props, pc_compat_4_0, pc_compat_4_0_len);
+}
+
 DEFINE_Q35_MACHINE(v4_0, "pc-q35-4.0", NULL,
                    pc_q35_4_0_machine_options);
 
diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c
index b52b82d298ef..8438741ec23c 100644
--- a/hw/ppc/spapr.c
+++ b/hw/ppc/spapr.c
@@ -4344,15 +4344,26 @@ static const TypeInfo spapr_machine_info = {
     }                                                                \
     type_init(spapr_machine_register_##suffix)
 
+/*
+ * pseries-4.1
+ */
+static void spapr_machine_4_1_class_options(MachineClass *mc)
+{
+    /* Defaults for the latest behaviour inherited from the base class */
+}
+
+DEFINE_SPAPR_MACHINE(4_1, "4.1", true);
+
 /*
  * pseries-4.0
  */
 static void spapr_machine_4_0_class_options(MachineClass *mc)
 {
-    /* Defaults for the latest behaviour inherited from the base class */
+    spapr_machine_4_1_class_options(mc);
+    compat_props_add(mc->compat_props, hw_compat_4_0, hw_compat_4_0_len);
 }
 
-DEFINE_SPAPR_MACHINE(4_0, "4.0", true);
+DEFINE_SPAPR_MACHINE(4_0, "4.0", false);
 
 /*
  * pseries-3.1
diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c
index d11069b860b4..02470e78c74d 100644
--- a/hw/s390x/s390-virtio-ccw.c
+++ b/hw/s390x/s390-virtio-ccw.c
@@ -646,14 +646,26 @@ bool css_migration_enabled(void)
     }                                                                         \
     type_init(ccw_machine_register_##suffix)
 
+static void ccw_machine_4_1_instance_options(MachineState *machine)
+{
+}
+
+static void ccw_machine_4_1_class_options(MachineClass *mc)
+{
+}
+DEFINE_CCW_MACHINE(4_1, "4.1", true);
+
 static void ccw_machine_4_0_instance_options(MachineState *machine)
 {
+    ccw_machine_4_1_instance_options(machine);
 }
 
 static void ccw_machine_4_0_class_options(MachineClass *mc)
 {
+    ccw_machine_4_1_class_options(mc);
+    compat_props_add(mc->compat_props, hw_compat_4_0, hw_compat_4_0_len);
 }
-DEFINE_CCW_MACHINE(4_0, "4.0", true);
+DEFINE_CCW_MACHINE(4_0, "4.0", false);
 
 static void ccw_machine_3_1_instance_options(MachineState *machine)
 {
diff --git a/include/hw/boards.h b/include/hw/boards.h
index e231860666a1..fe1885cbffa0 100644
--- a/include/hw/boards.h
+++ b/include/hw/boards.h
@@ -293,6 +293,9 @@ struct MachineState {
     } \
     type_init(machine_initfn##_register_types)
 
+extern GlobalProperty hw_compat_4_0[];
+extern const size_t hw_compat_4_0_len;
+
 extern GlobalProperty hw_compat_3_1[];
 extern const size_t hw_compat_3_1_len;
 
diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h
index ca65ef18afb4..43df7230a22b 100644
--- a/include/hw/i386/pc.h
+++ b/include/hw/i386/pc.h
@@ -293,6 +293,9 @@ int e820_add_entry(uint64_t, uint64_t, uint32_t);
 int e820_get_num_entries(void);
 bool e820_get_entry(int, uint32_t, uint64_t *, uint64_t *);
 
+extern GlobalProperty pc_compat_4_0[];
+extern const size_t pc_compat_4_0_len;
+
 extern GlobalProperty pc_compat_3_1[];
 extern const size_t pc_compat_3_1_len;
 
-- 
2.17.2



^ permalink raw reply related	[flat|nested] 15+ messages in thread
* Re: [Qemu-devel] [PATCH for-4.1] hw: add compat machines for 4.1
@ 2019-04-11 10:28   ` no-reply
  0 siblings, 0 replies; 15+ messages in thread
From: no-reply @ 2019-04-11 10:28 UTC (permalink / raw)
  To: cohuck
  Cc: fam, peter.maydell, ehabkost, marcel.apfelbaum, mst, pbonzini,
	rth, david, david, pasic, borntraeger, qemu-s390x, qemu-arm,
	qemu-ppc, qemu-devel

Patchew URL: https://patchew.org/QEMU/20190411102025.22559-1-cohuck@redhat.com/



Hi,

This series seems to have some coding style problems. See output below for
more information:

Message-id: 20190411102025.22559-1-cohuck@redhat.com
Subject: [Qemu-devel] [PATCH for-4.1] hw: add compat machines for 4.1
Type: series

=== TEST SCRIPT BEGIN ===
#!/bin/bash
git rev-parse base > /dev/null || exit 0
git config --local diff.renamelimit 0
git config --local diff.renames True
git config --local diff.algorithm histogram
./scripts/checkpatch.pl --mailback base..
=== TEST SCRIPT END ===

Updating 3c8cf5a9c21ff8782164d1def7f44bd888713384
From https://github.com/patchew-project/qemu
 t [tag update]            patchew/20190315032629.21234-1-richard.henderson@linaro.org -> patchew/20190315032629.21234-1-richard.henderson@linaro.org
 t [tag update]            patchew/20190411063408.3998-1-clg@kaod.org -> patchew/20190411063408.3998-1-clg@kaod.org
 * [new tag]               patchew/20190411071739.22889-1-richardw.yang@linux.intel.com -> patchew/20190411071739.22889-1-richardw.yang@linux.intel.com
 * [new tag]               patchew/20190411102025.22559-1-cohuck@redhat.com -> patchew/20190411102025.22559-1-cohuck@redhat.com
Switched to a new branch 'test'
55746ddae8 hw: add compat machines for 4.1

=== OUTPUT BEGIN ===
ERROR: spaces required around that '=' (ctx:WxV)
#58: FILE: hw/i386/pc.c:118:
+GlobalProperty pc_compat_4_0[] ={};
                                ^

total: 1 errors, 0 warnings, 160 lines checked

Commit 55746ddae8b6 (hw: add compat machines for 4.1) has style problems, please review.  If any of these errors
are false positives report them to the maintainer, see
CHECKPATCH in MAINTAINERS.
=== OUTPUT END ===

Test command exited with code: 1


The full log is available at
http://patchew.org/logs/20190411102025.22559-1-cohuck@redhat.com/testing.checkpatch/?type=message.
---
Email generated automatically by Patchew [https://patchew.org/].
Please send your feedback to patchew-devel@redhat.com

^ permalink raw reply	[flat|nested] 15+ messages in thread
* Re: [Qemu-devel] [PATCH for-4.1] hw: add compat machines for 4.1
@ 2019-04-11 10:28   ` no-reply
  0 siblings, 0 replies; 15+ messages in thread
From: no-reply @ 2019-04-11 10:28 UTC (permalink / raw)
  To: cohuck
  Cc: fam, peter.maydell, cohuck, ehabkost, mst, david, qemu-devel,
	pasic, borntraeger, qemu-s390x, qemu-arm, qemu-ppc, pbonzini,
	david, rth

Patchew URL: https://patchew.org/QEMU/20190411102025.22559-1-cohuck@redhat.com/



Hi,

This series seems to have some coding style problems. See output below for
more information:

Message-id: 20190411102025.22559-1-cohuck@redhat.com
Subject: [Qemu-devel] [PATCH for-4.1] hw: add compat machines for 4.1
Type: series

=== TEST SCRIPT BEGIN ===
#!/bin/bash
git rev-parse base > /dev/null || exit 0
git config --local diff.renamelimit 0
git config --local diff.renames True
git config --local diff.algorithm histogram
./scripts/checkpatch.pl --mailback base..
=== TEST SCRIPT END ===

Updating 3c8cf5a9c21ff8782164d1def7f44bd888713384
From https://github.com/patchew-project/qemu
 t [tag update]            patchew/20190315032629.21234-1-richard.henderson@linaro.org -> patchew/20190315032629.21234-1-richard.henderson@linaro.org
 t [tag update]            patchew/20190411063408.3998-1-clg@kaod.org -> patchew/20190411063408.3998-1-clg@kaod.org
 * [new tag]               patchew/20190411071739.22889-1-richardw.yang@linux.intel.com -> patchew/20190411071739.22889-1-richardw.yang@linux.intel.com
 * [new tag]               patchew/20190411102025.22559-1-cohuck@redhat.com -> patchew/20190411102025.22559-1-cohuck@redhat.com
Switched to a new branch 'test'
55746ddae8 hw: add compat machines for 4.1

=== OUTPUT BEGIN ===
ERROR: spaces required around that '=' (ctx:WxV)
#58: FILE: hw/i386/pc.c:118:
+GlobalProperty pc_compat_4_0[] ={};
                                ^

total: 1 errors, 0 warnings, 160 lines checked

Commit 55746ddae8b6 (hw: add compat machines for 4.1) has style problems, please review.  If any of these errors
are false positives report them to the maintainer, see
CHECKPATCH in MAINTAINERS.
=== OUTPUT END ===

Test command exited with code: 1


The full log is available at
http://patchew.org/logs/20190411102025.22559-1-cohuck@redhat.com/testing.checkpatch/?type=message.
---
Email generated automatically by Patchew [https://patchew.org/].
Please send your feedback to patchew-devel@redhat.com

^ permalink raw reply	[flat|nested] 15+ messages in thread
* Re: [Qemu-devel] [PATCH for-4.1] hw: add compat machines for 4.1
@ 2019-04-11 10:56     ` Cornelia Huck
  0 siblings, 0 replies; 15+ messages in thread
From: Cornelia Huck @ 2019-04-11 10:56 UTC (permalink / raw)
  To: qemu-devel
  Cc: fam, peter.maydell, ehabkost, marcel.apfelbaum, mst, pbonzini,
	rth, david, david, pasic, borntraeger, qemu-s390x, qemu-arm,
	qemu-ppc

On Thu, 11 Apr 2019 03:28:46 -0700 (PDT)
no-reply@patchew.org wrote:

> === OUTPUT BEGIN ===
> ERROR: spaces required around that '=' (ctx:WxV)
> #58: FILE: hw/i386/pc.c:118:
> +GlobalProperty pc_compat_4_0[] ={};
>                                 ^
> 
> total: 1 errors, 0 warnings, 160 lines checked

Yeah; trivial to fix by whoever applies this.

^ permalink raw reply	[flat|nested] 15+ messages in thread
* Re: [Qemu-devel] [PATCH for-4.1] hw: add compat machines for 4.1
@ 2019-04-11 10:56     ` Cornelia Huck
  0 siblings, 0 replies; 15+ messages in thread
From: Cornelia Huck @ 2019-04-11 10:56 UTC (permalink / raw)
  To: qemu-devel
  Cc: fam, peter.maydell, ehabkost, mst, david, pasic, borntraeger,
	qemu-s390x, qemu-arm, qemu-ppc, pbonzini, david, rth

On Thu, 11 Apr 2019 03:28:46 -0700 (PDT)
no-reply@patchew.org wrote:

> === OUTPUT BEGIN ===
> ERROR: spaces required around that '=' (ctx:WxV)
> #58: FILE: hw/i386/pc.c:118:
> +GlobalProperty pc_compat_4_0[] ={};
>                                 ^
> 
> total: 1 errors, 0 warnings, 160 lines checked

Yeah; trivial to fix by whoever applies this.


^ permalink raw reply	[flat|nested] 15+ messages in thread
* Re: [Qemu-devel] [qemu-s390x] [PATCH for-4.1] hw: add compat machines for 4.1
  2019-04-11 10:20 ` Cornelia Huck
  (?)
  (?)
@ 2019-04-11 14:11 ` Christian Borntraeger
  -1 siblings, 0 replies; 15+ messages in thread
From: Christian Borntraeger @ 2019-04-11 14:11 UTC (permalink / raw)
  To: Cornelia Huck, Peter Maydell, Eduardo Habkost, Marcel Apfelbaum,
	Michael S . Tsirkin, Paolo Bonzini, Richard Henderson,
	David Gibson, David Hildenbrand, Halil Pasic
  Cc: qemu-s390x, qemu-arm, qemu-ppc, qemu-devel

s390x parts looks good to me.

On 11.04.19 12:20, Cornelia Huck wrote:
> Add 4.1 machine types for arm/i440fx/q35/s390x/spapr.
> 
> Signed-off-by: Cornelia Huck <cohuck@redhat.com>
> ---
> 
> IIRC, we agreed last time that we want to merge a patch introducing
> the new compat machines first thing in a new development cycle. So
> here's that patch for 4.1.
> 
> ---
>  hw/arm/virt.c              |  9 ++++++++-
>  hw/core/machine.c          |  3 +++
>  hw/i386/pc.c               |  3 +++
>  hw/i386/pc_piix.c          | 14 +++++++++++++-
>  hw/i386/pc_q35.c           | 13 ++++++++++++-
>  hw/ppc/spapr.c             | 15 +++++++++++++--
>  hw/s390x/s390-virtio-ccw.c | 14 +++++++++++++-
>  include/hw/boards.h        |  3 +++
>  include/hw/i386/pc.h       |  3 +++
>  9 files changed, 71 insertions(+), 6 deletions(-)
> 
> diff --git a/hw/arm/virt.c b/hw/arm/virt.c
> index ce2664a30b7f..16ba67f7a768 100644
> --- a/hw/arm/virt.c
> +++ b/hw/arm/virt.c
> @@ -1978,10 +1978,17 @@ static void machvirt_machine_init(void)
>  }
>  type_init(machvirt_machine_init);
>  
> +static void virt_machine_4_1_options(MachineClass *mc)
> +{
> +}
> +DEFINE_VIRT_MACHINE_AS_LATEST(4, 1)
> +
>  static void virt_machine_4_0_options(MachineClass *mc)
>  {
> +    virt_machine_4_1_options(mc);
> +    compat_props_add(mc->compat_props, hw_compat_4_0, hw_compat_4_0_len);
>  }
> -DEFINE_VIRT_MACHINE_AS_LATEST(4, 0)
> +DEFINE_VIRT_MACHINE(4, 0)
>  
>  static void virt_machine_3_1_options(MachineClass *mc)
>  {
> diff --git a/hw/core/machine.c b/hw/core/machine.c
> index 743fef28982c..5d046a43e3d2 100644
> --- a/hw/core/machine.c
> +++ b/hw/core/machine.c
> @@ -24,6 +24,9 @@
>  #include "hw/pci/pci.h"
>  #include "hw/mem/nvdimm.h"
>  
> +GlobalProperty hw_compat_4_0[] = {};
> +const size_t hw_compat_4_0_len = G_N_ELEMENTS(hw_compat_4_0);
> +
>  GlobalProperty hw_compat_3_1[] = {
>      { "pcie-root-port", "x-speed", "2_5" },
>      { "pcie-root-port", "x-width", "1" },
> diff --git a/hw/i386/pc.c b/hw/i386/pc.c
> index f2c15bf1f2c3..868303cf6427 100644
> --- a/hw/i386/pc.c
> +++ b/hw/i386/pc.c
> @@ -115,6 +115,9 @@ struct hpet_fw_config hpet_cfg = {.count = UINT8_MAX};
>  /* Physical Address of PVH entry point read from kernel ELF NOTE */
>  static size_t pvh_start_addr;
>  
> +GlobalProperty pc_compat_4_0[] ={};
> +const size_t pc_compat_4_0_len = G_N_ELEMENTS(pc_compat_4_0);
> +
>  GlobalProperty pc_compat_3_1[] = {
>      { "intel-iommu", "dma-drain", "off" },
>      { "Opteron_G3" "-" TYPE_X86_CPU, "rdtscp", "off" },
> diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c
> index 8ad8e885c6b1..2a7700b564d3 100644
> --- a/hw/i386/pc_piix.c
> +++ b/hw/i386/pc_piix.c
> @@ -428,13 +428,25 @@ static void pc_i440fx_machine_options(MachineClass *m)
>      machine_class_allow_dynamic_sysbus_dev(m, TYPE_RAMFB_DEVICE);
>  }
>  
> -static void pc_i440fx_4_0_machine_options(MachineClass *m)
> +static void pc_i440fx_4_1_machine_options(MachineClass *m)
>  {
>      pc_i440fx_machine_options(m);
>      m->alias = "pc";
>      m->is_default = 1;
>  }
>  
> +DEFINE_I440FX_MACHINE(v4_1, "pc-i440fx-4.1", NULL,
> +                      pc_i440fx_4_1_machine_options);
> +
> +static void pc_i440fx_4_0_machine_options(MachineClass *m)
> +{
> +    pc_i440fx_4_1_machine_options(m);
> +    m->alias = NULL;
> +    m->is_default = 0;
> +    compat_props_add(m->compat_props, hw_compat_4_0, hw_compat_4_0_len);
> +    compat_props_add(m->compat_props, pc_compat_4_0, pc_compat_4_0_len);
> +}
> +
>  DEFINE_I440FX_MACHINE(v4_0, "pc-i440fx-4.0", NULL,
>                        pc_i440fx_4_0_machine_options);
>  
> diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c
> index 372c6b73bebd..37dd350511a9 100644
> --- a/hw/i386/pc_q35.c
> +++ b/hw/i386/pc_q35.c
> @@ -365,12 +365,23 @@ static void pc_q35_machine_options(MachineClass *m)
>      m->max_cpus = 288;
>  }
>  
> -static void pc_q35_4_0_machine_options(MachineClass *m)
> +static void pc_q35_4_1_machine_options(MachineClass *m)
>  {
>      pc_q35_machine_options(m);
>      m->alias = "q35";
>  }
>  
> +DEFINE_Q35_MACHINE(v4_1, "pc-q35-4.1", NULL,
> +                   pc_q35_4_1_machine_options);
> +
> +static void pc_q35_4_0_machine_options(MachineClass *m)
> +{
> +    pc_q35_4_1_machine_options(m);
> +    m->alias = NULL;
> +    compat_props_add(m->compat_props, hw_compat_4_0, hw_compat_4_0_len);
> +    compat_props_add(m->compat_props, pc_compat_4_0, pc_compat_4_0_len);
> +}
> +
>  DEFINE_Q35_MACHINE(v4_0, "pc-q35-4.0", NULL,
>                     pc_q35_4_0_machine_options);
>  
> diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c
> index b52b82d298ef..8438741ec23c 100644
> --- a/hw/ppc/spapr.c
> +++ b/hw/ppc/spapr.c
> @@ -4344,15 +4344,26 @@ static const TypeInfo spapr_machine_info = {
>      }                                                                \
>      type_init(spapr_machine_register_##suffix)
>  
> +/*
> + * pseries-4.1
> + */
> +static void spapr_machine_4_1_class_options(MachineClass *mc)
> +{
> +    /* Defaults for the latest behaviour inherited from the base class */
> +}
> +
> +DEFINE_SPAPR_MACHINE(4_1, "4.1", true);
> +
>  /*
>   * pseries-4.0
>   */
>  static void spapr_machine_4_0_class_options(MachineClass *mc)
>  {
> -    /* Defaults for the latest behaviour inherited from the base class */
> +    spapr_machine_4_1_class_options(mc);
> +    compat_props_add(mc->compat_props, hw_compat_4_0, hw_compat_4_0_len);
>  }
>  
> -DEFINE_SPAPR_MACHINE(4_0, "4.0", true);
> +DEFINE_SPAPR_MACHINE(4_0, "4.0", false);
>  
>  /*
>   * pseries-3.1
> diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c
> index d11069b860b4..02470e78c74d 100644
> --- a/hw/s390x/s390-virtio-ccw.c
> +++ b/hw/s390x/s390-virtio-ccw.c
> @@ -646,14 +646,26 @@ bool css_migration_enabled(void)
>      }                                                                         \
>      type_init(ccw_machine_register_##suffix)
>  
> +static void ccw_machine_4_1_instance_options(MachineState *machine)
> +{
> +}
> +
> +static void ccw_machine_4_1_class_options(MachineClass *mc)
> +{
> +}
> +DEFINE_CCW_MACHINE(4_1, "4.1", true);
> +
>  static void ccw_machine_4_0_instance_options(MachineState *machine)
>  {
> +    ccw_machine_4_1_instance_options(machine);
>  }
>  
>  static void ccw_machine_4_0_class_options(MachineClass *mc)
>  {
> +    ccw_machine_4_1_class_options(mc);
> +    compat_props_add(mc->compat_props, hw_compat_4_0, hw_compat_4_0_len);
>  }
> -DEFINE_CCW_MACHINE(4_0, "4.0", true);
> +DEFINE_CCW_MACHINE(4_0, "4.0", false);
>  
>  static void ccw_machine_3_1_instance_options(MachineState *machine)
>  {
> diff --git a/include/hw/boards.h b/include/hw/boards.h
> index e231860666a1..fe1885cbffa0 100644
> --- a/include/hw/boards.h
> +++ b/include/hw/boards.h
> @@ -293,6 +293,9 @@ struct MachineState {
>      } \
>      type_init(machine_initfn##_register_types)
>  
> +extern GlobalProperty hw_compat_4_0[];
> +extern const size_t hw_compat_4_0_len;
> +
>  extern GlobalProperty hw_compat_3_1[];
>  extern const size_t hw_compat_3_1_len;
>  
> diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h
> index ca65ef18afb4..43df7230a22b 100644
> --- a/include/hw/i386/pc.h
> +++ b/include/hw/i386/pc.h
> @@ -293,6 +293,9 @@ int e820_add_entry(uint64_t, uint64_t, uint32_t);
>  int e820_get_num_entries(void);
>  bool e820_get_entry(int, uint32_t, uint64_t *, uint64_t *);
>  
> +extern GlobalProperty pc_compat_4_0[];
> +extern const size_t pc_compat_4_0_len;
> +
>  extern GlobalProperty pc_compat_3_1[];
>  extern const size_t pc_compat_3_1_len;
>  
> 

^ permalink raw reply	[flat|nested] 15+ messages in thread
* Re: [Qemu-devel] [Qemu-ppc] [PATCH for-4.1] hw: add compat machines for 4.1
@ 2019-04-11 19:24   ` Greg Kurz
  0 siblings, 0 replies; 15+ messages in thread
From: Greg Kurz @ 2019-04-11 19:24 UTC (permalink / raw)
  To: Cornelia Huck
  Cc: Peter Maydell, Eduardo Habkost, Marcel Apfelbaum,
	Michael S . Tsirkin, Paolo Bonzini, Richard Henderson,
	David Gibson, David Hildenbrand, Halil Pasic,
	Christian Borntraeger, qemu-s390x, qemu-arm, qemu-ppc,
	qemu-devel

On Thu, 11 Apr 2019 12:20:25 +0200
Cornelia Huck <cohuck@redhat.com> wrote:

> Add 4.1 machine types for arm/i440fx/q35/s390x/spapr.
> 
> Signed-off-by: Cornelia Huck <cohuck@redhat.com>
> ---
> 

For spapr part:

Acked-by: Greg Kurz <groug@kaod.org>

> IIRC, we agreed last time that we want to merge a patch introducing
> the new compat machines first thing in a new development cycle. So
> here's that patch for 4.1.
> 
> ---
>  hw/arm/virt.c              |  9 ++++++++-
>  hw/core/machine.c          |  3 +++
>  hw/i386/pc.c               |  3 +++
>  hw/i386/pc_piix.c          | 14 +++++++++++++-
>  hw/i386/pc_q35.c           | 13 ++++++++++++-
>  hw/ppc/spapr.c             | 15 +++++++++++++--
>  hw/s390x/s390-virtio-ccw.c | 14 +++++++++++++-
>  include/hw/boards.h        |  3 +++
>  include/hw/i386/pc.h       |  3 +++
>  9 files changed, 71 insertions(+), 6 deletions(-)
> 
> diff --git a/hw/arm/virt.c b/hw/arm/virt.c
> index ce2664a30b7f..16ba67f7a768 100644
> --- a/hw/arm/virt.c
> +++ b/hw/arm/virt.c
> @@ -1978,10 +1978,17 @@ static void machvirt_machine_init(void)
>  }
>  type_init(machvirt_machine_init);
>  
> +static void virt_machine_4_1_options(MachineClass *mc)
> +{
> +}
> +DEFINE_VIRT_MACHINE_AS_LATEST(4, 1)
> +
>  static void virt_machine_4_0_options(MachineClass *mc)
>  {
> +    virt_machine_4_1_options(mc);
> +    compat_props_add(mc->compat_props, hw_compat_4_0, hw_compat_4_0_len);
>  }
> -DEFINE_VIRT_MACHINE_AS_LATEST(4, 0)
> +DEFINE_VIRT_MACHINE(4, 0)
>  
>  static void virt_machine_3_1_options(MachineClass *mc)
>  {
> diff --git a/hw/core/machine.c b/hw/core/machine.c
> index 743fef28982c..5d046a43e3d2 100644
> --- a/hw/core/machine.c
> +++ b/hw/core/machine.c
> @@ -24,6 +24,9 @@
>  #include "hw/pci/pci.h"
>  #include "hw/mem/nvdimm.h"
>  
> +GlobalProperty hw_compat_4_0[] = {};
> +const size_t hw_compat_4_0_len = G_N_ELEMENTS(hw_compat_4_0);
> +
>  GlobalProperty hw_compat_3_1[] = {
>      { "pcie-root-port", "x-speed", "2_5" },
>      { "pcie-root-port", "x-width", "1" },
> diff --git a/hw/i386/pc.c b/hw/i386/pc.c
> index f2c15bf1f2c3..868303cf6427 100644
> --- a/hw/i386/pc.c
> +++ b/hw/i386/pc.c
> @@ -115,6 +115,9 @@ struct hpet_fw_config hpet_cfg = {.count = UINT8_MAX};
>  /* Physical Address of PVH entry point read from kernel ELF NOTE */
>  static size_t pvh_start_addr;
>  
> +GlobalProperty pc_compat_4_0[] ={};
> +const size_t pc_compat_4_0_len = G_N_ELEMENTS(pc_compat_4_0);
> +
>  GlobalProperty pc_compat_3_1[] = {
>      { "intel-iommu", "dma-drain", "off" },
>      { "Opteron_G3" "-" TYPE_X86_CPU, "rdtscp", "off" },
> diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c
> index 8ad8e885c6b1..2a7700b564d3 100644
> --- a/hw/i386/pc_piix.c
> +++ b/hw/i386/pc_piix.c
> @@ -428,13 +428,25 @@ static void pc_i440fx_machine_options(MachineClass *m)
>      machine_class_allow_dynamic_sysbus_dev(m, TYPE_RAMFB_DEVICE);
>  }
>  
> -static void pc_i440fx_4_0_machine_options(MachineClass *m)
> +static void pc_i440fx_4_1_machine_options(MachineClass *m)
>  {
>      pc_i440fx_machine_options(m);
>      m->alias = "pc";
>      m->is_default = 1;
>  }
>  
> +DEFINE_I440FX_MACHINE(v4_1, "pc-i440fx-4.1", NULL,
> +                      pc_i440fx_4_1_machine_options);
> +
> +static void pc_i440fx_4_0_machine_options(MachineClass *m)
> +{
> +    pc_i440fx_4_1_machine_options(m);
> +    m->alias = NULL;
> +    m->is_default = 0;
> +    compat_props_add(m->compat_props, hw_compat_4_0, hw_compat_4_0_len);
> +    compat_props_add(m->compat_props, pc_compat_4_0, pc_compat_4_0_len);
> +}
> +
>  DEFINE_I440FX_MACHINE(v4_0, "pc-i440fx-4.0", NULL,
>                        pc_i440fx_4_0_machine_options);
>  
> diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c
> index 372c6b73bebd..37dd350511a9 100644
> --- a/hw/i386/pc_q35.c
> +++ b/hw/i386/pc_q35.c
> @@ -365,12 +365,23 @@ static void pc_q35_machine_options(MachineClass *m)
>      m->max_cpus = 288;
>  }
>  
> -static void pc_q35_4_0_machine_options(MachineClass *m)
> +static void pc_q35_4_1_machine_options(MachineClass *m)
>  {
>      pc_q35_machine_options(m);
>      m->alias = "q35";
>  }
>  
> +DEFINE_Q35_MACHINE(v4_1, "pc-q35-4.1", NULL,
> +                   pc_q35_4_1_machine_options);
> +
> +static void pc_q35_4_0_machine_options(MachineClass *m)
> +{
> +    pc_q35_4_1_machine_options(m);
> +    m->alias = NULL;
> +    compat_props_add(m->compat_props, hw_compat_4_0, hw_compat_4_0_len);
> +    compat_props_add(m->compat_props, pc_compat_4_0, pc_compat_4_0_len);
> +}
> +
>  DEFINE_Q35_MACHINE(v4_0, "pc-q35-4.0", NULL,
>                     pc_q35_4_0_machine_options);
>  
> diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c
> index b52b82d298ef..8438741ec23c 100644
> --- a/hw/ppc/spapr.c
> +++ b/hw/ppc/spapr.c
> @@ -4344,15 +4344,26 @@ static const TypeInfo spapr_machine_info = {
>      }                                                                \
>      type_init(spapr_machine_register_##suffix)
>  
> +/*
> + * pseries-4.1
> + */
> +static void spapr_machine_4_1_class_options(MachineClass *mc)
> +{
> +    /* Defaults for the latest behaviour inherited from the base class */
> +}
> +
> +DEFINE_SPAPR_MACHINE(4_1, "4.1", true);
> +
>  /*
>   * pseries-4.0
>   */
>  static void spapr_machine_4_0_class_options(MachineClass *mc)
>  {
> -    /* Defaults for the latest behaviour inherited from the base class */
> +    spapr_machine_4_1_class_options(mc);
> +    compat_props_add(mc->compat_props, hw_compat_4_0, hw_compat_4_0_len);
>  }
>  
> -DEFINE_SPAPR_MACHINE(4_0, "4.0", true);
> +DEFINE_SPAPR_MACHINE(4_0, "4.0", false);
>  
>  /*
>   * pseries-3.1
> diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c
> index d11069b860b4..02470e78c74d 100644
> --- a/hw/s390x/s390-virtio-ccw.c
> +++ b/hw/s390x/s390-virtio-ccw.c
> @@ -646,14 +646,26 @@ bool css_migration_enabled(void)
>      }                                                                         \
>      type_init(ccw_machine_register_##suffix)
>  
> +static void ccw_machine_4_1_instance_options(MachineState *machine)
> +{
> +}
> +
> +static void ccw_machine_4_1_class_options(MachineClass *mc)
> +{
> +}
> +DEFINE_CCW_MACHINE(4_1, "4.1", true);
> +
>  static void ccw_machine_4_0_instance_options(MachineState *machine)
>  {
> +    ccw_machine_4_1_instance_options(machine);
>  }
>  
>  static void ccw_machine_4_0_class_options(MachineClass *mc)
>  {
> +    ccw_machine_4_1_class_options(mc);
> +    compat_props_add(mc->compat_props, hw_compat_4_0, hw_compat_4_0_len);
>  }
> -DEFINE_CCW_MACHINE(4_0, "4.0", true);
> +DEFINE_CCW_MACHINE(4_0, "4.0", false);
>  
>  static void ccw_machine_3_1_instance_options(MachineState *machine)
>  {
> diff --git a/include/hw/boards.h b/include/hw/boards.h
> index e231860666a1..fe1885cbffa0 100644
> --- a/include/hw/boards.h
> +++ b/include/hw/boards.h
> @@ -293,6 +293,9 @@ struct MachineState {
>      } \
>      type_init(machine_initfn##_register_types)
>  
> +extern GlobalProperty hw_compat_4_0[];
> +extern const size_t hw_compat_4_0_len;
> +
>  extern GlobalProperty hw_compat_3_1[];
>  extern const size_t hw_compat_3_1_len;
>  
> diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h
> index ca65ef18afb4..43df7230a22b 100644
> --- a/include/hw/i386/pc.h
> +++ b/include/hw/i386/pc.h
> @@ -293,6 +293,9 @@ int e820_add_entry(uint64_t, uint64_t, uint32_t);
>  int e820_get_num_entries(void);
>  bool e820_get_entry(int, uint32_t, uint64_t *, uint64_t *);
>  
> +extern GlobalProperty pc_compat_4_0[];
> +extern const size_t pc_compat_4_0_len;
> +
>  extern GlobalProperty pc_compat_3_1[];
>  extern const size_t pc_compat_3_1_len;
>  

^ permalink raw reply	[flat|nested] 15+ messages in thread
* Re: [Qemu-devel] [Qemu-ppc] [PATCH for-4.1] hw: add compat machines for 4.1
@ 2019-04-11 19:24   ` Greg Kurz
  0 siblings, 0 replies; 15+ messages in thread
From: Greg Kurz @ 2019-04-11 19:24 UTC (permalink / raw)
  To: Cornelia Huck
  Cc: Peter Maydell, Eduardo Habkost, Michael S . Tsirkin,
	David Hildenbrand, qemu-devel, Halil Pasic,
	Christian Borntraeger, qemu-s390x, qemu-arm, qemu-ppc,
	Paolo Bonzini, David Gibson, Richard Henderson

On Thu, 11 Apr 2019 12:20:25 +0200
Cornelia Huck <cohuck@redhat.com> wrote:

> Add 4.1 machine types for arm/i440fx/q35/s390x/spapr.
> 
> Signed-off-by: Cornelia Huck <cohuck@redhat.com>
> ---
> 

For spapr part:

Acked-by: Greg Kurz <groug@kaod.org>

> IIRC, we agreed last time that we want to merge a patch introducing
> the new compat machines first thing in a new development cycle. So
> here's that patch for 4.1.
> 
> ---
>  hw/arm/virt.c              |  9 ++++++++-
>  hw/core/machine.c          |  3 +++
>  hw/i386/pc.c               |  3 +++
>  hw/i386/pc_piix.c          | 14 +++++++++++++-
>  hw/i386/pc_q35.c           | 13 ++++++++++++-
>  hw/ppc/spapr.c             | 15 +++++++++++++--
>  hw/s390x/s390-virtio-ccw.c | 14 +++++++++++++-
>  include/hw/boards.h        |  3 +++
>  include/hw/i386/pc.h       |  3 +++
>  9 files changed, 71 insertions(+), 6 deletions(-)
> 
> diff --git a/hw/arm/virt.c b/hw/arm/virt.c
> index ce2664a30b7f..16ba67f7a768 100644
> --- a/hw/arm/virt.c
> +++ b/hw/arm/virt.c
> @@ -1978,10 +1978,17 @@ static void machvirt_machine_init(void)
>  }
>  type_init(machvirt_machine_init);
>  
> +static void virt_machine_4_1_options(MachineClass *mc)
> +{
> +}
> +DEFINE_VIRT_MACHINE_AS_LATEST(4, 1)
> +
>  static void virt_machine_4_0_options(MachineClass *mc)
>  {
> +    virt_machine_4_1_options(mc);
> +    compat_props_add(mc->compat_props, hw_compat_4_0, hw_compat_4_0_len);
>  }
> -DEFINE_VIRT_MACHINE_AS_LATEST(4, 0)
> +DEFINE_VIRT_MACHINE(4, 0)
>  
>  static void virt_machine_3_1_options(MachineClass *mc)
>  {
> diff --git a/hw/core/machine.c b/hw/core/machine.c
> index 743fef28982c..5d046a43e3d2 100644
> --- a/hw/core/machine.c
> +++ b/hw/core/machine.c
> @@ -24,6 +24,9 @@
>  #include "hw/pci/pci.h"
>  #include "hw/mem/nvdimm.h"
>  
> +GlobalProperty hw_compat_4_0[] = {};
> +const size_t hw_compat_4_0_len = G_N_ELEMENTS(hw_compat_4_0);
> +
>  GlobalProperty hw_compat_3_1[] = {
>      { "pcie-root-port", "x-speed", "2_5" },
>      { "pcie-root-port", "x-width", "1" },
> diff --git a/hw/i386/pc.c b/hw/i386/pc.c
> index f2c15bf1f2c3..868303cf6427 100644
> --- a/hw/i386/pc.c
> +++ b/hw/i386/pc.c
> @@ -115,6 +115,9 @@ struct hpet_fw_config hpet_cfg = {.count = UINT8_MAX};
>  /* Physical Address of PVH entry point read from kernel ELF NOTE */
>  static size_t pvh_start_addr;
>  
> +GlobalProperty pc_compat_4_0[] ={};
> +const size_t pc_compat_4_0_len = G_N_ELEMENTS(pc_compat_4_0);
> +
>  GlobalProperty pc_compat_3_1[] = {
>      { "intel-iommu", "dma-drain", "off" },
>      { "Opteron_G3" "-" TYPE_X86_CPU, "rdtscp", "off" },
> diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c
> index 8ad8e885c6b1..2a7700b564d3 100644
> --- a/hw/i386/pc_piix.c
> +++ b/hw/i386/pc_piix.c
> @@ -428,13 +428,25 @@ static void pc_i440fx_machine_options(MachineClass *m)
>      machine_class_allow_dynamic_sysbus_dev(m, TYPE_RAMFB_DEVICE);
>  }
>  
> -static void pc_i440fx_4_0_machine_options(MachineClass *m)
> +static void pc_i440fx_4_1_machine_options(MachineClass *m)
>  {
>      pc_i440fx_machine_options(m);
>      m->alias = "pc";
>      m->is_default = 1;
>  }
>  
> +DEFINE_I440FX_MACHINE(v4_1, "pc-i440fx-4.1", NULL,
> +                      pc_i440fx_4_1_machine_options);
> +
> +static void pc_i440fx_4_0_machine_options(MachineClass *m)
> +{
> +    pc_i440fx_4_1_machine_options(m);
> +    m->alias = NULL;
> +    m->is_default = 0;
> +    compat_props_add(m->compat_props, hw_compat_4_0, hw_compat_4_0_len);
> +    compat_props_add(m->compat_props, pc_compat_4_0, pc_compat_4_0_len);
> +}
> +
>  DEFINE_I440FX_MACHINE(v4_0, "pc-i440fx-4.0", NULL,
>                        pc_i440fx_4_0_machine_options);
>  
> diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c
> index 372c6b73bebd..37dd350511a9 100644
> --- a/hw/i386/pc_q35.c
> +++ b/hw/i386/pc_q35.c
> @@ -365,12 +365,23 @@ static void pc_q35_machine_options(MachineClass *m)
>      m->max_cpus = 288;
>  }
>  
> -static void pc_q35_4_0_machine_options(MachineClass *m)
> +static void pc_q35_4_1_machine_options(MachineClass *m)
>  {
>      pc_q35_machine_options(m);
>      m->alias = "q35";
>  }
>  
> +DEFINE_Q35_MACHINE(v4_1, "pc-q35-4.1", NULL,
> +                   pc_q35_4_1_machine_options);
> +
> +static void pc_q35_4_0_machine_options(MachineClass *m)
> +{
> +    pc_q35_4_1_machine_options(m);
> +    m->alias = NULL;
> +    compat_props_add(m->compat_props, hw_compat_4_0, hw_compat_4_0_len);
> +    compat_props_add(m->compat_props, pc_compat_4_0, pc_compat_4_0_len);
> +}
> +
>  DEFINE_Q35_MACHINE(v4_0, "pc-q35-4.0", NULL,
>                     pc_q35_4_0_machine_options);
>  
> diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c
> index b52b82d298ef..8438741ec23c 100644
> --- a/hw/ppc/spapr.c
> +++ b/hw/ppc/spapr.c
> @@ -4344,15 +4344,26 @@ static const TypeInfo spapr_machine_info = {
>      }                                                                \
>      type_init(spapr_machine_register_##suffix)
>  
> +/*
> + * pseries-4.1
> + */
> +static void spapr_machine_4_1_class_options(MachineClass *mc)
> +{
> +    /* Defaults for the latest behaviour inherited from the base class */
> +}
> +
> +DEFINE_SPAPR_MACHINE(4_1, "4.1", true);
> +
>  /*
>   * pseries-4.0
>   */
>  static void spapr_machine_4_0_class_options(MachineClass *mc)
>  {
> -    /* Defaults for the latest behaviour inherited from the base class */
> +    spapr_machine_4_1_class_options(mc);
> +    compat_props_add(mc->compat_props, hw_compat_4_0, hw_compat_4_0_len);
>  }
>  
> -DEFINE_SPAPR_MACHINE(4_0, "4.0", true);
> +DEFINE_SPAPR_MACHINE(4_0, "4.0", false);
>  
>  /*
>   * pseries-3.1
> diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c
> index d11069b860b4..02470e78c74d 100644
> --- a/hw/s390x/s390-virtio-ccw.c
> +++ b/hw/s390x/s390-virtio-ccw.c
> @@ -646,14 +646,26 @@ bool css_migration_enabled(void)
>      }                                                                         \
>      type_init(ccw_machine_register_##suffix)
>  
> +static void ccw_machine_4_1_instance_options(MachineState *machine)
> +{
> +}
> +
> +static void ccw_machine_4_1_class_options(MachineClass *mc)
> +{
> +}
> +DEFINE_CCW_MACHINE(4_1, "4.1", true);
> +
>  static void ccw_machine_4_0_instance_options(MachineState *machine)
>  {
> +    ccw_machine_4_1_instance_options(machine);
>  }
>  
>  static void ccw_machine_4_0_class_options(MachineClass *mc)
>  {
> +    ccw_machine_4_1_class_options(mc);
> +    compat_props_add(mc->compat_props, hw_compat_4_0, hw_compat_4_0_len);
>  }
> -DEFINE_CCW_MACHINE(4_0, "4.0", true);
> +DEFINE_CCW_MACHINE(4_0, "4.0", false);
>  
>  static void ccw_machine_3_1_instance_options(MachineState *machine)
>  {
> diff --git a/include/hw/boards.h b/include/hw/boards.h
> index e231860666a1..fe1885cbffa0 100644
> --- a/include/hw/boards.h
> +++ b/include/hw/boards.h
> @@ -293,6 +293,9 @@ struct MachineState {
>      } \
>      type_init(machine_initfn##_register_types)
>  
> +extern GlobalProperty hw_compat_4_0[];
> +extern const size_t hw_compat_4_0_len;
> +
>  extern GlobalProperty hw_compat_3_1[];
>  extern const size_t hw_compat_3_1_len;
>  
> diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h
> index ca65ef18afb4..43df7230a22b 100644
> --- a/include/hw/i386/pc.h
> +++ b/include/hw/i386/pc.h
> @@ -293,6 +293,9 @@ int e820_add_entry(uint64_t, uint64_t, uint32_t);
>  int e820_get_num_entries(void);
>  bool e820_get_entry(int, uint32_t, uint64_t *, uint64_t *);
>  
> +extern GlobalProperty pc_compat_4_0[];
> +extern const size_t pc_compat_4_0_len;
> +
>  extern GlobalProperty pc_compat_3_1[];
>  extern const size_t pc_compat_3_1_len;
>  



^ permalink raw reply	[flat|nested] 15+ messages in thread
* Re: [Qemu-devel] [Qemu-ppc] [PATCH for-4.1] hw: add compat machines for 4.1
@ 2019-04-12  5:55     ` David Gibson
  0 siblings, 0 replies; 15+ messages in thread
From: David Gibson @ 2019-04-12  5:55 UTC (permalink / raw)
  To: Greg Kurz
  Cc: Cornelia Huck, Peter Maydell, Eduardo Habkost, Marcel Apfelbaum,
	Michael S . Tsirkin, Paolo Bonzini, Richard Henderson,
	David Hildenbrand, Halil Pasic, Christian Borntraeger,
	qemu-s390x, qemu-arm, qemu-ppc, qemu-devel

[-- Attachment #1: Type: text/plain, Size: 606 bytes --]

On Thu, Apr 11, 2019 at 09:24:05PM +0200, Greg Kurz wrote:
> On Thu, 11 Apr 2019 12:20:25 +0200
> Cornelia Huck <cohuck@redhat.com> wrote:
> 
> > Add 4.1 machine types for arm/i440fx/q35/s390x/spapr.
> > 
> > Signed-off-by: Cornelia Huck <cohuck@redhat.com>
> > ---
> > 
> 
> For spapr part:
> 
> Acked-by: Greg Kurz <groug@kaod.org>

and

Acked-by: David Gibson <david@gibson.dropbear.id.au>

-- 
David Gibson			| I'll have my music baroque, and my code
david AT gibson.dropbear.id.au	| minimalist, thank you.  NOT _the_ _other_
				| _way_ _around_!
http://www.ozlabs.org/~dgibson

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

^ permalink raw reply	[flat|nested] 15+ messages in thread
* Re: [Qemu-devel] [Qemu-ppc] [PATCH for-4.1] hw: add compat machines for 4.1
@ 2019-04-12  5:55     ` David Gibson
  0 siblings, 0 replies; 15+ messages in thread
From: David Gibson @ 2019-04-12  5:55 UTC (permalink / raw)
  To: Greg Kurz
  Cc: Peter Maydell, Eduardo Habkost, Michael S . Tsirkin,
	Cornelia Huck, David Hildenbrand, qemu-devel, Halil Pasic,
	Christian Borntraeger, qemu-s390x, qemu-arm, qemu-ppc,
	Paolo Bonzini, Richard Henderson

[-- Attachment #1: Type: text/plain, Size: 606 bytes --]

On Thu, Apr 11, 2019 at 09:24:05PM +0200, Greg Kurz wrote:
> On Thu, 11 Apr 2019 12:20:25 +0200
> Cornelia Huck <cohuck@redhat.com> wrote:
> 
> > Add 4.1 machine types for arm/i440fx/q35/s390x/spapr.
> > 
> > Signed-off-by: Cornelia Huck <cohuck@redhat.com>
> > ---
> > 
> 
> For spapr part:
> 
> Acked-by: Greg Kurz <groug@kaod.org>

and

Acked-by: David Gibson <david@gibson.dropbear.id.au>

-- 
David Gibson			| I'll have my music baroque, and my code
david AT gibson.dropbear.id.au	| minimalist, thank you.  NOT _the_ _other_
				| _way_ _around_!
http://www.ozlabs.org/~dgibson

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

^ permalink raw reply	[flat|nested] 15+ messages in thread
* Re: [Qemu-devel] [PATCH for-4.1] hw: add compat machines for 4.1
@ 2019-04-12 18:45   ` Eduardo Habkost
  0 siblings, 0 replies; 15+ messages in thread
From: Eduardo Habkost @ 2019-04-12 18:45 UTC (permalink / raw)
  To: Cornelia Huck
  Cc: Peter Maydell, Marcel Apfelbaum, Michael S . Tsirkin,
	Paolo Bonzini, Richard Henderson, David Gibson,
	David Hildenbrand, Halil Pasic, Christian Borntraeger, qemu-arm,
	qemu-devel, qemu-ppc, qemu-s390x

On Thu, Apr 11, 2019 at 12:20:25PM +0200, Cornelia Huck wrote:
> Add 4.1 machine types for arm/i440fx/q35/s390x/spapr.
> 
> Signed-off-by: Cornelia Huck <cohuck@redhat.com>

Thanks!

Reviewed-by: Eduardo Habkost <ehabkost@redhat.com>

I'm queueing it on machine-next.

-- 
Eduardo

^ permalink raw reply	[flat|nested] 15+ messages in thread
* Re: [Qemu-devel] [PATCH for-4.1] hw: add compat machines for 4.1
@ 2019-04-12 18:45   ` Eduardo Habkost
  0 siblings, 0 replies; 15+ messages in thread
From: Eduardo Habkost @ 2019-04-12 18:45 UTC (permalink / raw)
  To: Cornelia Huck
  Cc: Peter Maydell, Michael S . Tsirkin, David Hildenbrand,
	qemu-devel, Halil Pasic, Christian Borntraeger, qemu-s390x,
	qemu-arm, qemu-ppc, Paolo Bonzini, David Gibson,
	Richard Henderson

On Thu, Apr 11, 2019 at 12:20:25PM +0200, Cornelia Huck wrote:
> Add 4.1 machine types for arm/i440fx/q35/s390x/spapr.
> 
> Signed-off-by: Cornelia Huck <cohuck@redhat.com>

Thanks!

Reviewed-by: Eduardo Habkost <ehabkost@redhat.com>

I'm queueing it on machine-next.

-- 
Eduardo


^ permalink raw reply	[flat|nested] 15+ messages in thread
* Re: [Qemu-devel] [PATCH for-4.1] hw: add compat machines for 4.1
@ 2019-04-12 18:47       ` Eduardo Habkost
  0 siblings, 0 replies; 15+ messages in thread
From: Eduardo Habkost @ 2019-04-12 18:47 UTC (permalink / raw)
  To: Cornelia Huck
  Cc: qemu-devel, fam, peter.maydell, marcel.apfelbaum, mst, pbonzini,
	rth, david, david, pasic, borntraeger, qemu-s390x, qemu-arm,
	qemu-ppc

On Thu, Apr 11, 2019 at 12:56:55PM +0200, Cornelia Huck wrote:
> On Thu, 11 Apr 2019 03:28:46 -0700 (PDT)
> no-reply@patchew.org wrote:
> 
> > === OUTPUT BEGIN ===
> > ERROR: spaces required around that '=' (ctx:WxV)
> > #58: FILE: hw/i386/pc.c:118:
> > +GlobalProperty pc_compat_4_0[] ={};
> >                                 ^
> > 
> > total: 1 errors, 0 warnings, 160 lines checked
> 
> Yeah; trivial to fix by whoever applies this.

Fixed manually after committing.  Thanks!

-- 
Eduardo

^ permalink raw reply	[flat|nested] 15+ messages in thread
* Re: [Qemu-devel] [PATCH for-4.1] hw: add compat machines for 4.1
@ 2019-04-12 18:47       ` Eduardo Habkost
  0 siblings, 0 replies; 15+ messages in thread
From: Eduardo Habkost @ 2019-04-12 18:47 UTC (permalink / raw)
  To: Cornelia Huck
  Cc: fam, peter.maydell, mst, david, qemu-devel, pasic, borntraeger,
	qemu-s390x, qemu-arm, qemu-ppc, pbonzini, david, rth

On Thu, Apr 11, 2019 at 12:56:55PM +0200, Cornelia Huck wrote:
> On Thu, 11 Apr 2019 03:28:46 -0700 (PDT)
> no-reply@patchew.org wrote:
> 
> > === OUTPUT BEGIN ===
> > ERROR: spaces required around that '=' (ctx:WxV)
> > #58: FILE: hw/i386/pc.c:118:
> > +GlobalProperty pc_compat_4_0[] ={};
> >                                 ^
> > 
> > total: 1 errors, 0 warnings, 160 lines checked
> 
> Yeah; trivial to fix by whoever applies this.

Fixed manually after committing.  Thanks!

-- 
Eduardo


^ permalink raw reply	[flat|nested] 15+ messages in thread
end of thread, other threads:[~2019-04-12 18:49 UTC | newest]

Thread overview: 15+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-04-11 10:20 [Qemu-devel] [PATCH for-4.1] hw: add compat machines for 4.1 Cornelia Huck
2019-04-11 10:20 ` Cornelia Huck
2019-04-11 10:28 ` no-reply
2019-04-11 10:28   ` no-reply
2019-04-11 10:56   ` Cornelia Huck
2019-04-11 10:56     ` Cornelia Huck
2019-04-12 18:47     ` Eduardo Habkost
2019-04-12 18:47       ` Eduardo Habkost
2019-04-11 14:11 ` [Qemu-devel] [qemu-s390x] " Christian Borntraeger
2019-04-11 19:24 ` [Qemu-devel] [Qemu-ppc] " Greg Kurz
2019-04-11 19:24   ` Greg Kurz
2019-04-12  5:55   ` David Gibson
2019-04-12  5:55     ` David Gibson
2019-04-12 18:45 ` [Qemu-devel] " Eduardo Habkost
2019-04-12 18:45   ` Eduardo Habkost

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.