From: Eduardo Habkost <ehabkost@redhat.com>
To: Peter Maydell <peter.maydell@linaro.org>, qemu-devel@nongnu.org
Cc: Marcel Apfelbaum <marcel@redhat.com>, qemu-arm@nongnu.org
Subject: [Qemu-devel] [PULL 07/19] hw/arm/virt: Allow only supported dynamic sysbus devices
Date: Thu, 18 Jan 2018 00:09:48 -0200 [thread overview]
Message-ID: <20180118021000.27203-8-ehabkost@redhat.com> (raw)
In-Reply-To: <20180118021000.27203-1-ehabkost@redhat.com>
Replace the TYPE_SYS_BUS_DEVICE entry in the allowed sysbus
device list with the two device types that are really supported
by the virt machine: vfio-amd-xgbe and vfio-calxeda-xgmac.
Cc: Peter Maydell <peter.maydell@linaro.org>
Cc: qemu-arm@nongnu.org
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
Message-Id: <20171125151610.20547-3-ehabkost@redhat.com>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
---
hw/arm/virt.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/hw/arm/virt.c b/hw/arm/virt.c
index 7549895fd2..4a6fdcc4f5 100644
--- a/hw/arm/virt.c
+++ b/hw/arm/virt.c
@@ -34,6 +34,8 @@
#include "hw/arm/arm.h"
#include "hw/arm/primecell.h"
#include "hw/arm/virt.h"
+#include "hw/vfio/vfio-calxeda-xgmac.h"
+#include "hw/vfio/vfio-amd-xgbe.h"
#include "hw/devices.h"
#include "net/net.h"
#include "sysemu/block-backend.h"
@@ -1591,8 +1593,8 @@ static void virt_machine_class_init(ObjectClass *oc, void *data)
* configuration of the particular instance.
*/
mc->max_cpus = 255;
- /*TODO: allow only sysbus devices that really work with this machine */
- machine_class_allow_dynamic_sysbus_dev(mc, TYPE_SYS_BUS_DEVICE);
+ machine_class_allow_dynamic_sysbus_dev(mc, TYPE_VFIO_CALXEDA_XGMAC);
+ machine_class_allow_dynamic_sysbus_dev(mc, TYPE_VFIO_AMD_XGBE);
mc->block_default_type = IF_VIRTIO;
mc->no_cdrom = 1;
mc->pci_allow_0_address = true;
--
2.14.3
next prev parent reply other threads:[~2018-01-18 2:10 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-01-18 2:09 [Qemu-devel] [PULL 00/19] machine queue, 2018-01-18 Eduardo Habkost
2018-01-18 2:09 ` [Qemu-devel] [PULL 01/19] memfd: split qemu_memfd_alloc() Eduardo Habkost
2018-01-18 2:09 ` [Qemu-devel] [PULL 02/19] memfd: remove needless include Eduardo Habkost
2018-01-18 2:09 ` [Qemu-devel] [PULL 03/19] qemu-options: document missing memory-backend-file options Eduardo Habkost
2018-01-18 2:09 ` [Qemu-devel] [PULL 04/19] qemu-options: document memory-backend-ram Eduardo Habkost
2018-01-18 2:09 ` [Qemu-devel] [PULL 05/19] numa: fix missing '-numa cpu' in '-help' output Eduardo Habkost
2018-01-18 2:09 ` [Qemu-devel] [PULL 06/19] machine: Replace has_dynamic_sysbus with list of allowed devices Eduardo Habkost
2018-01-18 2:09 ` Eduardo Habkost [this message]
2018-01-18 2:09 ` [Qemu-devel] [PULL 08/19] ppc: e500: Allow only supported dynamic sysbus devices Eduardo Habkost
2018-01-18 2:09 ` [Qemu-devel] [PULL 09/19] spapr: " Eduardo Habkost
2018-01-18 2:09 ` [Qemu-devel] [PULL 10/19] xen: Add only xen-sysdev to dynamic sysbus device list Eduardo Habkost
2018-01-18 2:09 ` [Qemu-devel] [PULL 11/19] q35: Allow only supported dynamic sysbus devices Eduardo Habkost
2018-01-18 2:09 ` [Qemu-devel] [PULL 12/19] qdev_monitor: Simplify error handling in qdev_device_add() Eduardo Habkost
2018-01-18 2:09 ` [Qemu-devel] [PULL 13/19] qdev: Check for the availability of a hotplug controller before adding a device Eduardo Habkost
2018-01-18 2:09 ` [Qemu-devel] [PULL 14/19] scripts: Remove fixed entries from the device-crash-test Eduardo Habkost
2018-01-18 2:09 ` [Qemu-devel] [PULL 15/19] hostmem-file: add "align" option Eduardo Habkost
2018-01-18 2:09 ` [Qemu-devel] [PULL 16/19] nvdimm: add a macro for property "label-size" Eduardo Habkost
2018-01-18 2:09 ` [Qemu-devel] [PULL 17/19] nvdimm: add 'unarmed' option Eduardo Habkost
2018-01-18 2:09 ` [Qemu-devel] [PULL 18/19] possible_cpus: add CPUArchId::type field Eduardo Habkost
2018-01-18 2:10 ` [Qemu-devel] [PULL 19/19] fw_cfg: fix memory corruption when all fw_cfg slots are used Eduardo Habkost
2018-01-18 15:22 ` [Qemu-devel] [PULL 00/19] machine queue, 2018-01-18 Peter Maydell
2018-01-18 15:36 ` Philippe Mathieu-Daudé
2018-01-18 19:59 ` Eduardo Habkost
2018-01-18 20:14 ` Eduardo Habkost
2018-01-18 21:20 ` Eduardo Habkost
2018-01-19 0:47 ` Haozhong Zhang
2018-01-19 13:15 ` Eduardo Habkost
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180118021000.27203-8-ehabkost@redhat.com \
--to=ehabkost@redhat.com \
--cc=marcel@redhat.com \
--cc=peter.maydell@linaro.org \
--cc=qemu-arm@nongnu.org \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).