diff options
| author | Anthony Liguori | 2013-01-11 15:36:52 +0100 |
|---|---|---|
| committer | Anthony Liguori | 2013-01-11 15:43:08 +0100 |
| commit | e2848a78b0a6715f94623bdf43ef74d3d08cfe4d (patch) | |
| tree | 6c9f6a0ee2ee6d4ba57795e8c13a1cd7cd5ddd97 /block.c | |
| parent | Merge remote-tracking branch 'afaerber-or/prep-up' into staging (diff) | |
| parent | Makefile: install the "acpi-dsdt.aml" and "q35-acpi-dsdt.aml" blobs too (diff) | |
| download | qemu-e2848a78b0a6715f94623bdf43ef74d3d08cfe4d.tar.gz qemu-e2848a78b0a6715f94623bdf43ef74d3d08cfe4d.tar.xz qemu-e2848a78b0a6715f94623bdf43ef74d3d08cfe4d.zip | |
Merge remote-tracking branch 'kraxel/q35.1' into staging
* kraxel/q35.1:
Makefile: install the "acpi-dsdt.aml" and "q35-acpi-dsdt.aml" blobs too
pc: rename machine types
q35: document chipset devices
q35: add ich9 intel hda controller
Conflicts:
hw/intel-hda.c
aliguori: resolve conflict with static const change from Andreas.
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'block.c')
0 files changed, 0 insertions, 0 deletions