From: "Philippe Mathieu-Daudé" <philmd@redhat.com>
To: qemu-devel@nongnu.org
Cc: "Laurent Vivier" <lvivier@redhat.com>,
"Kevin Wolf" <kwolf@redhat.com>, "Thomas Huth" <thuth@redhat.com>,
qemu-block@nongnu.org,
"Philippe Mathieu-Daudé" <philmd@redhat.com>,
"Hanna Reitz" <hreitz@redhat.com>,
"Paolo Bonzini" <pbonzini@redhat.com>,
"John Snow" <jsnow@redhat.com>
Subject: [PATCH v4 1/3] hw/block/fdc: Extract blk_create_empty_drive()
Date: Wed, 24 Nov 2021 17:15:34 +0100 [thread overview]
Message-ID: <20211124161536.631563-2-philmd@redhat.com> (raw)
In-Reply-To: <20211124161536.631563-1-philmd@redhat.com>
We are going to re-use this code in the next commit,
so extract it as a new blk_create_empty_drive() function.
Inspired-by: Hanna Reitz <hreitz@redhat.com>
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
hw/block/fdc.c | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/hw/block/fdc.c b/hw/block/fdc.c
index fa933cd3263..1dbf3f6028f 100644
--- a/hw/block/fdc.c
+++ b/hw/block/fdc.c
@@ -61,6 +61,12 @@
} while (0)
+/* Anonymous BlockBackend for empty drive */
+static BlockBackend *blk_create_empty_drive(void)
+{
+ return blk_new(qemu_get_aio_context(), 0, BLK_PERM_ALL);
+}
+
/********************************************************/
/* qdev floppy bus */
@@ -486,8 +492,7 @@ static void floppy_drive_realize(DeviceState *qdev, Error **errp)
}
if (!dev->conf.blk) {
- /* Anonymous BlockBackend for an empty drive */
- dev->conf.blk = blk_new(qemu_get_aio_context(), 0, BLK_PERM_ALL);
+ dev->conf.blk = blk_create_empty_drive();
ret = blk_attach_dev(dev->conf.blk, qdev);
assert(ret == 0);
--
2.33.1
next prev parent reply other threads:[~2021-11-24 16:18 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-11-24 16:15 [PATCH v4 0/3] hw/block/fdc: Fix CVE-2021-20196 Philippe Mathieu-Daudé
2021-11-24 16:15 ` Philippe Mathieu-Daudé [this message]
2021-11-25 11:43 ` [PATCH v4 1/3] hw/block/fdc: Extract blk_create_empty_drive() Hanna Reitz
2021-11-24 16:15 ` [PATCH v4 2/3] hw/block/fdc: Kludge missing floppy drive to fix CVE-2021-20196 Philippe Mathieu-Daudé
2021-11-24 16:15 ` [PATCH v4 3/3] tests/qtest/fdc-test: Add a regression test for CVE-2021-20196 Philippe Mathieu-Daudé
2021-11-25 11:57 ` Hanna Reitz
2021-11-25 12:20 ` Philippe Mathieu-Daudé
2021-11-24 23:12 ` [PATCH v4 0/3] hw/block/fdc: Fix CVE-2021-20196 John Snow
2021-12-10 13:42 ` Kevin Wolf
2021-12-16 9:54 ` Philippe Mathieu-Daudé
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=20211124161536.631563-2-philmd@redhat.com \
--to=philmd@redhat.com \
--cc=hreitz@redhat.com \
--cc=jsnow@redhat.com \
--cc=kwolf@redhat.com \
--cc=lvivier@redhat.com \
--cc=pbonzini@redhat.com \
--cc=qemu-block@nongnu.org \
--cc=qemu-devel@nongnu.org \
--cc=thuth@redhat.com \
/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).