| commit | c9d944213ce2328e7fc3c980ab7311ad351a78dd | |
| author | Avi Kivity <avi@redhat.com> | |
| Tue, 28 Jul 2009 16:44:46 +0000 (28 19:44 +0300) | ||
| committer | Avi Kivity <avi@redhat.com> | |
| Tue, 28 Jul 2009 16:44:46 +0000 (28 19:44 +0300) | ||
| tree | 4f7645cb3e6e74435736b9b8333fea5aca888c90 | treesnapshot (tar.gz zip) |
| parent | 0d656e4e39edd69ccd1fe6ca5a6dd00e78bcb393 | commitdiff |
| parent | e1e8f35a4f59d82ab9a5361c3990c8dadd2e7678 | commitdiff |
Merge commit 'e1e8f35a4f59d82ab9a5361c3990c8dadd2e7678' into upstream-merge
* commit 'e1e8f35a4f59d82ab9a5361c3990c8dadd2e7678':
bios: Fix multiple calls into smbios_load_ex
gdbstub: x86: Support for setting segment registers
gdbstub: x86: Refactor register access
gdbstub: Add vCont support
slirp: Fix default netmask to 255.255.255.0
Conflicts:
pc-bios/bios.bin (dropped)
Signed-off-by: Avi Kivity <avi@redhat.com>
* commit 'e1e8f35a4f59d82ab9a5361c3990c8dadd2e7678':
bios: Fix multiple calls into smbios_load_ex
gdbstub: x86: Support for setting segment registers
gdbstub: x86: Refactor register access
gdbstub: Add vCont support
slirp: Fix default netmask to 255.255.255.0
Conflicts:
pc-bios/bios.bin (dropped)
Signed-off-by: Avi Kivity <avi@redhat.com>
| gdbstub.c | diff1 | diff2 | blobhistory |
| target-i386/helper.c | diff1 | diff2 | blobhistory |