diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2021-03-19 15:24:59 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2021-03-19 15:24:59 +0000 |
| commit | 8631a430e65ef73b3d8a297128be2ef3c7317b90 (patch) | |
| tree | aacaa13dc9879b923b9ea13864742d39b7c3b411 /softmmu | |
| parent | 92566947b3ac5ca75f91a34acb188219c455fc71 (diff) | |
| parent | bb3c92ed105f0704ffd1cc1dc6031b6d457c829e (diff) | |
Merge remote-tracking branch 'remotes/armbru/tags/pull-qom-fdc-2021-03-16-v5' into staging
QOM and fdc patches patches for 2021-03-16
# gpg: Signature made Fri 19 Mar 2021 14:18:47 GMT
# gpg: using RSA key 354BC8B3D7EB2A6B68674E5F3870B400EB918653
# gpg: issuer "armbru@redhat.com"
# gpg: Good signature from "Markus Armbruster <armbru@redhat.com>" [full]
# gpg: aka "Markus Armbruster <armbru@pond.sub.org>" [full]
# Primary key fingerprint: 354B C8B3 D7EB 2A6B 6867 4E5F 3870 B400 EB91 8653
* remotes/armbru/tags/pull-qom-fdc-2021-03-16-v5:
memory: Drop "qemu:" prefix from QOM memory region type names
hw: Replace anti-social QOM type names
blockdev: Drop deprecated bogus -drive interface type
fdc: Inline fdctrl_connect_drives() into fdctrl_realize_common()
fdc: Drop deprecated floppy configuration
docs/system/deprecated: Fix note on fdc drive properties
fuzz: Avoid deprecated misuse of -drive if=sd
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'softmmu')
| -rw-r--r-- | softmmu/vl.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/softmmu/vl.c b/softmmu/vl.c index cba7ab3441..d7f0b029dc 100644 --- a/softmmu/vl.c +++ b/softmmu/vl.c @@ -925,7 +925,7 @@ static const VGAInterfaceInfo vga_interfaces[VGA_TYPE_MAX] = { [VGA_TCX] = { .opt_name = "tcx", .name = "TCX framebuffer", - .class_names = { "SUNW,tcx" }, + .class_names = { "sun-tcx" }, }, [VGA_CG3] = { .opt_name = "cg3", @@ -2511,13 +2511,7 @@ static void qemu_init_board(void) /* From here on we enter MACHINE_PHASE_INITIALIZED. */ machine_run_board_init(current_machine); - /* - * TODO To drop support for deprecated bogus if=..., move - * drive_check_orphaned() here, replacing this call. Also drop - * its deprecation warning, along with DriveInfo member - * @claimed_by_board. - */ - drive_mark_claimed_by_board(); + drive_check_orphaned(); realtime_init(); |