Patchwork pc_piix: remove undesired change in pc_init1

login
register
mail settings
Submitter Paolo Bonzini
Date April 30, 2013, 2 p.m.
Message ID <1367330432-14417-1-git-send-email-pbonzini@redhat.com>
Download mbox | patch
Permalink /patch/240624/
State New
Headers show

Comments

Paolo Bonzini - April 30, 2013, 2 p.m.
Introduced when applying commit f81222b (audio: look for the ISA and
PCI buses, 2013-04-18).

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
 hw/i386/pc_piix.c | 1 +
 1 file changed, 1 insertion(+)
Anthony Liguori - April 30, 2013, 2:33 p.m.
Paolo Bonzini <pbonzini@redhat.com> writes:

> Introduced when applying commit f81222b (audio: look for the ISA and
> PCI buses, 2013-04-18).
>
> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>

Sorry about that.  Combination of a dirty tree and my patch fuzzing
script getting very, very unlucky.

Regards,

Anthony Liguori

> ---
>  hw/i386/pc_piix.c | 1 +
>  1 file changed, 1 insertion(+)
>
> diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c
> index c1113e0..2bda79e 100644
> --- a/hw/i386/pc_piix.c
> +++ b/hw/i386/pc_piix.c
> @@ -88,6 +88,7 @@ static void pc_init1(MemoryRegion *system_memory,
>      void *fw_cfg = NULL;
>  
>      pc_cpus_init(cpu_model);
> +    pc_acpi_init("acpi-dsdt.aml");
>  
>      if (kvmclock_enabled) {
>          kvmclock_create();
> -- 
> 1.8.2
Anthony Liguori - April 30, 2013, 6:58 p.m.
Applied.  Thanks.

Regards,

Anthony Liguori

Patch

diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c
index c1113e0..2bda79e 100644
--- a/hw/i386/pc_piix.c
+++ b/hw/i386/pc_piix.c
@@ -88,6 +88,7 @@  static void pc_init1(MemoryRegion *system_memory,
     void *fw_cfg = NULL;
 
     pc_cpus_init(cpu_model);
+    pc_acpi_init("acpi-dsdt.aml");
 
     if (kvmclock_enabled) {
         kvmclock_create();