| Submitter | Paolo Bonzini |
|---|---|
| Date | June 30, 2011, 3:46 p.m. |
| Message ID | <1309448777-1447-3-git-send-email-pbonzini@redhat.com> |
| Download | mbox | patch |
| Permalink | /patch/102776/ |
| State | New |
| Headers | show |
Comments
So, do we not need this change, then, to go along with the 0.15 release? Bruce >>> On 6/30/2011 at 09:46 AM, Paolo Bonzini <pbonzini@redhat.com> wrote: > The new pc-0.15 machine will have a different migration format, so > define the compatibility one right now. > > Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> > --- > hw/pc_piix.c | 10 +++++++++- > 1 files changed, 9 insertions(+), 1 deletions(-) > > diff --git a/hw/pc_piix.c b/hw/pc_piix.c > index c5c16b4..18cc942 100644 > --- a/hw/pc_piix.c > +++ b/hw/pc_piix.c > @@ -258,7 +258,7 @@ static void pc_xen_hvm_init(ram_addr_t ram_size, > #endif > > static QEMUMachine pc_machine = { > - .name = "pc-0.14", > + .name = "pc-0.15", > .alias = "pc", > .desc = "Standard PC", > .init = pc_init_pci, > @@ -266,6 +266,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", > @@ -482,6 +489,7 @@ static QEMUMachine xenfv_machine = { > static void pc_machine_init(void) > { > qemu_register_machine(&pc_machine); > + 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);
On 08/05/2011 02:26 PM, Bruce Rogers wrote: > So, do we not need this change, then, to go along with the 0.15 release? Strictly speaking, the 0.15 machine type is identical to the 0.14 machine type. It wouldn't hurt to have a 0.15 machine alias but I don't think it's a strict requirement. Regards, Anthony Liguori > Bruce > > >>> On 6/30/2011 at 09:46 AM, Paolo Bonzini<pbonzini@redhat.com> wrote: >> The new pc-0.15 machine will have a different migration format, so >> define the compatibility one right now. >> >> Signed-off-by: Paolo Bonzini<pbonzini@redhat.com> >> --- >> hw/pc_piix.c | 10 +++++++++- >> 1 files changed, 9 insertions(+), 1 deletions(-) >> >> diff --git a/hw/pc_piix.c b/hw/pc_piix.c >> index c5c16b4..18cc942 100644 >> --- a/hw/pc_piix.c >> +++ b/hw/pc_piix.c >> @@ -258,7 +258,7 @@ static void pc_xen_hvm_init(ram_addr_t ram_size, >> #endif >> >> static QEMUMachine pc_machine = { >> - .name = "pc-0.14", >> + .name = "pc-0.15", >> .alias = "pc", >> .desc = "Standard PC", >> .init = pc_init_pci, >> @@ -266,6 +266,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", >> @@ -482,6 +489,7 @@ static QEMUMachine xenfv_machine = { >> static void pc_machine_init(void) >> { >> qemu_register_machine(&pc_machine); >> + 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); > > > > >
Patch
diff --git a/hw/pc_piix.c b/hw/pc_piix.c index c5c16b4..18cc942 100644 --- a/hw/pc_piix.c +++ b/hw/pc_piix.c @@ -258,7 +258,7 @@ static void pc_xen_hvm_init(ram_addr_t ram_size, #endif static QEMUMachine pc_machine = { - .name = "pc-0.14", + .name = "pc-0.15", .alias = "pc", .desc = "Standard PC", .init = pc_init_pci, @@ -266,6 +266,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", @@ -482,6 +489,7 @@ static QEMUMachine xenfv_machine = { static void pc_machine_init(void) { qemu_register_machine(&pc_machine); + 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);
The new pc-0.15 machine will have a different migration format, so define the compatibility one right now. Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> --- hw/pc_piix.c | 10 +++++++++- 1 files changed, 9 insertions(+), 1 deletions(-)