aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge commit 'v0.15.0-rc0' into upstream-mergeAvi Kivity2011-07-271-1/+1
|\
| * notifier: Pass data argument to callbackJan Kiszka2011-07-231-1/+1
* | Merge commit '6141dbfe0a595076310f690ec8db84ad5be2cde5' into upstream-mergeAvi Kivity2011-07-271-5/+17
|\|
| * report serial devices created with -device in the PIIX4 config spacePaolo Bonzini2011-07-231-5/+17
| * Merge remote-tracking branch 'origin/master' into pciMichael S. Tsirkin2011-06-151-1/+3
| |\
* | | Merge commit 'e75ccf2c033fb0503d6cb7ddd0fd1dfa0aa4fc16' into upstream-mergeMarcelo Tosatti2011-06-221-4/+4
|\| |
| * | hw/acpi_piix4.c: convert to PCIDeviceInfo to initialize idsIsaku Yamahata2011-06-121-4/+4
* | | Merge commit '578c7b2ca8ee9e97fa8693b1a83d517e8e3f962e' into upstream-mergeMarcelo Tosatti2011-06-021-1/+3
|\ \ \ | | |/ | |/|
| * | Ignore pci unplug requests for unpluggable devices (CVE-2011-1751)Gerd Hoffmann2011-05-191-1/+3
| |/
* | acpi_piix4: remove bad save/restore of cpus_stsAvi Kivity2011-04-181-1/+0
* | acpi, acpi_piix: factor out GPE logicIsaku Yamahata2011-04-171-2/+1
* | Merge commit '23910d3f669d46073b403876e30a7314599633af' into upstream-mergeMarcelo Tosatti2011-04-151-171/+73
|\|
| * acpi, acpi_piix: factor out GPE logicIsaku Yamahata2011-04-101-70/+25
| * acpi, acpi_piix, vt82c686: factor out PM1_CNT logicIsaku Yamahata2011-04-091-34/+6
| * acpi, acpi_piix, vt82c686: factor out PM1a EVT logicIsaku Yamahata2011-04-091-36/+16
| * acpi, acpi_piix, vt82c686: factor out PM_TMR logicIsaku Yamahata2011-04-091-33/+12
| * fix build errors when we enable acpi_piix4 debugWen Congyang2011-04-011-2/+3
* | Merge commit '74475455442398a64355428b37422d14ccc293cb' into upstream-mergeMarcelo Tosatti2011-04-141-4/+4
|\|
| * change all other clock references to use nanosecond resolution accessorsPaolo Bonzini2011-03-211-4/+4
* | Merge commit '668643b025dcff72b9b18adb5df794be9e9be5dc' into upstream-mergeMarcelo Tosatti2011-01-211-0/+37
|\|
| * acpi_piix4: expose no_hotplug attribute via i/o portMarcelo Tosatti2011-01-171-0/+37
* | Merge commit 'd2f2b8a740c82319f9eea51ebed50815fbc3da3e' into upstream-mergeMarcelo Tosatti2011-01-211-0/+2
|\|
| * piix: tag as not hotpluggable.Gerd Hoffmann2011-01-101-0/+2
* | Merge commit 'f711df67d611e4762966a249742a5f7499e19f99' into upstream-mergeMarcelo Tosatti2010-12-021-33/+22
|\|
| * piix4 acpi: convert io BAR to type-safe ioport callbacksAvi Kivity2010-11-211-33/+22
* | Merge commit '4cff0a5994d0300e6e77e90d3354aa517a120539' into upstream-mergeMarcelo Tosatti2010-12-021-4/+10
|\|
| * pci: allow hotplug removal of cold-plugged devicesMichael S. Tsirkin2010-11-161-4/+10
| * Merge branch 'pci' into for_anthonyMichael S. Tsirkin2010-10-271-0/+3
| |\
* | \ Merge commit '43c945f16a172f07145ca1f30abb958070228690' into upstream-mergeAvi Kivity2010-11-141-0/+3
|\ \ \ | | |/ | |/|
| * | pci: call hotplug callback even when not hotplug case for later use.Isaku Yamahata2010-09-071-0/+3
* | | Fix cpu/pci hotplug to generate level triggered interrupt.Gleb Natapov2010-10-241-7/+5
* | | Use defines instead of numbers for cpu hotplugGleb Natapov2010-10-241-2/+3
* | | Fix cpu hotplug ioport function registration.Gleb Natapov2010-10-241-2/+2
* | | Merge commit '633aa0acfe2c4d3e56acfe28c912796bf54de6d3' into upstream-mergeMarcelo Tosatti2010-10-201-12/+21
|\ \ \ | | |/ | |/|
| * | Fix pci hotplug to generate level triggered interrupt.Gleb Natapov2010-10-201-11/+17
| * | Use defines instead of numbers for pci hotplug sts bitGleb Natapov2010-10-201-2/+4
* | | Merge commit 'bf1b00712375bea65f2254dea8281fa646eebbd5' into upstream-mergeMarcelo Tosatti2010-09-231-0/+1
|\| |
| * | Introduce range.hBlue Swirl2010-09-181-0/+1
| |/
* | Merge commit '498238687fd3a2bf3efb32694732f88ceac72e99' into upstream-mergeMarcelo Tosatti2010-07-131-1/+0
|\|
| * pci: don't overwrite multi functio bit in pci header type.Isaku Yamahata2010-07-111-1/+0
* | Merge commit 'fd42deeb4cb42f90084046e3ebdb4383953195e3' into upstream-mergeAvi Kivity2010-06-211-1/+28
|\|
| * acpi_piix4: save gpe and pci hotplug slot statusAlex Williamson2010-06-141-1/+28
* | Merge commit '666daa68234b5b1758652633cab07d5ca6046a5b' into upstream-mergeAvi Kivity2010-06-211-0/+1
|\|
| * blockdev: Collect block device code in new blockdev.cMarkus Armbruster2010-06-041-0/+1
* | Merge commit '88c8e03f5ddca8c8448dbb99d9de07d87b03ddd6' into upstream-mergeAvi Kivity2010-05-161-40/+18
|\|
| * Trim unnecessary includesBlue Swirl2010-05-151-3/+0
| * acpi_piix4: remove #ifdef DEBUG.Isaku Yamahata2010-05-151-37/+18
* | Merge commit 'ac4040955b1669f0aac5937f623d6587d5210679' into upstream-mergeAvi Kivity2010-05-161-55/+66
|\|
| * pci hotadd, acpi_piix4: remove global variablesIsaku Yamahata2010-05-151-41/+48
* | Merge commit '87c30546ef34f9eb6740d884c8b73e2cdd259e35' into upstream-mergeAvi Kivity2010-05-161-18/+49
|\|