From patchwork Tue Apr 7 05:51:54 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jon Doron X-Patchwork-Id: 1267211 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=DAFn+9OB; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 48xGnB0XKlz9sP7 for ; Tue, 7 Apr 2020 15:54:06 +1000 (AEST) Received: from localhost ([::1]:41650 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jLhBT-00077M-WC for incoming@patchwork.ozlabs.org; Tue, 07 Apr 2020 01:54:04 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60138) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jLh9q-0004gp-E1 for qemu-devel@nongnu.org; Tue, 07 Apr 2020 01:52:24 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jLh9p-0002Zb-CK for qemu-devel@nongnu.org; Tue, 07 Apr 2020 01:52:22 -0400 Received: from mail-wr1-x444.google.com ([2a00:1450:4864:20::444]:41951) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1jLh9p-0002ZD-6I for qemu-devel@nongnu.org; Tue, 07 Apr 2020 01:52:21 -0400 Received: by mail-wr1-x444.google.com with SMTP id h9so2370376wrc.8 for ; Mon, 06 Apr 2020 22:52:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Hp0TKGKSi/gHtI8I2mIP8YOmXXrvnTmTwZnNNAObxR0=; b=DAFn+9OBHJ3XePhKbPeuQtEXXAeLDkQJUVhVDSKxHdjsiWMkDzfbM8qcW6ul+vVVNc rGgcT0o4Eu3X51JfbgqHsx5TQZtWqWUvNFSC53olLwshhtwcpZzHu2NxAeTzTGKGCtLl OBR+7T50MxNdLjMmlyeQEpPfx/i/0VhC5O1t6f/F+BnBOJ+z4P0Zb/jmGfvsBTKrzrTv XeMykA0N3APeR+bxZK7gDJFWJY9+WY6ecGwwfpyeovOGzmB+G+3SEWtwUaUWSxL21DUJ 1Fuv5E2Bdbrq30mGlxaaJBouOyR4WeWvys9AV1+eaC1xgJWCNYhz4kGk+Umo47ZnlWHB 9Q0A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Hp0TKGKSi/gHtI8I2mIP8YOmXXrvnTmTwZnNNAObxR0=; b=Fhm1UTNTr9lOAo0cMYZJEtQvCqnzx9FDqXxB1AooiesBWVG41S9hV37OFK/tLm6/5/ 3brGPMGHGtKHv55fQ4BoOsQpW6Ji6IOQJWT2HFK7DM8Dq6klGXJiqQGpNAi+qmXqyjrf me1Bf4unNREy3bHEn4sTlSFM2wyVRCrHjZaliq5PEzc2CGo9UbvDahuz+sVLBJqf00iY OB8DbdYfDDesO6ZxebYtazTcgKbbTIambuKfYKNKjgCkXRui7qejtmaOkMkuk0b3MhLH YUgYLpuB/zkU1uv1Nto78vvZEWuTToAx4zhLf3R+GyF2ZF4LwPxQUUA8gRG0aR9+es0r spJg== X-Gm-Message-State: AGi0PuYqC0MqmaD10I0dhuz7wG7awlouB6TQzA0K+n4T4copLlYVsfv1 sAasOlhMnrr+c4fIX/LUEk8HxhA7C1c= X-Google-Smtp-Source: APiQypIuC3OFNyEw5O9VDW0yU59O2AM++DydssQssSVurW7MrWqb5wSZTXJnwiVNaiTexYB15JuLjA== X-Received: by 2002:adf:f74d:: with SMTP id z13mr795119wrp.55.1586238740036; Mon, 06 Apr 2020 22:52:20 -0700 (PDT) Received: from jondnuc.lan (IGLD-84-229-155-55.inter.net.il. [84.229.155.55]) by smtp.gmail.com with ESMTPSA id n11sm32271007wrg.72.2020.04.06.22.52.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 06 Apr 2020 22:52:19 -0700 (PDT) From: Jon Doron To: qemu-devel@nongnu.org Subject: [PATCH v3 5/7] i386:pc: whitelist dynamic vmbus-bridge Date: Tue, 7 Apr 2020 08:51:54 +0300 Message-Id: <20200407055156.137249-6-arilou@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200407055156.137249-1-arilou@gmail.com> References: <20200407055156.137249-1-arilou@gmail.com> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::444 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: mail@maciej.szmigiero.name, eyakovlev@virtuozzo.com, ehabkost@redhat.com, rvkagan@gmail.com, liran.alon@oracle.com, Roman Kagan , pbonzini@redhat.com, vkuznets@redhat.com, "Maciej S . Szmigiero" , Jon Doron Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" As vmbus-bridge is derived from sysbus device, it has to be whitelisted to be allowed to be created with -device. Signed-off-by: Roman Kagan Signed-off-by: Maciej S. Szmigiero Signed-off-by: Jon Doron --- hw/i386/pc_piix.c | 2 ++ hw/i386/pc_q35.c | 2 ++ 2 files changed, 4 insertions(+) diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c index 9cceae3e2c..6daa0770fa 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -60,6 +60,7 @@ #include "migration/global_state.h" #include "migration/misc.h" #include "sysemu/numa.h" +#include "hw/hyperv/vmbus-bridge.h" #include "hw/mem/nvdimm.h" #define MAX_IDE_BUS 2 @@ -417,6 +418,7 @@ static void pc_i440fx_machine_options(MachineClass *m) m->default_machine_opts = "firmware=bios-256k.bin"; m->default_display = "std"; machine_class_allow_dynamic_sysbus_dev(m, TYPE_RAMFB_DEVICE); + machine_class_allow_dynamic_sysbus_dev(m, TYPE_VMBUS_BRIDGE); } static void pc_i440fx_5_0_machine_options(MachineClass *m) diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c index d37c425e22..faaa39ced2 100644 --- a/hw/i386/pc_q35.c +++ b/hw/i386/pc_q35.c @@ -53,6 +53,7 @@ #include "qapi/error.h" #include "qemu/error-report.h" #include "sysemu/numa.h" +#include "hw/hyperv/vmbus-bridge.h" #include "hw/mem/nvdimm.h" /* ICH9 AHCI has 6 ports */ @@ -346,6 +347,7 @@ static void pc_q35_machine_options(MachineClass *m) machine_class_allow_dynamic_sysbus_dev(m, TYPE_AMD_IOMMU_DEVICE); machine_class_allow_dynamic_sysbus_dev(m, TYPE_INTEL_IOMMU_DEVICE); machine_class_allow_dynamic_sysbus_dev(m, TYPE_RAMFB_DEVICE); + machine_class_allow_dynamic_sysbus_dev(m, TYPE_VMBUS_BRIDGE); m->max_cpus = 288; }