Skip to content
Browse files

Merge branch 'master' of git.joyent.com:kvm-cmd-14

  • Loading branch information...
2 parents c3b74f8 + 36b02c7 commit 4749e36a8558c47e6db929595211e50bd08346ab @rgulewich rgulewich committed
Showing with 30 additions and 1 deletion.
  1. +4 −0 Makefile
  2. +2 −0 Makefile.objs
  3. +2 −0 Makefile.target
  4. +1 −0 configure
  5. +2 −0 exec.c
  6. +2 −0 hw/hw.h
  7. +1 −0 hw/pc.c
  8. +1 −0 kvm-all.c
  9. +1 −0 kvm.h
  10. +1 −0 net.c
  11. +4 −0 net.h
  12. +1 −0 qemu-kvm-x86.c
  13. +4 −1 qemu-kvm.c
  14. +1 −0 qemu-kvm.h
  15. +1 −0 qemu-malloc.c
  16. +1 −0 qemu-timer.c
  17. +1 −0 target-i386/kvm.c
View
4 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)
View
2 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
View
2 Makefile.target
@@ -1,3 +1,5 @@
+# Copyright 2011 QEMU contributors
+# Portions Copyright 2011 Joyent, Inc.
# -*- Mode: makefile -*-
GENERATED_HEADERS = config-target.h
View
1 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
View
2 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
View
2 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
View
1 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
View
1 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>
View
1 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
View
1 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
View
4 net.h
@@ -1,3 +1,7 @@
+/*
+ * Copyright 2011 QEMU contributors
+ * Portions Copyright 2011 Joyent, Inc.
+ */
#ifndef QEMU_NET_H
#define QEMU_NET_H
View
1 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.
*/
View
5 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;
View
1 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.
*/
View
1 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
View
1 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
View
1 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>

0 comments on commit 4749e36

Please sign in to comment.
Something went wrong with that request. Please try again.