On Mon, Jan 19, 2015 at 05:56:24PM +0100, Paolo Bonzini wrote: > See v2 for motivation. > > v2->v3: dropped pointer passing and patch 4.
Thanks! Igor - ok with you? > Paolo Bonzini (3): > pc: append ssdt-misc.dsl to the DSDT > pc: rename ssdt-misc to dsdt-common > pc: move common parts of the DSDT to dsdt-common > > hw/i386/Makefile.objs | 2 +- > hw/i386/acpi-build.c | 85 +- > hw/i386/{ssdt-misc.dsl => acpi-dsdt-common.dsl} | 22 +- > hw/i386/acpi-dsdt-common.hex.generated | 1897 ++++++++++++++ > hw/i386/acpi-dsdt-isa.dsl | 6 +- > hw/i386/acpi-dsdt.dsl | 12 +- > hw/i386/acpi-dsdt.hex.generated | 3119 > ++++++----------------- > hw/i386/q35-acpi-dsdt.dsl | 9 +- > hw/i386/q35-acpi-dsdt.hex.generated | 2787 +++++--------------- > hw/i386/ssdt-misc.hex.generated | 399 --- > tests/acpi-test-data/pc/DSDT | Bin 3592 -> 3923 bytes > tests/acpi-test-data/pc/SSDT | Bin 2279 -> 1951 bytes > tests/acpi-test-data/q35/DSDT | Bin 8182 -> 8513 bytes > tests/acpi-test-data/q35/SSDT | Bin 560 -> 232 bytes > 14 files changed, 3430 insertions(+), 4908 deletions(-) > rename hw/i386/{ssdt-misc.dsl => acpi-dsdt-common.dsl} (89%) > create mode 100644 hw/i386/acpi-dsdt-common.hex.generated > delete mode 100644 hw/i386/ssdt-misc.hex.generated In future pls don't include generated files, they often conflict on rebase - just note I need to generate them in the cover letter. > -- > 1.8.3.1