From patchwork Mon Apr 15 19:28:17 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Edgar E. Iglesias" X-Patchwork-Id: 236705 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 9FC9A2C00DC for ; Tue, 16 Apr 2013 05:29:12 +1000 (EST) Received: from localhost ([::1]:56129 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1URp5S-0007X5-PA for incoming@patchwork.ozlabs.org; Mon, 15 Apr 2013 15:29:10 -0400 Received: from eggs.gnu.org ([208.118.235.92]:55285) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1URp4m-0007HH-Ic for qemu-devel@nongnu.org; Mon, 15 Apr 2013 15:28:34 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1URp4l-0002vr-6j for qemu-devel@nongnu.org; Mon, 15 Apr 2013 15:28:28 -0400 Received: from mail-ea0-x22c.google.com ([2a00:1450:4013:c01::22c]:57343) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1URp4l-0002vi-0g for qemu-devel@nongnu.org; Mon, 15 Apr 2013 15:28:27 -0400 Received: by mail-ea0-f172.google.com with SMTP id z7so2441488eaf.31 for ; Mon, 15 Apr 2013 12:28:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=x-received:from:to:cc:subject:date:message-id:x-mailer; bh=2eBeAddg20fFlN8WhZFgvZql+5EmMkA3CP9khLj7i3M=; b=uDnHLFhm4nGU64XQrSXCojVThMZlolb0fYsObF97kEuRRsEwQklOVgnfhO4aOm5Sc8 8jh7L3FivvuMgL6ZRjMNeNxZU48e0qOu5oP5iewD11uTtPLy+VFa/NBOb+o2N2i90PqA X3zHGGOJ70EcDBHnkpDMcqm8fqGlvlj0MeBPYbv8nXB9jHukwZbzyH9cNaPmPKkIRhtB Ixa0YdbVb4Fx1a74M0a7zRp/VFqqhOIgchzlxEjYPOLnQ1LbaEXZ8YWKxSn4Mh3Igv01 CeOybm7Vh5rc4upMmv9Mht85+c3apXhHjPKENp8jAc8q8XBruhE1GQY3baxQzGJC3sch tCOQ== X-Received: by 10.15.43.73 with SMTP id w49mr65755991eev.12.1366054106218; Mon, 15 Apr 2013 12:28:26 -0700 (PDT) Received: from localhost (h59ec325f.selukar.dyn.perspektivbredband.net. [89.236.50.95]) by mx.google.com with ESMTPS id x42sm9165417eee.0.2013.04.15.12.28.25 (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Mon, 15 Apr 2013 12:28:25 -0700 (PDT) From: edgar.iglesias@gmail.com To: qemu-devel@nongnu.org Date: Mon, 15 Apr 2013 21:28:17 +0200 Message-Id: <1366054097-14132-1-git-send-email-edgar.iglesias@gmail.com> X-Mailer: git-send-email 1.7.10.4 X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2a00:1450:4013:c01::22c Cc: anthony@codemonkey.ws Subject: [Qemu-devel] [PATCH] Allow qtest to be used together with a virtual CPU X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org From: "Edgar E. Iglesias" Signed-off-by: Edgar E. Iglesias --- vl.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/vl.c b/vl.c index c566caf..0dbac29 100644 --- a/vl.c +++ b/vl.c @@ -4143,6 +4143,10 @@ int main(int argc, char **argv, char **envp) configure_accelerator(); + if (!qtest_enabled() && qtest_chrdev) { + qtest_init(); + } + machine_opts = qemu_opts_find(qemu_find_opts("machine"), 0); if (machine_opts) { kernel_filename = qemu_opt_get(machine_opts, "kernel");