* [Qemu-devel] [PATCH v2] pc: add 1.8 machine type
@ 2013-11-14 10:37 Michael S. Tsirkin
2013-11-14 10:39 ` Paolo Bonzini
` (2 more replies)
0 siblings, 3 replies; 11+ messages in thread
From: Michael S. Tsirkin @ 2013-11-14 10:37 UTC (permalink / raw)
Cc: Paolo Bonzini, Eduardo Habkost, qemu-devel, Anthony Liguori,
Andreas Färber
Several changes that affect compatibility between 1.8 and 1.7 are
already planned, so we need pc compat structures in place.
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
---
Changes from v1:
make 1.6 call 1.7 as suggested by Paolo
hw/i386/pc_piix.c | 30 +++++++++++++++++++++++++-----
hw/i386/pc_q35.c | 27 ++++++++++++++++++++++++---
2 files changed, 49 insertions(+), 8 deletions(-)
diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c
index 049f216..b6347e2 100644
--- a/hw/i386/pc_piix.c
+++ b/hw/i386/pc_piix.c
@@ -238,8 +238,13 @@ static void pc_init_pci(QEMUMachineInitArgs *args)
pc_init1(args, 1, 1);
}
+static void pc_compat_1_7(QEMUMachineInitArgs *args)
+{
+}
+
static void pc_compat_1_6(QEMUMachineInitArgs *args)
{
+ pc_compat_1_6(args);
has_pci_info = false;
rom_file_in_ram = false;
has_acpi_build = false;
@@ -272,6 +277,12 @@ static void pc_compat_1_2(QEMUMachineInitArgs *args)
disable_kvm_pv_eoi();
}
+static void pc_init_pci_1_7(QEMUMachineInitArgs *args)
+{
+ pc_compat_1_7(args);
+ pc_init_pci(args);
+}
+
static void pc_init_pci_1_6(QEMUMachineInitArgs *args)
{
pc_compat_1_6(args);
@@ -344,16 +355,24 @@ static void pc_xen_hvm_init(QEMUMachineInitArgs *args)
.desc = "Standard PC (i440FX + PIIX, 1996)", \
.hot_add_cpu = pc_hot_add_cpu
-#define PC_I440FX_1_7_MACHINE_OPTIONS PC_I440FX_MACHINE_OPTIONS
-static QEMUMachine pc_i440fx_machine_v1_7 = {
- PC_I440FX_1_7_MACHINE_OPTIONS,
- .name = "pc-i440fx-1.7",
+
+#define PC_I440FX_1_8_MACHINE_OPTIONS PC_I440FX_MACHINE_OPTIONS
+static QEMUMachine pc_i440fx_machine_v1_8 = {
+ PC_I440FX_1_8_MACHINE_OPTIONS,
+ .name = "pc-i440fx-1.8",
.alias = "pc",
.init = pc_init_pci,
.is_default = 1,
};
-#define PC_I440FX_1_6_MACHINE_OPTIONS PC_I440FX_MACHINE_OPTIONS
+#define PC_I440FX_1_7_MACHINE_OPTIONS PC_I440FX_1_8_MACHINE_OPTIONS
+static QEMUMachine pc_i440fx_machine_v1_7 = {
+ PC_I440FX_1_7_MACHINE_OPTIONS,
+ .name = "pc-i440fx-1.7",
+ .init = pc_init_pci_1_7,
+};
+
+#define PC_I440FX_1_6_MACHINE_OPTIONS PC_I440FX_1_7_MACHINE_OPTIONS
static QEMUMachine pc_i440fx_machine_v1_6 = {
PC_I440FX_1_6_MACHINE_OPTIONS,
@@ -752,6 +771,7 @@ static QEMUMachine xenfv_machine = {
static void pc_machine_init(void)
{
+ qemu_register_machine(&pc_i440fx_machine_v1_8);
qemu_register_machine(&pc_i440fx_machine_v1_7);
qemu_register_machine(&pc_i440fx_machine_v1_6);
qemu_register_machine(&pc_i440fx_machine_v1_5);
diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c
index d297000..9f3876f 100644
--- a/hw/i386/pc_q35.c
+++ b/hw/i386/pc_q35.c
@@ -222,8 +222,13 @@ static void pc_q35_init(QEMUMachineInitArgs *args)
}
}
+static void pc_compat_1_7(QEMUMachineInitArgs *args)
+{
+}
+
static void pc_compat_1_6(QEMUMachineInitArgs *args)
{
+ pc_compat_1_7(args);
has_pci_info = false;
rom_file_in_ram = false;
has_acpi_build = false;
@@ -243,6 +248,12 @@ static void pc_compat_1_4(QEMUMachineInitArgs *args)
x86_cpu_compat_set_features("Westmere", FEAT_1_ECX, 0, CPUID_EXT_PCLMULQDQ);
}
+static void pc_q35_init_1_7(QEMUMachineInitArgs *args)
+{
+ pc_compat_1_7(args);
+ pc_q35_init(args);
+}
+
static void pc_q35_init_1_6(QEMUMachineInitArgs *args)
{
pc_compat_1_6(args);
@@ -266,16 +277,25 @@ static void pc_q35_init_1_4(QEMUMachineInitArgs *args)
.desc = "Standard PC (Q35 + ICH9, 2009)", \
.hot_add_cpu = pc_hot_add_cpu
-#define PC_Q35_1_7_MACHINE_OPTIONS PC_Q35_MACHINE_OPTIONS
+#define PC_Q35_1_8_MACHINE_OPTIONS PC_Q35_MACHINE_OPTIONS
+
+static QEMUMachine pc_q35_machine_v1_8 = {
+ PC_Q35_1_8_MACHINE_OPTIONS,
+ .name = "pc-q35-1.8",
+ .alias = "q35",
+ .init = pc_q35_init,
+};
+
+#define PC_Q35_1_7_MACHINE_OPTIONS PC_Q35_1_8_MACHINE_OPTIONS
static QEMUMachine pc_q35_machine_v1_7 = {
PC_Q35_1_7_MACHINE_OPTIONS,
.name = "pc-q35-1.7",
.alias = "q35",
- .init = pc_q35_init,
+ .init = pc_q35_init_1_7,
};
-#define PC_Q35_1_6_MACHINE_OPTIONS PC_Q35_MACHINE_OPTIONS
+#define PC_Q35_1_6_MACHINE_OPTIONS PC_Q35_1_7_MACHINE_OPTIONS
static QEMUMachine pc_q35_machine_v1_6 = {
PC_Q35_1_6_MACHINE_OPTIONS,
@@ -313,6 +333,7 @@ static QEMUMachine pc_q35_machine_v1_4 = {
static void pc_q35_machine_init(void)
{
+ qemu_register_machine(&pc_q35_machine_v1_8);
qemu_register_machine(&pc_q35_machine_v1_7);
qemu_register_machine(&pc_q35_machine_v1_6);
qemu_register_machine(&pc_q35_machine_v1_5);
--
MST
^ permalink raw reply related [flat|nested] 11+ messages in thread* Re: [Qemu-devel] [PATCH v2] pc: add 1.8 machine type
2013-11-14 10:37 [Qemu-devel] [PATCH v2] pc: add 1.8 machine type Michael S. Tsirkin
@ 2013-11-14 10:39 ` Paolo Bonzini
2013-11-15 15:27 ` Vlad Yasevich
2013-12-05 17:53 ` Paolo Bonzini
2 siblings, 0 replies; 11+ messages in thread
From: Paolo Bonzini @ 2013-11-14 10:39 UTC (permalink / raw)
To: Michael S. Tsirkin
Cc: Eduardo Habkost, qemu-devel, Anthony Liguori, Andreas Färber
Il 14/11/2013 11:37, Michael S. Tsirkin ha scritto:
> Several changes that affect compatibility between 1.8 and 1.7 are
> already planned, so we need pc compat structures in place.
>
> Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
> ---
>
> Changes from v1:
> make 1.6 call 1.7 as suggested by Paolo
>
> hw/i386/pc_piix.c | 30 +++++++++++++++++++++++++-----
> hw/i386/pc_q35.c | 27 ++++++++++++++++++++++++---
> 2 files changed, 49 insertions(+), 8 deletions(-)
>
> diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c
> index 049f216..b6347e2 100644
> --- a/hw/i386/pc_piix.c
> +++ b/hw/i386/pc_piix.c
> @@ -238,8 +238,13 @@ static void pc_init_pci(QEMUMachineInitArgs *args)
> pc_init1(args, 1, 1);
> }
>
> +static void pc_compat_1_7(QEMUMachineInitArgs *args)
> +{
> +}
> +
> static void pc_compat_1_6(QEMUMachineInitArgs *args)
> {
> + pc_compat_1_6(args);
It's calling itself now. :) q35 is fine.
With the obvious blunder fixed,
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
> has_pci_info = false;
> rom_file_in_ram = false;
> has_acpi_build = false;
> @@ -272,6 +277,12 @@ static void pc_compat_1_2(QEMUMachineInitArgs *args)
> disable_kvm_pv_eoi();
> }
>
> +static void pc_init_pci_1_7(QEMUMachineInitArgs *args)
> +{
> + pc_compat_1_7(args);
> + pc_init_pci(args);
> +}
> +
> static void pc_init_pci_1_6(QEMUMachineInitArgs *args)
> {
> pc_compat_1_6(args);
> @@ -344,16 +355,24 @@ static void pc_xen_hvm_init(QEMUMachineInitArgs *args)
> .desc = "Standard PC (i440FX + PIIX, 1996)", \
> .hot_add_cpu = pc_hot_add_cpu
>
> -#define PC_I440FX_1_7_MACHINE_OPTIONS PC_I440FX_MACHINE_OPTIONS
> -static QEMUMachine pc_i440fx_machine_v1_7 = {
> - PC_I440FX_1_7_MACHINE_OPTIONS,
> - .name = "pc-i440fx-1.7",
> +
> +#define PC_I440FX_1_8_MACHINE_OPTIONS PC_I440FX_MACHINE_OPTIONS
> +static QEMUMachine pc_i440fx_machine_v1_8 = {
> + PC_I440FX_1_8_MACHINE_OPTIONS,
> + .name = "pc-i440fx-1.8",
> .alias = "pc",
> .init = pc_init_pci,
> .is_default = 1,
> };
>
> -#define PC_I440FX_1_6_MACHINE_OPTIONS PC_I440FX_MACHINE_OPTIONS
> +#define PC_I440FX_1_7_MACHINE_OPTIONS PC_I440FX_1_8_MACHINE_OPTIONS
> +static QEMUMachine pc_i440fx_machine_v1_7 = {
> + PC_I440FX_1_7_MACHINE_OPTIONS,
> + .name = "pc-i440fx-1.7",
> + .init = pc_init_pci_1_7,
> +};
> +
> +#define PC_I440FX_1_6_MACHINE_OPTIONS PC_I440FX_1_7_MACHINE_OPTIONS
>
> static QEMUMachine pc_i440fx_machine_v1_6 = {
> PC_I440FX_1_6_MACHINE_OPTIONS,
> @@ -752,6 +771,7 @@ static QEMUMachine xenfv_machine = {
>
> static void pc_machine_init(void)
> {
> + qemu_register_machine(&pc_i440fx_machine_v1_8);
> qemu_register_machine(&pc_i440fx_machine_v1_7);
> qemu_register_machine(&pc_i440fx_machine_v1_6);
> qemu_register_machine(&pc_i440fx_machine_v1_5);
> diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c
> index d297000..9f3876f 100644
> --- a/hw/i386/pc_q35.c
> +++ b/hw/i386/pc_q35.c
> @@ -222,8 +222,13 @@ static void pc_q35_init(QEMUMachineInitArgs *args)
> }
> }
>
> +static void pc_compat_1_7(QEMUMachineInitArgs *args)
> +{
> +}
> +
> static void pc_compat_1_6(QEMUMachineInitArgs *args)
> {
> + pc_compat_1_7(args);
> has_pci_info = false;
> rom_file_in_ram = false;
> has_acpi_build = false;
> @@ -243,6 +248,12 @@ static void pc_compat_1_4(QEMUMachineInitArgs *args)
> x86_cpu_compat_set_features("Westmere", FEAT_1_ECX, 0, CPUID_EXT_PCLMULQDQ);
> }
>
> +static void pc_q35_init_1_7(QEMUMachineInitArgs *args)
> +{
> + pc_compat_1_7(args);
> + pc_q35_init(args);
> +}
> +
> static void pc_q35_init_1_6(QEMUMachineInitArgs *args)
> {
> pc_compat_1_6(args);
> @@ -266,16 +277,25 @@ static void pc_q35_init_1_4(QEMUMachineInitArgs *args)
> .desc = "Standard PC (Q35 + ICH9, 2009)", \
> .hot_add_cpu = pc_hot_add_cpu
>
> -#define PC_Q35_1_7_MACHINE_OPTIONS PC_Q35_MACHINE_OPTIONS
> +#define PC_Q35_1_8_MACHINE_OPTIONS PC_Q35_MACHINE_OPTIONS
> +
> +static QEMUMachine pc_q35_machine_v1_8 = {
> + PC_Q35_1_8_MACHINE_OPTIONS,
> + .name = "pc-q35-1.8",
> + .alias = "q35",
> + .init = pc_q35_init,
> +};
> +
> +#define PC_Q35_1_7_MACHINE_OPTIONS PC_Q35_1_8_MACHINE_OPTIONS
>
> static QEMUMachine pc_q35_machine_v1_7 = {
> PC_Q35_1_7_MACHINE_OPTIONS,
> .name = "pc-q35-1.7",
> .alias = "q35",
> - .init = pc_q35_init,
> + .init = pc_q35_init_1_7,
> };
>
> -#define PC_Q35_1_6_MACHINE_OPTIONS PC_Q35_MACHINE_OPTIONS
> +#define PC_Q35_1_6_MACHINE_OPTIONS PC_Q35_1_7_MACHINE_OPTIONS
>
> static QEMUMachine pc_q35_machine_v1_6 = {
> PC_Q35_1_6_MACHINE_OPTIONS,
> @@ -313,6 +333,7 @@ static QEMUMachine pc_q35_machine_v1_4 = {
>
> static void pc_q35_machine_init(void)
> {
> + qemu_register_machine(&pc_q35_machine_v1_8);
> qemu_register_machine(&pc_q35_machine_v1_7);
> qemu_register_machine(&pc_q35_machine_v1_6);
> qemu_register_machine(&pc_q35_machine_v1_5);
>
^ permalink raw reply [flat|nested] 11+ messages in thread* Re: [Qemu-devel] [PATCH v2] pc: add 1.8 machine type
2013-11-14 10:37 [Qemu-devel] [PATCH v2] pc: add 1.8 machine type Michael S. Tsirkin
2013-11-14 10:39 ` Paolo Bonzini
@ 2013-11-15 15:27 ` Vlad Yasevich
2013-12-05 17:53 ` Paolo Bonzini
2 siblings, 0 replies; 11+ messages in thread
From: Vlad Yasevich @ 2013-11-15 15:27 UTC (permalink / raw)
To: Michael S. Tsirkin
Cc: Paolo Bonzini, Andreas Färber, Eduardo Habkost,
Anthony Liguori, qemu-devel
On 11/14/2013 05:37 AM, Michael S. Tsirkin wrote:
>
> -#define PC_Q35_1_7_MACHINE_OPTIONS PC_Q35_MACHINE_OPTIONS
> +#define PC_Q35_1_8_MACHINE_OPTIONS PC_Q35_MACHINE_OPTIONS
> +
> +static QEMUMachine pc_q35_machine_v1_8 = {
> + PC_Q35_1_8_MACHINE_OPTIONS,
> + .name = "pc-q35-1.8",
> + .alias = "q35",
> + .init = pc_q35_init,
> +};
> +
> +#define PC_Q35_1_7_MACHINE_OPTIONS PC_Q35_1_8_MACHINE_OPTIONS
>
> static QEMUMachine pc_q35_machine_v1_7 = {
> PC_Q35_1_7_MACHINE_OPTIONS,
> .name = "pc-q35-1.7",
> .alias = "q35",
> - .init = pc_q35_init,
> + .init = pc_q35_init_1_7,
> };
>
Hi Michael
Shouldn't the '.alias' be removed from the 1.7 machine?
Thanks
-vlad
> -#define PC_Q35_1_6_MACHINE_OPTIONS PC_Q35_MACHINE_OPTIONS
> +#define PC_Q35_1_6_MACHINE_OPTIONS PC_Q35_1_7_MACHINE_OPTIONS
>
> static QEMUMachine pc_q35_machine_v1_6 = {
> PC_Q35_1_6_MACHINE_OPTIONS,
> @@ -313,6 +333,7 @@ static QEMUMachine pc_q35_machine_v1_4 = {
>
> static void pc_q35_machine_init(void)
> {
> + qemu_register_machine(&pc_q35_machine_v1_8);
> qemu_register_machine(&pc_q35_machine_v1_7);
> qemu_register_machine(&pc_q35_machine_v1_6);
> qemu_register_machine(&pc_q35_machine_v1_5);
>
^ permalink raw reply [flat|nested] 11+ messages in thread* Re: [Qemu-devel] [PATCH v2] pc: add 1.8 machine type
2013-11-14 10:37 [Qemu-devel] [PATCH v2] pc: add 1.8 machine type Michael S. Tsirkin
2013-11-14 10:39 ` Paolo Bonzini
2013-11-15 15:27 ` Vlad Yasevich
@ 2013-12-05 17:53 ` Paolo Bonzini
2013-12-05 19:16 ` Eric Blake
2013-12-08 11:21 ` Michael S. Tsirkin
2 siblings, 2 replies; 11+ messages in thread
From: Paolo Bonzini @ 2013-12-05 17:53 UTC (permalink / raw)
To: Michael S. Tsirkin
Cc: Andreas Färber, Eduardo Habkost, Anthony Liguori, qemu-devel
Il 14/11/2013 11:37, Michael S. Tsirkin ha scritto:
> Several changes that affect compatibility between 1.8 and 1.7 are
> already planned, so we need pc compat structures in place.
>
> Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Is this patch in any tree? Also, you mentioned you would pick up
Marcelo's 1GB alignment patch.
Thanks,
Paolo
>
> Changes from v1:
> make 1.6 call 1.7 as suggested by Paolo
>
> hw/i386/pc_piix.c | 30 +++++++++++++++++++++++++-----
> hw/i386/pc_q35.c | 27 ++++++++++++++++++++++++---
> 2 files changed, 49 insertions(+), 8 deletions(-)
>
> diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c
> index 049f216..b6347e2 100644
> --- a/hw/i386/pc_piix.c
> +++ b/hw/i386/pc_piix.c
> @@ -238,8 +238,13 @@ static void pc_init_pci(QEMUMachineInitArgs *args)
> pc_init1(args, 1, 1);
> }
>
> +static void pc_compat_1_7(QEMUMachineInitArgs *args)
> +{
> +}
> +
> static void pc_compat_1_6(QEMUMachineInitArgs *args)
> {
> + pc_compat_1_6(args);
> has_pci_info = false;
> rom_file_in_ram = false;
> has_acpi_build = false;
> @@ -272,6 +277,12 @@ static void pc_compat_1_2(QEMUMachineInitArgs *args)
> disable_kvm_pv_eoi();
> }
>
> +static void pc_init_pci_1_7(QEMUMachineInitArgs *args)
> +{
> + pc_compat_1_7(args);
> + pc_init_pci(args);
> +}
> +
> static void pc_init_pci_1_6(QEMUMachineInitArgs *args)
> {
> pc_compat_1_6(args);
> @@ -344,16 +355,24 @@ static void pc_xen_hvm_init(QEMUMachineInitArgs *args)
> .desc = "Standard PC (i440FX + PIIX, 1996)", \
> .hot_add_cpu = pc_hot_add_cpu
>
> -#define PC_I440FX_1_7_MACHINE_OPTIONS PC_I440FX_MACHINE_OPTIONS
> -static QEMUMachine pc_i440fx_machine_v1_7 = {
> - PC_I440FX_1_7_MACHINE_OPTIONS,
> - .name = "pc-i440fx-1.7",
> +
> +#define PC_I440FX_1_8_MACHINE_OPTIONS PC_I440FX_MACHINE_OPTIONS
> +static QEMUMachine pc_i440fx_machine_v1_8 = {
> + PC_I440FX_1_8_MACHINE_OPTIONS,
> + .name = "pc-i440fx-1.8",
> .alias = "pc",
> .init = pc_init_pci,
> .is_default = 1,
> };
>
> -#define PC_I440FX_1_6_MACHINE_OPTIONS PC_I440FX_MACHINE_OPTIONS
> +#define PC_I440FX_1_7_MACHINE_OPTIONS PC_I440FX_1_8_MACHINE_OPTIONS
> +static QEMUMachine pc_i440fx_machine_v1_7 = {
> + PC_I440FX_1_7_MACHINE_OPTIONS,
> + .name = "pc-i440fx-1.7",
> + .init = pc_init_pci_1_7,
> +};
> +
> +#define PC_I440FX_1_6_MACHINE_OPTIONS PC_I440FX_1_7_MACHINE_OPTIONS
>
> static QEMUMachine pc_i440fx_machine_v1_6 = {
> PC_I440FX_1_6_MACHINE_OPTIONS,
> @@ -752,6 +771,7 @@ static QEMUMachine xenfv_machine = {
>
> static void pc_machine_init(void)
> {
> + qemu_register_machine(&pc_i440fx_machine_v1_8);
> qemu_register_machine(&pc_i440fx_machine_v1_7);
> qemu_register_machine(&pc_i440fx_machine_v1_6);
> qemu_register_machine(&pc_i440fx_machine_v1_5);
> diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c
> index d297000..9f3876f 100644
> --- a/hw/i386/pc_q35.c
> +++ b/hw/i386/pc_q35.c
> @@ -222,8 +222,13 @@ static void pc_q35_init(QEMUMachineInitArgs *args)
> }
> }
>
> +static void pc_compat_1_7(QEMUMachineInitArgs *args)
> +{
> +}
> +
> static void pc_compat_1_6(QEMUMachineInitArgs *args)
> {
> + pc_compat_1_7(args);
> has_pci_info = false;
> rom_file_in_ram = false;
> has_acpi_build = false;
> @@ -243,6 +248,12 @@ static void pc_compat_1_4(QEMUMachineInitArgs *args)
> x86_cpu_compat_set_features("Westmere", FEAT_1_ECX, 0, CPUID_EXT_PCLMULQDQ);
> }
>
> +static void pc_q35_init_1_7(QEMUMachineInitArgs *args)
> +{
> + pc_compat_1_7(args);
> + pc_q35_init(args);
> +}
> +
> static void pc_q35_init_1_6(QEMUMachineInitArgs *args)
> {
> pc_compat_1_6(args);
> @@ -266,16 +277,25 @@ static void pc_q35_init_1_4(QEMUMachineInitArgs *args)
> .desc = "Standard PC (Q35 + ICH9, 2009)", \
> .hot_add_cpu = pc_hot_add_cpu
>
> -#define PC_Q35_1_7_MACHINE_OPTIONS PC_Q35_MACHINE_OPTIONS
> +#define PC_Q35_1_8_MACHINE_OPTIONS PC_Q35_MACHINE_OPTIONS
> +
> +static QEMUMachine pc_q35_machine_v1_8 = {
> + PC_Q35_1_8_MACHINE_OPTIONS,
> + .name = "pc-q35-1.8",
> + .alias = "q35",
> + .init = pc_q35_init,
> +};
> +
> +#define PC_Q35_1_7_MACHINE_OPTIONS PC_Q35_1_8_MACHINE_OPTIONS
>
> static QEMUMachine pc_q35_machine_v1_7 = {
> PC_Q35_1_7_MACHINE_OPTIONS,
> .name = "pc-q35-1.7",
> .alias = "q35",
> - .init = pc_q35_init,
> + .init = pc_q35_init_1_7,
> };
>
> -#define PC_Q35_1_6_MACHINE_OPTIONS PC_Q35_MACHINE_OPTIONS
> +#define PC_Q35_1_6_MACHINE_OPTIONS PC_Q35_1_7_MACHINE_OPTIONS
>
> static QEMUMachine pc_q35_machine_v1_6 = {
> PC_Q35_1_6_MACHINE_OPTIONS,
> @@ -313,6 +333,7 @@ static QEMUMachine pc_q35_machine_v1_4 = {
>
> static void pc_q35_machine_init(void)
> {
> + qemu_register_machine(&pc_q35_machine_v1_8);
> qemu_register_machine(&pc_q35_machine_v1_7);
> qemu_register_machine(&pc_q35_machine_v1_6);
> qemu_register_machine(&pc_q35_machine_v1_5);
>
^ permalink raw reply [flat|nested] 11+ messages in thread* Re: [Qemu-devel] [PATCH v2] pc: add 1.8 machine type
2013-12-05 17:53 ` Paolo Bonzini
@ 2013-12-05 19:16 ` Eric Blake
2013-12-08 11:21 ` Michael S. Tsirkin
1 sibling, 0 replies; 11+ messages in thread
From: Eric Blake @ 2013-12-05 19:16 UTC (permalink / raw)
To: Paolo Bonzini, Michael S. Tsirkin
Cc: qemu-devel, Andreas Färber, Anthony Liguori, Eduardo Habkost
[-- Attachment #1: Type: text/plain, Size: 534 bytes --]
On 12/05/2013 10:53 AM, Paolo Bonzini wrote:
> Il 14/11/2013 11:37, Michael S. Tsirkin ha scritto:
>> Several changes that affect compatibility between 1.8 and 1.7 are
>> already planned, so we need pc compat structures in place.
>>
>> Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
>
> Is this patch in any tree?
And shouldn't it be rebased to use a 2.0 machine type, since we aren't
doing a 1.8 release?
--
Eric Blake eblake redhat com +1-919-301-3266
Libvirt virtualization library http://libvirt.org
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 621 bytes --]
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [Qemu-devel] [PATCH v2] pc: add 1.8 machine type
2013-12-05 17:53 ` Paolo Bonzini
2013-12-05 19:16 ` Eric Blake
@ 2013-12-08 11:21 ` Michael S. Tsirkin
2013-12-09 8:38 ` Paolo Bonzini
1 sibling, 1 reply; 11+ messages in thread
From: Michael S. Tsirkin @ 2013-12-08 11:21 UTC (permalink / raw)
To: Paolo Bonzini
Cc: Andreas Färber, Eduardo Habkost, Anthony Liguori, qemu-devel
On Thu, Dec 05, 2013 at 06:53:50PM +0100, Paolo Bonzini wrote:
> Il 14/11/2013 11:37, Michael S. Tsirkin ha scritto:
> > Several changes that affect compatibility between 1.8 and 1.7 are
> > already planned, so we need pc compat structures in place.
> >
> > Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
>
> Is this patch in any tree? Also, you mentioned you would pick up
> Marcelo's 1GB alignment patch.
>
> Thanks,
>
> Paolo
Both are in my PCI tree.
> >
> > Changes from v1:
> > make 1.6 call 1.7 as suggested by Paolo
> >
> > hw/i386/pc_piix.c | 30 +++++++++++++++++++++++++-----
> > hw/i386/pc_q35.c | 27 ++++++++++++++++++++++++---
> > 2 files changed, 49 insertions(+), 8 deletions(-)
> >
> > diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c
> > index 049f216..b6347e2 100644
> > --- a/hw/i386/pc_piix.c
> > +++ b/hw/i386/pc_piix.c
> > @@ -238,8 +238,13 @@ static void pc_init_pci(QEMUMachineInitArgs *args)
> > pc_init1(args, 1, 1);
> > }
> >
> > +static void pc_compat_1_7(QEMUMachineInitArgs *args)
> > +{
> > +}
> > +
> > static void pc_compat_1_6(QEMUMachineInitArgs *args)
> > {
> > + pc_compat_1_6(args);
> > has_pci_info = false;
> > rom_file_in_ram = false;
> > has_acpi_build = false;
> > @@ -272,6 +277,12 @@ static void pc_compat_1_2(QEMUMachineInitArgs *args)
> > disable_kvm_pv_eoi();
> > }
> >
> > +static void pc_init_pci_1_7(QEMUMachineInitArgs *args)
> > +{
> > + pc_compat_1_7(args);
> > + pc_init_pci(args);
> > +}
> > +
> > static void pc_init_pci_1_6(QEMUMachineInitArgs *args)
> > {
> > pc_compat_1_6(args);
> > @@ -344,16 +355,24 @@ static void pc_xen_hvm_init(QEMUMachineInitArgs *args)
> > .desc = "Standard PC (i440FX + PIIX, 1996)", \
> > .hot_add_cpu = pc_hot_add_cpu
> >
> > -#define PC_I440FX_1_7_MACHINE_OPTIONS PC_I440FX_MACHINE_OPTIONS
> > -static QEMUMachine pc_i440fx_machine_v1_7 = {
> > - PC_I440FX_1_7_MACHINE_OPTIONS,
> > - .name = "pc-i440fx-1.7",
> > +
> > +#define PC_I440FX_1_8_MACHINE_OPTIONS PC_I440FX_MACHINE_OPTIONS
> > +static QEMUMachine pc_i440fx_machine_v1_8 = {
> > + PC_I440FX_1_8_MACHINE_OPTIONS,
> > + .name = "pc-i440fx-1.8",
> > .alias = "pc",
> > .init = pc_init_pci,
> > .is_default = 1,
> > };
> >
> > -#define PC_I440FX_1_6_MACHINE_OPTIONS PC_I440FX_MACHINE_OPTIONS
> > +#define PC_I440FX_1_7_MACHINE_OPTIONS PC_I440FX_1_8_MACHINE_OPTIONS
> > +static QEMUMachine pc_i440fx_machine_v1_7 = {
> > + PC_I440FX_1_7_MACHINE_OPTIONS,
> > + .name = "pc-i440fx-1.7",
> > + .init = pc_init_pci_1_7,
> > +};
> > +
> > +#define PC_I440FX_1_6_MACHINE_OPTIONS PC_I440FX_1_7_MACHINE_OPTIONS
> >
> > static QEMUMachine pc_i440fx_machine_v1_6 = {
> > PC_I440FX_1_6_MACHINE_OPTIONS,
> > @@ -752,6 +771,7 @@ static QEMUMachine xenfv_machine = {
> >
> > static void pc_machine_init(void)
> > {
> > + qemu_register_machine(&pc_i440fx_machine_v1_8);
> > qemu_register_machine(&pc_i440fx_machine_v1_7);
> > qemu_register_machine(&pc_i440fx_machine_v1_6);
> > qemu_register_machine(&pc_i440fx_machine_v1_5);
> > diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c
> > index d297000..9f3876f 100644
> > --- a/hw/i386/pc_q35.c
> > +++ b/hw/i386/pc_q35.c
> > @@ -222,8 +222,13 @@ static void pc_q35_init(QEMUMachineInitArgs *args)
> > }
> > }
> >
> > +static void pc_compat_1_7(QEMUMachineInitArgs *args)
> > +{
> > +}
> > +
> > static void pc_compat_1_6(QEMUMachineInitArgs *args)
> > {
> > + pc_compat_1_7(args);
> > has_pci_info = false;
> > rom_file_in_ram = false;
> > has_acpi_build = false;
> > @@ -243,6 +248,12 @@ static void pc_compat_1_4(QEMUMachineInitArgs *args)
> > x86_cpu_compat_set_features("Westmere", FEAT_1_ECX, 0, CPUID_EXT_PCLMULQDQ);
> > }
> >
> > +static void pc_q35_init_1_7(QEMUMachineInitArgs *args)
> > +{
> > + pc_compat_1_7(args);
> > + pc_q35_init(args);
> > +}
> > +
> > static void pc_q35_init_1_6(QEMUMachineInitArgs *args)
> > {
> > pc_compat_1_6(args);
> > @@ -266,16 +277,25 @@ static void pc_q35_init_1_4(QEMUMachineInitArgs *args)
> > .desc = "Standard PC (Q35 + ICH9, 2009)", \
> > .hot_add_cpu = pc_hot_add_cpu
> >
> > -#define PC_Q35_1_7_MACHINE_OPTIONS PC_Q35_MACHINE_OPTIONS
> > +#define PC_Q35_1_8_MACHINE_OPTIONS PC_Q35_MACHINE_OPTIONS
> > +
> > +static QEMUMachine pc_q35_machine_v1_8 = {
> > + PC_Q35_1_8_MACHINE_OPTIONS,
> > + .name = "pc-q35-1.8",
> > + .alias = "q35",
> > + .init = pc_q35_init,
> > +};
> > +
> > +#define PC_Q35_1_7_MACHINE_OPTIONS PC_Q35_1_8_MACHINE_OPTIONS
> >
> > static QEMUMachine pc_q35_machine_v1_7 = {
> > PC_Q35_1_7_MACHINE_OPTIONS,
> > .name = "pc-q35-1.7",
> > .alias = "q35",
> > - .init = pc_q35_init,
> > + .init = pc_q35_init_1_7,
> > };
> >
> > -#define PC_Q35_1_6_MACHINE_OPTIONS PC_Q35_MACHINE_OPTIONS
> > +#define PC_Q35_1_6_MACHINE_OPTIONS PC_Q35_1_7_MACHINE_OPTIONS
> >
> > static QEMUMachine pc_q35_machine_v1_6 = {
> > PC_Q35_1_6_MACHINE_OPTIONS,
> > @@ -313,6 +333,7 @@ static QEMUMachine pc_q35_machine_v1_4 = {
> >
> > static void pc_q35_machine_init(void)
> > {
> > + qemu_register_machine(&pc_q35_machine_v1_8);
> > qemu_register_machine(&pc_q35_machine_v1_7);
> > qemu_register_machine(&pc_q35_machine_v1_6);
> > qemu_register_machine(&pc_q35_machine_v1_5);
> >
^ permalink raw reply [flat|nested] 11+ messages in thread* Re: [Qemu-devel] [PATCH v2] pc: add 1.8 machine type
2013-12-08 11:21 ` Michael S. Tsirkin
@ 2013-12-09 8:38 ` Paolo Bonzini
2013-12-09 10:24 ` Michael S. Tsirkin
0 siblings, 1 reply; 11+ messages in thread
From: Paolo Bonzini @ 2013-12-09 8:38 UTC (permalink / raw)
To: Michael S. Tsirkin
Cc: qemu-devel, Andreas Färber, Anthony Liguori, Eduardo Habkost
Il 08/12/2013 12:21, Michael S. Tsirkin ha scritto:
> On Thu, Dec 05, 2013 at 06:53:50PM +0100, Paolo Bonzini wrote:
>> Il 14/11/2013 11:37, Michael S. Tsirkin ha scritto:
>>> Several changes that affect compatibility between 1.8 and 1.7 are
>>> already planned, so we need pc compat structures in place.
>>>
>>> Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
>>
>> Is this patch in any tree? Also, you mentioned you would pick up
>> Marcelo's 1GB alignment patch.
>>
>> Thanks,
>>
>> Paolo
>
> Both are in my PCI tree.
git://github.com/mstsirkin/qemu.git doesn't have it, are you missing a push?
Paolo
>>>
>>> Changes from v1:
>>> make 1.6 call 1.7 as suggested by Paolo
>>>
>>> hw/i386/pc_piix.c | 30 +++++++++++++++++++++++++-----
>>> hw/i386/pc_q35.c | 27 ++++++++++++++++++++++++---
>>> 2 files changed, 49 insertions(+), 8 deletions(-)
>>>
>>> diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c
>>> index 049f216..b6347e2 100644
>>> --- a/hw/i386/pc_piix.c
>>> +++ b/hw/i386/pc_piix.c
>>> @@ -238,8 +238,13 @@ static void pc_init_pci(QEMUMachineInitArgs *args)
>>> pc_init1(args, 1, 1);
>>> }
>>>
>>> +static void pc_compat_1_7(QEMUMachineInitArgs *args)
>>> +{
>>> +}
>>> +
>>> static void pc_compat_1_6(QEMUMachineInitArgs *args)
>>> {
>>> + pc_compat_1_6(args);
>>> has_pci_info = false;
>>> rom_file_in_ram = false;
>>> has_acpi_build = false;
>>> @@ -272,6 +277,12 @@ static void pc_compat_1_2(QEMUMachineInitArgs *args)
>>> disable_kvm_pv_eoi();
>>> }
>>>
>>> +static void pc_init_pci_1_7(QEMUMachineInitArgs *args)
>>> +{
>>> + pc_compat_1_7(args);
>>> + pc_init_pci(args);
>>> +}
>>> +
>>> static void pc_init_pci_1_6(QEMUMachineInitArgs *args)
>>> {
>>> pc_compat_1_6(args);
>>> @@ -344,16 +355,24 @@ static void pc_xen_hvm_init(QEMUMachineInitArgs *args)
>>> .desc = "Standard PC (i440FX + PIIX, 1996)", \
>>> .hot_add_cpu = pc_hot_add_cpu
>>>
>>> -#define PC_I440FX_1_7_MACHINE_OPTIONS PC_I440FX_MACHINE_OPTIONS
>>> -static QEMUMachine pc_i440fx_machine_v1_7 = {
>>> - PC_I440FX_1_7_MACHINE_OPTIONS,
>>> - .name = "pc-i440fx-1.7",
>>> +
>>> +#define PC_I440FX_1_8_MACHINE_OPTIONS PC_I440FX_MACHINE_OPTIONS
>>> +static QEMUMachine pc_i440fx_machine_v1_8 = {
>>> + PC_I440FX_1_8_MACHINE_OPTIONS,
>>> + .name = "pc-i440fx-1.8",
>>> .alias = "pc",
>>> .init = pc_init_pci,
>>> .is_default = 1,
>>> };
>>>
>>> -#define PC_I440FX_1_6_MACHINE_OPTIONS PC_I440FX_MACHINE_OPTIONS
>>> +#define PC_I440FX_1_7_MACHINE_OPTIONS PC_I440FX_1_8_MACHINE_OPTIONS
>>> +static QEMUMachine pc_i440fx_machine_v1_7 = {
>>> + PC_I440FX_1_7_MACHINE_OPTIONS,
>>> + .name = "pc-i440fx-1.7",
>>> + .init = pc_init_pci_1_7,
>>> +};
>>> +
>>> +#define PC_I440FX_1_6_MACHINE_OPTIONS PC_I440FX_1_7_MACHINE_OPTIONS
>>>
>>> static QEMUMachine pc_i440fx_machine_v1_6 = {
>>> PC_I440FX_1_6_MACHINE_OPTIONS,
>>> @@ -752,6 +771,7 @@ static QEMUMachine xenfv_machine = {
>>>
>>> static void pc_machine_init(void)
>>> {
>>> + qemu_register_machine(&pc_i440fx_machine_v1_8);
>>> qemu_register_machine(&pc_i440fx_machine_v1_7);
>>> qemu_register_machine(&pc_i440fx_machine_v1_6);
>>> qemu_register_machine(&pc_i440fx_machine_v1_5);
>>> diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c
>>> index d297000..9f3876f 100644
>>> --- a/hw/i386/pc_q35.c
>>> +++ b/hw/i386/pc_q35.c
>>> @@ -222,8 +222,13 @@ static void pc_q35_init(QEMUMachineInitArgs *args)
>>> }
>>> }
>>>
>>> +static void pc_compat_1_7(QEMUMachineInitArgs *args)
>>> +{
>>> +}
>>> +
>>> static void pc_compat_1_6(QEMUMachineInitArgs *args)
>>> {
>>> + pc_compat_1_7(args);
>>> has_pci_info = false;
>>> rom_file_in_ram = false;
>>> has_acpi_build = false;
>>> @@ -243,6 +248,12 @@ static void pc_compat_1_4(QEMUMachineInitArgs *args)
>>> x86_cpu_compat_set_features("Westmere", FEAT_1_ECX, 0, CPUID_EXT_PCLMULQDQ);
>>> }
>>>
>>> +static void pc_q35_init_1_7(QEMUMachineInitArgs *args)
>>> +{
>>> + pc_compat_1_7(args);
>>> + pc_q35_init(args);
>>> +}
>>> +
>>> static void pc_q35_init_1_6(QEMUMachineInitArgs *args)
>>> {
>>> pc_compat_1_6(args);
>>> @@ -266,16 +277,25 @@ static void pc_q35_init_1_4(QEMUMachineInitArgs *args)
>>> .desc = "Standard PC (Q35 + ICH9, 2009)", \
>>> .hot_add_cpu = pc_hot_add_cpu
>>>
>>> -#define PC_Q35_1_7_MACHINE_OPTIONS PC_Q35_MACHINE_OPTIONS
>>> +#define PC_Q35_1_8_MACHINE_OPTIONS PC_Q35_MACHINE_OPTIONS
>>> +
>>> +static QEMUMachine pc_q35_machine_v1_8 = {
>>> + PC_Q35_1_8_MACHINE_OPTIONS,
>>> + .name = "pc-q35-1.8",
>>> + .alias = "q35",
>>> + .init = pc_q35_init,
>>> +};
>>> +
>>> +#define PC_Q35_1_7_MACHINE_OPTIONS PC_Q35_1_8_MACHINE_OPTIONS
>>>
>>> static QEMUMachine pc_q35_machine_v1_7 = {
>>> PC_Q35_1_7_MACHINE_OPTIONS,
>>> .name = "pc-q35-1.7",
>>> .alias = "q35",
>>> - .init = pc_q35_init,
>>> + .init = pc_q35_init_1_7,
>>> };
>>>
>>> -#define PC_Q35_1_6_MACHINE_OPTIONS PC_Q35_MACHINE_OPTIONS
>>> +#define PC_Q35_1_6_MACHINE_OPTIONS PC_Q35_1_7_MACHINE_OPTIONS
>>>
>>> static QEMUMachine pc_q35_machine_v1_6 = {
>>> PC_Q35_1_6_MACHINE_OPTIONS,
>>> @@ -313,6 +333,7 @@ static QEMUMachine pc_q35_machine_v1_4 = {
>>>
>>> static void pc_q35_machine_init(void)
>>> {
>>> + qemu_register_machine(&pc_q35_machine_v1_8);
>>> qemu_register_machine(&pc_q35_machine_v1_7);
>>> qemu_register_machine(&pc_q35_machine_v1_6);
>>> qemu_register_machine(&pc_q35_machine_v1_5);
>>>
>
>
^ permalink raw reply [flat|nested] 11+ messages in thread* Re: [Qemu-devel] [PATCH v2] pc: add 1.8 machine type
2013-12-09 8:38 ` Paolo Bonzini
@ 2013-12-09 10:24 ` Michael S. Tsirkin
2013-12-09 10:49 ` Paolo Bonzini
0 siblings, 1 reply; 11+ messages in thread
From: Michael S. Tsirkin @ 2013-12-09 10:24 UTC (permalink / raw)
To: Paolo Bonzini
Cc: qemu-devel, Andreas Färber, Anthony Liguori, Eduardo Habkost
On Mon, Dec 09, 2013 at 09:38:47AM +0100, Paolo Bonzini wrote:
> Il 08/12/2013 12:21, Michael S. Tsirkin ha scritto:
> > On Thu, Dec 05, 2013 at 06:53:50PM +0100, Paolo Bonzini wrote:
> >> Il 14/11/2013 11:37, Michael S. Tsirkin ha scritto:
> >>> Several changes that affect compatibility between 1.8 and 1.7 are
> >>> already planned, so we need pc compat structures in place.
> >>>
> >>> Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
> >>
> >> Is this patch in any tree? Also, you mentioned you would pick up
> >> Marcelo's 1GB alignment patch.
> >>
> >> Thanks,
> >>
> >> Paolo
> >
> > Both are in my PCI tree.
>
> git://github.com/mstsirkin/qemu.git doesn't have it, are you missing a push?
>
> Paolo
My tree is here:
git://git.kernel.org/pub/scm/virt/kvm/mst/qemu.git pci
> >>>
> >>> Changes from v1:
> >>> make 1.6 call 1.7 as suggested by Paolo
> >>>
> >>> hw/i386/pc_piix.c | 30 +++++++++++++++++++++++++-----
> >>> hw/i386/pc_q35.c | 27 ++++++++++++++++++++++++---
> >>> 2 files changed, 49 insertions(+), 8 deletions(-)
> >>>
> >>> diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c
> >>> index 049f216..b6347e2 100644
> >>> --- a/hw/i386/pc_piix.c
> >>> +++ b/hw/i386/pc_piix.c
> >>> @@ -238,8 +238,13 @@ static void pc_init_pci(QEMUMachineInitArgs *args)
> >>> pc_init1(args, 1, 1);
> >>> }
> >>>
> >>> +static void pc_compat_1_7(QEMUMachineInitArgs *args)
> >>> +{
> >>> +}
> >>> +
> >>> static void pc_compat_1_6(QEMUMachineInitArgs *args)
> >>> {
> >>> + pc_compat_1_6(args);
> >>> has_pci_info = false;
> >>> rom_file_in_ram = false;
> >>> has_acpi_build = false;
> >>> @@ -272,6 +277,12 @@ static void pc_compat_1_2(QEMUMachineInitArgs *args)
> >>> disable_kvm_pv_eoi();
> >>> }
> >>>
> >>> +static void pc_init_pci_1_7(QEMUMachineInitArgs *args)
> >>> +{
> >>> + pc_compat_1_7(args);
> >>> + pc_init_pci(args);
> >>> +}
> >>> +
> >>> static void pc_init_pci_1_6(QEMUMachineInitArgs *args)
> >>> {
> >>> pc_compat_1_6(args);
> >>> @@ -344,16 +355,24 @@ static void pc_xen_hvm_init(QEMUMachineInitArgs *args)
> >>> .desc = "Standard PC (i440FX + PIIX, 1996)", \
> >>> .hot_add_cpu = pc_hot_add_cpu
> >>>
> >>> -#define PC_I440FX_1_7_MACHINE_OPTIONS PC_I440FX_MACHINE_OPTIONS
> >>> -static QEMUMachine pc_i440fx_machine_v1_7 = {
> >>> - PC_I440FX_1_7_MACHINE_OPTIONS,
> >>> - .name = "pc-i440fx-1.7",
> >>> +
> >>> +#define PC_I440FX_1_8_MACHINE_OPTIONS PC_I440FX_MACHINE_OPTIONS
> >>> +static QEMUMachine pc_i440fx_machine_v1_8 = {
> >>> + PC_I440FX_1_8_MACHINE_OPTIONS,
> >>> + .name = "pc-i440fx-1.8",
> >>> .alias = "pc",
> >>> .init = pc_init_pci,
> >>> .is_default = 1,
> >>> };
> >>>
> >>> -#define PC_I440FX_1_6_MACHINE_OPTIONS PC_I440FX_MACHINE_OPTIONS
> >>> +#define PC_I440FX_1_7_MACHINE_OPTIONS PC_I440FX_1_8_MACHINE_OPTIONS
> >>> +static QEMUMachine pc_i440fx_machine_v1_7 = {
> >>> + PC_I440FX_1_7_MACHINE_OPTIONS,
> >>> + .name = "pc-i440fx-1.7",
> >>> + .init = pc_init_pci_1_7,
> >>> +};
> >>> +
> >>> +#define PC_I440FX_1_6_MACHINE_OPTIONS PC_I440FX_1_7_MACHINE_OPTIONS
> >>>
> >>> static QEMUMachine pc_i440fx_machine_v1_6 = {
> >>> PC_I440FX_1_6_MACHINE_OPTIONS,
> >>> @@ -752,6 +771,7 @@ static QEMUMachine xenfv_machine = {
> >>>
> >>> static void pc_machine_init(void)
> >>> {
> >>> + qemu_register_machine(&pc_i440fx_machine_v1_8);
> >>> qemu_register_machine(&pc_i440fx_machine_v1_7);
> >>> qemu_register_machine(&pc_i440fx_machine_v1_6);
> >>> qemu_register_machine(&pc_i440fx_machine_v1_5);
> >>> diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c
> >>> index d297000..9f3876f 100644
> >>> --- a/hw/i386/pc_q35.c
> >>> +++ b/hw/i386/pc_q35.c
> >>> @@ -222,8 +222,13 @@ static void pc_q35_init(QEMUMachineInitArgs *args)
> >>> }
> >>> }
> >>>
> >>> +static void pc_compat_1_7(QEMUMachineInitArgs *args)
> >>> +{
> >>> +}
> >>> +
> >>> static void pc_compat_1_6(QEMUMachineInitArgs *args)
> >>> {
> >>> + pc_compat_1_7(args);
> >>> has_pci_info = false;
> >>> rom_file_in_ram = false;
> >>> has_acpi_build = false;
> >>> @@ -243,6 +248,12 @@ static void pc_compat_1_4(QEMUMachineInitArgs *args)
> >>> x86_cpu_compat_set_features("Westmere", FEAT_1_ECX, 0, CPUID_EXT_PCLMULQDQ);
> >>> }
> >>>
> >>> +static void pc_q35_init_1_7(QEMUMachineInitArgs *args)
> >>> +{
> >>> + pc_compat_1_7(args);
> >>> + pc_q35_init(args);
> >>> +}
> >>> +
> >>> static void pc_q35_init_1_6(QEMUMachineInitArgs *args)
> >>> {
> >>> pc_compat_1_6(args);
> >>> @@ -266,16 +277,25 @@ static void pc_q35_init_1_4(QEMUMachineInitArgs *args)
> >>> .desc = "Standard PC (Q35 + ICH9, 2009)", \
> >>> .hot_add_cpu = pc_hot_add_cpu
> >>>
> >>> -#define PC_Q35_1_7_MACHINE_OPTIONS PC_Q35_MACHINE_OPTIONS
> >>> +#define PC_Q35_1_8_MACHINE_OPTIONS PC_Q35_MACHINE_OPTIONS
> >>> +
> >>> +static QEMUMachine pc_q35_machine_v1_8 = {
> >>> + PC_Q35_1_8_MACHINE_OPTIONS,
> >>> + .name = "pc-q35-1.8",
> >>> + .alias = "q35",
> >>> + .init = pc_q35_init,
> >>> +};
> >>> +
> >>> +#define PC_Q35_1_7_MACHINE_OPTIONS PC_Q35_1_8_MACHINE_OPTIONS
> >>>
> >>> static QEMUMachine pc_q35_machine_v1_7 = {
> >>> PC_Q35_1_7_MACHINE_OPTIONS,
> >>> .name = "pc-q35-1.7",
> >>> .alias = "q35",
> >>> - .init = pc_q35_init,
> >>> + .init = pc_q35_init_1_7,
> >>> };
> >>>
> >>> -#define PC_Q35_1_6_MACHINE_OPTIONS PC_Q35_MACHINE_OPTIONS
> >>> +#define PC_Q35_1_6_MACHINE_OPTIONS PC_Q35_1_7_MACHINE_OPTIONS
> >>>
> >>> static QEMUMachine pc_q35_machine_v1_6 = {
> >>> PC_Q35_1_6_MACHINE_OPTIONS,
> >>> @@ -313,6 +333,7 @@ static QEMUMachine pc_q35_machine_v1_4 = {
> >>>
> >>> static void pc_q35_machine_init(void)
> >>> {
> >>> + qemu_register_machine(&pc_q35_machine_v1_8);
> >>> qemu_register_machine(&pc_q35_machine_v1_7);
> >>> qemu_register_machine(&pc_q35_machine_v1_6);
> >>> qemu_register_machine(&pc_q35_machine_v1_5);
> >>>
> >
> >
^ permalink raw reply [flat|nested] 11+ messages in thread* Re: [Qemu-devel] [PATCH v2] pc: add 1.8 machine type
2013-12-09 10:24 ` Michael S. Tsirkin
@ 2013-12-09 10:49 ` Paolo Bonzini
2013-12-09 11:05 ` Michael S. Tsirkin
2013-12-10 9:47 ` Gerd Hoffmann
0 siblings, 2 replies; 11+ messages in thread
From: Paolo Bonzini @ 2013-12-09 10:49 UTC (permalink / raw)
To: Michael S. Tsirkin
Cc: Eduardo Habkost, qemu-devel, Anthony Liguori, Andreas Färber
Il 09/12/2013 11:24, Michael S. Tsirkin ha scritto:
> > > Both are in my PCI tree.
> >
> > git://github.com/mstsirkin/qemu.git doesn't have it, are you missing a push?
>
> My tree is here:
> git://git.kernel.org/pub/scm/virt/kvm/mst/qemu.git pci
Thanks. Can you please add it to MAINTAINERS?
You still need to change 1.8 to 2.0 in the patch.
Paolo
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [Qemu-devel] [PATCH v2] pc: add 1.8 machine type
2013-12-09 10:49 ` Paolo Bonzini
@ 2013-12-09 11:05 ` Michael S. Tsirkin
2013-12-10 9:47 ` Gerd Hoffmann
1 sibling, 0 replies; 11+ messages in thread
From: Michael S. Tsirkin @ 2013-12-09 11:05 UTC (permalink / raw)
To: Paolo Bonzini
Cc: Eduardo Habkost, qemu-devel, Anthony Liguori, Andreas Färber
On Mon, Dec 09, 2013 at 11:49:42AM +0100, Paolo Bonzini wrote:
> Il 09/12/2013 11:24, Michael S. Tsirkin ha scritto:
> > > > Both are in my PCI tree.
> > >
> > > git://github.com/mstsirkin/qemu.git doesn't have it, are you missing a push?
> >
> > My tree is here:
> > git://git.kernel.org/pub/scm/virt/kvm/mst/qemu.git pci
>
> Thanks. Can you please add it to MAINTAINERS?
>
> You still need to change 1.8 to 2.0 in the patch.
>
> Paolo
Will do. Thanks!
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [Qemu-devel] [PATCH v2] pc: add 1.8 machine type
2013-12-09 10:49 ` Paolo Bonzini
2013-12-09 11:05 ` Michael S. Tsirkin
@ 2013-12-10 9:47 ` Gerd Hoffmann
1 sibling, 0 replies; 11+ messages in thread
From: Gerd Hoffmann @ 2013-12-10 9:47 UTC (permalink / raw)
To: Paolo Bonzini
Cc: qemu-devel, Andreas Färber, Eduardo Habkost, Anthony Liguori,
Michael S. Tsirkin
On Mo, 2013-12-09 at 11:49 +0100, Paolo Bonzini wrote:
> Il 09/12/2013 11:24, Michael S. Tsirkin ha scritto:
> > > > Both are in my PCI tree.
> > >
> > > git://github.com/mstsirkin/qemu.git doesn't have it, are you missing a push?
> >
> > My tree is here:
> > git://git.kernel.org/pub/scm/virt/kvm/mst/qemu.git pci
>
> Thanks. Can you please add it to MAINTAINERS?
>
> You still need to change 1.8 to 2.0 in the patch.
We have 2.0 machine types meanwhile (seabios update brought them in as
we can use the big bios for 2.0 only).
cheers,
Gerd
^ permalink raw reply [flat|nested] 11+ messages in thread
end of thread, other threads:[~2013-12-10 9:47 UTC | newest]
Thread overview: 11+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-11-14 10:37 [Qemu-devel] [PATCH v2] pc: add 1.8 machine type Michael S. Tsirkin
2013-11-14 10:39 ` Paolo Bonzini
2013-11-15 15:27 ` Vlad Yasevich
2013-12-05 17:53 ` Paolo Bonzini
2013-12-05 19:16 ` Eric Blake
2013-12-08 11:21 ` Michael S. Tsirkin
2013-12-09 8:38 ` Paolo Bonzini
2013-12-09 10:24 ` Michael S. Tsirkin
2013-12-09 10:49 ` Paolo Bonzini
2013-12-09 11:05 ` Michael S. Tsirkin
2013-12-10 9:47 ` Gerd Hoffmann
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).