| commit | f21dd80aea0fff462ca0708977626ef0c05b81c9 | |
| author | Avi Kivity <avi@redhat.com> | |
| Tue, 30 Jun 2009 11:56:33 +0000 (30 14:56 +0300) | ||
| committer | Avi Kivity <avi@redhat.com> | |
| Tue, 30 Jun 2009 11:56:33 +0000 (30 14:56 +0300) | ||
| tree | 2a23799fa8b12eace48e78a8bcb137f8ffe77979 | treesnapshot (tar.gz zip) |
| parent | efc50e139f69b876fb579bcd6fff0c028b0a1eb6 | commitdiff |
| parent | e9283f8b88eb6054ac032f3d9b773e80d842c0cf | commitdiff |
Merge commit 'e9283f8b88eb6054ac032f3d9b773e80d842c0cf' into upstream-merge
* commit 'e9283f8b88eb6054ac032f3d9b773e80d842c0cf':
monitor: Drop pci_addr prefix from hotplug commands
qcow2: Cache refcount blocks during snapshot creation
block-raw: Allow pread beyond the end of growable images
make tags useful for block drivers and hardaware devices
Substitute ifdef CONFIG_FOO by sound-obj-
Conflicts:
hw/pci-hotplug.c
hw/pci.c
qemu-monitor.hx
Signed-off-by: Avi Kivity <avi@redhat.com>
* commit 'e9283f8b88eb6054ac032f3d9b773e80d842c0cf':
monitor: Drop pci_addr prefix from hotplug commands
qcow2: Cache refcount blocks during snapshot creation
block-raw: Allow pread beyond the end of growable images
make tags useful for block drivers and hardaware devices
Substitute ifdef CONFIG_FOO by sound-obj-
Conflicts:
hw/pci-hotplug.c
hw/pci.c
qemu-monitor.hx
Signed-off-by: Avi Kivity <avi@redhat.com>