qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: "Philippe Mathieu-Daudé" <philmd@redhat.com>
To: qemu-devel@nongnu.org
Cc: "Damien Hedde" <damien.hedde@greensocs.com>,
	"Daniel P. Berrangé" <berrange@redhat.com>,
	"Eduardo Habkost" <ehabkost@redhat.com>,
	"Alistair Francis" <alistair.francis@wdc.com>,
	"Paolo Bonzini" <pbonzini@redhat.com>,
	"Philippe Mathieu-Daudé" <philmd@redhat.com>
Subject: [PULL 09/10] qdev-monitor: Check sysbus device type before creating it
Date: Mon,  1 Nov 2021 19:42:58 +0100	[thread overview]
Message-ID: <20211101184259.2859090-10-philmd@redhat.com> (raw)
In-Reply-To: <20211101184259.2859090-1-philmd@redhat.com>

From: Damien Hedde <damien.hedde@greensocs.com>

Add an early check to test if the requested sysbus device type
is allowed by the current machine before creating the device. This
impacts both -device cli option and device_add qmp command.

Before this patch, the check was done well after the device has
been created (in a machine init done notifier). We can now report
the error right away.

Signed-off-by: Damien Hedde <damien.hedde@greensocs.com>
Reviewed-by: Alistair Francis <alistair.francis@wdc.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Acked-by: Eduardo Habkost <ehabkost@redhat.com>
Message-Id: <20211029142258.484907-3-damien.hedde@greensocs.com>
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
 softmmu/qdev-monitor.c | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/softmmu/qdev-monitor.c b/softmmu/qdev-monitor.c
index 4851de51a5c..e49d9773d2d 100644
--- a/softmmu/qdev-monitor.c
+++ b/softmmu/qdev-monitor.c
@@ -42,6 +42,7 @@
 #include "qemu/cutils.h"
 #include "hw/qdev-properties.h"
 #include "hw/clock.h"
+#include "hw/boards.h"
 
 /*
  * Aliases were a bad idea from the start.  Let's keep them
@@ -254,6 +255,16 @@ static DeviceClass *qdev_get_device_class(const char **driver, Error **errp)
         return NULL;
     }
 
+    if (object_class_dynamic_cast(oc, TYPE_SYS_BUS_DEVICE)) {
+        /* sysbus devices need to be allowed by the machine */
+        MachineClass *mc = MACHINE_CLASS(object_get_class(qdev_get_machine()));
+        if (!device_type_is_dynamic_sysbus(mc, *driver)) {
+            error_setg(errp, QERR_INVALID_PARAMETER_VALUE, "driver",
+                       "a dynamic sysbus device type for the machine");
+            return NULL;
+        }
+    }
+
     return dc;
 }
 
-- 
2.31.1



  parent reply	other threads:[~2021-11-01 19:44 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-11-01 18:42 [PULL 00/10] Machine-next patches for 2021-11-01 Philippe Mathieu-Daudé
2021-11-01 18:42 ` [PULL 01/10] machine: Move gpio code to hw/core/gpio.c Philippe Mathieu-Daudé
2021-11-01 18:42 ` [PULL 02/10] hw/core: Restrict sysemu specific files Philippe Mathieu-Daudé
2021-11-01 18:42 ` [PULL 03/10] hw/core: Declare meson source set Philippe Mathieu-Daudé
2021-11-01 18:42 ` [PULL 04/10] hw/core: Extract hotplug-related functions to qdev-hotplug.c Philippe Mathieu-Daudé
2021-11-01 18:42 ` [PULL 05/10] hw/core: Restrict hotplug to system emulation Philippe Mathieu-Daudé
2021-11-01 18:42 ` [PULL 06/10] hw/core/machine: Split out the smp parsing code Philippe Mathieu-Daudé
2021-11-01 18:42 ` [PULL 07/10] tests/unit: Add an unit test for smp parsing Philippe Mathieu-Daudé
2021-11-01 18:42 ` [PULL 08/10] machine: add device_type_is_dynamic_sysbus function Philippe Mathieu-Daudé
2021-11-01 18:42 ` Philippe Mathieu-Daudé [this message]
2021-11-01 18:42 ` [PULL 10/10] machine: remove the done notifier for dynamic sysbus device type check Philippe Mathieu-Daudé
2021-11-02 11:24 ` [PULL 00/10] Machine-next patches for 2021-11-01 Richard Henderson

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=20211101184259.2859090-10-philmd@redhat.com \
    --to=philmd@redhat.com \
    --cc=alistair.francis@wdc.com \
    --cc=berrange@redhat.com \
    --cc=damien.hedde@greensocs.com \
    --cc=ehabkost@redhat.com \
    --cc=pbonzini@redhat.com \
    --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).