From patchwork Sat Mar 27 22:10:49 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Blue Swirl X-Patchwork-Id: 48759 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id D2766B7CF8 for ; Sun, 28 Mar 2010 09:42:32 +1100 (EST) Received: from localhost ([127.0.0.1]:36173 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NveLd-0002qK-BL for incoming@patchwork.ozlabs.org; Sat, 27 Mar 2010 18:19:17 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NveDV-0000va-8g for qemu-devel@nongnu.org; Sat, 27 Mar 2010 18:10:53 -0400 Received: from [140.186.70.92] (port=46047 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NveDT-0000uy-QB for qemu-devel@nongnu.org; Sat, 27 Mar 2010 18:10:52 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1NveDS-0007XM-2Y for qemu-devel@nongnu.org; Sat, 27 Mar 2010 18:10:51 -0400 Received: from mail-pv0-f173.google.com ([74.125.83.173]:60597) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1NveDR-0007Ux-SL for qemu-devel@nongnu.org; Sat, 27 Mar 2010 18:10:50 -0400 Received: by mail-pv0-f173.google.com with SMTP id 33so4983104pvf.4 for ; Sat, 27 Mar 2010 15:10:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:mime-version:received:date:received:message-id :subject:from:to:content-type; bh=+zYJPp+ozlBOyUc+37LZ2IxCqtCGueQCKyJ1KCqXyKo=; b=QA894Wv8KneD4Sov6NQDDgPKBChSrp7C2z+FLLoQOtRZC0MprAZmK5/eo57M+Ov29s XZmX1DCPshPVq5pAcMm7HyH01EKkHW5rgVOSs4V2Lc9eK7eOnD7vKscgulYgyTEUrs/b a5zjOu1KmB2LYbxrGo3n4cy9GU+zZZPZp7hTA= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=mime-version:date:message-id:subject:from:to:content-type; b=BZSu3P6QhP5c+g+D2qF5lKEPo0DENjDqXv4w0dFrFyVSEoKwwMdigKF16KTt7iLiYQ sps+9YO836r6ZmNekl6YEHcPzHqmioEUxDCUXJazhv7/+EAz8qxPePEcNVjc1fzxzAgG O/zDmXAvGXtxZ7BV8lVNkPw+31ZmxvLmCBAQo= MIME-Version: 1.0 Received: by 10.141.51.13 with HTTP; Sat, 27 Mar 2010 15:10:49 -0700 (PDT) Date: Sun, 28 Mar 2010 00:10:49 +0200 Received: by 10.141.105.12 with SMTP id h12mr110446rvm.166.1269727849569; Sat, 27 Mar 2010 15:10:49 -0700 (PDT) Message-ID: From: Blue Swirl To: qemu-devel X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) Subject: [Qemu-devel] [PATCH 4/7] Move KVM and Xen global flags to vl.c X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Signed-off-by: Blue Swirl --- hw/xen_machine_pv.c | 3 --- kvm-all.c | 2 -- vl.c | 4 ++++ 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/hw/xen_machine_pv.c b/hw/xen_machine_pv.c index 162f88d..586214d 100644 --- a/hw/xen_machine_pv.c +++ b/hw/xen_machine_pv.c @@ -29,9 +29,6 @@ #include "xen_backend.h" #include "xen_domainbuild.h" -uint32_t xen_domid; -enum xen_mode xen_mode = XEN_EMULATE; - static void xen_init_pv(ram_addr_t ram_size, const char *boot_device, const char *kernel_filename, diff --git a/kvm-all.c b/kvm-all.c index 534ead0..40b5a51 100644 --- a/kvm-all.c +++ b/kvm-all.c @@ -51,8 +51,6 @@ typedef struct KVMSlot typedef struct kvm_dirty_log KVMDirtyLog; -int kvm_allowed = 0; - struct KVMState { KVMSlot slots[32]; diff --git a/vl.c b/vl.c index a2869b8..d9fc0cc 100644 --- a/vl.c +++ b/vl.c @@ -258,6 +258,10 @@ uint8_t qemu_uuid[16]; static QEMUBootSetHandler *boot_set_handler; static void *boot_set_opaque; +int kvm_allowed = 0; +uint32_t xen_domid; +enum xen_mode xen_mode = XEN_EMULATE; + #ifdef SIGRTMIN #define SIG_IPI (SIGRTMIN+4) #else