diff options
| author | Peter Maydell | 2014-10-06 11:59:55 +0200 |
|---|---|---|
| committer | Peter Maydell | 2014-10-06 11:59:56 +0200 |
| commit | 507ef2f9fab3e67ac6fefda4e20db7fc5f2bc186 (patch) | |
| tree | 71c2dc7fcfeb4f0b0dfba1287e191998b1375c79 /tests/bios-tables-test.c | |
| parent | Merge remote-tracking branch 'remotes/kraxel/tags/pull-input-20141002-1' into... (diff) | |
| parent | blockdev-test: Test device_del after drive_del (diff) | |
| download | qemu-507ef2f9fab3e67ac6fefda4e20db7fc5f2bc186.tar.gz qemu-507ef2f9fab3e67ac6fefda4e20db7fc5f2bc186.tar.xz qemu-507ef2f9fab3e67ac6fefda4e20db7fc5f2bc186.zip | |
Merge remote-tracking branch 'remotes/stefanha/tags/block-pull-request' into staging
# gpg: Signature made Sat 04 Oct 2014 21:24:46 BST using RSA key ID 81AB73C8
# gpg: Good signature from "Stefan Hajnoczi <stefanha@redhat.com>"
# gpg: aka "Stefan Hajnoczi <stefanha@gmail.com>"
* remotes/stefanha/tags/block-pull-request: (23 commits)
blockdev-test: Test device_del after drive_del
blockdev-test: Factor out some common code into helpers
blockdev-test: Simplify by using g_assert_cmpstr()
blockdev-test: Clean up bogus drive_add argument
blockdev-test: Use single rather than double quotes in QMP
drive_del-test: Merge of qdev-monitor-test, blockdev-test
iotests: qemu-img info output for corrupt image
qapi: Add corrupt field to ImageInfoSpecificQCow2
iotests: Use _img_info
util: Emancipate id_wellformed() from QemuOpts
q35/ahci: Pick up -cdrom and -hda options
qtest/bios-tables: Correct Q35 command line
ide: Update ide_drive_get to be HBA agnostic
pc/vl: Add units-per-default-bus property
blockdev: Allow overriding if_max_dev property
blockdev: Orphaned drive search
qemu-iotests: Fix supported cache modes for 052
make check-block: Use default cache modes
Modify qemu_opt_rename to realize renaming all items in opts
vmdk: Fix integer overflow in offset calculation
...
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'tests/bios-tables-test.c')
| -rw-r--r-- | tests/bios-tables-test.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/tests/bios-tables-test.c b/tests/bios-tables-test.c index 602932b888..9e4d20592b 100644 --- a/tests/bios-tables-test.c +++ b/tests/bios-tables-test.c @@ -714,14 +714,12 @@ static void test_acpi_one(const char *params, test_data *data) uint8_t signature_high; uint16_t signature; int i; - const char *device = ""; - if (!g_strcmp0(data->machine, MACHINE_Q35)) { - device = ",id=hd -device ide-hd,drive=hd"; - } + args = g_strdup_printf("-net none -display none %s " + "-drive id=hd0,if=none,file=%s " + "-device ide-hd,drive=hd0 ", + params ? params : "", disk); - args = g_strdup_printf("-net none -display none %s -drive file=%s%s,", - params ? params : "", disk, device); qtest_start(args); /* Wait at most 1 minute */ |