[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [PATCH v10 7/8] hw/pc_piix: add pc-1.1
From: |
Jordan Justen |
Subject: |
Re: [Qemu-devel] [PATCH v10 7/8] hw/pc_piix: add pc-1.1 |
Date: |
Sun, 8 Jan 2012 17:11:49 -0800 |
On Sun, Jan 8, 2012 at 16:12, Alexander Graf <address@hidden> wrote:
>
> On 08.01.2012, at 20:51, Jordan Justen wrote:
>
>> Signed-off-by: Jordan Justen <address@hidden>
>> ---
>> hw/pc_piix.c | 11 +++++++++--
>> 1 files changed, 9 insertions(+), 2 deletions(-)
>>
>> diff --git a/hw/pc_piix.c b/hw/pc_piix.c
>> index 00f525e..aea95e4 100644
>> --- a/hw/pc_piix.c
>> +++ b/hw/pc_piix.c
>> @@ -314,8 +314,8 @@ static void pc_xen_hvm_init(ram_addr_t ram_size,
>> }
>> #endif
>>
>> -static QEMUMachine pc_machine_v1_0 = {
>> - .name = "pc-1.0",
>> +static QEMUMachine pc_machine_v1_1 = {
>> + .name = "pc-1.1",
>> .alias = "pc",
>> .desc = "Standard PC",
>> .init = pc_init_pci,
>> @@ -323,6 +323,13 @@ static QEMUMachine pc_machine_v1_0 = {
>> .is_default = 1,
>> };
>>
>> +static QEMUMachine pc_machine_v1_0 = {
>> + .name = "pc-1.0",
>> + .desc = "Standard PC",
>> + .init = pc_init_pci,
>> + .max_cpus = 255,
>> +};
>> +
>> static QEMUMachine pc_machine_v0_15 = {
>> .name = "pc-0.15",
>> .desc = "Standard PC",
>
> This is missing registration of the v1.1 machine, no? Please see my -cpu best
> default patch I just posted.
Yep, whoops. I was splitting my change apart compared to v9, and it
looks like I mistakenly added the registration portion into patch 8/8.
Now that I see you are adding pc-1.1, it seems likely that I'll
probably be reworking my changeset again after yours is merged.
I also had added that pc-0.15 is_default change into my changeset, but
hopefully you'll have that change merged soon as well.
Thanks,
-Jordan
- [Qemu-devel] [PATCH v10 0/8] PC system flash support, Jordan Justen, 2012/01/08
- [Qemu-devel] [PATCH v10 1/8] blockdev: allow read-only pflash devices, Jordan Justen, 2012/01/08
- [Qemu-devel] [PATCH v10 2/8] pflash_cfi01/02: support read-only pflash devices, Jordan Justen, 2012/01/08
- [Qemu-devel] [PATCH v10 3/8] vl: make find_default_machine externally visible, Jordan Justen, 2012/01/08
- [Qemu-devel] [PATCH v10 4/8] hw/pc: move rom init to pc_sysfw.c, Jordan Justen, 2012/01/08
- [Qemu-devel] [PATCH v10 5/8] hw/pc_sysfw: Support system flash memory with pflash, Jordan Justen, 2012/01/08
- [Qemu-devel] [PATCH v10 6/8] hw/pc_piix: remove is_default for pc-0.15, Jordan Justen, 2012/01/08
- [Qemu-devel] [PATCH v10 7/8] hw/pc_piix: add pc-1.1, Jordan Justen, 2012/01/08
- [Qemu-devel] [PATCH v10 8/8] pc: enable system flash for pc-1.1, Jordan Justen, 2012/01/08
- Re: [Qemu-devel] [PATCH v10 0/8] PC system flash support, Jordan Justen, 2012/01/08