summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile4
-rw-r--r--Makefile.objs2
-rw-r--r--Makefile.target2
-rwxr-xr-xconfigure1
-rw-r--r--exec.c2
-rw-r--r--hw/hw.h2
-rw-r--r--hw/pc.c1
-rw-r--r--kvm-all.c1
-rw-r--r--kvm.h1
-rw-r--r--net.c1
-rw-r--r--net.h4
-rw-r--r--qemu-kvm-x86.c1
-rw-r--r--qemu-kvm.c5
-rw-r--r--qemu-kvm.h1
-rw-r--r--qemu-malloc.c1
-rw-r--r--qemu-timer.c1
-rw-r--r--target-i386/kvm.c1
17 files changed, 30 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index c6aae63..a84ce71 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,8 @@
# Makefile for QEMU.
+#
+# Copyright 2011 QEMU contributors
+# Portions Copyright 2011 Joyent, Inc.
+#
GENERATED_HEADERS = config-host.h trace.h qemu-options.def
ifeq ($(TRACE_BACKEND),dtrace)
diff --git a/Makefile.objs b/Makefile.objs
index db43f72..bf5b103 100644
--- a/Makefile.objs
+++ b/Makefile.objs
@@ -1,3 +1,5 @@
+# Copyright 2011 QEMU contributors
+# Portions Copyright 2011 Joyent, Inc.
#######################################################################
# QObject
qobject-obj-y = qint.o qstring.o qdict.o qlist.o qfloat.o qbool.o
diff --git a/Makefile.target b/Makefile.target
index 9913dd7..e0745b3 100644
--- a/Makefile.target
+++ b/Makefile.target
@@ -1,3 +1,5 @@
+# Copyright 2011 QEMU contributors
+# Portions Copyright 2011 Joyent, Inc.
# -*- Mode: makefile -*-
GENERATED_HEADERS = config-target.h
diff --git a/configure b/configure
index c169eb3..35c5e6c 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,7 @@
#!/bin/bash
#
# qemu configure script (c) 2003 Fabrice Bellard
+# portions copyright 2011 Joyent, Inc.
#
# set temporary file name
if test ! -z "$TMPDIR" ; then
diff --git a/exec.c b/exec.c
index 009e1d2..598f9d1 100644
--- a/exec.c
+++ b/exec.c
@@ -3,6 +3,8 @@
*
* Copyright (c) 2003 Fabrice Bellard
*
+ * Portions Copyright 2011 Joyent, Inc.
+ *
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
diff --git a/hw/hw.h b/hw/hw.h
index a412c18..60391e6 100644
--- a/hw/hw.h
+++ b/hw/hw.h
@@ -1,4 +1,6 @@
/* Declarations for use by hardware emulation. */
+/* Copyright 2011 QEMU contributors */
+/* Portions Copyright 2011 Joyent, Inc. */
#ifndef QEMU_HW_H
#define QEMU_HW_H
diff --git a/hw/pc.c b/hw/pc.c
index 3d7ed27..fe384e9 100644
--- a/hw/pc.c
+++ b/hw/pc.c
@@ -2,6 +2,7 @@
* QEMU PC System Emulator
*
* Copyright (c) 2003-2004 Fabrice Bellard
+ * Copyright 2011 Joyent, Inc.
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
diff --git a/kvm-all.c b/kvm-all.c
index d96cb6a..17573ff 100644
--- a/kvm-all.c
+++ b/kvm-all.c
@@ -11,6 +11,7 @@
* This work is licensed under the terms of the GNU GPL, version 2 or later.
* See the COPYING file in the top-level directory.
*
+ * Copyright 2011 Joyent, Inc.
*/
#include <sys/types.h>
diff --git a/kvm.h b/kvm.h
index 401b960..c44bde8 100644
--- a/kvm.h
+++ b/kvm.h
@@ -9,6 +9,7 @@
* This work is licensed under the terms of the GNU GPL, version 2 or later.
* See the COPYING file in the top-level directory.
*
+ * Copyright 2011 Joyent, Inc.
*/
#ifndef QEMU_KVM_H
diff --git a/net.c b/net.c
index b55cd44..fe8ba3d 100644
--- a/net.c
+++ b/net.c
@@ -2,6 +2,7 @@
* QEMU System Emulator
*
* Copyright (c) 2003-2008 Fabrice Bellard
+ * Copyright 2011 Joyent, Inc.
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
diff --git a/net.h b/net.h
index e206f15..a264353 100644
--- a/net.h
+++ b/net.h
@@ -1,3 +1,7 @@
+/*
+ * Copyright 2011 QEMU contributors
+ * Portions Copyright 2011 Joyent, Inc.
+ */
#ifndef QEMU_NET_H
#define QEMU_NET_H
diff --git a/qemu-kvm-x86.c b/qemu-kvm-x86.c
index 7de3098..ed1aaab 100644
--- a/qemu-kvm-x86.c
+++ b/qemu-kvm-x86.c
@@ -2,6 +2,7 @@
* qemu/kvm integration, x86 specific code
*
* Copyright (C) 2006-2008 Qumranet Technologies
+ * Portions Copyright 2011 Joyent, Inc.
*
* Licensed under the terms of the GNU GPL version 2 or higher.
*/
diff --git a/qemu-kvm.c b/qemu-kvm.c
index fd46173..c21cbe9 100644
--- a/qemu-kvm.c
+++ b/qemu-kvm.c
@@ -2,6 +2,7 @@
* qemu/kvm integration
*
* Copyright (C) 2006-2008 Qumranet Technologies
+ * Portions Copyright 2011 Joyent, Inc.
*
* Licensed under the terms of the GNU GPL version 2 or higher.
*/
@@ -1535,7 +1536,9 @@ int kvm_init_ap(void)
qemu_add_vm_change_state_handler(kvm_vm_state_change_handler, NULL);
- signal(SIG_IPI, sig_ipi_handler);
+ memset(&action, 0, sizeof(action));
+ action.sa_sigaction = (void (*)(int, siginfo_t*, void*))sig_ipi_handler;
+ sigaction(SIG_IPI, &action, NULL);
memset(&action, 0, sizeof(action));
action.sa_flags = SA_SIGINFO;
diff --git a/qemu-kvm.h b/qemu-kvm.h
index febd73f..8445bf0 100644
--- a/qemu-kvm.h
+++ b/qemu-kvm.h
@@ -2,6 +2,7 @@
* qemu/kvm integration
*
* Copyright (C) 2006-2008 Qumranet Technologies
+ * Portions Copyright 2011 Joyent, Inc.
*
* Licensed under the terms of the GNU GPL version 2 or higher.
*/
diff --git a/qemu-malloc.c b/qemu-malloc.c
index d27d595..b99cf82 100644
--- a/qemu-malloc.c
+++ b/qemu-malloc.c
@@ -2,6 +2,7 @@
* malloc-like functions for system emulation.
*
* Copyright (c) 2006 Fabrice Bellard
+ * Portions Copyright 2011 Joyent, Inc.
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
diff --git a/qemu-timer.c b/qemu-timer.c
index 0c475d9..78764e6 100644
--- a/qemu-timer.c
+++ b/qemu-timer.c
@@ -2,6 +2,7 @@
* QEMU System Emulator
*
* Copyright (c) 2003-2008 Fabrice Bellard
+ * Portions Copyright 2011 Joyent, Inc.
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
diff --git a/target-i386/kvm.c b/target-i386/kvm.c
index 5533f20..ee5fc13 100644
--- a/target-i386/kvm.c
+++ b/target-i386/kvm.c
@@ -10,6 +10,7 @@
* This work is licensed under the terms of the GNU GPL, version 2 or later.
* See the COPYING file in the top-level directory.
*
+ * Portions Copyright 2011 Joyent, Inc.
*/
#include <sys/types.h>