diff options
| author |   Avi Kivity <avi@redhat.com> | 2009-07-28 20:02:43 +0300 |
|---|---|---|
| committer | Avi Kivity <avi@redhat.com> | 2009-07-28 20:02:43 +0300 |
| commit | 02cdfb2f27a3ccdd009a7bced64a40a798e5474f (patch) | |
| tree | 2d69d0ac9bf344bb6a631dff8e37c2fc9cee4094 /gdbstub.c | |
| parent | Merge commit 'b8c0e7d7c4e9fe3ec00757053a33605eda1c5ac4' into upstream-merge (diff) | |
| parent | configure already knows what TARGET_BASE_ARCH we need, no need to put the log... (diff) | |
| download | qemu-kvm-02cdfb2f27a3ccdd009a7bced64a40a798e5474f.tar.gz qemu-kvm-02cdfb2f27a3ccdd009a7bced64a40a798e5474f.tar.bz2 qemu-kvm-02cdfb2f27a3ccdd009a7bced64a40a798e5474f.zip | |
Merge commit '0ba99fc6a188988f11361cb41eba7c1afce346d4' into upstream-merge
* commit '0ba99fc6a188988f11361cb41eba7c1afce346d4': (46 commits)
configure already knows what TARGET_BASE_ARCH we need, no need to put the logic in Makefile.target
already defined several lines before in block-obj-y
Remove unused Makefile variable
use nwfpe-obj-y for consistence
use block-nested-y for files inside block/
Remove duplicated definition
fix sparc not solaris build
fix XEN Build
fix for bad macaddr of e1000 in Windows 2003 server with original MS driver
qdev: es1370+ac97 description
qdev/compat: virtio-net-pci 0.10 compatibility.
qdev: print device id in "info pci".
qdev/compat: virtio-console-pci 0.10 compatibility.
qdev: add id= support for pci nics.
qdev/compat: virtio-blk-pci 0.10 compatibility.
qdev: add user-specified identifier to devices.
qdev/compat: add pc-0.10 machine type.
qdev: add no_user, alias and desc
qdev/compat: compat property infrastructure.
qdev: factor out driver search to qdev_find_info()
...
Conflicts:
Makefile.target
Signed-off-by: Avi Kivity <avi@redhat.com>
Diffstat (limited to 'gdbstub.c')
| -rw-r--r-- | gdbstub.c | 3 |
1 files changed, 1 insertions, 2 deletions
@@ -14,8 +14,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301 USA + * License along with this library; if not, see <http://www.gnu.org/licenses/>. */ #include "config.h" #include "qemu-common.h" |