RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-26 02:17:34 +00:00
Code Issues Activity Actions

Kernel/VirtIO: Don't expose constructors as public method

Browse source 
This leads to a bad pattern where anyone could create an RNG or a
Console object. Instead, let's just use the common pattern of a static
method to instantiate a new object and return it wrapped by a
NonnullRefPtr.
This commit is contained in:
Liav A 2021-08-27 12:32:05 +03:00 • committed by Andreas Kling
parent 01ae614727
commit 8e90a4fd1c
5 changed files with 16 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Kernel/Bus/VirtIO/Console.cpp
View file

@ -12,6 +12,11 @@ namespace Kernel::VirtIO {
unsigned Console::next_device_id = 0; unsigned Console::next_device_id = 0;
UNMAP_AFTER_INIT NonnullRefPtr<Console> Console::must_create(PCI::Address address)
{
return adopt_ref_if_nonnull(new Console(address)).release_nonnull();
}
UNMAP_AFTER_INIT Console::Console(PCI::Address address) UNMAP_AFTER_INIT Console::Console(PCI::Address address)
: VirtIO::Device(address) : VirtIO::Device(address)
, m_device_id(next_device_id++) , m_device_id(next_device_id++)

3
Kernel/Bus/VirtIO/Console.h
View file

@ -18,7 +18,7 @@ class Console
friend VirtIO::ConsolePort; friend VirtIO::ConsolePort;
public: public:
Console(PCI::Address); static NonnullRefPtr<Console> must_create(PCI::Address address);
virtual ~Console() override = default; virtual ~Console() override = default;
virtual StringView purpose() const override { return class_name(); } virtual StringView purpose() const override { return class_name(); }
@ -30,6 +30,7 @@ public:
private: private:
virtual StringView class_name() const override { return "VirtIOConsole"; } virtual StringView class_name() const override { return "VirtIOConsole"; }
explicit Console(PCI::Address);
enum class ControlEvent : u16 { enum class ControlEvent : u16 {
DeviceReady = 0, DeviceReady = 0,
DeviceAdd = 1, DeviceAdd = 1,

4
Kernel/Bus/VirtIO/Device.cpp
View file

@ -25,11 +25,11 @@ UNMAP_AFTER_INIT void detect()
return; return;
switch (id.device_id) { switch (id.device_id) {
case PCI::DeviceID::VirtIOConsole: { case PCI::DeviceID::VirtIOConsole: {
[[maybe_unused]] auto& unused = adopt_ref(*new Console(address)).leak_ref(); [[maybe_unused]] auto& unused = Console::must_create(address).leak_ref();
break; break;
} }
case PCI::DeviceID::VirtIOEntropy: { case PCI::DeviceID::VirtIOEntropy: {
[[maybe_unused]] auto& unused = adopt_ref(*new RNG(address)).leak_ref(); [[maybe_unused]] auto& unused = RNG::must_create(address).leak_ref();
break; break;
} }
case PCI::DeviceID::VirtIOGPU: { case PCI::DeviceID::VirtIOGPU: {

5
Kernel/Bus/VirtIO/RNG.cpp
View file

@ -9,6 +9,11 @@
namespace Kernel::VirtIO { namespace Kernel::VirtIO {
UNMAP_AFTER_INIT NonnullRefPtr<RNG> RNG::must_create(PCI::Address address)
{
return adopt_ref_if_nonnull(new RNG(address)).release_nonnull();
}
UNMAP_AFTER_INIT RNG::RNG(PCI::Address address) UNMAP_AFTER_INIT RNG::RNG(PCI::Address address)
: VirtIO::Device(address) : VirtIO::Device(address)
{ {

4
Kernel/Bus/VirtIO/RNG.h
View file

@ -19,13 +19,13 @@ class RNG final
: public RefCounted<RNG> : public RefCounted<RNG>
, public VirtIO::Device { , public VirtIO::Device {
public: public:
static NonnullRefPtr<RNG> must_create(PCI::Address address);
virtual StringView purpose() const override { return class_name(); } virtual StringView purpose() const override { return class_name(); }
RNG(PCI::Address);
virtual ~RNG() override; virtual ~RNG() override;
private: private:
virtual StringView class_name() const override { return "VirtIOConsole"; } virtual StringView class_name() const override { return "VirtIOConsole"; }
explicit RNG(PCI::Address);
virtual bool handle_device_config_change() override; virtual bool handle_device_config_change() override;
virtual void handle_queue_update(u16 queue_index) override; virtual void handle_queue_update(u16 queue_index) override;
void request_entropy_from_host(); void request_entropy_from_host();