Message ID | 1328563752-3976-8-git-send-email-hpoussin@reactos.org |
---|---|
State | New |
Headers | show |
Am 06.02.2012 22:29, schrieb Hervé Poussineau: > > Signed-off-by: Hervé Poussineau <hpoussin@reactos.org> > --- > hw/pc_piix.c | 11 ++++++++++- > 1 files changed, 10 insertions(+), 1 deletions(-) > > diff --git a/hw/pc_piix.c b/hw/pc_piix.c > index c06f1b5..400c6b6 100644 > --- a/hw/pc_piix.c > +++ b/hw/pc_piix.c > @@ -371,9 +371,17 @@ static void pc_xen_hvm_init(ram_addr_t ram_size, > } > #endif > > +static QEMUMachine pc_machine_v1_1 = { > + .name = "pc-1.1", > + .alias = "pc", > + .desc = "Standard PC", > + .init = pc_init_pci, > + .max_cpus = 255, > + .is_default = 1, > +}; Now we have three defaults. :-) I'll apply this anyway because we already do have two of them and three doesn't really make it worse, but a patch on top would be good. Kevin
diff --git a/hw/pc_piix.c b/hw/pc_piix.c index c06f1b5..400c6b6 100644 --- a/hw/pc_piix.c +++ b/hw/pc_piix.c @@ -371,9 +371,17 @@ static void pc_xen_hvm_init(ram_addr_t ram_size, } #endif +static QEMUMachine pc_machine_v1_1 = { + .name = "pc-1.1", + .alias = "pc", + .desc = "Standard PC", + .init = pc_init_pci, + .max_cpus = 255, + .is_default = 1, +}; + static QEMUMachine pc_machine_v1_0 = { .name = "pc-1.0", - .alias = "pc", .desc = "Standard PC", .init = pc_init_pci, .max_cpus = 255, @@ -670,6 +678,7 @@ static QEMUMachine xenfv_machine = { static void pc_machine_init(void) { + qemu_register_machine(&pc_machine_v1_1); qemu_register_machine(&pc_machine_v1_0); qemu_register_machine(&pc_machine_v0_15); qemu_register_machine(&pc_machine_v0_14);
Signed-off-by: Hervé Poussineau <hpoussin@reactos.org> --- hw/pc_piix.c | 11 ++++++++++- 1 files changed, 10 insertions(+), 1 deletions(-)