| commit | 286b9f0ff3aabe4ef31557edeaa2691a7634b95a | |
| author | Avi Kivity <avi@redhat.com> | |
| Tue, 30 Jun 2009 11:59:33 +0000 (30 14:59 +0300) | ||
| committer | Avi Kivity <avi@redhat.com> | |
| Tue, 30 Jun 2009 11:59:33 +0000 (30 14:59 +0300) | ||
| tree | a2ed92a7f3cbac7c1c7c447d3bf1290b28d77c91 | treesnapshot (tar.gz zip) |
| parent | 255af6f10b822e41e8cebb13e598c24c6b536164 | commitdiff |
| parent | a62acdc0cc5308706e2503557a09828979b59a12 | commitdiff |
Merge commit 'a62acdc0cc5308706e2503557a09828979b59a12' into upstream-merge
* commit 'a62acdc0cc5308706e2503557a09828979b59a12':
monitor: Make pci_add device options truely optional
Conflicts:
qemu-monitor.hx
Signed-off-by: Avi Kivity <avi@redhat.com>
* commit 'a62acdc0cc5308706e2503557a09828979b59a12':
monitor: Make pci_add device options truely optional
Conflicts:
qemu-monitor.hx
Signed-off-by: Avi Kivity <avi@redhat.com>
| hw/pci-hotplug.c | diff1 | diff2 | blobhistory |
| qemu-monitor.hx | diff1 | diff2 | blobhistory |