[PATCH 3/3] hw/boards: Remove MachineState::usb_disabled field

Philippe Mathieu-Daudé posted 3 patches 5 months, 3 weeks ago
Maintainers: Eduardo Habkost <eduardo@habkost.net>, Marcel Apfelbaum <marcel.apfelbaum@gmail.com>, "Philippe Mathieu-Daudé" <philmd@linaro.org>, Yanan Wang <wangyanan55@huawei.com>, Zhao Liu <zhao1.liu@intel.com>, Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>, Nicholas Piggin <npiggin@gmail.com>, Daniel Henrique Barboza <danielhb413@gmail.com>, Harsh Prateek Bora <harshpb@linux.ibm.com>
[PATCH 3/3] hw/boards: Remove MachineState::usb_disabled field
Posted by Philippe Mathieu-Daudé 5 months, 3 weeks ago
Commit c6e765035bc ("powerpc: fix -machine usb=no for newworld
and pseries machines") added the MachineState::usb_disabled
field. It is now unused, remove it.

Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
 include/hw/boards.h | 1 -
 hw/core/machine.c   | 1 -
 2 files changed, 2 deletions(-)

diff --git a/include/hw/boards.h b/include/hw/boards.h
index a7b1fcffae3..7d9149242ea 100644
--- a/include/hw/boards.h
+++ b/include/hw/boards.h
@@ -406,7 +406,6 @@ struct MachineState {
     bool dump_guest_core;
     bool mem_merge;
     bool usb;
-    bool usb_disabled;
     char *firmware;
     bool iommu;
     bool suppress_vmdesc;
diff --git a/hw/core/machine.c b/hw/core/machine.c
index c3f3a5020d0..896b5067214 100644
--- a/hw/core/machine.c
+++ b/hw/core/machine.c
@@ -498,7 +498,6 @@ static void machine_set_usb(Object *obj, bool value, Error **errp)
     MachineState *ms = MACHINE(obj);
 
     ms->usb = value;
-    ms->usb_disabled = !value;
 }
 
 static bool machine_get_graphics(Object *obj, Error **errp)
-- 
2.47.1