All of lore.kernel.org
 help / color / mirror / Atom feed
From: Anthony Liguori <anthony@codemonkey.ws>
To: Gerd Hoffmann <kraxel@redhat.com>
Cc: qemu-devel@nongnu.org, kvm@vger.kernel.org
Subject: Re: [Qemu-devel] [PATCH 1/2] pc: add 1.0 machine type
Date: Tue, 08 Nov 2011 11:25:02 -0600	[thread overview]
Message-ID: <4EB965EE.2010104@codemonkey.ws> (raw)
In-Reply-To: <1320679989-8274-1-git-send-email-kraxel@redhat.com>

On 11/07/2011 09:33 AM, Gerd Hoffmann wrote:
> This patch adds a pc-1.0 machine type.
>
> Signed-off-by: Gerd Hoffmann<kraxel@redhat.com>

Applied both.  Thanks.

Regards,

Anthony Liguori

> ---
>   hw/pc_piix.c |   14 +++++++++++---
>   1 files changed, 11 insertions(+), 3 deletions(-)
>
> diff --git a/hw/pc_piix.c b/hw/pc_piix.c
> index 8c7f2b7..93e40d0 100644
> --- a/hw/pc_piix.c
> +++ b/hw/pc_piix.c
> @@ -297,8 +297,8 @@ static void pc_xen_hvm_init(ram_addr_t ram_size,
>   }
>   #endif
>
> -static QEMUMachine pc_machine = {
> -    .name = "pc-0.14",
> +static QEMUMachine pc_machine_v1_0 = {
> +    .name = "pc-1.0",
>       .alias = "pc",
>       .desc = "Standard PC",
>       .init = pc_init_pci,
> @@ -306,6 +306,13 @@ static QEMUMachine pc_machine = {
>       .is_default = 1,
>   };
>
> +static QEMUMachine pc_machine_v0_14 = {
> +    .name = "pc-0.14",
> +    .desc = "Standard PC",
> +    .init = pc_init_pci,
> +    .max_cpus = 255,
> +};
> +
>   static QEMUMachine pc_machine_v0_13 = {
>       .name = "pc-0.13",
>       .desc = "Standard PC",
> @@ -521,7 +528,8 @@ static QEMUMachine xenfv_machine = {
>
>   static void pc_machine_init(void)
>   {
> -    qemu_register_machine(&pc_machine);
> +    qemu_register_machine(&pc_machine_v1_0);
> +    qemu_register_machine(&pc_machine_v0_14);
>       qemu_register_machine(&pc_machine_v0_13);
>       qemu_register_machine(&pc_machine_v0_12);
>       qemu_register_machine(&pc_machine_v0_11);


      parent reply	other threads:[~2011-11-08 17:27 UTC|newest]

Thread overview: 13+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-11-07 15:33 [PATCH 1/2] pc: add 1.0 machine type Gerd Hoffmann
2011-11-07 15:33 ` [Qemu-devel] " Gerd Hoffmann
2011-11-07 15:33 ` [PATCH 2/2] ac97: don't override the pci subsystem id Gerd Hoffmann
2011-11-07 15:33   ` [Qemu-devel] " Gerd Hoffmann
2011-11-07 16:00   ` Anthony Liguori
2011-11-07 16:00     ` Anthony Liguori
2011-11-08  8:08     ` Gerd Hoffmann
2011-11-08  8:08       ` [Qemu-devel] " Gerd Hoffmann
2011-11-08 10:00       ` Avi Kivity
2011-11-08 10:00         ` [Qemu-devel] " Avi Kivity
2011-11-08 10:18         ` Gerd Hoffmann
2011-11-08 10:18           ` [Qemu-devel] " Gerd Hoffmann
2011-11-08 17:25 ` Anthony Liguori [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=4EB965EE.2010104@codemonkey.ws \
    --to=anthony@codemonkey.ws \
    --cc=kraxel@redhat.com \
    --cc=kvm@vger.kernel.org \
    --cc=qemu-devel@nongnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
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.