diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2012-07-18 14:44:50 -0500 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2012-07-18 14:44:50 -0500 |
| commit | dfe1ce5d80cba603bafaac91b239d683abe19cf7 (patch) | |
| tree | 15aa6b143325c83b61871216ccb44ebd545f9aaa /hw/virtio-pci.c | |
| parent | 09f06a6c603ce64284287d32f6ffadaaa5064850 (diff) | |
| parent | c3cdc1b0ff84d1cfed0c8052d2c83f8ecbf24166 (diff) | |
| download | focaccia-qemu-dfe1ce5d80cba603bafaac91b239d683abe19cf7.tar.gz focaccia-qemu-dfe1ce5d80cba603bafaac91b239d683abe19cf7.zip | |
Merge remote-tracking branch 'kwolf/for-anthony' into staging
* kwolf/for-anthony: (41 commits) fdc-test: Clean up a bit fdc-test: introduce test_relative_seek fdc: fix relative seek qemu-iotests: Valgrind support coroutine-ucontext: Help valgrind understand coroutines qemu-io: Fix memory leaks hw/block-common: Factor out fall back to legacy -drive cyls=... blockdev: Don't limit DriveInfo serial to 20 characters hw/block-common: Factor out fall back to legacy -drive serial=... hw/block-common: Move BlockConf & friends from block.h Relax IDE CHS limits from 16383,16,63 to 65535,16,255 blockdev: Drop redundant CHS validation for if=ide hd-geometry: Compute BIOS CHS translation in one place qtest: Test we don't put hard disk info into CMOS for a CD-ROM ide pc: Put hard disk info into CMOS only for hard disks block: Geometry and translation hints are now useless, purge them qtest: Cover qdev property for BIOS CHS translation ide: qdev property for BIOS CHS translation qdev: New property type chs-translation qdev: Collect private helpers in one place ...
Diffstat (limited to 'hw/virtio-pci.c')
| -rw-r--r-- | hw/virtio-pci.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/hw/virtio-pci.c b/hw/virtio-pci.c index a66c946f48..4e03f0b42c 100644 --- a/hw/virtio-pci.c +++ b/hw/virtio-pci.c @@ -887,6 +887,7 @@ static int virtio_balloon_exit_pci(PCIDevice *pci_dev) static Property virtio_blk_properties[] = { DEFINE_PROP_HEX32("class", VirtIOPCIProxy, class_code, 0), DEFINE_BLOCK_PROPERTIES(VirtIOPCIProxy, blk.conf), + DEFINE_BLOCK_CHS_PROPERTIES(VirtIOPCIProxy, blk.conf), DEFINE_PROP_STRING("serial", VirtIOPCIProxy, blk.serial), #ifdef __linux__ DEFINE_PROP_BIT("scsi", VirtIOPCIProxy, blk.scsi, 0, true), |