From patchwork Mon Apr 15 13:19:24 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 236601 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 4CB8D2C00DA for ; Mon, 15 Apr 2013 23:27:13 +1000 (EST) Received: from localhost ([::1]:53719 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1URjR9-0006I4-Gr for incoming@patchwork.ozlabs.org; Mon, 15 Apr 2013 09:27:11 -0400 Received: from eggs.gnu.org ([208.118.235.92]:32822) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1URjQk-0006Ap-0c for qemu-devel@nongnu.org; Mon, 15 Apr 2013 09:26:50 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1URjJy-0001OR-RV for qemu-devel@nongnu.org; Mon, 15 Apr 2013 09:20:26 -0400 Received: from mail-bk0-x230.google.com ([2a00:1450:4008:c01::230]:60307) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1URjJy-0001Nt-Hh for qemu-devel@nongnu.org; Mon, 15 Apr 2013 09:19:46 -0400 Received: by mail-bk0-f48.google.com with SMTP id jf3so2385697bkc.35 for ; Mon, 15 Apr 2013 06:19:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=x-received:sender:from:to:cc:subject:date:message-id:x-mailer :in-reply-to:references; bh=yFt1hBCMRp+zpvYbD6yeE+SFAtBwjAs+Pik1s6F2PQ4=; b=yRIhOUuMaGSwnFnkdSQKJCpQj2Dink1GpLD0sCgnhp5NaVN87ZCTqsLyM+aK2xetEz 7xwYX7FJMmEAUWq2h7rRX+mAX5ZJyiBQvc2nJOW3W3pUoktZCFwwO8tqHwovA5y0t2Gf 690dtIxWpfa5bwGK5Woo63M4tbTwliOO9+iPRPJyMoZtDLqcxsTHYABTuMDY7PTwovPy Qs0X1OeJGZ+r8am139mMNDu1XESPu1+eRpmGpDETGa6raEtT9VUKhfAnamZuilPc4xpQ 7E2SOKDzBQL21VGaMlMpmhQXQIy3/+MqaQWqv6OUw8gRfOf8C9WTIY5PYixBM3mLGhlb H1GA== X-Received: by 10.204.244.198 with SMTP id lr6mr8201952bkb.1.1366031985657; Mon, 15 Apr 2013 06:19:45 -0700 (PDT) Received: from playground.lan (93-34-176-20.ip50.fastwebnet.it. [93.34.176.20]) by mx.google.com with ESMTPS id js7sm8527139bkb.9.2013.04.15.06.19.43 (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Mon, 15 Apr 2013 06:19:44 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Mon, 15 Apr 2013 15:19:24 +0200 Message-Id: <1366031973-7718-4-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.1.4 In-Reply-To: <1366031973-7718-1-git-send-email-pbonzini@redhat.com> References: <1366031973-7718-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2a00:1450:4008:c01::230 Cc: Hu Tao Subject: [Qemu-devel] [PATCH 03/12] Fix failure to create q35 machine 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: Hu Tao This is a regression introduced by c0907c9e6417c. How to reproduce: $ qemu-system-x86_64 -nodefaults -vnc :0 -M q35 qemu-system-x86_64: Unknown device 'q35-pcihost' for default sysbus Aborted (core dumped) Tested-by: Markus Armbruster Signed-off-by: Hu Tao Signed-off-by: Paolo Bonzini --- default-configs/i386-softmmu.mak | 2 +- default-configs/x86_64-softmmu.mak | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/default-configs/i386-softmmu.mak b/default-configs/i386-softmmu.mak index 4ac0694..6d9d364 100644 --- a/default-configs/i386-softmmu.mak +++ b/default-configs/i386-softmmu.mak @@ -42,6 +42,6 @@ CONFIG_ISA_TESTDEV=y CONFIG_VMPORT=y CONFIG_SGA=y CONFIG_LPC_ICH9=y -CONFIG_Q35=y +CONFIG_PCI_Q35=y CONFIG_APIC=y CONFIG_IOAPIC=y diff --git a/default-configs/x86_64-softmmu.mak b/default-configs/x86_64-softmmu.mak index bf4091c..3b06310 100644 --- a/default-configs/x86_64-softmmu.mak +++ b/default-configs/x86_64-softmmu.mak @@ -42,6 +42,6 @@ CONFIG_ISA_TESTDEV=y CONFIG_VMPORT=y CONFIG_SGA=y CONFIG_LPC_ICH9=y -CONFIG_Q35=y +CONFIG_PCI_Q35=y CONFIG_APIC=y CONFIG_IOAPIC=y