Patchwork [v2,1/3] pc: Bump up pc version to 0.13 and add a 0.12 compat version

login
register
mail settings
Submitter Amit Shah
Date Feb. 15, 2010, 3:13 p.m.
Message ID <1266246836-19932-1-git-send-email-amit.shah@redhat.com>
Download mbox | patch
Permalink /patch/45394/
State New
Headers show

Comments

Amit Shah - Feb. 15, 2010, 3:13 p.m.
The version 0.13 will be the new default and compatibility options will
be added to the 0.12 version.

Signed-off-by: Amit Shah <amit.shah@redhat.com>
---
v2: register the 0.12 version in this patch instead of the next one.

 hw/pc.c |   10 +++++++++-
 1 files changed, 9 insertions(+), 1 deletions(-)
Anthony Liguori - Feb. 19, 2010, 9:48 p.m.
On 02/15/2010 09:13 AM, Amit Shah wrote:
> The version 0.13 will be the new default and compatibility options will
> be added to the 0.12 version.
>
> Signed-off-by: Amit Shah<amit.shah@redhat.com>
>    

Applied.  Thanks.

Regards,

Anthony Liguori
> ---
> v2: register the 0.12 version in this patch instead of the next one.
>
>   hw/pc.c |   10 +++++++++-
>   1 files changed, 9 insertions(+), 1 deletions(-)
>
> diff --git a/hw/pc.c b/hw/pc.c
> index 6fbe98b..c27ad0f 100644
> --- a/hw/pc.c
> +++ b/hw/pc.c
> @@ -1052,7 +1052,7 @@ void cmos_set_s3_resume(void)
>   }
>
>   static QEMUMachine pc_machine = {
> -    .name = "pc-0.12",
> +    .name = "pc-0.13",
>       .alias = "pc",
>       .desc = "Standard PC",
>       .init = pc_init_pci,
> @@ -1060,6 +1060,13 @@ static QEMUMachine pc_machine = {
>       .is_default = 1,
>   };
>
> +static QEMUMachine pc_machine_v0_12 = {
> +    .name = "pc-0.12",
> +    .desc = "Standard PC",
> +    .init = pc_init_pci,
> +    .max_cpus = 255,
> +};
> +
>   static QEMUMachine pc_machine_v0_11 = {
>       .name = "pc-0.11",
>       .desc = "Standard PC, qemu 0.11",
> @@ -1136,6 +1143,7 @@ static QEMUMachine isapc_machine = {
>   static void pc_machine_init(void)
>   {
>       qemu_register_machine(&pc_machine);
> +    qemu_register_machine(&pc_machine_v0_12);
>       qemu_register_machine(&pc_machine_v0_11);
>       qemu_register_machine(&pc_machine_v0_10);
>       qemu_register_machine(&isapc_machine);
>

Patch

diff --git a/hw/pc.c b/hw/pc.c
index 6fbe98b..c27ad0f 100644
--- a/hw/pc.c
+++ b/hw/pc.c
@@ -1052,7 +1052,7 @@  void cmos_set_s3_resume(void)
 }
 
 static QEMUMachine pc_machine = {
-    .name = "pc-0.12",
+    .name = "pc-0.13",
     .alias = "pc",
     .desc = "Standard PC",
     .init = pc_init_pci,
@@ -1060,6 +1060,13 @@  static QEMUMachine pc_machine = {
     .is_default = 1,
 };
 
+static QEMUMachine pc_machine_v0_12 = {
+    .name = "pc-0.12",
+    .desc = "Standard PC",
+    .init = pc_init_pci,
+    .max_cpus = 255,
+};
+
 static QEMUMachine pc_machine_v0_11 = {
     .name = "pc-0.11",
     .desc = "Standard PC, qemu 0.11",
@@ -1136,6 +1143,7 @@  static QEMUMachine isapc_machine = {
 static void pc_machine_init(void)
 {
     qemu_register_machine(&pc_machine);
+    qemu_register_machine(&pc_machine_v0_12);
     qemu_register_machine(&pc_machine_v0_11);
     qemu_register_machine(&pc_machine_v0_10);
     qemu_register_machine(&isapc_machine);