| Message ID | 4FF71072.9010405@siemens.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Fri, Jul 06, 2012 at 06:21:06PM +0200, Jan Kiszka wrote: > qemu-kvm-specific machine defaults were missing for pc-0.15 to pc-1.1. > Then Daniel noted that --disable-kvm caused problems as the generated > binaries would be unable to run. As we are at it, we can drop the > kernel_irqchip=on that is now enable by default in upstream. > > CC: Daniel P. Berrange <berrange@redhat.com> > Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com> ACK, looks good to me. > Noticed that there was more to do. Can you take care of stable-1.1, > Daniel? TIA. Yep, will post a patch for stable-1.1 when this is accepted into master. > hw/pc_piix.c | 23 ++++++++++++++++------- > 1 files changed, 16 insertions(+), 7 deletions(-) > > diff --git a/hw/pc_piix.c b/hw/pc_piix.c > index 98a06fa..5860d52 100644 > --- a/hw/pc_piix.c > +++ b/hw/pc_piix.c > @@ -353,6 +353,12 @@ static void pc_xen_hvm_init(ram_addr_t ram_size, > } > #endif > > +#ifdef CONFIG_KVM_OPTIONS > +#define KVM_MACHINE_OPTIONS "accel=kvm" > +#else > +#define KVM_MACHINE_OPTIONS "" > +#endif > + > static QEMUMachine pc_machine_v1_2 = { > .name = "pc-1.2", > .alias = "pc", > @@ -360,7 +366,7 @@ static QEMUMachine pc_machine_v1_2 = { > .init = pc_init_pci, > .max_cpus = 255, > .is_default = 1, > - .default_machine_opts = "accel=kvm,kernel_irqchip=on", > + .default_machine_opts = KVM_MACHINE_OPTIONS, > }; > > #define PC_COMPAT_1_1 \ > @@ -387,6 +393,7 @@ static QEMUMachine pc_machine_v1_1 = { > .desc = "Standard PC", > .init = pc_init_pci, > .max_cpus = 255, > + .default_machine_opts = KVM_MACHINE_OPTIONS, > .compat_props = (GlobalProperty[]) { > PC_COMPAT_1_1, > { /* end of list */ } > @@ -422,6 +429,7 @@ static QEMUMachine pc_machine_v1_0 = { > .desc = "Standard PC", > .init = pc_init_pci, > .max_cpus = 255, > + .default_machine_opts = KVM_MACHINE_OPTIONS, > .compat_props = (GlobalProperty[]) { > PC_COMPAT_1_0, > { /* end of list */ } > @@ -437,6 +445,7 @@ static QEMUMachine pc_machine_v0_15 = { > .desc = "Standard PC", > .init = pc_init_pci, > .max_cpus = 255, > + .default_machine_opts = KVM_MACHINE_OPTIONS, > .compat_props = (GlobalProperty[]) { > PC_COMPAT_0_15, > { /* end of list */ } > @@ -469,7 +478,7 @@ static QEMUMachine pc_machine_v0_14 = { > .desc = "Standard PC", > .init = pc_init_pci, > .max_cpus = 255, > - .default_machine_opts = "accel=kvm,kernel_irqchip=on", > + .default_machine_opts = KVM_MACHINE_OPTIONS, > .compat_props = (GlobalProperty[]) { > PC_COMPAT_0_14, > { > @@ -503,7 +512,7 @@ static QEMUMachine pc_machine_v0_13 = { > .desc = "Standard PC", > .init = pc_init_pci_no_kvmclock, > .max_cpus = 255, > - .default_machine_opts = "accel=kvm,kernel_irqchip=on", > + .default_machine_opts = KVM_MACHINE_OPTIONS, > .compat_props = (GlobalProperty[]) { > PC_COMPAT_0_13, > { > @@ -541,7 +550,7 @@ static QEMUMachine pc_machine_v0_12 = { > .desc = "Standard PC", > .init = pc_init_pci_no_kvmclock, > .max_cpus = 255, > - .default_machine_opts = "accel=kvm,kernel_irqchip=on", > + .default_machine_opts = KVM_MACHINE_OPTIONS, > .compat_props = (GlobalProperty[]) { > PC_COMPAT_0_12, > { > @@ -575,7 +584,7 @@ static QEMUMachine pc_machine_v0_11 = { > .desc = "Standard PC, qemu 0.11", > .init = pc_init_pci_no_kvmclock, > .max_cpus = 255, > - .default_machine_opts = "accel=kvm,kernel_irqchip=on", > + .default_machine_opts = KVM_MACHINE_OPTIONS, > .compat_props = (GlobalProperty[]) { > PC_COMPAT_0_11, > { > @@ -597,7 +606,7 @@ static QEMUMachine pc_machine_v0_10 = { > .desc = "Standard PC, qemu 0.10", > .init = pc_init_pci_no_kvmclock, > .max_cpus = 255, > - .default_machine_opts = "accel=kvm,kernel_irqchip=on", > + .default_machine_opts = KVM_MACHINE_OPTIONS, > .compat_props = (GlobalProperty[]) { > PC_COMPAT_0_11, > { > @@ -631,7 +640,7 @@ static QEMUMachine isapc_machine = { > .desc = "ISA-only PC", > .init = pc_init_isa, > .max_cpus = 1, > - .default_machine_opts = "accel=kvm,kernel_irqchip=on", > + .default_machine_opts = KVM_MACHINE_OPTIONS, > .compat_props = (GlobalProperty[]) { > { > .driver = "pc-sysfw", > -- > 1.7.3.4 Daniel
On 07/06/2012 07:21 PM, Jan Kiszka wrote: > qemu-kvm-specific machine defaults were missing for pc-0.15 to pc-1.1. > Then Daniel noted that --disable-kvm caused problems as the generated > binaries would be unable to run. As we are at it, we can drop the > kernel_irqchip=on that is now enable by default in upstream. Thanks, applied.
diff --git a/hw/pc_piix.c b/hw/pc_piix.c index 98a06fa..5860d52 100644 --- a/hw/pc_piix.c +++ b/hw/pc_piix.c @@ -353,6 +353,12 @@ static void pc_xen_hvm_init(ram_addr_t ram_size, } #endif +#ifdef CONFIG_KVM_OPTIONS +#define KVM_MACHINE_OPTIONS "accel=kvm" +#else +#define KVM_MACHINE_OPTIONS "" +#endif + static QEMUMachine pc_machine_v1_2 = { .name = "pc-1.2", .alias = "pc", @@ -360,7 +366,7 @@ static QEMUMachine pc_machine_v1_2 = { .init = pc_init_pci, .max_cpus = 255, .is_default = 1, - .default_machine_opts = "accel=kvm,kernel_irqchip=on", + .default_machine_opts = KVM_MACHINE_OPTIONS, }; #define PC_COMPAT_1_1 \ @@ -387,6 +393,7 @@ static QEMUMachine pc_machine_v1_1 = { .desc = "Standard PC", .init = pc_init_pci, .max_cpus = 255, + .default_machine_opts = KVM_MACHINE_OPTIONS, .compat_props = (GlobalProperty[]) { PC_COMPAT_1_1, { /* end of list */ } @@ -422,6 +429,7 @@ static QEMUMachine pc_machine_v1_0 = { .desc = "Standard PC", .init = pc_init_pci, .max_cpus = 255, + .default_machine_opts = KVM_MACHINE_OPTIONS, .compat_props = (GlobalProperty[]) { PC_COMPAT_1_0, { /* end of list */ } @@ -437,6 +445,7 @@ static QEMUMachine pc_machine_v0_15 = { .desc = "Standard PC", .init = pc_init_pci, .max_cpus = 255, + .default_machine_opts = KVM_MACHINE_OPTIONS, .compat_props = (GlobalProperty[]) { PC_COMPAT_0_15, { /* end of list */ } @@ -469,7 +478,7 @@ static QEMUMachine pc_machine_v0_14 = { .desc = "Standard PC", .init = pc_init_pci, .max_cpus = 255, - .default_machine_opts = "accel=kvm,kernel_irqchip=on", + .default_machine_opts = KVM_MACHINE_OPTIONS, .compat_props = (GlobalProperty[]) { PC_COMPAT_0_14, { @@ -503,7 +512,7 @@ static QEMUMachine pc_machine_v0_13 = { .desc = "Standard PC", .init = pc_init_pci_no_kvmclock, .max_cpus = 255, - .default_machine_opts = "accel=kvm,kernel_irqchip=on", + .default_machine_opts = KVM_MACHINE_OPTIONS, .compat_props = (GlobalProperty[]) { PC_COMPAT_0_13, { @@ -541,7 +550,7 @@ static QEMUMachine pc_machine_v0_12 = { .desc = "Standard PC", .init = pc_init_pci_no_kvmclock, .max_cpus = 255, - .default_machine_opts = "accel=kvm,kernel_irqchip=on", + .default_machine_opts = KVM_MACHINE_OPTIONS, .compat_props = (GlobalProperty[]) { PC_COMPAT_0_12, { @@ -575,7 +584,7 @@ static QEMUMachine pc_machine_v0_11 = { .desc = "Standard PC, qemu 0.11", .init = pc_init_pci_no_kvmclock, .max_cpus = 255, - .default_machine_opts = "accel=kvm,kernel_irqchip=on", + .default_machine_opts = KVM_MACHINE_OPTIONS, .compat_props = (GlobalProperty[]) { PC_COMPAT_0_11, { @@ -597,7 +606,7 @@ static QEMUMachine pc_machine_v0_10 = { .desc = "Standard PC, qemu 0.10", .init = pc_init_pci_no_kvmclock, .max_cpus = 255, - .default_machine_opts = "accel=kvm,kernel_irqchip=on", + .default_machine_opts = KVM_MACHINE_OPTIONS, .compat_props = (GlobalProperty[]) { PC_COMPAT_0_11, { @@ -631,7 +640,7 @@ static QEMUMachine isapc_machine = { .desc = "ISA-only PC", .init = pc_init_isa, .max_cpus = 1, - .default_machine_opts = "accel=kvm,kernel_irqchip=on", + .default_machine_opts = KVM_MACHINE_OPTIONS, .compat_props = (GlobalProperty[]) { { .driver = "pc-sysfw",
qemu-kvm-specific machine defaults were missing for pc-0.15 to pc-1.1. Then Daniel noted that --disable-kvm caused problems as the generated binaries would be unable to run. As we are at it, we can drop the kernel_irqchip=on that is now enable by default in upstream. CC: Daniel P. Berrange <berrange@redhat.com> Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com> --- Noticed that there was more to do. Can you take care of stable-1.1, Daniel? TIA. hw/pc_piix.c | 23 ++++++++++++++++------- 1 files changed, 16 insertions(+), 7 deletions(-)