diff options
| author | Kevin Wolf | 2017-01-24 13:43:31 +0100 |
|---|---|---|
| committer | Kevin Wolf | 2017-02-28 20:40:36 +0100 |
| commit | a17c17a274f24f0c0259f89d288f29b8ce0511aa (patch) | |
| tree | 592723a71539dd34bdb76b7fe74f9898be7dcb90 /hw/block/nvme.c | |
| parent | block: Allow error return in BlockDevOps.change_media_cb() (diff) | |
| download | qemu-a17c17a274f24f0c0259f89d288f29b8ce0511aa.tar.gz qemu-a17c17a274f24f0c0259f89d288f29b8ce0511aa.tar.xz qemu-a17c17a274f24f0c0259f89d288f29b8ce0511aa.zip | |
hw/block: Request permissions
This makes all device emulations with a qdev drive property request
permissions on their BlockBackend. The only thing we block at this point
is resizing images for some devices that can't support it.
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Acked-by: Fam Zheng <famz@redhat.com>
Reviewed-by: Max Reitz <mreitz@redhat.com>
Diffstat (limited to 'hw/block/nvme.c')
| -rw-r--r-- | hw/block/nvme.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/hw/block/nvme.c b/hw/block/nvme.c index ae91a18f17..ae303d44e5 100644 --- a/hw/block/nvme.c +++ b/hw/block/nvme.c @@ -835,6 +835,7 @@ static int nvme_init(PCIDevice *pci_dev) int i; int64_t bs_size; uint8_t *pci_conf; + Error *local_err = NULL; if (!n->conf.blk) { return -1; @@ -850,7 +851,12 @@ static int nvme_init(PCIDevice *pci_dev) return -1; } blkconf_blocksizes(&n->conf); - blkconf_apply_backend_options(&n->conf); + blkconf_apply_backend_options(&n->conf, blk_is_read_only(n->conf.blk), + false, &local_err); + if (local_err) { + error_report_err(local_err); + return -1; + } pci_conf = pci_dev->config; pci_conf[PCI_INTERRUPT_PIN] = 1; |