diff options
| author | Anthony Liguori <aliguori@amazon.com> | 2013-12-13 11:10:33 -0800 |
|---|---|---|
| committer | Anthony Liguori <aliguori@amazon.com> | 2013-12-13 11:10:33 -0800 |
| commit | e157b8fdd412d48eacfbb8c67d3d58780154faa3 (patch) | |
| tree | 621e66b014eb9646ace29098e0aa7b8c9419ff46 /tests | |
| parent | 5d0e2280cc344f1b939acff431ed2731a9ee7db5 (diff) | |
| parent | 306ec6c3cece7004429c79c1ac93d49919f1f1cc (diff) | |
Merge remote-tracking branch 'bonzini/virtio' into staging
# By Andreas Färber (18) and Paolo Bonzini (12)
# Via Paolo Bonzini
* bonzini/virtio: (30 commits)
virtio: Convert exit to unrealize
virtio: Complete converting VirtioDevice to QOM realize
virtio-scsi: Convert to QOM realize
virtio-rng: Convert to QOM realize
virtio-balloon: Convert to QOM realize
virtio-net: Convert to QOM realize
virtio-serial: Convert to QOM realize
virtio-blk: Convert to QOM realize
virtio-9p: Convert to QOM realize
virtio: Start converting VirtioDevice to QOM realize
virtio-scsi: QOM realize preparations
virtio-rng: QOM realize preparations
virtio-balloon: QOM realize preparations
virtio-net: QOM realize preparations
virtio-serial: QOM realize preparations
virtio-blk: QOM realize preparations
virtio-9p: QOM realize preparations
virtio-blk-dataplane: Improve error reporting
virtio-pci: add device_unplugged callback
virtio-rng: switch exit callback to VirtioDeviceClass
...
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/qdev-monitor-test.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/tests/qdev-monitor-test.c b/tests/qdev-monitor-test.c index 33a8ea4b9c..ba7f9cc238 100644 --- a/tests/qdev-monitor-test.c +++ b/tests/qdev-monitor-test.c @@ -32,10 +32,8 @@ static void test_device_add(void) "}}"); g_assert(response); error = qdict_get_qdict(response, "error"); - g_assert(!strcmp(qdict_get_try_str(error, "class") ?: "", - "GenericError")); g_assert(!strcmp(qdict_get_try_str(error, "desc") ?: "", - "Device initialization failed.")); + "Device needs media, but drive is empty")); QDECREF(response); /* Delete the drive */ |