From nobody Wed Apr 24 17:06:17 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (209.51.188.17 [209.51.188.17]) by mx.zohomail.com with SMTPS id 154956285915148.89216004578452; Thu, 7 Feb 2019 10:07:39 -0800 (PST) Received: from localhost ([127.0.0.1]:44577 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gro5E-000147-RC for importer@patchew.org; Thu, 07 Feb 2019 13:07:32 -0500 Received: from eggs.gnu.org ([209.51.188.92]:57422) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1grnvw-0001x4-4f for qemu-devel@nongnu.org; Thu, 07 Feb 2019 12:57:58 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1grnvr-0002DW-UM for qemu-devel@nongnu.org; Thu, 07 Feb 2019 12:57:55 -0500 Received: from mail-wr1-x441.google.com ([2a00:1450:4864:20::441]:36556) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1grnvr-00024Q-GM for qemu-devel@nongnu.org; Thu, 07 Feb 2019 12:57:51 -0500 Received: by mail-wr1-x441.google.com with SMTP id z3so844615wrv.3 for ; Thu, 07 Feb 2019 09:57:40 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id q12sm12708982wmf.2.2019.02.07.09.57.38 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 07 Feb 2019 09:57:38 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=F5jc4J9x8VILzMAQcORMQdpxCvwUPh0SLsX+1SXABeU=; b=XmrTdJujvHwXOxBYkaMWZu+MQ3NNQD/Eok98U5NZ/btZJ+ISBboTkD3T9m0fTucJkv mA9zIK9zE2Jtso+lMF6Wj6hv8/HIjKrAEkWUhP+Gk3zg3zoe0297nrTtLEm34PyYJsUR KI1ciBu0iZ4n7VNAS5KWLWhUBEFJ+d7cppKryx88Gvh+zpaNUVi9lvf1iWMoqBBcWRXK XxRmNNB4gYcW82ANWGo5MicUpmlY6JplsbiAEysIOTRNYHcw7PNMcLTf5DaFX8gEbF8l OnakFtcVgGnw5ue6p8Y7jv+1qStd+mdtHOYfOO2f8oa53R0bq3G0GInD/GSD7uSKlTGc /ozg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=F5jc4J9x8VILzMAQcORMQdpxCvwUPh0SLsX+1SXABeU=; b=oPiNnuhEzu6olEFdMjn1syWav1kJW9F+cIdR8+DMHqj1KXM6bbw5qmlepxLtjJ0ROq ndPSf4Ts3F3lohsSisx0taSiS8m7SEAJM9jAtehE2L5CtonvcBWr0DGO3r1sc/Bx/WNK ba8X53AAIu3sFqm5nWL/f+M9rpnSeHEvXHhVn0vErN3mLboXxOI01lrEx3B9FNSpNUdz mOvIvQpsmbgjsYz5ZevEZ4WyhopwMWaTIwSlB3+jf5j9TEFEZNzP3GSCGiJxOGNxRX39 /mjxtUTrSkbDX9spNS0bVIiVJGh3V7znb/2Z6/zxsjD3I4ZA0QbOax+bIElvKTbJROLz I6Nw== X-Gm-Message-State: AHQUAua2dwKc5cmn5bQ6WPnOj4VFi8ZIChCKiIRdqy6/9a6MzsK3d8Mu RtIn+LatmhVkerO2cbFS+D5tOdAY X-Google-Smtp-Source: AHgI3IZiCcas1SfAZIwNPZM43D6VxHsqaRfBvBoKbHT7PhZ5c9Z3lNADfGv7d3aehavXW8lY7r4h4A== X-Received: by 2002:adf:f604:: with SMTP id t4mr13811509wrp.302.1549562258842; Thu, 07 Feb 2019 09:57:38 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Thu, 7 Feb 2019 18:56:44 +0100 Message-Id: <1549562254-41157-2-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1549562254-41157-1-git-send-email-pbonzini@redhat.com> References: <1549562254-41157-1-git-send-email-pbonzini@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::441 Subject: [Qemu-devel] [PATCH 01/51] minikconfig: add parser skeleton X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: thuth@redhat.com, philmd@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) This implements a scanner and recursive descent parser for Kconfig-like configuration files. The only "action" of the parser is for now to detect undefined variables and process include files. The main differences between Kconfig and this are: * only the "bool" type is supported * variables can only be defined once * choices are not supported (but they could be added as syntactic sugar for multiple Boolean values) * menus and other graphical concepts (prompts, help text) are not supported * assignments ("CONFIG_FOO=3Dy", "CONFIG_FOO=3Dn") are parsed as part of the Kconfig language, not as a separate file. The idea was originally by =C3=81kos Kov=C3=A1cs, but I could not find his implementation so I had to redo it. Signed-off-by: Paolo Bonzini Message-Id: <20190123065618.3520-23-yang.zhong@intel.com> Signed-off-by: Paolo Bonzini Reviewed-by: Michael S. Tsirkin --- scripts/minikconf.py | 441 +++++++++++++++++++++++++++++++++++++++++++++++= ++++ 1 file changed, 441 insertions(+) create mode 100644 scripts/minikconf.py diff --git a/scripts/minikconf.py b/scripts/minikconf.py new file mode 100644 index 0000000..8861a32 --- /dev/null +++ b/scripts/minikconf.py @@ -0,0 +1,441 @@ +# +# Mini-Kconfig parser +# +# Copyright (c) 2015 Red Hat Inc. +# +# Authors: +# Paolo Bonzini +# +# This work is licensed under the terms of the GNU GPL, version 2 +# or, at your option, any later version. See the COPYING file in +# the top-level directory. + +from __future__ import print_function +import os +import sys + + __all__ =3D [ 'KconfigParserError', 'KconfigData', 'KconfigParser' ] + +def debug_print(*args): + print('#' + (' '.join(str(x) for x in args))) + pass + +# ------------------------------------------- +# KconfigData implements the Kconfig semantics. For now it can only +# detect undefined symbols, i.e. symbols that were referenced in +# assignments or dependencies but were not declared with "config FOO". +# +# Semantic actions are represented by methods called do_*. The do_var +# method return the semantic value of a variable (which right now is +# just its name). +# ------------------------------------------- + +class KconfigData: + def __init__(self): + self.previously_included =3D [] + self.incl_info =3D None + self.defined_vars =3D set() + self.referenced_vars =3D set() + + # semantic analysis ------------- + + def check_undefined(self): + undef =3D False + for i in self.referenced_vars: + if not (i in self.defined_vars): + print("undefined symbol %s" % (i), file=3Dsys.stderr) + undef =3D True + return undef + + # semantic actions ------------- + + def do_declaration(self, var): + if (var in self.defined_vars): + raise Exception('variable "' + var + '" defined twice') + + self.defined_vars.add(var) + + # var is a string with the variable's name. + # + # For now this just returns the variable's name itself. + def do_var(self, var): + self.referenced_vars.add(var) + return var + + def do_assignment(self, var, val): + pass + + def do_default(self, var, val, cond=3DNone): + pass + + def do_depends_on(self, var, expr): + pass + + def do_select(self, var, symbol, cond=3DNone): + pass + + def do_imply(self, var, symbol, cond=3DNone): + pass + +# ------------------------------------------- +# KconfigParser implements a recursive descent parser for (simplified) +# Kconfig syntax. +# ------------------------------------------- + +# tokens table +TOKENS =3D {} +TOK_NONE =3D -1 +TOK_LPAREN =3D 0; TOKENS[TOK_LPAREN] =3D '"("'; +TOK_RPAREN =3D 1; TOKENS[TOK_RPAREN] =3D '")"'; +TOK_EQUAL =3D 2; TOKENS[TOK_EQUAL] =3D '"=3D"'; +TOK_AND =3D 3; TOKENS[TOK_AND] =3D '"&&"'; +TOK_OR =3D 4; TOKENS[TOK_OR] =3D '"||"'; +TOK_NOT =3D 5; TOKENS[TOK_NOT] =3D '"!"'; +TOK_DEPENDS =3D 6; TOKENS[TOK_DEPENDS] =3D '"depends"'; +TOK_ON =3D 7; TOKENS[TOK_ON] =3D '"on"'; +TOK_SELECT =3D 8; TOKENS[TOK_SELECT] =3D '"select"'; +TOK_IMPLY =3D 9; TOKENS[TOK_IMPLY] =3D '"imply"'; +TOK_CONFIG =3D 10; TOKENS[TOK_CONFIG] =3D '"config"'; +TOK_DEFAULT =3D 11; TOKENS[TOK_DEFAULT] =3D '"default"'; +TOK_Y =3D 12; TOKENS[TOK_Y] =3D '"y"'; +TOK_N =3D 13; TOKENS[TOK_N] =3D '"n"'; +TOK_SOURCE =3D 14; TOKENS[TOK_SOURCE] =3D '"source"'; +TOK_BOOL =3D 15; TOKENS[TOK_BOOL] =3D '"bool"'; +TOK_IF =3D 16; TOKENS[TOK_IF] =3D '"if"'; +TOK_ID =3D 17; TOKENS[TOK_ID] =3D 'identifier'; +TOK_EOF =3D 18; TOKENS[TOK_EOF] =3D 'end of file'; + +class KconfigParserError(Exception): + def __init__(self, parser, msg, tok=3DNone): + self.loc =3D parser.location() + tok =3D tok or parser.tok + if tok !=3D TOK_NONE: + location =3D TOKENS.get(tok, None) or ('"%s"' % tok) + msg =3D '%s before %s' % (msg, location) + self.msg =3D msg + + def __str__(self): + return "%s: %s" % (self.loc, self.msg) + +class KconfigParser: + @classmethod + def parse(self, fp): + data =3D KconfigData() + parser =3D KconfigParser(data) + parser.parse_file(fp) + if data.check_undefined(): + raise KconfigParserError(parser, "there were undefined symbols= ") + + return data + + def __init__(self, data): + self.data =3D data + + def parse_file(self, fp): + self.abs_fname =3D os.path.abspath(fp.name) + self.fname =3D fp.name + self.data.previously_included.append(self.abs_fname) + self.src =3D fp.read() + if self.src =3D=3D '' or self.src[-1] !=3D '\n': + self.src +=3D '\n' + self.cursor =3D 0 + self.line =3D 1 + self.line_pos =3D 0 + self.get_token() + self.parse_config() + + # file management ----- + + def error_path(self): + inf =3D self.data.incl_info + res =3D "" + while inf: + res =3D ("In file included from %s:%d:\n" % (inf['file'], + inf['line'])) + res + inf =3D inf['parent'] + return res + + def location(self): + col =3D 1 + for ch in self.src[self.line_pos:self.pos]: + if ch =3D=3D '\t': + col +=3D 8 - ((col - 1) % 8) + else: + col +=3D 1 + return '%s%s:%d:%d' %(self.error_path(), self.fname, self.line, co= l) + + def do_include(self, include): + incl_abs_fname =3D os.path.join(os.path.dirname(self.abs_fname), + include) + # catch inclusion cycle + inf =3D self.data.incl_info + while inf: + if incl_abs_fname =3D=3D os.path.abspath(inf['file']): + raise KconfigParserError(self, "Inclusion loop for %s" + % include) + inf =3D inf['parent'] + + # skip multiple include of the same file + if incl_abs_fname in self.data.previously_included: + return + try: + fp =3D open(incl_abs_fname, 'r') + except IOError as e: + raise KconfigParserError(self, + '%s: %s' % (e.strerror, include)) + + inf =3D self.data.incl_info + self.data.incl_info =3D { 'file': self.fname, 'line': self.line, + 'parent': inf } + KconfigParser(self.data).parse_file(fp) + self.data.incl_info =3D inf + + # recursive descent parser ----- + + # y_or_n: Y | N + def parse_y_or_n(self): + if self.tok =3D=3D TOK_Y: + self.get_token() + return True + if self.tok =3D=3D TOK_N: + self.get_token() + return False + raise KconfigParserError(self, 'Expected "y" or "n"') + + # var: ID + def parse_var(self): + if self.tok =3D=3D TOK_ID: + val =3D self.val + self.get_token() + return self.data.do_var(val) + else: + raise KconfigParserError(self, 'Expected identifier') + + # assignment_var: ID (starting with "CONFIG_") + def parse_assignment_var(self): + if self.tok =3D=3D TOK_ID: + val =3D self.val + if not val.startswith("CONFIG_"): + raise KconfigParserError(self, + 'Expected identifier starting with "CONFIG_"', = TOK_NONE) + self.get_token() + return self.data.do_var(val[7:]) + else: + raise KconfigParserError(self, 'Expected identifier') + + # assignment: var EQUAL y_or_n + def parse_assignment(self): + var =3D self.parse_assignment_var() + if self.tok !=3D TOK_EQUAL: + raise KconfigParserError(self, 'Expected "=3D"') + self.get_token() + self.data.do_assignment(var, self.parse_y_or_n()) + + # primary: NOT primary + # | LPAREN expr RPAREN + # | var + def parse_primary(self): + if self.tok =3D=3D TOK_NOT: + self.get_token() + self.parse_primary() + elif self.tok =3D=3D TOK_LPAREN: + self.get_token() + self.parse_expr() + if self.tok !=3D TOK_RPAREN: + raise KconfigParserError(self, 'Expected ")"') + self.get_token() + elif self.tok =3D=3D TOK_ID: + self.parse_var() + else: + raise KconfigParserError(self, 'Expected "!" or "(" or identif= ier') + + # disj: primary (OR primary)* + def parse_disj(self): + self.parse_primary() + while self.tok =3D=3D TOK_OR: + self.get_token() + self.parse_primary() + + # expr: disj (AND disj)* + def parse_expr(self): + self.parse_disj() + while self.tok =3D=3D TOK_AND: + self.get_token() + self.parse_disj() + + # condition: IF expr + # | empty + def parse_condition(self): + if self.tok =3D=3D TOK_IF: + self.get_token() + return self.parse_expr() + else: + return None + + # property: DEFAULT y_or_n condition + # | DEPENDS ON expr + # | SELECT var condition + # | BOOL + def parse_property(self, var): + if self.tok =3D=3D TOK_DEFAULT: + self.get_token() + val =3D self.parse_y_or_n() + cond =3D self.parse_condition() + self.data.do_default(var, val, cond) + elif self.tok =3D=3D TOK_DEPENDS: + self.get_token() + if self.tok !=3D TOK_ON: + raise KconfigParserError(self, 'Expected "on"') + self.get_token() + self.data.do_depends_on(var, self.parse_expr()) + elif self.tok =3D=3D TOK_SELECT: + self.get_token() + symbol =3D self.parse_var() + cond =3D self.parse_condition() + self.data.do_select(var, symbol, cond) + elif self.tok =3D=3D TOK_IMPLY: + self.get_token() + symbol =3D self.parse_var() + cond =3D self.parse_condition() + self.data.do_imply(var, symbol, cond) + elif self.tok =3D=3D TOK_BOOL: + self.get_token() + else: + raise KconfigParserError(self, 'Error in recursive descent?') + + # properties: properties property + # | /* empty */ + def parse_properties(self, var): + had_default =3D False + while self.tok =3D=3D TOK_DEFAULT or self.tok =3D=3D TOK_DEPENDS o= r \ + self.tok =3D=3D TOK_SELECT or self.tok =3D=3D TOK_BOOL or \ + self.tok =3D=3D TOK_IMPLY: + self.parse_property(var) + self.data.do_default(var, False) + + # for nicer error message + if self.tok !=3D TOK_SOURCE and self.tok !=3D TOK_CONFIG and \ + self.tok !=3D TOK_ID and self.tok !=3D TOK_EOF: + raise KconfigParserError(self, 'expected "source", "config", i= dentifier, ' + + '"default", "depends on", "imply" or "select"') + + # declaration: config var properties + def parse_declaration(self): + if self.tok =3D=3D TOK_CONFIG: + self.get_token() + var =3D self.parse_var() + self.data.do_declaration(var) + self.parse_properties(var) + else: + raise KconfigParserError(self, 'Error in recursive descent?') + + # clause: SOURCE + # | declaration + # | assignment + def parse_clause(self): + if self.tok =3D=3D TOK_SOURCE: + val =3D self.val + self.get_token() + self.do_include(val) + elif self.tok =3D=3D TOK_CONFIG: + self.parse_declaration() + elif self.tok =3D=3D TOK_ID: + self.parse_assignment() + else: + raise KconfigParserError(self, 'expected "source", "config" or= identifier') + + # config: clause+ EOF + def parse_config(self): + while self.tok !=3D TOK_EOF: + self.parse_clause() + return self.data + + # scanner ----- + + def get_token(self): + while True: + self.tok =3D self.src[self.cursor] + self.pos =3D self.cursor + self.cursor +=3D 1 + + self.val =3D None + self.tok =3D self.scan_token() + if self.tok is not None: + return + + def check_keyword(self, rest): + if not self.src.startswith(rest, self.cursor): + return False + length =3D len(rest) + if self.src[self.cursor + length].isalnum() or self.src[self.curso= r + length] =3D=3D '|': + return False + self.cursor +=3D length + return True + + def scan_token(self): + if self.tok =3D=3D '#': + self.cursor =3D self.src.find('\n', self.cursor) + return None + elif self.tok =3D=3D '=3D': + return TOK_EQUAL + elif self.tok =3D=3D '(': + return TOK_LPAREN + elif self.tok =3D=3D ')': + return TOK_RPAREN + elif self.tok =3D=3D '&' and self.src[self.pos+1] =3D=3D '&': + self.cursor +=3D 1 + return TOK_AND + elif self.tok =3D=3D '|' and self.src[self.pos+1] =3D=3D '|': + self.cursor +=3D 1 + return TOK_OR + elif self.tok =3D=3D '!': + return TOK_NOT + elif self.tok =3D=3D 'd' and self.check_keyword("epends"): + return TOK_DEPENDS + elif self.tok =3D=3D 'o' and self.check_keyword("n"): + return TOK_ON + elif self.tok =3D=3D 's' and self.check_keyword("elect"): + return TOK_SELECT + elif self.tok =3D=3D 'i' and self.check_keyword("mply"): + return TOK_IMPLY + elif self.tok =3D=3D 'c' and self.check_keyword("onfig"): + return TOK_CONFIG + elif self.tok =3D=3D 'd' and self.check_keyword("efault"): + return TOK_DEFAULT + elif self.tok =3D=3D 'b' and self.check_keyword("ool"): + return TOK_BOOL + elif self.tok =3D=3D 'i' and self.check_keyword("f"): + return TOK_IF + elif self.tok =3D=3D 'y' and self.check_keyword(""): + return TOK_Y + elif self.tok =3D=3D 'n' and self.check_keyword(""): + return TOK_N + elif (self.tok =3D=3D 's' and self.check_keyword("ource")) or \ + self.tok =3D=3D 'i' and self.check_keyword("nclude"): + # source FILENAME + # include FILENAME + while self.src[self.cursor].isspace(): + self.cursor +=3D 1 + start =3D self.cursor + self.cursor =3D self.src.find('\n', self.cursor) + self.val =3D self.src[start:self.cursor] + return TOK_SOURCE + elif self.tok.isalpha(): + # identifier + while self.src[self.cursor].isalnum() or self.src[self.cursor]= =3D=3D '_': + self.cursor +=3D 1 + self.val =3D self.src[self.pos:self.cursor] + return TOK_ID + elif self.tok =3D=3D '\n': + if self.cursor =3D=3D len(self.src): + return TOK_EOF + self.line +=3D 1 + self.line_pos =3D self.cursor + elif not self.tok.isspace(): + raise KconfigParserError(self, 'invalid input') + + return None + +if __name__ =3D=3D '__main__': + fname =3D len(sys.argv) > 1 and sys.argv[1] or 'Kconfig.test' + KconfigParser.parse(open(fname, 'r')) --=20 1.8.3.1 From nobody Wed Apr 24 17:06:17 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (209.51.188.17 [209.51.188.17]) by mx.zohomail.com with SMTPS id 1549563317594112.00968296925339; Thu, 7 Feb 2019 10:15:17 -0800 (PST) Received: from localhost ([127.0.0.1]:44676 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1groCd-0007Ak-FX for importer@patchew.org; Thu, 07 Feb 2019 13:15:11 -0500 Received: from eggs.gnu.org ([209.51.188.92]:57332) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1grnvt-0001vl-5C for qemu-devel@nongnu.org; Thu, 07 Feb 2019 12:57:55 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1grnvr-0002Cw-K5 for qemu-devel@nongnu.org; Thu, 07 Feb 2019 12:57:53 -0500 Received: from mail-wr1-x42e.google.com ([2a00:1450:4864:20::42e]:42492) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1grnvr-00024e-B6 for qemu-devel@nongnu.org; Thu, 07 Feb 2019 12:57:51 -0500 Received: by mail-wr1-x42e.google.com with SMTP id q18so796758wrx.9 for ; Thu, 07 Feb 2019 09:57:41 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id q12sm12708982wmf.2.2019.02.07.09.57.38 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 07 Feb 2019 09:57:39 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=IDz5+AjM9ntwURv6j4a/LPDTIE0YEl+7NnnpAPIGCW4=; b=ciSiKV3WlJdR35H2Zw0K7BvLpR2Aqa99OZVWFH8+a2f1H/TDsiBBjWsJg3lcNrsAm9 Fjd+CwcudvUHjsU//A/np0ES6HvYN9+3RYtdaFBb6HhLNT/rr1KMcZU1+4O8RA4wXC+J mFE8ChP1CDYy0FMh6Wxn73qGOueRHePaVfNHQ0owY+ZeVUS5hb8xNsl3He+M59OWaLoh Nr6Q+zc4uSpHYQVO7f/XEUDQSSAND69r2MuXBBOpQBU1QfFGIJ4adFnwgLUwPL18MODR UetugcNsyt0yS0I1k1zBsA/l7pYWrQ7bvrBQfEoOUpUitAFEfAKmVaaU5yDdZvKyrlga ECgg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=IDz5+AjM9ntwURv6j4a/LPDTIE0YEl+7NnnpAPIGCW4=; b=mUmRojgKxo0f3OK2EzQL2oVVqOxJilZ401OjExACj8VVq55ENMeBjp2AQ3LW68YdGM ohuKGhDageMhpzMxiDOYtlWBkFnkEpfSMfq1IeNbADbu2WlkXywdqRK4rCKBpCOZANRF 3hNKokpOQaHbQ4JJ/SBJ70ttWX8HX9wRMo7dpdT8W6Mk/PKbFMrQjngMgPOaI4wHraJ7 llA+Pygsg7Yi1e7xBgbXOMaQ7zK0D6KNGSwN9frgXxbg6UEGar9OUiUPMgWH5d6KriBq lnz6r2V/mnEYgluzCRcMCf06gKAD0VUlxq0E4mVxYhVocx3kgBsFk6tGF7owXS2yvzoQ m8+A== X-Gm-Message-State: AHQUAubEFA+r5ZpAgZfqZvpybmO6ZuI6GtZDAn+Ujvo4+hzKtscJjyTY JJwzYmbawxJF93ogQaQuPoqj7Ybh X-Google-Smtp-Source: AHgI3IYz4QI47KmUARKyDCnFkMwMwmCP9Mj17qfuP4MAJ+XyTM2GV6IgCfec4cSthbHa0joaGofB/g== X-Received: by 2002:adf:dfd1:: with SMTP id q17mr13827538wrn.27.1549562259630; Thu, 07 Feb 2019 09:57:39 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Thu, 7 Feb 2019 18:56:45 +0100 Message-Id: <1549562254-41157-3-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1549562254-41157-1-git-send-email-pbonzini@redhat.com> References: <1549562254-41157-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::42e Subject: [Qemu-devel] [PATCH 02/51] minikconfig: add AST X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: thuth@redhat.com, philmd@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Add Python classes that represent the Kconfig abstract syntax tree. The abstract syntax tree is stored as a list of clauses. For example: config FOO depends on BAR select BAZ is represented as three clauses: FOO depends on BAR FOO default n select BAZ if FOO Signed-off-by: Paolo Bonzini Message-Id: <20190123065618.3520-24-yang.zhong@intel.com> Signed-off-by: Paolo Bonzini Reviewed-by: Michael S. Tsirkin --- scripts/minikconf.py | 121 +++++++++++++++++++++++++++++++++++++++++++----= ---- 1 file changed, 102 insertions(+), 19 deletions(-) diff --git a/scripts/minikconf.py b/scripts/minikconf.py index 8861a32..d74b9df 100644 --- a/scripts/minikconf.py +++ b/scripts/minikconf.py @@ -31,11 +31,84 @@ def debug_print(*args): # ------------------------------------------- =20 class KconfigData: + class Expr: + def __and__(self, rhs): + return KconfigData.AND(self, rhs) + def __or__(self, rhs): + return KconfigData.OR(self, rhs) + def __invert__(self): + return KconfigData.NOT(self) + + class AND(Expr): + def __init__(self, lhs, rhs): + self.lhs =3D lhs + self.rhs =3D rhs + def __str__(self): + return "(%s && %s)" % (self.lhs, self.rhs) + + class OR(Expr): + def __init__(self, lhs, rhs): + self.lhs =3D lhs + self.rhs =3D rhs + def __str__(self): + return "(%s || %s)" % (self.lhs, self.rhs) + + class NOT(Expr): + def __init__(self, lhs): + self.lhs =3D lhs + def __str__(self): + return "!%s" % (self.lhs) + + class Var(Expr): + def __init__(self, name): + self.name =3D name + self.value =3D None + def __str__(self): + return self.name + + class Clause: + def __init__(self, dest): + self.dest =3D dest + + class AssignmentClause(Clause): + def __init__(self, dest, value): + KconfigData.Clause.__init__(self, dest) + self.value =3D value + def __str__(self): + return "%s=3D%s" % (self.dest, 'y' if self.value else 'n') + + class DefaultClause(Clause): + def __init__(self, dest, value, cond=3DNone): + KconfigData.Clause.__init__(self, dest) + self.value =3D value + self.cond =3D cond + def __str__(self): + value =3D 'y' if self.value else 'n' + if self.cond is None: + return "config %s default %s" % (self.dest, value) + else: + return "config %s default %s if %s" % (self.dest, value, s= elf.cond) + + class DependsOnClause(Clause): + def __init__(self, dest, expr): + KconfigData.Clause.__init__(self, dest) + self.expr =3D expr + def __str__(self): + return "config %s depends on %s" % (self.dest, self.expr) + + class SelectClause(Clause): + def __init__(self, dest, cond): + KconfigData.Clause.__init__(self, dest) + self.cond =3D cond + def __str__(self): + return "select %s if %s" % (self.dest, self.cond) + def __init__(self): self.previously_included =3D [] self.incl_info =3D None self.defined_vars =3D set() - self.referenced_vars =3D set() + self.referenced_vars =3D dict() + self.clauses =3D list() =20 # semantic analysis ------------- =20 @@ -53,29 +126,34 @@ class KconfigData: if (var in self.defined_vars): raise Exception('variable "' + var + '" defined twice') =20 - self.defined_vars.add(var) + self.defined_vars.add(var.name) =20 # var is a string with the variable's name. - # - # For now this just returns the variable's name itself. def do_var(self, var): - self.referenced_vars.add(var) - return var + if (var in self.referenced_vars): + return self.referenced_vars[var] + + var_obj =3D self.referenced_vars[var] =3D KconfigData.Var(var) + return var_obj =20 def do_assignment(self, var, val): - pass + self.clauses.append(KconfigData.AssignmentClause(var, val)) =20 def do_default(self, var, val, cond=3DNone): - pass + self.clauses.append(KconfigData.DefaultClause(var, val, cond)) =20 def do_depends_on(self, var, expr): - pass + self.clauses.append(KconfigData.DependsOnClause(var, expr)) =20 def do_select(self, var, symbol, cond=3DNone): - pass + cond =3D (cond & var) if cond is not None else var + self.clauses.append(KconfigData.SelectClause(symbol, cond)) =20 def do_imply(self, var, symbol, cond=3DNone): - pass + # "config X imply Y [if COND]" is the same as + # "config Y default y if X [&& COND]" + cond =3D (cond & var) if cond is not None else var + self.do_default(symbol, True, cond) =20 # ------------------------------------------- # KconfigParser implements a recursive descent parser for (simplified) @@ -237,31 +315,34 @@ class KconfigParser: def parse_primary(self): if self.tok =3D=3D TOK_NOT: self.get_token() - self.parse_primary() + val =3D ~self.parse_primary() elif self.tok =3D=3D TOK_LPAREN: self.get_token() - self.parse_expr() + val =3D self.parse_expr() if self.tok !=3D TOK_RPAREN: raise KconfigParserError(self, 'Expected ")"') self.get_token() elif self.tok =3D=3D TOK_ID: - self.parse_var() + val =3D self.parse_var() else: raise KconfigParserError(self, 'Expected "!" or "(" or identif= ier') + return val =20 # disj: primary (OR primary)* def parse_disj(self): - self.parse_primary() + lhs =3D self.parse_primary() while self.tok =3D=3D TOK_OR: self.get_token() - self.parse_primary() + lhs =3D lhs | self.parse_primary() + return lhs =20 # expr: disj (AND disj)* def parse_expr(self): - self.parse_disj() + lhs =3D self.parse_disj() while self.tok =3D=3D TOK_AND: self.get_token() - self.parse_disj() + lhs =3D lhs & self.parse_disj() + return lhs =20 # condition: IF expr # | empty @@ -438,4 +519,6 @@ class KconfigParser: =20 if __name__ =3D=3D '__main__': fname =3D len(sys.argv) > 1 and sys.argv[1] or 'Kconfig.test' - KconfigParser.parse(open(fname, 'r')) + data =3D KconfigParser.parse(open(fname, 'r')) + for i in data.clauses: + print i --=20 1.8.3.1 From nobody Wed Apr 24 17:06:17 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (209.51.188.17 [209.51.188.17]) by mx.zohomail.com with SMTPS id 15495625900611000.8439514383776; Thu, 7 Feb 2019 10:03:10 -0800 (PST) Received: from localhost ([127.0.0.1]:44515 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gro0t-0005sU-Sz for importer@patchew.org; Thu, 07 Feb 2019 13:03:04 -0500 Received: from eggs.gnu.org ([209.51.188.92]:57398) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1grnvv-0001wE-Ej for qemu-devel@nongnu.org; Thu, 07 Feb 2019 12:57:57 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1grnvr-0002Dc-W8 for qemu-devel@nongnu.org; Thu, 07 Feb 2019 12:57:55 -0500 Received: from mail-wr1-x443.google.com ([2a00:1450:4864:20::443]:46150) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1grnvr-000254-JE for qemu-devel@nongnu.org; Thu, 07 Feb 2019 12:57:51 -0500 Received: by mail-wr1-x443.google.com with SMTP id l9so762498wrt.13 for ; Thu, 07 Feb 2019 09:57:41 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id q12sm12708982wmf.2.2019.02.07.09.57.39 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 07 Feb 2019 09:57:40 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=HuMqdnrT+QqbUjlywYFuxOfs2R7PfYyfuisg3d4Eiv8=; b=NmJINKAuCHPu5hU0KVC08cqZ4R3OEKPsW0RwSMFJldZR0hHC2HbClWAqvc0QLhopb3 ZWSonNosZZhUmpQ/tMgkY1nH7N8ZHZY9RENFtPeMw6137PMgYPQZJmiLErxoyxeQGYXT FezKe6SROhAoRDlMdF8ZhA4wm+wn5u1p2j1XD4mKiFSRmwYffIblHbS1CAgICB/ovNtm o2LhtlcrKQ2v9QT+dX7rXMFJJor/AJlL/dKNeMd9WiikwgNTbxT0VmTPtlP72NEliBOr qBnIom6PjZqPdzQ20k6NNXP8ZNN73vwuD1KWXz5pHMwNovwtAWcTF7SWMp4CI2pTbCH1 mT5g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=HuMqdnrT+QqbUjlywYFuxOfs2R7PfYyfuisg3d4Eiv8=; b=lhMinl+AGc+5a2R94/f4uniDFk97xctHrXGZ+cmppolwXkvw6uyoyGjCUTNADrx5EN etzNln/1jLMurYq5FFWz67mJmfiTuxsSGQypULfuD509GZQ0Vs92A+CpbHgb/i3jIKLw I1sa7iJVM7mr7r1hNf5g9OJwXFeIAGVkesiRFMTEC2DPr//Uus1XV0dEZXAVWGYDWo/Z ECQ5fGj0fSyTIZyaLG9lqr3RLNigknJHDghjUzrE08dHJ+oC5CPU757PEpUomfiBvU6Y I21gUe11qMOC3IPAWYxgOzXPt8vm/yf1vpQ62eBIKnQHwsVi+bQDZAB2f9nQ9sfnL/Kh L/xw== X-Gm-Message-State: AHQUAuajhunDXGHLDB7/Ja16Iav96qQ3CH//0j/vBMFrPCH+39VmdU81 8C/Ewvh3JMDBDKpzrj1r56EqQNMW X-Google-Smtp-Source: AHgI3IZWNdWPNW0yPgjY1LIK19YwBPD6OtAF//ehVpDjIHtrPLbMvYwxZ2j+4wxWmLyNQ6TDP4Azaw== X-Received: by 2002:adf:dccd:: with SMTP id x13mr10060455wrm.162.1549562260631; Thu, 07 Feb 2019 09:57:40 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Thu, 7 Feb 2019 18:56:46 +0100 Message-Id: <1549562254-41157-4-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1549562254-41157-1-git-send-email-pbonzini@redhat.com> References: <1549562254-41157-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::443 Subject: [Qemu-devel] [PATCH 03/51] minikconfig: add semantic analysis X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: thuth@redhat.com, philmd@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" There are three parts in the semantic analysis: 1) evaluating expressions. This is done as a simple visit of the Expr nodes. 2) ordering clauses. This is done by constructing a graph of variables. There is an edge from X to Y if Y depends on X, if X selects Y, or if X appears in a conditional selection of Y; in other words, if the value of X can affect the value of Y. Each clause has a "destination" variable whose value can be affected by the clause, and clauses will be processed according to a topological sorting of their destination variables. Defaults are processed after all other clauses with the same destination. 3) deriving the value of the variables. This is done by processing the clauses in the topological order provided by the previous step. A "depends on" clause will force a variable to False, a "select" clause will force a variable to True, an assignment will force a variable to its RHS. A default will set a variable to its RHS if it has not been set before. Because all variables have a default, after visiting all clauses all variables will have been set. Signed-off-by: Paolo Bonzini Message-Id: <20190123065618.3520-25-yang.zhong@intel.com> Signed-off-by: Paolo Bonzini Reviewed-by: Michael S. Tsirkin --- scripts/minikconf.py | 138 +++++++++++++++++++++++++++++++++++++++++++++++= +--- 1 file changed, 130 insertions(+), 8 deletions(-) diff --git a/scripts/minikconf.py b/scripts/minikconf.py index d74b9df..2df14ca 100644 --- a/scripts/minikconf.py +++ b/scripts/minikconf.py @@ -20,6 +20,10 @@ def debug_print(*args): print('#' + (' '.join(str(x) for x in args))) pass =20 +def debug_print(*args): + #print ' '.join(str(x) for x in args) + pass + # ------------------------------------------- # KconfigData implements the Kconfig semantics. For now it can only # detect undefined symbols, i.e. symbols that were referenced in @@ -39,6 +43,12 @@ class KconfigData: def __invert__(self): return KconfigData.NOT(self) =20 + # Abstract methods + def add_edges_to(self, var): + pass + def evaluate(self): + assert False + class AND(Expr): def __init__(self, lhs, rhs): self.lhs =3D lhs @@ -46,6 +56,12 @@ class KconfigData: def __str__(self): return "(%s && %s)" % (self.lhs, self.rhs) =20 + def add_edges_to(self, var): + self.lhs.add_edges_to(var) + self.rhs.add_edges_to(var) + def evaluate(self): + return self.lhs.evaluate() and self.rhs.evaluate() + class OR(Expr): def __init__(self, lhs, rhs): self.lhs =3D lhs @@ -53,35 +69,85 @@ class KconfigData: def __str__(self): return "(%s || %s)" % (self.lhs, self.rhs) =20 + def add_edges_to(self, var): + self.lhs.add_edges_to(var) + self.rhs.add_edges_to(var) + def evaluate(self): + return self.lhs.evaluate() or self.rhs.evaluate() + class NOT(Expr): def __init__(self, lhs): self.lhs =3D lhs def __str__(self): return "!%s" % (self.lhs) =20 + def add_edges_to(self, var): + self.lhs.add_edges_to(var) + def evaluate(self): + return not self.lhs.evaluate() + class Var(Expr): def __init__(self, name): self.name =3D name self.value =3D None + self.outgoing =3D set() + self.clauses_for_var =3D list() def __str__(self): return self.name =20 + def has_value(self): + return not (self.value is None) + def set_value(self, val, clause): + self.clauses_for_var.append(clause) + if self.has_value() and self.value !=3D val: + print("The following clauses were found for " + self.name) + for i in self.clauses_for_var: + print(" " + str(i), file=3Dsys.stderr) + raise KconfigParserError('contradiction between clauses wh= en setting %s' % self) + debug_print("=3D> %s is now %s" % (self.name, val)) + self.value =3D val + + # depth first search of the dependency graph + def dfs(self, visited, f): + if self in visited: + return + visited.add(self) + for v in self.outgoing: + v.dfs(visited, f) + f(self) + + def add_edges_to(self, var): + self.outgoing.add(var) + def evaluate(self): + if not self.has_value(): + raise KconfigParserError('cycle found including %s' % self) + return self.value + class Clause: def __init__(self, dest): self.dest =3D dest + def priority(self): + return 0 + def process(self): + pass =20 class AssignmentClause(Clause): def __init__(self, dest, value): KconfigData.Clause.__init__(self, dest) self.value =3D value def __str__(self): - return "%s=3D%s" % (self.dest, 'y' if self.value else 'n') + return "CONFIG_%s=3D%s" % (self.dest, 'y' if self.value else '= n') + + def process(self): + self.dest.set_value(self.value, self) =20 class DefaultClause(Clause): def __init__(self, dest, value, cond=3DNone): KconfigData.Clause.__init__(self, dest) self.value =3D value self.cond =3D cond + if not (self.cond is None): + self.cond.add_edges_to(self.dest) def __str__(self): value =3D 'y' if self.value else 'n' if self.cond is None: @@ -89,20 +155,38 @@ class KconfigData: else: return "config %s default %s if %s" % (self.dest, value, s= elf.cond) =20 + def priority(self): + # Defaults are processed just before leaving the variable + return -1 + def process(self): + if not self.dest.has_value() and \ + (self.cond is None or self.cond.evaluate()): + self.dest.set_value(self.value, self) + class DependsOnClause(Clause): def __init__(self, dest, expr): KconfigData.Clause.__init__(self, dest) self.expr =3D expr + self.expr.add_edges_to(self.dest) def __str__(self): return "config %s depends on %s" % (self.dest, self.expr) =20 + def process(self): + if not self.expr.evaluate(): + self.dest.set_value(False, self) + class SelectClause(Clause): def __init__(self, dest, cond): KconfigData.Clause.__init__(self, dest) self.cond =3D cond + self.cond.add_edges_to(self.dest) def __str__(self): return "select %s if %s" % (self.dest, self.cond) =20 + def process(self): + if self.cond.evaluate(): + self.dest.set_value(True, self) + def __init__(self): self.previously_included =3D [] self.incl_info =3D None @@ -120,11 +204,54 @@ class KconfigData: undef =3D True return undef =20 + def compute_config(self): + if self.check_undefined(): + raise KconfigParserError(parser, "there were undefined symbols= ") + return None + + debug_print("Input:") + for clause in self.clauses: + debug_print(clause) + + debug_print("\nDependency graph:") + for i in self.referenced_vars: + debug_print(i, "->", [str(x) for x in self.referenced_vars[i].= outgoing]) + + # The reverse of the depth-first order is the topological sort + dfo =3D dict() + visited =3D set() + debug_print("\n") + def visit_fn(var): + debug_print(var, "has DFS number", len(dfo)) + dfo[var] =3D len(dfo) + + for name, v in self.referenced_vars.items(): + self.do_default(v, False) + v.dfs(visited, visit_fn) + + # Put higher DFS numbers and higher priorities first. This + # places the clauses in topological order and places defaults + # after assignments and dependencies. + self.clauses.sort(key=3Dlambda x: (-dfo[x.dest], -x.priority())) + + debug_print("\nSorted clauses:") + for clause in self.clauses: + debug_print(clause) + clause.process() + + debug_print("") + values =3D dict() + for name, v in self.referenced_vars.items(): + debug_print("Evaluating", name) + values[name] =3D v.evaluate() + + return values + # semantic actions ------------- =20 def do_declaration(self, var): if (var in self.defined_vars): - raise Exception('variable "' + var + '" defined twice') + raise KconfigParserError('variable "' + var + '" defined twice= ') =20 self.defined_vars.add(var.name) =20 @@ -201,9 +328,6 @@ class KconfigParser: data =3D KconfigData() parser =3D KconfigParser(data) parser.parse_file(fp) - if data.check_undefined(): - raise KconfigParserError(parser, "there were undefined symbols= ") - return data =20 def __init__(self, data): @@ -392,7 +516,6 @@ class KconfigParser: self.tok =3D=3D TOK_SELECT or self.tok =3D=3D TOK_BOOL or \ self.tok =3D=3D TOK_IMPLY: self.parse_property(var) - self.data.do_default(var, False) =20 # for nicer error message if self.tok !=3D TOK_SOURCE and self.tok !=3D TOK_CONFIG and \ @@ -520,5 +643,4 @@ class KconfigParser: if __name__ =3D=3D '__main__': fname =3D len(sys.argv) > 1 and sys.argv[1] or 'Kconfig.test' data =3D KconfigParser.parse(open(fname, 'r')) - for i in data.clauses: - print i + print data.compute_config() --=20 1.8.3.1 From nobody Wed Apr 24 17:06:17 2024 Delivered-To: importer@patchew.org Received-SPF: temperror (zoho.com: Error in retrieving data from DNS) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=temperror (zoho.com: Error in retrieving data from DNS) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (209.51.188.17 [209.51.188.17]) by mx.zohomail.com with SMTPS id 1549562402844337.07133575479963; Thu, 7 Feb 2019 10:00:02 -0800 (PST) Received: from localhost ([127.0.0.1]:44452 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1grnxn-0003MD-HP for importer@patchew.org; Thu, 07 Feb 2019 12:59:51 -0500 Received: from eggs.gnu.org ([209.51.188.92]:57333) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1grnvt-0001vn-5H for qemu-devel@nongnu.org; Thu, 07 Feb 2019 12:57:54 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1grnvr-0002DL-Sp for qemu-devel@nongnu.org; Thu, 07 Feb 2019 12:57:53 -0500 Received: from mail-wm1-x334.google.com ([2a00:1450:4864:20::334]:38272) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1grnvr-00025X-Gw for qemu-devel@nongnu.org; Thu, 07 Feb 2019 12:57:51 -0500 Received: by mail-wm1-x334.google.com with SMTP id v26so812143wmh.3 for ; Thu, 07 Feb 2019 09:57:42 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id q12sm12708982wmf.2.2019.02.07.09.57.40 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 07 Feb 2019 09:57:40 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=XrRdALztYRQEKPBj8xLXXrXCX2nLSJdUc2umIT3Qq+k=; b=RaKyiwvVmPqdsUDh6CDJL7L1AL2Z37k/6EO6GVe/6WaWb1Cj6F3mGnHSeJPrxHXAa4 oXLgG3qMRydoZX71higG06BKiQ8Hk1AhZve+Paxq/av8n4y1jiRKMdx6poYpD0dudLUz S67TJ26S0qGUlZsYPmB3czd4bO8SrzK4X5qC34gcmypX/mJbE+lIwty3LZbp/5ohJKwX r5TBaif1Qq1diqck18YHo3dDzTobebgYnCxlNVydu5IXqN6syrzkoD3/JWMag8VHtUCq lgwTnD0Qy5A8bw+yZ2c+dN8ueuf4TuE2o4yU7/YDqwFPPHF6OdnLregY2Zqt9KsWpwev TGGA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=XrRdALztYRQEKPBj8xLXXrXCX2nLSJdUc2umIT3Qq+k=; b=ON99ljeOgRDjFH8kE0x6ORoytuRzQleQ9u0mgPQevxQtKigmEkxomEmZ6M4s6P87eg 1++k5kf0DRdEnC4PHHw8eeKoZ22HwErZDV+r3bUOBniWcMrxQKQUTRj8y11XonDA3gHj OfEm00yzNS6oAYHsvchMljP9lnzbc+myxdxr2JM9wKv/GqEVhwX6dKr2009LArHC2h/l b6nUThWADu7OstPt3if6oy6LtAUr1qhanv04tuVF43POKjv28Ov/d7ZSCK+aXmbZuYOf vUMuEpH3xOH9VJ11jWH6pXEAKPaCUUp1f6e5DUjGZhDYKCoLTLn+6QdqxBgqJkCgDVFC PvlA== X-Gm-Message-State: AHQUAuZqWDqsNKQWonYuzGYK2iJCocuyNoRHDAJGDGowWBUpILb3btM4 lUPsSWVOCyFmvIrFd30dXvcOvSQC X-Google-Smtp-Source: AHgI3IbqE9KcoxFZgJeYQJRZX1AifV19eavMcBawm80dfR6KxdTIvuyN8hXzUBxn+yvl5D3/5FOodw== X-Received: by 2002:a1c:2787:: with SMTP id n129mr8701678wmn.128.1549562261629; Thu, 07 Feb 2019 09:57:41 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Thu, 7 Feb 2019 18:56:47 +0100 Message-Id: <1549562254-41157-5-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1549562254-41157-1-git-send-email-pbonzini@redhat.com> References: <1549562254-41157-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::334 Subject: [Qemu-devel] [PATCH 04/51] hw/display: make edid configurable X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Yang Zhong , thuth@redhat.com, philmd@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Yang Zhong Use CONFIG_EDID to make edid-generate.c and edid-region.c configurable. Signed-off-by: Yang Zhong Reviewed-by: Thomas Huth Message-Id: <20190123065618.3520-26-yang.zhong@intel.com> Signed-off-by: Paolo Bonzini Reviewed-by: Michael S. Tsirkin --- default-configs/pci.mak | 1 + hw/display/Makefile.objs | 4 +--- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/default-configs/pci.mak b/default-configs/pci.mak index 037636f..0552190 100644 --- a/default-configs/pci.mak +++ b/default-configs/pci.mak @@ -49,3 +49,4 @@ CONFIG_IVSHMEM_DEVICE=3D$(CONFIG_IVSHMEM) CONFIG_ROCKER=3Dy CONFIG_VFIO=3D$(CONFIG_LINUX) CONFIG_VFIO_PCI=3Dy +CONFIG_EDID=3Dy diff --git a/hw/display/Makefile.objs b/hw/display/Makefile.objs index 7c4ae9a..576fca4 100644 --- a/hw/display/Makefile.objs +++ b/hw/display/Makefile.objs @@ -1,4 +1,4 @@ -common-obj-y +=3D edid-generate.o +common-obj-$(CONFIG_EDID) +=3D edid-generate.o edid-region.o =20 common-obj-$(CONFIG_FW_CFG_DMA) +=3D ramfb.o common-obj-$(CONFIG_FW_CFG_DMA) +=3D ramfb-standalone.o @@ -15,12 +15,10 @@ common-obj-$(CONFIG_SSD0323) +=3D ssd0323.o common-obj-$(CONFIG_XEN) +=3D xenfb.o =20 common-obj-$(CONFIG_VGA_PCI) +=3D vga-pci.o -common-obj-$(CONFIG_VGA_PCI) +=3D edid-region.o common-obj-$(CONFIG_VGA_ISA) +=3D vga-isa.o common-obj-$(CONFIG_VGA_ISA_MM) +=3D vga-isa-mm.o common-obj-$(CONFIG_VMWARE_VGA) +=3D vmware_vga.o common-obj-$(CONFIG_BOCHS_DISPLAY) +=3D bochs-display.o -common-obj-$(CONFIG_BOCHS_DISPLAY) +=3D edid-region.o =20 common-obj-$(CONFIG_BLIZZARD) +=3D blizzard.o common-obj-$(CONFIG_EXYNOS4) +=3D exynos4210_fimd.o --=20 1.8.3.1 From nobody Wed Apr 24 17:06:17 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (209.51.188.17 [209.51.188.17]) by mx.zohomail.com with SMTPS id 1549562783135942.6112745339499; Thu, 7 Feb 2019 10:06:23 -0800 (PST) Received: from localhost ([127.0.0.1]:44575 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gro3y-0008Vy-SR for importer@patchew.org; Thu, 07 Feb 2019 13:06:14 -0500 Received: from eggs.gnu.org ([209.51.188.92]:57470) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1grnvy-0001zI-1P for qemu-devel@nongnu.org; Thu, 07 Feb 2019 12:58:01 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1grnvr-0002DQ-Sm for qemu-devel@nongnu.org; Thu, 07 Feb 2019 12:57:57 -0500 Received: from mail-wr1-x442.google.com ([2a00:1450:4864:20::442]:35344) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1grnvr-00026L-C8 for qemu-devel@nongnu.org; Thu, 07 Feb 2019 12:57:51 -0500 Received: by mail-wr1-x442.google.com with SMTP id z18so855371wrh.2 for ; Thu, 07 Feb 2019 09:57:44 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id q12sm12708982wmf.2.2019.02.07.09.57.41 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 07 Feb 2019 09:57:41 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=q354ild2avP6bYJc2ugYQ8MdodgNUQ5F7R3x1HBUaJ0=; b=R8PHTnH2eXg6Y7Cb9tSeCR4RpGAlPeNE4iuAyiDuSh8+vbXihwIdCbJN+8WRpmJsA/ UCfNyJqchOSjsWe52jncUs3TLWizc41ZqecF6oJhlrfWR4l41jOBJljc7pew8yBVHnjl R8xw27gNtJXKVlnZLAXQre0WWfoxiuSFbYN7JzGibs9Cr1CCtNui/1SFT2s3SS56tF63 LLrPzpTAyO3qChN4OucDLyuLiqU1p31J8gAPlzLKX0U3gNogyfNsLlMhRMnQsZlKFbas XPgRyROCEGyElxMs+fb6Gk+7gwpRDevoMZweG0DLy4ayo24VGx+OvNNQInoUGuaReqqg lbZQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=q354ild2avP6bYJc2ugYQ8MdodgNUQ5F7R3x1HBUaJ0=; b=KSBvASFjxPipWje4DLIVaq4W/vq5/XO2O3nwk/n0aB/mIfddr8V3RIwyhxLTx6aBED LWJy3Ai0rHBiL8kVv6VbIxjhxF2oeQ/8pEHlV60iOU/iEDUB5y03Qi0KhFAO1qZWHB7X f8X2bqs3VurEeb/VakhCf+aHpJ3rpAs5nHoi8bcEBoFZGPAGaGmWuLw5mLMkSgt6knVi my+HE+N/blGwxgVec8cJDdv2Q2+rezzt/+D8hrMEbW0COjNNrPqnDg3uW6VyrlGGD3yG nqsYF/63kQrsc4xfNn7r2MV8qKmzTEcsMDFkYQbLSqb52f5FY4sn6gg6nXum4RDsSXX+ JK6w== X-Gm-Message-State: AHQUAuZEwlqLAJd9+hnpxuJOi5aL8qEloA9pJkbwNgfXkeyoh0IailU0 r+xFqvzFG6/60ckFX43XJ3aJ5dDP X-Google-Smtp-Source: AHgI3IaCi4j9V4f4xpjVtmS8RTI+cJwgm7WXp0+2gWUcBv60cGRdcsNxqM/qbsZFNoHBOX2qrgFTww== X-Received: by 2002:a5d:6a52:: with SMTP id t18mr9674295wrw.131.1549562262502; Thu, 07 Feb 2019 09:57:42 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Thu, 7 Feb 2019 18:56:48 +0100 Message-Id: <1549562254-41157-6-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1549562254-41157-1-git-send-email-pbonzini@redhat.com> References: <1549562254-41157-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::442 Subject: [Qemu-devel] [PATCH 05/51] kconfig: introduce kconfig files X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Yang Zhong , thuth@redhat.com, philmd@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" The Kconfig files were generated mostly with this script: for i in `grep -ho CONFIG_[A-Z0-9_]* default-configs/* | sort -u`; do set fnord `git grep -lw $i -- 'hw/*/Makefile.objs' ` shift if test $# =3D 1; then cat >> $(dirname $1)/Kconfig << EOF config ${i#CONFIG_} bool EOF git add $(dirname $1)/Kconfig else echo $i $* fi done sed -i '$d' hw/*/Kconfig for i in hw/*; do if test -d $i && ! test -f $i/Kconfig; then touch $i/Kconfig git add $i/Kconfig fi done Whenever a symbol is referenced from multiple subdirectories, the script prints the list of directories that reference the symbol. These symbols have to be added manually to the Kconfig files. Kconfig.host and hw/Kconfig were created manually. Signed-off-by: Paolo Bonzini Signed-off-by: Yang Zhong Message-Id: <20190123065618.3520-27-yang.zhong@intel.com> Signed-off-by: Paolo Bonzini Reviewed-by: Michael S. Tsirkin --- Kconfig.host | 23 ++++++++++ hw/9pfs/Kconfig | 4 ++ hw/Kconfig | 68 +++++++++++++++++++++++++++++ hw/acpi/Kconfig | 20 +++++++++ hw/adc/Kconfig | 2 + hw/alpha/Kconfig | 2 + hw/arm/Kconfig | 119 ++++++++++++++++++++++++++++++++++++++++++++++= ++++ hw/audio/Kconfig | 35 +++++++++++++++ hw/block/Kconfig | 29 ++++++++++++ hw/bt/Kconfig | 2 + hw/char/Kconfig | 32 ++++++++++++++ hw/core/Kconfig | 11 +++++ hw/cpu/Kconfig | 8 ++++ hw/cris/Kconfig | 5 +++ hw/display/Kconfig | 77 ++++++++++++++++++++++++++++++++ hw/dma/Kconfig | 20 +++++++++ hw/gpio/Kconfig | 8 ++++ hw/hppa/Kconfig | 2 + hw/hyperv/Kconfig | 5 +++ hw/i2c/Kconfig | 20 +++++++++ hw/i386/Kconfig | 23 ++++++++++ hw/ide/Kconfig | 35 +++++++++++++++ hw/input/Kconfig | 23 ++++++++++ hw/intc/Kconfig | 47 ++++++++++++++++++++ hw/ipack/Kconfig | 2 + hw/ipmi/Kconfig | 14 ++++++ hw/isa/Kconfig | 23 ++++++++++ hw/lm32/Kconfig | 5 +++ hw/m68k/Kconfig | 8 ++++ hw/mem/Kconfig | 8 ++++ hw/microblaze/Kconfig | 8 ++++ hw/mips/Kconfig | 20 +++++++++ hw/misc/Kconfig | 94 +++++++++++++++++++++++++++++++++++++++ hw/misc/macio/Kconfig | 11 +++++ hw/moxie/Kconfig | 2 + hw/net/Kconfig | 92 ++++++++++++++++++++++++++++++++++++++ hw/nios2/Kconfig | 5 +++ hw/nvram/Kconfig | 8 ++++ hw/openrisc/Kconfig | 2 + hw/pci-bridge/Kconfig | 20 +++++++++ hw/pci-host/Kconfig | 35 +++++++++++++++ hw/pci/Kconfig | 2 + hw/pcmcia/Kconfig | 2 + hw/ppc/Kconfig | 44 +++++++++++++++++++ hw/riscv/Kconfig | 20 +++++++++ hw/s390x/Kconfig | 2 + hw/scsi/Kconfig | 26 +++++++++++ hw/sd/Kconfig | 11 +++++ hw/sh4/Kconfig | 11 +++++ hw/smbios/Kconfig | 2 + hw/sparc/Kconfig | 11 +++++ hw/sparc64/Kconfig | 5 +++ hw/ssi/Kconfig | 14 ++++++ hw/timer/Kconfig | 53 ++++++++++++++++++++++ hw/tpm/Kconfig | 14 ++++++ hw/tricore/Kconfig | 2 + hw/unicore32/Kconfig | 2 + hw/usb/Kconfig | 53 ++++++++++++++++++++++ hw/vfio/Kconfig | 20 +++++++++ hw/virtio/Kconfig | 17 ++++++++ hw/watchdog/Kconfig | 11 +++++ hw/xtensa/Kconfig | 5 +++ scripts/minikconf.py | 35 +++++++++++++-- 63 files changed, 1336 insertions(+), 3 deletions(-) create mode 100644 Kconfig.host create mode 100644 hw/9pfs/Kconfig create mode 100644 hw/Kconfig create mode 100644 hw/acpi/Kconfig create mode 100644 hw/adc/Kconfig create mode 100644 hw/alpha/Kconfig create mode 100644 hw/arm/Kconfig create mode 100644 hw/audio/Kconfig create mode 100644 hw/block/Kconfig create mode 100644 hw/bt/Kconfig create mode 100644 hw/char/Kconfig create mode 100644 hw/core/Kconfig create mode 100644 hw/cpu/Kconfig create mode 100644 hw/cris/Kconfig create mode 100644 hw/display/Kconfig create mode 100644 hw/dma/Kconfig create mode 100644 hw/gpio/Kconfig create mode 100644 hw/hppa/Kconfig create mode 100644 hw/hyperv/Kconfig create mode 100644 hw/i2c/Kconfig create mode 100644 hw/i386/Kconfig create mode 100644 hw/ide/Kconfig create mode 100644 hw/input/Kconfig create mode 100644 hw/intc/Kconfig create mode 100644 hw/ipack/Kconfig create mode 100644 hw/ipmi/Kconfig create mode 100644 hw/isa/Kconfig create mode 100644 hw/lm32/Kconfig create mode 100644 hw/m68k/Kconfig create mode 100644 hw/mem/Kconfig create mode 100644 hw/microblaze/Kconfig create mode 100644 hw/mips/Kconfig create mode 100644 hw/misc/Kconfig create mode 100644 hw/misc/macio/Kconfig create mode 100644 hw/moxie/Kconfig create mode 100644 hw/net/Kconfig create mode 100644 hw/nios2/Kconfig create mode 100644 hw/nvram/Kconfig create mode 100644 hw/openrisc/Kconfig create mode 100644 hw/pci-bridge/Kconfig create mode 100644 hw/pci-host/Kconfig create mode 100644 hw/pci/Kconfig create mode 100644 hw/pcmcia/Kconfig create mode 100644 hw/ppc/Kconfig create mode 100644 hw/riscv/Kconfig create mode 100644 hw/s390x/Kconfig create mode 100644 hw/scsi/Kconfig create mode 100644 hw/sd/Kconfig create mode 100644 hw/sh4/Kconfig create mode 100644 hw/smbios/Kconfig create mode 100644 hw/sparc/Kconfig create mode 100644 hw/sparc64/Kconfig create mode 100644 hw/ssi/Kconfig create mode 100644 hw/timer/Kconfig create mode 100644 hw/tpm/Kconfig create mode 100644 hw/tricore/Kconfig create mode 100644 hw/unicore32/Kconfig create mode 100644 hw/usb/Kconfig create mode 100644 hw/vfio/Kconfig create mode 100644 hw/virtio/Kconfig create mode 100644 hw/watchdog/Kconfig create mode 100644 hw/xtensa/Kconfig diff --git a/Kconfig.host b/Kconfig.host new file mode 100644 index 0000000..ff5457d --- /dev/null +++ b/Kconfig.host @@ -0,0 +1,23 @@ +# These are "proxy" symbols used to pass config-host.mak values +# down to Kconfig. + +config KVM + bool + +config LINUX + bool + +config OPENGL + bool + +config SPICE + bool + +config TPM + bool + +config VHOST_USER + bool + +config XEN + bool diff --git a/hw/9pfs/Kconfig b/hw/9pfs/Kconfig new file mode 100644 index 0000000..be8e5b3 --- /dev/null +++ b/hw/9pfs/Kconfig @@ -0,0 +1,4 @@ +config VIRTFS + +config VIRTIO_9P + bool diff --git a/hw/Kconfig b/hw/Kconfig new file mode 100644 index 0000000..c4f1547 --- /dev/null +++ b/hw/Kconfig @@ -0,0 +1,68 @@ +# devices Kconfig +source 9pfs/Kconfig +source acpi/Kconfig +source adc/Kconfig +source audio/Kconfig +source block/Kconfig +source bt/Kconfig +source char/Kconfig +source core/Kconfig +source display/Kconfig +source dma/Kconfig +source gpio/Kconfig +source hyperv/Kconfig +source i2c/Kconfig +source ide/Kconfig +source input/Kconfig +source intc/Kconfig +source ipack/Kconfig +source ipmi/Kconfig +source isa/Kconfig +source mem/Kconfig +source misc/Kconfig +source net/Kconfig +source nvram/Kconfig +source pci-bridge/Kconfig +source pci-host/Kconfig +source pcmcia/Kconfig +source pci/Kconfig +source scsi/Kconfig +source sd/Kconfig +source smbios/Kconfig +source ssi/Kconfig +source timer/Kconfig +source tpm/Kconfig +source usb/Kconfig +source virtio/Kconfig +source vfio/Kconfig +source watchdog/Kconfig + +# arch Kconfig +source arm/Kconfig +source alpha/Kconfig +source cris/Kconfig +source hppa/Kconfig +source i386/Kconfig +source lm32/Kconfig +source m68k/Kconfig +source microblaze/Kconfig +source mips/Kconfig +source moxie/Kconfig +source nios2/Kconfig +source openrisc/Kconfig +source ppc/Kconfig +source riscv/Kconfig +source s390x/Kconfig +source sh4/Kconfig +source sparc/Kconfig +source sparc64/Kconfig +source tricore/Kconfig +source unicore32/Kconfig +source xtensa/Kconfig + +# Symbols used by multiple targets +config XILINX + bool + +config XILINX_AXI + bool diff --git a/hw/acpi/Kconfig b/hw/acpi/Kconfig new file mode 100644 index 0000000..c485a34 --- /dev/null +++ b/hw/acpi/Kconfig @@ -0,0 +1,20 @@ +config ACPI + bool + +config ACPI_X86 + bool + +config ACPI_X86_ICH + bool + +config ACPI_CPU_HOTPLUG + bool + +config ACPI_MEMORY_HOTPLUG + bool + +config ACPI_NVDIMM + bool + +config ACPI_VMGENID + bool diff --git a/hw/adc/Kconfig b/hw/adc/Kconfig new file mode 100644 index 0000000..25d2229 --- /dev/null +++ b/hw/adc/Kconfig @@ -0,0 +1,2 @@ +config STM32F2XX_ADC + bool diff --git a/hw/alpha/Kconfig b/hw/alpha/Kconfig new file mode 100644 index 0000000..c5d0438 --- /dev/null +++ b/hw/alpha/Kconfig @@ -0,0 +1,2 @@ +config DP264 + bool diff --git a/hw/arm/Kconfig b/hw/arm/Kconfig new file mode 100644 index 0000000..64cd698 --- /dev/null +++ b/hw/arm/Kconfig @@ -0,0 +1,119 @@ +config ARM_VIRT + bool + +config DIGIC + bool + +config EXYNOS4 + bool + +config HIGHBANK + bool + +config INTEGRATOR + bool + +config MAINSTONE + bool + +config MUSICPAL + bool + +config NETDUINO2 + bool + +config NSERIES + bool + +config OMAP + bool + +config PXA2XX + bool + +config REALVIEW + bool + +config STELLARIS + bool + +config STRONGARM + bool + +config VERSATILE + bool + +config ZYNQ + bool + +config ARM_V7M + bool + +config EXYNOS4 + bool + +config ALLWINNER_A10 + bool + +config RASPI + bool + +config STM32F205_SOC + bool + +config XLNX_ZYNQMP_ARM + bool + +config XLNX_VERSAL + bool + +config FSL_IMX25 + bool + +config FSL_IMX31 + bool + +config FSL_IMX6 + bool + +config ASPEED_SOC + bool + +config MPS2 + bool + +config IOTKIT + bool + +config FSL_IMX7 + bool + +config ARM_SMMUV3 + bool + +config FSL_IMX6UL + bool + +config NRF51_SOC + bool + +config MSF2 + bool + +config ZAURUS + bool + +config A9MPCORE + bool + +config A15MPCORE + bool + +config ARM11MPCORE + bool + +config ARMSSE + bool + +config ARMSSE_CPUID + bool diff --git a/hw/audio/Kconfig b/hw/audio/Kconfig new file mode 100644 index 0000000..207baee --- /dev/null +++ b/hw/audio/Kconfig @@ -0,0 +1,35 @@ +config SB16 + bool + +config ES1370 + bool + +config AC97 + bool + +config ADLIB + bool + +config GUS + bool + +config CS4231A + bool + +config HDA + bool + +config PCSPK + bool + +config WM8750 + bool + +config PL041 + bool + +config CS4231 + bool + +config MARVELL_88W8618 + bool diff --git a/hw/block/Kconfig b/hw/block/Kconfig new file mode 100644 index 0000000..9d418bc --- /dev/null +++ b/hw/block/Kconfig @@ -0,0 +1,29 @@ +config FDC + bool + +config SSI_M25P80 + bool + +config NAND + bool + +config PFLASH_CFI01 + bool + +config PFLASH_CFI02 + bool + +config ECC + bool + +config ONENAND + bool + +config NVME_PCI + bool + +config VIRTIO_BLK + bool + +config VHOST_USER_BLK + bool diff --git a/hw/bt/Kconfig b/hw/bt/Kconfig new file mode 100644 index 0000000..554a9ee --- /dev/null +++ b/hw/bt/Kconfig @@ -0,0 +1,2 @@ +config BLUETOOTH + bool diff --git a/hw/char/Kconfig b/hw/char/Kconfig new file mode 100644 index 0000000..26c1324 --- /dev/null +++ b/hw/char/Kconfig @@ -0,0 +1,32 @@ +config ESCC + bool + +config PARALLEL + bool + +config PL011 + bool + +config SERIAL + bool + +config SERIAL_ISA + bool + +config SERIAL_PCI + bool + +config VIRTIO_SERIAL + bool + +config STM32F2XX_USART + bool + +config CMSDK_APB_UART + bool + +config SCLPCONSOLE + bool + +config TERMINAL3270 + bool diff --git a/hw/core/Kconfig b/hw/core/Kconfig new file mode 100644 index 0000000..c2a1ae8 --- /dev/null +++ b/hw/core/Kconfig @@ -0,0 +1,11 @@ +config EMPTY_SLOT + bool + +config PTIMER + bool + +config FITLOADER + bool + +config PLATFORM_BUS + bool diff --git a/hw/cpu/Kconfig b/hw/cpu/Kconfig new file mode 100644 index 0000000..1767d02 --- /dev/null +++ b/hw/cpu/Kconfig @@ -0,0 +1,8 @@ +config ARM11MPCORE + bool + +config A9MPCORE + bool + +config A15MPCORE + bool diff --git a/hw/cris/Kconfig b/hw/cris/Kconfig new file mode 100644 index 0000000..86954ab --- /dev/null +++ b/hw/cris/Kconfig @@ -0,0 +1,5 @@ +config AXIS + bool + +config ETRAXFS + bool diff --git a/hw/display/Kconfig b/hw/display/Kconfig new file mode 100644 index 0000000..d5c022c --- /dev/null +++ b/hw/display/Kconfig @@ -0,0 +1,77 @@ +config EDID + bool + +config FW_CFG_DMA + bool + +config ADS7846 + bool + +config VGA_CIRRUS + bool + +config G364FB + bool + +config JAZZ_LED + bool + +config PL110 + bool + +config SII9022 + bool + +config SSD0303 + bool + +config SSD0323 + bool + +config VGA_PCI + bool + +config VGA_ISA + bool + +config VGA_ISA_MM + bool + +config VMWARE_VGA + bool + +config BOCHS_DISPLAY + bool + +config BLIZZARD + bool + +config FRAMEBUFFER + bool + +config MILKYMIST_TMU2 + bool + +config SM501 + bool + +config TCX + bool + +config CG3 + bool + +config VGA + bool + +config QXL + bool + +config VIRTIO_GPU + bool + +config VIRTIO_VGA + bool + +config DPCD + bool diff --git a/hw/dma/Kconfig b/hw/dma/Kconfig new file mode 100644 index 0000000..b9ce1c5 --- /dev/null +++ b/hw/dma/Kconfig @@ -0,0 +1,20 @@ +config RC4030 + bool + +config PL080 + bool + +config PL330 + bool + +config I82374 + bool + +config I8257 + bool + +config ZYNQ_DEVCFG + bool + +config STP2000 + bool diff --git a/hw/gpio/Kconfig b/hw/gpio/Kconfig new file mode 100644 index 0000000..d0a4abf --- /dev/null +++ b/hw/gpio/Kconfig @@ -0,0 +1,8 @@ +config MAX7310 + bool + +config PL061 + bool + +config GPIO_KEY + bool diff --git a/hw/hppa/Kconfig b/hw/hppa/Kconfig new file mode 100644 index 0000000..5ce48ef --- /dev/null +++ b/hw/hppa/Kconfig @@ -0,0 +1,2 @@ +config DINO + bool diff --git a/hw/hyperv/Kconfig b/hw/hyperv/Kconfig new file mode 100644 index 0000000..be724b7 --- /dev/null +++ b/hw/hyperv/Kconfig @@ -0,0 +1,5 @@ +config HYPERV + bool + +config HYPERV_TESTDEV + bool diff --git a/hw/i2c/Kconfig b/hw/i2c/Kconfig new file mode 100644 index 0000000..d6d4402 --- /dev/null +++ b/hw/i2c/Kconfig @@ -0,0 +1,20 @@ +config I2C + bool + +config SMBUS_EEPROM + bool + +config DDC + bool + +config VERSATILE_I2C + bool + +config ACPI_SMBUS + bool + +config BITBANG_I2C + bool + +config IMX_I2C + bool diff --git a/hw/i386/Kconfig b/hw/i386/Kconfig new file mode 100644 index 0000000..c851e2b --- /dev/null +++ b/hw/i386/Kconfig @@ -0,0 +1,23 @@ +config SEV + bool + +config I440FX + bool + +config ISAPC + bool + +config Q35 + bool + +config VTD + bool + +config AMD_IOMMU + bool + +config VMPORT + bool + +config VMMOUSE + bool diff --git a/hw/ide/Kconfig b/hw/ide/Kconfig new file mode 100644 index 0000000..5ec4495 --- /dev/null +++ b/hw/ide/Kconfig @@ -0,0 +1,35 @@ +config IDE_CORE + bool + +config IDE_QDEV + bool + +config IDE_PCI + bool + +config IDE_ISA + bool + +config IDE_PIIX + bool + +config IDE_CMD646 + bool + +config IDE_MACIO + bool + +config IDE_MMIO + bool + +config IDE_VIA + bool + +config MICRODRIVE + bool + +config AHCI + bool + +config IDE_SII3112 + bool diff --git a/hw/input/Kconfig b/hw/input/Kconfig new file mode 100644 index 0000000..91bae47 --- /dev/null +++ b/hw/input/Kconfig @@ -0,0 +1,23 @@ +config ADB + bool + +config LM832X + bool + +config PCKBD + bool + +config PL050 + bool + +config STELLARIS_INPUT + bool + +config TSC2005 + bool + +config VIRTIO_INPUT + bool + +config TSC210X + bool diff --git a/hw/intc/Kconfig b/hw/intc/Kconfig new file mode 100644 index 0000000..69adbd1 --- /dev/null +++ b/hw/intc/Kconfig @@ -0,0 +1,47 @@ +config HEATHROW_PIC + bool + +config I8259 + bool + +config PL190 + bool + +config IOAPIC + bool + +config ARM_GIC + bool + +config OPENPIC + bool + +config APIC + bool + +config ARM_GIC_KVM + bool + +config OPENPIC_KVM + bool + +config XICS + bool + +config XICS_SPAPR + bool + +config XICS_KVM + bool + +config ALLWINNER_A10_PIC + bool + +config S390_FLIC + bool + +config S390_FLIC_KVM + bool + +config OMPIC + bool diff --git a/hw/ipack/Kconfig b/hw/ipack/Kconfig new file mode 100644 index 0000000..481e0d2 --- /dev/null +++ b/hw/ipack/Kconfig @@ -0,0 +1,2 @@ +config IPACK + bool diff --git a/hw/ipmi/Kconfig b/hw/ipmi/Kconfig new file mode 100644 index 0000000..68f8ba1 --- /dev/null +++ b/hw/ipmi/Kconfig @@ -0,0 +1,14 @@ +config IPMI + bool + +config IPMI_LOCAL + bool + +config IPMI_EXTERN + bool + +config ISA_IPMI_KCS + bool + +config ISA_IPMI_BT + bool diff --git a/hw/isa/Kconfig b/hw/isa/Kconfig new file mode 100644 index 0000000..b59d074 --- /dev/null +++ b/hw/isa/Kconfig @@ -0,0 +1,23 @@ +config ISA_BUS + bool + +config APM + bool + +config I82378 + bool + +config PC87312 + bool + +config PIIX4 + bool + +config VT82C686 + bool + +config SMC37C669 + bool + +config LPC_ICH9 + bool diff --git a/hw/lm32/Kconfig b/hw/lm32/Kconfig new file mode 100644 index 0000000..84c530e --- /dev/null +++ b/hw/lm32/Kconfig @@ -0,0 +1,5 @@ +config LM32 + bool + +config MILKYMIST + bool diff --git a/hw/m68k/Kconfig b/hw/m68k/Kconfig new file mode 100644 index 0000000..cd66ada --- /dev/null +++ b/hw/m68k/Kconfig @@ -0,0 +1,8 @@ +config AN5206 + bool + +config MCF5206 + bool + +config MCF5208 + bool diff --git a/hw/mem/Kconfig b/hw/mem/Kconfig new file mode 100644 index 0000000..a3a4372 --- /dev/null +++ b/hw/mem/Kconfig @@ -0,0 +1,8 @@ +config DIMM + bool + +config MEM_DEVICE + bool + +config NVDIMM + bool diff --git a/hw/microblaze/Kconfig b/hw/microblaze/Kconfig new file mode 100644 index 0000000..44683b2 --- /dev/null +++ b/hw/microblaze/Kconfig @@ -0,0 +1,8 @@ +config PETALOGIX_S3ADSP1800 + bool + +config PETALOGIX_ML605 + bool + +config XLNX_ZYNQMP_PMU + bool diff --git a/hw/mips/Kconfig b/hw/mips/Kconfig new file mode 100644 index 0000000..348c9bf --- /dev/null +++ b/hw/mips/Kconfig @@ -0,0 +1,20 @@ +config R4K + bool + +config MALTA + bool + +config MIPSSIM + bool + +config JAZZ + bool + +config FULONG + bool + +config MIPS_CPS + bool + +config MIPS_BOSTON + bool diff --git a/hw/misc/Kconfig b/hw/misc/Kconfig new file mode 100644 index 0000000..d512634 --- /dev/null +++ b/hw/misc/Kconfig @@ -0,0 +1,94 @@ +config APPLESMC + bool + +config MAX111X + bool + +config TMP105 + bool + +config TMP421 + bool + +config ISA_DEBUG + bool + +config SGA + bool + +config ISA_TESTDEV + bool + +config PCI_TESTDEV + bool + +config EDU + bool + +config PCA9552 + bool + +config PL310 + bool + +config INTEGRATOR_DEBUG + bool + +config A9SCU + bool + +config ARM11SCU + bool + +config MOS6522 + bool + +config MACIO + bool + +config IVSHMEM_DEVICE + bool + +config ECCMEMCTL + bool + +config IMX + bool + +config STM32F2XX_SYSCFG + bool + +config MIPS_ITU + bool + +config MPS2_FPGAIO + bool + +config MPS2_SCC + bool + +config TZ_MPC + bool + +config TZ_MSC + bool + +config TZ_PPC + bool + +config IOTKIT_SECCTL + bool + +config IOTKIT_SYSCTL + bool + +config IOTKIT_SYSINFO + bool + +config PVPANIC + bool + +config AUX + bool + +source macio/Kconfig diff --git a/hw/misc/macio/Kconfig b/hw/misc/macio/Kconfig new file mode 100644 index 0000000..c6caeb6 --- /dev/null +++ b/hw/misc/macio/Kconfig @@ -0,0 +1,11 @@ +config CUDA + bool + +config MAC_PMU + bool + +config MAC_DBDMA + bool + +config MACIO_GPIO + bool diff --git a/hw/moxie/Kconfig b/hw/moxie/Kconfig new file mode 100644 index 0000000..03f62e3 --- /dev/null +++ b/hw/moxie/Kconfig @@ -0,0 +1,2 @@ +config MOXIESIM + bool diff --git a/hw/net/Kconfig b/hw/net/Kconfig new file mode 100644 index 0000000..d358b2c --- /dev/null +++ b/hw/net/Kconfig @@ -0,0 +1,92 @@ +config DP8393X + bool + +config NE2000_PCI + bool + +config EEPRO100_PCI + bool + +config PCNET_PCI + bool + +config PCNET_COMMON + bool + +config E1000_PCI + bool + +config E1000E_PCI_EXPRESS + bool + +config RTL8139_PCI + bool + +config VMXNET3_PCI + bool + +config SMC91C111 + bool + +config LAN9118 + bool + +config NE2000_ISA + bool + +config OPENCORES_ETH + bool + +config XGMAC + bool + +config MIPSNET + bool + +config ALLWINNER_EMAC + bool + +config IMX_FEC + bool + +config CADENCE + bool + +config STELLARIS_ENET + bool + +config LANCE + bool + +config SUNHME + bool + +config FTGMAC100 + bool + +config SUNGEM + bool + +config COLDFIRE + bool + +config XILINX_ETHLITE + bool + +config VIRTIO_NET + bool + +config ETSEC + bool + +config ROCKER + bool + +config CAN_BUS + bool + +config CAN_PCI + bool + +config CAN_SJA1000 + bool diff --git a/hw/nios2/Kconfig b/hw/nios2/Kconfig new file mode 100644 index 0000000..22817e4 --- /dev/null +++ b/hw/nios2/Kconfig @@ -0,0 +1,5 @@ +config NIOS2_10M50 + bool + +config NIOS2 + bool diff --git a/hw/nvram/Kconfig b/hw/nvram/Kconfig new file mode 100644 index 0000000..1f5ec95 --- /dev/null +++ b/hw/nvram/Kconfig @@ -0,0 +1,8 @@ +config DS1225Y + bool + +config AT24C + bool + +config MAC_NVRAM + bool diff --git a/hw/openrisc/Kconfig b/hw/openrisc/Kconfig new file mode 100644 index 0000000..7aef98d --- /dev/null +++ b/hw/openrisc/Kconfig @@ -0,0 +1,2 @@ +config OR1K_SIM + bool diff --git a/hw/pci-bridge/Kconfig b/hw/pci-bridge/Kconfig new file mode 100644 index 0000000..bb19b7a --- /dev/null +++ b/hw/pci-bridge/Kconfig @@ -0,0 +1,20 @@ +config PCIE_PORT + bool + +config PXB + bool + +config XIO3130 + bool + +config IOH3420 + bool + +config I82801B11 + bool + +config DEC_PCI + bool + +config SIMBA + bool diff --git a/hw/pci-host/Kconfig b/hw/pci-host/Kconfig new file mode 100644 index 0000000..2edc5bb --- /dev/null +++ b/hw/pci-host/Kconfig @@ -0,0 +1,35 @@ +config PAM + bool + +config PREP_PCI + bool + +config GRACKLE_PCI + bool + +config UNIN_PCI + bool + +config PPCE500_PCI + bool + +config VERSATILE_PCI + bool + +config PCI_SABRE + bool + +config PCI_PIIX + bool + +config PCI_EXPRESS_Q35 + bool + +config PCI_EXPRESS_GENERIC_BRIDGE + bool + +config PCI_EXPRESS_XILINX + bool + +config PCI_EXPRESS_DESIGNWARE + bool diff --git a/hw/pci/Kconfig b/hw/pci/Kconfig new file mode 100644 index 0000000..d3d2205 --- /dev/null +++ b/hw/pci/Kconfig @@ -0,0 +1,2 @@ +config PCI + bool diff --git a/hw/pcmcia/Kconfig b/hw/pcmcia/Kconfig new file mode 100644 index 0000000..41f2df9 --- /dev/null +++ b/hw/pcmcia/Kconfig @@ -0,0 +1,2 @@ +config PCMCIA + bool diff --git a/hw/ppc/Kconfig b/hw/ppc/Kconfig new file mode 100644 index 0000000..6087454 --- /dev/null +++ b/hw/ppc/Kconfig @@ -0,0 +1,44 @@ +config PSERIES + bool + +config SPAPR_RNG + bool + +config POWERNV + bool + +config PPC405 + bool + +config PPC440 + bool + +config PPC4XX + bool + +config SAM460EX + bool + +config PREP + bool + +config RS6000_MC + bool + +config MAC_OLDWORLD + bool + +config MAC_NEWWORLD + bool + +config E500 + bool + +config VIRTEX + bool + +config XIVE + bool + +config XIVE_SPAPR + bool diff --git a/hw/riscv/Kconfig b/hw/riscv/Kconfig new file mode 100644 index 0000000..4989589 --- /dev/null +++ b/hw/riscv/Kconfig @@ -0,0 +1,20 @@ +config HTIF + bool + +config HART + bool + +config SIFIVE + bool + +config SIFIVE_E + bool + +config SIFIVE_U + bool + +config SPIKE + bool + +config RISCV_VIRT + bool diff --git a/hw/s390x/Kconfig b/hw/s390x/Kconfig new file mode 100644 index 0000000..303db7f --- /dev/null +++ b/hw/s390x/Kconfig @@ -0,0 +1,2 @@ +config S390_CCW_VIRTIO + bool diff --git a/hw/scsi/Kconfig b/hw/scsi/Kconfig new file mode 100644 index 0000000..eb78478 --- /dev/null +++ b/hw/scsi/Kconfig @@ -0,0 +1,26 @@ +config SCSI + bool + +config LSI_SCSI_PCI + bool + +config MPTSAS_SCSI_PCI + bool + +config MEGASAS_SCSI_PCI + bool + +config VMW_PVSCSI_SCSI_PCI + bool + +config ESP + bool + +config ESP_PCI + bool + +config VIRTIO_SCSI + bool + +config VHOST_USER_SCSI + bool diff --git a/hw/sd/Kconfig b/hw/sd/Kconfig new file mode 100644 index 0000000..4f43bbb --- /dev/null +++ b/hw/sd/Kconfig @@ -0,0 +1,11 @@ +config PL181 + bool + +config SSI_SD + bool + +config SD + bool + +config SDHCI + bool diff --git a/hw/sh4/Kconfig b/hw/sh4/Kconfig new file mode 100644 index 0000000..417a72f --- /dev/null +++ b/hw/sh4/Kconfig @@ -0,0 +1,11 @@ +config R2D + bool + +config SHIX + bool + +config SH7750 + bool + +config SH4 + bool diff --git a/hw/smbios/Kconfig b/hw/smbios/Kconfig new file mode 100644 index 0000000..553adf4 --- /dev/null +++ b/hw/smbios/Kconfig @@ -0,0 +1,2 @@ +config SMBIOS + bool diff --git a/hw/sparc/Kconfig b/hw/sparc/Kconfig new file mode 100644 index 0000000..3795754 --- /dev/null +++ b/hw/sparc/Kconfig @@ -0,0 +1,11 @@ +config SUN4M + bool + +config LEON3 + bool + +config GRLIB + bool + +config SLAVIO + bool diff --git a/hw/sparc64/Kconfig b/hw/sparc64/Kconfig new file mode 100644 index 0000000..8c13345 --- /dev/null +++ b/hw/sparc64/Kconfig @@ -0,0 +1,5 @@ +config SUN4U + bool + +config NIAGARA + bool diff --git a/hw/ssi/Kconfig b/hw/ssi/Kconfig new file mode 100644 index 0000000..5a03110 --- /dev/null +++ b/hw/ssi/Kconfig @@ -0,0 +1,14 @@ +config PL022 + bool + +config SSI + bool + +config XILINX_SPI + bool + +config XILINX_SPIPS + bool + +config STM32F2XX_SPI + bool diff --git a/hw/timer/Kconfig b/hw/timer/Kconfig new file mode 100644 index 0000000..7dbc121 --- /dev/null +++ b/hw/timer/Kconfig @@ -0,0 +1,53 @@ +config ARM_TIMER + bool + +config ARM_MPTIMER + bool + +config A9_GTIMER + bool + +config DS1338 + bool + +config HPET + bool + +config I8254 + bool + +config M41T80 + bool + +config M48T59 + bool + +config PL031 + bool + +config TWL92230 + bool + +config XLNX_ZYNQMP + bool + +config ALTERA_TIMER + bool + +config MC146818RTC + bool + +config ALLWINNER_A10_PIT + bool + +config STM32F2XX_TIMER + bool + +config SUN4V_RTC + bool + +config CMSDK_APB_TIMER + bool + +config CMSDK_APB_DUALTIMER + bool diff --git a/hw/tpm/Kconfig b/hw/tpm/Kconfig new file mode 100644 index 0000000..2eee8eb --- /dev/null +++ b/hw/tpm/Kconfig @@ -0,0 +1,14 @@ +config TPM + bool + +config TPM_TIS + bool + +config TPM_CRB + bool + +config TPM_PASSTHROUGH + bool + +config TPM_EMULATOR + bool diff --git a/hw/tricore/Kconfig b/hw/tricore/Kconfig new file mode 100644 index 0000000..9313409 --- /dev/null +++ b/hw/tricore/Kconfig @@ -0,0 +1,2 @@ +config TRICORE + bool diff --git a/hw/unicore32/Kconfig b/hw/unicore32/Kconfig new file mode 100644 index 0000000..b3cf294 --- /dev/null +++ b/hw/unicore32/Kconfig @@ -0,0 +1,2 @@ +config PUV3 + bool diff --git a/hw/usb/Kconfig b/hw/usb/Kconfig new file mode 100644 index 0000000..cbf5c5d --- /dev/null +++ b/hw/usb/Kconfig @@ -0,0 +1,53 @@ +config USB + bool + +config USB_UHCI + bool + +config USB_OHCI + bool + +config USB_EHCI + bool + +config USB_EHCI_SYSBUS + bool + +config USB_XHCI + bool + +config USB_XHCI_NEC + bool + +config USB_MUSB + bool + +config TUSB6010 + bool + +config USB_TABLET_WACOM + bool + +config USB_STORAGE_BOT + bool + +config USB_STORAGE_UAS + bool + +config USB_AUDIO + bool + +config USB_SERIAL + bool + +config USB_NETWORK + bool + +config USB_BLUETOOTH + bool + +config USB_SMARTCARD + bool + +config USB_STORAGE_MTP + bool diff --git a/hw/vfio/Kconfig b/hw/vfio/Kconfig new file mode 100644 index 0000000..3606967 --- /dev/null +++ b/hw/vfio/Kconfig @@ -0,0 +1,20 @@ +config VFIO + bool + +config VFIO_PCI + bool + +config VFIO_CCW + bool + +config VFIO_PLATFORM + bool + +config VFIO_XGMAC + bool + +config VFIO_AMD_XGBE + bool + +config VFIO_AP + bool diff --git a/hw/virtio/Kconfig b/hw/virtio/Kconfig new file mode 100644 index 0000000..ebf1812 --- /dev/null +++ b/hw/virtio/Kconfig @@ -0,0 +1,17 @@ +config VIRTIO + bool + +config VIRTIO_RNG + bool + +config VIRTIO_PCI + bool + +config VIRTIO_MMIO + bool + +config VIRTIO_BALLOON + bool + +config VIRTIO_CRYPTO + bool diff --git a/hw/watchdog/Kconfig b/hw/watchdog/Kconfig new file mode 100644 index 0000000..cd0244f --- /dev/null +++ b/hw/watchdog/Kconfig @@ -0,0 +1,11 @@ +config CMSDK_APB_WATCHDOG + bool + +config WDT_IB6300ESB + bool + +config WDT_IB700 + bool + +config WDT_DIAG288 + bool diff --git a/hw/xtensa/Kconfig b/hw/xtensa/Kconfig new file mode 100644 index 0000000..97543a9 --- /dev/null +++ b/hw/xtensa/Kconfig @@ -0,0 +1,5 @@ +config XTENSA_SIM + bool + +config XTENSA_FPGA + bool diff --git a/scripts/minikconf.py b/scripts/minikconf.py index 2df14ca..dd96ab9 100644 --- a/scripts/minikconf.py +++ b/scripts/minikconf.py @@ -13,6 +13,7 @@ from __future__ import print_function import os import sys +import re =20 __all__ =3D [ 'KconfigParserError', 'KconfigData', 'KconfigParser' ] =20 @@ -346,6 +347,12 @@ class KconfigParser: self.get_token() self.parse_config() =20 + def do_assignment(self, var, val): + if not var.startswith("CONFIG_"): + raise Error('assigned variable should start with CONFIG_') + var =3D self.data.do_var(var[7:]) + self.data.do_assignment(var, val) + # file management ----- =20 def error_path(self): @@ -641,6 +648,28 @@ class KconfigParser: return None =20 if __name__ =3D=3D '__main__': - fname =3D len(sys.argv) > 1 and sys.argv[1] or 'Kconfig.test' - data =3D KconfigParser.parse(open(fname, 'r')) - print data.compute_config() + argv =3D sys.argv + if len(argv) =3D=3D 1: + print ("%s: at least one argument is required" % argv[0], file=3Ds= ys.stderr) + sys.exit(1) + + data =3D KconfigData() + parser =3D KconfigParser(data) + for arg in argv[3:]: + m =3D re.match(r'^(CONFIG_[A-Z0-9_]+)=3D([yn]?)$', arg) + if m is not None: + name, value =3D m.groups() + parser.do_assignment(name, value =3D=3D 'y') + else: + fp =3D open(arg, 'r') + parser.parse_file(fp) + fp.close() + + config =3D data.compute_config() + for key in sorted(config.keys()): + print ('CONFIG_%s=3D%s' % (key, ('y' if config[key] else 'n'))) + + deps =3D open(argv[2], 'w') + for fname in data.previously_included: + print ('%s: %s' % (argv[1], fname), file=3Ddeps) + deps.close() --=20 1.8.3.1 From nobody Wed Apr 24 17:06:17 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (209.51.188.17 [209.51.188.17]) by mx.zohomail.com with SMTPS id 1549562407761671.5728730148091; Thu, 7 Feb 2019 10:00:07 -0800 (PST) Received: from localhost ([127.0.0.1]:44458 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1grnxx-0003UO-3Z for importer@patchew.org; Thu, 07 Feb 2019 13:00:01 -0500 Received: from eggs.gnu.org ([209.51.188.92]:57437) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1grnvw-0001xU-La for qemu-devel@nongnu.org; Thu, 07 Feb 2019 12:57:58 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1grnvs-0002Dr-7q for qemu-devel@nongnu.org; Thu, 07 Feb 2019 12:57:56 -0500 Received: from mail-wm1-x344.google.com ([2a00:1450:4864:20::344]:54689) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1grnvr-00026b-V5 for qemu-devel@nongnu.org; Thu, 07 Feb 2019 12:57:52 -0500 Received: by mail-wm1-x344.google.com with SMTP id a62so804028wmh.4 for ; Thu, 07 Feb 2019 09:57:44 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id q12sm12708982wmf.2.2019.02.07.09.57.42 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 07 Feb 2019 09:57:42 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=B//gaM0Re+xwB9elclIasSojpOatVfq52fxexDnPXBs=; b=smh1x/V2KslqbMBdvpXpVbvM7+A6W7XO4nivvelzXrByqspOC/zRhM7o3VFmhcsk6r sWVXPzjA9VSHOrMsL/zNs2NsJqpw26GBCTtf93Vz2G1TPqmHZjukybhtuKMZ9UpxrmYs gffq+K8e0x4+PQVhPS7FRy5vt1vBaMxY831egeNHDuTt7NJQYKTaTCeEUzdJ/d4sOmQH RHZRbd8bBUoOAekgx5mDedznRIydD0U1PKPjwmDf8n2DqeJVNwl6A80zgmq3vOKeTh6C ++znxbdwxNU8KkCq0AnZhP4vLV7cejPo2wK7sgieLBF0JYuGm18OIVzBKfEGYlbx5HAi 9/Jg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=B//gaM0Re+xwB9elclIasSojpOatVfq52fxexDnPXBs=; b=VIEJevbh/FvvvHYnoxq1fc7OV1VgN9pTvSbmzMawCTLZTY0XrjGh4kf78igmyTwRzT 4gcEZVQGmaDNWfhqNeg9A2bVnABbyWT/xAT2E8jM6GkF2MMaFblwFzkZP4Id6Q0h7Us9 +F29MhU03WMERksnk5MhJ9hyxIwBziHiPvuzZE1Z+uwHwO8Gx5N9hbg6pMKRpNbI/DtJ s84ut7nZ6jv1/iV5EV6q5kyyIWlDPfJ7hxjSkAwPNiHyOaYlyCtvKLLj2XYhhkSkF7zt iu38Wu6Ue21AHtBfjQh8kiM5Dj8LFgKLlDHQbQfaFTqh4OcumlQFNm4LGHXLMI+XgLAZ vMCg== X-Gm-Message-State: AHQUAuZ8ysfR9NcFGjcccMscsUXwGGexX4DfyAvGskWIHNZcx3q2l7bs PdoFLbuaI94SqHz3E4MOTQNeZ6g1 X-Google-Smtp-Source: AHgI3IYHh3XaBik+RR0G7vLFhiF8MGKk6Y3x4nGvyV7VWTSWRlnf3isXJbW0xh6COLuruypuS2KeQA== X-Received: by 2002:a1c:9e4a:: with SMTP id h71mr8646874wme.82.1549562263217; Thu, 07 Feb 2019 09:57:43 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Thu, 7 Feb 2019 18:56:49 +0100 Message-Id: <1549562254-41157-7-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1549562254-41157-1-git-send-email-pbonzini@redhat.com> References: <1549562254-41157-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::344 Subject: [Qemu-devel] [PATCH 06/51] build: switch to Kconfig X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Yang Zhong , thuth@redhat.com, philmd@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" The make_device_config.sh script is replaced by minikconf, which is modified to support the same command line as its predecessor. The roots of the parsing are default-configs/*.mak, Kconfig.host and hw/Kconfig. One difference with make_device_config.sh is that all symbols have to be defined in a Kconfig file, including those coming from the configure script. This is the reason for the Kconfig.host file introduced in the previous patch. Whenever a file in default-configs/*.mak used $(...) to refer to a config-host.mak symbol, this is replaced by a Kconfig dependency; this part must be done already in this patch for bisectability. Signed-off-by: Paolo Bonzini Signed-off-by: Yang Zhong Acked-by: Thomas Huth Message-Id: <20190123065618.3520-28-yang.zhong@intel.com> Signed-off-by: Paolo Bonzini Reviewed-by: Michael S. Tsirkin --- Kconfig.host | 6 +++++- Makefile | 24 +++++++++++++++++++----- Makefile.target | 7 ++++++- configure | 6 ++++++ default-configs/arm-softmmu.mak | 2 -- default-configs/i386-softmmu.mak | 5 +---- default-configs/lm32-softmmu.mak | 1 - default-configs/pci.mak | 1 - default-configs/ppc-softmmu.mak | 1 - default-configs/ppc64-softmmu.mak | 5 ----- default-configs/s390x-softmmu.mak | 4 +--- default-configs/virtio.mak | 3 --- hw/9pfs/Kconfig | 2 ++ hw/block/Kconfig | 2 ++ hw/display/Kconfig | 3 +++ hw/i386/Kconfig | 7 +++++++ hw/input/Kconfig | 5 +++++ hw/intc/Kconfig | 12 ++++++++++++ hw/misc/Kconfig | 2 ++ hw/ppc/Kconfig | 4 ++++ hw/scsi/Kconfig | 7 +++++++ hw/tpm/Kconfig | 1 + hw/vfio/Kconfig | 9 +++++++++ rules.mak | 2 +- scripts/make_device_config.sh | 30 ------------------------------ 25 files changed, 93 insertions(+), 58 deletions(-) delete mode 100644 scripts/make_device_config.sh diff --git a/Kconfig.host b/Kconfig.host index ff5457d..e3d486c 100644 --- a/Kconfig.host +++ b/Kconfig.host @@ -1,5 +1,6 @@ # These are "proxy" symbols used to pass config-host.mak values -# down to Kconfig. +# down to Kconfig. See also MINIKCONF_ARGS in the Makefile: +# these two need to be kept in sync. =20 config KVM bool @@ -10,6 +11,9 @@ config LINUX config OPENGL bool =20 +config X11 + bool + config SPICE bool =20 diff --git a/Makefile b/Makefile index 3658310..959ab9e 100644 --- a/Makefile +++ b/Makefile @@ -313,8 +313,8 @@ DOCS=3D endif =20 SUBDIR_MAKEFLAGS=3D$(if $(V),,--no-print-directory --quiet) BUILD_DIR=3D$(= BUILD_DIR) -SUBDIR_DEVICES_MAK=3D$(patsubst %, %/config-devices.mak, $(TARGET_DIRS)) -SUBDIR_DEVICES_MAK_DEP=3D$(patsubst %, %-config-devices.mak.d, $(TARGET_DI= RS)) +SUBDIR_DEVICES_MAK=3D$(patsubst %, %/config-devices.mak, $(filter %-softmm= u, $(TARGET_DIRS))) +SUBDIR_DEVICES_MAK_DEP=3D$(patsubst %, %.d, $(SUBDIR_DEVICES_MAK)) =20 ifeq ($(SUBDIR_DEVICES_MAK),) config-all-devices.mak: @@ -329,9 +329,23 @@ endif =20 -include $(SUBDIR_DEVICES_MAK_DEP) =20 -%/config-devices.mak: default-configs/%.mak $(SRC_PATH)/scripts/make_devic= e_config.sh - $(call quiet-command, \ - $(SHELL) $(SRC_PATH)/scripts/make_device_config.sh $< $*-confi= g-devices.mak.d $@ > $@.tmp,"GEN","$@.tmp") +# This has to be kept in sync with Kconfig.host. +MINIKCONF_ARGS =3D \ + $@ $*-config.devices.mak.d $< $(MINIKCONF_INPUTS) \ + CONFIG_KVM=3D$(CONFIG_KVM) \ + CONFIG_SPICE=3D$(CONFIG_SPICE) \ + CONFIG_TPM=3D$(CONFIG_TPM) \ + CONFIG_XEN=3D$(CONFIG_XEN) \ + CONFIG_OPENGL=3D$(CONFIG_OPENGL) \ + CONFIG_X11=3D$(CONFIG_X11) \ + CONFIG_VHOST_USER=3D$(CONFIG_VHOST_USER) \ + CONFIG_LINUX=3D$(CONFIG_LINUX) + +MINIKCONF_INPUTS =3D $(SRC_PATH)/Kconfig.host $(SRC_PATH)/hw/Kconfig +MINIKCONF =3D $(PYTHON) $(SRC_PATH)/scripts/minikconf.py \ + +$(SUBDIR_DEVICES_MAK): %/config-devices.mak: default-configs/%.mak $(MINIK= CONF_INPUTS) $(BUILD_DIR)/config-host.mak + $(call quiet-command, $(MINIKCONF) $(MINIKCONF_ARGS) > $@.tmp, "GEN", "$@= .tmp") $(call quiet-command, if test -f $@; then \ if cmp -s $@.old $@; then \ mv $@.tmp $@; \ diff --git a/Makefile.target b/Makefile.target index 401dc1e..bb82959 100644 --- a/Makefile.target +++ b/Makefile.target @@ -4,9 +4,12 @@ BUILD_DIR?=3D$(CURDIR)/.. =20 include ../config-host.mak include config-target.mak -include config-devices.mak include $(SRC_PATH)/rules.mak =20 +ifdef CONFIG_SOFTMMU +include config-devices.mak +endif + $(call set-vpath, $(SRC_PATH):$(BUILD_DIR)) ifdef CONFIG_LINUX QEMU_CFLAGS +=3D -I../linux-headers @@ -198,7 +201,9 @@ all-obj-$(CONFIG_SOFTMMU) +=3D $(crypto-obj-y) all-obj-$(CONFIG_SOFTMMU) +=3D $(io-obj-y) all-obj-$(CONFIG_SOFTMMU) +=3D $(slirp-obj-y) =20 +ifdef CONFIG_SOFTMMU $(QEMU_PROG_BUILD): config-devices.mak +endif =20 COMMON_LDADDS =3D ../libqemuutil.a =20 diff --git a/configure b/configure index 558170c..64f843f 100755 --- a/configure +++ b/configure @@ -7346,18 +7346,24 @@ fi =20 if supported_xen_target $target; then echo "CONFIG_XEN=3Dy" >> $config_target_mak + echo "$target/config-devices.mak: CONFIG_XEN=3Dy" >> $config_host_mak if test "$xen_pci_passthrough" =3D yes; then echo "CONFIG_XEN_PCI_PASSTHROUGH=3Dy" >> "$config_target_mak" fi +else + echo "$target/config-devices.mak: CONFIG_XEN=3Dn" >> $config_host_mak fi if supported_kvm_target $target; then echo "CONFIG_KVM=3Dy" >> $config_target_mak + echo "$target/config-devices.mak: CONFIG_KVM=3Dy" >> $config_host_mak if test "$vhost_net" =3D "yes" ; then echo "CONFIG_VHOST_NET=3Dy" >> $config_target_mak if test "$vhost_user" =3D "yes" ; then echo "CONFIG_VHOST_USER_NET_TEST_$target_name=3Dy" >> $config_= host_mak fi fi +else + echo "$target/config-devices.mak: CONFIG_KVM=3Dn" >> $config_host_mak fi if supported_hax_target $target; then echo "CONFIG_HAX=3Dy" >> $config_target_mak diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.= mak index 734ca72..40d31cc 100644 --- a/default-configs/arm-softmmu.mak +++ b/default-configs/arm-softmmu.mak @@ -51,7 +51,6 @@ CONFIG_ARM_V7M=3Dy CONFIG_NETDUINO2=3Dy =20 CONFIG_ARM_GIC=3Dy -CONFIG_ARM_GIC_KVM=3D$(CONFIG_KVM) CONFIG_ARM_TIMER=3Dy CONFIG_ARM_MPTIMER=3Dy CONFIG_A9_GTIMER=3Dy @@ -124,7 +123,6 @@ CONFIG_VERSATILE_PCI=3Dy CONFIG_VERSATILE_I2C=3Dy =20 CONFIG_PCI_EXPRESS_GENERIC_BRIDGE=3Dy -CONFIG_VFIO=3D$(CONFIG_LINUX) CONFIG_VFIO_PLATFORM=3Dy CONFIG_VFIO_XGMAC=3Dy CONFIG_VFIO_AMD_XGBE=3Dy diff --git a/default-configs/i386-softmmu.mak b/default-configs/i386-softmm= u.mak index 15b6287..412c8c5 100644 --- a/default-configs/i386-softmmu.mak +++ b/default-configs/i386-softmmu.mak @@ -4,7 +4,6 @@ include pci.mak include sound.mak include usb.mak include hyperv.mak -CONFIG_QXL=3D$(CONFIG_SPICE) CONFIG_VGA_ISA=3Dy CONFIG_VGA_CIRRUS=3Dy CONFIG_VMWARE_VGA=3Dy @@ -37,8 +36,6 @@ CONFIG_HPET=3Dy CONFIG_APPLESMC=3Dy CONFIG_I8259=3Dy CONFIG_PFLASH_CFI01=3Dy -CONFIG_TPM_TIS=3D$(CONFIG_TPM) -CONFIG_TPM_CRB=3D$(CONFIG_TPM) CONFIG_MC146818RTC=3Dy CONFIG_PCI_PIIX=3Dy CONFIG_WDT_IB700=3Dy @@ -66,9 +63,9 @@ CONFIG_ACPI_SMBUS=3Dy CONFIG_SMBUS_EEPROM=3Dy CONFIG_FW_CFG_DMA=3Dy CONFIG_I2C=3Dy -CONFIG_SEV=3D$(CONFIG_KVM) CONFIG_VTD=3Dy CONFIG_AMD_IOMMU=3Dy CONFIG_PAM=3Dy +CONFIG_PC=3Dy CONFIG_I440FX=3Dy CONFIG_Q35=3Dy diff --git a/default-configs/lm32-softmmu.mak b/default-configs/lm32-softmm= u.mak index 4049b23..ef0f4ba 100644 --- a/default-configs/lm32-softmmu.mak +++ b/default-configs/lm32-softmmu.mak @@ -2,7 +2,6 @@ =20 CONFIG_LM32=3Dy CONFIG_MILKYMIST=3Dy -CONFIG_MILKYMIST_TMU2=3D$(call land,$(CONFIG_X11),$(CONFIG_OPENGL)) CONFIG_FRAMEBUFFER=3Dy CONFIG_PTIMER=3Dy CONFIG_PFLASH_CFI01=3Dy diff --git a/default-configs/pci.mak b/default-configs/pci.mak index 0552190..3d4c71d 100644 --- a/default-configs/pci.mak +++ b/default-configs/pci.mak @@ -47,6 +47,5 @@ CONFIG_VGA_PCI=3Dy CONFIG_BOCHS_DISPLAY=3Dy CONFIG_IVSHMEM_DEVICE=3D$(CONFIG_IVSHMEM) CONFIG_ROCKER=3Dy -CONFIG_VFIO=3D$(CONFIG_LINUX) CONFIG_VFIO_PCI=3Dy CONFIG_EDID=3Dy diff --git a/default-configs/ppc-softmmu.mak b/default-configs/ppc-softmmu.= mak index 52acb7c..90118cb 100644 --- a/default-configs/ppc-softmmu.mak +++ b/default-configs/ppc-softmmu.mak @@ -18,7 +18,6 @@ CONFIG_I8259=3Dy CONFIG_XILINX=3Dy CONFIG_XILINX_ETHLITE=3Dy CONFIG_E500=3Dy -CONFIG_OPENPIC_KVM=3D$(call land,$(CONFIG_E500),$(CONFIG_KVM)) CONFIG_PLATFORM_BUS=3Dy CONFIG_ETSEC=3Dy CONFIG_PPC405=3Dy diff --git a/default-configs/ppc64-softmmu.mak b/default-configs/ppc64-soft= mmu.mak index 7f34ad0..a0a9151 100644 --- a/default-configs/ppc64-softmmu.mak +++ b/default-configs/ppc64-softmmu.mak @@ -13,11 +13,6 @@ CONFIG_ISA_IPMI_BT=3Dy # For pSeries CONFIG_PSERIES=3Dy CONFIG_VIRTIO_VGA=3Dy -CONFIG_XICS=3D$(CONFIG_PSERIES) -CONFIG_XICS_SPAPR=3D$(CONFIG_PSERIES) -CONFIG_XICS_KVM=3D$(call land,$(CONFIG_PSERIES),$(CONFIG_KVM)) -CONFIG_XIVE=3D$(CONFIG_PSERIES) -CONFIG_XIVE_SPAPR=3D$(CONFIG_PSERIES) CONFIG_MEM_DEVICE=3Dy CONFIG_DIMM=3Dy CONFIG_SPAPR_RNG=3Dy diff --git a/default-configs/s390x-softmmu.mak b/default-configs/s390x-soft= mmu.mak index 6f2c6ce..2794ffb 100644 --- a/default-configs/s390x-softmmu.mak +++ b/default-configs/s390x-softmmu.mak @@ -1,12 +1,10 @@ CONFIG_PCI=3Dy -CONFIG_VIRTIO_PCI=3D$(CONFIG_PCI) +CONFIG_VIRTIO_PCI=3Dy include virtio.mak CONFIG_SCLPCONSOLE=3Dy CONFIG_TERMINAL3270=3Dy CONFIG_S390_FLIC=3Dy -CONFIG_S390_FLIC_KVM=3D$(CONFIG_KVM) CONFIG_WDT_DIAG288=3Dy CONFIG_S390_CCW_VIRTIO=3Dy -CONFIG_VFIO=3D$(CONFIG_LINUX) CONFIG_VFIO_CCW=3Dy CONFIG_VFIO_AP=3Dy diff --git a/default-configs/virtio.mak b/default-configs/virtio.mak index ecb4420..51599ed 100644 --- a/default-configs/virtio.mak +++ b/default-configs/virtio.mak @@ -1,5 +1,3 @@ -CONFIG_VHOST_USER_SCSI=3D$(call land,$(CONFIG_VHOST_USER),$(CONFIG_LINUX)) -CONFIG_VHOST_USER_BLK=3D$(call land,$(CONFIG_VHOST_USER),$(CONFIG_LINUX)) CONFIG_VIRTIO=3Dy CONFIG_VIRTIO_9P=3D$(CONFIG_VIRTFS) CONFIG_VIRTIO_BALLOON=3Dy @@ -12,4 +10,3 @@ CONFIG_VIRTIO_RNG=3Dy CONFIG_SCSI=3Dy CONFIG_VIRTIO_SCSI=3Dy CONFIG_VIRTIO_SERIAL=3Dy -CONFIG_VIRTIO_INPUT_HOST=3D$(CONFIG_LINUX) diff --git a/hw/9pfs/Kconfig b/hw/9pfs/Kconfig index be8e5b3..32071c1 100644 --- a/hw/9pfs/Kconfig +++ b/hw/9pfs/Kconfig @@ -2,3 +2,5 @@ config VIRTFS =20 config VIRTIO_9P bool + default y + depends on VIRTFS diff --git a/hw/block/Kconfig b/hw/block/Kconfig index 9d418bc..65431c4 100644 --- a/hw/block/Kconfig +++ b/hw/block/Kconfig @@ -27,3 +27,5 @@ config VIRTIO_BLK =20 config VHOST_USER_BLK bool + default y + depends on VHOST_USER && LINUX diff --git a/hw/display/Kconfig b/hw/display/Kconfig index d5c022c..1149ea2 100644 --- a/hw/display/Kconfig +++ b/hw/display/Kconfig @@ -51,6 +51,8 @@ config FRAMEBUFFER =20 config MILKYMIST_TMU2 bool + default y + depends on OPENGL && X11 =20 config SM501 bool @@ -66,6 +68,7 @@ config VGA =20 config QXL bool + depends on SPICE && PCI =20 config VIRTIO_GPU bool diff --git a/hw/i386/Kconfig b/hw/i386/Kconfig index c851e2b..6df3f7c 100644 --- a/hw/i386/Kconfig +++ b/hw/i386/Kconfig @@ -1,5 +1,12 @@ config SEV bool + depends on KVM + +config PC + bool + imply QXL + imply SEV + imply TPM_TIS =20 config I440FX bool diff --git a/hw/input/Kconfig b/hw/input/Kconfig index 91bae47..c729dcd 100644 --- a/hw/input/Kconfig +++ b/hw/input/Kconfig @@ -19,5 +19,10 @@ config TSC2005 config VIRTIO_INPUT bool =20 +config VIRTIO_INPUT_HOST + bool + default y + depends on LINUX + config TSC210X bool diff --git a/hw/intc/Kconfig b/hw/intc/Kconfig index 69adbd1..6eea14e 100644 --- a/hw/intc/Kconfig +++ b/hw/intc/Kconfig @@ -21,18 +21,28 @@ config APIC =20 config ARM_GIC_KVM bool + default y + depends on ARM_GIC && KVM =20 config OPENPIC_KVM bool + default y + depends on OPENPIC && KVM =20 config XICS bool + default y + depends on PSERIES =20 config XICS_SPAPR bool + default y + depends on PSERIES =20 config XICS_KVM bool + default y + depends on XICS && KVM =20 config ALLWINNER_A10_PIC bool @@ -42,6 +52,8 @@ config S390_FLIC =20 config S390_FLIC_KVM bool + default y + depends on S390_FLIC && KVM =20 config OMPIC bool diff --git a/hw/misc/Kconfig b/hw/misc/Kconfig index d512634..74474bb 100644 --- a/hw/misc/Kconfig +++ b/hw/misc/Kconfig @@ -48,6 +48,8 @@ config MACIO =20 config IVSHMEM_DEVICE bool + default y + depends on PCI =20 config ECCMEMCTL bool diff --git a/hw/ppc/Kconfig b/hw/ppc/Kconfig index 6087454..fb085d7 100644 --- a/hw/ppc/Kconfig +++ b/hw/ppc/Kconfig @@ -39,6 +39,10 @@ config VIRTEX =20 config XIVE bool + default y + depends on PSERIES =20 config XIVE_SPAPR bool + default y + depends on PSERIES diff --git a/hw/scsi/Kconfig b/hw/scsi/Kconfig index eb78478..a3518a3 100644 --- a/hw/scsi/Kconfig +++ b/hw/scsi/Kconfig @@ -19,8 +19,15 @@ config ESP config ESP_PCI bool =20 +config SPAPR_VSCSI + bool + default y + depends on PSERIES + config VIRTIO_SCSI bool =20 config VHOST_USER_SCSI bool + default y + depends on VHOST_USER && LINUX diff --git a/hw/tpm/Kconfig b/hw/tpm/Kconfig index 2eee8eb..da4bb5b 100644 --- a/hw/tpm/Kconfig +++ b/hw/tpm/Kconfig @@ -3,6 +3,7 @@ config TPM =20 config TPM_TIS bool + depends on TPM =20 config TPM_CRB bool diff --git a/hw/vfio/Kconfig b/hw/vfio/Kconfig index 3606967..0fdff10 100644 --- a/hw/vfio/Kconfig +++ b/hw/vfio/Kconfig @@ -1,14 +1,21 @@ config VFIO bool + depends on LINUX =20 config VFIO_PCI bool + select VFIO + depends on LINUX =20 config VFIO_CCW bool + select VFIO + depends on LINUX =20 config VFIO_PLATFORM bool + select VFIO + depends on LINUX =20 config VFIO_XGMAC bool @@ -18,3 +25,5 @@ config VFIO_AMD_XGBE =20 config VFIO_AP bool + select VFIO + depends on LINUX diff --git a/rules.mak b/rules.mak index 86e033d..62cf02e 100644 --- a/rules.mak +++ b/rules.mak @@ -144,7 +144,7 @@ cc-option =3D $(if $(shell $(CC) $1 $2 -S -o /dev/null = -xc /dev/null \ cc-c-option =3D $(if $(shell $(CC) $1 $2 -c -o /dev/null -xc /dev/null \ >/dev/null 2>&1 && echo OK), $2, $3) =20 -VPATH_SUFFIXES =3D %.c %.h %.S %.cc %.cpp %.m %.mak %.texi %.sh %.rc +VPATH_SUFFIXES =3D %.c %.h %.S %.cc %.cpp %.m %.mak %.texi %.sh %.rc Kconf= ig% set-vpath =3D $(if $1,$(foreach PATTERN,$(VPATH_SUFFIXES),$(eval vpath $(P= ATTERN) $1))) =20 # install-prog list, dir diff --git a/scripts/make_device_config.sh b/scripts/make_device_config.sh deleted file mode 100644 index 354af31..0000000 --- a/scripts/make_device_config.sh +++ /dev/null @@ -1,30 +0,0 @@ -#! /bin/sh -# Writes a target device config file to stdout, from a default and from -# include directives therein. Also emits Makefile dependencies. -# -# Usage: make_device_config.sh SRC DEPFILE-NAME DEPFILE-TARGET > DEST - -src=3D$1 -dep=3D$2 -target=3D$3 -src_dir=3D$(dirname $src) -all_includes=3D - -process_includes () { - cat $1 | grep '^include' | \ - while read include file ; do - all_includes=3D"$all_includes $src_dir/$file" - process_includes $src_dir/$file - done -} - -f=3D$src -while [ -n "$f" ] ; do - f=3D$(cat $f | tr -d '\r' | awk '/^include / {printf "'$src_dir'/%s ", $= 2}') - [ $? =3D 0 ] || exit 1 - all_includes=3D"$all_includes $f" -done -process_includes $src - -cat $src $all_includes | grep -v '^include' -echo "$target: $all_includes" > $dep --=20 1.8.3.1 From nobody Wed Apr 24 17:06:17 2024 Delivered-To: importer@patchew.org Received-SPF: temperror (zoho.com: Error in retrieving data from DNS) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=temperror (zoho.com: Error in retrieving data from DNS) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1549562775881634.666040848136; Thu, 7 Feb 2019 10:06:15 -0800 (PST) Received: from localhost ([127.0.0.1]:44571 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gro3p-0008Q1-Mb for importer@patchew.org; Thu, 07 Feb 2019 13:06:05 -0500 Received: from eggs.gnu.org ([209.51.188.92]:57319) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1grnvs-0001uX-RQ for qemu-devel@nongnu.org; Thu, 07 Feb 2019 12:57:55 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1grnvr-0002Cq-Is for qemu-devel@nongnu.org; Thu, 07 Feb 2019 12:57:52 -0500 Received: from mail-wr1-x443.google.com ([2a00:1450:4864:20::443]:35345) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1grnvr-00026j-AB for qemu-devel@nongnu.org; Thu, 07 Feb 2019 12:57:51 -0500 Received: by mail-wr1-x443.google.com with SMTP id z18so855410wrh.2 for ; Thu, 07 Feb 2019 09:57:45 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id q12sm12708982wmf.2.2019.02.07.09.57.43 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 07 Feb 2019 09:57:43 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=nfkgXXx3MWh2uH/8jURh2pzZF1eDUgWEyXWXb9rUCxM=; b=Z5hyHgJ2lYuVGTypDLAYf/3QqqCxz8Kn3xpEmbR+I4zE70EJLnKdWBgGuhMNghj5Eo adY9+Q7jhugvGoVvYv0PZOrb4eYJ7ML/pHGSsQAvrQOCBkQ96R4T0bkW15+BfNPfVd6m +osvOW3QO+Bk22NJ/ALcgDOvSRD9PABO9i80L7aost2i0XzqqGkugZrtW1GopXEwPJNj QtC/GNOkc+GZKrq6OuBpoFa+ATuXBhO4q3lgzPO7jiif5tbqiDXwsge15hbbfJSZpG8O vBUN5XraZUKzokMmpHwAM2iyrG9l0SR09Ttfe1E2PiVS110aTE6mSfU0lmVTXAHVoM4P ZviA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=nfkgXXx3MWh2uH/8jURh2pzZF1eDUgWEyXWXb9rUCxM=; b=i6PN/dGXcICesvdDL4OoCh4c5S0DMsuGaSpjHAKlqUjDWZqpklkqtKAm3a9IfBdnhf GUHGjfDqRy9Ktwatyq7+tUGd+hGEGn7wJCvcg4LNOyZ6zCnv75ZaRUgdviOj++MKEGf9 CMuindRU7eBWEJJi3vJUxcQEhKtIahUAL1ZhrRiE3eltUnFeGvPhahWsGWvSY6nCFlDS JImKF+vuD4qxqrUsai0CvFwopB988RIlLOPf7K9HMk+p+aBaSipDCmEbsZTZUkbvkrzG slVu9vcGPN222IxmzSiCreKs2zv01gy31R3BnFBv5sKv8UcxoqZhr47HLg1i2FCntnwj l4NQ== X-Gm-Message-State: AHQUAubpRGHtjIestRaGC6dpKPxTdinfSZSAUvb01OPVkcKwOfyrI7tW lFiXCdpmEooSKjZqq/chtLXX+RJy X-Google-Smtp-Source: AHgI3IYRLp/ukk9tX2KgeCsl4jCoO4X1zhNZA3f9B9qkqGj/xFDqQmJBND0TUF6oP4zEaNVXncwsJg== X-Received: by 2002:a5d:6803:: with SMTP id w3mr13612322wru.272.1549562263918; Thu, 07 Feb 2019 09:57:43 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Thu, 7 Feb 2019 18:56:50 +0100 Message-Id: <1549562254-41157-8-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1549562254-41157-1-git-send-email-pbonzini@redhat.com> References: <1549562254-41157-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::443 Subject: [Qemu-devel] [PATCH 07/51] minikconfig: implement allnoconfig and defconfig modes X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: thuth@redhat.com, philmd@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Apart from defconfig (which is a no-op), allyesconfig/allnoconfig/randcondfig can be implemented simply by ignoring the RHS of assignments and "default" statements. The RHS is replaced respectively by "true", "false" or a random value. However, allyesconfig and randconfig do not quite work, because all the files for hw/ARCH/Kconfig are sourced and therefore you could end up enabling some ARM boards in x86 or things like that. This is left for future work, but I am leaving it in to help debugging minikconf itself. allnoconfig mode is tied to a new configure option, --without-default-devic= es. Signed-off-by: Paolo Bonzini Reviewed-by: Michael S. Tsirkin --- Makefile | 1 + configure | 12 +++++++++++- scripts/minikconf.py | 43 ++++++++++++++++++++++++++++++++++--------- 3 files changed, 46 insertions(+), 10 deletions(-) diff --git a/Makefile b/Makefile index 959ab9e..e444f91 100644 --- a/Makefile +++ b/Makefile @@ -331,6 +331,7 @@ endif =20 # This has to be kept in sync with Kconfig.host. MINIKCONF_ARGS =3D \ + $(CONFIG_MINIKCONF_MODE) \ $@ $*-config.devices.mak.d $< $(MINIKCONF_INPUTS) \ CONFIG_KVM=3D$(CONFIG_KVM) \ CONFIG_SPICE=3D$(CONFIG_SPICE) \ diff --git a/configure b/configure index 64f843f..39e80c7 100755 --- a/configure +++ b/configure @@ -486,7 +486,7 @@ libxml2=3D"" docker=3D"no" debug_mutex=3D"no" libpmem=3D"" -libudev=3D"no" +default_devices=3D"yes" =20 # cross compilers defaults, can be overridden with --cross-cc-ARCH cross_cc_aarch64=3D"aarch64-linux-gnu-gcc" @@ -997,6 +997,10 @@ for opt do ;; --with-trace-file=3D*) trace_file=3D"$optarg" ;; + --with-default-devices) default_devices=3D"yes" + ;; + --without-default-devices) default_devices=3D"no" + ;; --enable-gprof) gprof=3D"yes" ;; --enable-gcov) gcov=3D"yes" @@ -6183,6 +6187,7 @@ echo "capstone $capstone" echo "docker $docker" echo "libpmem support $libpmem" echo "libudev $libudev" +echo "default devices $default_devices" =20 if test "$supported_cpu" =3D "no"; then echo @@ -6244,6 +6249,11 @@ echo "GIT_UPDATE=3D$git_update" >> $config_host_mak =20 echo "ARCH=3D$ARCH" >> $config_host_mak =20 +if test "$default_devices" =3D "yes" ; then + echo "CONFIG_MINIKCONF_MODE=3D--defconfig" >> $config_host_mak +else + echo "CONFIG_MINIKCONF_MODE=3D--allnoconfig" >> $config_host_mak +fi if test "$debug_tcg" =3D "yes" ; then echo "CONFIG_DEBUG_TCG=3Dy" >> $config_host_mak fi diff --git a/scripts/minikconf.py b/scripts/minikconf.py index dd96ab9..dc1b612 100644 --- a/scripts/minikconf.py +++ b/scripts/minikconf.py @@ -14,17 +14,15 @@ from __future__ import print_function import os import sys import re +import random =20 - __all__ =3D [ 'KconfigParserError', 'KconfigData', 'KconfigParser' ] +__all__ =3D [ 'KconfigParserError', 'KconfigData', 'KconfigParser', + 'defconfig', 'allyesconfig', 'allnoconfig', 'randconfig' ] =20 def debug_print(*args): print('#' + (' '.join(str(x) for x in args))) pass =20 -def debug_print(*args): - #print ' '.join(str(x) for x in args) - pass - # ------------------------------------------- # KconfigData implements the Kconfig semantics. For now it can only # detect undefined symbols, i.e. symbols that were referenced in @@ -35,6 +33,11 @@ def debug_print(*args): # just its name). # ------------------------------------------- =20 +allyesconfig =3D lambda x: True +allnoconfig =3D lambda x: False +defconfig =3D lambda x: x +randconfig =3D lambda x: random.randint(0, 1) =3D=3D 1 + class KconfigData: class Expr: def __and__(self, rhs): @@ -188,7 +191,8 @@ class KconfigData: if self.cond.evaluate(): self.dest.set_value(True, self) =20 - def __init__(self): + def __init__(self, value_mangler=3Ddefconfig): + self.value_mangler =3D value_mangler self.previously_included =3D [] self.incl_info =3D None self.defined_vars =3D set() @@ -268,6 +272,7 @@ class KconfigData: self.clauses.append(KconfigData.AssignmentClause(var, val)) =20 def do_default(self, var, val, cond=3DNone): + val =3D self.value_mangler(val) self.clauses.append(KconfigData.DefaultClause(var, val, cond)) =20 def do_depends_on(self, var, expr): @@ -324,9 +329,10 @@ class KconfigParserError(Exception): return "%s: %s" % (self.loc, self.msg) =20 class KconfigParser: + @classmethod - def parse(self, fp): - data =3D KconfigData() + def parse(self, fp, mode=3DNone): + data =3D KconfigData(mode or KconfigParser.defconfig) parser =3D KconfigParser(data) parser.parse_file(fp) return data @@ -649,11 +655,30 @@ class KconfigParser: =20 if __name__ =3D=3D '__main__': argv =3D sys.argv + mode =3D defconfig + if len(sys.argv) > 1: + if argv[1] =3D=3D '--defconfig': + del argv[1] + elif argv[1] =3D=3D '--randconfig': + random.seed() + mode =3D randconfig + del argv[1] + elif argv[1] =3D=3D '--allyesconfig': + mode =3D allyesconfig + del argv[1] + elif argv[1] =3D=3D '--allnoconfig': + mode =3D allnoconfig + del argv[1] + if len(argv) =3D=3D 1: print ("%s: at least one argument is required" % argv[0], file=3Ds= ys.stderr) sys.exit(1) =20 - data =3D KconfigData() + if argv[1].startswith('-'): + print ("%s: invalid option %s" % (argv[0], argv[1]), file=3Dsys.st= derr) + sys.exit(1) + + data =3D KconfigData(mode) parser =3D KconfigParser(data) for arg in argv[3:]: m =3D re.match(r'^(CONFIG_[A-Z0-9_]+)=3D([yn]?)$', arg) --=20 1.8.3.1 From nobody Wed Apr 24 17:06:17 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1549562582436102.20098537794308; Thu, 7 Feb 2019 10:03:02 -0800 (PST) Received: from localhost ([127.0.0.1]:44513 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gro0r-0005q1-C8 for importer@patchew.org; Thu, 07 Feb 2019 13:03:01 -0500 Received: from eggs.gnu.org ([209.51.188.92]:57341) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1grnvt-0001vt-Fx for qemu-devel@nongnu.org; Thu, 07 Feb 2019 12:57:55 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1grnvr-0002DE-PC for qemu-devel@nongnu.org; Thu, 07 Feb 2019 12:57:53 -0500 Received: from mail-wr1-x444.google.com ([2a00:1450:4864:20::444]:40393) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1grnvr-00027h-Ex for qemu-devel@nongnu.org; Thu, 07 Feb 2019 12:57:51 -0500 Received: by mail-wr1-x444.google.com with SMTP id q1so809902wrp.7 for ; Thu, 07 Feb 2019 09:57:46 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id q12sm12708982wmf.2.2019.02.07.09.57.43 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 07 Feb 2019 09:57:44 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=DJzr1h8T6kz1tVDPY6iOwYzXqvfqfn6mIo9R41kTp7U=; b=AxCkbtLcNEPPaD6FLH8IZXSTIIN1jKWg4DLsUeRszkETnXQ5JLJ3eTY/JoJAkNkcPJ OGaSAfPrWWhvQd3WjisRDI8vNClHx/mPr4XBMBZaYEPC9baWLq/7Yo5ah9M+O5ICwk74 CC7OZDBFqPm70+BAk/HQbMmqP6mW1E6diVrR7/LCE4LSIfpnV+BH0hNbENRfMJB7jkSX 7wU8wqd15enkMhkHeMSYzsgGe7DuadcXPZzIvRthuKe1K1hWmVA5BklfgoO7pGBxxyb4 2Yut4gZb0QALzMSWi4zU9Fh0SU5247cFoWKYI62JwPbmMPY3cf3IsqZ+L5H4uzHqsujL IMEw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=DJzr1h8T6kz1tVDPY6iOwYzXqvfqfn6mIo9R41kTp7U=; b=hF2kEfMiAS3Ec1AaSYiftGhHqlfidT5U7cDh5SPN/Bna2unSsr25qBeG7QcM5aEbOq QEglTz5C2yhhADUabrIOCrbtIkLQ23H2ZWCYlBcHmlOMuEvCzzLwxFvWpyGEdBepWXgy 2h3z+rCI/71n0mAPeFjJJENCuU/2WFOeXP9keLMIojEU7xdLY351r4bTQiAPs5xnH/Mx LfZopWx5Ro6LriOi8267q7dEa4eA+p0skaa6gEZGmJ0gJPry38Vc58JiKD3VTv6uWToh l2waOhoPySUQpW3fadhXSISY5Xn91qgBpnv7K7vPvaEt+03bMIX43GuXmgmLr1d1CzXJ 10Rw== X-Gm-Message-State: AHQUAuZguIg7rpcVbfKWa4yidD7lLZaWaIVABtXHFsPk1Pwj78YPURW3 KBKCe9/9MlHNttdyOBMo1Hd+O0Az X-Google-Smtp-Source: AHgI3IbB773wEAoPN1ktoefgPqqq4RcqwAXBkANHDTR0fqaWiVhevWitG/jutaevSk7HlZIMaDFL+w== X-Received: by 2002:adf:fd0a:: with SMTP id e10mr13818203wrr.190.1549562265497; Thu, 07 Feb 2019 09:57:45 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Thu, 7 Feb 2019 18:56:51 +0100 Message-Id: <1549562254-41157-9-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1549562254-41157-1-git-send-email-pbonzini@redhat.com> References: <1549562254-41157-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::444 Subject: [Qemu-devel] [PATCH 08/51] kconfig: introduce CONFIG_TEST_DEVICES X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: thuth@redhat.com, philmd@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Devices that are mostly used for testing purposes (for example in endianness-test) will be moved under a new symbol CONFIG_TEST_DEVICES that can be disabled in the default-configs file. This makes it easier to drop this code from QEMU if desirable. Signed-off-by: Paolo Bonzini Reviewed-by: Michael S. Tsirkin --- default-configs/alpha-softmmu.mak | 1 + default-configs/i386-softmmu.mak | 1 + default-configs/mips-softmmu-common.mak | 1 + default-configs/ppc-softmmu.mak | 1 + default-configs/sh4-softmmu.mak | 1 + default-configs/sh4eb-softmmu.mak | 1 + default-configs/sparc64-softmmu.mak | 1 + hw/Kconfig | 3 +++ 8 files changed, 10 insertions(+) diff --git a/default-configs/alpha-softmmu.mak b/default-configs/alpha-soft= mmu.mak index 49cb7ce..74501ca 100644 --- a/default-configs/alpha-softmmu.mak +++ b/default-configs/alpha-softmmu.mak @@ -18,5 +18,6 @@ CONFIG_IDE_CMD646=3Dy CONFIG_I8259=3Dy CONFIG_MC146818RTC=3Dy CONFIG_ISA_TESTDEV=3Dy +CONFIG_TEST_DEVICES=3Dy CONFIG_SMC37C669=3Dy CONFIG_DP264=3Dy diff --git a/default-configs/i386-softmmu.mak b/default-configs/i386-softmm= u.mak index 412c8c5..1d43fb2 100644 --- a/default-configs/i386-softmmu.mak +++ b/default-configs/i386-softmmu.mak @@ -4,6 +4,7 @@ include pci.mak include sound.mak include usb.mak include hyperv.mak +CONFIG_TEST_DEVICES=3Dy CONFIG_VGA_ISA=3Dy CONFIG_VGA_CIRRUS=3Dy CONFIG_VMWARE_VGA=3Dy diff --git a/default-configs/mips-softmmu-common.mak b/default-configs/mips= -softmmu-common.mak index ded7498..331bdc5 100644 --- a/default-configs/mips-softmmu-common.mak +++ b/default-configs/mips-softmmu-common.mak @@ -41,3 +41,4 @@ CONFIG_MALTA=3Dy CONFIG_MIPSSIM=3Dy CONFIG_ACPI_SMBUS=3Dy CONFIG_SMBUS_EEPROM=3Dy +CONFIG_TEST_DEVICES=3Dy diff --git a/default-configs/ppc-softmmu.mak b/default-configs/ppc-softmmu.= mak index 90118cb..a58d81a 100644 --- a/default-configs/ppc-softmmu.mak +++ b/default-configs/ppc-softmmu.mak @@ -3,6 +3,7 @@ include pci.mak include sound.mak include usb.mak +CONFIG_TEST_DEVICES=3Dy =20 # For embedded PPCs: CONFIG_PPC4XX=3Dy diff --git a/default-configs/sh4-softmmu.mak b/default-configs/sh4-softmmu.= mak index 1fdb009..38c7290 100644 --- a/default-configs/sh4-softmmu.mak +++ b/default-configs/sh4-softmmu.mak @@ -12,6 +12,7 @@ CONFIG_SM501=3Dy CONFIG_I2C=3Dy CONFIG_DDC=3Dy CONFIG_ISA_TESTDEV=3Dy +CONFIG_TEST_DEVICES=3Dy CONFIG_I82378=3Dy CONFIG_I8259=3Dy CONFIG_I8254=3Dy diff --git a/default-configs/sh4eb-softmmu.mak b/default-configs/sh4eb-soft= mmu.mak index 3b550a5..c966cca 100644 --- a/default-configs/sh4eb-softmmu.mak +++ b/default-configs/sh4eb-softmmu.mak @@ -12,6 +12,7 @@ CONFIG_SM501=3Dy CONFIG_I2C=3Dy CONFIG_DDC=3Dy CONFIG_ISA_TESTDEV=3Dy +CONFIG_TEST_DEVICES=3Dy CONFIG_I82378=3Dy CONFIG_I8259=3Dy CONFIG_I8254=3Dy diff --git a/default-configs/sparc64-softmmu.mak b/default-configs/sparc64-= softmmu.mak index 1fae488..415d4e0 100644 --- a/default-configs/sparc64-softmmu.mak +++ b/default-configs/sparc64-softmmu.mak @@ -16,6 +16,7 @@ CONFIG_SIMBA=3Dy CONFIG_SUNHME=3Dy CONFIG_MC146818RTC=3Dy CONFIG_ISA_TESTDEV=3Dy +CONFIG_TEST_DEVICES=3Dy CONFIG_SUN4V_RTC=3Dy CONFIG_SUN4U=3Dy CONFIG_NIAGARA=3Dy diff --git a/hw/Kconfig b/hw/Kconfig index c4f1547..f902c8f 100644 --- a/hw/Kconfig +++ b/hw/Kconfig @@ -61,6 +61,9 @@ source unicore32/Kconfig source xtensa/Kconfig =20 # Symbols used by multiple targets +config TEST_DEVICES + bool + config XILINX bool =20 --=20 1.8.3.1 From nobody Wed Apr 24 17:06:17 2024 Delivered-To: importer@patchew.org Received-SPF: temperror (zoho.com: Error in retrieving data from DNS) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=temperror (zoho.com: Error in retrieving data from DNS) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (209.51.188.17 [209.51.188.17]) by mx.zohomail.com with SMTPS id 1549562404115539.8418605205022; Thu, 7 Feb 2019 10:00:04 -0800 (PST) Received: from localhost ([127.0.0.1]:44454 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1grnxp-0003Mw-0C for importer@patchew.org; Thu, 07 Feb 2019 12:59:53 -0500 Received: from eggs.gnu.org ([209.51.188.92]:57300) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1grnvs-0001tl-Et for qemu-devel@nongnu.org; Thu, 07 Feb 2019 12:57:54 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1grnvr-0002Ca-Bh for qemu-devel@nongnu.org; Thu, 07 Feb 2019 12:57:52 -0500 Received: from mail-wm1-x343.google.com ([2a00:1450:4864:20::343]:51790) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1grnvr-00028h-3W for qemu-devel@nongnu.org; Thu, 07 Feb 2019 12:57:51 -0500 Received: by mail-wm1-x343.google.com with SMTP id b11so828184wmj.1 for ; Thu, 07 Feb 2019 09:57:47 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id q12sm12708982wmf.2.2019.02.07.09.57.45 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 07 Feb 2019 09:57:45 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=hHszIOZEMxZeszGU5BKHUxl4X5auNj94NxsxZzgyA04=; b=mSSdEIeHSAXesxfvZNZJu0zKFzBjhPLQaN04vVi/OJywhB6N8dpS06n62mLe5WaEwm cvxhEZWkJKv8bqzDocgyNTBKwe77XN7oQ2QmJE7LggVJxkMxPf4EXOgim7evELEnukuT 1nfZehSCFUbsj4qsl9ZIi7hJXj/pZXr5fzN2dJydhOuW49ybMEUZR8Vz5mdUzBAp9sQJ l4zacQntInuwIIWEYCbBE6u+f9+llkkNYMUA8DNeF6IItuqB+FIMrcOC37MwNG92mXMl /pvFOTcoJJx7urDv/tej1+fWhthhkyhH7+1FrI/IEzBnrAFgJ/HlUOnueuY0fpTyLL19 a1EQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=hHszIOZEMxZeszGU5BKHUxl4X5auNj94NxsxZzgyA04=; b=qOluaY+gWmsJC0Tv9rfKrDh2NeR2uuFU1CJB4h5VzlZkN96Wt8NXNQ0mB9LnRxIy9o uSVmWxORwh/uiz2H/SP5Wcx4gaTd8gin4PC/MbcxPWlbbAGZ15BxUk9bKwzxtUGoWGc9 4+YjN6hhJGC0bQ3naQDynFG2/ru3dmchTI49m3ptbOLWE6pxCxVudztStFxdTnuZYuwU T4PPoGm3VJDkinP0MN5azQqQuJXEubIHSLY1JpgluGujlW0i8MM9MGR6ZfngmZmKS2EE GhteOzryGFCVOw6VjPR0Ao01PfgY5J9YbWMW53f9byQEy9WvcaJfl4zdEFUftQESrded YpDw== X-Gm-Message-State: AHQUAuZX+1QczzF/AjWXp77MV4gEY5AdNwald6nabZMxR4g8j4UbAq9Y KcMKt4vCtS7hybj2SFMeGjYZT9t7 X-Google-Smtp-Source: AHgI3Iadv5psgdiVHhPVrEs3770D61pvs3aTNN1CiWgADVU+N5gUUaUFiNUOkXkgK6YIQOS2wtqLuQ== X-Received: by 2002:a1c:4d06:: with SMTP id o6mr4098516wmh.6.1549562266515; Thu, 07 Feb 2019 09:57:46 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Thu, 7 Feb 2019 18:56:52 +0100 Message-Id: <1549562254-41157-10-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1549562254-41157-1-git-send-email-pbonzini@redhat.com> References: <1549562254-41157-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::343 Subject: [Qemu-devel] [PATCH 09/51] ide: express dependencies with Kconfig X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: thuth@redhat.com, philmd@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Signed-off-by: Paolo Bonzini Reviewed-by: Thomas Huth Message-Id: <20190123065618.3520-29-yang.zhong@intel.com> Signed-off-by: Paolo Bonzini Reviewed-by: Michael S. Tsirkin --- default-configs/alpha-softmmu.mak | 2 -- default-configs/hppa-softmmu.mak | 1 - default-configs/pci.mak | 3 --- default-configs/sparc64-softmmu.mak | 1 - hw/ide/Kconfig | 15 +++++++++++++++ 5 files changed, 15 insertions(+), 7 deletions(-) diff --git a/default-configs/alpha-softmmu.mak b/default-configs/alpha-soft= mmu.mak index 74501ca..3fd656e 100644 --- a/default-configs/alpha-softmmu.mak +++ b/default-configs/alpha-softmmu.mak @@ -11,8 +11,6 @@ CONFIG_PARALLEL=3Dy CONFIG_FDC=3Dy CONFIG_PCKBD=3Dy CONFIG_VGA_CIRRUS=3Dy -CONFIG_IDE_CORE=3Dy -CONFIG_IDE_QDEV=3Dy CONFIG_VMWARE_VGA=3Dy CONFIG_IDE_CMD646=3Dy CONFIG_I8259=3Dy diff --git a/default-configs/hppa-softmmu.mak b/default-configs/hppa-softmm= u.mak index b594a6d..e0a6cdc 100644 --- a/default-configs/hppa-softmmu.mak +++ b/default-configs/hppa-softmmu.mak @@ -5,7 +5,6 @@ CONFIG_SERIAL_ISA=3Dy CONFIG_ISA_BUS=3Dy CONFIG_I8259=3Dy CONFIG_E1000_PCI=3Dy -CONFIG_IDE_ISA=3Dy CONFIG_IDE_CMD646=3Dy # CONFIG_IDE_MMIO=3Dy CONFIG_VIRTIO_VGA=3Dy diff --git a/default-configs/pci.mak b/default-configs/pci.mak index 3d4c71d..41af5e7 100644 --- a/default-configs/pci.mak +++ b/default-configs/pci.mak @@ -23,9 +23,6 @@ CONFIG_MPTSAS_SCSI_PCI=3Dy CONFIG_RTL8139_PCI=3Dy CONFIG_E1000_PCI=3Dy CONFIG_E1000E_PCI_EXPRESS=3Dy -CONFIG_IDE_CORE=3Dy -CONFIG_IDE_QDEV=3Dy -CONFIG_IDE_PCI=3Dy CONFIG_AHCI=3Dy CONFIG_ESP=3Dy CONFIG_ESP_PCI=3Dy diff --git a/default-configs/sparc64-softmmu.mak b/default-configs/sparc64-= softmmu.mak index 415d4e0..b17513b 100644 --- a/default-configs/sparc64-softmmu.mak +++ b/default-configs/sparc64-softmmu.mak @@ -9,7 +9,6 @@ CONFIG_SERIAL_ISA=3Dy CONFIG_PARALLEL=3Dy CONFIG_PCKBD=3Dy CONFIG_FDC=3Dy -CONFIG_IDE_ISA=3Dy CONFIG_IDE_CMD646=3Dy CONFIG_PCI_SABRE=3Dy CONFIG_SIMBA=3Dy diff --git a/hw/ide/Kconfig b/hw/ide/Kconfig index 5ec4495..fe27705 100644 --- a/hw/ide/Kconfig +++ b/hw/ide/Kconfig @@ -3,33 +3,48 @@ config IDE_CORE =20 config IDE_QDEV bool + select IDE_CORE =20 config IDE_PCI bool + select IDE_CORE =20 config IDE_ISA bool + select IDE_QDEV =20 config IDE_PIIX bool + select IDE_PCI + select IDE_QDEV =20 config IDE_CMD646 bool + select IDE_PCI + select IDE_QDEV =20 config IDE_MACIO bool + select IDE_QDEV =20 config IDE_MMIO bool + select IDE_QDEV =20 config IDE_VIA bool + select IDE_PCI + select IDE_QDEV =20 config MICRODRIVE bool + select IDE_QDEV =20 config AHCI bool + select IDE_QDEV =20 config IDE_SII3112 bool + select IDE_PCI + select IDE_QDEV --=20 1.8.3.1 From nobody Wed Apr 24 17:06:17 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (209.51.188.17 [209.51.188.17]) by mx.zohomail.com with SMTPS id 1549562589726282.4784599754786; Thu, 7 Feb 2019 10:03:09 -0800 (PST) Received: from localhost ([127.0.0.1]:44518 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gro0t-0005sl-Jb for importer@patchew.org; Thu, 07 Feb 2019 13:03:03 -0500 Received: from eggs.gnu.org ([209.51.188.92]:57330) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1grnvt-0001vY-4J for qemu-devel@nongnu.org; Thu, 07 Feb 2019 12:57:55 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1grnvr-0002D9-OS for qemu-devel@nongnu.org; Thu, 07 Feb 2019 12:57:53 -0500 Received: from mail-wr1-x42b.google.com ([2a00:1450:4864:20::42b]:44331) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1grnvr-000299-Eq for qemu-devel@nongnu.org; Thu, 07 Feb 2019 12:57:51 -0500 Received: by mail-wr1-x42b.google.com with SMTP id v16so782022wrn.11 for ; Thu, 07 Feb 2019 09:57:48 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id q12sm12708982wmf.2.2019.02.07.09.57.46 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 07 Feb 2019 09:57:46 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=aIBl5wFiLxpc6h/39OIM4lZ3VqJmDtiri04ACrFvrAU=; b=BnZWscaVZaxUk6RXWpUxvQLdXtzO/8a28K7E4a+tIo7Zf4bzNLUqZISHZc0f0ZznPF 7MdPzcxMk/vqVtdGIi36UlMTieujKUV+FqtgAnUiZ6epfLDY87LoHJ4TLfZ1+JxGoE/m dFJYDaKLZyIn6mnpyQtGrYsjyVkwroJxJQVPQ3RBr0peuDL1CvpNPiwoEPWjFDRrgz7x 538RxZpIBVs2VN1SBKdYEz0jayMmQ3dHaJRsYy9jVd23PyN/72ucx2wCAMbu7bLQ8Oxz 3ifkfHdignotxObvhTzD/sqbBIyFnWPgFXFuwN6n2eKovkn0GvWbfOLAd0Q54bxd7JHH HTBg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=aIBl5wFiLxpc6h/39OIM4lZ3VqJmDtiri04ACrFvrAU=; b=dpc25aHliSHD725xgxrCEnOua1r4pe8kI3wArNEp/Qku8jdqmOKLHxV7HEQ4+3+cXp ILNR6YGsyJf6x/lCQvq24WPB9fxJZIdrDQP5ddSPJmUEk3lqJKM2M6AewuvtCPSq8pFB VPFQyRfH9Tn+wXq/bfrkf4wozsvzo+kDsZ5OPUzR2Y4SGOX/Bz41m2kTFP3nipdV4CuV /QnQKu96vGDFNGeHv8FIy8W6b+f8CUsItEWkfPzzOYzz2L/jdST17vFybpLtsopvUFWo lVuaPF9jv6kHyupZ+EFDrDvaXHFWLkxZuaAK355729y6yErWeg/tmf+c85v4ROvU4L64 gWRw== X-Gm-Message-State: AHQUAub4oYSQPCs7efTRyVOjVBKXUQaX42CPz18kBJskQXTABrdPk4rQ mDNG5nQHyfz6E6G/HkLm2ITXKI76 X-Google-Smtp-Source: AHgI3IazYu90tujvpvk+BJjy5zyHBQ69dt4SFxAbFcQuH836u8welQaYHL2cy2o4zC9efb5iCnNZVw== X-Received: by 2002:a5d:4349:: with SMTP id u9mr13821711wrr.223.1549562267580; Thu, 07 Feb 2019 09:57:47 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Thu, 7 Feb 2019 18:56:53 +0100 Message-Id: <1549562254-41157-11-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1549562254-41157-1-git-send-email-pbonzini@redhat.com> References: <1549562254-41157-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::42b Subject: [Qemu-devel] [PATCH 10/51] hw/pci/Makefile.objs: make pcie configurable X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Yang Zhong , thuth@redhat.com, philmd@redhat.com, "Michael S. Tsirkin" Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Yang Zhong Make pcie splited from pci and make it configurable. Signed-off-by: Yang Zhong Cc: Michael S. Tsirkin Reviewed-by: Thomas Huth Message-Id: <20190123065618.3520-30-yang.zhong@intel.com> Signed-off-by: Paolo Bonzini Reviewed-by: Michael S. Tsirkin --- default-configs/arm-softmmu.mak | 1 + default-configs/i386-softmmu.mak | 1 + default-configs/mips64el-softmmu.mak | 1 + default-configs/ppc-softmmu.mak | 1 + default-configs/riscv32-softmmu.mak | 1 + default-configs/riscv64-softmmu.mak | 1 + hw/pci/Kconfig | 4 ++++ hw/pci/Makefile.objs | 9 +++++++-- 8 files changed, 17 insertions(+), 2 deletions(-) diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.= mak index 40d31cc..3c87a22 100644 --- a/default-configs/arm-softmmu.mak +++ b/default-configs/arm-softmmu.mak @@ -122,6 +122,7 @@ CONFIG_VERSATILE=3Dy CONFIG_VERSATILE_PCI=3Dy CONFIG_VERSATILE_I2C=3Dy =20 +CONFIG_PCI_EXPRESS=3Dy CONFIG_PCI_EXPRESS_GENERIC_BRIDGE=3Dy CONFIG_VFIO_PLATFORM=3Dy CONFIG_VFIO_XGMAC=3Dy diff --git a/default-configs/i386-softmmu.mak b/default-configs/i386-softmm= u.mak index 1d43fb2..256443e 100644 --- a/default-configs/i386-softmmu.mak +++ b/default-configs/i386-softmmu.mak @@ -45,6 +45,7 @@ CONFIG_ISA_TESTDEV=3Dy CONFIG_VMPORT=3Dy CONFIG_SGA=3Dy CONFIG_LPC_ICH9=3Dy +CONFIG_PCI_EXPRESS=3Dy CONFIG_PCI_EXPRESS_Q35=3Dy CONFIG_APIC=3Dy CONFIG_IOAPIC=3Dy diff --git a/default-configs/mips64el-softmmu.mak b/default-configs/mips64e= l-softmmu.mak index 9eb1208..c6ad4da 100644 --- a/default-configs/mips64el-softmmu.mak +++ b/default-configs/mips64el-softmmu.mak @@ -12,4 +12,5 @@ CONFIG_JAZZ_LED=3Dy CONFIG_VT82C686=3Dy CONFIG_MIPS_BOSTON=3Dy CONFIG_FITLOADER=3Dy +CONFIG_PCI_EXPRESS=3Dy CONFIG_PCI_EXPRESS_XILINX=3Dy diff --git a/default-configs/ppc-softmmu.mak b/default-configs/ppc-softmmu.= mak index a58d81a..5c576fe 100644 --- a/default-configs/ppc-softmmu.mak +++ b/default-configs/ppc-softmmu.mak @@ -24,6 +24,7 @@ CONFIG_ETSEC=3Dy CONFIG_PPC405=3Dy CONFIG_PPC440=3Dy CONFIG_VIRTEX=3Dy +CONFIG_PCI_EXPRESS=3Dy =20 # For Sam460ex CONFIG_SAM460EX=3Dy diff --git a/default-configs/riscv32-softmmu.mak b/default-configs/riscv32-= softmmu.mak index 6533716..8c3a91a 100644 --- a/default-configs/riscv32-softmmu.mak +++ b/default-configs/riscv32-softmmu.mak @@ -8,6 +8,7 @@ CONFIG_VIRTIO_MMIO=3Dy =20 CONFIG_CADENCE=3Dy =20 +CONFIG_PCI_EXPRESS=3Dy CONFIG_PCI_EXPRESS_GENERIC_BRIDGE=3Dy =20 CONFIG_VGA=3Dy diff --git a/default-configs/riscv64-softmmu.mak b/default-configs/riscv64-= softmmu.mak index 6533716..8c3a91a 100644 --- a/default-configs/riscv64-softmmu.mak +++ b/default-configs/riscv64-softmmu.mak @@ -8,6 +8,7 @@ CONFIG_VIRTIO_MMIO=3Dy =20 CONFIG_CADENCE=3Dy =20 +CONFIG_PCI_EXPRESS=3Dy CONFIG_PCI_EXPRESS_GENERIC_BRIDGE=3Dy =20 CONFIG_VGA=3Dy diff --git a/hw/pci/Kconfig b/hw/pci/Kconfig index d3d2205..4ca2537 100644 --- a/hw/pci/Kconfig +++ b/hw/pci/Kconfig @@ -1,2 +1,6 @@ config PCI bool + +config PCI_EXPRESS + bool + select PCI diff --git a/hw/pci/Makefile.objs b/hw/pci/Makefile.objs index 9f905e6..c78f2fb 100644 --- a/hw/pci/Makefile.objs +++ b/hw/pci/Makefile.objs @@ -2,8 +2,13 @@ common-obj-$(CONFIG_PCI) +=3D pci.o pci_bridge.o common-obj-$(CONFIG_PCI) +=3D msix.o msi.o common-obj-$(CONFIG_PCI) +=3D shpc.o common-obj-$(CONFIG_PCI) +=3D slotid_cap.o -common-obj-$(CONFIG_PCI) +=3D pci_host.o pcie_host.o -common-obj-$(CONFIG_PCI) +=3D pcie.o pcie_aer.o pcie_port.o +common-obj-$(CONFIG_PCI) +=3D pci_host.o + +# The functions in these modules can be used by devices too. Since we +# allow plugging PCIe devices into PCI buses, include them even if +# CONFIG_PCI_EXPRESS=3Dn. +common-obj-$(CONFIG_PCI) +=3D pcie.o pcie_aer.o +common-obj-$(CONFIG_PCI_EXPRESS) +=3D pcie_port.o pcie_host.o =20 common-obj-$(call lnot,$(CONFIG_PCI)) +=3D pci-stub.o common-obj-$(CONFIG_ALL) +=3D pci-stub.o --=20 1.8.3.1 From nobody Wed Apr 24 17:06:17 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1549563050627566.1018439705401; Thu, 7 Feb 2019 10:10:50 -0800 (PST) Received: from localhost ([127.0.0.1]:44620 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gro8N-0003To-Dy for importer@patchew.org; Thu, 07 Feb 2019 13:10:47 -0500 Received: from eggs.gnu.org ([209.51.188.92]:57442) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1grnvw-0001xb-PY for qemu-devel@nongnu.org; Thu, 07 Feb 2019 12:57:58 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1grnvs-0002Dz-8i for qemu-devel@nongnu.org; Thu, 07 Feb 2019 12:57:56 -0500 Received: from mail-wm1-x344.google.com ([2a00:1450:4864:20::344]:53731) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1grnvr-0002AQ-Ud for qemu-devel@nongnu.org; Thu, 07 Feb 2019 12:57:52 -0500 Received: by mail-wm1-x344.google.com with SMTP id d15so814370wmb.3 for ; Thu, 07 Feb 2019 09:57:50 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id q12sm12708982wmf.2.2019.02.07.09.57.47 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 07 Feb 2019 09:57:47 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=wRucE10Wgnv3yH0zO4eJJ3engn8zWU+17qKqSZZNZoo=; b=FhFDJopn7BF993mYdipfb5HtSSChz13H6SI0ivPeVgv6Pcs33Qcna0Js7B7Jvqdnqc 7pu53+mgxVFLqmBxjHp3ix7Z4PMbs7feSMqqpvS4jvB/RwgyecmJ2O4bs4W29Dd23NcV 8XE0c9Uznyx3dcgFRtBmDeIy6uMhaz14dLzgEZJA9e6CoLrL7G1pp9BGNgWTxTpVeYTq 5Wx7gsXx3TMxFu/n70J0EJi3VNiAFIrVq0g1isOOHicr+lT6rE2ecndR+vp2qFaZ9Ucv gHKy4gvlI1/+F630KcTi7Qf3O5YTKeTt0/NVYWkLnYatRuo6zq7PFzGCloK2vaHmVgoP SAiA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=wRucE10Wgnv3yH0zO4eJJ3engn8zWU+17qKqSZZNZoo=; b=Whq5hvtVdfmWZZFR/emqjqJ2HVLuHU0lDgVrmtNYOMTHMHodP1i06m2zJdAW0Dcc4T dpKRf86zfmDT5S+R0+hGy4r2/bu4RQ5AE1+oIzA50r2Ybe165bBJRR2a/j35BfYfRlTL CC/Fj3sOVT74Dzi7tGiKKlH+KawZ3rNHxjfg59Mvb1rVM6tSlYoxUBxV0GSI2quMJ3I9 BALHLf9M+SejKXO+hCPFdZyz2u/UjtU9XWRbpyLEW2o8lCt1DRmCClI20EQzUxoS3qPp gFN1MnT9CvgILAMC/+JqjLBaUKvcSbDP2dYLTlXYglKNcVGsiA3EmMlrOHIChQRdXrjf XEkw== X-Gm-Message-State: AHQUAubwuhfObCJGhvuW8N7rR2/QTFyQWNAEW5XXFfkqr/KKoBykFB/X ZmNuGdkTORGS1FfoBCsmzOV5oNvy X-Google-Smtp-Source: AHgI3IYYV9EYjRjJiHgIGUi8CUPL0YnB3DiZz465EfMeUpmVkpDrxw9ArM4ERYNIfdC7+XS2kTkf8Q== X-Received: by 2002:a1c:5f8a:: with SMTP id t132mr8680502wmb.40.1549562268650; Thu, 07 Feb 2019 09:57:48 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Thu, 7 Feb 2019 18:56:54 +0100 Message-Id: <1549562254-41157-12-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1549562254-41157-1-git-send-email-pbonzini@redhat.com> References: <1549562254-41157-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::344 Subject: [Qemu-devel] [PATCH 11/51] build: convert pci.mak to Kconfig X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Yang Zhong , thuth@redhat.com, philmd@redhat.com, "Michael S. Tsirkin" Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Instead of including the same list of devices for each target, set CONFIG_PCI to true, and make the devices default to present whenever PCI is available. However, s390x does not want all the PCI devices, so there is a separate symbol to enable them. Done mostly with the following script: while read i; do i=3D${i%=3Dy}; i=3D${i#CONFIG_} sed -i -e'/^config '$i'$/!b' -en \ -e'a\' -e' default y if PCI_DEVICES\' -e' depends on PCI'= \ `grep -lw $i hw/*/Kconfig` done < default-configs/pci.mak followed by replacing a few "depends on" clauses with "select" whenever the symbol is not really related to PCI. Signed-off-by: Paolo Bonzini Signed-off-by: Yang Zhong Cc: Michael S. Tsirkin Reviewed-by: Thomas Huth Message-Id: <20190123065618.3520-31-yang.zhong@intel.com> Acked-by: Richard Henderson Signed-off-by: Paolo Bonzini Reviewed-by: Michael S. Tsirkin --- default-configs/alpha-softmmu.mak | 3 ++- default-configs/arm-softmmu.mak | 7 ++++- default-configs/hppa-softmmu.mak | 5 +++- default-configs/i386-softmmu.mak | 5 ++-- default-configs/mips-softmmu-common.mak | 3 ++- default-configs/mips64el-softmmu.mak | 1 + default-configs/pci.mak | 48 -----------------------------= ---- default-configs/ppc-softmmu.mak | 3 ++- default-configs/riscv32-softmmu.mak | 4 +-- default-configs/riscv64-softmmu.mak | 4 +-- default-configs/sh4-softmmu.mak | 3 ++- default-configs/sh4eb-softmmu.mak | 3 ++- default-configs/sparc64-softmmu.mak | 3 ++- docs/devel/build-system.txt | 1 - hw/audio/Kconfig | 6 +++++ hw/block/Kconfig | 2 ++ hw/char/Kconfig | 2 ++ hw/display/Kconfig | 16 +++++++++++ hw/ide/Kconfig | 3 +++ hw/ipack/Kconfig | 2 ++ hw/misc/Kconfig | 6 ++++- hw/net/Kconfig | 23 ++++++++++++++++ hw/pci-bridge/Kconfig | 8 ++++++ hw/pci-host/Kconfig | 10 +++++++ hw/pci/Kconfig | 3 +++ hw/scsi/Kconfig | 11 ++++++++ hw/sd/Kconfig | 3 +++ hw/usb/Kconfig | 10 +++++++ hw/virtio/Kconfig | 3 +++ hw/watchdog/Kconfig | 2 ++ 30 files changed, 138 insertions(+), 65 deletions(-) delete mode 100644 default-configs/pci.mak diff --git a/default-configs/alpha-softmmu.mak b/default-configs/alpha-soft= mmu.mak index 3fd656e..d19d920 100644 --- a/default-configs/alpha-softmmu.mak +++ b/default-configs/alpha-softmmu.mak @@ -1,7 +1,8 @@ # Default configuration for alpha-softmmu =20 -include pci.mak include usb.mak +CONFIG_PCI=3Dy +CONFIG_PCI_DEVICES=3Dy CONFIG_SERIAL=3Dy CONFIG_SERIAL_ISA=3Dy CONFIG_I82374=3Dy diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.= mak index 3c87a22..1ebe433 100644 --- a/default-configs/arm-softmmu.mak +++ b/default-configs/arm-softmmu.mak @@ -1,7 +1,8 @@ # Default configuration for arm-softmmu =20 -include pci.mak include usb.mak +CONFIG_PCI=3Dy +CONFIG_PCI_DEVICES=3Dy CONFIG_VGA=3Dy CONFIG_NAND=3Dy CONFIG_ECC=3Dy @@ -162,3 +163,7 @@ CONFIG_PCI_EXPRESS_DESIGNWARE=3Dy CONFIG_STRONGARM=3Dy CONFIG_HIGHBANK=3Dy CONFIG_MUSICPAL=3Dy + +# for realview and versatilepb +CONFIG_SCSI=3Dy +CONFIG_LSI_SCSI_PCI=3Dy diff --git a/default-configs/hppa-softmmu.mak b/default-configs/hppa-softmm= u.mak index e0a6cdc..85a2011 100644 --- a/default-configs/hppa-softmmu.mak +++ b/default-configs/hppa-softmmu.mak @@ -1,5 +1,6 @@ -include pci.mak include usb.mak +CONFIG_PCI=3Dy +CONFIG_PCI_DEVICES=3Dy CONFIG_SERIAL=3Dy CONFIG_SERIAL_ISA=3Dy CONFIG_ISA_BUS=3Dy @@ -7,6 +8,8 @@ CONFIG_I8259=3Dy CONFIG_E1000_PCI=3Dy CONFIG_IDE_CMD646=3Dy # CONFIG_IDE_MMIO=3Dy +CONFIG_SCSI=3Dy +CONFIG_LSI_SCSI_PCI=3Dy CONFIG_VIRTIO_VGA=3Dy CONFIG_MC146818RTC=3Dy CONFIG_DINO=3Dy diff --git a/default-configs/i386-softmmu.mak b/default-configs/i386-softmm= u.mak index 256443e..80c4b49 100644 --- a/default-configs/i386-softmmu.mak +++ b/default-configs/i386-softmmu.mak @@ -1,12 +1,12 @@ # Default configuration for i386-softmmu =20 -include pci.mak +CONFIG_PCI=3Dy +CONFIG_PCI_DEVICES=3Dy include sound.mak include usb.mak include hyperv.mak CONFIG_TEST_DEVICES=3Dy CONFIG_VGA_ISA=3Dy -CONFIG_VGA_CIRRUS=3Dy CONFIG_VMWARE_VGA=3Dy CONFIG_VMXNET3_PCI=3Dy CONFIG_VIRTIO_VGA=3Dy @@ -54,7 +54,6 @@ CONFIG_MEM_DEVICE=3Dy CONFIG_DIMM=3Dy CONFIG_NVDIMM=3Dy CONFIG_ACPI_NVDIMM=3Dy -CONFIG_PCIE_PORT=3Dy CONFIG_XIO3130=3Dy CONFIG_IOH3420=3Dy CONFIG_I82801B11=3Dy diff --git a/default-configs/mips-softmmu-common.mak b/default-configs/mips= -softmmu-common.mak index 331bdc5..88f28e5 100644 --- a/default-configs/mips-softmmu-common.mak +++ b/default-configs/mips-softmmu-common.mak @@ -1,8 +1,9 @@ # Common mips*-softmmu CONFIG defines =20 -include pci.mak include sound.mak include usb.mak +CONFIG_PCI=3Dy +CONFIG_PCI_DEVICES=3Dy CONFIG_ESP=3Dy CONFIG_SCSI=3Dy CONFIG_VGA_ISA=3Dy diff --git a/default-configs/mips64el-softmmu.mak b/default-configs/mips64e= l-softmmu.mak index c6ad4da..8b255ef 100644 --- a/default-configs/mips64el-softmmu.mak +++ b/default-configs/mips64el-softmmu.mak @@ -10,6 +10,7 @@ CONFIG_JAZZ=3Dy CONFIG_G364FB=3Dy CONFIG_JAZZ_LED=3Dy CONFIG_VT82C686=3Dy +CONFIG_AHCI=3Dy CONFIG_MIPS_BOSTON=3Dy CONFIG_FITLOADER=3Dy CONFIG_PCI_EXPRESS=3Dy diff --git a/default-configs/pci.mak b/default-configs/pci.mak deleted file mode 100644 index 41af5e7..0000000 --- a/default-configs/pci.mak +++ /dev/null @@ -1,48 +0,0 @@ -CONFIG_PCI=3Dy -# For now, CONFIG_IDE_CORE requires ISA, so we enable it here -CONFIG_ISA_BUS=3Dy -CONFIG_VIRTIO_PCI=3Dy -include virtio.mak -CONFIG_USB_UHCI=3Dy -CONFIG_USB_OHCI=3Dy -CONFIG_USB_EHCI=3Dy -CONFIG_USB_XHCI=3Dy -CONFIG_USB_XHCI_NEC=3Dy -CONFIG_NE2000_PCI=3Dy -CONFIG_EEPRO100_PCI=3Dy -CONFIG_PCNET_PCI=3Dy -CONFIG_PCNET_COMMON=3Dy -CONFIG_AC97=3Dy -CONFIG_HDA=3Dy -CONFIG_ES1370=3Dy -CONFIG_SCSI=3Dy -CONFIG_LSI_SCSI_PCI=3Dy -CONFIG_VMW_PVSCSI_SCSI_PCI=3Dy -CONFIG_MEGASAS_SCSI_PCI=3Dy -CONFIG_MPTSAS_SCSI_PCI=3Dy -CONFIG_RTL8139_PCI=3Dy -CONFIG_E1000_PCI=3Dy -CONFIG_E1000E_PCI_EXPRESS=3Dy -CONFIG_AHCI=3Dy -CONFIG_ESP=3Dy -CONFIG_ESP_PCI=3Dy -CONFIG_SERIAL=3Dy -CONFIG_SERIAL_ISA=3Dy -CONFIG_SERIAL_PCI=3Dy -CONFIG_CAN_BUS=3Dy -CONFIG_CAN_SJA1000=3Dy -CONFIG_CAN_PCI=3Dy -CONFIG_IPACK=3Dy -CONFIG_WDT_IB6300ESB=3Dy -CONFIG_PCI_TESTDEV=3Dy -CONFIG_NVME_PCI=3Dy -CONFIG_SD=3Dy -CONFIG_SDHCI=3Dy -CONFIG_EDU=3Dy -CONFIG_VGA=3Dy -CONFIG_VGA_PCI=3Dy -CONFIG_BOCHS_DISPLAY=3Dy -CONFIG_IVSHMEM_DEVICE=3D$(CONFIG_IVSHMEM) -CONFIG_ROCKER=3Dy -CONFIG_VFIO_PCI=3Dy -CONFIG_EDID=3Dy diff --git a/default-configs/ppc-softmmu.mak b/default-configs/ppc-softmmu.= mak index 5c576fe..f47c069 100644 --- a/default-configs/ppc-softmmu.mak +++ b/default-configs/ppc-softmmu.mak @@ -1,8 +1,9 @@ # Default configuration for ppc-softmmu =20 -include pci.mak include sound.mak include usb.mak +CONFIG_PCI=3Dy +CONFIG_PCI_DEVICES=3Dy CONFIG_TEST_DEVICES=3Dy =20 # For embedded PPCs: diff --git a/default-configs/riscv32-softmmu.mak b/default-configs/riscv32-= softmmu.mak index 8c3a91a..5501c1b 100644 --- a/default-configs/riscv32-softmmu.mak +++ b/default-configs/riscv32-softmmu.mak @@ -1,8 +1,8 @@ # Default configuration for riscv-softmmu =20 -include pci.mak include usb.mak - +CONFIG_PCI=3Dy +CONFIG_PCI_DEVICES=3Dy CONFIG_SERIAL=3Dy CONFIG_VIRTIO_MMIO=3Dy =20 diff --git a/default-configs/riscv64-softmmu.mak b/default-configs/riscv64-= softmmu.mak index 8c3a91a..5501c1b 100644 --- a/default-configs/riscv64-softmmu.mak +++ b/default-configs/riscv64-softmmu.mak @@ -1,8 +1,8 @@ # Default configuration for riscv-softmmu =20 -include pci.mak include usb.mak - +CONFIG_PCI=3Dy +CONFIG_PCI_DEVICES=3Dy CONFIG_SERIAL=3Dy CONFIG_VIRTIO_MMIO=3Dy =20 diff --git a/default-configs/sh4-softmmu.mak b/default-configs/sh4-softmmu.= mak index 38c7290..4c33d34 100644 --- a/default-configs/sh4-softmmu.mak +++ b/default-configs/sh4-softmmu.mak @@ -1,7 +1,8 @@ # Default configuration for sh4-softmmu =20 -include pci.mak include usb.mak +CONFIG_PCI=3Dy +CONFIG_PCI_DEVICES=3Dy CONFIG_SERIAL=3Dy CONFIG_SERIAL_ISA=3Dy CONFIG_PTIMER=3Dy diff --git a/default-configs/sh4eb-softmmu.mak b/default-configs/sh4eb-soft= mmu.mak index c966cca..71f81da 100644 --- a/default-configs/sh4eb-softmmu.mak +++ b/default-configs/sh4eb-softmmu.mak @@ -1,7 +1,8 @@ # Default configuration for sh4eb-softmmu =20 -include pci.mak include usb.mak +CONFIG_PCI=3Dy +CONFIG_PCI_DEVICES=3Dy CONFIG_SERIAL=3Dy CONFIG_SERIAL_ISA=3Dy CONFIG_PTIMER=3Dy diff --git a/default-configs/sparc64-softmmu.mak b/default-configs/sparc64-= softmmu.mak index b17513b..cb70798 100644 --- a/default-configs/sparc64-softmmu.mak +++ b/default-configs/sparc64-softmmu.mak @@ -1,7 +1,8 @@ # Default configuration for sparc64-softmmu =20 -include pci.mak include usb.mak +CONFIG_PCI=3Dy +CONFIG_PCI_DEVICES=3Dy CONFIG_M48T59=3Dy CONFIG_PTIMER=3Dy CONFIG_SERIAL=3Dy diff --git a/docs/devel/build-system.txt b/docs/devel/build-system.txt index f9fd27f..addd274 100644 --- a/docs/devel/build-system.txt +++ b/docs/devel/build-system.txt @@ -417,7 +417,6 @@ into each QEMU system and userspace emulator targets. T= hey merely contain a long list of config variable definitions. For example, default-configs/x86_64-softmmu.mak has: =20 - include pci.mak include sound.mak include usb.mak CONFIG_QXL=3D$(CONFIG_SPICE) diff --git a/hw/audio/Kconfig b/hw/audio/Kconfig index 207baee..aa5c82b 100644 --- a/hw/audio/Kconfig +++ b/hw/audio/Kconfig @@ -3,9 +3,13 @@ config SB16 =20 config ES1370 bool + default y if PCI_DEVICES + depends on PCI =20 config AC97 bool + default y if PCI_DEVICES + depends on PCI =20 config ADLIB bool @@ -18,6 +22,8 @@ config CS4231A =20 config HDA bool + default y if PCI_DEVICES + depends on PCI =20 config PCSPK bool diff --git a/hw/block/Kconfig b/hw/block/Kconfig index 65431c4..b60e2ab 100644 --- a/hw/block/Kconfig +++ b/hw/block/Kconfig @@ -21,6 +21,8 @@ config ONENAND =20 config NVME_PCI bool + default y if PCI_DEVICES + depends on PCI =20 config VIRTIO_BLK bool diff --git a/hw/char/Kconfig b/hw/char/Kconfig index 26c1324..6eba69a 100644 --- a/hw/char/Kconfig +++ b/hw/char/Kconfig @@ -15,6 +15,8 @@ config SERIAL_ISA =20 config SERIAL_PCI bool + default y if PCI_DEVICES + depends on PCI =20 config VIRTIO_SERIAL bool diff --git a/hw/display/Kconfig b/hw/display/Kconfig index 1149ea2..9199beb 100644 --- a/hw/display/Kconfig +++ b/hw/display/Kconfig @@ -9,6 +9,9 @@ config ADS7846 =20 config VGA_CIRRUS bool + default y if PCI_DEVICES + depends on PCI + select VGA =20 config G364FB bool @@ -30,6 +33,9 @@ config SSD0323 =20 config VGA_PCI bool + default y if PCI_DEVICES + depends on PCI + select VGA =20 config VGA_ISA bool @@ -39,9 +45,15 @@ config VGA_ISA_MM =20 config VMWARE_VGA bool + default y if PCI_DEVICES + depends on PCI + select VGA =20 config BOCHS_DISPLAY bool + default y if PCI_DEVICES + depends on PCI + select VGA =20 config BLIZZARD bool @@ -69,12 +81,16 @@ config VGA config QXL bool depends on SPICE && PCI + select VGA =20 config VIRTIO_GPU bool =20 config VIRTIO_VGA bool + default y if PCI_DEVICES + depends on VIRTIO_PCI + select VGA =20 config DPCD bool diff --git a/hw/ide/Kconfig b/hw/ide/Kconfig index fe27705..246e27b 100644 --- a/hw/ide/Kconfig +++ b/hw/ide/Kconfig @@ -7,6 +7,7 @@ config IDE_QDEV =20 config IDE_PCI bool + depends on PCI select IDE_CORE =20 config IDE_ISA @@ -42,6 +43,8 @@ config MICRODRIVE =20 config AHCI bool + default y if PCI_DEVICES + depends on PCI select IDE_QDEV =20 config IDE_SII3112 diff --git a/hw/ipack/Kconfig b/hw/ipack/Kconfig index 481e0d2..f8da24a 100644 --- a/hw/ipack/Kconfig +++ b/hw/ipack/Kconfig @@ -1,2 +1,4 @@ config IPACK bool + default y if PCI_DEVICES + depends on PCI diff --git a/hw/misc/Kconfig b/hw/misc/Kconfig index 74474bb..830b457 100644 --- a/hw/misc/Kconfig +++ b/hw/misc/Kconfig @@ -21,9 +21,13 @@ config ISA_TESTDEV =20 config PCI_TESTDEV bool + default y if TEST_DEVICES + depends on PCI =20 config EDU bool + default y if TEST_DEVICES + depends on PCI =20 config PCA9552 bool @@ -48,7 +52,7 @@ config MACIO =20 config IVSHMEM_DEVICE bool - default y + default y if PCI_DEVICES depends on PCI =20 config ECCMEMCTL diff --git a/hw/net/Kconfig b/hw/net/Kconfig index d358b2c..d50e301 100644 --- a/hw/net/Kconfig +++ b/hw/net/Kconfig @@ -3,27 +3,42 @@ config DP8393X =20 config NE2000_PCI bool + default y if PCI_DEVICES + depends on PCI =20 config EEPRO100_PCI bool + default y if PCI_DEVICES + depends on PCI =20 config PCNET_PCI bool + default y if PCI_DEVICES + depends on PCI + select PCNET_COMMON =20 config PCNET_COMMON bool =20 config E1000_PCI bool + default y if PCI_DEVICES + depends on PCI =20 config E1000E_PCI_EXPRESS bool + default y if PCI_DEVICES + depends on PCI_EXPRESS =20 config RTL8139_PCI bool + default y if PCI_DEVICES + depends on PCI =20 config VMXNET3_PCI bool + default y if PCI_DEVICES + depends on PCI =20 config SMC91C111 bool @@ -81,12 +96,20 @@ config ETSEC =20 config ROCKER bool + default y if PCI_DEVICES + depends on PCI =20 config CAN_BUS bool =20 config CAN_PCI bool + default y if PCI_DEVICES + depends on PCI + select CAN_BUS =20 config CAN_SJA1000 bool + default y if PCI_DEVICES + depends on PCI + select CAN_BUS diff --git a/hw/pci-bridge/Kconfig b/hw/pci-bridge/Kconfig index bb19b7a..0519eb1 100644 --- a/hw/pci-bridge/Kconfig +++ b/hw/pci-bridge/Kconfig @@ -1,17 +1,25 @@ config PCIE_PORT bool + default y if PCI_DEVICES + depends on PCI_EXPRESS =20 config PXB bool =20 config XIO3130 bool + default y if PCI_DEVICES + depends on PCI_EXPRESS =20 config IOH3420 bool + default y if PCI_DEVICES + depends on PCI_EXPRESS =20 config I82801B11 bool + default y if PCI_DEVICES + depends on PCI_EXPRESS =20 config DEC_PCI bool diff --git a/hw/pci-host/Kconfig b/hw/pci-host/Kconfig index 2edc5bb..c01812a 100644 --- a/hw/pci-host/Kconfig +++ b/hw/pci-host/Kconfig @@ -2,21 +2,27 @@ config PAM bool =20 config PREP_PCI + select PCI bool =20 config GRACKLE_PCI + select PCI bool =20 config UNIN_PCI + select PCI bool =20 config PPCE500_PCI + select PCI bool =20 config VERSATILE_PCI + select PCI bool =20 config PCI_SABRE + select PCI bool =20 config PCI_PIIX @@ -24,12 +30,16 @@ config PCI_PIIX =20 config PCI_EXPRESS_Q35 bool + select PCI_EXPRESS =20 config PCI_EXPRESS_GENERIC_BRIDGE bool + select PCI_EXPRESS =20 config PCI_EXPRESS_XILINX bool + select PCI_EXPRESS =20 config PCI_EXPRESS_DESIGNWARE bool + select PCI_EXPRESS diff --git a/hw/pci/Kconfig b/hw/pci/Kconfig index 4ca2537..3b8638b 100644 --- a/hw/pci/Kconfig +++ b/hw/pci/Kconfig @@ -4,3 +4,6 @@ config PCI config PCI_EXPRESS bool select PCI + +config PCI_DEVICES + bool diff --git a/hw/scsi/Kconfig b/hw/scsi/Kconfig index a3518a3..a7d25d3 100644 --- a/hw/scsi/Kconfig +++ b/hw/scsi/Kconfig @@ -3,21 +3,32 @@ config SCSI =20 config LSI_SCSI_PCI bool + default y if PCI_DEVICES + depends on PCI =20 config MPTSAS_SCSI_PCI bool + default y if PCI_DEVICES + depends on PCI =20 config MEGASAS_SCSI_PCI bool + default y if PCI_DEVICES + depends on PCI =20 config VMW_PVSCSI_SCSI_PCI bool + default y if PCI_DEVICES + depends on PCI =20 config ESP bool =20 config ESP_PCI bool + default y if PCI_DEVICES + depends on PCI + select ESP =20 config SPAPR_VSCSI bool diff --git a/hw/sd/Kconfig b/hw/sd/Kconfig index 4f43bbb..c6c5dfb 100644 --- a/hw/sd/Kconfig +++ b/hw/sd/Kconfig @@ -9,3 +9,6 @@ config SD =20 config SDHCI bool + default y if PCI_DEVICES + depends on PCI + select SD diff --git a/hw/usb/Kconfig b/hw/usb/Kconfig index cbf5c5d..86ee615 100644 --- a/hw/usb/Kconfig +++ b/hw/usb/Kconfig @@ -3,21 +3,31 @@ config USB =20 config USB_UHCI bool + default y if PCI_DEVICES + depends on PCI =20 config USB_OHCI bool + default y if PCI_DEVICES + depends on PCI =20 config USB_EHCI bool + default y if PCI_DEVICES + depends on PCI =20 config USB_EHCI_SYSBUS bool =20 config USB_XHCI bool + default y if PCI_DEVICES + depends on PCI =20 config USB_XHCI_NEC bool + default y if PCI_DEVICES + depends on PCI =20 config USB_MUSB bool diff --git a/hw/virtio/Kconfig b/hw/virtio/Kconfig index ebf1812..5dafbe3 100644 --- a/hw/virtio/Kconfig +++ b/hw/virtio/Kconfig @@ -6,6 +6,9 @@ config VIRTIO_RNG =20 config VIRTIO_PCI bool + default y if PCI_DEVICES + depends on PCI + select VIRTIO =20 config VIRTIO_MMIO bool diff --git a/hw/watchdog/Kconfig b/hw/watchdog/Kconfig index cd0244f..edb3d42 100644 --- a/hw/watchdog/Kconfig +++ b/hw/watchdog/Kconfig @@ -3,6 +3,8 @@ config CMSDK_APB_WATCHDOG =20 config WDT_IB6300ESB bool + default y if PCI_DEVICES + depends on PCI =20 config WDT_IB700 bool --=20 1.8.3.1 From nobody Wed Apr 24 17:06:17 2024 Delivered-To: importer@patchew.org Received-SPF: temperror (zoho.com: Error in retrieving data from DNS) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=temperror (zoho.com: Error in retrieving data from DNS) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (209.51.188.17 [209.51.188.17]) by mx.zohomail.com with SMTPS id 1549562405069276.2928459223433; Thu, 7 Feb 2019 10:00:05 -0800 (PST) Received: from localhost ([127.0.0.1]:44456 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1grnxp-0003NX-LT for importer@patchew.org; Thu, 07 Feb 2019 12:59:53 -0500 Received: from eggs.gnu.org ([209.51.188.92]:57322) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1grnvs-0001un-Ui for qemu-devel@nongnu.org; Thu, 07 Feb 2019 12:57:54 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1grnvr-0002D2-MR for qemu-devel@nongnu.org; Thu, 07 Feb 2019 12:57:52 -0500 Received: from mail-wm1-x342.google.com ([2a00:1450:4864:20::342]:33024) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1grnvr-0002Ap-D9 for qemu-devel@nongnu.org; Thu, 07 Feb 2019 12:57:51 -0500 Received: by mail-wm1-x342.google.com with SMTP id h22so4956411wmb.0 for ; Thu, 07 Feb 2019 09:57:50 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id q12sm12708982wmf.2.2019.02.07.09.57.48 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 07 Feb 2019 09:57:48 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=yntSKXC+30q5agoc6rF4xjwM5YuyOFQdcihbw8kMZp4=; b=SkMDi+yrQaLTNZrDeDKAfSGmvIeiKYBtsQ5BSCFCdoNprtOoOLuSWVKarbqrog2dJN JR6HPtzOTBiBaN1QfscU9Th44s4Fjw7uBRxoJBLAshLxUVPe5QxXeUDzXthrYLXoGPjV yCP8abxb2lbDWYPL2scTZb6Ff9Xhrt13OUorlfovgRvLZJXk5pjKxriI1cWJr63Gtmxs UyZv6laVQVkxmKxdSKzseuUbOSVQNg4exp/CTOz5iXk3BStl93FyQY25oFVTcI6662TS vIIrGeTkA9XlpkFGv8yncrPITHcEJJrn0vTrlQfLqcL4juf8cJqPYAGJvPmt+B1c2uw6 zeaw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=yntSKXC+30q5agoc6rF4xjwM5YuyOFQdcihbw8kMZp4=; b=QMrMzSCsps5ETGeMtiFz25ZFcWtW+qVyZh3PJX4T1wMdxQXIFUS6biCsGfFVWxRiEs xHhKkUzvqkYkBSHCIdDDBpiQMO42sBzTulHWcHlY4A0Map9XifhaF/kOMLkfDHVz4b7p OLsf0rsEdQJX5fYnAr8BBiR+tUq0YAUwYYNj7bDM7Gnf/Co3DkxrrgmkAEKXQgJY/MW1 +zQ+ZInE0UP2onXcIEcp9u0+sLOL5JFywg/bx9WrvRbxOIKrLpMCJMRj3Ru5Lqyk4b+a SGvBK6OKm4DNuux4ebmop9sLy0nGyJen2IWvSqHgosgQ0AcT2C2P9HeQCXUFQ4EarIF4 UUDw== X-Gm-Message-State: AHQUAubkMk/gYbMnYjktZlHkkF/OmKmLQG2cr2F5I7pMGP9Nq7QUt9dd k7nHkRiMhUKIFMww3K2COtsuzIH7 X-Google-Smtp-Source: AHgI3IaEl/tty7T8NGWL0Kus5Cv/x6qco5dEG3Ovv+64NpzOFg7zskpavkG+3h5ta/YpoWE0sJaKBw== X-Received: by 2002:a7b:c144:: with SMTP id z4mr8038381wmi.68.1549562269435; Thu, 07 Feb 2019 09:57:49 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Thu, 7 Feb 2019 18:56:55 +0100 Message-Id: <1549562254-41157-13-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1549562254-41157-1-git-send-email-pbonzini@redhat.com> References: <1549562254-41157-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::342 Subject: [Qemu-devel] [PATCH 12/51] build: convert sound.mak to Kconfig X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: thuth@redhat.com, philmd@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" There is really nothing special in these devices; they are just ISA devices. Instead of including them for each target, set CONFIG_ISA_BUS to true, and make the devices default to present whenever ISA is available. More conversion of ISA devices will follow. Done with the following script: while read i; do i=3D${i%=3Dy}; i=3D${i#CONFIG_} sed -i -e'/^config '$i'$/!b' -en \ -e'a\' -e' default y\' -e' depends on ISA_BUS' \ `grep -lw $i hw/*/Kconfig` done < default-configs/sound.mak Signed-off-by: Paolo Bonzini Reviewed-by: Thomas Huth Message-Id: <20190123065618.3520-32-yang.zhong@intel.com> Signed-off-by: Paolo Bonzini Reviewed-by: Michael S. Tsirkin --- default-configs/i386-softmmu.mak | 2 +- default-configs/mips-softmmu-common.mak | 2 +- default-configs/ppc-softmmu.mak | 2 +- default-configs/sound.mak | 4 ---- hw/audio/Kconfig | 8 ++++++++ 5 files changed, 11 insertions(+), 7 deletions(-) delete mode 100644 default-configs/sound.mak diff --git a/default-configs/i386-softmmu.mak b/default-configs/i386-softmm= u.mak index 80c4b49..db841b6 100644 --- a/default-configs/i386-softmmu.mak +++ b/default-configs/i386-softmmu.mak @@ -2,7 +2,7 @@ =20 CONFIG_PCI=3Dy CONFIG_PCI_DEVICES=3Dy -include sound.mak +CONFIG_ISA_BUS=3Dy include usb.mak include hyperv.mak CONFIG_TEST_DEVICES=3Dy diff --git a/default-configs/mips-softmmu-common.mak b/default-configs/mips= -softmmu-common.mak index 88f28e5..4a48960 100644 --- a/default-configs/mips-softmmu-common.mak +++ b/default-configs/mips-softmmu-common.mak @@ -1,7 +1,7 @@ # Common mips*-softmmu CONFIG defines =20 -include sound.mak include usb.mak +CONFIG_ISA_BUS=3Dy CONFIG_PCI=3Dy CONFIG_PCI_DEVICES=3Dy CONFIG_ESP=3Dy diff --git a/default-configs/ppc-softmmu.mak b/default-configs/ppc-softmmu.= mak index f47c069..f1d06f4 100644 --- a/default-configs/ppc-softmmu.mak +++ b/default-configs/ppc-softmmu.mak @@ -1,7 +1,7 @@ # Default configuration for ppc-softmmu =20 -include sound.mak include usb.mak +CONFIG_ISA_BUS=3Dy CONFIG_PCI=3Dy CONFIG_PCI_DEVICES=3Dy CONFIG_TEST_DEVICES=3Dy diff --git a/default-configs/sound.mak b/default-configs/sound.mak deleted file mode 100644 index 4f22c34..0000000 --- a/default-configs/sound.mak +++ /dev/null @@ -1,4 +0,0 @@ -CONFIG_SB16=3Dy -CONFIG_ADLIB=3Dy -CONFIG_GUS=3Dy -CONFIG_CS4231A=3Dy diff --git a/hw/audio/Kconfig b/hw/audio/Kconfig index aa5c82b..dedb513 100644 --- a/hw/audio/Kconfig +++ b/hw/audio/Kconfig @@ -1,5 +1,7 @@ config SB16 bool + default y + depends on ISA_BUS =20 config ES1370 bool @@ -13,12 +15,18 @@ config AC97 =20 config ADLIB bool + default y + depends on ISA_BUS =20 config GUS bool + default y + depends on ISA_BUS =20 config CS4231A bool + default y + depends on ISA_BUS =20 config HDA bool --=20 1.8.3.1 From nobody Wed Apr 24 17:06:17 2024 Delivered-To: importer@patchew.org Received-SPF: temperror (zoho.com: Error in retrieving data from DNS) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=temperror (zoho.com: Error in retrieving data from DNS) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1549562782501751.9157535263344; Thu, 7 Feb 2019 10:06:22 -0800 (PST) Received: from localhost ([127.0.0.1]:44573 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gro3x-0008VX-AV for importer@patchew.org; Thu, 07 Feb 2019 13:06:13 -0500 Received: from eggs.gnu.org ([209.51.188.92]:57412) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1grnvv-0001wd-MQ for qemu-devel@nongnu.org; Thu, 07 Feb 2019 12:57:57 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1grnvs-0002Dk-6z for qemu-devel@nongnu.org; Thu, 07 Feb 2019 12:57:55 -0500 Received: from mail-wm1-x344.google.com ([2a00:1450:4864:20::344]:37855) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1grnvr-0002CD-Sr for qemu-devel@nongnu.org; Thu, 07 Feb 2019 12:57:52 -0500 Received: by mail-wm1-x344.google.com with SMTP id g67so815045wmd.2 for ; Thu, 07 Feb 2019 09:57:51 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id q12sm12708982wmf.2.2019.02.07.09.57.49 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 07 Feb 2019 09:57:49 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=1c3bP+40j6OslygwWC/XwJsCLM3pC5HSujlJc+5mBNs=; b=nZFyS5cgkVct21trdLUO4o4HzXK+Qc+I+YsSH4dsN4e0GI96lUpwKBvffqLRmI2jQ/ lt7lCAwizk0lbjNGNhXjTjdm/Ut2zteksmgUjDf8H1J4KbBTWgD/K5TcnHsvoubU2ZlT Ydhq95HZvZTp+llTj9Xo+b57iBOUlDHPIfcl0YM/u8p3uNVt0UydhlbpkFOVjeFAOMX7 pUFkfcb3DRY7qM5mnK4b0aoLO60oHUe4+yn/lRxPfe0shmpCZlDEKqc0V7LHjp4Nc2yx aXNhjPpHHoxaPipsCpbjS5pm6bb0xK6qed8VgksfnGgzkPqoqqjvHTBJX8DU+5olxlmU sUSw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=1c3bP+40j6OslygwWC/XwJsCLM3pC5HSujlJc+5mBNs=; b=drFRNiMlqRZveAuFCzSfXDFZAJ/aKiQBZjXM6EjehxhVmQcTrQpWjuLlwAx1PCt+4S YMlpdlmkNJIWuLSkRU1xTPUtJdu3gP6pxIv6PL0th/ko7KZJOf/CWlOPzQOomHeCbkQF BDSRn/7SsOgdjEk5riwtV7NM9oPDzjSmg0Dm0LV7Kh7lbzQgwzTh8F05FyoYwuRhDVBs FgNsY8QqsrR22JyubTlBeQMHPyu5b1FCZYcItGXyUAM3ks77qAtR9auT0UBnjZ+X2eZw 8L24S0Cayx8odUmMaEYavmXXh+LVdLKXoo7TU9seLEu4Pe3kjK6eIUlHQns4LtMAUSB5 g1lg== X-Gm-Message-State: AHQUAuaVtDAP7iNUxPYVEvLniBenaotWDpqJXYGKw/QUJVfpDzQaqpib Yt3gFlzy6WJjZ4oNnXdBSGTP+EpV X-Google-Smtp-Source: AHgI3IZ1eoRcC8eBPRVyT9f8RhSuGEvw3eipDrNnCjsI2WgCLcOlmLOLJzzVq5udUAiV9ubprdGEfQ== X-Received: by 2002:a1c:1a8a:: with SMTP id a132mr8715906wma.109.1549562270451; Thu, 07 Feb 2019 09:57:50 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Thu, 7 Feb 2019 18:56:56 +0100 Message-Id: <1549562254-41157-14-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1549562254-41157-1-git-send-email-pbonzini@redhat.com> References: <1549562254-41157-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::344 Subject: [Qemu-devel] [PATCH 13/51] build: convert usb.mak to Kconfig X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Yang Zhong , thuth@redhat.com, philmd@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Instead of including the same list of devices for each target, let the host controllers select CONFIG_USB and make the devices default to present whenever USB is available. Done with the following script: while read i; do i=3D${i%=3Dy}; i=3D${i#CONFIG_} sed -i -e'/^config '$i'$/!b' -en \ -e'a\' -e' default y\' -e' depends on USB' \ `grep -lw $i hw/*/Kconfig` done < default-configs/usb.mak followed by adding "select USB" on the host controllers. Signed-off-by: Paolo Bonzini Signed-off-by: Yang Zhong Reviewed-by: Thomas Huth Message-Id: <20190123065618.3520-33-yang.zhong@intel.com> Acked-by: Richard Henderson Signed-off-by: Paolo Bonzini Reviewed-by: Michael S. Tsirkin --- default-configs/alpha-softmmu.mak | 1 - default-configs/arm-softmmu.mak | 2 -- default-configs/hppa-softmmu.mak | 1 - default-configs/i386-softmmu.mak | 1 - default-configs/mips-softmmu-common.mak | 1 - default-configs/ppc-softmmu.mak | 1 - default-configs/riscv32-softmmu.mak | 1 - default-configs/riscv64-softmmu.mak | 1 - default-configs/sh4-softmmu.mak | 1 - default-configs/sh4eb-softmmu.mak | 1 - default-configs/sparc64-softmmu.mak | 1 - default-configs/usb.mak | 11 ----------- hw/usb/Kconfig | 26 ++++++++++++++++++++++++++ hw/usb/Makefile.objs | 2 +- 14 files changed, 27 insertions(+), 24 deletions(-) delete mode 100644 default-configs/usb.mak diff --git a/default-configs/alpha-softmmu.mak b/default-configs/alpha-soft= mmu.mak index d19d920..e1017aa 100644 --- a/default-configs/alpha-softmmu.mak +++ b/default-configs/alpha-softmmu.mak @@ -1,6 +1,5 @@ # Default configuration for alpha-softmmu =20 -include usb.mak CONFIG_PCI=3Dy CONFIG_PCI_DEVICES=3Dy CONFIG_SERIAL=3Dy diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.= mak index 1ebe433..901f42a 100644 --- a/default-configs/arm-softmmu.mak +++ b/default-configs/arm-softmmu.mak @@ -1,6 +1,5 @@ # Default configuration for arm-softmmu =20 -include usb.mak CONFIG_PCI=3Dy CONFIG_PCI_DEVICES=3Dy CONFIG_VGA=3Dy @@ -38,7 +37,6 @@ CONFIG_DS1338=3Dy CONFIG_PFLASH_CFI01=3Dy CONFIG_PFLASH_CFI02=3Dy CONFIG_MICRODRIVE=3Dy -CONFIG_USB=3Dy CONFIG_USB_MUSB=3Dy CONFIG_USB_EHCI_SYSBUS=3Dy CONFIG_PLATFORM_BUS=3Dy diff --git a/default-configs/hppa-softmmu.mak b/default-configs/hppa-softmm= u.mak index 85a2011..5089a94 100644 --- a/default-configs/hppa-softmmu.mak +++ b/default-configs/hppa-softmmu.mak @@ -1,4 +1,3 @@ -include usb.mak CONFIG_PCI=3Dy CONFIG_PCI_DEVICES=3Dy CONFIG_SERIAL=3Dy diff --git a/default-configs/i386-softmmu.mak b/default-configs/i386-softmm= u.mak index db841b6..60356ed 100644 --- a/default-configs/i386-softmmu.mak +++ b/default-configs/i386-softmmu.mak @@ -3,7 +3,6 @@ CONFIG_PCI=3Dy CONFIG_PCI_DEVICES=3Dy CONFIG_ISA_BUS=3Dy -include usb.mak include hyperv.mak CONFIG_TEST_DEVICES=3Dy CONFIG_VGA_ISA=3Dy diff --git a/default-configs/mips-softmmu-common.mak b/default-configs/mips= -softmmu-common.mak index 4a48960..90a2412 100644 --- a/default-configs/mips-softmmu-common.mak +++ b/default-configs/mips-softmmu-common.mak @@ -1,6 +1,5 @@ # Common mips*-softmmu CONFIG defines =20 -include usb.mak CONFIG_ISA_BUS=3Dy CONFIG_PCI=3Dy CONFIG_PCI_DEVICES=3Dy diff --git a/default-configs/ppc-softmmu.mak b/default-configs/ppc-softmmu.= mak index f1d06f4..f5df65f 100644 --- a/default-configs/ppc-softmmu.mak +++ b/default-configs/ppc-softmmu.mak @@ -1,6 +1,5 @@ # Default configuration for ppc-softmmu =20 -include usb.mak CONFIG_ISA_BUS=3Dy CONFIG_PCI=3Dy CONFIG_PCI_DEVICES=3Dy diff --git a/default-configs/riscv32-softmmu.mak b/default-configs/riscv32-= softmmu.mak index 5501c1b..fd91efb 100644 --- a/default-configs/riscv32-softmmu.mak +++ b/default-configs/riscv32-softmmu.mak @@ -1,6 +1,5 @@ # Default configuration for riscv-softmmu =20 -include usb.mak CONFIG_PCI=3Dy CONFIG_PCI_DEVICES=3Dy CONFIG_SERIAL=3Dy diff --git a/default-configs/riscv64-softmmu.mak b/default-configs/riscv64-= softmmu.mak index 5501c1b..fd91efb 100644 --- a/default-configs/riscv64-softmmu.mak +++ b/default-configs/riscv64-softmmu.mak @@ -1,6 +1,5 @@ # Default configuration for riscv-softmmu =20 -include usb.mak CONFIG_PCI=3Dy CONFIG_PCI_DEVICES=3Dy CONFIG_SERIAL=3Dy diff --git a/default-configs/sh4-softmmu.mak b/default-configs/sh4-softmmu.= mak index 4c33d34..651fe1a 100644 --- a/default-configs/sh4-softmmu.mak +++ b/default-configs/sh4-softmmu.mak @@ -1,6 +1,5 @@ # Default configuration for sh4-softmmu =20 -include usb.mak CONFIG_PCI=3Dy CONFIG_PCI_DEVICES=3Dy CONFIG_SERIAL=3Dy diff --git a/default-configs/sh4eb-softmmu.mak b/default-configs/sh4eb-soft= mmu.mak index 71f81da..fa3e07e 100644 --- a/default-configs/sh4eb-softmmu.mak +++ b/default-configs/sh4eb-softmmu.mak @@ -1,6 +1,5 @@ # Default configuration for sh4eb-softmmu =20 -include usb.mak CONFIG_PCI=3Dy CONFIG_PCI_DEVICES=3Dy CONFIG_SERIAL=3Dy diff --git a/default-configs/sparc64-softmmu.mak b/default-configs/sparc64-= softmmu.mak index cb70798..24d7389 100644 --- a/default-configs/sparc64-softmmu.mak +++ b/default-configs/sparc64-softmmu.mak @@ -1,6 +1,5 @@ # Default configuration for sparc64-softmmu =20 -include usb.mak CONFIG_PCI=3Dy CONFIG_PCI_DEVICES=3Dy CONFIG_M48T59=3Dy diff --git a/default-configs/usb.mak b/default-configs/usb.mak deleted file mode 100644 index e42cfea..0000000 --- a/default-configs/usb.mak +++ /dev/null @@ -1,11 +0,0 @@ -CONFIG_USB=3Dy -CONFIG_USB_TABLET_WACOM=3Dy -CONFIG_USB_STORAGE_BOT=3Dy -CONFIG_USB_STORAGE_UAS=3Dy -CONFIG_USB_STORAGE_MTP=3Dy -CONFIG_SCSI=3Dy -CONFIG_USB_SMARTCARD=3Dy -CONFIG_USB_AUDIO=3Dy -CONFIG_USB_SERIAL=3Dy -CONFIG_USB_NETWORK=3Dy -CONFIG_USB_BLUETOOTH=3Dy diff --git a/hw/usb/Kconfig b/hw/usb/Kconfig index 86ee615..e20670a 100644 --- a/hw/usb/Kconfig +++ b/hw/usb/Kconfig @@ -5,59 +5,85 @@ config USB_UHCI bool default y if PCI_DEVICES depends on PCI + select USB =20 config USB_OHCI bool default y if PCI_DEVICES depends on PCI + select USB =20 config USB_EHCI bool default y if PCI_DEVICES depends on PCI + select USB =20 config USB_EHCI_SYSBUS bool + select USB =20 config USB_XHCI bool default y if PCI_DEVICES depends on PCI + select USB =20 config USB_XHCI_NEC bool default y if PCI_DEVICES depends on PCI + select USB =20 config USB_MUSB bool + select USB =20 config TUSB6010 bool + select USB_MUSB =20 config USB_TABLET_WACOM bool + default y + depends on USB =20 config USB_STORAGE_BOT bool + default y + depends on USB =20 config USB_STORAGE_UAS bool + default y + depends on USB =20 config USB_AUDIO bool + default y + depends on USB =20 config USB_SERIAL bool + default y + depends on USB =20 config USB_NETWORK bool + default y + depends on USB =20 config USB_BLUETOOTH bool + default y + depends on USB =20 config USB_SMARTCARD bool + default y + depends on USB =20 config USB_STORAGE_MTP bool + default y + depends on USB diff --git a/hw/usb/Makefile.objs b/hw/usb/Makefile.objs index 41be700..2b92964 100644 --- a/hw/usb/Makefile.objs +++ b/hw/usb/Makefile.objs @@ -6,7 +6,7 @@ common-obj-$(CONFIG_USB) +=3D desc.o desc-msos.o common-obj-$(CONFIG_USB_UHCI) +=3D hcd-uhci.o common-obj-$(CONFIG_USB_OHCI) +=3D hcd-ohci.o common-obj-$(CONFIG_USB_EHCI) +=3D hcd-ehci.o hcd-ehci-pci.o -common-obj-$(CONFIG_USB_EHCI_SYSBUS) +=3D hcd-ehci-sysbus.o +common-obj-$(CONFIG_USB_EHCI_SYSBUS) +=3D hcd-ehci.o hcd-ehci-sysbus.o common-obj-$(CONFIG_USB_XHCI) +=3D hcd-xhci.o common-obj-$(CONFIG_USB_XHCI_NEC) +=3D hcd-xhci-nec.o common-obj-$(CONFIG_USB_MUSB) +=3D hcd-musb.o --=20 1.8.3.1 From nobody Wed Apr 24 17:06:17 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (209.51.188.17 [209.51.188.17]) by mx.zohomail.com with SMTPS id 1549562964983267.86500097442615; Thu, 7 Feb 2019 10:09:24 -0800 (PST) Received: from localhost ([127.0.0.1]:44595 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gro6w-0002JH-Ul for importer@patchew.org; Thu, 07 Feb 2019 13:09:18 -0500 Received: from eggs.gnu.org ([209.51.188.92]:57360) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1grnvu-0001vz-Dj for qemu-devel@nongnu.org; Thu, 07 Feb 2019 12:57:55 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1grnvt-0002Fa-0T for qemu-devel@nongnu.org; Thu, 07 Feb 2019 12:57:54 -0500 Received: from mail-wm1-x333.google.com ([2a00:1450:4864:20::333]:52622) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1grnvs-0002Dg-PT for qemu-devel@nongnu.org; Thu, 07 Feb 2019 12:57:52 -0500 Received: by mail-wm1-x333.google.com with SMTP id m1so821600wml.2 for ; Thu, 07 Feb 2019 09:57:52 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id q12sm12708982wmf.2.2019.02.07.09.57.50 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 07 Feb 2019 09:57:50 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=UELZZFGuOSKHSOTDqFd4P08XlGWHaWt9WwMO4hy4Irs=; b=iTPvF55GdRPAB9GuJDyzAbC41LcvY+3/z0uXekrDzo0x5JgdtQC25FJ8oAlKmmUOXc oVirLevl4uxYxpiBLF2mD18MOhE2WK+vPblv8ybn/LoEElZb6Qi1Z9XQXHMV3vLl+nBc rgJ2n0740p3UE4tnPY77GbQ6+MZDakwuxZ1eFsRL+U0SEO3ur8IaX9li2sn6+cXikQgl Gaif6rWxBFudfuemmwdkRd3Z4sR/W8tNIWqbKewIeXyl6TrrY4BqgxWHlCqDsBcye63B DQwKqQOe2QPJKo4RO4VF6Ifc3yZdrpn1F7bB1U5zAbtFgsaODSTIqbipMCKzMeW6+6kX xTCw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=UELZZFGuOSKHSOTDqFd4P08XlGWHaWt9WwMO4hy4Irs=; b=HpeMlilQXIs7j1cvYdAWdLeeJ3NkeesSBFxtA413sZXNWZRhSHkoCA9gYUMt5U59oV uSA3uOR0CrDLNf2LEbTnWtXGoX2HcLqOINqX7bj18inanE5zP1WKbPQXbsN99XeCnQ5F 78LrBRX5bM+Z27s6ZKr8Xcro5lSq5+IP1xrD5DPd4In8a+CMXBBcHtSunSdI278sJulK Tg+BA5yDNp1jcP37JV3ar0D23h0ELxwM2We6sHQPv9aWhyqCj/9pf/nf0E0V4FJC9MFo YaKUV6cTYpM8bYgE3tGhTrQMTp0gGxDE0Po/tgFWT+0tAPafelaH9EjgTsokpRsCflsS 8o7Q== X-Gm-Message-State: AHQUAubs6urTlUrc/ts8JPuJCghfjiult5oALK0U38ZAly12lZq5AXRV jp/vnlrkgd+SLncZYhNb0351zMxF X-Google-Smtp-Source: AHgI3Ibqq57zqyW5a75BGE8lSFnhwyv3LMEXXOGWe9BiPSS9zC5zt85Lptwe5HkcV4cOnw84ubbPuA== X-Received: by 2002:a1c:3581:: with SMTP id c123mr8348987wma.60.1549562271425; Thu, 07 Feb 2019 09:57:51 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Thu, 7 Feb 2019 18:56:57 +0100 Message-Id: <1549562254-41157-15-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1549562254-41157-1-git-send-email-pbonzini@redhat.com> References: <1549562254-41157-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::333 Subject: [Qemu-devel] [PATCH 14/51] block: fix recursion in hw/block/dataplane X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: thuth@redhat.com, philmd@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" There are Xen files in hw/block/dataplane that should be compiled even if virtio-blk is disabled. Signed-off-by: Paolo Bonzini Reviewed-by: Michael S. Tsirkin --- hw/block/Makefile.objs | 3 ++- hw/block/dataplane/Makefile.objs | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/hw/block/Makefile.objs b/hw/block/Makefile.objs index e206b8e..f5f643f 100644 --- a/hw/block/Makefile.objs +++ b/hw/block/Makefile.objs @@ -12,5 +12,6 @@ common-obj-$(CONFIG_NVME_PCI) +=3D nvme.o obj-$(CONFIG_SH4) +=3D tc58128.o =20 obj-$(CONFIG_VIRTIO_BLK) +=3D virtio-blk.o -obj-$(CONFIG_VIRTIO_BLK) +=3D dataplane/ obj-$(CONFIG_VHOST_USER_BLK) +=3D vhost-user-blk.o + +obj-y +=3D dataplane/ diff --git a/hw/block/dataplane/Makefile.objs b/hw/block/dataplane/Makefile= .objs index c6c68db..0c52702 100644 --- a/hw/block/dataplane/Makefile.objs +++ b/hw/block/dataplane/Makefile.objs @@ -1,2 +1,2 @@ -obj-y +=3D virtio-blk.o +obj-$(CONFIG_VIRTIO_BLK) +=3D virtio-blk.o obj-$(CONFIG_XEN) +=3D xen-block.o --=20 1.8.3.1 From nobody Wed Apr 24 17:06:17 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1549562661767645.2784814436604; Thu, 7 Feb 2019 10:04:21 -0800 (PST) Received: from localhost ([127.0.0.1]:44520 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gro28-0006sw-LO for importer@patchew.org; Thu, 07 Feb 2019 13:04:20 -0500 Received: from eggs.gnu.org ([209.51.188.92]:57418) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1grnvw-0001wx-0L for qemu-devel@nongnu.org; Thu, 07 Feb 2019 12:57:57 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1grnvt-0002HI-U2 for qemu-devel@nongnu.org; Thu, 07 Feb 2019 12:57:55 -0500 Received: from mail-wm1-x342.google.com ([2a00:1450:4864:20::342]:36765) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1grnvt-0002Fj-Ln for qemu-devel@nongnu.org; Thu, 07 Feb 2019 12:57:53 -0500 Received: by mail-wm1-x342.google.com with SMTP id p6so828571wmc.1 for ; Thu, 07 Feb 2019 09:57:53 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id q12sm12708982wmf.2.2019.02.07.09.57.51 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 07 Feb 2019 09:57:51 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=bgVghyGwuem/CESAEZhzXUipZkkWpaSUEcbSTh1s2lA=; b=cNIyzPjxe4keZ7Re8XwN+X33q7NthgtZcdTUGZjrC0V1E6/FuiQtNwYjMW04r2Qq5k vb08QpnDuKWAcvc3tSe59niNFMnDrAcno3gE41m8kbB6DMMlwWC8TEBgw9MmHkPyuZwy XiTJYxih+NqhYqWO7ncJ6q/GiYoU/qXtEihxcDUQh7O8iIaMBGn/TPcaWZaEFdW/vaiU yPtdHgLTWuu6aTu1bH34GxWZsAUrm91amrXRjS33GusjLNq2g0/ZhBoB3o1rw7GUIffs XfhTIQLNgPI61rPzJmR4OKPG/oXjHBomSyOX8aWPtso3naMmFIi4kaZ1a55V44rAykeg kemA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=bgVghyGwuem/CESAEZhzXUipZkkWpaSUEcbSTh1s2lA=; b=k1izlWKYQAaTL2LnMbhGdVTQkN1s7zrOU6ZNilNqOqDt5zzGXb5cL1DDUHisOTZDLD 4K2PwFwt+3AzFOYMRKiB57Nn9Sz6lCMQfHUvcZhVDIi61zJDv0BubswPmx3+CDdN4IBB wey9e2CDg1w8ZhGNWAR332/U4Be+i2Y6iBGaQ72/LiyPNweCwhwMzD0u0Ww7BBpb2VH2 QfcnLmNeRODjSEEWTkfvlgy+cSAHWlTxqtsnbBh8FB9SzRfi9DEozary0ENiSus3PHsa iIFubhgpUNjFOo4Wy1TgJ5+WklHoAFZoH1jja3aaFAlgyX2La9qHj3ySjrFo6sPQKrGD urgA== X-Gm-Message-State: AHQUAua+vjhYxJXFX8kRVOy4xExA8AnTWkuFHa8PZay/ZTc6QpXprTB5 VIG3VSouCS9LA8f9scQTP/gfasgg X-Google-Smtp-Source: AHgI3IZwe4NtJvDSrldHdHmu2yrvTzi5poPPRsP73JWo2YdM3BFEnEJty0TCQHxBGSRvF18jdnuaVg== X-Received: by 2002:a7b:c75a:: with SMTP id w26mr4585951wmk.35.1549562272363; Thu, 07 Feb 2019 09:57:52 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Thu, 7 Feb 2019 18:56:58 +0100 Message-Id: <1549562254-41157-16-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1549562254-41157-1-git-send-email-pbonzini@redhat.com> References: <1549562254-41157-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::342 Subject: [Qemu-devel] [PATCH 15/51] scsi: express dependencies with Kconfig X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Yang Zhong , thuth@redhat.com, philmd@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" This automatically removes the SCSI subsystem from the binary altogether if no controllers are selected. Signed-off-by: Paolo Bonzini Signed-off-by: Yang Zhong Message-Id: <20190123065618.3520-34-yang.zhong@intel.com> Signed-off-by: Paolo Bonzini Reviewed-by: Michael S. Tsirkin --- default-configs/arm-softmmu.mak | 1 - default-configs/hppa-softmmu.mak | 1 - default-configs/mips-softmmu-common.mak | 1 - default-configs/sparc-softmmu.mak | 1 - default-configs/virtio.mak | 1 - hw/scsi/Kconfig | 10 +++++++++- hw/scsi/Makefile.objs | 2 +- hw/usb/Kconfig | 2 ++ 8 files changed, 12 insertions(+), 7 deletions(-) diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.= mak index 901f42a..44acb5a 100644 --- a/default-configs/arm-softmmu.mak +++ b/default-configs/arm-softmmu.mak @@ -163,5 +163,4 @@ CONFIG_HIGHBANK=3Dy CONFIG_MUSICPAL=3Dy =20 # for realview and versatilepb -CONFIG_SCSI=3Dy CONFIG_LSI_SCSI_PCI=3Dy diff --git a/default-configs/hppa-softmmu.mak b/default-configs/hppa-softmm= u.mak index 5089a94..b7f2b43 100644 --- a/default-configs/hppa-softmmu.mak +++ b/default-configs/hppa-softmmu.mak @@ -7,7 +7,6 @@ CONFIG_I8259=3Dy CONFIG_E1000_PCI=3Dy CONFIG_IDE_CMD646=3Dy # CONFIG_IDE_MMIO=3Dy -CONFIG_SCSI=3Dy CONFIG_LSI_SCSI_PCI=3Dy CONFIG_VIRTIO_VGA=3Dy CONFIG_MC146818RTC=3Dy diff --git a/default-configs/mips-softmmu-common.mak b/default-configs/mips= -softmmu-common.mak index 90a2412..a7a8d4e 100644 --- a/default-configs/mips-softmmu-common.mak +++ b/default-configs/mips-softmmu-common.mak @@ -4,7 +4,6 @@ CONFIG_ISA_BUS=3Dy CONFIG_PCI=3Dy CONFIG_PCI_DEVICES=3Dy CONFIG_ESP=3Dy -CONFIG_SCSI=3Dy CONFIG_VGA_ISA=3Dy CONFIG_VGA_ISA_MM=3Dy CONFIG_VGA_CIRRUS=3Dy diff --git a/default-configs/sparc-softmmu.mak b/default-configs/sparc-soft= mmu.mak index 59a4a3d..805c400 100644 --- a/default-configs/sparc-softmmu.mak +++ b/default-configs/sparc-softmmu.mak @@ -2,7 +2,6 @@ =20 CONFIG_ISA_BUS=3Dy CONFIG_ECC=3Dy -CONFIG_SCSI=3Dy CONFIG_ESP=3Dy CONFIG_ESCC=3Dy CONFIG_M48T59=3Dy diff --git a/default-configs/virtio.mak b/default-configs/virtio.mak index 51599ed..82d0726 100644 --- a/default-configs/virtio.mak +++ b/default-configs/virtio.mak @@ -7,6 +7,5 @@ CONFIG_VIRTIO_GPU=3Dy CONFIG_VIRTIO_INPUT=3Dy CONFIG_VIRTIO_NET=3Dy CONFIG_VIRTIO_RNG=3Dy -CONFIG_SCSI=3Dy CONFIG_VIRTIO_SCSI=3Dy CONFIG_VIRTIO_SERIAL=3Dy diff --git a/hw/scsi/Kconfig b/hw/scsi/Kconfig index a7d25d3..b9cf269 100644 --- a/hw/scsi/Kconfig +++ b/hw/scsi/Kconfig @@ -5,24 +5,29 @@ config LSI_SCSI_PCI bool default y if PCI_DEVICES depends on PCI + select SCSI =20 config MPTSAS_SCSI_PCI bool default y if PCI_DEVICES depends on PCI + select SCSI =20 config MEGASAS_SCSI_PCI bool default y if PCI_DEVICES depends on PCI + select SCSI =20 config VMW_PVSCSI_SCSI_PCI bool default y if PCI_DEVICES depends on PCI + select SCSI =20 config ESP bool + select SCSI =20 config ESP_PCI bool @@ -34,11 +39,14 @@ config SPAPR_VSCSI bool default y depends on PSERIES + select SCSI =20 config VIRTIO_SCSI bool + select SCSI =20 config VHOST_USER_SCSI bool - default y + # Only PCI devices are provided for now + default y if VIRTIO_PCI depends on VHOST_USER && LINUX diff --git a/hw/scsi/Makefile.objs b/hw/scsi/Makefile.objs index 45167ba..54b36ed 100644 --- a/hw/scsi/Makefile.objs +++ b/hw/scsi/Makefile.objs @@ -6,7 +6,7 @@ common-obj-$(CONFIG_MEGASAS_SCSI_PCI) +=3D megasas.o common-obj-$(CONFIG_VMW_PVSCSI_SCSI_PCI) +=3D vmw_pvscsi.o common-obj-$(CONFIG_ESP) +=3D esp.o common-obj-$(CONFIG_ESP_PCI) +=3D esp-pci.o -obj-$(CONFIG_PSERIES) +=3D spapr_vscsi.o +obj-$(CONFIG_SPAPR_VSCSI) +=3D spapr_vscsi.o =20 ifeq ($(CONFIG_VIRTIO_SCSI),y) obj-y +=3D virtio-scsi.o virtio-scsi-dataplane.o diff --git a/hw/usb/Kconfig b/hw/usb/Kconfig index e20670a..a1b7acb 100644 --- a/hw/usb/Kconfig +++ b/hw/usb/Kconfig @@ -52,11 +52,13 @@ config USB_STORAGE_BOT bool default y depends on USB + select SCSI =20 config USB_STORAGE_UAS bool default y depends on USB + select SCSI =20 config USB_AUDIO bool --=20 1.8.3.1 From nobody Wed Apr 24 17:06:17 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (209.51.188.17 [209.51.188.17]) by mx.zohomail.com with SMTPS id 1549563506630621.4942966840606; Thu, 7 Feb 2019 10:18:26 -0800 (PST) Received: from localhost ([127.0.0.1]:44731 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1groFg-0001L2-HV for importer@patchew.org; Thu, 07 Feb 2019 13:18:20 -0500 Received: from eggs.gnu.org ([209.51.188.92]:57446) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1grnvw-0001xj-Tb for qemu-devel@nongnu.org; Thu, 07 Feb 2019 12:57:58 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1grnvv-0002Hl-2h for qemu-devel@nongnu.org; Thu, 07 Feb 2019 12:57:56 -0500 Received: from mail-wr1-x442.google.com ([2a00:1450:4864:20::442]:38648) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1grnvu-0002HS-P8 for qemu-devel@nongnu.org; Thu, 07 Feb 2019 12:57:55 -0500 Received: by mail-wr1-x442.google.com with SMTP id v13so829100wrw.5 for ; Thu, 07 Feb 2019 09:57:54 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id q12sm12708982wmf.2.2019.02.07.09.57.52 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 07 Feb 2019 09:57:52 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=LrFNCqwnbEuLS4d3ll24MyMzEIBdwUAuozh8j57i2Rs=; b=Pirl9yf3nXzjnXrcnPxLjujHcTXxvMICKflAuXaNsOUzAaptDSEw76R+rrRMPLaWbT wL+ayvkA2o7CMP+D1kiehMGItYvHCCBMURtpz1PAZe6HbfSTz9Xk/LGBssRNY4bRCIWE jDMnD7RTXuJAeQ6Lkb7a6raBp8YTuRn082A8T4wjPY994wW9HJAtOwwwUYDdG8ip+Iew ORaLxR4mjcycassuSNSblef2yNFp5/XbM7FerRXuo8LZCcyyd7cvuBr3+E1xLSoB9t8Q yz4RLNO3Yo4iMmzXaDVDHQE6DHsFCN1FmEo0lMUDwl1qf8nd5DBiKYNdbcFEw7oH1IKB NUQA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=LrFNCqwnbEuLS4d3ll24MyMzEIBdwUAuozh8j57i2Rs=; b=mu8Kljb5NPsUHE/QVBuCV0bZ2ssk/OlITqYMOSwfBzm+wg71e14/uxaByQ+AlqsE8e 3pGqO2YmezjBJqQBaTYlEMykm5dQkCPl/Unfd+pl53S8W+EVydFd8avtM/yIG44Ii4PU tXCYfaaVUuy+RUMWBTdfTVKAkgHaRGUa6Aw8S/QDlBu4oQzrrJI/dDUAJPxvluDESyBG QySn91xDaGU+nUguONmu2pJIKBs3aajLa1HbHjW47CpwkpKQ/O+MR2BiAJa00WcTYNlh Z0QpY3sPQH7Ma3ZSoLdtGnogu4p1fNEfVnIT43GmppJiHm753n/mxXp4vyIkLlNFQ6HE u6Kg== X-Gm-Message-State: AHQUAubzaF6VXALxReYF0cYYsdh7c1DEMKBq59clWbYNEPPbkPo98mjX NReBzVjYCEepKtKGocdYjQRMo20t X-Google-Smtp-Source: AHgI3Ibh9t6k9/CQwRcIhWUoX8f/BfOmurrmsyf77hUwbvqG7Zc4Krcjjeodhj6i4H08JFKkHpBBsQ== X-Received: by 2002:adf:a78a:: with SMTP id j10mr13473011wrc.191.1549562273299; Thu, 07 Feb 2019 09:57:53 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Thu, 7 Feb 2019 18:56:59 +0100 Message-Id: <1549562254-41157-17-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1549562254-41157-1-git-send-email-pbonzini@redhat.com> References: <1549562254-41157-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::442 Subject: [Qemu-devel] [PATCH 16/51] isa: express dependencies with kconfig X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Yang Zhong , thuth@redhat.com, philmd@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Signed-off-by: Paolo Bonzini Signed-off-by: Yang Zhong Message-Id: <20190123065618.3520-36-yang.zhong@intel.com> Reviewed-by: Thomas Huth Signed-off-by: Paolo Bonzini Reviewed-by: Michael S. Tsirkin --- default-configs/alpha-softmmu.mak | 1 - default-configs/i386-softmmu.mak | 9 --------- default-configs/mips-softmmu-common.mak | 1 - default-configs/ppc-softmmu.mak | 1 - default-configs/sh4-softmmu.mak | 1 - default-configs/sh4eb-softmmu.mak | 1 - default-configs/sparc64-softmmu.mak | 1 - hw/audio/Kconfig | 2 ++ hw/block/Kconfig | 2 ++ hw/char/Kconfig | 6 ++++++ hw/display/Kconfig | 3 +++ hw/dma/Kconfig | 1 + hw/i386/Kconfig | 1 + hw/ide/Kconfig | 1 + hw/input/Kconfig | 2 ++ hw/ipmi/Kconfig | 2 ++ hw/isa/Kconfig | 7 +++++++ hw/misc/Kconfig | 6 ++++++ hw/net/Kconfig | 4 ++++ hw/sparc64/Kconfig | 1 + hw/tpm/Kconfig | 2 +- hw/watchdog/Kconfig | 2 ++ 22 files changed, 41 insertions(+), 16 deletions(-) diff --git a/default-configs/alpha-softmmu.mak b/default-configs/alpha-soft= mmu.mak index e1017aa..f0c1928 100644 --- a/default-configs/alpha-softmmu.mak +++ b/default-configs/alpha-softmmu.mak @@ -15,7 +15,6 @@ CONFIG_VMWARE_VGA=3Dy CONFIG_IDE_CMD646=3Dy CONFIG_I8259=3Dy CONFIG_MC146818RTC=3Dy -CONFIG_ISA_TESTDEV=3Dy CONFIG_TEST_DEVICES=3Dy CONFIG_SMC37C669=3Dy CONFIG_DP264=3Dy diff --git a/default-configs/i386-softmmu.mak b/default-configs/i386-softmm= u.mak index 60356ed..54b571f 100644 --- a/default-configs/i386-softmmu.mak +++ b/default-configs/i386-softmmu.mak @@ -9,19 +9,12 @@ CONFIG_VGA_ISA=3Dy CONFIG_VMWARE_VGA=3Dy CONFIG_VMXNET3_PCI=3Dy CONFIG_VIRTIO_VGA=3Dy -CONFIG_VMMOUSE=3Dy CONFIG_IPMI=3Dy CONFIG_IPMI_LOCAL=3Dy CONFIG_IPMI_EXTERN=3Dy CONFIG_ISA_IPMI_KCS=3Dy CONFIG_ISA_IPMI_BT=3Dy -CONFIG_SERIAL=3Dy -CONFIG_SERIAL_ISA=3Dy -CONFIG_PARALLEL=3Dy CONFIG_I8254=3Dy -CONFIG_PCSPK=3Dy -CONFIG_PCKBD=3Dy -CONFIG_FDC=3Dy CONFIG_ACPI=3Dy CONFIG_ACPI_X86=3Dy CONFIG_ACPI_X86_ICH=3Dy @@ -31,14 +24,12 @@ CONFIG_APM=3Dy CONFIG_I8257=3Dy CONFIG_IDE_ISA=3Dy CONFIG_IDE_PIIX=3Dy -CONFIG_NE2000_ISA=3Dy CONFIG_HPET=3Dy CONFIG_APPLESMC=3Dy CONFIG_I8259=3Dy CONFIG_PFLASH_CFI01=3Dy CONFIG_MC146818RTC=3Dy CONFIG_PCI_PIIX=3Dy -CONFIG_WDT_IB700=3Dy CONFIG_ISA_DEBUG=3Dy CONFIG_ISA_TESTDEV=3Dy CONFIG_VMPORT=3Dy diff --git a/default-configs/mips-softmmu-common.mak b/default-configs/mips= -softmmu-common.mak index a7a8d4e..45c599b 100644 --- a/default-configs/mips-softmmu-common.mak +++ b/default-configs/mips-softmmu-common.mak @@ -30,7 +30,6 @@ CONFIG_MIPSNET=3Dy CONFIG_PFLASH_CFI01=3Dy CONFIG_I8259=3Dy CONFIG_MC146818RTC=3Dy -CONFIG_ISA_TESTDEV=3Dy CONFIG_EMPTY_SLOT=3Dy CONFIG_MIPS_CPS=3Dy CONFIG_MIPS_ITU=3Dy diff --git a/default-configs/ppc-softmmu.mak b/default-configs/ppc-softmmu.= mak index f5df65f..d4807b3 100644 --- a/default-configs/ppc-softmmu.mak +++ b/default-configs/ppc-softmmu.mak @@ -63,7 +63,6 @@ CONFIG_PREP=3Dy CONFIG_PREP_PCI=3Dy CONFIG_SERIAL_ISA=3Dy CONFIG_MC146818RTC=3Dy -CONFIG_ISA_TESTDEV=3Dy CONFIG_RS6000_MC=3Dy CONFIG_PARALLEL=3Dy CONFIG_I82374=3Dy diff --git a/default-configs/sh4-softmmu.mak b/default-configs/sh4-softmmu.= mak index 651fe1a..3f7fbe2 100644 --- a/default-configs/sh4-softmmu.mak +++ b/default-configs/sh4-softmmu.mak @@ -11,7 +11,6 @@ CONFIG_IDE_MMIO=3Dy CONFIG_SM501=3Dy CONFIG_I2C=3Dy CONFIG_DDC=3Dy -CONFIG_ISA_TESTDEV=3Dy CONFIG_TEST_DEVICES=3Dy CONFIG_I82378=3Dy CONFIG_I8259=3Dy diff --git a/default-configs/sh4eb-softmmu.mak b/default-configs/sh4eb-soft= mmu.mak index fa3e07e..17f07a4 100644 --- a/default-configs/sh4eb-softmmu.mak +++ b/default-configs/sh4eb-softmmu.mak @@ -11,7 +11,6 @@ CONFIG_IDE_MMIO=3Dy CONFIG_SM501=3Dy CONFIG_I2C=3Dy CONFIG_DDC=3Dy -CONFIG_ISA_TESTDEV=3Dy CONFIG_TEST_DEVICES=3Dy CONFIG_I82378=3Dy CONFIG_I8259=3Dy diff --git a/default-configs/sparc64-softmmu.mak b/default-configs/sparc64-= softmmu.mak index 24d7389..2d23b0c 100644 --- a/default-configs/sparc64-softmmu.mak +++ b/default-configs/sparc64-softmmu.mak @@ -14,7 +14,6 @@ CONFIG_PCI_SABRE=3Dy CONFIG_SIMBA=3Dy CONFIG_SUNHME=3Dy CONFIG_MC146818RTC=3Dy -CONFIG_ISA_TESTDEV=3Dy CONFIG_TEST_DEVICES=3Dy CONFIG_SUN4V_RTC=3Dy CONFIG_SUN4U=3Dy diff --git a/hw/audio/Kconfig b/hw/audio/Kconfig index dedb513..01aea55 100644 --- a/hw/audio/Kconfig +++ b/hw/audio/Kconfig @@ -35,6 +35,8 @@ config HDA =20 config PCSPK bool + default y + depends on I8254 =20 config WM8750 bool diff --git a/hw/block/Kconfig b/hw/block/Kconfig index b60e2ab..6a23659 100644 --- a/hw/block/Kconfig +++ b/hw/block/Kconfig @@ -1,5 +1,7 @@ config FDC bool + default y + depends on ISA_BUS =20 config SSI_M25P80 bool diff --git a/hw/char/Kconfig b/hw/char/Kconfig index 6eba69a..fc18481 100644 --- a/hw/char/Kconfig +++ b/hw/char/Kconfig @@ -3,6 +3,8 @@ config ESCC =20 config PARALLEL bool + default y + depends on ISA_BUS =20 config PL011 bool @@ -12,11 +14,15 @@ config SERIAL =20 config SERIAL_ISA bool + default y + depends on ISA_BUS + select SERIAL =20 config SERIAL_PCI bool default y if PCI_DEVICES depends on PCI + select SERIAL =20 config VIRTIO_SERIAL bool diff --git a/hw/display/Kconfig b/hw/display/Kconfig index 9199beb..e5f347f 100644 --- a/hw/display/Kconfig +++ b/hw/display/Kconfig @@ -39,9 +39,12 @@ config VGA_PCI =20 config VGA_ISA bool + depends on ISA_BUS + select VGA =20 config VGA_ISA_MM bool + select VGA =20 config VMWARE_VGA bool diff --git a/hw/dma/Kconfig b/hw/dma/Kconfig index b9ce1c5..751dec5 100644 --- a/hw/dma/Kconfig +++ b/hw/dma/Kconfig @@ -9,6 +9,7 @@ config PL330 =20 config I82374 bool + select I8257 =20 config I8257 bool diff --git a/hw/i386/Kconfig b/hw/i386/Kconfig index 6df3f7c..0f94ae1 100644 --- a/hw/i386/Kconfig +++ b/hw/i386/Kconfig @@ -13,6 +13,7 @@ config I440FX =20 config ISAPC bool + select ISA_BUS =20 config Q35 bool diff --git a/hw/ide/Kconfig b/hw/ide/Kconfig index 246e27b..ab47b6a 100644 --- a/hw/ide/Kconfig +++ b/hw/ide/Kconfig @@ -12,6 +12,7 @@ config IDE_PCI =20 config IDE_ISA bool + depends on ISA_BUS select IDE_QDEV =20 config IDE_PIIX diff --git a/hw/input/Kconfig b/hw/input/Kconfig index c729dcd..814f87f 100644 --- a/hw/input/Kconfig +++ b/hw/input/Kconfig @@ -6,6 +6,8 @@ config LM832X =20 config PCKBD bool + default y + depends on ISA_BUS =20 config PL050 bool diff --git a/hw/ipmi/Kconfig b/hw/ipmi/Kconfig index 68f8ba1..6a4f08f 100644 --- a/hw/ipmi/Kconfig +++ b/hw/ipmi/Kconfig @@ -9,6 +9,8 @@ config IPMI_EXTERN =20 config ISA_IPMI_KCS bool + depends on ISA_BUS =20 config ISA_IPMI_BT bool + depends on ISA_BUS diff --git a/hw/isa/Kconfig b/hw/isa/Kconfig index b59d074..af68af9 100644 --- a/hw/isa/Kconfig +++ b/hw/isa/Kconfig @@ -6,18 +6,25 @@ config APM =20 config I82378 bool + select ISA_BUS =20 config PC87312 bool + select ISA_BUS =20 config PIIX4 bool + select ISA_BUS =20 config VT82C686 bool + select ISA_BUS =20 config SMC37C669 bool + select ISA_BUS =20 config LPC_ICH9 bool + select ISA_BUS + select ACPI_X86_ICH diff --git a/hw/misc/Kconfig b/hw/misc/Kconfig index 830b457..5a7dbe1 100644 --- a/hw/misc/Kconfig +++ b/hw/misc/Kconfig @@ -1,5 +1,6 @@ config APPLESMC bool + depends on ISA_BUS =20 config MAX111X bool @@ -12,12 +13,16 @@ config TMP421 =20 config ISA_DEBUG bool + depends on ISA_BUS =20 config SGA bool + depends on ISA_BUS =20 config ISA_TESTDEV bool + default y if TEST_DEVICES + depends on ISA_BUS =20 config PCI_TESTDEV bool @@ -93,6 +98,7 @@ config IOTKIT_SYSINFO =20 config PVPANIC bool + depends on ISA_BUS =20 config AUX bool diff --git a/hw/net/Kconfig b/hw/net/Kconfig index d50e301..ff974bc 100644 --- a/hw/net/Kconfig +++ b/hw/net/Kconfig @@ -48,6 +48,10 @@ config LAN9118 =20 config NE2000_ISA bool + default y + depends on ISA_BUS + depends on PCI # for NE2000State + select NE2000_PCI =20 config OPENCORES_ETH bool diff --git a/hw/sparc64/Kconfig b/hw/sparc64/Kconfig index 8c13345..41f7295 100644 --- a/hw/sparc64/Kconfig +++ b/hw/sparc64/Kconfig @@ -1,5 +1,6 @@ config SUN4U bool + select ISA_BUS =20 config NIAGARA bool diff --git a/hw/tpm/Kconfig b/hw/tpm/Kconfig index da4bb5b..f3eb570 100644 --- a/hw/tpm/Kconfig +++ b/hw/tpm/Kconfig @@ -3,7 +3,7 @@ config TPM =20 config TPM_TIS bool - depends on TPM + depends on TPM && ISA_BUS =20 config TPM_CRB bool diff --git a/hw/watchdog/Kconfig b/hw/watchdog/Kconfig index edb3d42..35ccb72 100644 --- a/hw/watchdog/Kconfig +++ b/hw/watchdog/Kconfig @@ -8,6 +8,8 @@ config WDT_IB6300ESB =20 config WDT_IB700 bool + default y + depends on ISA_BUS =20 config WDT_DIAG288 bool --=20 1.8.3.1 From nobody Wed Apr 24 17:06:17 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (209.51.188.17 [209.51.188.17]) by mx.zohomail.com with SMTPS id 1549563714275388.8422392953647; Thu, 7 Feb 2019 10:21:54 -0800 (PST) Received: from localhost ([127.0.0.1]:44786 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1groJ0-0003qv-4n for importer@patchew.org; Thu, 07 Feb 2019 13:21:46 -0500 Received: from eggs.gnu.org ([209.51.188.92]:57459) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1grnvx-0001yO-GQ for qemu-devel@nongnu.org; Thu, 07 Feb 2019 12:57:58 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1grnvw-0002If-94 for qemu-devel@nongnu.org; Thu, 07 Feb 2019 12:57:57 -0500 Received: from mail-wr1-x441.google.com ([2a00:1450:4864:20::441]:45687) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1grnvv-0002Hx-VM for qemu-devel@nongnu.org; Thu, 07 Feb 2019 12:57:56 -0500 Received: by mail-wr1-x441.google.com with SMTP id q15so770221wro.12 for ; Thu, 07 Feb 2019 09:57:55 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id q12sm12708982wmf.2.2019.02.07.09.57.53 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 07 Feb 2019 09:57:53 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=qOo1zRA5u0wlR+90m0ImHFBSmy2GrV0uMhOc75Zh1TI=; b=LVuRt4WGFGti/w9IngcV3SoeACMSkEpwtKJfhLq8uTQhrrcg2hS0REJL8+agZOVXDg x9AdLpsNQgvETseONd5+0lrWkoZPlm0W6sYsNQI303KDXJZSDm4jr9SjXymfwgQcfmhY vJV+likfaIwXe1oDM/NI2TVWd45tNEjTGi6Lp7IBXNgiCqZ3DKuxZ5NR+0PnKRxg/8/9 1GlcGVqRZpv7g9HFyaCisEwvYPGsF9QK2eX41RHhGC1++0O5SCd30j+87hpyfqcvspUz Csc6ZJH2RBaJPe+OqZ6RgUKzcJzwzyIbvLokan5gCDZgV4DQ7KYAJ79pmXQsmdHR9IVr 8poA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=qOo1zRA5u0wlR+90m0ImHFBSmy2GrV0uMhOc75Zh1TI=; b=kxyz1COCaoctW0iWmNACjxaFRcgY6ZG+tek1zgh8TWzKGNrglwH0eMkUbuSwEj5J1y BOKxHojvnjY1yvoJlL0A1RKxepxjG8rmi6YrBYzeQqxcCHROlPtg6cCSR0Z0+cak+XSO 3TuD8JoBSdwP923N4uSNjgzbjcKlQNfHVCIM1zJYfXEsXOBh2dzxuVToItS0QIAxyTE1 4riyA3KNB+H5fWnfPcs1ITTIcbZyrPgaALloCBqyYQq++ms+2n/4j6+sd//ZvzZW1Pho qf6S6LcwdlgT1b9t/5cF27tsuA8w12srmDg4T79Zde2wuin+1zwKKe+tEJL4SITTnLNI OYWQ== X-Gm-Message-State: AHQUAuZgzts+Wj9IXJMNVI+VRibUpOWYispgsy6dGE9pGOcyE7scJeWo SL6febozjEx2wBb4IPPMDcQnHhux X-Google-Smtp-Source: AHgI3IYfkncZGvlHNp2bwDfCKLvxPkbKzahwT78JJfNZ9qElUE4eAWovQHZ2rA9K8PEAt/fbKjuV7A== X-Received: by 2002:adf:ba8d:: with SMTP id p13mr7669076wrg.53.1549562274610; Thu, 07 Feb 2019 09:57:54 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Thu, 7 Feb 2019 18:57:00 +0100 Message-Id: <1549562254-41157-18-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1549562254-41157-1-git-send-email-pbonzini@redhat.com> References: <1549562254-41157-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::441 Subject: [Qemu-devel] [PATCH 17/51] i386: express dependencies with Kconfig X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Yang Zhong , thuth@redhat.com, philmd@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" This way, the default-configs file only need to specify the boards and any optional devices. Signed-off-by: Paolo Bonzini Signed-off-by: Yang Zhong Message-Id: <20190123065618.3520-37-yang.zhong@intel.com> Signed-off-by: Paolo Bonzini Reviewed-by: Michael S. Tsirkin --- default-configs/i386-softmmu.mak | 45 ++++++++---------------------------- hw/acpi/Kconfig | 3 +++ hw/i2c/Makefile.objs | 2 +- hw/i386/Kconfig | 50 ++++++++++++++++++++++++++++++++++++= ++++ hw/i386/Makefile.objs | 5 ++-- hw/isa/Kconfig | 1 + hw/pci-host/Kconfig | 4 ++++ hw/tpm/Kconfig | 2 ++ 8 files changed, 73 insertions(+), 39 deletions(-) diff --git a/default-configs/i386-softmmu.mak b/default-configs/i386-softmm= u.mak index 54b571f..ed234c1 100644 --- a/default-configs/i386-softmmu.mak +++ b/default-configs/i386-softmmu.mak @@ -1,12 +1,6 @@ # Default configuration for i386-softmmu =20 -CONFIG_PCI=3Dy -CONFIG_PCI_DEVICES=3Dy -CONFIG_ISA_BUS=3Dy include hyperv.mak -CONFIG_TEST_DEVICES=3Dy -CONFIG_VGA_ISA=3Dy -CONFIG_VMWARE_VGA=3Dy CONFIG_VMXNET3_PCI=3Dy CONFIG_VIRTIO_VGA=3Dy CONFIG_IPMI=3Dy @@ -14,49 +8,28 @@ CONFIG_IPMI_LOCAL=3Dy CONFIG_IPMI_EXTERN=3Dy CONFIG_ISA_IPMI_KCS=3Dy CONFIG_ISA_IPMI_BT=3Dy -CONFIG_I8254=3Dy -CONFIG_ACPI=3Dy -CONFIG_ACPI_X86=3Dy -CONFIG_ACPI_X86_ICH=3Dy -CONFIG_ACPI_MEMORY_HOTPLUG=3Dy -CONFIG_ACPI_CPU_HOTPLUG=3Dy -CONFIG_APM=3Dy -CONFIG_I8257=3Dy -CONFIG_IDE_ISA=3Dy -CONFIG_IDE_PIIX=3Dy + +# Optional devices: +# CONFIG_HPET=3Dy CONFIG_APPLESMC=3Dy -CONFIG_I8259=3Dy CONFIG_PFLASH_CFI01=3Dy -CONFIG_MC146818RTC=3Dy -CONFIG_PCI_PIIX=3Dy CONFIG_ISA_DEBUG=3Dy CONFIG_ISA_TESTDEV=3Dy -CONFIG_VMPORT=3Dy +CONFIG_TEST_DEVICES=3Dy CONFIG_SGA=3Dy -CONFIG_LPC_ICH9=3Dy -CONFIG_PCI_EXPRESS=3Dy -CONFIG_PCI_EXPRESS_Q35=3Dy -CONFIG_APIC=3Dy -CONFIG_IOAPIC=3Dy CONFIG_PVPANIC=3Dy CONFIG_MEM_DEVICE=3Dy -CONFIG_DIMM=3Dy CONFIG_NVDIMM=3Dy CONFIG_ACPI_NVDIMM=3Dy -CONFIG_XIO3130=3Dy -CONFIG_IOH3420=3Dy -CONFIG_I82801B11=3Dy -CONFIG_SMBIOS=3Dy CONFIG_PXB=3Dy CONFIG_ACPI_VMGENID=3Dy -CONFIG_ACPI_SMBUS=3Dy CONFIG_SMBUS_EEPROM=3Dy -CONFIG_FW_CFG_DMA=3Dy CONFIG_I2C=3Dy -CONFIG_VTD=3Dy -CONFIG_AMD_IOMMU=3Dy -CONFIG_PAM=3Dy -CONFIG_PC=3Dy +CONFIG_PCI_DEVICES=3Dy + +# Boards: +# +CONFIG_ISAPC=3Dy CONFIG_I440FX=3Dy CONFIG_Q35=3Dy diff --git a/hw/acpi/Kconfig b/hw/acpi/Kconfig index c485a34..035a28f 100644 --- a/hw/acpi/Kconfig +++ b/hw/acpi/Kconfig @@ -3,15 +3,18 @@ config ACPI =20 config ACPI_X86 bool + select ACPI =20 config ACPI_X86_ICH bool + select ACPI_X86 =20 config ACPI_CPU_HOTPLUG bool =20 config ACPI_MEMORY_HOTPLUG bool + select MEM_DEVICE =20 config ACPI_NVDIMM bool diff --git a/hw/i2c/Makefile.objs b/hw/i2c/Makefile.objs index cecee48..aaa3997 100644 --- a/hw/i2c/Makefile.objs +++ b/hw/i2c/Makefile.objs @@ -2,7 +2,7 @@ common-obj-$(CONFIG_I2C) +=3D core.o smbus.o common-obj-$(CONFIG_SMBUS_EEPROM) +=3D smbus_eeprom.o common-obj-$(CONFIG_DDC) +=3D i2c-ddc.o common-obj-$(CONFIG_VERSATILE_I2C) +=3D versatile_i2c.o -common-obj-$(CONFIG_ACPI_X86) +=3D smbus_ich9.o +common-obj-$(CONFIG_ACPI_X86_ICH) +=3D smbus_ich9.o common-obj-$(CONFIG_ACPI_SMBUS) +=3D pm_smbus.o common-obj-$(CONFIG_BITBANG_I2C) +=3D bitbang_i2c.o common-obj-$(CONFIG_EXYNOS4) +=3D exynos4210_i2c.o diff --git a/hw/i386/Kconfig b/hw/i386/Kconfig index 0f94ae1..daf2015 100644 --- a/hw/i386/Kconfig +++ b/hw/i386/Kconfig @@ -7,16 +7,65 @@ config PC imply QXL imply SEV imply TPM_TIS + select I8259 + select I8254 + select PCSPK + select I82374 + select I8257 + select MC146818RTC + +config PC_PCI + bool + select APIC + select IOAPIC + select APM + select PC + +config PC_ACPI + bool + select ACPI_X86 + select ACPI_CPU_HOTPLUG + select ACPI_MEMORY_HOTPLUG + depends on ACPI_SMBUS =20 config I440FX bool + select PC_PCI + select PC_ACPI + select ACPI_SMBUS + select PCI_PIIX + select FDC + select IDE_PIIX + select DIMM + select SMBIOS + select VMPORT + select VMMOUSE + select FW_CFG_DMA =20 config ISAPC bool select ISA_BUS + select PC + select IDE_ISA + select VGA_ISA + # FIXME: it is in the same file as i440fx, and does not compile + # if separated + depends on I440FX =20 config Q35 bool + imply VTD + imply AMD_IOMMU + select PC_PCI + select PC_ACPI + select PCI_EXPRESS_Q35 + select LPC_ICH9 + select AHCI + select DIMM + select SMBIOS + select VMPORT + select VMMOUSE + select FW_CFG_DMA =20 config VTD bool @@ -29,3 +78,4 @@ config VMPORT =20 config VMMOUSE bool + depends on VMPORT diff --git a/hw/i386/Makefile.objs b/hw/i386/Makefile.objs index 3de7ca2..27248a0 100644 --- a/hw/i386/Makefile.objs +++ b/hw/i386/Makefile.objs @@ -4,8 +4,9 @@ obj-y +=3D pc.o obj-$(CONFIG_I440FX) +=3D pc_piix.o obj-$(CONFIG_Q35) +=3D pc_q35.o obj-y +=3D pc_sysfw.o -obj-$(CONFIG_VTD) +=3D x86-iommu.o intel_iommu.o -obj-$(CONFIG_AMD_IOMMU) +=3D x86-iommu.o amd_iommu.o +obj-y +=3D x86-iommu.o +obj-$(CONFIG_VTD) +=3D intel_iommu.o +obj-$(CONFIG_AMD_IOMMU) +=3D amd_iommu.o obj-$(CONFIG_XEN) +=3D ../xenpv/ xen/ obj-$(CONFIG_VMPORT) +=3D vmport.o obj-$(CONFIG_VMMOUSE) +=3D vmmouse.o diff --git a/hw/isa/Kconfig b/hw/isa/Kconfig index af68af9..6f0812d 100644 --- a/hw/isa/Kconfig +++ b/hw/isa/Kconfig @@ -27,4 +27,5 @@ config SMC37C669 config LPC_ICH9 bool select ISA_BUS + select ACPI_SMBUS select ACPI_X86_ICH diff --git a/hw/pci-host/Kconfig b/hw/pci-host/Kconfig index c01812a..ff4080c 100644 --- a/hw/pci-host/Kconfig +++ b/hw/pci-host/Kconfig @@ -27,10 +27,14 @@ config PCI_SABRE =20 config PCI_PIIX bool + select PCI + select PAM + select ISA_BUS =20 config PCI_EXPRESS_Q35 bool select PCI_EXPRESS + select PAM =20 config PCI_EXPRESS_GENERIC_BRIDGE bool diff --git a/hw/tpm/Kconfig b/hw/tpm/Kconfig index f3eb570..b0c2c05 100644 --- a/hw/tpm/Kconfig +++ b/hw/tpm/Kconfig @@ -7,6 +7,8 @@ config TPM_TIS =20 config TPM_CRB bool + default y + depends on TPM && PC =20 config TPM_PASSTHROUGH bool --=20 1.8.3.1 From nobody Wed Apr 24 17:06:17 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1549563895933935.4010001490922; Thu, 7 Feb 2019 10:24:55 -0800 (PST) Received: from localhost ([127.0.0.1]:44811 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1groLy-0006DM-Oa for importer@patchew.org; Thu, 07 Feb 2019 13:24:50 -0500 Received: from eggs.gnu.org ([209.51.188.92]:57488) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1grnvy-0001zt-Fh for qemu-devel@nongnu.org; Thu, 07 Feb 2019 12:57:59 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1grnvx-0002JQ-8M for qemu-devel@nongnu.org; Thu, 07 Feb 2019 12:57:58 -0500 Received: from mail-wr1-x441.google.com ([2a00:1450:4864:20::441]:39760) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1grnvx-0002Ip-1h for qemu-devel@nongnu.org; Thu, 07 Feb 2019 12:57:57 -0500 Received: by mail-wr1-x441.google.com with SMTP id t27so815234wra.6 for ; Thu, 07 Feb 2019 09:57:56 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id q12sm12708982wmf.2.2019.02.07.09.57.54 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 07 Feb 2019 09:57:54 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=J2Iy+23Tp1rPogpjpCR3sHFlfebPTH4rKx3KsJhluMw=; b=atzsvgUtBmlkj/6/JeMhsPX2D4zyycspJeQiYUiXWCaHJM6DLQY7BifKuMKwBXFdlh QdYqTtfgXplEl0fCI07Nf9Bch4KZYobDC5/LME/zK+A8w+XsDbHlyC0tGr4B00P6h65O M/ERBYXHPQBM8JbnjwkavTgO3A/RZeK91M87nz9eO9Gd2mGvucl1DFY9betW7GEDXCLJ XYn81blbeOxcNk/X7F58r0f8hCIbARCeNJa+i2kIq6GAEExVamRc/9IYcZawXnZuqvUN Hx1Gv3qoDCpnWHp+ctgrCSGVnGIYjh58vPnv9/O1tkZQCtGkcLV6p2EzMrVpzILR/Enq OHoA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=J2Iy+23Tp1rPogpjpCR3sHFlfebPTH4rKx3KsJhluMw=; b=KXEyrhpA6Ww1EiVWpOsHYbK34our8j1Tndyj0imaOpoRcd2UrTYix7GkWt8RvqO0Am U2lxnTGNuiYZIG7yZ4gntmltGIZtW7zD4z3kkBjG6WkOrwiKsYiDfSndGUw1zDmQRqB5 JgzudH0qDWERGhArxtrpikdEnonQA+2sajNLPFRpHBL8IPpDCdY9vBceJfIgyy+hX2di VTFsfh6yLNPkZ6E3ZGyiLJGtTzNbNqnjUKlI+PB2n2GjAUdk81sw7Jj99SZaZpdtt57R nOXvOPFdgpkDwWuKQmijtlhPU2mfsqYCk7d8iVqIBM8mK+BloHceYmE0SJddq0BoZii9 DByQ== X-Gm-Message-State: AHQUAuZhJMG8IaPF25C691hIM68S/TngfrYquiFNO4F88zOMtb+J7uNR bLaY+m4v9ckngeHXms3FW6yjiH9F X-Google-Smtp-Source: AHgI3IaFGXfXvl/oV23XTw/1XZW06Bl8HJnX+tspwujJO7bBqBMezfAoAiTOGzQxfVhU7s6rPAprgw== X-Received: by 2002:adf:8506:: with SMTP id 6mr14014044wrh.128.1549562275807; Thu, 07 Feb 2019 09:57:55 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Thu, 7 Feb 2019 18:57:01 +0100 Message-Id: <1549562254-41157-19-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1549562254-41157-1-git-send-email-pbonzini@redhat.com> References: <1549562254-41157-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::441 Subject: [Qemu-devel] [PATCH 18/51] i2c: express dependencies with Kconfig X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Yang Zhong , thuth@redhat.com, philmd@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Signed-off-by: Paolo Bonzini Signed-off-by: Yang Zhong Acked-by: Thomas Huth Message-Id: <20190123065618.3520-38-yang.zhong@intel.com> Signed-off-by: Paolo Bonzini Reviewed-by: Michael S. Tsirkin --- default-configs/arm-softmmu.mak | 1 - default-configs/i386-softmmu.mak | 2 -- default-configs/mips-softmmu-common.mak | 1 - default-configs/ppc-softmmu.mak | 1 - default-configs/sh4-softmmu.mak | 1 - default-configs/sh4eb-softmmu.mak | 1 - hw/Makefile.objs | 2 +- hw/audio/Kconfig | 1 + hw/display/Kconfig | 3 +++ hw/gpio/Kconfig | 1 + hw/i2c/Kconfig | 6 ++++++ hw/i386/Kconfig | 1 + hw/input/Kconfig | 1 + hw/isa/Kconfig | 1 + hw/misc/Kconfig | 4 ++++ hw/nvram/Kconfig | 1 + hw/timer/Kconfig | 3 +++ 17 files changed, 23 insertions(+), 8 deletions(-) diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.= mak index 44acb5a..e490d6a 100644 --- a/default-configs/arm-softmmu.mak +++ b/default-configs/arm-softmmu.mak @@ -69,7 +69,6 @@ CONFIG_CADENCE=3Dy CONFIG_XGMAC=3Dy CONFIG_EXYNOS4=3Dy CONFIG_PXA2XX=3Dy -CONFIG_I2C=3Dy CONFIG_BITBANG_I2C=3Dy CONFIG_FRAMEBUFFER=3Dy CONFIG_XILINX_SPIPS=3Dy diff --git a/default-configs/i386-softmmu.mak b/default-configs/i386-softmm= u.mak index ed234c1..98552e1 100644 --- a/default-configs/i386-softmmu.mak +++ b/default-configs/i386-softmmu.mak @@ -24,8 +24,6 @@ CONFIG_NVDIMM=3Dy CONFIG_ACPI_NVDIMM=3Dy CONFIG_PXB=3Dy CONFIG_ACPI_VMGENID=3Dy -CONFIG_SMBUS_EEPROM=3Dy -CONFIG_I2C=3Dy CONFIG_PCI_DEVICES=3Dy =20 # Boards: diff --git a/default-configs/mips-softmmu-common.mak b/default-configs/mips= -softmmu-common.mak index 45c599b..0795d52 100644 --- a/default-configs/mips-softmmu-common.mak +++ b/default-configs/mips-softmmu-common.mak @@ -33,7 +33,6 @@ CONFIG_MC146818RTC=3Dy CONFIG_EMPTY_SLOT=3Dy CONFIG_MIPS_CPS=3Dy CONFIG_MIPS_ITU=3Dy -CONFIG_I2C=3Dy CONFIG_R4K=3Dy CONFIG_MALTA=3Dy CONFIG_MIPSSIM=3Dy diff --git a/default-configs/ppc-softmmu.mak b/default-configs/ppc-softmmu.= mak index d4807b3..0e46d6a 100644 --- a/default-configs/ppc-softmmu.mak +++ b/default-configs/ppc-softmmu.mak @@ -32,7 +32,6 @@ CONFIG_USB_EHCI_SYSBUS=3Dy CONFIG_SM501=3Dy CONFIG_DDC=3Dy CONFIG_IDE_SII3112=3Dy -CONFIG_I2C=3Dy CONFIG_AT24C=3Dy CONFIG_BITBANG_I2C=3Dy CONFIG_M41T80=3Dy diff --git a/default-configs/sh4-softmmu.mak b/default-configs/sh4-softmmu.= mak index 3f7fbe2..8b003e1 100644 --- a/default-configs/sh4-softmmu.mak +++ b/default-configs/sh4-softmmu.mak @@ -9,7 +9,6 @@ CONFIG_PFLASH_CFI02=3Dy CONFIG_SH4=3Dy CONFIG_IDE_MMIO=3Dy CONFIG_SM501=3Dy -CONFIG_I2C=3Dy CONFIG_DDC=3Dy CONFIG_TEST_DEVICES=3Dy CONFIG_I82378=3Dy diff --git a/default-configs/sh4eb-softmmu.mak b/default-configs/sh4eb-soft= mmu.mak index 17f07a4..6f58242 100644 --- a/default-configs/sh4eb-softmmu.mak +++ b/default-configs/sh4eb-softmmu.mak @@ -9,7 +9,6 @@ CONFIG_PFLASH_CFI02=3Dy CONFIG_SH4=3Dy CONFIG_IDE_MMIO=3Dy CONFIG_SM501=3Dy -CONFIG_I2C=3Dy CONFIG_DDC=3Dy CONFIG_TEST_DEVICES=3Dy CONFIG_I82378=3Dy diff --git a/hw/Makefile.objs b/hw/Makefile.objs index e2fcd6a..225f6cc 100644 --- a/hw/Makefile.objs +++ b/hw/Makefile.objs @@ -10,7 +10,7 @@ devices-dirs-$(CONFIG_SOFTMMU) +=3D display/ devices-dirs-$(CONFIG_SOFTMMU) +=3D dma/ devices-dirs-$(CONFIG_SOFTMMU) +=3D gpio/ devices-dirs-$(CONFIG_HYPERV) +=3D hyperv/ -devices-dirs-$(CONFIG_SOFTMMU) +=3D i2c/ +devices-dirs-$(CONFIG_I2C) +=3D i2c/ devices-dirs-$(CONFIG_SOFTMMU) +=3D ide/ devices-dirs-$(CONFIG_SOFTMMU) +=3D input/ devices-dirs-$(CONFIG_SOFTMMU) +=3D intc/ diff --git a/hw/audio/Kconfig b/hw/audio/Kconfig index 01aea55..e9c6fed 100644 --- a/hw/audio/Kconfig +++ b/hw/audio/Kconfig @@ -40,6 +40,7 @@ config PCSPK =20 config WM8750 bool + depends on I2C =20 config PL041 bool diff --git a/hw/display/Kconfig b/hw/display/Kconfig index e5f347f..5393116 100644 --- a/hw/display/Kconfig +++ b/hw/display/Kconfig @@ -24,9 +24,11 @@ config PL110 =20 config SII9022 bool + depends on I2C =20 config SSD0303 bool + depends on I2C =20 config SSD0323 bool @@ -71,6 +73,7 @@ config MILKYMIST_TMU2 =20 config SM501 bool + select I2C =20 config TCX bool diff --git a/hw/gpio/Kconfig b/hw/gpio/Kconfig index d0a4abf..9227cb5 100644 --- a/hw/gpio/Kconfig +++ b/hw/gpio/Kconfig @@ -1,5 +1,6 @@ config MAX7310 bool + depends on I2C =20 config PL061 bool diff --git a/hw/i2c/Kconfig b/hw/i2c/Kconfig index d6d4402..74c9328 100644 --- a/hw/i2c/Kconfig +++ b/hw/i2c/Kconfig @@ -3,18 +3,24 @@ config I2C =20 config SMBUS_EEPROM bool + depends on I2C =20 config DDC bool + depends on I2C =20 config VERSATILE_I2C bool + select I2C =20 config ACPI_SMBUS bool + select I2C =20 config BITBANG_I2C bool + select I2C =20 config IMX_I2C bool + select I2C diff --git a/hw/i386/Kconfig b/hw/i386/Kconfig index daf2015..bd84393 100644 --- a/hw/i386/Kconfig +++ b/hw/i386/Kconfig @@ -26,6 +26,7 @@ config PC_ACPI select ACPI_X86 select ACPI_CPU_HOTPLUG select ACPI_MEMORY_HOTPLUG + select SMBUS_EEPROM depends on ACPI_SMBUS =20 config I440FX diff --git a/hw/input/Kconfig b/hw/input/Kconfig index 814f87f..e05b7be 100644 --- a/hw/input/Kconfig +++ b/hw/input/Kconfig @@ -3,6 +3,7 @@ config ADB =20 config LM832X bool + depends on I2C =20 config PCKBD bool diff --git a/hw/isa/Kconfig b/hw/isa/Kconfig index 6f0812d..fcd87b4 100644 --- a/hw/isa/Kconfig +++ b/hw/isa/Kconfig @@ -19,6 +19,7 @@ config PIIX4 config VT82C686 bool select ISA_BUS + select ACPI_SMBUS =20 config SMC37C669 bool diff --git a/hw/misc/Kconfig b/hw/misc/Kconfig index 5a7dbe1..f610928 100644 --- a/hw/misc/Kconfig +++ b/hw/misc/Kconfig @@ -7,9 +7,11 @@ config MAX111X =20 config TMP105 bool + depends on I2C =20 config TMP421 bool + depends on I2C =20 config ISA_DEBUG bool @@ -36,6 +38,7 @@ config EDU =20 config PCA9552 bool + depends on I2C =20 config PL310 bool @@ -102,5 +105,6 @@ config PVPANIC =20 config AUX bool + select I2C =20 source macio/Kconfig diff --git a/hw/nvram/Kconfig b/hw/nvram/Kconfig index 1f5ec95..ebaa749 100644 --- a/hw/nvram/Kconfig +++ b/hw/nvram/Kconfig @@ -3,6 +3,7 @@ config DS1225Y =20 config AT24C bool + depends on I2C =20 config MAC_NVRAM bool diff --git a/hw/timer/Kconfig b/hw/timer/Kconfig index 7dbc121..e1a6e74 100644 --- a/hw/timer/Kconfig +++ b/hw/timer/Kconfig @@ -9,6 +9,7 @@ config A9_GTIMER =20 config DS1338 bool + depends on I2C =20 config HPET bool @@ -18,6 +19,7 @@ config I8254 =20 config M41T80 bool + depends on I2C =20 config M48T59 bool @@ -27,6 +29,7 @@ config PL031 =20 config TWL92230 bool + depends on I2C =20 config XLNX_ZYNQMP bool --=20 1.8.3.1 From nobody Wed Apr 24 17:06:17 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (209.51.188.17 [209.51.188.17]) by mx.zohomail.com with SMTPS id 1549562972942722.7046188842886; Thu, 7 Feb 2019 10:09:32 -0800 (PST) Received: from localhost ([127.0.0.1]:44597 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gro74-0002Pn-P4 for importer@patchew.org; Thu, 07 Feb 2019 13:09:26 -0500 Received: from eggs.gnu.org ([209.51.188.92]:57503) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1grnvz-00021N-MQ for qemu-devel@nongnu.org; Thu, 07 Feb 2019 12:58:01 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1grnvy-0002K1-DG for qemu-devel@nongnu.org; Thu, 07 Feb 2019 12:57:59 -0500 Received: from mail-wr1-x442.google.com ([2a00:1450:4864:20::442]:42249) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1grnvy-0002Je-4L for qemu-devel@nongnu.org; Thu, 07 Feb 2019 12:57:58 -0500 Received: by mail-wr1-x442.google.com with SMTP id q18so797703wrx.9 for ; Thu, 07 Feb 2019 09:57:58 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id q12sm12708982wmf.2.2019.02.07.09.57.55 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 07 Feb 2019 09:57:56 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=Eji/ChUydAXrFj76qRk5/VaQq7Cg34xdiiqxQzMrhAk=; b=dZd2hWIV2w9Fve5GZ0Suyycmj0hyCVUSf2SssEypteyTD/Jz81QhqzkEjaYOu+wFGp 9CZggBXDQ9bJJbzYavyi0wUwTOWSQqzg1cl6e5TFxUxyBREI02v4y6+mmHlIA5iXQH3F tdgGuMiXldJdpzF36/3Lz5HCow6rTyZUOiwnjt91rOBKt0I6uuyXMI+LzcbBRzSEBGOt 8LrBo2xQHeYdyohtln4//GUty4J69Zaev/LTpLoBPHONNXu9RN/8Mird27Xk4k0I/TPh at3j//W0g7O7dAKnQ/IcXniXLYnIw1qvLcR5+xaSamqX3HE6q8l2pVWgDLL37xxpL0Lj TZng== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=Eji/ChUydAXrFj76qRk5/VaQq7Cg34xdiiqxQzMrhAk=; b=OcMzbor408UB5haCyIGiDfQoAe9xqf6OpIJcV8IBMVBC4KOFpcMIaYLAEl4+LzNeV0 5EmE3dRDuHzR7NQnre+H/oRYep2nBUet8SV+5XyJiuXWxS9d0dAv2IcsSitNjbPOXZzC BjbSCAt55DCssjWkyTu25pBdzeV7oFQ0qU3r1kv42mcNAAM9cLy7osZRKD/bQvULbhRU 5CzXxYPGbtw5IPESLhzPRpRkoQMcAFgqrlNOpFMIigjT2jOaq8vABB5UJGV+Xhjtc8n7 qISk3FC6EIY2y9eJMAQlo3mGzS0QvwcM2vhUhBHo+5zT5rj+pzv1tPQkE1nnQMntlyLW nKbg== X-Gm-Message-State: AHQUAuZMp3356SZkR0GgdgWnjbpZTKYEAv5TLvgNulvF2cpfGFRlG57b 21+3GwrGgXKKoOGA+IesuSabH/jl X-Google-Smtp-Source: AHgI3IZzOJ5eL40vtPn4n6WIFScEAfibZ2BK6zVOZlyEC0PxFY92cTTpmCCHbNad8zu/elHgU7vt7w== X-Received: by 2002:a5d:468f:: with SMTP id u15mr4980629wrq.188.1549562276816; Thu, 07 Feb 2019 09:57:56 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Thu, 7 Feb 2019 18:57:02 +0100 Message-Id: <1549562254-41157-20-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1549562254-41157-1-git-send-email-pbonzini@redhat.com> References: <1549562254-41157-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::442 Subject: [Qemu-devel] [PATCH 19/51] ptimer: express dependencies with Kconfig X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Yang Zhong , thuth@redhat.com, philmd@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Signed-off-by: Paolo Bonzini Signed-off-by: Yang Zhong Reviewed-by: Thomas Huth Message-Id: <20190123065618.3520-39-yang.zhong@intel.com> Signed-off-by: Paolo Bonzini Reviewed-by: Michael S. Tsirkin --- default-configs/arm-softmmu.mak | 1 - default-configs/cris-softmmu.mak | 1 - default-configs/lm32-softmmu.mak | 1 - default-configs/m68k-softmmu.mak | 1 - default-configs/microblaze-softmmu.mak | 1 - default-configs/nios2-softmmu.mak | 1 - default-configs/ppc-softmmu.mak | 1 - default-configs/sh4-softmmu.mak | 1 - default-configs/sh4eb-softmmu.mak | 1 - default-configs/sparc-softmmu.mak | 1 - default-configs/sparc64-softmmu.mak | 1 - default-configs/unicore32-softmmu.mak | 1 - hw/Kconfig | 2 ++ hw/arm/Kconfig | 4 ++++ hw/cris/Kconfig | 1 + hw/lm32/Kconfig | 2 ++ hw/m68k/Kconfig | 2 ++ hw/mips/Kconfig | 1 + hw/misc/Kconfig | 1 + hw/net/Kconfig | 2 ++ hw/sh4/Kconfig | 1 + hw/sparc/Kconfig | 2 ++ hw/timer/Kconfig | 6 ++++++ hw/unicore32/Kconfig | 1 + hw/watchdog/Kconfig | 1 + 25 files changed, 26 insertions(+), 12 deletions(-) diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.= mak index e490d6a..c1871c7 100644 --- a/default-configs/arm-softmmu.mak +++ b/default-configs/arm-softmmu.mak @@ -6,7 +6,6 @@ CONFIG_VGA=3Dy CONFIG_NAND=3Dy CONFIG_ECC=3Dy CONFIG_SERIAL=3Dy -CONFIG_PTIMER=3Dy CONFIG_SD=3Dy CONFIG_MAX7310=3Dy CONFIG_WM8750=3Dy diff --git a/default-configs/cris-softmmu.mak b/default-configs/cris-softmm= u.mak index a637c4b..b3cae59 100644 --- a/default-configs/cris-softmmu.mak +++ b/default-configs/cris-softmmu.mak @@ -2,6 +2,5 @@ =20 CONFIG_ETRAXFS=3Dy CONFIG_NAND=3Dy -CONFIG_PTIMER=3Dy CONFIG_PFLASH_CFI02=3Dy CONFIG_AXIS=3Dy diff --git a/default-configs/lm32-softmmu.mak b/default-configs/lm32-softmm= u.mak index ef0f4ba..f489838 100644 --- a/default-configs/lm32-softmmu.mak +++ b/default-configs/lm32-softmmu.mak @@ -3,7 +3,6 @@ CONFIG_LM32=3Dy CONFIG_MILKYMIST=3Dy CONFIG_FRAMEBUFFER=3Dy -CONFIG_PTIMER=3Dy CONFIG_PFLASH_CFI01=3Dy CONFIG_PFLASH_CFI02=3Dy CONFIG_SD=3Dy diff --git a/default-configs/m68k-softmmu.mak b/default-configs/m68k-softmm= u.mak index 27f5274..a12eece 100644 --- a/default-configs/m68k-softmmu.mak +++ b/default-configs/m68k-softmmu.mak @@ -1,6 +1,5 @@ # Default configuration for m68k-softmmu =20 CONFIG_COLDFIRE=3Dy -CONFIG_PTIMER=3Dy CONFIG_AN5206=3Dy CONFIG_MCF5208=3Dy diff --git a/default-configs/microblaze-softmmu.mak b/default-configs/micro= blaze-softmmu.mak index 14837cf..a4a6770 100644 --- a/default-configs/microblaze-softmmu.mak +++ b/default-configs/microblaze-softmmu.mak @@ -1,6 +1,5 @@ # Default configuration for microblaze-softmmu =20 -CONFIG_PTIMER=3Dy CONFIG_PFLASH_CFI01=3Dy CONFIG_SERIAL=3Dy CONFIG_XILINX=3Dy diff --git a/default-configs/nios2-softmmu.mak b/default-configs/nios2-soft= mmu.mak index ab42d0f..b3c507e 100644 --- a/default-configs/nios2-softmmu.mak +++ b/default-configs/nios2-softmmu.mak @@ -2,6 +2,5 @@ =20 CONFIG_NIOS2=3Dy CONFIG_SERIAL=3Dy -CONFIG_PTIMER=3Dy CONFIG_ALTERA_TIMER=3Dy CONFIG_NIOS2_10M50=3Dy diff --git a/default-configs/ppc-softmmu.mak b/default-configs/ppc-softmmu.= mak index 0e46d6a..0dcd863 100644 --- a/default-configs/ppc-softmmu.mak +++ b/default-configs/ppc-softmmu.mak @@ -14,7 +14,6 @@ CONFIG_OPENPIC=3Dy CONFIG_PPCE500_PCI=3Dy CONFIG_PFLASH_CFI01=3Dy CONFIG_PFLASH_CFI02=3Dy -CONFIG_PTIMER=3Dy CONFIG_I8259=3Dy CONFIG_XILINX=3Dy CONFIG_XILINX_ETHLITE=3Dy diff --git a/default-configs/sh4-softmmu.mak b/default-configs/sh4-softmmu.= mak index 8b003e1..7172c8b 100644 --- a/default-configs/sh4-softmmu.mak +++ b/default-configs/sh4-softmmu.mak @@ -4,7 +4,6 @@ CONFIG_PCI=3Dy CONFIG_PCI_DEVICES=3Dy CONFIG_SERIAL=3Dy CONFIG_SERIAL_ISA=3Dy -CONFIG_PTIMER=3Dy CONFIG_PFLASH_CFI02=3Dy CONFIG_SH4=3Dy CONFIG_IDE_MMIO=3Dy diff --git a/default-configs/sh4eb-softmmu.mak b/default-configs/sh4eb-soft= mmu.mak index 6f58242..3622afc 100644 --- a/default-configs/sh4eb-softmmu.mak +++ b/default-configs/sh4eb-softmmu.mak @@ -4,7 +4,6 @@ CONFIG_PCI=3Dy CONFIG_PCI_DEVICES=3Dy CONFIG_SERIAL=3Dy CONFIG_SERIAL_ISA=3Dy -CONFIG_PTIMER=3Dy CONFIG_PFLASH_CFI02=3Dy CONFIG_SH4=3Dy CONFIG_IDE_MMIO=3Dy diff --git a/default-configs/sparc-softmmu.mak b/default-configs/sparc-soft= mmu.mak index 805c400..b31a9f2 100644 --- a/default-configs/sparc-softmmu.mak +++ b/default-configs/sparc-softmmu.mak @@ -5,7 +5,6 @@ CONFIG_ECC=3Dy CONFIG_ESP=3Dy CONFIG_ESCC=3Dy CONFIG_M48T59=3Dy -CONFIG_PTIMER=3Dy CONFIG_FDC=3Dy CONFIG_EMPTY_SLOT=3Dy CONFIG_PCNET_COMMON=3Dy diff --git a/default-configs/sparc64-softmmu.mak b/default-configs/sparc64-= softmmu.mak index 2d23b0c..528af8f 100644 --- a/default-configs/sparc64-softmmu.mak +++ b/default-configs/sparc64-softmmu.mak @@ -3,7 +3,6 @@ CONFIG_PCI=3Dy CONFIG_PCI_DEVICES=3Dy CONFIG_M48T59=3Dy -CONFIG_PTIMER=3Dy CONFIG_SERIAL=3Dy CONFIG_SERIAL_ISA=3Dy CONFIG_PARALLEL=3Dy diff --git a/default-configs/unicore32-softmmu.mak b/default-configs/unicor= e32-softmmu.mak index 5f6c4a8..17a7915 100644 --- a/default-configs/unicore32-softmmu.mak +++ b/default-configs/unicore32-softmmu.mak @@ -1,5 +1,4 @@ # Default configuration for unicore32-softmmu CONFIG_ISA_BUS=3Dy CONFIG_PUV3=3Dy -CONFIG_PTIMER=3Dy CONFIG_PCKBD=3Dy diff --git a/hw/Kconfig b/hw/Kconfig index f902c8f..d5ecd02 100644 --- a/hw/Kconfig +++ b/hw/Kconfig @@ -66,6 +66,8 @@ config TEST_DEVICES =20 config XILINX bool + select PTIMER # for hw/timer/xilinx_timer.c =20 config XILINX_AXI bool + select PTIMER # for hw/dma/xilinx_axidma.c diff --git a/hw/arm/Kconfig b/hw/arm/Kconfig index 64cd698..3176680 100644 --- a/hw/arm/Kconfig +++ b/hw/arm/Kconfig @@ -3,9 +3,11 @@ config ARM_VIRT =20 config DIGIC bool + select PTIMER =20 config EXYNOS4 bool + select PTIMER =20 config HIGHBANK bool @@ -18,6 +20,7 @@ config MAINSTONE =20 config MUSICPAL bool + select PTIMER =20 config NETDUINO2 bool @@ -99,6 +102,7 @@ config NRF51_SOC =20 config MSF2 bool + select PTIMER =20 config ZAURUS bool diff --git a/hw/cris/Kconfig b/hw/cris/Kconfig index 86954ab..b7738ab 100644 --- a/hw/cris/Kconfig +++ b/hw/cris/Kconfig @@ -3,3 +3,4 @@ config AXIS =20 config ETRAXFS bool + select PTIMER diff --git a/hw/lm32/Kconfig b/hw/lm32/Kconfig index 84c530e..4f45840 100644 --- a/hw/lm32/Kconfig +++ b/hw/lm32/Kconfig @@ -1,5 +1,7 @@ config LM32 bool + select PTIMER =20 config MILKYMIST bool + select PTIMER diff --git a/hw/m68k/Kconfig b/hw/m68k/Kconfig index cd66ada..8e91eda 100644 --- a/hw/m68k/Kconfig +++ b/hw/m68k/Kconfig @@ -3,6 +3,8 @@ config AN5206 =20 config MCF5206 bool + select PTIMER =20 config MCF5208 bool + select PTIMER diff --git a/hw/mips/Kconfig b/hw/mips/Kconfig index 348c9bf..cdc07e5 100644 --- a/hw/mips/Kconfig +++ b/hw/mips/Kconfig @@ -15,6 +15,7 @@ config FULONG =20 config MIPS_CPS bool + select PTIMER =20 config MIPS_BOSTON bool diff --git a/hw/misc/Kconfig b/hw/misc/Kconfig index f610928..74031cc 100644 --- a/hw/misc/Kconfig +++ b/hw/misc/Kconfig @@ -68,6 +68,7 @@ config ECCMEMCTL =20 config IMX bool + select PTIMER =20 config STM32F2XX_SYSCFG bool diff --git a/hw/net/Kconfig b/hw/net/Kconfig index ff974bc..982e139 100644 --- a/hw/net/Kconfig +++ b/hw/net/Kconfig @@ -45,6 +45,7 @@ config SMC91C111 =20 config LAN9118 bool + select PTIMER =20 config NE2000_ISA bool @@ -97,6 +98,7 @@ config VIRTIO_NET =20 config ETSEC bool + select PTIMER =20 config ROCKER bool diff --git a/hw/sh4/Kconfig b/hw/sh4/Kconfig index 417a72f..1ea2bc3 100644 --- a/hw/sh4/Kconfig +++ b/hw/sh4/Kconfig @@ -9,3 +9,4 @@ config SH7750 =20 config SH4 bool + select PTIMER diff --git a/hw/sparc/Kconfig b/hw/sparc/Kconfig index 3795754..c9c2142 100644 --- a/hw/sparc/Kconfig +++ b/hw/sparc/Kconfig @@ -6,6 +6,8 @@ config LEON3 =20 config GRLIB bool + select PTIMER =20 config SLAVIO bool + select PTIMER diff --git a/hw/timer/Kconfig b/hw/timer/Kconfig index e1a6e74..a021c74 100644 --- a/hw/timer/Kconfig +++ b/hw/timer/Kconfig @@ -1,8 +1,10 @@ config ARM_TIMER bool + select PTIMER =20 config ARM_MPTIMER bool + select PTIMER =20 config A9_GTIMER bool @@ -36,12 +38,14 @@ config XLNX_ZYNQMP =20 config ALTERA_TIMER bool + select PTIMER =20 config MC146818RTC bool =20 config ALLWINNER_A10_PIT bool + select PTIMER =20 config STM32F2XX_TIMER bool @@ -51,6 +55,8 @@ config SUN4V_RTC =20 config CMSDK_APB_TIMER bool + select PTIMER =20 config CMSDK_APB_DUALTIMER bool + select PTIMER diff --git a/hw/unicore32/Kconfig b/hw/unicore32/Kconfig index b3cf294..a03a996 100644 --- a/hw/unicore32/Kconfig +++ b/hw/unicore32/Kconfig @@ -1,2 +1,3 @@ config PUV3 bool + select PTIMER diff --git a/hw/watchdog/Kconfig b/hw/watchdog/Kconfig index 35ccb72..2118d89 100644 --- a/hw/watchdog/Kconfig +++ b/hw/watchdog/Kconfig @@ -1,5 +1,6 @@ config CMSDK_APB_WATCHDOG bool + select PTIMER =20 config WDT_IB6300ESB bool --=20 1.8.3.1 From nobody Wed Apr 24 17:06:17 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (209.51.188.17 [209.51.188.17]) by mx.zohomail.com with SMTPS id 1549564071731218.70240585909335; Thu, 7 Feb 2019 10:27:51 -0800 (PST) Received: from localhost ([127.0.0.1]:44867 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1groOn-0000Bv-KJ for importer@patchew.org; Thu, 07 Feb 2019 13:27:45 -0500 Received: from eggs.gnu.org ([209.51.188.92]:57517) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1grnw0-00022U-PU for qemu-devel@nongnu.org; Thu, 07 Feb 2019 12:58:01 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1grnvz-0002Kn-Sa for qemu-devel@nongnu.org; Thu, 07 Feb 2019 12:58:00 -0500 Received: from mail-wr1-x444.google.com ([2a00:1450:4864:20::444]:37128) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1grnvz-0002KX-ME for qemu-devel@nongnu.org; Thu, 07 Feb 2019 12:57:59 -0500 Received: by mail-wr1-x444.google.com with SMTP id c8so835994wrs.4 for ; Thu, 07 Feb 2019 09:57:59 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id q12sm12708982wmf.2.2019.02.07.09.57.56 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 07 Feb 2019 09:57:57 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=AnLM/dOZyISJNwdON+2zioe5KCLbCrSGr5jazb2hMNQ=; b=BkRn3cYAgAAkGdU3/RmFkm8HFdWSKcBHETq76wWKCz4FxUD/D8e8Iz+vsij7RbI8sG so2G3dcBEF+dZsUF1z6LcoKAHfMqUwRNzRiZofAu23yQPySxkQSgiB5HzMigXML1CV+R UpDb/A39smCtAZq/gm3vU7zXzXPEYhqL/JGoDBPEituvcAR+Lv1NCUdURunRIuOYShwA Bkqvvnxc3H/3DaOHBea5U9K+XqveP5dTFVGsnNQc4Zu9/yjFLRpW1dYfKDOcWCfx/A+5 yV0qdMjnooLzUchA2hI9LLZx1WEabPgDvFt4JHjNaz2R+7aXGhc/2r/cSSTPg4CfXMe3 Z5EQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=AnLM/dOZyISJNwdON+2zioe5KCLbCrSGr5jazb2hMNQ=; b=ljUhAFpsByp+ImHgNUXCmUgBU+r1KhhDKhpel1C+NIG7yP2tdXm1fMmJm+usX/X8N0 vYAqJJwH0G86sOFbwFp4GGZ+/VpL48yHKCDW2Jbf69mp4hGcIXoytUW3/UwcWtI9XEdQ MvG6R3CwR4lMyGgtFE0lzELikVgWftDnwfdVmtbD8ZFaAA6g2PCdSYGy2x+tjuWszzjD CQ8aiq2i1Fif4TERaCDvSKZEifaJbMFuFHd1CGszKWj7zeTqE47CQ71w3GdHDjJhs8R6 gdvSgu6llMAd9uPG4IdFjygPyDVvisVxfjU4tMNUp+ntbkEjkVE191FCssXUUpsDnDmk WrCw== X-Gm-Message-State: AHQUAubLL5BKf6Skl7YnTqngg5z9Mkm5ZZ1UEFSStvUAt0D+BdyrAq/y NlUn6tNNn5ffdK5yw8uihCn7KtZx X-Google-Smtp-Source: AHgI3Ib6Rma4xgyR5/Kf2kucmGoNjJp6STQ/76RQugod65LdfLksLD7QNEsIeBCIKbKvhYb6TqFNWA== X-Received: by 2002:adf:e949:: with SMTP id m9mr12399705wrn.17.1549562278474; Thu, 07 Feb 2019 09:57:58 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Thu, 7 Feb 2019 18:57:03 +0100 Message-Id: <1549562254-41157-21-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1549562254-41157-1-git-send-email-pbonzini@redhat.com> References: <1549562254-41157-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::444 Subject: [Qemu-devel] [PATCH 20/51] display: express dependencies with kconfig X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Yang Zhong , thuth@redhat.com, philmd@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Yang Zhong Signed-off-by: Yang Zhong Reviewed-by: Thomas Huth Message-Id: <20190123065618.3520-40-yang.zhong@intel.com> Signed-off-by: Paolo Bonzini Reviewed-by: Michael S. Tsirkin --- default-configs/ppc-softmmu.mak | 1 - default-configs/sh4-softmmu.mak | 1 - default-configs/sh4eb-softmmu.mak | 1 - hw/display/Kconfig | 6 +++++- hw/i2c/Kconfig | 1 + 5 files changed, 6 insertions(+), 4 deletions(-) diff --git a/default-configs/ppc-softmmu.mak b/default-configs/ppc-softmmu.= mak index 0dcd863..d1ee6f7 100644 --- a/default-configs/ppc-softmmu.mak +++ b/default-configs/ppc-softmmu.mak @@ -29,7 +29,6 @@ CONFIG_PCI_EXPRESS=3Dy CONFIG_SAM460EX=3Dy CONFIG_USB_EHCI_SYSBUS=3Dy CONFIG_SM501=3Dy -CONFIG_DDC=3Dy CONFIG_IDE_SII3112=3Dy CONFIG_AT24C=3Dy CONFIG_BITBANG_I2C=3Dy diff --git a/default-configs/sh4-softmmu.mak b/default-configs/sh4-softmmu.= mak index 7172c8b..ccefc10 100644 --- a/default-configs/sh4-softmmu.mak +++ b/default-configs/sh4-softmmu.mak @@ -8,7 +8,6 @@ CONFIG_PFLASH_CFI02=3Dy CONFIG_SH4=3Dy CONFIG_IDE_MMIO=3Dy CONFIG_SM501=3Dy -CONFIG_DDC=3Dy CONFIG_TEST_DEVICES=3Dy CONFIG_I82378=3Dy CONFIG_I8259=3Dy diff --git a/default-configs/sh4eb-softmmu.mak b/default-configs/sh4eb-soft= mmu.mak index 3622afc..c8edeb7 100644 --- a/default-configs/sh4eb-softmmu.mak +++ b/default-configs/sh4eb-softmmu.mak @@ -8,7 +8,6 @@ CONFIG_PFLASH_CFI02=3Dy CONFIG_SH4=3Dy CONFIG_IDE_MMIO=3Dy CONFIG_SM501=3Dy -CONFIG_DDC=3Dy CONFIG_TEST_DEVICES=3Dy CONFIG_I82378=3Dy CONFIG_I8259=3Dy diff --git a/hw/display/Kconfig b/hw/display/Kconfig index 5393116..6d58f93 100644 --- a/hw/display/Kconfig +++ b/hw/display/Kconfig @@ -38,6 +38,7 @@ config VGA_PCI default y if PCI_DEVICES depends on PCI select VGA + select EDID =20 config VGA_ISA bool @@ -59,6 +60,7 @@ config BOCHS_DISPLAY default y if PCI_DEVICES depends on PCI select VGA + select EDID =20 config BLIZZARD bool @@ -69,11 +71,13 @@ config FRAMEBUFFER config MILKYMIST_TMU2 bool default y - depends on OPENGL && X11 + depends on OPENGL && X11 && MILKYMIST =20 config SM501 bool select I2C + select DDC + select SERIAL =20 config TCX bool diff --git a/hw/i2c/Kconfig b/hw/i2c/Kconfig index 74c9328..ef1caa6 100644 --- a/hw/i2c/Kconfig +++ b/hw/i2c/Kconfig @@ -8,6 +8,7 @@ config SMBUS_EEPROM config DDC bool depends on I2C + select EDID =20 config VERSATILE_I2C bool --=20 1.8.3.1 From nobody Wed Apr 24 17:06:17 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (209.51.188.17 [209.51.188.17]) by mx.zohomail.com with SMTPS id 1549563224564492.58190774242576; Thu, 7 Feb 2019 10:13:44 -0800 (PST) Received: from localhost ([127.0.0.1]:44657 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1groB8-0005qd-G9 for importer@patchew.org; Thu, 07 Feb 2019 13:13:38 -0500 Received: from eggs.gnu.org ([209.51.188.92]:57548) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1grnw1-00023Y-Pt for qemu-devel@nongnu.org; Thu, 07 Feb 2019 12:58:02 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1grnw1-0002Li-0E for qemu-devel@nongnu.org; Thu, 07 Feb 2019 12:58:01 -0500 Received: from mail-wm1-x343.google.com ([2a00:1450:4864:20::343]:50595) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1grnw0-0002L2-Px for qemu-devel@nongnu.org; Thu, 07 Feb 2019 12:58:00 -0500 Received: by mail-wm1-x343.google.com with SMTP id z5so830505wmf.0 for ; Thu, 07 Feb 2019 09:58:00 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id q12sm12708982wmf.2.2019.02.07.09.57.58 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 07 Feb 2019 09:57:58 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=jmx6389OJS68h9g3wBbSw3sZ4rPzvsj+m/8OuueAolo=; b=XS3gwryBeDj71V91/VyoFA6xR541yFOQyDz6ZKpIj/1+Rj9kiuByuaztJlEbawSpRc 9iKGFU2RmcTsHRAqFR2Pl4y5Rdw+AXiLMx+dWnd6T9wJSrrX1jUr0HrxVDCSTnlFQwMr LwQoHgcP5N1G1D9VxhX8hLEegxhUQLkjLP5OxYHRE7xdOZxdtVDdbvB6XgABm8kN95Qi uCBCQ8Z89CDVVt8WhcpLJ6R1vQVu5XhwnywneaSQDZgbzqAgwE5y5cO0L9mHEKyR5rKd Y5/7jZSNMrPXDzKHgndha60gJ15hZUOEUjOLzxa8Ci3kX7kyVEIFjse9VyxAAQgaKSUF Hd6g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=jmx6389OJS68h9g3wBbSw3sZ4rPzvsj+m/8OuueAolo=; b=oqxPHPdHMv+Jq8XEhFJjjWhrMmL0tgyKfI1QCvPeyWZVIdG/GMEc5CrL2AysGi26BP XOPmVjLrFDKUBmhARsml4SFcZnJp2gBdwMrCS1VVFzN680ET7qLAYq3SJHVmXWk0Kkje AFNpE0WHQqY3V+hgC6XlfMluFrH6iPilhCesTZioljvMokCCKT01x9DCHjWavZGW8VIy 6qKtY/wL1z2mc1cYrdU2ZNgILbJUgy3MIrGl7hLtteA/qwmoi73f0qaztmfDtXX6utM7 ss0TGfeDYkeyQiEvkbCKU+VemdwGz3N2j1TYV6d5vs2x9incOX5TdmK4fTNL+vDeRcNP zbfQ== X-Gm-Message-State: AHQUAubNwfoSYSt3Si1JgkFSEdT3WUAL5UTw/uuxGbOCgYtBEehnVZez QCxNrkSNeZHz1OV/6vANbxq+wHmW X-Google-Smtp-Source: AHgI3IbwfgFjGi2x5q3oezz8+DejDfnJa2VOod0oT3EGkrGu087ArL19CWu+GwmWWaTTcaX1FY9fFA== X-Received: by 2002:a1c:2e43:: with SMTP id u64mr8519594wmu.52.1549562279605; Thu, 07 Feb 2019 09:57:59 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Thu, 7 Feb 2019 18:57:04 +0100 Message-Id: <1549562254-41157-22-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1549562254-41157-1-git-send-email-pbonzini@redhat.com> References: <1549562254-41157-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::343 Subject: [Qemu-devel] [PATCH 21/51] hyperv: express dependencies with kconfig X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Yang Zhong , thuth@redhat.com, philmd@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Yang Zhong remove default-configs/hyperv.mak and make dependencies with Kconfig. Signed-off-by: Yang Zhong Reviewed-by: Thomas Huth Message-Id: <20190123065618.3520-41-yang.zhong@intel.com> Signed-off-by: Paolo Bonzini Reviewed-by: Michael S. Tsirkin --- default-configs/hyperv.mak | 2 -- default-configs/i386-softmmu.mak | 1 - hw/hyperv/Kconfig | 3 +++ hw/i386/Kconfig | 1 + 4 files changed, 4 insertions(+), 3 deletions(-) delete mode 100644 default-configs/hyperv.mak diff --git a/default-configs/hyperv.mak b/default-configs/hyperv.mak deleted file mode 100644 index 5d0d9fd..0000000 --- a/default-configs/hyperv.mak +++ /dev/null @@ -1,2 +0,0 @@ -CONFIG_HYPERV=3D$(CONFIG_KVM) -CONFIG_HYPERV_TESTDEV=3Dy diff --git a/default-configs/i386-softmmu.mak b/default-configs/i386-softmm= u.mak index 98552e1..c0826f5 100644 --- a/default-configs/i386-softmmu.mak +++ b/default-configs/i386-softmmu.mak @@ -1,6 +1,5 @@ # Default configuration for i386-softmmu =20 -include hyperv.mak CONFIG_VMXNET3_PCI=3Dy CONFIG_VIRTIO_VGA=3Dy CONFIG_IPMI=3Dy diff --git a/hw/hyperv/Kconfig b/hw/hyperv/Kconfig index be724b7..a1fa8ff 100644 --- a/hw/hyperv/Kconfig +++ b/hw/hyperv/Kconfig @@ -1,5 +1,8 @@ config HYPERV bool + depends on KVM =20 config HYPERV_TESTDEV bool + default y if TEST_DEVICES + depends on HYPERV diff --git a/hw/i386/Kconfig b/hw/i386/Kconfig index bd84393..2da10af 100644 --- a/hw/i386/Kconfig +++ b/hw/i386/Kconfig @@ -4,6 +4,7 @@ config SEV =20 config PC bool + imply HYPERV imply QXL imply SEV imply TPM_TIS --=20 1.8.3.1 From nobody Wed Apr 24 17:06:17 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (209.51.188.17 [209.51.188.17]) by mx.zohomail.com with SMTPS id 1549562971900316.44534833729153; Thu, 7 Feb 2019 10:09:31 -0800 (PST) Received: from localhost ([127.0.0.1]:44599 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gro73-0002QT-RO for importer@patchew.org; Thu, 07 Feb 2019 13:09:25 -0500 Received: from eggs.gnu.org ([209.51.188.92]:57563) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1grnw2-00024L-Fu for qemu-devel@nongnu.org; Thu, 07 Feb 2019 12:58:03 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1grnw1-0002ME-Q5 for qemu-devel@nongnu.org; Thu, 07 Feb 2019 12:58:02 -0500 Received: from mail-wr1-x441.google.com ([2a00:1450:4864:20::441]:40393) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1grnw1-0002Lm-Iw for qemu-devel@nongnu.org; Thu, 07 Feb 2019 12:58:01 -0500 Received: by mail-wr1-x441.google.com with SMTP id q1so810740wrp.7 for ; Thu, 07 Feb 2019 09:58:01 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id q12sm12708982wmf.2.2019.02.07.09.57.59 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 07 Feb 2019 09:57:59 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=MKOor6PGmCrk2YtxGwgwOw3LOuFlK1PxmEoYpaZ39nY=; b=EX+S48L+3oHq0Z1p719QNHF/V3bjsl3jEU0iFccPaF3OFBwZ6zqkpKm1t2MGtHKPZh 8YY393+HIi/AhzuZWAhg94CxnEj1bclpYM8TCvcmsiMx6+vjipHKp/d7F11+raKuoVRk jUys/M3GPOOGPfD9KqHDc70RVW5nXL1CPntEXzZ7QcPa6hPzX76wIRZQUWGExDr7HC9B W65wXtinhJybaVVqiPipg3y+YQp0GKnqoYaS/Bzzdsy5DJIPoogHCr2uRn22mQWUC/7j OgUW1YL/GoVya7qdNTyqIXqJdVIA5j3MVebvN+KAdl0AKO9ga5jXcFjgR2+X9LpQW/Xd cwlQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=MKOor6PGmCrk2YtxGwgwOw3LOuFlK1PxmEoYpaZ39nY=; b=Z43fJhtkJmTrvrjCuMKKyZSBO+oc0ZXKVWPDNcRrYX79roZrfjKLs08T/4VitMbxow OXH7XWuo3TMieXvYQyjMWH/39BvlVmE/FIY837lystdfqg/TpAnrlkx9qZvR6uXJM02o pk+zk/OgkDwGf106eNX8aO/NwrruT+apLsTO1lmMWeUqdUemS8n+6Y9iiZxP4NxHjq/w q19oMRyw8Jd+/T/1yVPhCUwuux6NR9X1LOjGU/47yJeV5pFBARZG1z8eQIh/Om4ipnI+ /3jdbIZoDYAo7p6kbxvdvMtrXgyyLRhw8Mu0xHgWSz4gsKHaN8+bjAKrtvf+KkcRMCHv KeUw== X-Gm-Message-State: AHQUAuaoCgYEZa+hUqMJzduVXR0zYa++qRTWjW8ti0tidJjfloSGsQJt tQPTYqDevZwh/ey0xmYeaJmp1QYs X-Google-Smtp-Source: AHgI3IY+0zk1MhHK+YoxueqM33Wj8JW31QQQcS4GlCWZzmsLImM1XQV4RWOf0ichlj3OLjO/HxH69Q== X-Received: by 2002:adf:dd0d:: with SMTP id a13mr10174563wrm.46.1549562280481; Thu, 07 Feb 2019 09:58:00 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Thu, 7 Feb 2019 18:57:05 +0100 Message-Id: <1549562254-41157-23-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1549562254-41157-1-git-send-email-pbonzini@redhat.com> References: <1549562254-41157-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::441 Subject: [Qemu-devel] [PATCH 22/51] vfio: express vfio dependencies with Kconfig X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: thuth@redhat.com, philmd@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Signed-off-by: Paolo Bonzini Reviewed-by: Michael S. Tsirkin --- hw/vfio/Kconfig | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/hw/vfio/Kconfig b/hw/vfio/Kconfig index 0fdff10..ebda9fd 100644 --- a/hw/vfio/Kconfig +++ b/hw/vfio/Kconfig @@ -9,21 +9,28 @@ config VFIO_PCI =20 config VFIO_CCW bool + default y select VFIO - depends on LINUX + depends on LINUX && S390_CCW_VIRTIO =20 config VFIO_PLATFORM bool + default y select VFIO - depends on LINUX + depends on LINUX && PLATFORM_BUS =20 config VFIO_XGMAC bool + default y + depends on VFIO_PLATFORM =20 config VFIO_AMD_XGBE bool + default y + depends on VFIO_PLATFORM =20 config VFIO_AP bool + default y select VFIO - depends on LINUX + depends on LINUX && S390_CCW_VIRTIO --=20 1.8.3.1 From nobody Wed Apr 24 17:06:17 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1549564243984454.9233840767099; Thu, 7 Feb 2019 10:30:43 -0800 (PST) Received: from localhost ([127.0.0.1]:44900 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1groRc-0002iz-HH for importer@patchew.org; Thu, 07 Feb 2019 13:30:40 -0500 Received: from eggs.gnu.org ([209.51.188.92]:57586) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1grnw3-000261-W2 for qemu-devel@nongnu.org; Thu, 07 Feb 2019 12:58:04 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1grnw2-0002N0-NP for qemu-devel@nongnu.org; Thu, 07 Feb 2019 12:58:03 -0500 Received: from mail-wr1-x443.google.com ([2a00:1450:4864:20::443]:40395) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1grnw2-0002MS-Gl for qemu-devel@nongnu.org; Thu, 07 Feb 2019 12:58:02 -0500 Received: by mail-wr1-x443.google.com with SMTP id q1so810782wrp.7 for ; Thu, 07 Feb 2019 09:58:02 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id q12sm12708982wmf.2.2019.02.07.09.58.00 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 07 Feb 2019 09:58:00 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=Vd3KTs3zfUbsLp3AY/GgOxrywylBBmYCO0jqCU9xzGM=; b=IrOtBBLNIsNbs+jSV4Vzw7fMGcu00vcGfuAeUsyXF49D9OiFJHqNm0je/XGobjHu/G btAhRSAYu5EQupKdtKTQdDqCklMi+yM6dQQdc/SboHjsgMYvTBCBsoIZtzlNveHMRYKz OUTRbnV5lmsgqDrmqhYKyveZrY+qwdnSVXSOYKc0mmOOU/DEDT2HvzXnw0XQyhTJLIg4 Gykq5GRs+NPb8YJZnQWpYLJZycvh48j66AirTesrMjDVzlEAak8lnvUT10MoJlyv5plg y7lmdbcc+15LUIp0p8krjorFt01e9yix9gRI+cSDIEgTENsvwqt+mGGiWNRhMpMfDamT 0y+Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=Vd3KTs3zfUbsLp3AY/GgOxrywylBBmYCO0jqCU9xzGM=; b=UCIBVNFfqdsAk12iSLT9sLpV1ShM9DG4vvlKudyPf/E2Rjk2sV/BveSIIzuZh3P8h2 KU+23CurpI28dCuyo30gU+YognfPFCowCU7WpKRBJqyhyRvGAStgpKLO09wdulFAOZ5R 8Tbn0K2IhR3U9NdTQTOU/kaxdHQtSNstnZFJ/LhGQDdVUj7gCmh5ZUrBUlpcs/TqRuMU S861o3sb0GFaRDzsJGoZKo2JlX9ttjsA3xxpeEW03Eqc9e/pfe+qLJVa38YcHW/j3Te3 2cVOjlYpUSnQB4Qvbmyq2KfoCYVXQm7fRE71aVbf70zKI5gscIydadhBpB9R217E061U EbrQ== X-Gm-Message-State: AHQUAubjLIkFe0JeVJjjKJLdN27FPYlZiBpndTB9dq9DTji38jDxfIZK Px+9JcBojBjp/+X+xeXdG7VkmB7N X-Google-Smtp-Source: AHgI3IaiWZ2vqcBBzPL36imCxbcxPAae6HBf4C6RA+9QTmhVPKWCT2jZPazYukRBWmeBKbVLQVFLDQ== X-Received: by 2002:adf:dfd1:: with SMTP id q17mr13828712wrn.27.1549562281366; Thu, 07 Feb 2019 09:58:01 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Thu, 7 Feb 2019 18:57:06 +0100 Message-Id: <1549562254-41157-24-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1549562254-41157-1-git-send-email-pbonzini@redhat.com> References: <1549562254-41157-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::443 Subject: [Qemu-devel] [PATCH 23/51] virtio: express virtio dependencies with Kconfig X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Yang Zhong , thuth@redhat.com, philmd@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Yang Zhong Signed-off-by: Yang Zhong Reviewed-by: Thomas Huth Message-Id: <20190123065618.3520-42-yang.zhong@intel.com> Signed-off-by: Paolo Bonzini Reviewed-by: Michael S. Tsirkin --- default-configs/i386-softmmu.mak | 1 - default-configs/s390x-softmmu.mak | 1 - default-configs/virtio.mak | 11 ----------- hw/9pfs/Kconfig | 2 +- hw/block/Kconfig | 7 +++++-- hw/char/Kconfig | 2 ++ hw/display/Kconfig | 2 ++ hw/input/Kconfig | 4 +++- hw/net/Kconfig | 2 ++ hw/scsi/Kconfig | 4 +++- hw/virtio/Kconfig | 7 +++++++ 11 files changed, 25 insertions(+), 18 deletions(-) delete mode 100644 default-configs/virtio.mak diff --git a/default-configs/i386-softmmu.mak b/default-configs/i386-softmm= u.mak index c0826f5..53e9d5e 100644 --- a/default-configs/i386-softmmu.mak +++ b/default-configs/i386-softmmu.mak @@ -1,7 +1,6 @@ # Default configuration for i386-softmmu =20 CONFIG_VMXNET3_PCI=3Dy -CONFIG_VIRTIO_VGA=3Dy CONFIG_IPMI=3Dy CONFIG_IPMI_LOCAL=3Dy CONFIG_IPMI_EXTERN=3Dy diff --git a/default-configs/s390x-softmmu.mak b/default-configs/s390x-soft= mmu.mak index 2794ffb..2be5059 100644 --- a/default-configs/s390x-softmmu.mak +++ b/default-configs/s390x-softmmu.mak @@ -1,6 +1,5 @@ CONFIG_PCI=3Dy CONFIG_VIRTIO_PCI=3Dy -include virtio.mak CONFIG_SCLPCONSOLE=3Dy CONFIG_TERMINAL3270=3Dy CONFIG_S390_FLIC=3Dy diff --git a/default-configs/virtio.mak b/default-configs/virtio.mak deleted file mode 100644 index 82d0726..0000000 --- a/default-configs/virtio.mak +++ /dev/null @@ -1,11 +0,0 @@ -CONFIG_VIRTIO=3Dy -CONFIG_VIRTIO_9P=3D$(CONFIG_VIRTFS) -CONFIG_VIRTIO_BALLOON=3Dy -CONFIG_VIRTIO_BLK=3Dy -CONFIG_VIRTIO_CRYPTO=3Dy -CONFIG_VIRTIO_GPU=3Dy -CONFIG_VIRTIO_INPUT=3Dy -CONFIG_VIRTIO_NET=3Dy -CONFIG_VIRTIO_RNG=3Dy -CONFIG_VIRTIO_SCSI=3Dy -CONFIG_VIRTIO_SERIAL=3Dy diff --git a/hw/9pfs/Kconfig b/hw/9pfs/Kconfig index 32071c1..e658e40 100644 --- a/hw/9pfs/Kconfig +++ b/hw/9pfs/Kconfig @@ -3,4 +3,4 @@ config VIRTFS config VIRTIO_9P bool default y - depends on VIRTFS + depends on VIRTFS && VIRTIO diff --git a/hw/block/Kconfig b/hw/block/Kconfig index 6a23659..00f9dad 100644 --- a/hw/block/Kconfig +++ b/hw/block/Kconfig @@ -28,8 +28,11 @@ config NVME_PCI =20 config VIRTIO_BLK bool + default y + depends on VIRTIO =20 config VHOST_USER_BLK bool - default y - depends on VHOST_USER && LINUX + # Only PCI devices are provided for now + default y if VIRTIO_PCI + depends on VIRTIO && VHOST_USER && LINUX diff --git a/hw/char/Kconfig b/hw/char/Kconfig index fc18481..6360c9f 100644 --- a/hw/char/Kconfig +++ b/hw/char/Kconfig @@ -26,6 +26,8 @@ config SERIAL_PCI =20 config VIRTIO_SERIAL bool + default y + depends on VIRTIO =20 config STM32F2XX_USART bool diff --git a/hw/display/Kconfig b/hw/display/Kconfig index 6d58f93..0f659e9 100644 --- a/hw/display/Kconfig +++ b/hw/display/Kconfig @@ -95,6 +95,8 @@ config QXL =20 config VIRTIO_GPU bool + default y + depends on VIRTIO =20 config VIRTIO_VGA bool diff --git a/hw/input/Kconfig b/hw/input/Kconfig index e05b7be..e2e66f0 100644 --- a/hw/input/Kconfig +++ b/hw/input/Kconfig @@ -21,11 +21,13 @@ config TSC2005 =20 config VIRTIO_INPUT bool + default y + depends on VIRTIO =20 config VIRTIO_INPUT_HOST bool default y - depends on LINUX + depends on VIRTIO && LINUX =20 config TSC210X bool diff --git a/hw/net/Kconfig b/hw/net/Kconfig index 982e139..dc69e55 100644 --- a/hw/net/Kconfig +++ b/hw/net/Kconfig @@ -95,6 +95,8 @@ config XILINX_ETHLITE =20 config VIRTIO_NET bool + default y + depends on VIRTIO =20 config ETSEC bool diff --git a/hw/scsi/Kconfig b/hw/scsi/Kconfig index b9cf269..b3ba540 100644 --- a/hw/scsi/Kconfig +++ b/hw/scsi/Kconfig @@ -43,10 +43,12 @@ config SPAPR_VSCSI =20 config VIRTIO_SCSI bool + default y + depends on VIRTIO select SCSI =20 config VHOST_USER_SCSI bool # Only PCI devices are provided for now default y if VIRTIO_PCI - depends on VHOST_USER && LINUX + depends on VIRTIO && VHOST_USER && LINUX diff --git a/hw/virtio/Kconfig b/hw/virtio/Kconfig index 5dafbe3..74f4573 100644 --- a/hw/virtio/Kconfig +++ b/hw/virtio/Kconfig @@ -3,6 +3,8 @@ config VIRTIO =20 config VIRTIO_RNG bool + default y + depends on VIRTIO =20 config VIRTIO_PCI bool @@ -12,9 +14,14 @@ config VIRTIO_PCI =20 config VIRTIO_MMIO bool + select VIRTIO =20 config VIRTIO_BALLOON bool + default y + depends on VIRTIO =20 config VIRTIO_CRYPTO bool + default y + depends on VIRTIO --=20 1.8.3.1 From nobody Wed Apr 24 17:06:17 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (209.51.188.17 [209.51.188.17]) by mx.zohomail.com with SMTPS id 154956315798036.230484886975546; Thu, 7 Feb 2019 10:12:37 -0800 (PST) Received: from localhost ([127.0.0.1]:44655 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1groA0-0004sV-Nn for importer@patchew.org; Thu, 07 Feb 2019 13:12:28 -0500 Received: from eggs.gnu.org ([209.51.188.92]:57597) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1grnw4-00027G-Si for qemu-devel@nongnu.org; Thu, 07 Feb 2019 12:58:05 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1grnw3-0002Nd-V7 for qemu-devel@nongnu.org; Thu, 07 Feb 2019 12:58:04 -0500 Received: from mail-wm1-x341.google.com ([2a00:1450:4864:20::341]:36766) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1grnw3-0002N7-Gc for qemu-devel@nongnu.org; Thu, 07 Feb 2019 12:58:03 -0500 Received: by mail-wm1-x341.google.com with SMTP id p6so829108wmc.1 for ; Thu, 07 Feb 2019 09:58:03 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id q12sm12708982wmf.2.2019.02.07.09.58.01 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 07 Feb 2019 09:58:01 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=cJxJ3nCJt4JwG00j1DXK+heQjFEMYs4LPctd5vmY6Xs=; b=AGYuogDFLmvcIgDSLq3Gr/NV+0glkMaGJuqkPTGw6zmaALcE9Nzuu8WjFH78JbuLwl b2CwDHtxZQS+Cv9VR57tODsmSOMJcrQpsSCuQMWbxfCWO6V/mFaSPXP3x04SHt9pMCMk NaeG1qECHcUzeDGdr6ftrLR3iWXkNjvfHeZvPVo5oEA4JKwTn8R93psygkejCLUmpAYH SLc1tqSiXW3BDO+B/Arg4Rnwh1QCUKxVcz7U+DyXs1GJrf43+dq5p67c0eJcpF6S5Qql HB8zMcF+er5/x3GQvlzl6p478LE1BaGcCbMOgDoJzncEUnQlrJrmlGt7xicRxyDLisOu RxYQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=cJxJ3nCJt4JwG00j1DXK+heQjFEMYs4LPctd5vmY6Xs=; b=ou68Z5zEThO6yYWZJ09DmpOL7CoZt9eoPzsRDWofhYFSGFatMgwbdtrV8GvJk/siR9 bh+Y5WZgSNyRWFyTHsMGNq32Ui/b0sZcbIn6VoQ0vMMuNW7iYmzAzKxUTy87sGDeicxz oyMW+N+V3OyivOFZeCDk9sZ109nDZsSBFZqILOxOwofb8/4Z47tKL/mwLFoQ1MXixYTu zyJ0nfcpLu4aryI1GuqevDl3CBl8MEFg0yV7DybdXfmLgn1T44MiUeQp/4BYu6UgjfTk nRGQRW/XUTwZKEf7LVkanmmlz/jXqUWKQrQpBGJi3BsAqxuZfw96kBRbprZyElB9oT6y Fl1g== X-Gm-Message-State: AHQUAuYOuipPE43T3eRMwdBvVra2TvjfmUHEQEWsTyhlRuvj6iSHd6/7 /YliSwQWNUXMrGlTuGsjcN7rAH/b X-Google-Smtp-Source: AHgI3Ibb3M/+p+XpfCO+A0k8/BcEfjaMe455F287nNehenuUbRm8pvFfcLvR8gVgqdIVFrn/FgC4BQ== X-Received: by 2002:a7b:c1c5:: with SMTP id a5mr3410410wmj.51.1549562282173; Thu, 07 Feb 2019 09:58:02 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Thu, 7 Feb 2019 18:57:07 +0100 Message-Id: <1549562254-41157-25-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1549562254-41157-1-git-send-email-pbonzini@redhat.com> References: <1549562254-41157-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::341 Subject: [Qemu-devel] [PATCH 24/51] tpm: express dependencies with Kconfig X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Yang Zhong , thuth@redhat.com, philmd@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" This automatically removes the SCSI subsystem from the binary altogether if no controllers are selected. Signed-off-by: Paolo Bonzini Signed-off-by: Yang Zhong Message-Id: <20190123065618.3520-34-yang.zhong@intel.com> Signed-off-by: Paolo Bonzini Reviewed-by: Michael S. Tsirkin --- hw/i386/Kconfig | 1 + hw/tpm/Kconfig | 12 ++++++++++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/hw/i386/Kconfig b/hw/i386/Kconfig index 2da10af..73d33e9 100644 --- a/hw/i386/Kconfig +++ b/hw/i386/Kconfig @@ -7,6 +7,7 @@ config PC imply HYPERV imply QXL imply SEV + imply TPM_CRB imply TPM_TIS select I8259 select I8254 diff --git a/hw/tpm/Kconfig b/hw/tpm/Kconfig index b0c2c05..6fc6a2c 100644 --- a/hw/tpm/Kconfig +++ b/hw/tpm/Kconfig @@ -1,17 +1,25 @@ config TPM bool =20 +config TPMDEV + bool + config TPM_TIS bool depends on TPM && ISA_BUS + select TPMDEV =20 config TPM_CRB bool - default y - depends on TPM && PC + depends on TPM + select TPMDEV =20 config TPM_PASSTHROUGH bool + default y + depends on TPMDEV =20 config TPM_EMULATOR bool + default y + depends on TPMDEV --=20 1.8.3.1 From nobody Wed Apr 24 17:06:17 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1549564444762997.5853628349169; Thu, 7 Feb 2019 10:34:04 -0800 (PST) Received: from localhost ([127.0.0.1]:44948 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1groUr-00059h-J6 for importer@patchew.org; Thu, 07 Feb 2019 13:34:01 -0500 Received: from eggs.gnu.org ([209.51.188.92]:57611) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1grnw7-00029i-AY for qemu-devel@nongnu.org; Thu, 07 Feb 2019 12:58:08 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1grnw4-0002OH-VM for qemu-devel@nongnu.org; Thu, 07 Feb 2019 12:58:07 -0500 Received: from mail-wr1-x443.google.com ([2a00:1450:4864:20::443]:46151) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1grnw4-0002NZ-EZ for qemu-devel@nongnu.org; Thu, 07 Feb 2019 12:58:04 -0500 Received: by mail-wr1-x443.google.com with SMTP id l9so763784wrt.13 for ; Thu, 07 Feb 2019 09:58:04 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id q12sm12708982wmf.2.2019.02.07.09.58.02 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 07 Feb 2019 09:58:02 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=5oWZ/SkSJb9i14MWqua4WGCDe2Zt33ydIuVlwghm1Q4=; b=rNDkJ/YiXOxztVwvjXGhVNaABFFS5VL31eoq8kAsf2BzAgY63YiW5PPihh+D04HnSD 8xOvCvM3839uL7zAsqoi1nr4EodbivVHD+O60NjM6tR7mJbfdbtzKHV27dOVAANV1ab9 LqfGZtNdeGRPF8rZp+kaLdxHnYWNGaxxrvz8LAkVmDt4+WTLeqki8Y22MD/t6OC3/aes OCykmaXr69Hga5E/IPiS1uyo4JR2wL4W6NYQ5Rrt92xJL7UymtNwepv2l52gIBf/dhGc kGhoa6IXOqooR7VzvDECjiUQKr6LcMNzF03wkxrVEvH+SRdAu1tBp8Q37r5fKJXbXgK3 lPng== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=5oWZ/SkSJb9i14MWqua4WGCDe2Zt33ydIuVlwghm1Q4=; b=OdEgIOgihdOwzK5MUACljERuyOU3cu/mmQxn4YhMqwh/uJKAaA3IY+scP0Cq0wGecy YJP9iUUX4kSE6mIW14ZdvngT9MlPzUDRqVlEFjTTZFf0F0afTAZmYkUHEyYgI3AOv5qT 81O/SaUMJV71Mmnw+dVl5/jOKoLqHWlqAVdvaiJi2gVBjnuX0qzE2RQLrePnWn21XLwz W63qTr8WfZONIGQD+23YPnaY2Rv3v1N1RZ95k/wlaks0JIGw7TCKSWAoz6jmRHYYLb4c gdEj2FzqGns8aC5HSAoN132dN7MjyNpP8vuc+fUHR+HottBHPW8NQNfIPs0jwv5Ocv3Q Sg4g== X-Gm-Message-State: AHQUAuZl3c9F1qv7G8G9tsK1Cnbh8sT+HUK811zBxtmJJLX2WhYRVpbH 6X4Al58NHGLcb1viWY30Xnv868bE X-Google-Smtp-Source: AHgI3IZx9O03D2PzynCsC9X7Ct6d48oTLpN4anM7gic19n7vS5rAT3LpIl4KDd8RV5dYMXSk3j31kA== X-Received: by 2002:adf:b783:: with SMTP id s3mr13970230wre.274.1549562283208; Thu, 07 Feb 2019 09:58:03 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Thu, 7 Feb 2019 18:57:08 +0100 Message-Id: <1549562254-41157-26-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1549562254-41157-1-git-send-email-pbonzini@redhat.com> References: <1549562254-41157-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::443 Subject: [Qemu-devel] [PATCH 25/51] isa: express SuperIO dependencies with Kconfig X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: thuth@redhat.com, philmd@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Signed-off-by: Paolo Bonzini Reviewed-by: Michael S. Tsirkin --- default-configs/alpha-softmmu.mak | 5 ----- default-configs/ppc-softmmu.mak | 9 --------- default-configs/sh4-softmmu.mak | 9 ++------- default-configs/sh4eb-softmmu.mak | 6 ------ hw/block/Kconfig | 5 +++-- hw/i386/Kconfig | 1 + hw/isa/Kconfig | 21 +++++++++++++++++++++ 7 files changed, 27 insertions(+), 29 deletions(-) diff --git a/default-configs/alpha-softmmu.mak b/default-configs/alpha-soft= mmu.mak index f0c1928..762e3a2 100644 --- a/default-configs/alpha-softmmu.mak +++ b/default-configs/alpha-softmmu.mak @@ -2,13 +2,8 @@ =20 CONFIG_PCI=3Dy CONFIG_PCI_DEVICES=3Dy -CONFIG_SERIAL=3Dy -CONFIG_SERIAL_ISA=3Dy CONFIG_I82374=3Dy CONFIG_I8254=3Dy -CONFIG_I8257=3Dy -CONFIG_PARALLEL=3Dy -CONFIG_FDC=3Dy CONFIG_PCKBD=3Dy CONFIG_VGA_CIRRUS=3Dy CONFIG_VMWARE_VGA=3Dy diff --git a/default-configs/ppc-softmmu.mak b/default-configs/ppc-softmmu.= mak index d1ee6f7..9ad307a 100644 --- a/default-configs/ppc-softmmu.mak +++ b/default-configs/ppc-softmmu.mak @@ -9,12 +9,10 @@ CONFIG_TEST_DEVICES=3Dy CONFIG_PPC4XX=3Dy CONFIG_M48T59=3Dy CONFIG_SERIAL=3Dy -CONFIG_I8257=3Dy CONFIG_OPENPIC=3Dy CONFIG_PPCE500_PCI=3Dy CONFIG_PFLASH_CFI01=3Dy CONFIG_PFLASH_CFI02=3Dy -CONFIG_I8259=3Dy CONFIG_XILINX=3Dy CONFIG_XILINX_ETHLITE=3Dy CONFIG_E500=3Dy @@ -58,17 +56,10 @@ CONFIG_MAC_NEWWORLD=3Dy # For PReP CONFIG_PREP=3Dy CONFIG_PREP_PCI=3Dy -CONFIG_SERIAL_ISA=3Dy -CONFIG_MC146818RTC=3Dy CONFIG_RS6000_MC=3Dy -CONFIG_PARALLEL=3Dy CONFIG_I82374=3Dy CONFIG_I82378=3Dy -CONFIG_I8254=3Dy CONFIG_PCKBD=3Dy -CONFIG_FDC=3Dy CONFIG_NE2000_ISA=3Dy CONFIG_PC87312=3Dy -CONFIG_PCSPK=3Dy -CONFIG_IDE_ISA=3Dy CONFIG_CS4231A=3Dy diff --git a/default-configs/sh4-softmmu.mak b/default-configs/sh4-softmmu.= mak index ccefc10..4ba5584 100644 --- a/default-configs/sh4-softmmu.mak +++ b/default-configs/sh4-softmmu.mak @@ -1,20 +1,15 @@ -# Default configuration for sh4-softmmu +# Default configuration for sh4eb-softmmu =20 CONFIG_PCI=3Dy CONFIG_PCI_DEVICES=3Dy CONFIG_SERIAL=3Dy -CONFIG_SERIAL_ISA=3Dy CONFIG_PFLASH_CFI02=3Dy CONFIG_SH4=3Dy CONFIG_IDE_MMIO=3Dy CONFIG_SM501=3Dy CONFIG_TEST_DEVICES=3Dy CONFIG_I82378=3Dy -CONFIG_I8259=3Dy -CONFIG_I8254=3Dy -CONFIG_PCSPK=3Dy CONFIG_I82374=3Dy -CONFIG_I8257=3Dy -CONFIG_MC146818RTC=3Dy CONFIG_R2D=3Dy CONFIG_SHIX=3Dy +CONFIG_TEST_DEVICES=3Dy diff --git a/default-configs/sh4eb-softmmu.mak b/default-configs/sh4eb-soft= mmu.mak index c8edeb7..9717673 100644 --- a/default-configs/sh4eb-softmmu.mak +++ b/default-configs/sh4eb-softmmu.mak @@ -3,18 +3,12 @@ CONFIG_PCI=3Dy CONFIG_PCI_DEVICES=3Dy CONFIG_SERIAL=3Dy -CONFIG_SERIAL_ISA=3Dy CONFIG_PFLASH_CFI02=3Dy CONFIG_SH4=3Dy CONFIG_IDE_MMIO=3Dy CONFIG_SM501=3Dy CONFIG_TEST_DEVICES=3Dy CONFIG_I82378=3Dy -CONFIG_I8259=3Dy -CONFIG_I8254=3Dy -CONFIG_PCSPK=3Dy CONFIG_I82374=3Dy -CONFIG_I8257=3Dy -CONFIG_MC146818RTC=3Dy CONFIG_R2D=3Dy CONFIG_SHIX=3Dy diff --git a/hw/block/Kconfig b/hw/block/Kconfig index 00f9dad..df96dc5 100644 --- a/hw/block/Kconfig +++ b/hw/block/Kconfig @@ -1,7 +1,8 @@ config FDC bool - default y - depends on ISA_BUS + # FIXME: there is no separate file for the MMIO floppy disk controller= , so + # select ISA_BUS here instead of polluting each board that requires one + select ISA_BUS =20 config SSI_M25P80 bool diff --git a/hw/i386/Kconfig b/hw/i386/Kconfig index 73d33e9..b9d9168 100644 --- a/hw/i386/Kconfig +++ b/hw/i386/Kconfig @@ -57,6 +57,7 @@ config ISAPC =20 config Q35 bool + imply FDC imply VTD imply AMD_IOMMU select PC_PCI diff --git a/hw/isa/Kconfig b/hw/isa/Kconfig index fcd87b4..57e09a0 100644 --- a/hw/isa/Kconfig +++ b/hw/isa/Kconfig @@ -7,26 +7,47 @@ config APM config I82378 bool select ISA_BUS + select I8259 + select I8254 + select I82374 + select MC146818RTC =20 config PC87312 bool select ISA_BUS + select I8259 + select I8254 + select I8257 + select MC146818RTC + select SERIAL_ISA + select PARALLEL + select FDC + select IDE_ISA =20 config PIIX4 bool + # For historical reasons, SuperIO devices are created in the board + # for PIIX4. select ISA_BUS =20 config VT82C686 bool select ISA_BUS select ACPI_SMBUS + select SERIAL_ISA + select FDC =20 config SMC37C669 bool select ISA_BUS + select SERIAL_ISA + select PARALLEL + select FDC =20 config LPC_ICH9 bool + # For historical reasons, SuperIO devices are created in the board + # for ICH9. select ISA_BUS select ACPI_SMBUS select ACPI_X86_ICH --=20 1.8.3.1 From nobody Wed Apr 24 17:06:17 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1549563398393551.4060453996343; Thu, 7 Feb 2019 10:16:38 -0800 (PST) Received: from localhost ([127.0.0.1]:44712 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1groDx-0008Ph-C5 for importer@patchew.org; Thu, 07 Feb 2019 13:16:33 -0500 Received: from eggs.gnu.org ([209.51.188.92]:57630) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1grnw9-0002Bj-9Z for qemu-devel@nongnu.org; Thu, 07 Feb 2019 12:58:10 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1grnw7-0002P3-9L for qemu-devel@nongnu.org; Thu, 07 Feb 2019 12:58:09 -0500 Received: from mail-wr1-x444.google.com ([2a00:1450:4864:20::444]:38651) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1grnw5-0002O8-5Q for qemu-devel@nongnu.org; Thu, 07 Feb 2019 12:58:05 -0500 Received: by mail-wr1-x444.google.com with SMTP id v13so829760wrw.5 for ; Thu, 07 Feb 2019 09:58:05 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id q12sm12708982wmf.2.2019.02.07.09.58.03 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 07 Feb 2019 09:58:03 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=b0GzIn7zs8h+77f4f0f0//5H/cTO2q3dYfxclL/PZs8=; b=l1X+kaFOm6FcQNPXDfigmywrJ4vcFvCbEg3uhzDFqsR+JXJerkoi+BSheNObE0CVWj QYhmolr5lvny4iR8UpPLrg6eQbi+kIYs89vzbQimW5K6aASHYtztpFlpUjD68vDr+QmT Z81hU+A6GUt4CEpsygOw+QkXZRTDIjHtyHnnt32YtV6miYcPgqYzI9rPpqcdO7YLzb0l 5tpn4m+CIoQWdWlC6DXFk8NcLYwvKZkb+ghZVJuwNVkeCUiPRGQ9zEdU/+VsJjej5ePZ wkOC2hNrCyNaR91N/20CeO0lrRVPJeTQ1Ryko+9bQic/Q+9FX19WeQOhbssET74VWGPs PvNA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=b0GzIn7zs8h+77f4f0f0//5H/cTO2q3dYfxclL/PZs8=; b=APAp22oZxQVZL6nDjw5PQOJu1V9KOvprquhhkMbSNh0jOzLilTIM5TdHOKDxkt6AYC 4YyICDIJCP6xEfBvUC+GRpytr2wnTyy4vKAkjXX+daVibyBz3tRiZwzXvcHmFcElNXWw kIm8A1Bb5pXc6BLLIBGbFXN/gT8FucvmL085kC6KUf9ol9Qhc7fsThcrRGzOlqhDnzrV +oPFqtn9bHbQtKF3lTCl1WpITK8PyFWoPQXdekO72z4jxALPUAfUet/wtQ3hWs3ThueQ Y/IaurTF1CLSk6Eie86SLlWcqLgLUeUTYLqhV+/CLgpP5bkhsnrdI5XV66gBw3rBX0gB d+4w== X-Gm-Message-State: AHQUAuYbdUbq691au9DuGii2lC9L8SMYLbgRMWVy41T2yfNOYb/jdKhy 4jxlIVRqQdzNjfJp61yfaeSN62f9 X-Google-Smtp-Source: AHgI3IYFUr1k00T09qtm1294HKNeWQm5N0EyU9lJN/phYMkYR0pUG+kSEBWkoD/+hKAOB99kI4mJmA== X-Received: by 2002:a5d:468e:: with SMTP id u14mr11120963wrq.253.1549562284071; Thu, 07 Feb 2019 09:58:04 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Thu, 7 Feb 2019 18:57:09 +0100 Message-Id: <1549562254-41157-27-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1549562254-41157-1-git-send-email-pbonzini@redhat.com> References: <1549562254-41157-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::444 Subject: [Qemu-devel] [PATCH 26/51] ssi: express dependencies with kconfig X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: thuth@redhat.com, philmd@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Signed-off-by: Paolo Bonzini Reviewed-by: Michael S. Tsirkin --- default-configs/arm-softmmu.mak | 1 - default-configs/microblaze-softmmu.mak | 1 - hw/sd/Kconfig | 1 + hw/ssi/Kconfig | 4 ++++ 4 files changed, 5 insertions(+), 2 deletions(-) diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.= mak index c1871c7..3491403 100644 --- a/default-configs/arm-softmmu.mak +++ b/default-configs/arm-softmmu.mak @@ -24,7 +24,6 @@ CONFIG_DDC=3Dy CONFIG_SII9022=3Dy CONFIG_ADS7846=3Dy CONFIG_MAX111X=3Dy -CONFIG_SSI=3Dy CONFIG_SSI_SD=3Dy CONFIG_SSI_M25P80=3Dy CONFIG_LAN9118=3Dy diff --git a/default-configs/microblaze-softmmu.mak b/default-configs/micro= blaze-softmmu.mak index a4a6770..7140ef3 100644 --- a/default-configs/microblaze-softmmu.mak +++ b/default-configs/microblaze-softmmu.mak @@ -6,7 +6,6 @@ CONFIG_XILINX=3Dy CONFIG_XILINX_AXI=3Dy CONFIG_XILINX_SPI=3Dy CONFIG_XILINX_ETHLITE=3Dy -CONFIG_SSI=3Dy CONFIG_SSI_M25P80=3Dy CONFIG_XLNX_ZYNQMP=3Dy CONFIG_PETALOGIX_S3ADSP1800=3Dy diff --git a/hw/sd/Kconfig b/hw/sd/Kconfig index c6c5dfb..8f12d9c 100644 --- a/hw/sd/Kconfig +++ b/hw/sd/Kconfig @@ -3,6 +3,7 @@ config PL181 =20 config SSI_SD bool + depends on SSI =20 config SD bool diff --git a/hw/ssi/Kconfig b/hw/ssi/Kconfig index 5a03110..9e54a0c 100644 --- a/hw/ssi/Kconfig +++ b/hw/ssi/Kconfig @@ -1,14 +1,18 @@ config PL022 bool + select SSI =20 config SSI bool =20 config XILINX_SPI bool + select SSI =20 config XILINX_SPIPS bool + select SSI =20 config STM32F2XX_SPI bool + select SSI --=20 1.8.3.1 From nobody Wed Apr 24 17:06:17 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1549564636622761.5620731297155; Thu, 7 Feb 2019 10:37:16 -0800 (PST) Received: from localhost ([127.0.0.1]:45004 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1groXx-0007ey-JS for importer@patchew.org; Thu, 07 Feb 2019 13:37:13 -0500 Received: from eggs.gnu.org ([209.51.188.92]:57653) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1grnwA-0002Cf-4I for qemu-devel@nongnu.org; Thu, 07 Feb 2019 12:58:10 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1grnw9-0002Q6-BB for qemu-devel@nongnu.org; Thu, 07 Feb 2019 12:58:10 -0500 Received: from mail-wm1-x341.google.com ([2a00:1450:4864:20::341]:36767) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1grnw7-0002Oa-C0 for qemu-devel@nongnu.org; Thu, 07 Feb 2019 12:58:09 -0500 Received: by mail-wm1-x341.google.com with SMTP id p6so829243wmc.1 for ; Thu, 07 Feb 2019 09:58:06 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id q12sm12708982wmf.2.2019.02.07.09.58.04 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 07 Feb 2019 09:58:04 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=eBqhbVMzCRU3HbYGiyb8WNQjcWq8lKc7B7yl9UM5f9I=; b=UK1owxOu9KonWtdSqDhAW/raeXLZFGrkP0z3eYpQ53ndTDK4GlOPOreuqSMJcI9PRf fREUyuteBnpOKLTfmZeoBg5WpBzYXsera8Ohw/M5tUfFjV3gNVCWoWXLAY1NXL5ROhjJ 0hRTphe8StDS+NagGSvhRnmKIIl1TAAWHSP+A0a0J8rDItII/9di2WRGYFfpLJW/W5Dw 3SgOwPjMfopfwlFE6Cw+rGFHov5JqaQlddz+K+RtH7micOXnhz/n/FYNIWjSTzZn2tgO 434Qv+NJlyWddXzE1Jfn7xB2fqnm8vUm+4MJbGfV7hSxUWvO2FKCWufSf5JG2MkawGS5 Cy9A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=eBqhbVMzCRU3HbYGiyb8WNQjcWq8lKc7B7yl9UM5f9I=; b=Go3ARQeOHETVqaNAfu4LDhl0d6iiUYMWvYaIsdZDVkjEaOmPWxHCxuyDkLJKSPkDJu gEpuYYTiti5BKK/Nd3AMbEvvqnNlf7qLQf/ektmPjfpWFbPVMLsr/8gWW8492nYoRNAs Hgg9sajn5BhtYgxxOKrHD56LGqrHnun4MLOBH+l1wW7e1AhhurJIvOeXbbM42MREvV0m TbOJz3+mNmh/YWuc1FjJ5Y0oA6GwJ82kWczRBuDabm2AZlEq8E1wrPMVjmMVeZGjb3Ph WUT7aZGEFFIESqWQKA/YsSTAmDDl7ZvNTaiH+OTHPzTJMAfC0NBCDw/tAtN1Z7nqetE2 AgXg== X-Gm-Message-State: AHQUAuajphUN4aJ4DPGcbOiRuRTXMTM8BBXCDB/HMR6zAVTiGEz8eTjc J0sgfAuhsP0i5XBK2OWKB5YkYXsW X-Google-Smtp-Source: AHgI3IaRC1UjhJWF5q/map3rP+B0oGi1w29siy5S3sBjukVSQp8It1VhHuXbr87FOQBLGdkES78XSQ== X-Received: by 2002:a7b:c08f:: with SMTP id r15mr8535636wmh.118.1549562285080; Thu, 07 Feb 2019 09:58:05 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Thu, 7 Feb 2019 18:57:10 +0100 Message-Id: <1549562254-41157-28-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1549562254-41157-1-git-send-email-pbonzini@redhat.com> References: <1549562254-41157-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::341 Subject: [Qemu-devel] [PATCH 27/51] sd: express dependencies with kconfig X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: thuth@redhat.com, philmd@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Signed-off-by: Paolo Bonzini Reviewed-by: Michael S. Tsirkin --- default-configs/arm-softmmu.mak | 1 - hw/sd/Kconfig | 2 ++ 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.= mak index 3491403..8283aeb 100644 --- a/default-configs/arm-softmmu.mak +++ b/default-configs/arm-softmmu.mak @@ -6,7 +6,6 @@ CONFIG_VGA=3Dy CONFIG_NAND=3Dy CONFIG_ECC=3Dy CONFIG_SERIAL=3Dy -CONFIG_SD=3Dy CONFIG_MAX7310=3Dy CONFIG_WM8750=3Dy CONFIG_TWL92230=3Dy diff --git a/hw/sd/Kconfig b/hw/sd/Kconfig index 8f12d9c..864f535 100644 --- a/hw/sd/Kconfig +++ b/hw/sd/Kconfig @@ -1,9 +1,11 @@ config PL181 bool + select SD =20 config SSI_SD bool depends on SSI + select SD =20 config SD bool --=20 1.8.3.1 From nobody Wed Apr 24 17:06:17 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1549563231300134.000878911653; Thu, 7 Feb 2019 10:13:51 -0800 (PST) Received: from localhost ([127.0.0.1]:44661 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1groBF-0005wi-5Z for importer@patchew.org; Thu, 07 Feb 2019 13:13:45 -0500 Received: from eggs.gnu.org ([209.51.188.92]:57654) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1grnwA-0002Ch-4X for qemu-devel@nongnu.org; Thu, 07 Feb 2019 12:58:10 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1grnw9-0002Q7-Aj for qemu-devel@nongnu.org; Thu, 07 Feb 2019 12:58:10 -0500 Received: from mail-wr1-x441.google.com ([2a00:1450:4864:20::441]:38649) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1grnw7-0002Oj-9f for qemu-devel@nongnu.org; Thu, 07 Feb 2019 12:58:09 -0500 Received: by mail-wr1-x441.google.com with SMTP id v13so829864wrw.5 for ; Thu, 07 Feb 2019 09:58:07 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id q12sm12708982wmf.2.2019.02.07.09.58.05 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 07 Feb 2019 09:58:05 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=tGweMoXy9qv2Bdf3Z64kx+UyIEIYy/u4fKfhLC4o2gI=; b=amDzyjK3uGpNvwzC5DSwVYC0E94OrNd2d21RBBp3QsSOtwn46ZFvgHrCq6lgZ12bmV 35tmBzd3EmlozhO4YTNXzmQthXrqYaiRiPoS+ekBwzYvBqq36K6OcYFNT1jX98T0munY 8eYD1ZJHiDitE3MagzoEA85E6mf710G0Nq03XmTobeVNqdwdlhlRVNndn6hSKBhaJDyo eETZpuwUGO09GwSplTxbflSqAkxLICU+ri45C8KhecKsnwbuc1orSLXrO9vkNReZb/2L d/TDROGQoJgjTKYgjfQgdrlbeVSgNLawQcpw5BwigMJWg4DxrFnJZxrZ0GqLjOwIYDuX 14Pw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=tGweMoXy9qv2Bdf3Z64kx+UyIEIYy/u4fKfhLC4o2gI=; b=hosOoQ8b++KjJknF9JOAOUiyfTEVI13QzoefcFzLSBX1ailhD38biUz8PSvQSxpVdF V85lJ6WidnJeQkH4DXT6sq/4/kydgaI2EJkN9twO+JEuBAg9Bg4ZXD1pMXazjrVZ1RfG WCZlIJPZ5oHN+PM0zabIZzJz5Utn8ffwNo1WiWJgKPM/eOmucOucgpFpRWvrLlROjs6C ieddU+lnwV3UyUOny5HA4ce3UaDxDKcqdYX6eIWJHydTCcKWzvwdnBHYTOTXwEzYa+2l iyxJandzwkN3w2daeDbPc/zHZ00aBJGZzSnBrqPODqKhuBIi+Gj7vyoAEWWUl8+QYipl 9MSQ== X-Gm-Message-State: AHQUAuYSAN04Mw0in7+JaNIU+H+Rt7H7/5DEv8Zvr2o38bW5jI9DpJ9b GJXau2nMlua18MdezdwX5ZDFwoaH X-Google-Smtp-Source: AHgI3IaGPocSWwqlCh/IANoUc2a71InXAcBsejxWMVNxEwLISwItiqT2csjNITc6xf0KCpx+n8JCqA== X-Received: by 2002:a5d:6b09:: with SMTP id v9mr13932022wrw.304.1549562285904; Thu, 07 Feb 2019 09:58:05 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Thu, 7 Feb 2019 18:57:11 +0100 Message-Id: <1549562254-41157-29-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1549562254-41157-1-git-send-email-pbonzini@redhat.com> References: <1549562254-41157-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::441 Subject: [Qemu-devel] [PATCH 28/51] ipmi: express dependencies with kconfig X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Yang Zhong , thuth@redhat.com, philmd@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Signed-off-by: Paolo Bonzini Signed-off-by: Yang Zhong Message-Id: <20190123065618.3520-36-yang.zhong@intel.com> Reviewed-by: Thomas Huth Signed-off-by: Paolo Bonzini Reviewed-by: Corey Minyard Reviewed-by: Michael S. Tsirkin --- default-configs/i386-softmmu.mak | 3 --- default-configs/ppc64-softmmu.mak | 3 --- hw/ipmi/Kconfig | 6 ++++++ 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/default-configs/i386-softmmu.mak b/default-configs/i386-softmm= u.mak index 53e9d5e..e779ee1 100644 --- a/default-configs/i386-softmmu.mak +++ b/default-configs/i386-softmmu.mak @@ -1,9 +1,6 @@ # Default configuration for i386-softmmu =20 CONFIG_VMXNET3_PCI=3Dy -CONFIG_IPMI=3Dy -CONFIG_IPMI_LOCAL=3Dy -CONFIG_IPMI_EXTERN=3Dy CONFIG_ISA_IPMI_KCS=3Dy CONFIG_ISA_IPMI_BT=3Dy =20 diff --git a/default-configs/ppc64-softmmu.mak b/default-configs/ppc64-soft= mmu.mak index a0a9151..d642b67 100644 --- a/default-configs/ppc64-softmmu.mak +++ b/default-configs/ppc64-softmmu.mak @@ -5,9 +5,6 @@ include ppc-softmmu.mak =20 # For PowerNV CONFIG_POWERNV=3Dy -CONFIG_IPMI=3Dy -CONFIG_IPMI_LOCAL=3Dy -CONFIG_IPMI_EXTERN=3Dy CONFIG_ISA_IPMI_BT=3Dy =20 # For pSeries diff --git a/hw/ipmi/Kconfig b/hw/ipmi/Kconfig index 6a4f08f..b944fae 100644 --- a/hw/ipmi/Kconfig +++ b/hw/ipmi/Kconfig @@ -3,14 +3,20 @@ config IPMI =20 config IPMI_LOCAL bool + default y + depends on IPMI =20 config IPMI_EXTERN bool + default y + depends on IPMI =20 config ISA_IPMI_KCS bool depends on ISA_BUS + select IPMI =20 config ISA_IPMI_BT bool depends on ISA_BUS + select IPMI --=20 1.8.3.1 From nobody Wed Apr 24 17:06:17 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (209.51.188.17 [209.51.188.17]) by mx.zohomail.com with SMTPS id 1549563324727689.9640767324502; Thu, 7 Feb 2019 10:15:24 -0800 (PST) Received: from localhost ([127.0.0.1]:44680 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1groCk-0007Hv-JK for importer@patchew.org; Thu, 07 Feb 2019 13:15:18 -0500 Received: from eggs.gnu.org ([209.51.188.92]:57687) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1grnwD-0002GI-1c for qemu-devel@nongnu.org; Thu, 07 Feb 2019 12:58:13 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1grnwA-0002QZ-3n for qemu-devel@nongnu.org; Thu, 07 Feb 2019 12:58:12 -0500 Received: from mail-wm1-x342.google.com ([2a00:1450:4864:20::342]:55513) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1grnw9-0002PM-AP for qemu-devel@nongnu.org; Thu, 07 Feb 2019 12:58:09 -0500 Received: by mail-wm1-x342.google.com with SMTP id r17so793871wmh.5 for ; Thu, 07 Feb 2019 09:58:08 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id q12sm12708982wmf.2.2019.02.07.09.58.05 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 07 Feb 2019 09:58:06 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=VXcM2KWY9G1tEDzuV2xge5ND9vhPF7ObRjQJ5BN8AbU=; b=Pxig4xv87S2B4q0qy0uw+BEfri6GDaeD3FgJfN7UP/Eyi8cBR+o121QovfPjJ+i49w IHWClw32Y6tVwrX/uAEMxAzA6wJd4p85RpJJZnMwUXNMzKXV6CcwIWJwWZogMc9kHaP6 XqD9A0VwM7TX56BFWNP8mrF9H45PSLzK9/+lAUTvBzqpvIIqb0EbS4H0Nwe+UaLB2qSm ARmsuaiKrRBKEqNNf1KbtjYR/vQOkRiHmHypLl1aIlLPFfnSNlz8EM6paMcGPX3bBt2k T2gwlwc1tvU15r4+gtJhcj2lVR1S17Oq8BeX8yRKlSQ174pKWk6r0UzlXy20Dbr0lziw NrVw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=VXcM2KWY9G1tEDzuV2xge5ND9vhPF7ObRjQJ5BN8AbU=; b=biz4CcIlG+ok4Qh+YN9GHfYmvgwdolNTcZV9RMtJ+uIRFI9vanojnXP0cijA94O2FR 70zl534s+uGu9ZsnGDBrrJoqSBEkDHpAhIUAGZO1EWLfuagWRMrY4iZOnJdrYyyKRguY bwn4vmsDuJ0EiAF5fZnaZhaOQb/HrcIlZjwBT3n4U8b9skC+NVNVOWSPzOYZ0zp3nxBI 25+j2E23bUcizXNtISaJvkJHYoPQvxz3g2+aprg04wxbcNsiPr0Wd7Rr0f+o+ygbn1RV qXnlIFMIz8vgiC2GLIHCjt022KrCQOpa/3Jp+rMgXcKneiZascP77cXbxGu6qxUBID2H 0/wQ== X-Gm-Message-State: AHQUAuZHpRNLt9hyb2TN+efb1EUx3LX3oBc9uZHisk+5DHP/Jlh6PHo7 bLzbjgd7pBV7M7aK8o5Kp6TBkClR X-Google-Smtp-Source: AHgI3IavKYW9Ep8A3d8PJvUQN5gz0J823Mc6rS0dSBuo9EeamKpFXdiHktL9hodIZ8yRW6L7xRf+Vg== X-Received: by 2002:a1c:5fd7:: with SMTP id t206mr8855414wmb.145.1549562286978; Thu, 07 Feb 2019 09:58:06 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Thu, 7 Feb 2019 18:57:12 +0100 Message-Id: <1549562254-41157-30-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1549562254-41157-1-git-send-email-pbonzini@redhat.com> References: <1549562254-41157-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::342 Subject: [Qemu-devel] [PATCH 29/51] i386-softmmu.mak: remove all CONFIG_* except boards definitions X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Yang Zhong , thuth@redhat.com, philmd@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Yang Zhong %-softmmu.mak only keep boards definitions in Kconfig mode. Signed-off-by: Yang Zhong Message-Id: <20190123065618.3520-43-yang.zhong@intel.com> Signed-off-by: Paolo Bonzini Reviewed-by: Michael S. Tsirkin --- default-configs/i386-softmmu.mak | 37 ++++++++++++++++++------------------- hw/acpi/Kconfig | 6 ++++++ hw/i386/Kconfig | 15 +++++++++++++++ hw/mem/Kconfig | 2 ++ hw/pci-bridge/Kconfig | 1 + hw/timer/Kconfig | 1 + 6 files changed, 43 insertions(+), 19 deletions(-) diff --git a/default-configs/i386-softmmu.mak b/default-configs/i386-softmm= u.mak index e779ee1..ba3fb3f 100644 --- a/default-configs/i386-softmmu.mak +++ b/default-configs/i386-softmmu.mak @@ -1,25 +1,24 @@ # Default configuration for i386-softmmu =20 -CONFIG_VMXNET3_PCI=3Dy -CONFIG_ISA_IPMI_KCS=3Dy -CONFIG_ISA_IPMI_BT=3Dy - -# Optional devices: +# Uncomment the following lines to disable these optional devices: # -CONFIG_HPET=3Dy -CONFIG_APPLESMC=3Dy -CONFIG_PFLASH_CFI01=3Dy -CONFIG_ISA_DEBUG=3Dy -CONFIG_ISA_TESTDEV=3Dy -CONFIG_TEST_DEVICES=3Dy -CONFIG_SGA=3Dy -CONFIG_PVPANIC=3Dy -CONFIG_MEM_DEVICE=3Dy -CONFIG_NVDIMM=3Dy -CONFIG_ACPI_NVDIMM=3Dy -CONFIG_PXB=3Dy -CONFIG_ACPI_VMGENID=3Dy -CONFIG_PCI_DEVICES=3Dy +#CONFIG_AMD_IOMMU=3Dn +#CONFIG_APPLESMC=3Dn +#CONFIG_FDC=3Dn +#CONFIG_HPET=3Dn +#CONFIG_HYPERV=3Dn +#CONFIG_ISA_DEBUG=3Dn +#CONFIG_ISA_IPMI_BT=3Dn +#CONFIG_ISA_IPMI_KCS=3Dn +#CONFIG_PCI_DEVICES=3Dn +#CONFIG_PVPANIC=3Dn +#CONFIG_QXL=3Dn +#CONFIG_SEV=3Dn +#CONFIG_SGA=3Dn +#CONFIG_TEST_DEVICES=3Dn +#CONFIG_TPM_CRB=3Dn +#CONFIG_TPM_TIS=3Dn +#CONFIG_VTD=3Dn =20 # Boards: # diff --git a/hw/acpi/Kconfig b/hw/acpi/Kconfig index 035a28f..eca3bee 100644 --- a/hw/acpi/Kconfig +++ b/hw/acpi/Kconfig @@ -4,6 +4,9 @@ config ACPI config ACPI_X86 bool select ACPI + select ACPI_NVDIMM + select ACPI_CPU_HOTPLUG + select ACPI_MEMORY_HOTPLUG =20 config ACPI_X86_ICH bool @@ -18,6 +21,9 @@ config ACPI_MEMORY_HOTPLUG =20 config ACPI_NVDIMM bool + depends on ACPI =20 config ACPI_VMGENID bool + default y + depends on PC diff --git a/hw/i386/Kconfig b/hw/i386/Kconfig index b9d9168..790d37e 100644 --- a/hw/i386/Kconfig +++ b/hw/i386/Kconfig @@ -4,17 +4,31 @@ config SEV =20 config PC bool + imply APPLESMC imply HYPERV + imply ISA_IPMI_KCS + imply ISA_IPMI_BT + imply ISA_DEBUG + imply PCI_DEVICES + imply PVPANIC imply QXL imply SEV + imply SGA + imply TEST_DEVICES imply TPM_CRB imply TPM_TIS select I8259 select I8254 + select PCKBD select PCSPK select I82374 select I8257 select MC146818RTC + # Needed by the board code: + select PARALLEL + # For ACPI builder: + select SERIAL_ISA + select ACPI_VMGENID =20 config PC_PCI bool @@ -29,6 +43,7 @@ config PC_ACPI select ACPI_CPU_HOTPLUG select ACPI_MEMORY_HOTPLUG select SMBUS_EEPROM + select PFLASH_CFI01 depends on ACPI_SMBUS =20 config I440FX diff --git a/hw/mem/Kconfig b/hw/mem/Kconfig index a3a4372..d1e635c 100644 --- a/hw/mem/Kconfig +++ b/hw/mem/Kconfig @@ -6,3 +6,5 @@ config MEM_DEVICE =20 config NVDIMM bool + default y + depends on PC diff --git a/hw/pci-bridge/Kconfig b/hw/pci-bridge/Kconfig index 0519eb1..b167b98 100644 --- a/hw/pci-bridge/Kconfig +++ b/hw/pci-bridge/Kconfig @@ -5,6 +5,7 @@ config PCIE_PORT =20 config PXB bool + default y if Q35 =20 config XIO3130 bool diff --git a/hw/timer/Kconfig b/hw/timer/Kconfig index a021c74..51921eb 100644 --- a/hw/timer/Kconfig +++ b/hw/timer/Kconfig @@ -15,6 +15,7 @@ config DS1338 =20 config HPET bool + default y if PC =20 config I8254 bool --=20 1.8.3.1 From nobody Wed Apr 24 17:06:17 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (209.51.188.17 [209.51.188.17]) by mx.zohomail.com with SMTPS id 1549564823829811.0317173741964; Thu, 7 Feb 2019 10:40:23 -0800 (PST) Received: from localhost ([127.0.0.1]:45026 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1groav-0001dc-Ob for importer@patchew.org; Thu, 07 Feb 2019 13:40:17 -0500 Received: from eggs.gnu.org ([209.51.188.92]:57678) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1grnwC-0002Fj-Jj for qemu-devel@nongnu.org; Thu, 07 Feb 2019 12:58:13 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1grnwA-0002Qj-4Q for qemu-devel@nongnu.org; Thu, 07 Feb 2019 12:58:11 -0500 Received: from mail-wr1-x444.google.com ([2a00:1450:4864:20::444]:43200) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1grnw9-0002PV-A0 for qemu-devel@nongnu.org; Thu, 07 Feb 2019 12:58:09 -0500 Received: by mail-wr1-x444.google.com with SMTP id r2so785336wrv.10 for ; Thu, 07 Feb 2019 09:58:08 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id q12sm12708982wmf.2.2019.02.07.09.58.07 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 07 Feb 2019 09:58:07 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=Br9acmsw/eWOsnfF1ERIFgW+eoTqEVJa/frT05h97i8=; b=HDqo50MhsGEBhsTLa2KzLj80qhHjgsYadX1FTZ59Xm2RjdeOIzYmTT4ernK0PmO/iR HJ1HGRWYMPPUzNdFK0K8LOiz0eA5Tgg2nJdtAkl1PA7bz3vhq4M3jck9XJwoQrjGL4yO 9gV+5QsxOTwdhTE9UTKsvio+SUSwMpTxzZpS+Y1Kyx/peUhFILjTAvrAKwaSBvn9aXeb BH2Pbqctss+TKhmFq7kaPlJbcwFWMS3aL4ziobVr0Mw370c9u/cuBSpibIpelsVVwxBo DWFD5o6kuHrK3HXamTsTfUXCNE2M7HOu8qh6JvT3R0uAmUN498tZsea2wqapAXF5shJR xoaw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=Br9acmsw/eWOsnfF1ERIFgW+eoTqEVJa/frT05h97i8=; b=Ln5hVkp1zmKqG2UH3wxyH1dZOheM7rUAsPudFZLtD09lKG4CE5D0syRvDFfJz+QXwI xC4hX7ulhReEsNVYmzyzxEjKbWpygpy5u3rB4M80HQsm5R9oop3kKH5NzZKpVn6Wngvo QvG0/kHxKDCHR66EG4sVZhkKcn8USoMsWMrRciro4W7EQheybeXQmHb0jflyg9WGRJQ4 l4KJaFVaHttErUpfrSFtq/f6WlIkLRI/LAr6mZiVcpgRA/OlLvYL6fxfA5YnJi7BVbu0 AGXpbe+/PWMdEop+IXoX/slQg4prIlSbpHWm5toNpSqIxukmrE9xo5F+EJGUS4eb0ayc K+DQ== X-Gm-Message-State: AHQUAuYiywm1tNJS3FCoKfJRPqMpUeJEHG4butDC5ZJ2JV54u4t27kaC IbUpIARTfknAVLhrpnT9DuJehi1H X-Google-Smtp-Source: AHgI3IZdooarcnrZ9ETIZHyfz9xvOsB7zUgH/+xMcq2/L0zK3auJKUrMlYQpxneu5C+/oVrtrU6duQ== X-Received: by 2002:a5d:4349:: with SMTP id u9mr13822874wrr.223.1549562287830; Thu, 07 Feb 2019 09:58:07 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Thu, 7 Feb 2019 18:57:13 +0100 Message-Id: <1549562254-41157-31-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1549562254-41157-1-git-send-email-pbonzini@redhat.com> References: <1549562254-41157-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::444 Subject: [Qemu-devel] [PATCH 30/51] ppc64: Express dependencies of 'pseries' and 'powernv' machines with kconfig X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: thuth@redhat.com, philmd@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Thomas Huth The POWERNV switch should always select ISA_IPMI_BT, then the other IPMI options are turned on automatically now. CONFIG_DIMM should always be selected by the pseries machine, which in turn depends on CONFIG_MEM_DEVICE since DIMM implements this interface. CONFIG_VIRTIO_VGA can be dropped from default-configs/ppc64-softmmu.mak completely since this device is already automatically enabled via hw/display/Kconfig now. Signed-off-by: Thomas Huth Signed-off-by: Paolo Bonzini Reviewed-by: Michael S. Tsirkin --- default-configs/ppc64-softmmu.mak | 5 ----- hw/intc/Kconfig | 6 ++---- hw/mem/Kconfig | 1 + hw/ppc/Kconfig | 22 ++++++++++++++++++++-- 4 files changed, 23 insertions(+), 11 deletions(-) diff --git a/default-configs/ppc64-softmmu.mak b/default-configs/ppc64-soft= mmu.mak index d642b67..cca5266 100644 --- a/default-configs/ppc64-softmmu.mak +++ b/default-configs/ppc64-softmmu.mak @@ -5,11 +5,6 @@ include ppc-softmmu.mak =20 # For PowerNV CONFIG_POWERNV=3Dy -CONFIG_ISA_IPMI_BT=3Dy =20 # For pSeries CONFIG_PSERIES=3Dy -CONFIG_VIRTIO_VGA=3Dy -CONFIG_MEM_DEVICE=3Dy -CONFIG_DIMM=3Dy -CONFIG_SPAPR_RNG=3Dy diff --git a/hw/intc/Kconfig b/hw/intc/Kconfig index 6eea14e..de10a6b 100644 --- a/hw/intc/Kconfig +++ b/hw/intc/Kconfig @@ -31,13 +31,11 @@ config OPENPIC_KVM =20 config XICS bool - default y - depends on PSERIES + depends on POWERNV || PSERIES =20 config XICS_SPAPR bool - default y - depends on PSERIES + select XICS =20 config XICS_KVM bool diff --git a/hw/mem/Kconfig b/hw/mem/Kconfig index d1e635c..620fd4c 100644 --- a/hw/mem/Kconfig +++ b/hw/mem/Kconfig @@ -1,5 +1,6 @@ config DIMM bool + select MEM_DEVICE =20 config MEM_DEVICE bool diff --git a/hw/ppc/Kconfig b/hw/ppc/Kconfig index fb085d7..be6440e 100644 --- a/hw/ppc/Kconfig +++ b/hw/ppc/Kconfig @@ -1,11 +1,29 @@ config PSERIES bool + imply PCI_DEVICES + imply TEST_DEVICES + select DIMM + select PCI + select VFIO + select XICS_SPAPR + select XIVE_SPAPR + select SPAPR_VSCSI =20 config SPAPR_RNG bool + default y + depends on PSERIES =20 config POWERNV bool + imply PCI_DEVICES + imply TEST_DEVICES + select ISA_IPMI_BT + select IPMI_LOCAL + select ISA_BUS + select MC146818RTC + select XICS + select XIVE =20 config PPC405 bool @@ -39,10 +57,10 @@ config VIRTEX =20 config XIVE bool - default y - depends on PSERIES + depends on POWERNV || PSERIES =20 config XIVE_SPAPR bool default y depends on PSERIES + select XIVE --=20 1.8.3.1 From nobody Wed Apr 24 17:06:17 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (209.51.188.17 [209.51.188.17]) by mx.zohomail.com with SMTPS id 154956361430636.566437582847925; Thu, 7 Feb 2019 10:20:14 -0800 (PST) Received: from localhost ([127.0.0.1]:44739 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1groHN-0002ZU-5J for importer@patchew.org; Thu, 07 Feb 2019 13:20:05 -0500 Received: from eggs.gnu.org ([209.51.188.92]:57680) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1grnwC-0002Fl-K9 for qemu-devel@nongnu.org; Thu, 07 Feb 2019 12:58:13 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1grnwA-0002R6-Ao for qemu-devel@nongnu.org; Thu, 07 Feb 2019 12:58:11 -0500 Received: from mail-wr1-x444.google.com ([2a00:1450:4864:20::444]:45691) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1grnwA-0002QG-2x for qemu-devel@nongnu.org; Thu, 07 Feb 2019 12:58:10 -0500 Received: by mail-wr1-x444.google.com with SMTP id q15so771004wro.12 for ; Thu, 07 Feb 2019 09:58:09 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id q12sm12708982wmf.2.2019.02.07.09.58.07 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 07 Feb 2019 09:58:08 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=EiTHigkVECft0LYnqlB1g95tyHSDdzOW8/6bJepT52M=; b=cmO1QB+bjABI5Kwnmf7Wu6LoNZ+H/hyGyB6i0sviCtcJVyU9onDkMonWUwYdx6C4xL bWpHrHJeP6YBPmzFx2tfoHywAHJ8Va++ATjDNDRo7BIl7Yb6DI1U4Orcn9DpSMMuurAy 5dH2UDzwx+0ZDtbIkDvHcnFcRLCW9bfMnl2+UJYFAnikVUjSPjNOsz/58f4IcDicPAmv 61QToR7E7GYv3PP6zBlOG5+8vqbsv+Ekm+Soy3evlLOnh1wwyICx7J8+wQLjFRPuVEqs wsA/wq3zgeH+8wruRqj8LyUIxCEy32bISf3NR9GMcUy4N392ONpqNyEaD/5OzR9BKgHZ O92g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=EiTHigkVECft0LYnqlB1g95tyHSDdzOW8/6bJepT52M=; b=JM5Q8F0p0f5sW1wLbmL5HAekqgbf1qcSmid/EWz94xcuXZyZkXDJk9Y4mVswPjtne6 NW5Wj0ZKg6noLgbadzlmpi7cfuYDbSNfaBvxGBiMLdV5l/Eagg2tK10vZVKuSXZj4kIo 1ua71yL+c8KHwigV8Wx0+I/Pe0i4fyCJ+dOMhfJhUWiQpP3LH4oEpmzA3FPVpSSSsJLs fvxX10DTFFuEWCLfDp+j7rOSCkodQ5ET1vhTW14+Csrh/A6LN0ndVaWjkKhU76RMHjzV 15lYPf/3y85AWztfIaf3H+C3cAaQQ7xZgAs8K0LNrLp7P+bZCWT3M7kR6SgtTyyndT+X jOIg== X-Gm-Message-State: AHQUAuY6IX2YKRBkWsSSBdKq91jQJ+c3TTPl/PdI6G9WqzTKNMPGM/6k 4PvVsMAstGGcq3f94w8U9IpHAcCu X-Google-Smtp-Source: AHgI3IasJ2ZdF6/Nsb1bWpK8v5wXDUx5hiQslDb2hf4C7mlIB15DulsoMQI2jtYEdno29kNk+AupBA== X-Received: by 2002:a5d:4dd0:: with SMTP id f16mr11134724wru.127.1549562288801; Thu, 07 Feb 2019 09:58:08 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Thu, 7 Feb 2019 18:57:14 +0100 Message-Id: <1549562254-41157-32-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1549562254-41157-1-git-send-email-pbonzini@redhat.com> References: <1549562254-41157-1-git-send-email-pbonzini@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::444 Subject: [Qemu-devel] [PATCH 31/51] ppc: Express dependencies of the 'prep' and '40p' machines with kconfig X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?UTF-8?q?Herv=C3=83=C2=A9=20Poussineau?= , thuth@redhat.com, philmd@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) From: Thomas Huth Select the required devices in hw/ppc/Kconfig instead, so that ppc-softmmu.mak only contains the user-selectable PREP switch. Plug-in devices like NE2000_ISA are pulled in automatically by the Kconfig build system now. Cc: Herv=C3=83=C2=A9 Poussineau Signed-off-by: Thomas Huth Signed-off-by: Paolo Bonzini Reviewed-by: Michael S. Tsirkin --- default-configs/ppc-softmmu.mak | 8 -------- hw/ppc/Kconfig | 10 ++++++++++ 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/default-configs/ppc-softmmu.mak b/default-configs/ppc-softmmu.= mak index 9ad307a..066cec9 100644 --- a/default-configs/ppc-softmmu.mak +++ b/default-configs/ppc-softmmu.mak @@ -55,11 +55,3 @@ CONFIG_MAC_NEWWORLD=3Dy =20 # For PReP CONFIG_PREP=3Dy -CONFIG_PREP_PCI=3Dy -CONFIG_RS6000_MC=3Dy -CONFIG_I82374=3Dy -CONFIG_I82378=3Dy -CONFIG_PCKBD=3Dy -CONFIG_NE2000_ISA=3Dy -CONFIG_PC87312=3Dy -CONFIG_CS4231A=3Dy diff --git a/hw/ppc/Kconfig b/hw/ppc/Kconfig index be6440e..9cebf0f 100644 --- a/hw/ppc/Kconfig +++ b/hw/ppc/Kconfig @@ -39,6 +39,16 @@ config SAM460EX =20 config PREP bool + imply PCI_DEVICES + imply TEST_DEVICES + select CS4231A + select PREP_PCI + select I82374 + select I82378 + select LSI_SCSI_PCI + select M48T59 + select PC87312 + select RS6000_MC =20 config RS6000_MC bool --=20 1.8.3.1 From nobody Wed Apr 24 17:06:17 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 15495638024981008.4192511799469; Thu, 7 Feb 2019 10:23:22 -0800 (PST) Received: from localhost ([127.0.0.1]:44794 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1groKV-0004yq-8P for importer@patchew.org; Thu, 07 Feb 2019 13:23:19 -0500 Received: from eggs.gnu.org ([209.51.188.92]:57716) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1grnwG-0002Kr-TV for qemu-devel@nongnu.org; Thu, 07 Feb 2019 12:58:17 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1grnwD-0002SF-52 for qemu-devel@nongnu.org; Thu, 07 Feb 2019 12:58:14 -0500 Received: from mail-wm1-x344.google.com ([2a00:1450:4864:20::344]:40346) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1grnwC-0002RA-JY for qemu-devel@nongnu.org; Thu, 07 Feb 2019 12:58:13 -0500 Received: by mail-wm1-x344.google.com with SMTP id q21so800837wmc.5 for ; Thu, 07 Feb 2019 09:58:10 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id q12sm12708982wmf.2.2019.02.07.09.58.08 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 07 Feb 2019 09:58:09 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=Sn8p67rWq4HN5rXve4l1DMvddArRQ0/XjKWU868LkLA=; b=SjfwFwtqrxJNEI3BoqFxfv/M1iGEgTzPO2N68sMjn35sorbF5CPY5oUaFuRCCvX2CN OLh/BDSS0KC48PzCI1oPVKNnq3Eni7vvM7m7gY8VIz+6a3GxJz79EY+Hi/SLcwscR2Za DaDlgQFab7ctN+qVVOvzpA4O2w+n3++cJJH0cldCWufm3i6JiHmhGDcAPVqjHGJaOuX7 vJD7gA6nbvI682rWud+BwSscf2Nzt+1ZxE2t3Iohm8P+MoY3qBtYGKvLnSE3tSHLzpr+ vzgq/G8AMExnjN7r6NVYmD7amMoY0dKkhqcz8mO/FKNqUSuHNi8z36VXyWBcXAN3s+R7 50gQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=Sn8p67rWq4HN5rXve4l1DMvddArRQ0/XjKWU868LkLA=; b=XR/K+r1jv8ye8ICMwmCb/heFFQpQ8Jlu08pKy6CkyQHzAv4klvqN5MMx8hpKF3L8h4 JoO8NuWvRNyRDP5jcmMM/rHR6I1L09y3AS+er5IsQYvqZceSMbqNQE8ygwHo5J3qCTIu +4I4gnPAEXFLTXi1SQQbqhNXEAraGi25Dk0K6iLr4kA49zwMZ/RYNmDDxrFrrjxLFLgr 6iVZegnHWAGip6p1qcSEceqYKYCOsdK9pWWE65rx86izp9o/e2pKJU47d6t8h7uoRoZY Vx6iBgVsPOlLsAk0Z4IHSjfMW6LNh5kS3fH+tnhEYjvCVH3IShSALdyzZKW6crqNG+dA kZmw== X-Gm-Message-State: AHQUAuar5rHFEkxvbA5QS5uC8rc44r/8/94jmEWDIenqU8vSDR52i3Vn KpFPzIXIs9hDKziVXFATXrMSWfy0 X-Google-Smtp-Source: AHgI3IYr3BNLreSyr6tsgqvY3ce7qK52GrjUcGpIZCX9uh7/d9N2Ut3iz1FJJURGzDFmI/oLi/IVwg== X-Received: by 2002:a1c:7c07:: with SMTP id x7mr8425539wmc.82.1549562289689; Thu, 07 Feb 2019 09:58:09 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Thu, 7 Feb 2019 18:57:15 +0100 Message-Id: <1549562254-41157-33-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1549562254-41157-1-git-send-email-pbonzini@redhat.com> References: <1549562254-41157-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::344 Subject: [Qemu-devel] [PATCH 32/51] ppc: Express dependencies of the Mac machines with kconfig X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Mark Cave-Ayland , thuth@redhat.com, philmd@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Thomas Huth This will make it for example easier if the users want to disable one of the two machines for their builds. Cc: Mark Cave-Ayland Reviewed-by: Paolo Bonzini Signed-off-by: Thomas Huth Signed-off-by: Paolo Bonzini Reviewed-by: Michael S. Tsirkin --- default-configs/ppc-softmmu.mak | 15 --------------- hw/misc/Kconfig | 6 ++++++ hw/net/Kconfig | 1 + hw/pci-host/Kconfig | 4 +++- hw/ppc/Kconfig | 15 +++++++++++++++ 5 files changed, 25 insertions(+), 16 deletions(-) diff --git a/default-configs/ppc-softmmu.mak b/default-configs/ppc-softmmu.= mak index 066cec9..caaff60 100644 --- a/default-configs/ppc-softmmu.mak +++ b/default-configs/ppc-softmmu.mak @@ -35,21 +35,6 @@ CONFIG_VGA_CIRRUS=3Dy CONFIG_SMBUS_EEPROM=3Dy =20 # For Macs -CONFIG_ESCC=3Dy -CONFIG_MACIO=3Dy -CONFIG_MACIO_GPIO=3Dy -CONFIG_SUNGEM=3Dy -CONFIG_MOS6522=3Dy -CONFIG_CUDA=3Dy -CONFIG_ADB=3Dy -CONFIG_MAC_NVRAM=3Dy -CONFIG_MAC_DBDMA=3Dy -CONFIG_MAC_PMU=3Dy -CONFIG_HEATHROW_PIC=3Dy -CONFIG_GRACKLE_PCI=3Dy -CONFIG_UNIN_PCI=3Dy -CONFIG_DEC_PCI=3Dy -CONFIG_IDE_MACIO=3Dy CONFIG_MAC_OLDWORLD=3Dy CONFIG_MAC_NEWWORLD=3Dy =20 diff --git a/hw/misc/Kconfig b/hw/misc/Kconfig index 74031cc..728c561 100644 --- a/hw/misc/Kconfig +++ b/hw/misc/Kconfig @@ -57,6 +57,12 @@ config MOS6522 =20 config MACIO bool + select CUDA + select ESCC + select IDE_MACIO + select MAC_DBDMA + select MAC_NVRAM + select MOS6522 =20 config IVSHMEM_DEVICE bool diff --git a/hw/net/Kconfig b/hw/net/Kconfig index dc69e55..1aa1071 100644 --- a/hw/net/Kconfig +++ b/hw/net/Kconfig @@ -86,6 +86,7 @@ config FTGMAC100 =20 config SUNGEM bool + depends on PCI =20 config COLDFIRE bool diff --git a/hw/pci-host/Kconfig b/hw/pci-host/Kconfig index ff4080c..b39ea29 100644 --- a/hw/pci-host/Kconfig +++ b/hw/pci-host/Kconfig @@ -10,8 +10,10 @@ config GRACKLE_PCI bool =20 config UNIN_PCI - select PCI bool + select PCI + select DEC_PCI + select OPENPIC =20 config PPCE500_PCI select PCI diff --git a/hw/ppc/Kconfig b/hw/ppc/Kconfig index 9cebf0f..fb77151 100644 --- a/hw/ppc/Kconfig +++ b/hw/ppc/Kconfig @@ -55,9 +55,24 @@ config RS6000_MC =20 config MAC_OLDWORLD bool + imply PCI_DEVICES + imply SUNGEM + imply TEST_DEVICES + select ADB + select GRACKLE_PCI + select HEATHROW_PIC + select MACIO =20 config MAC_NEWWORLD bool + imply PCI_DEVICES + imply SUNGEM + imply TEST_DEVICES + select ADB + select MACIO + select MACIO_GPIO + select MAC_PMU + select UNIN_PCI =20 config E500 bool --=20 1.8.3.1 From nobody Wed Apr 24 17:06:17 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (209.51.188.17 [209.51.188.17]) by mx.zohomail.com with SMTPS id 1549563407013268.8133325191469; Thu, 7 Feb 2019 10:16:47 -0800 (PST) Received: from localhost ([127.0.0.1]:44716 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1groE4-000051-Ui for importer@patchew.org; Thu, 07 Feb 2019 13:16:41 -0500 Received: from eggs.gnu.org ([209.51.188.92]:57723) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1grnwI-0002Mu-PF for qemu-devel@nongnu.org; Thu, 07 Feb 2019 12:58:19 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1grnwD-0002ST-6t for qemu-devel@nongnu.org; Thu, 07 Feb 2019 12:58:14 -0500 Received: from mail-wm1-x342.google.com ([2a00:1450:4864:20::342]:52272) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1grnwC-0002RO-S3 for qemu-devel@nongnu.org; Thu, 07 Feb 2019 12:58:13 -0500 Received: by mail-wm1-x342.google.com with SMTP id m1so822684wml.2 for ; Thu, 07 Feb 2019 09:58:11 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id q12sm12708982wmf.2.2019.02.07.09.58.09 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 07 Feb 2019 09:58:09 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=igtI9fi31/95c0n+5pD8KUmvb3ZA4mw3ekDBmFc47FM=; b=kNSj0QRHVGe0z7IJjrLIJbzPKM3FqaKfIUlMB/70COe2YwzXo4+rxZa/0cBLNCiO/n 5sykzEtUfmej5KmGmXECIRlQrEPFmA97v9yMR9iXAu6EMtZPYaSjLUHBsorkbkWzJdf9 vw9yvNh4orjePklfBd0iVx0ztAurPLUbapkjKCqCPLmgJ4esbbBrkEQJL444cyjiwbgC 9mlmwRdEeHaN3qhivSArhBNNjEuY5NHd8/qIdoRUcNTC+7JRk/pMWFC/1nGajilE5WBx kbqqrm0SsbxNrX2OD9s47TPa3y5HZDfvI3o31ZMZPAux+yYB4j8t2u8AaKTGWQdYGOlM hIdw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=igtI9fi31/95c0n+5pD8KUmvb3ZA4mw3ekDBmFc47FM=; b=tgOp4ToBlQBu7f39M7PF1pVPsQnQBfgQYjDrTzheC6SHnmpL+ve56UneOc7aFCzpJf c2YTKliQJuGtEAWszu+eHLH3auZMnS0gMrG1Clum9Pz+0Df6Smno5gNaMjlKpQ55liX9 27vTaFJKpgMmTSMIp0Gul42Tp5KMY4OZ5HENhyLy7fcg1YVFx+MvKizhxK9P/XdmCxDX oD37OQdy3YFTNgnBg0kMuqZq4xv/85KYdxd82qM9Zvr1VozYQOUQBTPaSwx2HBywVxnn yiF8d1KGNJhl7nyvzsCJKBNMK/fOsXGbduGtzp/FhDLsXLezTDFZjsYXs3EoL+oprAGD FFbw== X-Gm-Message-State: AHQUAuawuao1NQv+c+TZc2/MhDXfGagLK4CMW7ngoKohtPQbASFZPye6 FdtfC0DzlIYx+zaS3hNyz4yKDRWA X-Google-Smtp-Source: AHgI3IaFWjzmmJjIpKxETFkoD9F70jlYfOqxRxpcB79461TTMwe8+LdgxpycGNTL186FZHjlrsS2Vg== X-Received: by 2002:a1c:c44c:: with SMTP id u73mr8733323wmf.45.1549562290742; Thu, 07 Feb 2019 09:58:10 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Thu, 7 Feb 2019 18:57:16 +0100 Message-Id: <1549562254-41157-34-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1549562254-41157-1-git-send-email-pbonzini@redhat.com> References: <1549562254-41157-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::342 Subject: [Qemu-devel] [PATCH 33/51] ppc: Express dependencies of the Sam460EX machines with kconfig X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: thuth@redhat.com, philmd@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Thomas Huth Most of the dependencies are now directly selected by the SAM460EX switch. We can drop CONFIG_VGA_CIRRUS since this device is already selected automatically when CONFIG_PCI_DEVICES is set. Reviewed-by: BALATON Zoltan Reviewed-by: Paolo Bonzini Signed-off-by: Thomas Huth Signed-off-by: Paolo Bonzini Reviewed-by: Michael S. Tsirkin --- default-configs/ppc-softmmu.mak | 8 -------- hw/display/Kconfig | 1 + hw/ppc/Kconfig | 11 +++++++++++ 3 files changed, 12 insertions(+), 8 deletions(-) diff --git a/default-configs/ppc-softmmu.mak b/default-configs/ppc-softmmu.= mak index caaff60..fb43cba 100644 --- a/default-configs/ppc-softmmu.mak +++ b/default-configs/ppc-softmmu.mak @@ -25,14 +25,6 @@ CONFIG_PCI_EXPRESS=3Dy =20 # For Sam460ex CONFIG_SAM460EX=3Dy -CONFIG_USB_EHCI_SYSBUS=3Dy -CONFIG_SM501=3Dy -CONFIG_IDE_SII3112=3Dy -CONFIG_AT24C=3Dy -CONFIG_BITBANG_I2C=3Dy -CONFIG_M41T80=3Dy -CONFIG_VGA_CIRRUS=3Dy -CONFIG_SMBUS_EEPROM=3Dy =20 # For Macs CONFIG_MAC_OLDWORLD=3Dy diff --git a/hw/display/Kconfig b/hw/display/Kconfig index 0f659e9..69f8a7e 100644 --- a/hw/display/Kconfig +++ b/hw/display/Kconfig @@ -29,6 +29,7 @@ config SII9022 config SSD0303 bool depends on I2C + select DDC =20 config SSD0323 bool diff --git a/hw/ppc/Kconfig b/hw/ppc/Kconfig index fb77151..664fc31 100644 --- a/hw/ppc/Kconfig +++ b/hw/ppc/Kconfig @@ -33,9 +33,20 @@ config PPC440 =20 config PPC4XX bool + select BITBANG_I2C + select PCI =20 config SAM460EX bool + select PFLASH_CFI01 + select IDE_SII3112 + select M41T80 + select PPC440 + select SERIAL + select SM501 + select SMBUS_EEPROM + select USB_EHCI_SYSBUS + select USB_OHCI =20 config PREP bool --=20 1.8.3.1 From nobody Wed Apr 24 17:06:17 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (209.51.188.17 [209.51.188.17]) by mx.zohomail.com with SMTPS id 1549563692109496.5609091204585; Thu, 7 Feb 2019 10:21:32 -0800 (PST) Received: from localhost ([127.0.0.1]:44779 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1groIg-0003aT-1A for importer@patchew.org; Thu, 07 Feb 2019 13:21:26 -0500 Received: from eggs.gnu.org ([209.51.188.92]:57730) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1grnwL-0002PQ-CR for qemu-devel@nongnu.org; Thu, 07 Feb 2019 12:58:22 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1grnwE-0002TE-SK for qemu-devel@nongnu.org; Thu, 07 Feb 2019 12:58:18 -0500 Received: from mail-wr1-x443.google.com ([2a00:1450:4864:20::443]:39764) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1grnwD-0002Ra-1Z for qemu-devel@nongnu.org; Thu, 07 Feb 2019 12:58:13 -0500 Received: by mail-wr1-x443.google.com with SMTP id t27so816129wra.6 for ; Thu, 07 Feb 2019 09:58:12 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id q12sm12708982wmf.2.2019.02.07.09.58.10 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 07 Feb 2019 09:58:11 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=FRCVVKxniD6tjASRcRoY0CgWI47VOBq60r2yT2MUxpE=; b=mFSXloF7mHNPsL+loc1Cay5ZPajSYW/qm7Ug3LUn/8Dc9bzlDIWlqdEApgbwihrJde B8IqWActqv8FkPnV5UiJ1vIJAiLbJWiCGv0ziT4VgRj4euT4C5o3jD6vmnUwjjyIcbcO hKWP+RSSLrTKT54xiKwFCnfFH0RrNSIr28sP51AzpwPGTZaODk3aYjdxujqwEM20D2aK q8+pmva3vN7GbnMv8j5vArzR2Yz9wfyAljJTniv4JcJ6JoVo2tY4j5JzDYJRipuP4VJB EpztkNTjPKFZNyUGwUh0NwCMo9k82ALoXGeO0OcPhceLbjE+cIL4nMYHgXPRriihdfZq S4yw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=FRCVVKxniD6tjASRcRoY0CgWI47VOBq60r2yT2MUxpE=; b=J5k1V4HCOpvbtlq91IozXPNT4eSCj6myt5JWSFSYdX8Uxpur2fJjJHEHSiGvPlcqtn /UDxnbKCjlcC3hVsINwUt4Y5JJQWjKMirbREVEmiofCL6w1RcgMVtDBPHVsupUHTA9Ir KuJZTCyDvD9TucXuYc4JMtT7VK6EORPSTe/x9ko8VEPAwvO1Vm0ttro5xtMEGFUB64BM WSjvKekL6Id4l0DAA3B0t8XBkBI8G+GUo1sUakyoJRaJJezMN2qUWFEJso8xpdH8Loos sYpenHeFoyoDwOn6UUCpyTmHOANnMa883Lm0Pv56gfM3/HH1/w73mTDMtnm4lI09ImdB fX7Q== X-Gm-Message-State: AHQUAubF+QLvpTJFQdFniNhkolMl4FRMX0urAv0lWJhK4wBKN7+yINiN 3gzVYZNUHT5KXQnfKJFstBwqTulW X-Google-Smtp-Source: AHgI3IaAQb/Jv4FJD8fOWW9LuaEhjP8uyiyxrp8RH51hX6VLXjoMM3BLVsyzS8wl8CK2H3ne8hpyyQ== X-Received: by 2002:adf:dbcb:: with SMTP id e11mr13758964wrj.58.1549562291657; Thu, 07 Feb 2019 09:58:11 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Thu, 7 Feb 2019 18:57:17 +0100 Message-Id: <1549562254-41157-35-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1549562254-41157-1-git-send-email-pbonzini@redhat.com> References: <1549562254-41157-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::443 Subject: [Qemu-devel] [PATCH 34/51] ppc: Express dependencies of the embedded machines with kconfig X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: thuth@redhat.com, philmd@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Thomas Huth This makes it much easier if the users want to disable some of the embedded machines for their builds. Reviewed-by: Paolo Bonzini Signed-off-by: Thomas Huth Signed-off-by: Paolo Bonzini Reviewed-by: Michael S. Tsirkin --- default-configs/ppc-softmmu.mak | 17 ----------------- hw/ppc/Kconfig | 19 +++++++++++++++++++ 2 files changed, 19 insertions(+), 17 deletions(-) diff --git a/default-configs/ppc-softmmu.mak b/default-configs/ppc-softmmu.= mak index fb43cba..6ea36d4 100644 --- a/default-configs/ppc-softmmu.mak +++ b/default-configs/ppc-softmmu.mak @@ -1,27 +1,10 @@ # Default configuration for ppc-softmmu =20 -CONFIG_ISA_BUS=3Dy -CONFIG_PCI=3Dy -CONFIG_PCI_DEVICES=3Dy -CONFIG_TEST_DEVICES=3Dy - # For embedded PPCs: -CONFIG_PPC4XX=3Dy -CONFIG_M48T59=3Dy -CONFIG_SERIAL=3Dy -CONFIG_OPENPIC=3Dy -CONFIG_PPCE500_PCI=3Dy -CONFIG_PFLASH_CFI01=3Dy -CONFIG_PFLASH_CFI02=3Dy -CONFIG_XILINX=3Dy -CONFIG_XILINX_ETHLITE=3Dy CONFIG_E500=3Dy -CONFIG_PLATFORM_BUS=3Dy -CONFIG_ETSEC=3Dy CONFIG_PPC405=3Dy CONFIG_PPC440=3Dy CONFIG_VIRTEX=3Dy -CONFIG_PCI_EXPRESS=3Dy =20 # For Sam460ex CONFIG_SAM460EX=3Dy diff --git a/hw/ppc/Kconfig b/hw/ppc/Kconfig index 664fc31..f57d107 100644 --- a/hw/ppc/Kconfig +++ b/hw/ppc/Kconfig @@ -27,9 +27,18 @@ config POWERNV =20 config PPC405 bool + select M48T59 + select PFLASH_CFI02 + select PPC4XX + select SERIAL =20 config PPC440 bool + imply PCI_DEVICES + imply TEST_DEVICES + select PCI_EXPRESS + select PPC4XX + select SERIAL =20 config PPC4XX bool @@ -87,9 +96,19 @@ config MAC_NEWWORLD =20 config E500 bool + imply AT24C + select ETSEC + select OPENPIC + select PLATFORM_BUS + select PPCE500_PCI + select SERIAL =20 config VIRTEX bool + select PFLASH_CFI01 + select SERIAL + select XILINX + select XILINX_ETHLITE =20 config XIVE bool --=20 1.8.3.1 From nobody Wed Apr 24 17:06:17 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1549563874763837.462033248337; Thu, 7 Feb 2019 10:24:34 -0800 (PST) Received: from localhost ([127.0.0.1]:44805 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1groLf-0005y9-Jp for importer@patchew.org; Thu, 07 Feb 2019 13:24:31 -0500 Received: from eggs.gnu.org ([209.51.188.92]:57742) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1grnwP-0002Sz-3j for qemu-devel@nongnu.org; Thu, 07 Feb 2019 12:58:25 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1grnwL-0002Vx-DZ for qemu-devel@nongnu.org; Thu, 07 Feb 2019 12:58:23 -0500 Received: from mail-wr1-x443.google.com ([2a00:1450:4864:20::443]:41691) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1grnwH-0002SY-LQ for qemu-devel@nongnu.org; Thu, 07 Feb 2019 12:58:19 -0500 Received: by mail-wr1-x443.google.com with SMTP id x10so804787wrs.8 for ; Thu, 07 Feb 2019 09:58:13 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id q12sm12708982wmf.2.2019.02.07.09.58.11 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 07 Feb 2019 09:58:11 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=aUKz4PWJwhePpSywRhOheggZUFsmHsEDVJrwz73oHT4=; b=NVnDqgATDvGQQ5W3VuucS5vN9eIw/YXG0TLSgJwBLSWYl4MoYtsUNXIU2GwL+hQQRU nBDlOXD5Qr/DVUqm4V5mcRoIF22nyLPN8ul1Xb/yHIIvxsKuzDh9XMd0TO7GU+bYOnNf dwIT+7opcwl87rCTb+Vz33z+4RdfU1WFOgKbfQdOggv+vtINt+5bs9SMwItW9Y7o6UlO SY02iDMXTfw2JPTJ/JGjNQjwg2D5Mmqc73891Afz3bWH+GpkhWp0tgkJlShdTvtukNv5 m7YO4re4r6+cR2eWOdKsUxRQ4QGe04au+2z5mhazoNYq2dEL8AgOjRVLqWApv0/oS4CW mw6g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=aUKz4PWJwhePpSywRhOheggZUFsmHsEDVJrwz73oHT4=; b=GonSGP+XnKOktni2vwFARbHyxoUOmjJkTPmlqOppKV8/54+Z9U90dimrMMEhic9FyP 9nYMnKKesWiSHUMNXj587BYZaMUjRH31i0bkPhTlBOKB08xjMv5T8LZrpAtwDVcSHs6X gHXV3psiuQiLax0mQ3l3xLi45CfScbJ86O74Q43piXtgPt8wk/6uwbszrAXYNpTyWnUR WuzSuYgWI/2PZo8ceArwRKhfGbY5HMZzVaiVCD61bM0prsyp/7AR0xdyebvD49u1upT5 WfYNS3pqg1l9VPQvcQIHTofv8w0EhA6ghLa1q9a9SbGiRAKhbl6lEil6grksg7LcKpBm 9fZQ== X-Gm-Message-State: AHQUAuZ+OMHvnnprt8UIlJLK1akEObMMg5sRe7sIcxzIHRB/Kxp4xFCA nRTAB2eXjtEY3KsnUuY/5nLGt8cp X-Google-Smtp-Source: AHgI3IZYd4SIut0Yk8zuTTDmR3yTc6OtfBZGhGLQQDg6ippbN8EDylpz6X9dq3O1bR3WOW6Tt0mEWw== X-Received: by 2002:a5d:528d:: with SMTP id c13mr13639056wrv.153.1549562292602; Thu, 07 Feb 2019 09:58:12 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Thu, 7 Feb 2019 18:57:18 +0100 Message-Id: <1549562254-41157-36-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1549562254-41157-1-git-send-email-pbonzini@redhat.com> References: <1549562254-41157-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::443 Subject: [Qemu-devel] [PATCH 35/51] alpha-softmmu.mak: express dependencies with Kconfig X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: thuth@redhat.com, philmd@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" %-softmmu.mak only keep boards and optional device definitions in Kconfig mode. Signed-off-by: Paolo Bonzini Reviewed-by: Michael S. Tsirkin --- default-configs/alpha-softmmu.mak | 19 +++++++------------ hw/alpha/Kconfig | 10 ++++++++++ 2 files changed, 17 insertions(+), 12 deletions(-) diff --git a/default-configs/alpha-softmmu.mak b/default-configs/alpha-soft= mmu.mak index 762e3a2..d186fe8 100644 --- a/default-configs/alpha-softmmu.mak +++ b/default-configs/alpha-softmmu.mak @@ -1,15 +1,10 @@ # Default configuration for alpha-softmmu =20 -CONFIG_PCI=3Dy -CONFIG_PCI_DEVICES=3Dy -CONFIG_I82374=3Dy -CONFIG_I8254=3Dy -CONFIG_PCKBD=3Dy -CONFIG_VGA_CIRRUS=3Dy -CONFIG_VMWARE_VGA=3Dy -CONFIG_IDE_CMD646=3Dy -CONFIG_I8259=3Dy -CONFIG_MC146818RTC=3Dy -CONFIG_TEST_DEVICES=3Dy -CONFIG_SMC37C669=3Dy +# Uncomment the following lines to disable these optional devices: +# +#CONFIG_PCI_DEVICES=3Dn +#CONFIG_TEST_DEVICES=3Dn + +# Boards: +# CONFIG_DP264=3Dy diff --git a/hw/alpha/Kconfig b/hw/alpha/Kconfig index c5d0438..22cefd9 100644 --- a/hw/alpha/Kconfig +++ b/hw/alpha/Kconfig @@ -1,2 +1,12 @@ config DP264 bool + imply PCI_DEVICES + imply TEST_DEVICES + select I82374 + select I8254 + select I8259 + select IDE_CMD646 + select MC146818RTC + select PCI + select PCKBD + select SMC37C669 --=20 1.8.3.1 From nobody Wed Apr 24 17:06:17 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (209.51.188.17 [209.51.188.17]) by mx.zohomail.com with SMTPS id 1549565004790868.1656161531154; Thu, 7 Feb 2019 10:43:24 -0800 (PST) Received: from localhost ([127.0.0.1]:45087 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1grodn-00049g-PD for importer@patchew.org; Thu, 07 Feb 2019 13:43:15 -0500 Received: from eggs.gnu.org ([209.51.188.92]:57778) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1grnwQ-0002Ud-Vm for qemu-devel@nongnu.org; Thu, 07 Feb 2019 12:58:27 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1grnwP-0002XX-0u for qemu-devel@nongnu.org; Thu, 07 Feb 2019 12:58:25 -0500 Received: from mail-wm1-x342.google.com ([2a00:1450:4864:20::342]:50596) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1grnwL-0002T0-CO for qemu-devel@nongnu.org; Thu, 07 Feb 2019 12:58:22 -0500 Received: by mail-wm1-x342.google.com with SMTP id z5so831256wmf.0 for ; Thu, 07 Feb 2019 09:58:14 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id q12sm12708982wmf.2.2019.02.07.09.58.12 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 07 Feb 2019 09:58:12 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=BUsqquIZJrlCQabIGdZTGsTywcrHXoqrL8qgsUEd0Ao=; b=SzWilVReBMqpnjuo2CheKtjPnXeRAjvtHpD2visRk2BxbZtNhx18XqS9ZS6SnVTIwV iBgG9WBunmEScGp8Mh+2VvR83Heh5IglaH9kIk81f38cnUMPSXw/vLkD79fgz9GMKada 8rQxaI2sc4JmzsjiT/tXowxaoV8B7mtG8NTde9ZGLnrsPCyQL+FARWenTuKEAKTiooQj t+Ah45jvYfY7mnCs7N99s5k57k6D0TVL4yKv6L4bUJ3tQUidtqXldji1IxalpoTn+Oh9 gJi3D6NH5qZ141e8bip5qklHj/FerFf9ay9jXPWsjzKuyYMp9oUOoFJqgnMhYKiVKIlh skEQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=BUsqquIZJrlCQabIGdZTGsTywcrHXoqrL8qgsUEd0Ao=; b=g6vLjBnKEVw8jWbvDP6ETT3C22VOQYk+BjKiW+8QUgTz9ebK3eidsQYLVemdQbDkok +r7PhdpMhVTNMI/xc4uMeX7AHpF5xANLC8AQBA4bd3MN9rz+ejJ6d/u7iEi6z7rCimCN Tjrg4prISHXI/EjYhrIRyTC1dF2kVwhiUKQOIbCC2PVNTGavCuzWIuJ+RHHwVQxaMq4w oGUvkE42jrMgCwPE4UD4Saijzfijfd+avoizQNgUFeOcfl9W2pnvW6X7PH4y8dCK8wmG mpW/kCsm1q5OE4x4QMboncSNGYp9uJufpI617BM9sif4FZRrxDscOVqV/700drtUM04e Hkqg== X-Gm-Message-State: AHQUAuZowJXKSaUNqzWQfBZtKCgSYQFPpRWQ5uljdGi+igjf8C304naC 1UI7LFJXMUBP4tjoJvsEt8+9JyK1 X-Google-Smtp-Source: AHgI3IZL6WgeJ2VPIahvyhHQN0PuUcnwyQnTEuQcNM+xEa1cgSzI8joJT89dEo50+qyd167sFp3uGw== X-Received: by 2002:a1c:f509:: with SMTP id t9mr8862367wmh.76.1549562293544; Thu, 07 Feb 2019 09:58:13 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Thu, 7 Feb 2019 18:57:19 +0100 Message-Id: <1549562254-41157-37-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1549562254-41157-1-git-send-email-pbonzini@redhat.com> References: <1549562254-41157-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::342 Subject: [Qemu-devel] [PATCH 36/51] cris-softmmu.mak: express dependencies with Kconfig X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: thuth@redhat.com, philmd@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" %-softmmu.mak only keep boards and optional device definitions in Kconfig mode. Signed-off-by: Paolo Bonzini Reviewed-by: Michael S. Tsirkin --- default-configs/cris-softmmu.mak | 5 ++--- hw/cris/Kconfig | 3 +++ 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/default-configs/cris-softmmu.mak b/default-configs/cris-softmm= u.mak index b3cae59..5932cf4 100644 --- a/default-configs/cris-softmmu.mak +++ b/default-configs/cris-softmmu.mak @@ -1,6 +1,5 @@ # Default configuration for cris-softmmu =20 -CONFIG_ETRAXFS=3Dy -CONFIG_NAND=3Dy -CONFIG_PFLASH_CFI02=3Dy +# Boards: +# CONFIG_AXIS=3Dy diff --git a/hw/cris/Kconfig b/hw/cris/Kconfig index b7738ab..884ad2c 100644 --- a/hw/cris/Kconfig +++ b/hw/cris/Kconfig @@ -1,5 +1,8 @@ config AXIS bool + select ETRAXFS + select PFLASH_CFI02 + select NAND =20 config ETRAXFS bool --=20 1.8.3.1 From nobody Wed Apr 24 17:06:17 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (209.51.188.17 [209.51.188.17]) by mx.zohomail.com with SMTPS id 1549563722446852.3863899069287; Thu, 7 Feb 2019 10:22:02 -0800 (PST) Received: from localhost ([127.0.0.1]:44788 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1groJD-00041P-BF for importer@patchew.org; Thu, 07 Feb 2019 13:21:59 -0500 Received: from eggs.gnu.org ([209.51.188.92]:57784) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1grnwR-0002Us-5V for qemu-devel@nongnu.org; Thu, 07 Feb 2019 12:58:27 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1grnwP-0002Xv-4s for qemu-devel@nongnu.org; Thu, 07 Feb 2019 12:58:26 -0500 Received: from mail-wm1-x342.google.com ([2a00:1450:4864:20::342]:34232) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1grnwL-0002TQ-EP for qemu-devel@nongnu.org; Thu, 07 Feb 2019 12:58:23 -0500 Received: by mail-wm1-x342.google.com with SMTP id y185so4952428wmd.1 for ; Thu, 07 Feb 2019 09:58:15 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id q12sm12708982wmf.2.2019.02.07.09.58.13 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 07 Feb 2019 09:58:13 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=NeY5hQS/dM+EQxDe37MjDjW2RdFDN4s8f7fdlCMOsYo=; b=okx8HYHPy5wyX2Rpk9STk0xMcVJJ6TFdJ3y/7323zeBkvUNAtjPxVNez1K7RhEaBDc Ej1CO30STLct2ulBjV4arChG/IimhANPJUFnsyMWsy5jtFd9Q7K6YRVV7bhw0BaVTopY JD4ab4EipJzjyoGLKrOpqynk1BQjSDw4JfmRu8D8MFdnZFNPFsE+tKEQSQhZEe4he3W+ 5Bs/HQkmq+B8+FcGFYzGd8F0l8pltoYlViBSPkN2nzz6khTlyEJcJ8XwBFvMIrYdqmkz Yvws+QKOrISIkRcx1t8+MwSZjJTCXXli13qv9OnSDQ3gdzsuzB99OYKIaFgYggO2+RXA Ap1A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=NeY5hQS/dM+EQxDe37MjDjW2RdFDN4s8f7fdlCMOsYo=; b=gT1/p4bJ7feIGMCbaFgxIp+OWkIU3wIF9Hfri1djtDyYlDt6bAT748nJ2iCYNWmDsW Wu2SFnNHuh7K6HBRoBh5/fpP6NaBTvuwcMhusqfPYdT+cjfHwaiazd1aM2qAa1sfz0wV VlGatrqPvuxaL4dNOZavmTYiEajleRClpx5b+LzkmXeYIZubJIrUoibwfbgg3iq5x9WW 0pOhNWCzYog8KV9yAkmCrCnWJiQNpUjpxaW4YMvVONGW8NcO+rHPIeB2DNY4c/zJgfhL GZxhDDNciMkS0sE8+575f5KwcXeXoqDx9agbwG0fk7GV1zlZ3YXjtikCAdY789rtylvb oqdQ== X-Gm-Message-State: AHQUAuYDhvDjq1pA62dgys2OAXeW+J0l9KdqCxlYR1yoLUmB2GRSUSn3 O7F0GYi8EWsspg/0/pcrYvb9QE23 X-Google-Smtp-Source: AHgI3IZhygxkIBufYMtiYKB8fMw3rSsAEixMBN0nvGRLO/Y2o69bE3W6ms6/LK0LPLkSBKOPawnFLQ== X-Received: by 2002:a1c:9e4a:: with SMTP id h71mr8648623wme.82.1549562294443; Thu, 07 Feb 2019 09:58:14 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Thu, 7 Feb 2019 18:57:20 +0100 Message-Id: <1549562254-41157-38-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1549562254-41157-1-git-send-email-pbonzini@redhat.com> References: <1549562254-41157-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::342 Subject: [Qemu-devel] [PATCH 37/51] hppa-softmmu.mak: express dependencies with Kconfig X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: thuth@redhat.com, philmd@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" %-softmmu.mak only keep boards and optional device definitions in Kconfig mode. Note that the Dino board uses a memory mapped 16550 UART and therefore only CONFIG_SERIAL is needed, not CONFIG_SERIAL_ISA. Signed-off-by: Paolo Bonzini Reviewed-by: Michael S. Tsirkin --- default-configs/hppa-softmmu.mak | 20 ++++++++------------ hw/hppa/Kconfig | 8 ++++++++ 2 files changed, 16 insertions(+), 12 deletions(-) diff --git a/default-configs/hppa-softmmu.mak b/default-configs/hppa-softmm= u.mak index b7f2b43..b64c5eb 100644 --- a/default-configs/hppa-softmmu.mak +++ b/default-configs/hppa-softmmu.mak @@ -1,13 +1,9 @@ -CONFIG_PCI=3Dy -CONFIG_PCI_DEVICES=3Dy -CONFIG_SERIAL=3Dy -CONFIG_SERIAL_ISA=3Dy -CONFIG_ISA_BUS=3Dy -CONFIG_I8259=3Dy -CONFIG_E1000_PCI=3Dy -CONFIG_IDE_CMD646=3Dy -# CONFIG_IDE_MMIO=3Dy -CONFIG_LSI_SCSI_PCI=3Dy -CONFIG_VIRTIO_VGA=3Dy -CONFIG_MC146818RTC=3Dy +# Default configuration for hppa-softmmu + +# Uncomment the following lines to disable these optional devices: +# +#CONFIG_PCI_DEVICES=3Dn + +# Boards: +# CONFIG_DINO=3Dy diff --git a/hw/hppa/Kconfig b/hw/hppa/Kconfig index 5ce48ef..2d9b072 100644 --- a/hw/hppa/Kconfig +++ b/hw/hppa/Kconfig @@ -1,2 +1,10 @@ config DINO bool + imply PCI_DEVICES + select PCI + select SERIAL + select ISA_BUS + select I8259 + select IDE_CMD646 + select MC146818RTC + select LSI_SCSI_PCI --=20 1.8.3.1 From nobody Wed Apr 24 17:06:17 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1549564154728446.36988425200093; Thu, 7 Feb 2019 10:29:14 -0800 (PST) Received: from localhost ([127.0.0.1]:44875 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1groQB-0001ME-C0 for importer@patchew.org; Thu, 07 Feb 2019 13:29:11 -0500 Received: from eggs.gnu.org ([209.51.188.92]:57807) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1grnwS-0002WW-S1 for qemu-devel@nongnu.org; Thu, 07 Feb 2019 12:58:29 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1grnwP-0002YV-Q0 for qemu-devel@nongnu.org; Thu, 07 Feb 2019 12:58:26 -0500 Received: from mail-wm1-x344.google.com ([2a00:1450:4864:20::344]:52274) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1grnwN-0002Td-6D for qemu-devel@nongnu.org; Thu, 07 Feb 2019 12:58:25 -0500 Received: by mail-wm1-x344.google.com with SMTP id m1so822942wml.2 for ; Thu, 07 Feb 2019 09:58:16 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id q12sm12708982wmf.2.2019.02.07.09.58.14 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 07 Feb 2019 09:58:14 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=faxVAY4o4cHqUAxGWK0jA9OUdrWkZhCDwqQLA8A1pyQ=; b=antzGnmTM4lUlAjKOtwv2u7tLdEN7GXFj9SbBcfo0H/xO5/J0FXCrAEjxQMWltJBbJ JeAVnOnCd5BZHOvMTJ8DdGb3jEYidWYzPP63TK1KeRvb2LZufF1o2g36oIKnw/sDZoEZ bVf6RmZLbc5i3Pb63qK8nI1lLVwtB7SXIDfH8qrWpi6NurcVZIf+Av4uiP3AmXbx6ZGS KRX1dlJ1IIWN/zW5EzJK56+Kf0T7/w+8stZb1Qw/ntV/dPQGaUsBDRFqCqVDwWUWUKQR aBtJDfRspMJuviBHxYT8tTMIFZafsg1soaOEkRZ9fR0kwVjP0vmsi397Ndr4pkSNW7aZ W3jQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=faxVAY4o4cHqUAxGWK0jA9OUdrWkZhCDwqQLA8A1pyQ=; b=BSQBZkjAc23rXvSxuKdUNSBiYCOxHBTBG4bVl15DQqjRe/LfSAAx1hxn8JRbDR/i37 ecoTM/C7sAOBff6+ZiSED01z+SLXOzt4ZhA4C8QK/bswoqmXy5Hfk6oyguPtQfPSm+Ik JkA6zpOpcyl2UusTZBp1UixUtPaI2B+1XvD4imWVfWTJaEWdr/46wOH9njxRO+od0hv1 MwN/S29P6OqqUNzveMozTcz6xlk2IXPa1wBnzmEFBscJ9J8VeLgnMjNiYRhDsIjhl0EA XYRMQdFAFwZroMAJYB+2Pno1LVHGk9Lfu09yD95F+3QS4f/fDY4/dCr980i0eT3k7H7n 0t6w== X-Gm-Message-State: AHQUAubpDjDPWPOCgWKvOP3YDva5/UbSizKJOxiOvf3fXAdWqgZDsOB8 mY2QOw5yiiNtfWdYWsnrhxFDsYRC X-Google-Smtp-Source: AHgI3IaoIDfzRWfFcD0NSOV54/Nq8OipxM3pAdcbWJnA/e+Nxz/mxo8zrsq4yMBEFlPF6KI0JMdV6A== X-Received: by 2002:a7b:c945:: with SMTP id i5mr8631847wml.33.1549562295442; Thu, 07 Feb 2019 09:58:15 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Thu, 7 Feb 2019 18:57:21 +0100 Message-Id: <1549562254-41157-39-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1549562254-41157-1-git-send-email-pbonzini@redhat.com> References: <1549562254-41157-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::344 Subject: [Qemu-devel] [PATCH 38/51] lm32-softmmu.mak: express dependencies with Kconfig X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: thuth@redhat.com, philmd@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" %-softmmu.mak only keep boards and optional device definitions in Kconfig mode. Signed-off-by: Paolo Bonzini Reviewed-by: Michael S. Tsirkin --- default-configs/lm32-softmmu.mak | 10 ++++++---- hw/display/Kconfig | 3 +-- hw/lm32/Kconfig | 6 ++++++ 3 files changed, 13 insertions(+), 6 deletions(-) diff --git a/default-configs/lm32-softmmu.mak b/default-configs/lm32-softmm= u.mak index f489838..6d25966 100644 --- a/default-configs/lm32-softmmu.mak +++ b/default-configs/lm32-softmmu.mak @@ -1,8 +1,10 @@ # Default configuration for lm32-softmmu =20 +# Uncomment the following lines to disable these optional devices: +# +#CONFIG_MILKYMIST_TMU2=3Dn # disabling it actually causes compile-t= ime failures + +# Boards: +# CONFIG_LM32=3Dy CONFIG_MILKYMIST=3Dy -CONFIG_FRAMEBUFFER=3Dy -CONFIG_PFLASH_CFI01=3Dy -CONFIG_PFLASH_CFI02=3Dy -CONFIG_SD=3Dy diff --git a/hw/display/Kconfig b/hw/display/Kconfig index 69f8a7e..ee3acd9 100644 --- a/hw/display/Kconfig +++ b/hw/display/Kconfig @@ -71,8 +71,7 @@ config FRAMEBUFFER =20 config MILKYMIST_TMU2 bool - default y - depends on OPENGL && X11 && MILKYMIST + depends on OPENGL && X11 =20 config SM501 bool diff --git a/hw/lm32/Kconfig b/hw/lm32/Kconfig index 4f45840..3d09c2d 100644 --- a/hw/lm32/Kconfig +++ b/hw/lm32/Kconfig @@ -1,7 +1,13 @@ config LM32 bool select PTIMER + select PFLASH_CFI02 =20 config MILKYMIST bool + # FIXME: disabling it results in compile-time errors + select MILKYMIST_TMU2 if OPENGL && X11 select PTIMER + select PFLASH_CFI01 + select FRAMEBUFFER + select SD --=20 1.8.3.1 From nobody Wed Apr 24 17:06:17 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1549563521117348.0492106195733; Thu, 7 Feb 2019 10:18:41 -0800 (PST) Received: from localhost ([127.0.0.1]:44735 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1groFy-0001VS-1S for importer@patchew.org; Thu, 07 Feb 2019 13:18:38 -0500 Received: from eggs.gnu.org ([209.51.188.92]:57781) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1grnwR-0002Uj-08 for qemu-devel@nongnu.org; Thu, 07 Feb 2019 12:58:27 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1grnwP-0002Xs-4t for qemu-devel@nongnu.org; Thu, 07 Feb 2019 12:58:26 -0500 Received: from mail-wr1-x441.google.com ([2a00:1450:4864:20::441]:33064) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1grnwL-0002Tz-Dr for qemu-devel@nongnu.org; Thu, 07 Feb 2019 12:58:23 -0500 Received: by mail-wr1-x441.google.com with SMTP id a16so868641wrv.0 for ; Thu, 07 Feb 2019 09:58:17 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id q12sm12708982wmf.2.2019.02.07.09.58.15 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 07 Feb 2019 09:58:15 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=PSoXYbR02XTv2fuRf82F4HlUk7Zvkrr/kPlrCVfdBHI=; b=khFx5Lp4ixmGzi7NEiopE208sWO/lK7+XoT/G8pG8czZqM5eStOeSrKbrbcTwu7LuW +ryYW+wKMSScJKMqBWJbQS3Es44D5iQxUZ897soUXh0irg7Y+lokpNenFcayVsAzmMDp yqlxJ8A7U/CgDIAGvvCre5M2VmNejgo1Nv7J+FnkDEiAUzgQRYoeRSQzy2wIJwjiLTxS koJ8L4m8cM8AY1aacIBOqfazWQZnAwbypKWAhzq9AvMbvYagJWg39V+YiJZo+QV3/ww9 0jbExbzdnBleM6jrmjgigPd4uqQjBe//3Cj+AAIKWuS73U95s12ECs/FKhvmD0mT/6sX OQQg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=PSoXYbR02XTv2fuRf82F4HlUk7Zvkrr/kPlrCVfdBHI=; b=GyBPqF5BIaeIBj8gh8sjkGe+n12bFsEDzbUUPOJilzWD1jU5mQ8CLmCYDD3CsPRpQn WAhiMa9/gH81woOSMZfQ8yyo5jmdTv6oLkCAW2wCV75RGveBto0r+3Ru1LosX/YO4Aya 1X1PSgAZM784i1qb7yW9OCvB2009rACOZi4aYRB0wWDbHwKWe4/EFuoF6JPU932CkKx7 ighE2S8UDEQ4QbTYJodR8npvbqgFrakX5UicX3aX/13w/9uQfD4m1/DPHXL0YDUveJ9I uJi6GrvqVTxjJLCP0fzZmhf7pcmbgmaBmGclYwDL/V8Hi5cP1NSYgo+ynb+rA9CwghUn clIA== X-Gm-Message-State: AHQUAuYHbl9oPH/WmPnB+VI9rTjjR09M/XbEoXVgd5oHmtjAQwV3nZv2 +3wCqRvqBg6WVvSPquK8ColG2PAc X-Google-Smtp-Source: AHgI3IZEBoDhQtkA9/xPxBe4m7j7ucO6rgLzDY8OyedazX7GmkQo8UesQmNqoSxHrBZHbys360qTkg== X-Received: by 2002:adf:a78a:: with SMTP id j10mr13474374wrc.191.1549562296188; Thu, 07 Feb 2019 09:58:16 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Thu, 7 Feb 2019 18:57:22 +0100 Message-Id: <1549562254-41157-40-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1549562254-41157-1-git-send-email-pbonzini@redhat.com> References: <1549562254-41157-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::441 Subject: [Qemu-devel] [PATCH 39/51] m68k-softmmu.mak: express dependencies with Kconfig X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: thuth@redhat.com, philmd@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" %-softmmu.mak only keep boards and optional device definitions in Kconfig mode. Signed-off-by: Paolo Bonzini Reviewed-by: Michael S. Tsirkin --- default-configs/m68k-softmmu.mak | 3 ++- hw/m68k/Kconfig | 5 ++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/default-configs/m68k-softmmu.mak b/default-configs/m68k-softmm= u.mak index a12eece..e17495e 100644 --- a/default-configs/m68k-softmmu.mak +++ b/default-configs/m68k-softmmu.mak @@ -1,5 +1,6 @@ # Default configuration for m68k-softmmu =20 -CONFIG_COLDFIRE=3Dy +# Boards: +# CONFIG_AN5206=3Dy CONFIG_MCF5208=3Dy diff --git a/hw/m68k/Kconfig b/hw/m68k/Kconfig index 8e91eda..49ef0b3 100644 --- a/hw/m68k/Kconfig +++ b/hw/m68k/Kconfig @@ -1,10 +1,9 @@ config AN5206 bool - -config MCF5206 - bool + select COLDFIRE select PTIMER =20 config MCF5208 bool + select COLDFIRE select PTIMER --=20 1.8.3.1 From nobody Wed Apr 24 17:06:17 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1549564221698448.890437257626; Thu, 7 Feb 2019 10:30:21 -0800 (PST) Received: from localhost ([127.0.0.1]:44885 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1groRG-0002Qo-LE for importer@patchew.org; Thu, 07 Feb 2019 13:30:18 -0500 Received: from eggs.gnu.org ([209.51.188.92]:57867) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1grnwm-0002ku-SV for qemu-devel@nongnu.org; Thu, 07 Feb 2019 12:58:49 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1grnwe-0002eP-90 for qemu-devel@nongnu.org; Thu, 07 Feb 2019 12:58:42 -0500 Received: from mail-wm1-x342.google.com ([2a00:1450:4864:20::342]:35200) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1grnwX-0002UK-HJ for qemu-devel@nongnu.org; Thu, 07 Feb 2019 12:58:35 -0500 Received: by mail-wm1-x342.google.com with SMTP id t200so845064wmt.0 for ; Thu, 07 Feb 2019 09:58:18 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id q12sm12708982wmf.2.2019.02.07.09.58.16 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 07 Feb 2019 09:58:16 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=vqci00vRae1XGfirQMhJ3EJu8kT0U4p53PVWDecRAfE=; b=rO1DKCEuczXdNXJkuwjSwS+c86m3Sk1P/6HqK7p8mZJUNUVx0IAgZuENnaMski+4tD +xEbGQu78ugyQxcp+VXdUdX7LudXqdSVNzTdSdtnotIU5ueN7VnTlOfkYJFPHhnHTygk VxJ2EirAYfv8gfylBsspVWW0AVDKfWQedxAGiMjX6a+i9afTb3iImRCVG4NsLh78m4mV R7hAsQxHGt+rfuY24Dfo/Cyaa4mITXSKFi2x8+7+tnxpnprGvin4WE1tVmFuQzVytqcD uzZSQTaZMYF247yG2t7g00cnH158hW1bkMn8kqf6JFGkf2017ZzzQm9udQor86LYeyNl VuuA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=vqci00vRae1XGfirQMhJ3EJu8kT0U4p53PVWDecRAfE=; b=ZWNTvHZSUYcWZLDUgxf4BdPcGOTh84mYBH0+lkZ+qcsvBQPH55eugmGFIQOjZg+nvV H2kcIRuyHn48ovxwrg/VolvRLrVOByy3lOk9732TJSZ0HqUS/33mfEU8UWvr+C3xAAP1 tDowbCjBFC5ievj/oHtiSmA/NMBVJ+JNGObv3pn53609IHuOYwK9NbbU/qL2Rjjg8JuS CXMclRka3E1L0beFocjx0URXHRW73vxq4Qp9o8rALu89aDen4UIV2haZ40SRjBQQG9iQ 6eTHptgfvx/irnt6FPL54XXDWPdGQ6crDuB0VXxQusQ2nEVsN3nK3wmcNEHyR5slIkKM 9hGA== X-Gm-Message-State: AHQUAuasOR1hbOD7a6d51fYj4/cjQtPrX5o5L6i9A2sq5EKUNveiXDOt VzaKvYav9BYDJSoWLOBtVN2W0btH X-Google-Smtp-Source: AHgI3IbrCg6WBuHZP9ffA9qPPXs+vYcFKRXM6eDJY33sYNPfh9Xa7sWAKmhNZqM/PNeb0Eia0K8rAw== X-Received: by 2002:a1c:44d6:: with SMTP id r205mr8677390wma.50.1549562297109; Thu, 07 Feb 2019 09:58:17 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Thu, 7 Feb 2019 18:57:23 +0100 Message-Id: <1549562254-41157-41-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1549562254-41157-1-git-send-email-pbonzini@redhat.com> References: <1549562254-41157-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::342 Subject: [Qemu-devel] [PATCH 40/51] microblaze-softmmu.mak: express dependencies with Kconfig X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: thuth@redhat.com, philmd@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" %-softmmu.mak only keep boards and optional device definitions in Kconfig mode. Signed-off-by: Paolo Bonzini Reviewed-by: Michael S. Tsirkin --- default-configs/microblaze-softmmu.mak | 10 ++-------- hw/microblaze/Kconfig | 12 ++++++++++++ 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/default-configs/microblaze-softmmu.mak b/default-configs/micro= blaze-softmmu.mak index 7140ef3..db8c6e4 100644 --- a/default-configs/microblaze-softmmu.mak +++ b/default-configs/microblaze-softmmu.mak @@ -1,13 +1,7 @@ # Default configuration for microblaze-softmmu =20 -CONFIG_PFLASH_CFI01=3Dy -CONFIG_SERIAL=3Dy -CONFIG_XILINX=3Dy -CONFIG_XILINX_AXI=3Dy -CONFIG_XILINX_SPI=3Dy -CONFIG_XILINX_ETHLITE=3Dy -CONFIG_SSI_M25P80=3Dy -CONFIG_XLNX_ZYNQMP=3Dy +# Boards: +# CONFIG_PETALOGIX_S3ADSP1800=3Dy CONFIG_PETALOGIX_ML605=3Dy CONFIG_XLNX_ZYNQMP_PMU=3Dy diff --git a/hw/microblaze/Kconfig b/hw/microblaze/Kconfig index 44683b2..c4dc120 100644 --- a/hw/microblaze/Kconfig +++ b/hw/microblaze/Kconfig @@ -1,8 +1,20 @@ config PETALOGIX_S3ADSP1800 bool + select PFLASH_CFI01 + select XILINX + select XILINX_AXI + select XILINX_ETHLITE =20 config PETALOGIX_ML605 bool + select PFLASH_CFI01 + select SERIAL + select SSI_M25P80 + select XILINX + select XILINX_AXI + select XILINX_ETHLITE + select XILINX_SPI =20 config XLNX_ZYNQMP_PMU bool + select XLNX_ZYNQMP --=20 1.8.3.1 From nobody Wed Apr 24 17:06:17 2024 Delivered-To: importer@patchew.org Received-SPF: temperror (zoho.com: Error in retrieving data from DNS) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=temperror (zoho.com: Error in retrieving data from DNS) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1549564342334171.06139946040537; Thu, 7 Feb 2019 10:32:22 -0800 (PST) Received: from localhost ([127.0.0.1]:44930 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1groT4-0003ty-9R for importer@patchew.org; Thu, 07 Feb 2019 13:32:10 -0500 Received: from eggs.gnu.org ([209.51.188.92]:57848) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1grnwf-0002gr-Rv for qemu-devel@nongnu.org; Thu, 07 Feb 2019 12:58:45 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1grnwX-0002bw-9Q for qemu-devel@nongnu.org; Thu, 07 Feb 2019 12:58:35 -0500 Received: from mail-wr1-x444.google.com ([2a00:1450:4864:20::444]:41692) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1grnwU-0002Ua-RM for qemu-devel@nongnu.org; Thu, 07 Feb 2019 12:58:32 -0500 Received: by mail-wr1-x444.google.com with SMTP id x10so805085wrs.8 for ; Thu, 07 Feb 2019 09:58:19 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id q12sm12708982wmf.2.2019.02.07.09.58.17 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 07 Feb 2019 09:58:17 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=GDUDe+QjKgxorclZxkkxyem4z2dj9J/Vh7OFrpkEB3g=; b=uugb3NOqeq7pfimVRW54hIATlBBgfKRaPWLJKK1TIagPrfREuRHr9AyyQC+Wj/ums+ 20apnzvGvqqZCOMuweQBLWc31ZwlwJY7sTX66RQ0Th+8MAYa7e62eZ4xZg/bOPvbZkaT yw7WVp11fAXP9H97oI4ZEHrL51j6yDnPgi+scXI3rj5u6BEGCdbL3AR3hUoUhs1Np6wS 8qrCwZ2izwOV4Av/ZLfUqhbAZl5TwoHkK8Dl19OxTVwvCmmLGNkodSbb8x6omHKJ7rWM CBmALFsnILfODE2898bLWfi+BK2NvXFFv/2kndDhKv7V+5CQDOYZLjplRvKASFSOXfkV 3GpA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=GDUDe+QjKgxorclZxkkxyem4z2dj9J/Vh7OFrpkEB3g=; b=NHLuYbq+iwkl5lCm7tDzIu6XpCULCQNh2aY2LAjS8vxHm7uv2+F2mAq6RLkKuIQwTV hxdKFO9SQPlOQCj8wPCo0XkmI9Wj/0/DfoT2P2juHQBkxvdoD14Jrr5j8H5Yxzxjt05i g5mSnxgXcE76ZfF75grfsLhoo85i4QCJCOsScrx4AJUh2mfVOWCG6bPbF1Y74ESv+EGo jOqa7O4hJpBfHFclqbwgCWVYgdE3Ke1cNiaGaDlKP+J1dLlEEDJ8iDXGB88M8xW1nN2O LZIO6TibjLbTAYk9E1axj18Ss7hXJL1W/ed4adbqt1s6C8TI3eVei4oqET/DIXmNmtxB CUoQ== X-Gm-Message-State: AHQUAubZLB+tSahA1OisT+MUHmp1Ptq2MxfpKzDnR4JQfo3OR5gYAJSx 5mmVsq0By879bUuf5xt2r+LVhZRa X-Google-Smtp-Source: AHgI3IY+bvsNCMKKPFhOxQQ/F54BzWg9QnzI3Em9HZ6betIkjdJRKxiKoRVkKmbh2sqHEUZbepIUrw== X-Received: by 2002:adf:ba8d:: with SMTP id p13mr7670520wrg.53.1549562298088; Thu, 07 Feb 2019 09:58:18 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Thu, 7 Feb 2019 18:57:24 +0100 Message-Id: <1549562254-41157-42-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1549562254-41157-1-git-send-email-pbonzini@redhat.com> References: <1549562254-41157-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::444 Subject: [Qemu-devel] [PATCH 41/51] moxie-softmmu.mak: express dependencies with Kconfig X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: thuth@redhat.com, philmd@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" %-softmmu.mak only keep boards and optional device definitions in Kconfig mode. Moxie does not use VGA, ISA or RTC, and only has a memory-mapped serial port. Adjust for the correct dependencies. Signed-off-by: Paolo Bonzini Reviewed-by: Michael S. Tsirkin --- default-configs/moxie-softmmu.mak | 7 ++----- hw/moxie/Kconfig | 1 + 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/default-configs/moxie-softmmu.mak b/default-configs/moxie-soft= mmu.mak index 17ba906..bd50da3 100644 --- a/default-configs/moxie-softmmu.mak +++ b/default-configs/moxie-softmmu.mak @@ -1,8 +1,5 @@ # Default configuration for moxie-softmmu =20 -CONFIG_ISA_BUS=3Dy -CONFIG_MC146818RTC=3Dy -CONFIG_SERIAL=3Dy -CONFIG_SERIAL_ISA=3Dy -CONFIG_VGA=3Dy +# Boards: +# CONFIG_MOXIESIM=3Dy diff --git a/hw/moxie/Kconfig b/hw/moxie/Kconfig index 03f62e3..3793ef0 100644 --- a/hw/moxie/Kconfig +++ b/hw/moxie/Kconfig @@ -1,2 +1,3 @@ config MOXIESIM bool + select SERIAL --=20 1.8.3.1 From nobody Wed Apr 24 17:06:17 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (209.51.188.17 [209.51.188.17]) by mx.zohomail.com with SMTPS id 1549564428883920.7607198063674; Thu, 7 Feb 2019 10:33:48 -0800 (PST) Received: from localhost ([127.0.0.1]:44940 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1groUY-0004tU-Q3 for importer@patchew.org; Thu, 07 Feb 2019 13:33:42 -0500 Received: from eggs.gnu.org ([209.51.188.92]:58060) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1grnwt-0002sn-60 for qemu-devel@nongnu.org; Thu, 07 Feb 2019 12:58:56 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1grnwq-0002jr-KX for qemu-devel@nongnu.org; Thu, 07 Feb 2019 12:58:54 -0500 Received: from mail-wm1-x341.google.com ([2a00:1450:4864:20::341]:51792) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1grnwq-0002VB-8i for qemu-devel@nongnu.org; Thu, 07 Feb 2019 12:58:52 -0500 Received: by mail-wm1-x341.google.com with SMTP id b11so829975wmj.1 for ; Thu, 07 Feb 2019 09:58:20 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id q12sm12708982wmf.2.2019.02.07.09.58.18 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 07 Feb 2019 09:58:18 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=klJ/Hs9ECxa12HZ+XmFOyqcRdDExAPz2E1W/0og8DE4=; b=fG5aNH4noWbxmYykMQdTUhw88Bk3yy429SAA0p9WAhBA8pZpecGPUKaOdD2kk067jC 9iHyfBBfVYnL4dV2siL2MPeYBilzhpYnmPHtEvDzfrgAC3RxDe/9Lsti0imIZb+jYCuG cULBWbnMffFyBDM29QBLXWx2gQONRsZHol2iIKHz2hRLU17Qqv9A5lSeUQ8rkO9I4600 oN8KfhS7JYpfozHyjTJVar75Evqyz/OXbXWPVgrlIf34l0HWRmqUgLadz/pe6/dKHI45 sgKuhABpaSFblKk4akzC/NXgY4HfcJMqyOSOv4Dt9H4CZjELNZHVBVIbH8RBs9H2Zvv3 vy5g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=klJ/Hs9ECxa12HZ+XmFOyqcRdDExAPz2E1W/0og8DE4=; b=BS6L0iRZ/N0l4HkIdwWOX+Tv1GApBwP2pIP9cjtADAuz82D+0k+y/HsttYtPKNSGFB 3z3sysKpYy9dS9u1XOUg4V+/0sal3en4AH/cC4LrHKxj0AqvlOCLAikqjTkOl3uNlK+A xiqXOSpHz+c2su3Q/TiDpSX27/dLaOE8OlDwTPgjARW7F5BGzMaztJFC9U3tolcUtc4l fvRDFxS47hrFtT6m6hewDL5sY90zdt1LGL0ilesEhj0FzW810iJD+xrc9uHi250QqMDI lSBcnQlvs3gFkgiBaGnOnRPtPHp1NA3B2EYMqC4rxG5PwM1fIG333whvVDF8ZAqLn9mq oN9Q== X-Gm-Message-State: AHQUAuZvOXTi35FeHXjci8RBjxD1Ph+QHr377wT+4hsH2F6iUO/RUGoX 5uDi+TSxnHwY/4ETCfKn9RO+fx5Q X-Google-Smtp-Source: AHgI3IZ0qcQNQ3g4zMnm9SK/Cfb5zETOfPFb8hhkSIN8EZXUMp/M+jvwqqDUYxs2F1wNWkXmPBqBfw== X-Received: by 2002:a7b:c144:: with SMTP id z4mr8040089wmi.68.1549562299025; Thu, 07 Feb 2019 09:58:19 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Thu, 7 Feb 2019 18:57:25 +0100 Message-Id: <1549562254-41157-43-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1549562254-41157-1-git-send-email-pbonzini@redhat.com> References: <1549562254-41157-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::341 Subject: [Qemu-devel] [PATCH 42/51] nios2-softmmu.mak: express dependencies with Kconfig X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: thuth@redhat.com, philmd@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" %-softmmu.mak only keep boards and optional device definitions in Kconfig mode. Signed-off-by: Paolo Bonzini Reviewed-by: Michael S. Tsirkin --- default-configs/nios2-softmmu.mak | 5 ++--- hw/nios2/Kconfig | 3 +++ 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/default-configs/nios2-softmmu.mak b/default-configs/nios2-soft= mmu.mak index b3c507e..e11dc54 100644 --- a/default-configs/nios2-softmmu.mak +++ b/default-configs/nios2-softmmu.mak @@ -1,6 +1,5 @@ # Default configuration for nios2-softmmu =20 -CONFIG_NIOS2=3Dy -CONFIG_SERIAL=3Dy -CONFIG_ALTERA_TIMER=3Dy +# Boards: +# CONFIG_NIOS2_10M50=3Dy diff --git a/hw/nios2/Kconfig b/hw/nios2/Kconfig index 22817e4..ab953e0 100644 --- a/hw/nios2/Kconfig +++ b/hw/nios2/Kconfig @@ -1,5 +1,8 @@ config NIOS2_10M50 bool + select NIOS2 + select SERIAL + select ALTERA_TIMER =20 config NIOS2 bool --=20 1.8.3.1 From nobody Wed Apr 24 17:06:17 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1549563983314442.35486777155825; Thu, 7 Feb 2019 10:26:23 -0800 (PST) Received: from localhost ([127.0.0.1]:44851 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1groNN-0007Pz-6n for importer@patchew.org; Thu, 07 Feb 2019 13:26:17 -0500 Received: from eggs.gnu.org ([209.51.188.92]:57780) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1grnwR-0002Ui-08 for qemu-devel@nongnu.org; Thu, 07 Feb 2019 12:58:27 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1grnwP-0002Xm-4n for qemu-devel@nongnu.org; Thu, 07 Feb 2019 12:58:26 -0500 Received: from mail-wm1-x341.google.com ([2a00:1450:4864:20::341]:53733) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1grnwL-0002VX-Dv for qemu-devel@nongnu.org; Thu, 07 Feb 2019 12:58:23 -0500 Received: by mail-wm1-x341.google.com with SMTP id d15so816062wmb.3 for ; Thu, 07 Feb 2019 09:58:21 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id q12sm12708982wmf.2.2019.02.07.09.58.19 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 07 Feb 2019 09:58:19 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=+mITbK0sV/p/wHQkgkimbl85T3Zhe8uz8eGh/gUPV0s=; b=dwm3Zd/OcqCzqiibOtGE3MGOpPh1ld7J/tBcqFvV+/PtXhAzFsmu6L9XPZuXNZsL0o 8b7WndXb7+/ENLLi92dX09InQLBZGB7J4jFI+kPlKBhQYyREsDjQ7LAjefaw9BCgjTav tq9RMdimyJrMYQBOBnJIVoF7J3Sjl4GkJjJPEtgVcVhYEUz1Aowzg1L1nDz+RYoHoRlR SU/Ml/cp6NEhSR8nPoDXDwJb2o+Fzfqd7iqgU/ARhYeZPK3rTcTOyIxt8fCLKDBxQu07 /Sdg2j3BDeXcD7eJ5ozIuUemvu7mUJycsP6N56xcjlq4SJvY5433s7HLtah0SwMDA0gR DTGg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=+mITbK0sV/p/wHQkgkimbl85T3Zhe8uz8eGh/gUPV0s=; b=tl+L4JBIFnmt+CadSXYipndNH1XBC5AA+c8jKuNPB9ZS3fFvwD7IAFtf0dPtsoyosF D6Wk6Kq4hzup+HzuLGoP9Wj5XaYsWFo/vC3UU7y1PTR+3cevEtzmJyvDql6ec2CmYmD6 xbIJv/84yfcC5nmBipztcejEbOFHhyHV4gh/I+z+KabSYkF47RLZ8qjUitS81qIa0Aqx 3F9TeSgiVL7uEh1NAh66skqeB6NKhc8GXJYD3QDhJ7BYj0UqCcr/B84dfE1hoi4ZdneN JvFAFg6lmynDDM84B+9kHDYXdLBnM0DwGk7QnkRNB+PtcS8KDOuecSZXP6t0HThIw4fm EnAw== X-Gm-Message-State: AHQUAuYe07gy7jJlftNL4AAE2+WuFK0fmosKMF0nXVrxo3JnDS2bzYb6 86gEKqGCH4Z8RYg/XZlIQLck71gs X-Google-Smtp-Source: AHgI3IYuhDPxZKGDahl5GsqoHsNBdUE1654lsk1/4BI0aiY7hp3EYVEg3N/xPl0e4Ts3XhluZnWWxg== X-Received: by 2002:a1c:1a8a:: with SMTP id a132mr8717613wma.109.1549562299907; Thu, 07 Feb 2019 09:58:19 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Thu, 7 Feb 2019 18:57:26 +0100 Message-Id: <1549562254-41157-44-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1549562254-41157-1-git-send-email-pbonzini@redhat.com> References: <1549562254-41157-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::341 Subject: [Qemu-devel] [PATCH 43/51] or1k-softmmu.mak: express dependencies with Kconfig X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: thuth@redhat.com, philmd@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" %-softmmu.mak only keep boards and optional device definitions in Kconfig mode. Signed-off-by: Paolo Bonzini Reviewed-by: Michael S. Tsirkin --- default-configs/or1k-softmmu.mak | 5 ++--- hw/openrisc/Kconfig | 3 +++ 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/default-configs/or1k-softmmu.mak b/default-configs/or1k-softmm= u.mak index 6a0f2ef..168101c 100644 --- a/default-configs/or1k-softmmu.mak +++ b/default-configs/or1k-softmmu.mak @@ -1,6 +1,5 @@ # Default configuration for or1k-softmmu =20 -CONFIG_SERIAL=3Dy -CONFIG_OPENCORES_ETH=3Dy -CONFIG_OMPIC=3Dy +# Boards: +# CONFIG_OR1K_SIM=3Dy diff --git a/hw/openrisc/Kconfig b/hw/openrisc/Kconfig index 7aef98d..6c1e868 100644 --- a/hw/openrisc/Kconfig +++ b/hw/openrisc/Kconfig @@ -1,2 +1,5 @@ config OR1K_SIM bool + select SERIAL + select OPENCORES_ETH + select OMPIC --=20 1.8.3.1 From nobody Wed Apr 24 17:06:17 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (209.51.188.17 [209.51.188.17]) by mx.zohomail.com with SMTPS id 1549564052383997.1151873261067; Thu, 7 Feb 2019 10:27:32 -0800 (PST) Received: from localhost ([127.0.0.1]:44861 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1groOU-0008Kt-7V for importer@patchew.org; Thu, 07 Feb 2019 13:27:26 -0500 Received: from eggs.gnu.org ([209.51.188.92]:57855) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1grnwi-0002hP-Se for qemu-devel@nongnu.org; Thu, 07 Feb 2019 12:58:45 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1grnwZ-0002cf-8L for qemu-devel@nongnu.org; Thu, 07 Feb 2019 12:58:38 -0500 Received: from mail-wm1-x343.google.com ([2a00:1450:4864:20::343]:52274) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1grnwX-0002W3-8N for qemu-devel@nongnu.org; Thu, 07 Feb 2019 12:58:33 -0500 Received: by mail-wm1-x343.google.com with SMTP id m1so823375wml.2 for ; Thu, 07 Feb 2019 09:58:22 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id q12sm12708982wmf.2.2019.02.07.09.58.19 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 07 Feb 2019 09:58:20 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=UxIbYR3qRi6d6G3qcmZ58+AzdEFmlQ7XRWd7QuZgye0=; b=vESq7PZisdvsGmimmaSsffhGHbXpvX6JHK3YHPpwoDQc63t2f2HBmxJ9F9P195FYK5 hyaCbKZ5t+Kjz4jSbCYCdXrbHXuPJ3yN7brZtGlJMcaM8wbUKempx3XPDfrF3SlGku0i YM1waTmU1zTrNTzNdTo5SUDrbCaam6wiawj8FDhSDv947V104m4vgXfSPli10l01g4vy 5e1Jiq1WGcyS0Hjqzcb6mFGa4yeY2c7gpA24Wg98PfyVceS7OOapjwI07CI4GOHGwCAV 8PSF9VhVBlMutsXGGOSn9GxDr91qbwkUoO6szujoFdr6Ka41H1CWOYVpDpRr+SPStkEr tjaQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=UxIbYR3qRi6d6G3qcmZ58+AzdEFmlQ7XRWd7QuZgye0=; b=XtTIjwFDBM87seit4ciB0xG3BwsvKCfkbSyPbcPUfYs5H7ZPHWwlYzgR7vY+J4clxC GF/byQhR4xmEIRL6hPf/HZIxPGw6cmlI8IRFjiUHx5FO/BjsHeeXR8ZlJTw92uJMsyD0 g1+vQ54zdkV79LfHfGV7+wnErXxvr69e6JzOdlCMBFd6Q3xiUwbiaDeClj89a51tZOCM nM56yYajoX77ZQKnjONJjhorB8eRI9G1W0G4tHw9OnAE91N038aFPQjdOm89UPnX8i9Q Ezj8ZO180yFR8qW4hqZnyJStEQalDEbuoWBxnVw1h4P7+NL6gLb1v1W38j3Ml3VHQwJd f1PQ== X-Gm-Message-State: AHQUAuYDCzCuiCQRi6Obgedp3Pf7tBlfLntTVUK/eQzHmEU12FhqjOHX ya65iM/V5QNoPV3qpAmtXao3kFg/ X-Google-Smtp-Source: AHgI3IbvJ9JmZUtlJnTvXLKlWEQxK+xe+FNgwjFh9JLKbUDOU+vqc/HDzAEW7pIsOv9pRO9nUrHPcQ== X-Received: by 2002:a1c:a4c4:: with SMTP id n187mr8440121wme.15.1549562300905; Thu, 07 Feb 2019 09:58:20 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Thu, 7 Feb 2019 18:57:27 +0100 Message-Id: <1549562254-41157-45-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1549562254-41157-1-git-send-email-pbonzini@redhat.com> References: <1549562254-41157-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::343 Subject: [Qemu-devel] [PATCH 44/51] s390x: express dependencies with Kconfig X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: thuth@redhat.com, philmd@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Thomas Huth Instead of hard-coding all config switches in the config file default-configs/s390x-softmmu.mak, let's use the new Kconfig files to express the necessary dependencies: The S390_CCW_VIRTIO config switch for the "s390-ccw-virtio" machine now selects all non-optional devices. And since we already have the VIRTIO_PCI and VIRTIO_MMIO config switches for the other two virtio transports, this patch also introduces a new config switch VIRTIO_CCW for the third, s390x-specific virtio transport, so that all three virtio transports are now handled in the same way. Signed-off-by: Thomas Huth Acked-by: Cornelia Huck Signed-off-by: Paolo Bonzini Reviewed-by: Michael S. Tsirkin --- default-configs/s390x-softmmu.mak | 20 ++++++++++++-------- hw/s390x/Kconfig | 9 +++++++++ hw/s390x/Makefile.objs | 4 +++- hw/virtio/Kconfig | 4 ++++ 4 files changed, 28 insertions(+), 9 deletions(-) diff --git a/default-configs/s390x-softmmu.mak b/default-configs/s390x-soft= mmu.mak index 2be5059..f2287a1 100644 --- a/default-configs/s390x-softmmu.mak +++ b/default-configs/s390x-softmmu.mak @@ -1,9 +1,13 @@ -CONFIG_PCI=3Dy -CONFIG_VIRTIO_PCI=3Dy -CONFIG_SCLPCONSOLE=3Dy -CONFIG_TERMINAL3270=3Dy -CONFIG_S390_FLIC=3Dy -CONFIG_WDT_DIAG288=3Dy +# Default configuration for s390x-softmmu + +# Uncomment the following lines to disable these optional devices: +# +#CONFIG_TERMINAL3270=3Dn +#CONFIG_VFIO_AP=3Dn +#CONFIG_VFIO_CCW=3Dn +#CONFIG_VIRTIO_PCI=3Dn +#CONFIG_WDT_DIAG288=3Dn + +# Boards: +# CONFIG_S390_CCW_VIRTIO=3Dy -CONFIG_VFIO_CCW=3Dy -CONFIG_VFIO_AP=3Dy diff --git a/hw/s390x/Kconfig b/hw/s390x/Kconfig index 303db7f..a7046ea 100644 --- a/hw/s390x/Kconfig +++ b/hw/s390x/Kconfig @@ -1,2 +1,11 @@ config S390_CCW_VIRTIO bool + imply VIRTIO_PCI + imply TERMINAL3270 + imply VFIO_AP + imply VFIO_CCW + imply WDT_DIAG288 + select PCI + select S390_FLIC + select SCLPCONSOLE + select VIRTIO_CCW diff --git a/hw/s390x/Makefile.objs b/hw/s390x/Makefile.objs index a18c471..9884979 100644 --- a/hw/s390x/Makefile.objs +++ b/hw/s390x/Makefile.objs @@ -6,7 +6,8 @@ obj-y +=3D sclpcpu.o obj-y +=3D ipl.o obj-y +=3D css.o obj-$(CONFIG_S390_CCW_VIRTIO) +=3D s390-virtio-ccw.o -obj-y +=3D 3270-ccw.o +obj-$(CONFIG_TERMINAL3270) +=3D 3270-ccw.o +ifeq ($(CONFIG_VIRTIO_CCW),y) obj-y +=3D virtio-ccw.o obj-$(CONFIG_VIRTIO_SERIAL) +=3D virtio-ccw-serial.o obj-$(CONFIG_VIRTIO_BALLOON) +=3D virtio-ccw-balloon.o @@ -19,6 +20,7 @@ obj-$(CONFIG_VIRTIO_NET) +=3D virtio-ccw-net.o obj-$(CONFIG_VIRTIO_BLK) +=3D virtio-ccw-blk.o obj-$(call land,$(CONFIG_VIRTIO_9P),$(CONFIG_VIRTFS)) +=3D virtio-ccw-9p.o obj-$(CONFIG_VHOST_VSOCK) +=3D vhost-vsock-ccw.o +endif obj-y +=3D css-bridge.o obj-y +=3D ccw-device.o obj-$(CONFIG_PCI) +=3D s390-pci-bus.o s390-pci-inst.o diff --git a/hw/virtio/Kconfig b/hw/virtio/Kconfig index 74f4573..e0452de 100644 --- a/hw/virtio/Kconfig +++ b/hw/virtio/Kconfig @@ -16,6 +16,10 @@ config VIRTIO_MMIO bool select VIRTIO =20 +config VIRTIO_CCW + bool + select VIRTIO + config VIRTIO_BALLOON bool default y --=20 1.8.3.1 From nobody Wed Apr 24 17:06:17 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (209.51.188.17 [209.51.188.17]) by mx.zohomail.com with SMTPS id 1549563907002780.4679866214623; Thu, 7 Feb 2019 10:25:07 -0800 (PST) Received: from localhost ([127.0.0.1]:44815 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1groM9-0006Kb-1k for importer@patchew.org; Thu, 07 Feb 2019 13:25:01 -0500 Received: from eggs.gnu.org ([209.51.188.92]:57810) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1grnwS-0002Wc-Tq for qemu-devel@nongnu.org; Thu, 07 Feb 2019 12:58:29 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1grnwR-0002Zc-5s for qemu-devel@nongnu.org; Thu, 07 Feb 2019 12:58:28 -0500 Received: from mail-wm1-x344.google.com ([2a00:1450:4864:20::344]:35202) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1grnwP-0002WJ-L5 for qemu-devel@nongnu.org; Thu, 07 Feb 2019 12:58:26 -0500 Received: by mail-wm1-x344.google.com with SMTP id t200so845300wmt.0 for ; Thu, 07 Feb 2019 09:58:22 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id q12sm12708982wmf.2.2019.02.07.09.58.20 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 07 Feb 2019 09:58:21 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=5gJM+Uoo0C9kJr/jT5zAR4CvLYEHTQs4ZFvYyqQRLaQ=; b=fjF+fOT0Jl86ZRwYChktVfpp0ssz7Iq20BSLeB8Ovu1pzB+rBz2chXzBSHtBIuuBjM 5L2IwYhfsGU4xATlZrbNXT1x2Nn8u3oQZpBQjIrYbrHEs02nim0yTLfLAB6M/NGj6NCS c0XafD87L7LgqyNnFq8DJleCPn6arVVc3mT/iUrMdoS11nzLKhq+/LyQ4PsjVynRTX5V 5Ljhs/wqx/N5YIBSw3iSsuwU4Fnq3mv14nO6D5JpAWIBFDQFO8431N//xwKFPK1057OL Jte+XVvtmyky2GeEXFFhHO2IGRAeG2ppgaD2eGdGnT+CTOwf+4EkuhqBGnF3Eb9mitpB Btng== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=5gJM+Uoo0C9kJr/jT5zAR4CvLYEHTQs4ZFvYyqQRLaQ=; b=fVlo83PhRspircUtcM/pXb1kOLiCp5u0hk1DdG55/pbVyBZ4lnM9zrzOVjKqCGClfP GnCS7VwGNH7T2XsFf8cKcEIBApDDyEUG57SMg1zENY0k1waAy2u7th8B3Xmfp+TQobC7 6Xb/0oWw4WXC8hmNR7tGlL7Uvki8HQTjjCfySVXnAKekpHSaqbIl97u2W3Ej7b26V/hY CU0RrgJsLLy5pGBAM6uqSHfUbhQCHkRyupYC0qMCideZfZr52oM5GnEk0ZEVh0OPWJiE iYAA2hUqvPFg8Wc7OyaII53qVj4qAQ0yusGN1+cAyMewTD0h1z287ARiNaz4whhFsHiv +Kgw== X-Gm-Message-State: AHQUAuY+dJuVI/XYGiCdMruvlVQRkT+mofSUhJzFFrIdY7xTjVqkOlHq o3fLvnnOx5i0AhiHXKSguf+MgP5h X-Google-Smtp-Source: AHgI3IYe1myFw/Ya9dFYgzaJX1brwkqHPIqa0KJlEj2bWLJBqEeEKlilQqAReja1FV7ENoG/jD+Jvg== X-Received: by 2002:a1c:3581:: with SMTP id c123mr8350689wma.60.1549562301817; Thu, 07 Feb 2019 09:58:21 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Thu, 7 Feb 2019 18:57:28 +0100 Message-Id: <1549562254-41157-46-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1549562254-41157-1-git-send-email-pbonzini@redhat.com> References: <1549562254-41157-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::344 Subject: [Qemu-devel] [PATCH 45/51] sh4-softmmu.mak: express dependencies with Kconfig X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: thuth@redhat.com, philmd@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" %-softmmu.mak only keep boards and optional device definitions in Kconfig mode. Note that USB_OHCI was missing (it was brought in via pci.mak, but r2d needs the sysbus version) and SERIAL is not used. Signed-off-by: Paolo Bonzini Reviewed-by: Michael S. Tsirkin --- default-configs/sh4-softmmu.mak | 18 +++++++----------- default-configs/sh4eb-softmmu.mak | 13 +------------ hw/sh4/Kconfig | 11 +++++++++++ 3 files changed, 19 insertions(+), 23 deletions(-) diff --git a/default-configs/sh4-softmmu.mak b/default-configs/sh4-softmmu.= mak index 4ba5584..565e8b0 100644 --- a/default-configs/sh4-softmmu.mak +++ b/default-configs/sh4-softmmu.mak @@ -1,15 +1,11 @@ # Default configuration for sh4eb-softmmu =20 -CONFIG_PCI=3Dy -CONFIG_PCI_DEVICES=3Dy -CONFIG_SERIAL=3Dy -CONFIG_PFLASH_CFI02=3Dy -CONFIG_SH4=3Dy -CONFIG_IDE_MMIO=3Dy -CONFIG_SM501=3Dy -CONFIG_TEST_DEVICES=3Dy -CONFIG_I82378=3Dy -CONFIG_I82374=3Dy +# Uncomment the following lines to disable these optional devices: +# +#CONFIG_PCI_DEVICES=3Dn +#CONFIG_TEST_DEVICES=3Dn + +# Boards: +# CONFIG_R2D=3Dy CONFIG_SHIX=3Dy -CONFIG_TEST_DEVICES=3Dy diff --git a/default-configs/sh4eb-softmmu.mak b/default-configs/sh4eb-soft= mmu.mak index 9717673..522a7a5 100644 --- a/default-configs/sh4eb-softmmu.mak +++ b/default-configs/sh4eb-softmmu.mak @@ -1,14 +1,3 @@ # Default configuration for sh4eb-softmmu =20 -CONFIG_PCI=3Dy -CONFIG_PCI_DEVICES=3Dy -CONFIG_SERIAL=3Dy -CONFIG_PFLASH_CFI02=3Dy -CONFIG_SH4=3Dy -CONFIG_IDE_MMIO=3Dy -CONFIG_SM501=3Dy -CONFIG_TEST_DEVICES=3Dy -CONFIG_I82378=3Dy -CONFIG_I82374=3Dy -CONFIG_R2D=3Dy -CONFIG_SHIX=3Dy +include sh4-softmmu.mak diff --git a/hw/sh4/Kconfig b/hw/sh4/Kconfig index 1ea2bc3..8597613 100644 --- a/hw/sh4/Kconfig +++ b/hw/sh4/Kconfig @@ -1,8 +1,19 @@ config R2D bool + imply PCI_DEVICES + imply TEST_DEVICES + select I82378 if TEST_DEVICES + select IDE_MMIO + select PFLASH_CFI02 + select USB_OHCI + select PCI + select SM501 + select SH4 =20 config SHIX bool + select SH7750 + select SH4 =20 config SH7750 bool --=20 1.8.3.1 From nobody Wed Apr 24 17:06:17 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (209.51.188.17 [209.51.188.17]) by mx.zohomail.com with SMTPS id 1549564830240408.81806845690085; Thu, 7 Feb 2019 10:40:30 -0800 (PST) Received: from localhost ([127.0.0.1]:45028 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1grob2-0001jj-JT for importer@patchew.org; Thu, 07 Feb 2019 13:40:24 -0500 Received: from eggs.gnu.org ([209.51.188.92]:58067) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1grnwt-0002sz-9L for qemu-devel@nongnu.org; Thu, 07 Feb 2019 12:58:57 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1grnwq-0002k8-Mi for qemu-devel@nongnu.org; Thu, 07 Feb 2019 12:58:55 -0500 Received: from mail-wr1-x441.google.com ([2a00:1450:4864:20::441]:46153) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1grnwq-0002X5-AD for qemu-devel@nongnu.org; Thu, 07 Feb 2019 12:58:52 -0500 Received: by mail-wr1-x441.google.com with SMTP id l9so764988wrt.13 for ; Thu, 07 Feb 2019 09:58:24 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id q12sm12708982wmf.2.2019.02.07.09.58.21 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 07 Feb 2019 09:58:22 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=xkvW0uwtySgLQU/oWR3vV841Xcf523cSNtXIrR7nNDE=; b=YAHaoq3Ru7smMOQmp63qy+r524TLAY6jxkigeY59H8FfxJ+zUUbSKipjSyQq5bgcFs MH4t2fCcKPDr/TMK5qC2ayP2km4t2yKsla+NjJWxAhDMySAu85QuqwBn/spng5oi3agI y+ufh82xBYC3Rd/S/BHToQRleta0Klfxf+YHv9fgftz6vQKbk7wiOgFWrWWUvrDA8Js9 GDp7ikzmW73Dzfd9dBH6KTvz1n0IjBdQPSaZbbBgz2LUuibsiIbzuhJdVThQQCTAcT5q tepuyHIecSEkJDwm6Z4Hn4tAV/2vid2VAUE1SZvrFOl9YKrTadUg1/DRZ7c53y5azApO dB0A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=xkvW0uwtySgLQU/oWR3vV841Xcf523cSNtXIrR7nNDE=; b=m6j9jTx97Ojeu1tSssGQcS3U7c3YihK7FmeuokZ9EkUGxX5C2Ax2659tD7zAWzYouO b51Z8k88Yjh4CynmheYBfbLv9pgM1Zm4yzkJG/LdEtClJ0beoffNv0nqt01x1+Ca6mpX +sApshXAd8vo7wYllosRtwuLgJOU42GuMyxMe1RpYkxKbxQU9nyWyBXvtNOJfdfDyAsk GZ4itdJQuPbe3s+Sq9E9td/xz7sveLoK8LLTE2Qo++wMqsm8wwmBagMlD686EqK5Qj7v eHP7caJkZlqxSRm/nY+jzLWPZrlYoa+O3LOAGzLt3LkxNcJB9UJuki7biTcf7FVH5MDC l6Jw== X-Gm-Message-State: AHQUAuYVgMXFd+s2gWX/gh9F29QNUkwtTcExC0LS/CpCvSve2J7MWQ5A vZiIiMHGHWvbHfCD1EeZwalqUrHc X-Google-Smtp-Source: AHgI3IYkOVj7URfNqAk9W4LkLZdY5/jo5xPz/hiJHiBt4W60KI5jSmUXcJTVNpPvE6vizknmqNG0sw== X-Received: by 2002:adf:e385:: with SMTP id e5mr176461wrm.267.1549562302759; Thu, 07 Feb 2019 09:58:22 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Thu, 7 Feb 2019 18:57:29 +0100 Message-Id: <1549562254-41157-47-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1549562254-41157-1-git-send-email-pbonzini@redhat.com> References: <1549562254-41157-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::441 Subject: [Qemu-devel] [PATCH 46/51] sparc-softmmu.mak: express dependencies with Kconfig X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: thuth@redhat.com, philmd@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" %-softmmu.mak only keep boards and optional device definitions in Kconfig mode. Signed-off-by: Paolo Bonzini Reviewed-by: Michael S. Tsirkin --- default-configs/sparc-softmmu.mak | 22 ++++++---------------- hw/misc/Kconfig | 1 + hw/net/Kconfig | 1 + hw/sparc/Kconfig | 13 +++++++++++++ 4 files changed, 21 insertions(+), 16 deletions(-) diff --git a/default-configs/sparc-softmmu.mak b/default-configs/sparc-soft= mmu.mak index b31a9f2..ee85218 100644 --- a/default-configs/sparc-softmmu.mak +++ b/default-configs/sparc-softmmu.mak @@ -1,21 +1,11 @@ # Default configuration for sparc-softmmu =20 -CONFIG_ISA_BUS=3Dy -CONFIG_ECC=3Dy -CONFIG_ESP=3Dy -CONFIG_ESCC=3Dy -CONFIG_M48T59=3Dy -CONFIG_FDC=3Dy -CONFIG_EMPTY_SLOT=3Dy -CONFIG_PCNET_COMMON=3Dy -CONFIG_LANCE=3Dy -CONFIG_TCX=3Dy -CONFIG_CG3=3Dy -CONFIG_SLAVIO=3Dy -CONFIG_CS4231=3Dy -CONFIG_GRLIB=3Dy -CONFIG_STP2000=3Dy -CONFIG_ECCMEMCTL=3Dy +# Uncomment the following lines to disable these optional devices: +# +#CONFIG_TCX=3Dn +#CONFIG_CG3=3Dn =20 +# Boards: +# CONFIG_SUN4M=3Dy CONFIG_LEON3=3Dy diff --git a/hw/misc/Kconfig b/hw/misc/Kconfig index 728c561..11d4b30 100644 --- a/hw/misc/Kconfig +++ b/hw/misc/Kconfig @@ -71,6 +71,7 @@ config IVSHMEM_DEVICE =20 config ECCMEMCTL bool + select ECC =20 config IMX bool diff --git a/hw/net/Kconfig b/hw/net/Kconfig index 1aa1071..c132180 100644 --- a/hw/net/Kconfig +++ b/hw/net/Kconfig @@ -77,6 +77,7 @@ config STELLARIS_ENET =20 config LANCE bool + select PCNET_COMMON =20 config SUNHME bool diff --git a/hw/sparc/Kconfig b/hw/sparc/Kconfig index c9c2142..2a83a80 100644 --- a/hw/sparc/Kconfig +++ b/hw/sparc/Kconfig @@ -1,8 +1,21 @@ config SUN4M bool + imply TCX + imply CG3 + select CS4231 + select ECCMEMCTL + select EMPTY_SLOT + select ESCC + select ESP + select FDC + select SLAVIO + select LANCE + select M48T59 + select STP2000 =20 config LEON3 bool + select GRLIB =20 config GRLIB bool --=20 1.8.3.1 From nobody Wed Apr 24 17:06:17 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1549564076737484.39012426503655; Thu, 7 Feb 2019 10:27:56 -0800 (PST) Received: from localhost ([127.0.0.1]:44869 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1groOw-0000I6-1q for importer@patchew.org; Thu, 07 Feb 2019 13:27:54 -0500 Received: from eggs.gnu.org ([209.51.188.92]:57824) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1grnwW-0002ax-UG for qemu-devel@nongnu.org; Thu, 07 Feb 2019 12:58:33 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1grnwS-0002aT-T6 for qemu-devel@nongnu.org; Thu, 07 Feb 2019 12:58:30 -0500 Received: from mail-wm1-x341.google.com ([2a00:1450:4864:20::341]:37855) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1grnwQ-0002XJ-2c for qemu-devel@nongnu.org; Thu, 07 Feb 2019 12:58:26 -0500 Received: by mail-wm1-x341.google.com with SMTP id g67so816822wmd.2 for ; Thu, 07 Feb 2019 09:58:24 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id q12sm12708982wmf.2.2019.02.07.09.58.22 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 07 Feb 2019 09:58:23 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=lRWytvmXezRJFWGrdYcAD3Cz+nCCYBhlZ42inWCQv+Q=; b=op8c//Eul8ocLYR63rO1tlHge/jdbqhhFjlhG6LaV6sWZ1cabmPvoD95WT68PqDfyE uw9BugUn/1jzIJCMUGBcJ1obR8k+CfIqaJG/wZk66YekSDn1h9Zc5d3vQtqky2w8iucA QjvG+4vIrB6njNqlBKxrSkkLRlvM8v8p/rm5QuX13kT1DTIwHmVIkayFF+Go4R6/uzyb iq8dZTFQkXXZFJM+f6ccA5NnIXCB4lbjof4NIykqe1evFxiepnv5jo3kStCxmGSOQUku TD62j8FPV43v9MczBhXBfQ2Box7LgDOH7ZwOe/UwBblgMyCysH/nkTs3OExRtjaCVtVy vUwQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=lRWytvmXezRJFWGrdYcAD3Cz+nCCYBhlZ42inWCQv+Q=; b=em3gVAD2s053NFttFjkc9idCswQc/gcwuRpB7EojGcoaLK9TAVhQ4jzawcLd7rbQVD 2BsMwaqQFj+JIrQq+BP9vfFcYVFyOCnirM8mqzL6EFEJVz/PdWt64lFKmudBl7uBuSqy IyC6/ju4jH13+eiVjQFTNxgMSv95HW6icmRh4zcjJlg5IzxyZqKqUeM8mHvibf24gfAG uGncyT0pyQr9h4IDrjvMQHgxpivowdrMTT1th69WD8sSMK3qVGMdzSTacg4s6/evSlFQ oNDwgWI4B35CAN1nZVA0I9cIIxmLi9fR1j39ZjcI4EGUZ1azpoMJrvkRW8d2WpJ9Fs+t Ea2Q== X-Gm-Message-State: AHQUAubj+g1EpOGAl7iBE2baVR9VNDDm+Kjd7iv/UjlTPRGVMv56CSuf 5vLU5NBEObLHkNM0nxtkO3dCkUqT X-Google-Smtp-Source: AHgI3IbY/j9GvFSbGJX6+QaGQrrFBdQtcZvM/xY6YMyeGGTARajCnxcrr53NOvaFU6WAnjLacw/irg== X-Received: by 2002:a1c:2e43:: with SMTP id u64mr8520986wmu.52.1549562303782; Thu, 07 Feb 2019 09:58:23 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Thu, 7 Feb 2019 18:57:30 +0100 Message-Id: <1549562254-41157-48-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1549562254-41157-1-git-send-email-pbonzini@redhat.com> References: <1549562254-41157-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::341 Subject: [Qemu-devel] [PATCH 47/51] sparc64-softmmu.mak: express dependencies with Kconfig X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: thuth@redhat.com, philmd@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" %-softmmu.mak only keep boards and optional device definitions in Kconfig mode. Signed-off-by: Paolo Bonzini Reviewed-by: Michael S. Tsirkin --- default-configs/sparc64-softmmu.mak | 23 ++++++++--------------- hw/sparc64/Kconfig | 13 +++++++++++++ 2 files changed, 21 insertions(+), 15 deletions(-) diff --git a/default-configs/sparc64-softmmu.mak b/default-configs/sparc64-= softmmu.mak index 528af8f..e50030a 100644 --- a/default-configs/sparc64-softmmu.mak +++ b/default-configs/sparc64-softmmu.mak @@ -1,19 +1,12 @@ # Default configuration for sparc64-softmmu =20 -CONFIG_PCI=3Dy -CONFIG_PCI_DEVICES=3Dy -CONFIG_M48T59=3Dy -CONFIG_SERIAL=3Dy -CONFIG_SERIAL_ISA=3Dy -CONFIG_PARALLEL=3Dy -CONFIG_PCKBD=3Dy -CONFIG_FDC=3Dy -CONFIG_IDE_CMD646=3Dy -CONFIG_PCI_SABRE=3Dy -CONFIG_SIMBA=3Dy -CONFIG_SUNHME=3Dy -CONFIG_MC146818RTC=3Dy -CONFIG_TEST_DEVICES=3Dy -CONFIG_SUN4V_RTC=3Dy +# Uncomment the following lines to disable these optional devices: +# +#CONFIG_PCI_DEVICES=3Dn +#CONFIG_SUNHME=3Dn +#CONFIG_TEST_DEVICES=3Dn + +# Boards: +# CONFIG_SUN4U=3Dy CONFIG_NIAGARA=3Dy diff --git a/hw/sparc64/Kconfig b/hw/sparc64/Kconfig index 41f7295..4a8166e 100644 --- a/hw/sparc64/Kconfig +++ b/hw/sparc64/Kconfig @@ -1,6 +1,19 @@ config SUN4U bool + imply PCI_DEVICES + imply SUNHME + imply TEST_DEVICES + select M48T59 select ISA_BUS + select FDC + select SERIAL_ISA + select PCI_SABRE + select IDE_CMD646 + select PARALLEL + select PCKBD + select SIMBA =20 config NIAGARA bool + select EMPTY_SLOT + select SUN4V_RTC --=20 1.8.3.1 From nobody Wed Apr 24 17:06:17 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (209.51.188.17 [209.51.188.17]) by mx.zohomail.com with SMTPS id 1549565173760691.8909440057633; Thu, 7 Feb 2019 10:46:13 -0800 (PST) Received: from localhost ([127.0.0.1]:45158 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1grogZ-0006g5-PA for importer@patchew.org; Thu, 07 Feb 2019 13:46:07 -0500 Received: from eggs.gnu.org ([209.51.188.92]:58065) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1grnwt-0002sy-8y for qemu-devel@nongnu.org; Thu, 07 Feb 2019 12:58:56 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1grnwq-0002l9-VY for qemu-devel@nongnu.org; Thu, 07 Feb 2019 12:58:55 -0500 Received: from mail-wm1-x344.google.com ([2a00:1450:4864:20::344]:39459) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1grnwq-0002Y2-IP for qemu-devel@nongnu.org; Thu, 07 Feb 2019 12:58:52 -0500 Received: by mail-wm1-x344.google.com with SMTP id f16so808776wmh.4 for ; Thu, 07 Feb 2019 09:58:25 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id q12sm12708982wmf.2.2019.02.07.09.58.23 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 07 Feb 2019 09:58:24 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=tMKMSy3+8dwCidkJZbNjAhdE6SHIn2k3fDcUvd8yy0I=; b=Fhl7EVLkBfSNx7KlwXMpdHRI/7f/ZocSISFfp4jz1qRoUB6oltUk3NiK+iHZGkXUn0 +UuwTC7kA/5nvp+ay5vItSrozdwjni80kOdx4o6dFxs7rRN+MrSvn70YvS1sCocDnoYh Zp9AJk4Jz7DCTEMH67TZtVJys2nwAFz6u42qknYDagXWqPUA/6+xdbY56d9KjuE8+NIS WFdqC/pzQbuSo4+qQUA2z0BR+0xqVFS791ZQUcCPxtgo5Ec1Y+odc/RHgHfjEFSthD6p P6ekWQhkMhhLOiOgP8qwNbY8P4f5SbjaVK76wbVMRulanO3RmcTtEJdtiPFkIL/1qIcU mdzQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=tMKMSy3+8dwCidkJZbNjAhdE6SHIn2k3fDcUvd8yy0I=; b=BAs1ua++mYz8eUVA6FoRzDmcFm4yT5ZxnonymBdir/iFcDU9M3sts6idvTHRSm27kc l5BLrOlZyXU/9Kf/BYj7bIK3BSquhev9yChOyrH0T7t27FhZ5iqDufwxZglTSwbYn2u1 p0i2CYY5qo/hshweoD693HRX8Z1zm00f50JviozeCefrxnaRPK6d8wNbUx8Q7Bn4UiVM vYQkP3ROvM7neA3jM19HVe5ZVWj2jwNfzl4VzrXwJKSYvpriV+39S7+1w3U81cbfgtvg j4ejcqN0JfIzTCTmj8xyj4hmfdGBXcNQ5gbNySc36b1GdgJBDZeKBQZH2l8e/6lrcoH1 8MVQ== X-Gm-Message-State: AHQUAuZxyZ0vH76XscZYNLzJDjrce4zcJTzvxszvkOCvk5AYicJxS16q +KFFbApOD/gFU7a5Uuq7tEedCrBJ X-Google-Smtp-Source: AHgI3IbL5/FXgOp+10xC4Syku66mZgftu/0buEPXwFH1bf95V5jrj4YaT3HeULo5RObOMdMpFhRpMw== X-Received: by 2002:a1c:43:: with SMTP id 64mr8841174wma.72.1549562304641; Thu, 07 Feb 2019 09:58:24 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Thu, 7 Feb 2019 18:57:31 +0100 Message-Id: <1549562254-41157-49-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1549562254-41157-1-git-send-email-pbonzini@redhat.com> References: <1549562254-41157-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::344 Subject: [Qemu-devel] [PATCH 48/51] unicore32-softmmu.mak: express dependencies with Kconfig X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: thuth@redhat.com, philmd@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" %-softmmu.mak only keep boards and optional device definitions in Kconfig mode. Signed-off-by: Paolo Bonzini Reviewed-by: Michael S. Tsirkin --- default-configs/unicore32-softmmu.mak | 5 +++-- hw/unicore32/Kconfig | 2 ++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/default-configs/unicore32-softmmu.mak b/default-configs/unicor= e32-softmmu.mak index 17a7915..0bfce48 100644 --- a/default-configs/unicore32-softmmu.mak +++ b/default-configs/unicore32-softmmu.mak @@ -1,4 +1,5 @@ # Default configuration for unicore32-softmmu -CONFIG_ISA_BUS=3Dy + +# Boards: +# CONFIG_PUV3=3Dy -CONFIG_PCKBD=3Dy diff --git a/hw/unicore32/Kconfig b/hw/unicore32/Kconfig index a03a996..4443a29 100644 --- a/hw/unicore32/Kconfig +++ b/hw/unicore32/Kconfig @@ -1,3 +1,5 @@ config PUV3 bool + select ISA_BUS + select PCKBD select PTIMER --=20 1.8.3.1 From nobody Wed Apr 24 17:06:17 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1549564250723811.8581725173328; Thu, 7 Feb 2019 10:30:50 -0800 (PST) Received: from localhost ([127.0.0.1]:44921 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1groRj-0002q2-Jm for importer@patchew.org; Thu, 07 Feb 2019 13:30:47 -0500 Received: from eggs.gnu.org ([209.51.188.92]:57951) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1grnwq-0002oW-JR for qemu-devel@nongnu.org; Thu, 07 Feb 2019 12:58:54 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1grnwp-0002i0-KM for qemu-devel@nongnu.org; Thu, 07 Feb 2019 12:58:52 -0500 Received: from mail-wm1-x343.google.com ([2a00:1450:4864:20::343]:33027) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1grnwp-0002Ye-9N for qemu-devel@nongnu.org; Thu, 07 Feb 2019 12:58:51 -0500 Received: by mail-wm1-x343.google.com with SMTP id h22so4957567wmb.0 for ; Thu, 07 Feb 2019 09:58:26 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id q12sm12708982wmf.2.2019.02.07.09.58.24 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 07 Feb 2019 09:58:24 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=adqfHb5H+Kpon4QPXcEzodi2mMqmVyML0/OKr8tvxac=; b=NJbEjQBLgNo1MtNPb3c/aio8swDYuMbrFfddy8ehFijnZzjlq0RATUKUp9JINDXFuh ih/2vBzHEDXmoio4dTfj96gPQMu98OftiUsBWBxhFW3+ZhbhSc9Ca1VwM1FjzS0nPdGv J8dPVhNVVTkW+n0xB9O8g53ioX0fh3/nv9bkfCNy63gd44419gioGhysCFlOSVItR3Fn GUgrxSvB8EWJNHxFi/+2qNdu3EeiRzUSvU2kTLKPsoJ5zBROweOLJkbGsKf3uKrXZ19l QUQ8BUf5C6Vx3rHpzspWozmMhpkD9DZ3l/nPFi9pcLxbFeakaDvHh9mwHrbyS7DAt1lH /qGQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=adqfHb5H+Kpon4QPXcEzodi2mMqmVyML0/OKr8tvxac=; b=is2jufrVaMlnb+FwhtuP08xnks8jmZHwzJdChRaj71PlKv4fKcKyb9+hAqw0hm3inU K8lN+9u62TDfhsq2MEkcV1vRLaZzVKWMvhkc5emhrPYKfMm5rZzxQOBoNK/gwFnlXE27 AOQcesabYTIdbSaBtqjuQEWPWVooG4nIvUeUnXjuEDukqsHjYHeANTy84fSCiXi1RISR vn+2YiAX57wTO7wLVKxwM8v63y94K3fiaEcpoH1HEm93DiPR1wGa3CaaTGr56Ixa/y5T iq8NUb2gnwEE5PS4J+laE1GTMew2ZDQlUDCA2G5ZmPzKlhR9OIElTsJw4QfydYHGpcIs bU3g== X-Gm-Message-State: AHQUAubk+nrXHebWAo3Cl8eoCr+YyKh/MYKPhXSYqWBU9yvcNIySVviU pBcegqPYe893LI8LTPzhEWy1lcOT X-Google-Smtp-Source: AHgI3IaNvLOMWP23ExRGhwonjbKEmxzOm3h94gm9VkyTBoM4CGN6C2dlIitshgZg4KmlJ3XVTrOS6A== X-Received: by 2002:a1c:ed17:: with SMTP id l23mr8612480wmh.51.1549562305484; Thu, 07 Feb 2019 09:58:25 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Thu, 7 Feb 2019 18:57:32 +0100 Message-Id: <1549562254-41157-50-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1549562254-41157-1-git-send-email-pbonzini@redhat.com> References: <1549562254-41157-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::343 Subject: [Qemu-devel] [PATCH 49/51] xtensa-softmmu.mak: express dependencies with Kconfig X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: thuth@redhat.com, philmd@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" %-softmmu.mak only keep boards and optional device definitions in Kconfig mode. Signed-off-by: Paolo Bonzini Reviewed-by: Michael S. Tsirkin --- default-configs/xtensa-softmmu.mak | 6 ++---- default-configs/xtensaeb-softmmu.mak | 7 +------ hw/xtensa/Kconfig | 3 +++ 3 files changed, 6 insertions(+), 10 deletions(-) diff --git a/default-configs/xtensa-softmmu.mak b/default-configs/xtensa-so= ftmmu.mak index baf90ca..6c1e898 100644 --- a/default-configs/xtensa-softmmu.mak +++ b/default-configs/xtensa-softmmu.mak @@ -1,8 +1,6 @@ # Default configuration for Xtensa =20 -CONFIG_SERIAL=3Dy -CONFIG_OPENCORES_ETH=3Dy -CONFIG_PFLASH_CFI01=3Dy - +# Boards: +# CONFIG_XTENSA_SIM=3Dy CONFIG_XTENSA_FPGA=3Dy diff --git a/default-configs/xtensaeb-softmmu.mak b/default-configs/xtensae= b-softmmu.mak index baf90ca..f7e48c7 100644 --- a/default-configs/xtensaeb-softmmu.mak +++ b/default-configs/xtensaeb-softmmu.mak @@ -1,8 +1,3 @@ # Default configuration for Xtensa =20 -CONFIG_SERIAL=3Dy -CONFIG_OPENCORES_ETH=3Dy -CONFIG_PFLASH_CFI01=3Dy - -CONFIG_XTENSA_SIM=3Dy -CONFIG_XTENSA_FPGA=3Dy +include xtensa-softmmu.mak diff --git a/hw/xtensa/Kconfig b/hw/xtensa/Kconfig index 97543a9..2b507d4 100644 --- a/hw/xtensa/Kconfig +++ b/hw/xtensa/Kconfig @@ -3,3 +3,6 @@ config XTENSA_SIM =20 config XTENSA_FPGA bool + select OPENCORES_ETH + select PFLASH_CFI01 + select SERIAL --=20 1.8.3.1 From nobody Wed Apr 24 17:06:17 2024 Delivered-To: importer@patchew.org Received-SPF: temperror (zoho.com: Error in retrieving data from DNS) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=temperror (zoho.com: Error in retrieving data from DNS) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (209.51.188.17 [209.51.188.17]) by mx.zohomail.com with SMTPS id 1549564655076190.6464679161038; Thu, 7 Feb 2019 10:37:35 -0800 (PST) Received: from localhost ([127.0.0.1]:45006 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1groY8-0007jw-1l for importer@patchew.org; Thu, 07 Feb 2019 13:37:24 -0500 Received: from eggs.gnu.org ([209.51.188.92]:58015) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1grnws-0002rl-2A for qemu-devel@nongnu.org; Thu, 07 Feb 2019 12:58:56 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1grnwq-0002j5-CG for qemu-devel@nongnu.org; Thu, 07 Feb 2019 12:58:53 -0500 Received: from mail-wr1-x444.google.com ([2a00:1450:4864:20::444]:45693) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1grnwq-0002ZH-2s for qemu-devel@nongnu.org; Thu, 07 Feb 2019 12:58:52 -0500 Received: by mail-wr1-x444.google.com with SMTP id q15so772003wro.12 for ; Thu, 07 Feb 2019 09:58:27 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id q12sm12708982wmf.2.2019.02.07.09.58.25 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 07 Feb 2019 09:58:25 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=H7eH6itBNH0SztRrx9P9amMmHNYNPrVr/pi1U+O4hp0=; b=T+8uiodx15bKT323w6Rnz7wugJFq+vaHhL7ZQFBMGuuV9Z71Xyl27CkJcnpRJYTBsj p3qnOZuPli9sonLVv5wtyR0mmrYTd+egzDKFlfUwIbOuRAN1CXU/IMqjYDB6DS9hSGdu WSHo9uTUnYAyhUS2qTlcLH/yHfePL7JI4G28q8t7vxS3I9we0DECzchmWhj0AsDtuRa4 TbHBaLJJMHtsVyKxABPcMgdQAseHKWhpaGXe7/IepJBWxvHFpZSGzvsBMgyjlE1+BqE1 o2I5wSWIe2gN0Wmwf9yuwQWc6JhT/vJS8mF1Q1wQvq2L4Qg+xqiBS0WLj206B/w2E0j2 U6cw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=H7eH6itBNH0SztRrx9P9amMmHNYNPrVr/pi1U+O4hp0=; b=XleDwXM20vkrtoLBferp6e4p4Z6DPwdc5SQC+KWJaQyO2nEN+1tpPVsOj+b/lIctKx g5vdmt7f0o0D9fqXgckzDLPOE1HKYT91tdgnH0LFNg57iFiJ+U6Q9H56pPWmmYlvZdfB WHDI1dqAgCLP0e95NQYB7MYVZAoYjhk0G9BxkGq68Y04sVsDYigpcQ9UwMQgvuamUjgn MnzFxMe7Khk7j5eXrQH6ZoW8u6T62AyTQRLzEH6u41TBkdY6b4lOD56k0fR7gd/IXXZ+ kyqUagqXDrsbwYOV8LxOYJALvpAD5h35FKvGBgxGU9aiWYJ7nf34RlL71pLefMHoPO7s TR4Q== X-Gm-Message-State: AHQUAuaXCKV/Zny3vRtrC3c9FTLUVVGY//vHxm7XJ9Dn4xfW6dvv0eAq x1JwAotrscEMMInQzrckiN+3ktF+ X-Google-Smtp-Source: AHgI3IaTVV1f35z/LQhjRBceQgKBPvFHuJO0tHOWFCh4akXxZ7wQwr9RW17wJVaW30sBdBphB98etw== X-Received: by 2002:a5d:6152:: with SMTP id y18mr13956759wrt.141.1549562306388; Thu, 07 Feb 2019 09:58:26 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Thu, 7 Feb 2019 18:57:33 +0100 Message-Id: <1549562254-41157-51-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1549562254-41157-1-git-send-email-pbonzini@redhat.com> References: <1549562254-41157-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::444 Subject: [Qemu-devel] [PATCH 50/51] .travis.yml: test that no-default-device builds do not regress X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: thuth@redhat.com, philmd@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Signed-off-by: Paolo Bonzini Reviewed-by: Michael S. Tsirkin --- .travis.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.travis.yml b/.travis.yml index 87d9fa9..a095d22 100644 --- a/.travis.yml +++ b/.travis.yml @@ -132,6 +132,12 @@ matrix: =20 # We manually include builds which we disable "make check" for - env: + - CONFIG=3D"--without-default-devices" + - TEST_CMD=3D"" + + + # We manually include builds which we disable "make check" for + - env: - CONFIG=3D"--enable-debug --enable-tcg-interpreter" - TEST_CMD=3D"" =20 --=20 1.8.3.1 From nobody Wed Apr 24 17:06:17 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1549564455590206.81332531799683; Thu, 7 Feb 2019 10:34:15 -0800 (PST) Received: from localhost ([127.0.0.1]:44952 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1groV2-0005Gj-GP for importer@patchew.org; Thu, 07 Feb 2019 13:34:12 -0500 Received: from eggs.gnu.org ([209.51.188.92]:57966) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1grnwq-0002pb-Pj for qemu-devel@nongnu.org; Thu, 07 Feb 2019 12:58:55 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1grnwp-0002iC-Ms for qemu-devel@nongnu.org; Thu, 07 Feb 2019 12:58:52 -0500 Received: from mail-wm1-x343.google.com ([2a00:1450:4864:20::343]:38262) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1grnwp-0002Zt-EB for qemu-devel@nongnu.org; Thu, 07 Feb 2019 12:58:51 -0500 Received: by mail-wm1-x343.google.com with SMTP id v26so814483wmh.3 for ; Thu, 07 Feb 2019 09:58:28 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id q12sm12708982wmf.2.2019.02.07.09.58.26 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 07 Feb 2019 09:58:26 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=bGU6DN/yiLcS30nXpMwcBUwHTG5VcFf6NEzDf3p0Pe0=; b=II44DUOommwJdtBuQeOyh3cWgo1T/BHY+a/CNSl4AMhRORus+l0XcSzZVWWAHZWZvN dFnA9XxW5hMqmNu2VFkqM88n4Jce4Iz5j374tOgcA5VN/adOSYik2LdhIkZ/gzqWMkx1 cAU8zrhJfh6eBRfzLhTXQE/QMHB8NzVWfL9zmzYuJ+gNq9RhcG9Jjr5PhyTwKulJGuj9 I3Ijh+pR10A/iYG/9vwAtgwC71KTbC+flY+fD97gswaAAYjVrl99JGEChkwxEpetfNwk bMx1W8YYHZLjr0ZOeb4/4nSfxCmWJUwlxKd++H0Q/wawqcTtTUF62eiWUTmSKyFFzkxW Doow== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=bGU6DN/yiLcS30nXpMwcBUwHTG5VcFf6NEzDf3p0Pe0=; b=oNw5cq/JPh0luEoobtaxy+otionHo2zJbpRVsbD9wes0sKR6LcRytzI4bEVbErBeb5 wASvXZai85OaDZ+KB53nNV0ko9KbWWsvTBJaaqOGvAARTrpz9XsIrWmopbOgxMh0fPgJ Wofl9LS96hiiWGKh1XFzYzIKQHCoJtI+g0ygClzqwlOcaYRby3cOmylUK9qd+o0SnR19 +U2pNFFnI93XDls4WvVU8tGeUARI2ikZNvzzyfmWl4nrQi1z3rmoLKPnKlBv/AiuCIW+ N0h4mc6J/FiQbt1Q7RaFfFZTuh/0u7Xt4VsoVEjOY8oLvv+PQGLrlnBG0G4bm9g+VHMz T9ow== X-Gm-Message-State: AHQUAubhEHmle+V0tNCAi24VK3TtbNUmdOjzUzpFI+LOB6ynpv1HXpvW MPlYC6vaIrP+09OHsnu/V9YBdkz1 X-Google-Smtp-Source: AHgI3Iak6MSg99aA+w3NBr7iq0T/F71NAY62fKx03ndikSuK78Al22clq3jThToplrp0sascFXGh+g== X-Received: by 2002:a1c:7c07:: with SMTP id x7mr8426497wmc.82.1549562307178; Thu, 07 Feb 2019 09:58:27 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Thu, 7 Feb 2019 18:57:34 +0100 Message-Id: <1549562254-41157-52-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1549562254-41157-1-git-send-email-pbonzini@redhat.com> References: <1549562254-41157-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::343 Subject: [Qemu-devel] [PATCH 51/51] FIXME vhost: add more stubs X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: thuth@redhat.com, philmd@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Due to the dependency of net/ against hw/net/, it is not possible to compile out hw/net/vhost_net.c for now. Add more stubs to allow it to compile when hw/net/vhost.c is missing. (To be re-evaluated after rebase on top of the revamped vhost_net configury= ). Signed-off-by: Paolo Bonzini Reviewed-by: Michael S. Tsirkin --- hw/virtio/vhost-stub.c | 58 ++++++++++++++++++++++++++++++++++++++++++++++= ++++ 1 file changed, 58 insertions(+) diff --git a/hw/virtio/vhost-stub.c b/hw/virtio/vhost-stub.c index 049089b..ef8e54d 100644 --- a/hw/virtio/vhost-stub.c +++ b/hw/virtio/vhost-stub.c @@ -15,3 +15,61 @@ VhostUserState *vhost_user_init(void) void vhost_user_cleanup(VhostUserState *user) { } + +int vhost_dev_init(struct vhost_dev *hdev, void *opaque, + VhostBackendType backend_type, uint32_t busyloop_timeou= t) +{ + return -ENODEV; +} + +void vhost_dev_cleanup(struct vhost_dev *hdev) +{ +} + +int vhost_dev_start(struct vhost_dev *hdev, VirtIODevice *vdev) +{ + abort(); +} + +void vhost_dev_stop(struct vhost_dev *hdev, VirtIODevice *vdev) +{ +} + +int vhost_dev_enable_notifiers(struct vhost_dev *hdev, VirtIODevice *vdev) +{ + abort(); +} + +void vhost_dev_disable_notifiers(struct vhost_dev *hdev, VirtIODevice *vde= v) +{ + abort(); +} + +int vhost_net_set_backend(struct vhost_dev *hdev, + struct vhost_vring_file *file) +{ + abort(); +} + +uint64_t vhost_get_features(struct vhost_dev *hdev, const int *feature_bit= s, + uint64_t features) +{ + abort(); +} + +void vhost_ack_features(struct vhost_dev *hdev, const int *feature_bits, + uint64_t features) +{ + abort(); +} + +bool vhost_virtqueue_pending(struct vhost_dev *hdev, int n) +{ + abort(); +} + +void vhost_virtqueue_mask(struct vhost_dev *hdev, VirtIODevice *vdev, int = n, + bool mask) +{ + abort(); +} --=20 1.8.3.1