Patchwork [1/6] pc: add machine type for 0.12

login
register
mail settings
Submitter Gerd Hoffmann
Date Jan. 8, 2010, 2:25 p.m.
Message ID <1262960742-18267-2-git-send-email-kraxel@redhat.com>
Download mbox | patch
Permalink /patch/42506/
State New
Headers show

Comments

Gerd Hoffmann - Jan. 8, 2010, 2:25 p.m.
Add a new machine type for qemu 0.12.

Also fixup the 0.11 machine type: msi for virtio-blk-pci was enabled
after the 0.11 release, so turn it off in the 0.11 machine type.

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
 hw/pc.c |   18 +++++++++++++++++-
 1 files changed, 17 insertions(+), 1 deletions(-)
Anthony Liguori - Jan. 11, 2010, 7:50 p.m.
On 01/08/2010 08:25 AM, Gerd Hoffmann wrote:
> Add a new machine type for qemu 0.12.
>
> Also fixup the 0.11 machine type: msi for virtio-blk-pci was enabled
> after the 0.11 release, so turn it off in the 0.11 machine type.
>
> Signed-off-by: Gerd Hoffmann<kraxel@redhat.com>
>    

Applied all.  Thanks.

Regards,

Anthony Liguori
> ---
>   hw/pc.c |   18 +++++++++++++++++-
>   1 files changed, 17 insertions(+), 1 deletions(-)
>
> diff --git a/hw/pc.c b/hw/pc.c
> index 83f8dd0..ea5ac8e 100644
> --- a/hw/pc.c
> +++ b/hw/pc.c
> @@ -1298,7 +1298,7 @@ void cmos_set_s3_resume(void)
>   }
>
>   static QEMUMachine pc_machine = {
> -    .name = "pc-0.11",
> +    .name = "pc-0.12",
>       .alias = "pc",
>       .desc = "Standard PC",
>       .init = pc_init_pci,
> @@ -1306,6 +1306,21 @@ static QEMUMachine pc_machine = {
>       .is_default = 1,
>   };
>
> +static QEMUMachine pc_machine_v0_11 = {
> +    .name = "pc-0.11",
> +    .desc = "Standard PC, qemu 0.11",
> +    .init = pc_init_pci,
> +    .max_cpus = 255,
> +    .compat_props = (GlobalProperty[]) {
> +        {
> +            .driver   = "virtio-blk-pci",
> +            .property = "vectors",
> +            .value    = stringify(0),
> +        },
> +        { /* end of list */ }
> +    }
> +};
> +
>   static QEMUMachine pc_machine_v0_10 = {
>       .name = "pc-0.10",
>       .desc = "Standard PC, qemu 0.10",
> @@ -1343,6 +1358,7 @@ static QEMUMachine isapc_machine = {
>   static void pc_machine_init(void)
>   {
>       qemu_register_machine(&pc_machine);
> +    qemu_register_machine(&pc_machine_v0_11);
>       qemu_register_machine(&pc_machine_v0_10);
>       qemu_register_machine(&isapc_machine);
>   }
>
Gerd Hoffmann - Jan. 12, 2010, 5:10 p.m.
On 01/11/10 20:50, Anthony Liguori wrote:
> On 01/08/2010 08:25 AM, Gerd Hoffmann wrote:
>> Add a new machine type for qemu 0.12.
>>
>> Also fixup the 0.11 machine type: msi for virtio-blk-pci was enabled
>> after the 0.11 release, so turn it off in the 0.11 machine type.
>>
>> Signed-off-by: Gerd Hoffmann<kraxel@redhat.com>
>
> Applied all. Thanks.

Note: this is intented to be applied to 0.12 too.  Forgot to mention in 
$subject.  The series description should have made that clear though.

On a related note: Tried to check staging for stable.  anthony-queue.git 
seems to be unused now though (last update a few weeks ago)  Can you 
post a summary of which git trees are where right now and what is 
planned (transition to git.qemu.org?).

thanks,
   Gerd
Anthony Liguori - Jan. 12, 2010, 7:18 p.m.
On 01/12/2010 11:10 AM, Gerd Hoffmann wrote:
> On 01/11/10 20:50, Anthony Liguori wrote:
>> On 01/08/2010 08:25 AM, Gerd Hoffmann wrote:
>>> Add a new machine type for qemu 0.12.
>>>
>>> Also fixup the 0.11 machine type: msi for virtio-blk-pci was enabled
>>> after the 0.11 release, so turn it off in the 0.11 machine type.
>>>
>>> Signed-off-by: Gerd Hoffmann<kraxel@redhat.com>
>>
>> Applied all. Thanks.
>
> Note: this is intented to be applied to 0.12 too.  Forgot to mention 
> in $subject.  The series description should have made that clear though.

Thanks, I'll make sure to pull those in to stable.

> On a related note: Tried to check staging for stable.  
> anthony-queue.git seems to be unused now though (last update a few 
> weeks ago)  Can you post a summary of which git trees are where right 
> now and what is planned (transition to git.qemu.org?).

I'm trying something a little different.  I'm using a different 
mechanism to track patches and trying to make sure to always push 
patches on a daily basis.  If this works out, a staging tree won't make 
sense anymore.  Give me a week or two to see how this works and I'll 
make sure to explain my new process.

Regards,

Anthony Liguori

> thanks,
>   Gerd
>
Anthony Liguori - Jan. 12, 2010, 7:36 p.m.
On 01/12/2010 11:10 AM, Gerd Hoffmann wrote:
> On 01/11/10 20:50, Anthony Liguori wrote:
>> On 01/08/2010 08:25 AM, Gerd Hoffmann wrote:
>>> Add a new machine type for qemu 0.12.
>>>
>>> Also fixup the 0.11 machine type: msi for virtio-blk-pci was enabled
>>> after the 0.11 release, so turn it off in the 0.11 machine type.
>>>
>>> Signed-off-by: Gerd Hoffmann<kraxel@redhat.com>
>>
>> Applied all. Thanks.
>
> Note: this is intented to be applied to 0.12 too.  Forgot to mention 
> in $subject.  The series description should have made that clear though.

Can you rebase this series to stable and submit?  I rebased myself but 
one of the rom loader patches didn't apply and I'm concerned we're 
missing a previous patch here.  If you can take a look, I'd appreciate it.

Regards,

Anthony Liguori

> On a related note: Tried to check staging for stable.  
> anthony-queue.git seems to be unused now though (last update a few 
> weeks ago)  Can you post a summary of which git trees are where right 
> now and what is planned (transition to git.qemu.org?).
>
> thanks,
>   Gerd
>
Gerd Hoffmann - Jan. 12, 2010, 8:43 p.m.
On 01/12/10 20:36, Anthony Liguori wrote:
> Can you rebase this series to stable and submit? I rebased myself but
> one of the rom loader patches didn't apply and I'm concerned we're
> missing a previous patch here. If you can take a look, I'd appreciate it.

It is a missing patch indeed.  After cherry-picking commit 
f21a59c224a6fdf7b30c3fe551fd93043e537f6c ("loader: more ignores for rom 
intended to be loaded by the bios" by Aurelien Jarno) the series cleanly 
applies to stable as-is.

cheers,
   Gerd

Patch

diff --git a/hw/pc.c b/hw/pc.c
index 83f8dd0..ea5ac8e 100644
--- a/hw/pc.c
+++ b/hw/pc.c
@@ -1298,7 +1298,7 @@  void cmos_set_s3_resume(void)
 }
 
 static QEMUMachine pc_machine = {
-    .name = "pc-0.11",
+    .name = "pc-0.12",
     .alias = "pc",
     .desc = "Standard PC",
     .init = pc_init_pci,
@@ -1306,6 +1306,21 @@  static QEMUMachine pc_machine = {
     .is_default = 1,
 };
 
+static QEMUMachine pc_machine_v0_11 = {
+    .name = "pc-0.11",
+    .desc = "Standard PC, qemu 0.11",
+    .init = pc_init_pci,
+    .max_cpus = 255,
+    .compat_props = (GlobalProperty[]) {
+        {
+            .driver   = "virtio-blk-pci",
+            .property = "vectors",
+            .value    = stringify(0),
+        },
+        { /* end of list */ }
+    }
+};
+
 static QEMUMachine pc_machine_v0_10 = {
     .name = "pc-0.10",
     .desc = "Standard PC, qemu 0.10",
@@ -1343,6 +1358,7 @@  static QEMUMachine isapc_machine = {
 static void pc_machine_init(void)
 {
     qemu_register_machine(&pc_machine);
+    qemu_register_machine(&pc_machine_v0_11);
     qemu_register_machine(&pc_machine_v0_10);
     qemu_register_machine(&isapc_machine);
 }