[qemu/f19] Fix crash with -M isapc -cpu Haswell (bz #986790) Fix crash in lsi_soft_reset (bz #1000947) Fix cras
Cole Robinson
crobinso at fedoraproject.org
Tue Sep 3 19:01:27 UTC 2013
commit 18389bf646dfdf012a248c369970e8efd2c9eef7
Author: Cole Robinson <crobinso at redhat.com>
Date: Tue Sep 3 15:01:17 2013 -0400
Fix crash with -M isapc -cpu Haswell (bz #986790)
Fix crash in lsi_soft_reset (bz #1000947)
Fix crash in scsi_dma_complete (bz #1001617)
Fix initial /dev/kvm permissions (bz #993491)
0211-qemu-socket-Make-socket_optslist-public.patch | 7 +-
...ibcacard-correct-T0-historical-bytes-size.patch | 7 +-
...mul-do-not-crash-if-backend-is-not-provid.patch | 8 +-
...ackend_enum_table-static-const-and-adjust.patch | 8 +-
...lare-DEFAULT_ATR-table-to-be-static-const.patch | 7 +-
...se-system-config-directory-for-nss-db-on-.patch | 8 +-
0217-util-move-socket_init-to-osdep.c.patch | 7 +-
...build-sys-must-link-with-fstack-protector.patch | 7 +-
0219-libcacard-fix-mingw64-cross-compilation.patch | 7 +-
...-split-vscclient-main-from-socket-reading.patch | 7 +-
...scclient-to-use-QemuThread-for-portabilit.patch | 8 +-
...each-vscclient-to-use-GMainLoop-for-porta.patch | 8 +-
0223-libcacard-remove-sql-prefix.patch | 7 +-
...bcacard-remove-default-libcoolkey-loading.patch | 7 +-
0225-dev-smartcard-reader-white-space-fixes.patch | 7 +-
...dev-smartcard-reader-nicer-debug-messages.patch | 7 +-
...rd-reader-remove-aborts-never-triggered-b.patch | 9 +-
...ev-smartcard-reader-support-windows-guest.patch | 7 +-
...-smartcard-reader-reuse-usb.h-definitions.patch | 7 +-
0230-libcacard-change-default-ATR.patch | 7 +-
0231-ccid-card-passthru-add-atr-check.patch | 7 +-
...assthru-dev-smartcard-reader-add-debug-en.patch | 7 +-
...rd-reader-define-structs-for-CCID_Paramet.patch | 9 +-
...ard-reader-change-default-protocol-to-T-0.patch | 7 +-
...rd-reader-copy-atr-protocol-to-ccid-param.patch | 8 +-
...d-vreader-add-debugging-messages-for-apdu.patch | 7 +-
...d-move-atr-setting-from-macro-to-function.patch | 7 +-
...rd-reader-empty-implementation-for-Mechan.patch | 9 +-
...ac-change-big-switch-functions-to-single-.patch | 9 +-
...scclient-fix-leakage-of-socket-on-error-p.patch | 8 +-
...ix-cppcheck-warning-and-remove-unneeded-c.patch | 8 +-
0311-isapc-disable-kvmvapic.patch | 34 +++++
0312-pci-do-not-export-pci_bus_reset.patch | 73 ++++++++++
...both-pre-and-post-order-vists-in-qdev-wal.patch | 142 +++++++++++++++++++
0314-qdev-switch-reset-to-post-order.patch | 144 ++++++++++++++++++++
...avoid-assertion-failure-on-VERIFY-command.patch | 63 +++++++++
qemu.spec | 99 +++++++++-----
37 files changed, 584 insertions(+), 204 deletions(-)
---
diff --git a/0211-qemu-socket-Make-socket_optslist-public.patch b/0211-qemu-socket-Make-socket_optslist-public.patch
index 4fc8d97..4017ec9 100644
--- a/0211-qemu-socket-Make-socket_optslist-public.patch
+++ b/0211-qemu-socket-Make-socket_optslist-public.patch
@@ -1,7 +1,7 @@
-From 4190f44bbdde97adb467c9c0c625bdc2f89f4af7 Mon Sep 17 00:00:00 2001
+From 0d298cfe215b2e09debb62978eb77d7be4f37e1f Mon Sep 17 00:00:00 2001
From: Kevin Wolf <kwolf at redhat.com>
Date: Fri, 15 Mar 2013 17:14:24 +0100
-Subject: [PATCH 211/241] qemu-socket: Make socket_optslist public
+Subject: [PATCH] qemu-socket: Make socket_optslist public
Allow other users to create the QemuOpts needed for inet_connect_opts().
@@ -108,6 +108,3 @@ index cd54fb4..b32510a 100644
switch (addr->kind) {
case SOCKET_ADDRESS_KIND_INET:
inet_addr_to_opts(opts, addr->inet);
---
-1.8.3.1
-
diff --git a/0212-libcacard-correct-T0-historical-bytes-size.patch b/0212-libcacard-correct-T0-historical-bytes-size.patch
index f2d3507..ce89ec0 100644
--- a/0212-libcacard-correct-T0-historical-bytes-size.patch
+++ b/0212-libcacard-correct-T0-historical-bytes-size.patch
@@ -1,7 +1,7 @@
-From ec22a81dc76492a729695a54e32a837ab6384e65 Mon Sep 17 00:00:00 2001
+From 82ba8008f0c6d7328872421e4d9d4f9868d74b11 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= <mlureau at redhat.com>
Date: Sun, 2 Dec 2012 22:00:55 +0100
-Subject: [PATCH 212/241] libcacard: correct T0 historical bytes size
+Subject: [PATCH] libcacard: correct T0 historical bytes size
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
@@ -33,6 +33,3 @@ index d3e9522..538bdde 100644
'V', 'C', 'A', 'R', 'D', '_'
---
-1.8.3.1
-
diff --git a/0213-ccid-card-emul-do-not-crash-if-backend-is-not-provid.patch b/0213-ccid-card-emul-do-not-crash-if-backend-is-not-provid.patch
index 0caa307..0574385 100644
--- a/0213-ccid-card-emul-do-not-crash-if-backend-is-not-provid.patch
+++ b/0213-ccid-card-emul-do-not-crash-if-backend-is-not-provid.patch
@@ -1,8 +1,7 @@
-From 142383e938fddcf7ed4f81aa30a1e7c1a968cef8 Mon Sep 17 00:00:00 2001
+From ab2662a8074e329e15d92ee5bdce741b84901c4a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= <mlureau at redhat.com>
Date: Wed, 21 Nov 2012 14:16:08 +0100
-Subject: [PATCH 213/241] ccid-card-emul: do not crash if backend is not
- provided
+Subject: [PATCH] ccid-card-emul: do not crash if backend is not provided
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
@@ -35,6 +34,3 @@ index c8f8ba3..210433e 100644
while (table->name != NULL) {
if (strcmp(table->name, str) == 0) {
ret = table->value;
---
-1.8.3.1
-
diff --git a/0214-ccid-make-backend_enum_table-static-const-and-adjust.patch b/0214-ccid-make-backend_enum_table-static-const-and-adjust.patch
index 8ecc5a7..45b99ac 100644
--- a/0214-ccid-make-backend_enum_table-static-const-and-adjust.patch
+++ b/0214-ccid-make-backend_enum_table-static-const-and-adjust.patch
@@ -1,8 +1,7 @@
-From e72e97097d1c619774cb07326496e38c0de46ef0 Mon Sep 17 00:00:00 2001
+From c05bf7d253830527dbb6f4280f50e805c188bb57 Mon Sep 17 00:00:00 2001
From: Jim Meyering <meyering at redhat.com>
Date: Mon, 21 May 2012 21:56:20 +0200
-Subject: [PATCH 214/241] ccid: make backend_enum_table "static const" and
- adjust users
+Subject: [PATCH] ccid: make backend_enum_table "static const" and adjust users
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
@@ -45,6 +44,3 @@ index 210433e..cb9ef10 100644
QSIMPLEQ_INIT(&card->event_list);
QSIMPLEQ_INIT(&card->guest_apdu_list);
---
-1.8.3.1
-
diff --git a/0215-ccid-declare-DEFAULT_ATR-table-to-be-static-const.patch b/0215-ccid-declare-DEFAULT_ATR-table-to-be-static-const.patch
index a93cafd..a0c8f96 100644
--- a/0215-ccid-declare-DEFAULT_ATR-table-to-be-static-const.patch
+++ b/0215-ccid-declare-DEFAULT_ATR-table-to-be-static-const.patch
@@ -1,7 +1,7 @@
-From 0a8bbcf1c62e0cf12188eaad871b23633a336f73 Mon Sep 17 00:00:00 2001
+From f45224daee28b04543bf913e4d544c77ba9751a4 Mon Sep 17 00:00:00 2001
From: Jim Meyering <meyering at redhat.com>
Date: Mon, 21 May 2012 21:51:33 +0200
-Subject: [PATCH 215/241] ccid: declare DEFAULT_ATR table to be "static const"
+Subject: [PATCH] ccid: declare DEFAULT_ATR table to be "static const"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
@@ -27,6 +27,3 @@ index 0dde761..62070db 100644
/*
* From some example somewhere
* 0x3B, 0xB0, 0x18, 0x00, 0xD1, 0x81, 0x05, 0xB1, 0x40, 0x38, 0x1F, 0x03, 0x28
---
-1.8.3.1
-
diff --git a/0216-libcacard-use-system-config-directory-for-nss-db-on-.patch b/0216-libcacard-use-system-config-directory-for-nss-db-on-.patch
index dc6ce62..444a737 100644
--- a/0216-libcacard-use-system-config-directory-for-nss-db-on-.patch
+++ b/0216-libcacard-use-system-config-directory-for-nss-db-on-.patch
@@ -1,8 +1,7 @@
-From 2b60d2a60e98747e46e6addb89bf9a7f923ae499 Mon Sep 17 00:00:00 2001
+From 55f9a7671661393885ed67a5fdbd54a2bf8fed48 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= <mlureau at redhat.com>
Date: Wed, 27 Feb 2013 21:08:06 +0100
-Subject: [PATCH 216/241] libcacard: use system config directory for nss db on
- win32
+Subject: [PATCH] libcacard: use system config directory for nss db on win32
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
@@ -46,6 +45,3 @@ index df79476..21d4689 100644
}
if (rv != SECSuccess) {
return VCARD_EMUL_FAIL;
---
-1.8.3.1
-
diff --git a/0217-util-move-socket_init-to-osdep.c.patch b/0217-util-move-socket_init-to-osdep.c.patch
index 83de188..3246bf2 100644
--- a/0217-util-move-socket_init-to-osdep.c.patch
+++ b/0217-util-move-socket_init-to-osdep.c.patch
@@ -1,7 +1,7 @@
-From 2f2068568e87fc1f20bc891cce18b4e65965b091 Mon Sep 17 00:00:00 2001
+From 9819cebc4010a996b466669022e78dfedd4f0b9f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= <marcandre.lureau at redhat.com>
Date: Mon, 25 Feb 2013 23:31:11 +0100
-Subject: [PATCH 217/241] util: move socket_init() to osdep.c
+Subject: [PATCH] util: move socket_init() to osdep.c
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
@@ -92,6 +92,3 @@ index b32510a..7909381 100644
-#endif
- return 0;
-}
---
-1.8.3.1
-
diff --git a/0218-build-sys-must-link-with-fstack-protector.patch b/0218-build-sys-must-link-with-fstack-protector.patch
index 95a1dfe..cc71dc1 100644
--- a/0218-build-sys-must-link-with-fstack-protector.patch
+++ b/0218-build-sys-must-link-with-fstack-protector.patch
@@ -1,7 +1,7 @@
-From 989623664fb428748a5efedbab162d75e1eb0432 Mon Sep 17 00:00:00 2001
+From 2772b3db795ff963a6dc9fade6e561b6e23dea9a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= <mlureau at redhat.com>
Date: Mon, 25 Feb 2013 23:31:12 +0100
-Subject: [PATCH 218/241] build-sys: must link with -fstack-protector
+Subject: [PATCH] build-sys: must link with -fstack-protector
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
@@ -68,6 +68,3 @@ index edc2552..36aba2d 100644
$(LIBS),$(if $(filter %.lo %.la,$^),"lt LINK ", " LINK ")"$(TARGET_DIR)$@")
endif
---
-1.8.3.1
-
diff --git a/0219-libcacard-fix-mingw64-cross-compilation.patch b/0219-libcacard-fix-mingw64-cross-compilation.patch
index 106a709..50555ec 100644
--- a/0219-libcacard-fix-mingw64-cross-compilation.patch
+++ b/0219-libcacard-fix-mingw64-cross-compilation.patch
@@ -1,7 +1,7 @@
-From cc5a2202bc5484aba302a684fb75106da506b1f0 Mon Sep 17 00:00:00 2001
+From c47df42d06e9bbc8bd7e7a40754f6245f4bea83f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= <mlureau at redhat.com>
Date: Mon, 25 Feb 2013 23:31:13 +0100
-Subject: [PATCH 219/241] libcacard: fix mingw64 cross-compilation
+Subject: [PATCH] libcacard: fix mingw64 cross-compilation
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
@@ -52,6 +52,3 @@ index 36aba2d..292a422 100644
$(if $(filter %.lo %.la,$^),$(LIBTOOLFLAGS)) \
$(LIBS),$(if $(filter %.lo %.la,$^),"lt LINK ", " LINK ")"$(TARGET_DIR)$@")
endif
---
-1.8.3.1
-
diff --git a/0220-libcacard-split-vscclient-main-from-socket-reading.patch b/0220-libcacard-split-vscclient-main-from-socket-reading.patch
index 37fe0e7..a44e447 100644
--- a/0220-libcacard-split-vscclient-main-from-socket-reading.patch
+++ b/0220-libcacard-split-vscclient-main-from-socket-reading.patch
@@ -1,7 +1,7 @@
-From 2898705c820b4b0c6bbd196bccce55dd3d64f62c Mon Sep 17 00:00:00 2001
+From 6a7a90c34f62ffca270db3dbe3653f4eb2145c32 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= <marcandre.lureau at redhat.com>
Date: Mon, 25 Feb 2013 23:31:14 +0100
-Subject: [PATCH 220/241] libcacard: split vscclient main() from socket reading
+Subject: [PATCH] libcacard: split vscclient main() from socket reading
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
@@ -372,6 +372,3 @@ index 9b744f2..5e00db3 100644
} while (rv >= 0);
return 0;
---
-1.8.3.1
-
diff --git a/0221-libcacard-vscclient-to-use-QemuThread-for-portabilit.patch b/0221-libcacard-vscclient-to-use-QemuThread-for-portabilit.patch
index 6d75edf..2784a3e 100644
--- a/0221-libcacard-vscclient-to-use-QemuThread-for-portabilit.patch
+++ b/0221-libcacard-vscclient-to-use-QemuThread-for-portabilit.patch
@@ -1,8 +1,7 @@
-From dc54f4b260b2fe57af5ad57326f0a67a82f977d3 Mon Sep 17 00:00:00 2001
+From 30cbcaa34cbfa214b8680b83ad8d5da3b4ac0512 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= <marcandre.lureau at redhat.com>
Date: Mon, 25 Feb 2013 23:31:15 +0100
-Subject: [PATCH 221/241] libcacard: vscclient to use QemuThread for
- portability
+Subject: [PATCH] libcacard: vscclient to use QemuThread for portability
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
@@ -41,6 +40,3 @@ index 5e00db3..5f47634 100644
return 0;
}
---
-1.8.3.1
-
diff --git a/0222-libcacard-teach-vscclient-to-use-GMainLoop-for-porta.patch b/0222-libcacard-teach-vscclient-to-use-GMainLoop-for-porta.patch
index 4b9d39f..26e8db5 100644
--- a/0222-libcacard-teach-vscclient-to-use-GMainLoop-for-porta.patch
+++ b/0222-libcacard-teach-vscclient-to-use-GMainLoop-for-porta.patch
@@ -1,8 +1,7 @@
-From d5830145bc9af4b8df2eddd5a6ece27c4010b3d6 Mon Sep 17 00:00:00 2001
+From a27ea89383fee656bb9b9eacca03c233bd673ad2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= <mlureau at redhat.com>
Date: Mon, 25 Feb 2013 23:31:16 +0100
-Subject: [PATCH 222/241] libcacard: teach vscclient to use GMainLoop for
- portability
+Subject: [PATCH] libcacard: teach vscclient to use GMainLoop for portability
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
@@ -543,6 +542,3 @@ index 5f47634..ac23647 100644
return 0;
}
---
-1.8.3.1
-
diff --git a/0223-libcacard-remove-sql-prefix.patch b/0223-libcacard-remove-sql-prefix.patch
index ee58836..96636bf 100644
--- a/0223-libcacard-remove-sql-prefix.patch
+++ b/0223-libcacard-remove-sql-prefix.patch
@@ -1,7 +1,7 @@
-From 1975b2acbff807d88d494153db64882d19410724 Mon Sep 17 00:00:00 2001
+From 0cb5cdc4badf4f3415425413986b91915b1fab52 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= <mlureau at redhat.com>
Date: Wed, 20 Mar 2013 14:07:48 +0100
-Subject: [PATCH 223/241] libcacard: remove sql: prefix
+Subject: [PATCH] libcacard: remove sql: prefix
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
@@ -42,6 +42,3 @@ index 21d4689..6b1ca8a 100644
g_free(path);
}
if (rv != SECSuccess) {
---
-1.8.3.1
-
diff --git a/0224-libcacard-remove-default-libcoolkey-loading.patch b/0224-libcacard-remove-default-libcoolkey-loading.patch
index 77cb055..5b5ca6a 100644
--- a/0224-libcacard-remove-default-libcoolkey-loading.patch
+++ b/0224-libcacard-remove-default-libcoolkey-loading.patch
@@ -1,7 +1,7 @@
-From 26acaa4bf064f7608dec08cff4d23769b167dced Mon Sep 17 00:00:00 2001
+From 218d4160ff017861388f37feb02fa818d55d4eb3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= <mlureau at redhat.com>
Date: Wed, 20 Mar 2013 14:07:49 +0100
-Subject: [PATCH 224/241] libcacard: remove default libcoolkey loading
+Subject: [PATCH] libcacard: remove default libcoolkey loading
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
@@ -59,6 +59,3 @@ index 6b1ca8a..9ba80fb 100644
/* now examine all the slots, finding which should be readers */
/* We should control this with options. For now we mirror out any
* removable hardware slot */
---
-1.8.3.1
-
diff --git a/0225-dev-smartcard-reader-white-space-fixes.patch b/0225-dev-smartcard-reader-white-space-fixes.patch
index c00da7d..d91ef09 100644
--- a/0225-dev-smartcard-reader-white-space-fixes.patch
+++ b/0225-dev-smartcard-reader-white-space-fixes.patch
@@ -1,7 +1,7 @@
-From c1a01e889c7562c5e61cbd2da7844697c56940bd Mon Sep 17 00:00:00 2001
+From 4407e349fde5a3ab43a0cad130ec66e6a31c4471 Mon Sep 17 00:00:00 2001
From: Alon Levy <alevy at redhat.com>
Date: Mon, 4 Mar 2013 18:45:49 +0200
-Subject: [PATCH 225/241] dev-smartcard-reader: white space fixes
+Subject: [PATCH] dev-smartcard-reader: white space fixes
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
@@ -49,6 +49,3 @@ index 979a473..24c84ce 100644
if (cc->initfn) {
return cc->initfn(card);
}
---
-1.8.3.1
-
diff --git a/0226-dev-smartcard-reader-nicer-debug-messages.patch b/0226-dev-smartcard-reader-nicer-debug-messages.patch
index 660c460..9934602 100644
--- a/0226-dev-smartcard-reader-nicer-debug-messages.patch
+++ b/0226-dev-smartcard-reader-nicer-debug-messages.patch
@@ -1,7 +1,7 @@
-From bd39de640ffd3f552775bfb1a084657872acd114 Mon Sep 17 00:00:00 2001
+From 5220cd7238ea12e4fa361372706dc81ae0e6b54a Mon Sep 17 00:00:00 2001
From: Alon Levy <alevy at redhat.com>
Date: Mon, 4 Mar 2013 18:50:33 +0200
-Subject: [PATCH 226/241] dev-smartcard-reader: nicer debug messages
+Subject: [PATCH] dev-smartcard-reader: nicer debug messages
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
@@ -139,6 +139,3 @@ index 24c84ce..173dcc9 100644
ccid_reset_error_status(s);
s->powered = false;
ccid_write_slot_status(s, ccid_header);
---
-1.8.3.1
-
diff --git a/0227-dev-smartcard-reader-remove-aborts-never-triggered-b.patch b/0227-dev-smartcard-reader-remove-aborts-never-triggered-b.patch
index 6306c72..b5dcb7e 100644
--- a/0227-dev-smartcard-reader-remove-aborts-never-triggered-b.patch
+++ b/0227-dev-smartcard-reader-remove-aborts-never-triggered-b.patch
@@ -1,8 +1,8 @@
-From 006440535dd1d581f0e5b7b15295fe511589c3e2 Mon Sep 17 00:00:00 2001
+From 3ea945e317cfda37503bccc6c0548f7bebdb5ba3 Mon Sep 17 00:00:00 2001
From: Alon Levy <alevy at redhat.com>
Date: Mon, 4 Mar 2013 18:55:07 +0200
-Subject: [PATCH 227/241] dev-smartcard-reader: remove aborts (never triggered,
- but just in case)
+Subject: [PATCH] dev-smartcard-reader: remove aborts (never triggered, but
+ just in case)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
@@ -66,6 +66,3 @@ index 173dcc9..54ea536 100644
}
DPRINTF(s, 1, "APDU returned to guest %d (answer seq %d, slot %d)\n",
len, answer->seq, answer->slot);
---
-1.8.3.1
-
diff --git a/0228-dev-smartcard-reader-support-windows-guest.patch b/0228-dev-smartcard-reader-support-windows-guest.patch
index 6fd2e09..f523135 100644
--- a/0228-dev-smartcard-reader-support-windows-guest.patch
+++ b/0228-dev-smartcard-reader-support-windows-guest.patch
@@ -1,7 +1,7 @@
-From 6339bbf28651cbcb5cf24bd1d53cd7b52028ff1b Mon Sep 17 00:00:00 2001
+From 749942f6d5fdfed2d860169cf5271373e6a02868 Mon Sep 17 00:00:00 2001
From: Alon Levy <alevy at redhat.com>
Date: Mon, 4 Mar 2013 21:40:53 +0200
-Subject: [PATCH 228/241] dev-smartcard-reader: support windows guest
+Subject: [PATCH] dev-smartcard-reader: support windows guest
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
@@ -33,6 +33,3 @@ index 54ea536..db5dd6d 100644
/*
* u32 dwMaxCCIDMessageLength; For extended APDU in
* [261 + 10 , 65544 + 10]. Otherwise the minimum is
---
-1.8.3.1
-
diff --git a/0229-dev-smartcard-reader-reuse-usb.h-definitions.patch b/0229-dev-smartcard-reader-reuse-usb.h-definitions.patch
index 1616e7a..3290726 100644
--- a/0229-dev-smartcard-reader-reuse-usb.h-definitions.patch
+++ b/0229-dev-smartcard-reader-reuse-usb.h-definitions.patch
@@ -1,7 +1,7 @@
-From b7fd4cdb21c93be3a3e4b2d309f07e56d47eb2a4 Mon Sep 17 00:00:00 2001
+From cede7cafc7b0056c44446468463eabbc89d4da2c Mon Sep 17 00:00:00 2001
From: Alon Levy <alevy at redhat.com>
Date: Tue, 5 Mar 2013 15:31:26 +0200
-Subject: [PATCH 229/241] dev-smartcard-reader: reuse usb.h definitions
+Subject: [PATCH] dev-smartcard-reader: reuse usb.h definitions
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
@@ -60,6 +60,3 @@ index db5dd6d..75f813c 100644
DPRINTF(s, 1, "ccid_control get data rates UNIMPLEMENTED\n");
p->status = USB_RET_STALL;
break;
---
-1.8.3.1
-
diff --git a/0230-libcacard-change-default-ATR.patch b/0230-libcacard-change-default-ATR.patch
index 3cfee43..3646e74 100644
--- a/0230-libcacard-change-default-ATR.patch
+++ b/0230-libcacard-change-default-ATR.patch
@@ -1,7 +1,7 @@
-From b3d57573e23a456b2c21f045b153e2c0a621f886 Mon Sep 17 00:00:00 2001
+From b6c0f55dee51c131fc2e4154aae30693b88b4595 Mon Sep 17 00:00:00 2001
From: Alon Levy <alevy at redhat.com>
Date: Tue, 5 Mar 2013 15:35:24 +0200
-Subject: [PATCH 230/241] libcacard: change default ATR
+Subject: [PATCH] libcacard: change default ATR
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
@@ -37,6 +37,3 @@ index 538bdde..3b9a619 100644
typedef enum {
VCARD_DONE,
---
-1.8.3.1
-
diff --git a/0231-ccid-card-passthru-add-atr-check.patch b/0231-ccid-card-passthru-add-atr-check.patch
index abae187..7ab89aa 100644
--- a/0231-ccid-card-passthru-add-atr-check.patch
+++ b/0231-ccid-card-passthru-add-atr-check.patch
@@ -1,7 +1,7 @@
-From 1c4d96f6622f00c4d4b84b5e17f8e42dcb5b7501 Mon Sep 17 00:00:00 2001
+From a447d4fc0ece3d1f0ae20c89ddf4b01d7afdb553 Mon Sep 17 00:00:00 2001
From: Alon Levy <alevy at redhat.com>
Date: Mon, 4 Mar 2013 18:39:09 +0200
-Subject: [PATCH 231/241] ccid-card-passthru: add atr check
+Subject: [PATCH] ccid-card-passthru: add atr check
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
@@ -90,6 +90,3 @@ index 62070db..7fecd10 100644
memcpy(card->atr, data, scr_msg_header->length);
card->atr_length = scr_msg_header->length;
ccid_card_card_inserted(&card->base);
---
-1.8.3.1
-
diff --git a/0232-ccid-card-passthru-dev-smartcard-reader-add-debug-en.patch b/0301-ccid-card-passthru-dev-smartcard-reader-add-debug-en.patch
similarity index 95%
rename from 0232-ccid-card-passthru-dev-smartcard-reader-add-debug-en.patch
rename to 0301-ccid-card-passthru-dev-smartcard-reader-add-debug-en.patch
index 39cb23e..5109058 100644
--- a/0232-ccid-card-passthru-dev-smartcard-reader-add-debug-en.patch
+++ b/0301-ccid-card-passthru-dev-smartcard-reader-add-debug-en.patch
@@ -1,7 +1,7 @@
-From f462152289d55ae01456d1d9122e26ff63407520 Mon Sep 17 00:00:00 2001
+From b22a9a5c4b0a3907cf00b04a12b84a5366d1fc8d Mon Sep 17 00:00:00 2001
From: Alon Levy <alevy at redhat.com>
Date: Mon, 4 Mar 2013 18:41:28 +0200
-Subject: [PATCH 232/241] ccid-card-passthru, dev-smartcard-reader: add debug
+Subject: [PATCH] ccid-card-passthru, dev-smartcard-reader: add debug
environment variables
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
@@ -105,6 +105,3 @@ index 1439da4..32e1f5b 100644
+ }
+ return debug;
+}
---
-1.8.3.1
-
diff --git a/0233-dev-smartcard-reader-define-structs-for-CCID_Paramet.patch b/0302-dev-smartcard-reader-define-structs-for-CCID_Paramet.patch
similarity index 97%
rename from 0233-dev-smartcard-reader-define-structs-for-CCID_Paramet.patch
rename to 0302-dev-smartcard-reader-define-structs-for-CCID_Paramet.patch
index 89f2fb5..ec8caa0 100644
--- a/0233-dev-smartcard-reader-define-structs-for-CCID_Paramet.patch
+++ b/0302-dev-smartcard-reader-define-structs-for-CCID_Paramet.patch
@@ -1,8 +1,8 @@
-From 4d36e75eb55c7ee557bebabd6fe33c5a65d52228 Mon Sep 17 00:00:00 2001
+From cf593228aeb0a8be714d3bf5d83d3e0eef87ea76 Mon Sep 17 00:00:00 2001
From: Alon Levy <alevy at redhat.com>
Date: Mon, 4 Mar 2013 18:57:45 +0200
-Subject: [PATCH 233/241] dev-smartcard-reader: define structs for
- CCID_Parameter internals
+Subject: [PATCH] dev-smartcard-reader: define structs for CCID_Parameter
+ internals
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
@@ -156,6 +156,3 @@ index 09c2403..f2cab09 100644
VMSTATE_UINT32(ulProtocolDataStructureSize, USBCCIDState),
VMSTATE_STRUCT_ARRAY(bulk_in_pending, USBCCIDState,
BULK_IN_PENDING_NUM, 1, bulk_in_vmstate, BulkIn),
---
-1.8.3.1
-
diff --git a/0234-dev-smartcard-reader-change-default-protocol-to-T-0.patch b/0303-dev-smartcard-reader-change-default-protocol-to-T-0.patch
similarity index 91%
rename from 0234-dev-smartcard-reader-change-default-protocol-to-T-0.patch
rename to 0303-dev-smartcard-reader-change-default-protocol-to-T-0.patch
index 05e11ea..e6ebac4 100644
--- a/0234-dev-smartcard-reader-change-default-protocol-to-T-0.patch
+++ b/0303-dev-smartcard-reader-change-default-protocol-to-T-0.patch
@@ -1,7 +1,7 @@
-From f7019fa4fc6d883f1922bb0e3b18ceb3a628b340 Mon Sep 17 00:00:00 2001
+From 4a70750aabe57e3a24d16fd1c82acc7f1c6f66f0 Mon Sep 17 00:00:00 2001
From: Alon Levy <alevy at redhat.com>
Date: Wed, 27 Mar 2013 10:14:15 +0200
-Subject: [PATCH 234/241] dev-smartcard-reader: change default protocol to T=0
+Subject: [PATCH] dev-smartcard-reader: change default protocol to T=0
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
@@ -45,6 +45,3 @@ index f2cab09..e97dfcb 100644
s->abProtocolDataStructure = defaultProtocolDataStructure;
}
---
-1.8.3.1
-
diff --git a/0235-dev-smartcard-reader-copy-atr-protocol-to-ccid-param.patch b/0304-dev-smartcard-reader-copy-atr-protocol-to-ccid-param.patch
similarity index 94%
rename from 0235-dev-smartcard-reader-copy-atr-protocol-to-ccid-param.patch
rename to 0304-dev-smartcard-reader-copy-atr-protocol-to-ccid-param.patch
index e0be516..193f3a6 100644
--- a/0235-dev-smartcard-reader-copy-atr-protocol-to-ccid-param.patch
+++ b/0304-dev-smartcard-reader-copy-atr-protocol-to-ccid-param.patch
@@ -1,8 +1,7 @@
-From 2e26deacddb52bb3f7eb100ac5fe9709d6089cf3 Mon Sep 17 00:00:00 2001
+From bdba89b1e2ff2a5d72847741b87b1bf03a17f008 Mon Sep 17 00:00:00 2001
From: Alon Levy <alevy at redhat.com>
Date: Mon, 4 Mar 2013 18:58:29 +0200
-Subject: [PATCH 235/241] dev-smartcard-reader: copy atr protocol to ccid
- parameters
+Subject: [PATCH] dev-smartcard-reader: copy atr protocol to ccid parameters
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
@@ -80,6 +79,3 @@ index e97dfcb..4e08f9b 100644
ccid_write_data_block(s, recv->bSlot, recv->bSeq, atr, len);
}
---
-1.8.3.1
-
diff --git a/0236-libcacard-vreader-add-debugging-messages-for-apdu.patch b/0305-libcacard-vreader-add-debugging-messages-for-apdu.patch
similarity index 96%
rename from 0236-libcacard-vreader-add-debugging-messages-for-apdu.patch
rename to 0305-libcacard-vreader-add-debugging-messages-for-apdu.patch
index 20dffe4..991cca1 100644
--- a/0236-libcacard-vreader-add-debugging-messages-for-apdu.patch
+++ b/0305-libcacard-vreader-add-debugging-messages-for-apdu.patch
@@ -1,7 +1,7 @@
-From 71560a321c2c7678191f0f7da42f25917ed40974 Mon Sep 17 00:00:00 2001
+From c8149d68b2b487ac37f4e7d74b8611d377f47d82 Mon Sep 17 00:00:00 2001
From: Alon Levy <alevy at redhat.com>
Date: Tue, 5 Mar 2013 15:32:19 +0200
-Subject: [PATCH 236/241] libcacard/vreader: add debugging messages for apdu
+Subject: [PATCH] libcacard/vreader: add debugging messages for apdu
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
@@ -164,6 +164,3 @@ index f3efc27..5793d73 100644
}
assert(card_status == VCARD_DONE);
if (card_status == VCARD_DONE) {
---
-1.8.3.1
-
diff --git a/0237-libcacard-move-atr-setting-from-macro-to-function.patch b/0306-libcacard-move-atr-setting-from-macro-to-function.patch
similarity index 96%
rename from 0237-libcacard-move-atr-setting-from-macro-to-function.patch
rename to 0306-libcacard-move-atr-setting-from-macro-to-function.patch
index d622ae2..931624c 100644
--- a/0237-libcacard-move-atr-setting-from-macro-to-function.patch
+++ b/0306-libcacard-move-atr-setting-from-macro-to-function.patch
@@ -1,7 +1,7 @@
-From 703a72f26668f26f2bb98851f1a2edd9a8681f86 Mon Sep 17 00:00:00 2001
+From 3cab527b3f9be5bbc8b8d3637ff0a8d1cddd6356 Mon Sep 17 00:00:00 2001
From: Alon Levy <alevy at redhat.com>
Date: Tue, 5 Mar 2013 16:27:43 +0200
-Subject: [PATCH 237/241] libcacard: move atr setting from macro to function
+Subject: [PATCH] libcacard: move atr setting from macro to function
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
@@ -156,6 +156,3 @@ index 0000000..e5c8d2d
+unsigned char *vcard_alloc_atr(const char *postfix, int *atr_len);
+
+#endif
---
-1.8.3.1
-
diff --git a/0238-dev-smartcard-reader-empty-implementation-for-Mechan.patch b/0307-dev-smartcard-reader-empty-implementation-for-Mechan.patch
similarity index 85%
rename from 0238-dev-smartcard-reader-empty-implementation-for-Mechan.patch
rename to 0307-dev-smartcard-reader-empty-implementation-for-Mechan.patch
index 340a550..c779dd3 100644
--- a/0238-dev-smartcard-reader-empty-implementation-for-Mechan.patch
+++ b/0307-dev-smartcard-reader-empty-implementation-for-Mechan.patch
@@ -1,8 +1,8 @@
-From 002714edb70b00c20de7d54980a528ac7232bb33 Mon Sep 17 00:00:00 2001
+From 6c11295ab78a3b421d94c64a88bec74676e0bc4f Mon Sep 17 00:00:00 2001
From: Alon Levy <alevy at redhat.com>
Date: Tue, 5 Mar 2013 17:31:10 +0200
-Subject: [PATCH 238/241] dev-smartcard-reader: empty implementation for
- Mechanical (fail correctly)
+Subject: [PATCH] dev-smartcard-reader: empty implementation for Mechanical
+ (fail correctly)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
@@ -29,6 +29,3 @@ index 4e08f9b..a473b87 100644
default:
DPRINTF(s, 1,
"handle_data: ERROR: unhandled message type %Xh\n",
---
-1.8.3.1
-
diff --git a/0239-libcacard-cac-change-big-switch-functions-to-single-.patch b/0308-libcacard-cac-change-big-switch-functions-to-single-.patch
similarity index 97%
rename from 0239-libcacard-cac-change-big-switch-functions-to-single-.patch
rename to 0308-libcacard-cac-change-big-switch-functions-to-single-.patch
index 1d77761..3be3227 100644
--- a/0239-libcacard-cac-change-big-switch-functions-to-single-.patch
+++ b/0308-libcacard-cac-change-big-switch-functions-to-single-.patch
@@ -1,8 +1,8 @@
-From 8527c47117c0ec6d12929b6c19206eed6ee90528 Mon Sep 17 00:00:00 2001
+From f90f2ac15af433ed36fce659bc2d40d533c3943f Mon Sep 17 00:00:00 2001
From: Alon Levy <alevy at redhat.com>
Date: Mon, 4 Mar 2013 21:43:36 +0200
-Subject: [PATCH 239/241] libcacard/cac: change big switch functions to single
- return point
+Subject: [PATCH] libcacard/cac: change big switch functions to single return
+ point
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
@@ -204,6 +204,3 @@ index 5864539..7a06b5a 100644
}
/*
---
-1.8.3.1
-
diff --git a/0240-libcacard-vscclient-fix-leakage-of-socket-on-error-p.patch b/0309-libcacard-vscclient-fix-leakage-of-socket-on-error-p.patch
similarity index 88%
rename from 0240-libcacard-vscclient-fix-leakage-of-socket-on-error-p.patch
rename to 0309-libcacard-vscclient-fix-leakage-of-socket-on-error-p.patch
index b23df89..d918935 100644
--- a/0240-libcacard-vscclient-fix-leakage-of-socket-on-error-p.patch
+++ b/0309-libcacard-vscclient-fix-leakage-of-socket-on-error-p.patch
@@ -1,8 +1,7 @@
-From aae98aa5aa23dbddf3a6e8c8c0399948f0d43480 Mon Sep 17 00:00:00 2001
+From fb5d3b665f4a4c123ecf89c3d9da488f0f455d99 Mon Sep 17 00:00:00 2001
From: Alon Levy <alevy at redhat.com>
Date: Tue, 4 Jun 2013 16:23:37 -0400
-Subject: [PATCH 240/241] libcacard/vscclient: fix leakage of socket on error
- paths
+Subject: [PATCH] libcacard/vscclient: fix leakage of socket on error paths
Spotted by Coverity.
@@ -50,6 +49,3 @@ index ac23647..5180d29 100644
+ closesocket(sock);
return 0;
}
---
-1.8.3.1
-
diff --git a/0241-libcacard-Fix-cppcheck-warning-and-remove-unneeded-c.patch b/0310-libcacard-Fix-cppcheck-warning-and-remove-unneeded-c.patch
similarity index 94%
rename from 0241-libcacard-Fix-cppcheck-warning-and-remove-unneeded-c.patch
rename to 0310-libcacard-Fix-cppcheck-warning-and-remove-unneeded-c.patch
index 06965b0..65d0306 100644
--- a/0241-libcacard-Fix-cppcheck-warning-and-remove-unneeded-c.patch
+++ b/0310-libcacard-Fix-cppcheck-warning-and-remove-unneeded-c.patch
@@ -1,8 +1,7 @@
-From 742e78d849a701e49f3c7d3c13eb9c4013f2cec3 Mon Sep 17 00:00:00 2001
+From 4b227c5279d96e767f5976d1e45d76ef485176a4 Mon Sep 17 00:00:00 2001
From: Stefan Weil <sw at weilnetz.de>
Date: Sun, 16 Jun 2013 11:08:52 +0200
-Subject: [PATCH 241/241] libcacard: Fix cppcheck warning and remove unneeded
- code
+Subject: [PATCH] libcacard: Fix cppcheck warning and remove unneeded code
The local function vcard_emul_alloc_arrays always returned PR_TRUE.
Therefore cppcheck complained about code which handled the
@@ -84,6 +83,3 @@ index 1a3e568..fb429b1 100644
cert_count = 0;
for (j = 0; j < options->vreader[i].cert_count; j++) {
/* we should have a better way of identifying certs than by
---
-1.8.3.1
-
diff --git a/0311-isapc-disable-kvmvapic.patch b/0311-isapc-disable-kvmvapic.patch
new file mode 100644
index 0000000..910aafb
--- /dev/null
+++ b/0311-isapc-disable-kvmvapic.patch
@@ -0,0 +1,34 @@
+From df121e30406a1f892f383f86c76db936992354c2 Mon Sep 17 00:00:00 2001
+From: Paolo Bonzini <pbonzini at redhat.com>
+Date: Tue, 13 Aug 2013 00:02:18 +0200
+Subject: [PATCH] isapc: disable kvmvapic
+
+vapic requires the VAPIC ROM to be mapped into RAM. This is not
+possible without PAM hardware. This fixes a segmentation fault
+running with -M isapc.
+
+Cc: qemu-stable at nongnu.org
+Signed-off-by: Paolo Bonzini <pbonzini at redhat.com>
+
+(crobinso: s/kvmvapic/vapic/g)
+---
+ hw/pc_piix.c | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/hw/pc_piix.c b/hw/pc_piix.c
+index a1a6794..9f3f93b 100644
+--- a/hw/pc_piix.c
++++ b/hw/pc_piix.c
+@@ -689,7 +689,11 @@ static QEMUMachine isapc_machine = {
+ .property = "rom_only",
+ .value = stringify(1),
+ },
+- { /* end of list */ }
++ {
++ .driver = "apic-common",
++ .property = "vapic",
++ .value = "off",
++ },
+ },
+ DEFAULT_MACHINE_OPTIONS,
+ };
diff --git a/0312-pci-do-not-export-pci_bus_reset.patch b/0312-pci-do-not-export-pci_bus_reset.patch
new file mode 100644
index 0000000..2ce67fd
--- /dev/null
+++ b/0312-pci-do-not-export-pci_bus_reset.patch
@@ -0,0 +1,73 @@
+From 5ff013a13ea2530c94ffdfb829f922ba450ddef0 Mon Sep 17 00:00:00 2001
+From: Paolo Bonzini <pbonzini at redhat.com>
+Date: Thu, 2 May 2013 11:38:37 +0200
+Subject: [PATCH] pci: do not export pci_bus_reset
+
+qbus_reset_all can be used instead. There is no semantic change
+because pcibus_reset returns 1 and takes care of the device
+tree traversal.
+
+This will be necessary once the traversal is done always in
+qbus_reset_all *before* invoking pcibus_reset itself.
+
+Tested-by: Claudio Bley <cbley at av-test.de>
+Signed-off-by: Paolo Bonzini <pbonzini at redhat.com>
+Signed-off-by: Cole Robinson <crobinso at redhat.com>
+---
+ hw/pci/pci.c | 8 ++------
+ hw/pci/pci.h | 1 -
+ hw/pci/pci_bridge.c | 2 +-
+ 3 files changed, 3 insertions(+), 8 deletions(-)
+
+diff --git a/hw/pci/pci.c b/hw/pci/pci.c
+index 2f45c8f..5813ef0 100644
+--- a/hw/pci/pci.c
++++ b/hw/pci/pci.c
+@@ -209,8 +209,9 @@ void pci_device_reset(PCIDevice *dev)
+ * Trigger pci bus reset under a given bus.
+ * To be called on RST# assert.
+ */
+-void pci_bus_reset(PCIBus *bus)
++static int pcibus_reset(BusState *qbus)
+ {
++ PCIBus *bus = DO_UPCAST(PCIBus, qbus, qbus);
+ int i;
+
+ for (i = 0; i < bus->nirq; i++) {
+@@ -221,11 +222,6 @@ void pci_bus_reset(PCIBus *bus)
+ pci_device_reset(bus->devices[i]);
+ }
+ }
+-}
+-
+-static int pcibus_reset(BusState *qbus)
+-{
+- pci_bus_reset(DO_UPCAST(PCIBus, qbus, qbus));
+
+ /* topology traverse is done by pci_bus_reset().
+ Tell qbus/qdev walker not to traverse the tree */
+diff --git a/hw/pci/pci.h b/hw/pci/pci.h
+index f340fe5..b9f2a5a 100644
+--- a/hw/pci/pci.h
++++ b/hw/pci/pci.h
+@@ -346,7 +346,6 @@ void pci_bus_fire_intx_routing_notifier(PCIBus *bus);
+ void pci_device_set_intx_routing_notifier(PCIDevice *dev,
+ PCIINTxRoutingNotifier notifier);
+ void pci_device_reset(PCIDevice *dev);
+-void pci_bus_reset(PCIBus *bus);
+
+ PCIDevice *pci_nic_init(NICInfo *nd, const char *default_model,
+ const char *default_devaddr);
+diff --git a/hw/pci/pci_bridge.c b/hw/pci/pci_bridge.c
+index 995842a..1b9722e 100644
+--- a/hw/pci/pci_bridge.c
++++ b/hw/pci/pci_bridge.c
+@@ -234,7 +234,7 @@ void pci_bridge_write_config(PCIDevice *d,
+ newctl = pci_get_word(d->config + PCI_BRIDGE_CONTROL);
+ if (~oldctl & newctl & PCI_BRIDGE_CTL_BUS_RESET) {
+ /* Trigger hot reset on 0->1 transition. */
+- pci_bus_reset(&s->sec_bus);
++ qbus_reset_all(&s->sec_bus.qbus);
+ }
+ }
+
diff --git a/0313-qdev-allow-both-pre-and-post-order-vists-in-qdev-wal.patch b/0313-qdev-allow-both-pre-and-post-order-vists-in-qdev-wal.patch
new file mode 100644
index 0000000..5b79af2
--- /dev/null
+++ b/0313-qdev-allow-both-pre-and-post-order-vists-in-qdev-wal.patch
@@ -0,0 +1,142 @@
+From ed7dc4037ba6f105ef2826cf20a8663256e40823 Mon Sep 17 00:00:00 2001
+From: Paolo Bonzini <pbonzini at redhat.com>
+Date: Thu, 2 May 2013 11:38:38 +0200
+Subject: [PATCH] qdev: allow both pre- and post-order vists in qdev walking
+ functions
+
+Resetting should be done in post-order, not pre-order. However,
+qdev_walk_children and qbus_walk_children do not allow this. Fix
+it by adding two extra arguments to the functions.
+
+Tested-by: Claudio Bley <cbley at av-test.de>
+Signed-off-by: Paolo Bonzini <pbonzini at redhat.com>
+Signed-off-by: Cole Robinson <crobinso at redhat.com>
+---
+ hw/qdev-core.h | 13 +++++++++----
+ hw/qdev.c | 45 +++++++++++++++++++++++++++++++++------------
+ 2 files changed, 42 insertions(+), 16 deletions(-)
+
+diff --git a/hw/qdev-core.h b/hw/qdev-core.h
+index cc5bb2a..5dc25ec 100644
+--- a/hw/qdev-core.h
++++ b/hw/qdev-core.h
+@@ -237,10 +237,15 @@ BusState *qbus_create(const char *typename, DeviceState *parent, const char *nam
+ /* Returns > 0 if either devfn or busfn skip walk somewhere in cursion,
+ * < 0 if either devfn or busfn terminate walk somewhere in cursion,
+ * 0 otherwise. */
+-int qbus_walk_children(BusState *bus, qdev_walkerfn *devfn,
+- qbus_walkerfn *busfn, void *opaque);
+-int qdev_walk_children(DeviceState *dev, qdev_walkerfn *devfn,
+- qbus_walkerfn *busfn, void *opaque);
++int qbus_walk_children(BusState *bus,
++ qdev_walkerfn *pre_devfn, qbus_walkerfn *pre_busfn,
++ qdev_walkerfn *post_devfn, qbus_walkerfn *post_busfn,
++ void *opaque);
++int qdev_walk_children(DeviceState *dev,
++ qdev_walkerfn *pre_devfn, qbus_walkerfn *pre_busfn,
++ qdev_walkerfn *post_devfn, qbus_walkerfn *post_busfn,
++ void *opaque);
++
+ void qdev_reset_all(DeviceState *dev);
+
+ /**
+diff --git a/hw/qdev.c b/hw/qdev.c
+index 1cbd910..50be0f8 100644
+--- a/hw/qdev.c
++++ b/hw/qdev.c
+@@ -237,12 +237,12 @@ static int qbus_reset_one(BusState *bus, void *opaque)
+
+ void qdev_reset_all(DeviceState *dev)
+ {
+- qdev_walk_children(dev, qdev_reset_one, qbus_reset_one, NULL);
++ qdev_walk_children(dev, qdev_reset_one, qbus_reset_one, NULL, NULL, NULL);
+ }
+
+ void qbus_reset_all(BusState *bus)
+ {
+- qbus_walk_children(bus, qdev_reset_one, qbus_reset_one, NULL);
++ qbus_walk_children(bus, qdev_reset_one, qbus_reset_one, NULL, NULL, NULL);
+ }
+
+ void qbus_reset_all_fn(void *opaque)
+@@ -340,49 +340,70 @@ BusState *qdev_get_child_bus(DeviceState *dev, const char *name)
+ return NULL;
+ }
+
+-int qbus_walk_children(BusState *bus, qdev_walkerfn *devfn,
+- qbus_walkerfn *busfn, void *opaque)
++int qbus_walk_children(BusState *bus,
++ qdev_walkerfn *pre_devfn, qbus_walkerfn *pre_busfn,
++ qdev_walkerfn *post_devfn, qbus_walkerfn *post_busfn,
++ void *opaque)
+ {
+ BusChild *kid;
+ int err;
+
+- if (busfn) {
+- err = busfn(bus, opaque);
++ if (pre_busfn) {
++ err = pre_busfn(bus, opaque);
+ if (err) {
+ return err;
+ }
+ }
+
+ QTAILQ_FOREACH(kid, &bus->children, sibling) {
+- err = qdev_walk_children(kid->child, devfn, busfn, opaque);
++ err = qdev_walk_children(kid->child,
++ pre_devfn, pre_busfn,
++ post_devfn, post_busfn, opaque);
+ if (err < 0) {
+ return err;
+ }
+ }
+
++ if (post_busfn) {
++ err = post_busfn(bus, opaque);
++ if (err) {
++ return err;
++ }
++ }
++
+ return 0;
+ }
+
+-int qdev_walk_children(DeviceState *dev, qdev_walkerfn *devfn,
+- qbus_walkerfn *busfn, void *opaque)
++int qdev_walk_children(DeviceState *dev,
++ qdev_walkerfn *pre_devfn, qbus_walkerfn *pre_busfn,
++ qdev_walkerfn *post_devfn, qbus_walkerfn *post_busfn,
++ void *opaque)
+ {
+ BusState *bus;
+ int err;
+
+- if (devfn) {
+- err = devfn(dev, opaque);
++ if (pre_devfn) {
++ err = pre_devfn(dev, opaque);
+ if (err) {
+ return err;
+ }
+ }
+
+ QLIST_FOREACH(bus, &dev->child_bus, sibling) {
+- err = qbus_walk_children(bus, devfn, busfn, opaque);
++ err = qbus_walk_children(bus, pre_devfn, pre_busfn,
++ post_devfn, post_busfn, opaque);
+ if (err < 0) {
+ return err;
+ }
+ }
+
++ if (post_devfn) {
++ err = post_devfn(dev, opaque);
++ if (err) {
++ return err;
++ }
++ }
++
+ return 0;
+ }
+
diff --git a/0314-qdev-switch-reset-to-post-order.patch b/0314-qdev-switch-reset-to-post-order.patch
new file mode 100644
index 0000000..d29ee6d
--- /dev/null
+++ b/0314-qdev-switch-reset-to-post-order.patch
@@ -0,0 +1,144 @@
+From bca7fa0f8de47d691473257c6d6c9a58ee5d05e8 Mon Sep 17 00:00:00 2001
+From: Paolo Bonzini <pbonzini at redhat.com>
+Date: Thu, 2 May 2013 11:38:39 +0200
+Subject: [PATCH] qdev: switch reset to post-order
+
+Post-order is the only sensible direction for the reset signals.
+For example, suppose pre-order is used and the parent has some data
+structures that cache children state (for example a list of active
+requests). When the reset method is invoked on the parent, these caches
+could be in any state.
+
+If post-order is used, on the other hand, these will be in a known state
+when the reset method is invoked on the parent.
+
+This change means that it is no longer possible to block the visit of
+the devices, so the callback is changed to return void. This is not
+a problem, because PCI was returning 1 exactly in order to achieve the
+same ordering that this patch implements.
+
+PCI can then rely on the qdev core having sent a "reset signal"
+(whatever that means) to the device, and only do the PCI-specific
+initialization with the new function pci_do_device_reset, extracted
+from pci_device_reset. There is no change in the operation of FLR,
+which used and still uses pci_device_reset.
+
+Tested-by: Claudio Bley <cbley at av-test.de>
+Signed-off-by: Paolo Bonzini <pbonzini at redhat.com>
+Signed-off-by: Cole Robinson <crobinso at redhat.com>
+---
+ hw/pci/pci.c | 31 ++++++++++++++++---------------
+ hw/qdev-core.h | 2 +-
+ hw/qdev.c | 6 +++---
+ 3 files changed, 20 insertions(+), 19 deletions(-)
+
+diff --git a/hw/pci/pci.c b/hw/pci/pci.c
+index 5813ef0..9826b6e 100644
+--- a/hw/pci/pci.c
++++ b/hw/pci/pci.c
+@@ -45,7 +45,7 @@
+ static void pcibus_dev_print(Monitor *mon, DeviceState *dev, int indent);
+ static char *pcibus_get_dev_path(DeviceState *dev);
+ static char *pcibus_get_fw_dev_path(DeviceState *dev);
+-static int pcibus_reset(BusState *qbus);
++static void pcibus_reset(BusState *qbus);
+
+ static Property pci_props[] = {
+ DEFINE_PROP_PCI_DEVFN("addr", PCIDevice, devfn, -1),
+@@ -164,16 +164,10 @@ void pci_device_deassert_intx(PCIDevice *dev)
+ }
+ }
+
+-/*
+- * This function is called on #RST and FLR.
+- * FLR if PCI_EXP_DEVCTL_BCR_FLR is set
+- */
+-void pci_device_reset(PCIDevice *dev)
++static void pci_do_device_reset(PCIDevice *dev)
+ {
+ int r;
+
+- qdev_reset_all(&dev->qdev);
+-
+ dev->irq_state = 0;
+ pci_update_irq_status(dev);
+ pci_device_deassert_intx(dev);
+@@ -206,10 +200,21 @@ void pci_device_reset(PCIDevice *dev)
+ }
+
+ /*
++ * This function is called on #RST and FLR.
++ * FLR if PCI_EXP_DEVCTL_BCR_FLR is set
++ */
++void pci_device_reset(PCIDevice *dev)
++{
++ qdev_reset_all(&dev->qdev);
++ pci_do_device_reset(dev);
++}
++
++/*
+ * Trigger pci bus reset under a given bus.
+- * To be called on RST# assert.
++ * Called via qbus_reset_all on RST# assert, after the devices
++ * have been reset qdev_reset_all-ed already.
+ */
+-static int pcibus_reset(BusState *qbus)
++static void pcibus_reset(BusState *qbus)
+ {
+ PCIBus *bus = DO_UPCAST(PCIBus, qbus, qbus);
+ int i;
+@@ -219,13 +224,9 @@ static int pcibus_reset(BusState *qbus)
+ }
+ for (i = 0; i < ARRAY_SIZE(bus->devices); ++i) {
+ if (bus->devices[i]) {
+- pci_device_reset(bus->devices[i]);
++ pci_do_device_reset(bus->devices[i]);
+ }
+ }
+-
+- /* topology traverse is done by pci_bus_reset().
+- Tell qbus/qdev walker not to traverse the tree */
+- return 1;
+ }
+
+ static void pci_host_bus_register(int domain, PCIBus *bus)
+diff --git a/hw/qdev-core.h b/hw/qdev-core.h
+index 5dc25ec..083e5ab 100644
+--- a/hw/qdev-core.h
++++ b/hw/qdev-core.h
+@@ -144,7 +144,7 @@ struct BusClass {
+ * bindings can be found at http://playground.sun.com/1275/bindings/.
+ */
+ char *(*get_fw_dev_path)(DeviceState *dev);
+- int (*reset)(BusState *bus);
++ void (*reset)(BusState *bus);
+ /* maximum devices allowed on the bus, 0: no limit. */
+ int max_dev;
+ };
+diff --git a/hw/qdev.c b/hw/qdev.c
+index 50be0f8..fd2b99e 100644
+--- a/hw/qdev.c
++++ b/hw/qdev.c
+@@ -230,19 +230,19 @@ static int qbus_reset_one(BusState *bus, void *opaque)
+ {
+ BusClass *bc = BUS_GET_CLASS(bus);
+ if (bc->reset) {
+- return bc->reset(bus);
++ bc->reset(bus);
+ }
+ return 0;
+ }
+
+ void qdev_reset_all(DeviceState *dev)
+ {
+- qdev_walk_children(dev, qdev_reset_one, qbus_reset_one, NULL, NULL, NULL);
++ qdev_walk_children(dev, NULL, NULL, qdev_reset_one, qbus_reset_one, NULL);
+ }
+
+ void qbus_reset_all(BusState *bus)
+ {
+- qbus_walk_children(bus, qdev_reset_one, qbus_reset_one, NULL, NULL, NULL);
++ qbus_walk_children(bus, NULL, NULL, qdev_reset_one, qbus_reset_one, NULL);
+ }
+
+ void qbus_reset_all_fn(void *opaque)
diff --git a/0315-scsi-avoid-assertion-failure-on-VERIFY-command.patch b/0315-scsi-avoid-assertion-failure-on-VERIFY-command.patch
new file mode 100644
index 0000000..5f9fe30
--- /dev/null
+++ b/0315-scsi-avoid-assertion-failure-on-VERIFY-command.patch
@@ -0,0 +1,63 @@
+From eb8dbec969a5d32053e95f4c42c17c470d0558e7 Mon Sep 17 00:00:00 2001
+From: Paolo Bonzini <pbonzini at redhat.com>
+Date: Mon, 8 Apr 2013 18:50:15 +0200
+Subject: [PATCH] scsi: avoid assertion failure on VERIFY command
+
+A verify command is not an actual read (we do not implement
+compare mode) and thus does not have an AIOCB attached. Do
+not crash in scsi_dma_complete.
+
+Signed-off-by: Paolo Bonzini <pbonzini at redhat.com>
+(cherry picked from commit ef8489d45927a6d35b214365e4b39ab311b48f2a)
+---
+ hw/scsi-disk.c | 19 ++++++++++++++-----
+ 1 file changed, 14 insertions(+), 5 deletions(-)
+
+diff --git a/hw/scsi-disk.c b/hw/scsi-disk.c
+index c9c983a..1d9cdd1 100644
+--- a/hw/scsi-disk.c
++++ b/hw/scsi-disk.c
+@@ -242,14 +242,15 @@ done:
+ }
+ }
+
+-static void scsi_dma_complete(void *opaque, int ret)
++static void scsi_dma_complete_noio(void *opaque, int ret)
+ {
+ SCSIDiskReq *r = (SCSIDiskReq *)opaque;
+ SCSIDiskState *s = DO_UPCAST(SCSIDiskState, qdev, r->req.dev);
+
+- assert(r->req.aiocb != NULL);
+- r->req.aiocb = NULL;
+- bdrv_acct_done(s->qdev.conf.bs, &r->acct);
++ if (r->req.aiocb != NULL) {
++ r->req.aiocb = NULL;
++ bdrv_acct_done(s->qdev.conf.bs, &r->acct);
++ }
+ if (r->req.io_canceled) {
+ goto done;
+ }
+@@ -275,6 +276,14 @@ done:
+ }
+ }
+
++static void scsi_dma_complete(void *opaque, int ret)
++{
++ SCSIDiskReq *r = (SCSIDiskReq *)opaque;
++
++ assert(r->req.aiocb != NULL);
++ scsi_dma_complete_noio(opaque, ret);
++}
++
+ static void scsi_read_complete(void * opaque, int ret)
+ {
+ SCSIDiskReq *r = (SCSIDiskReq *)opaque;
+@@ -494,7 +503,7 @@ static void scsi_write_data(SCSIRequest *req)
+ if (r->req.cmd.buf[0] == VERIFY_10 || r->req.cmd.buf[0] == VERIFY_12 ||
+ r->req.cmd.buf[0] == VERIFY_16) {
+ if (r->req.sg) {
+- scsi_dma_complete(r, 0);
++ scsi_dma_complete_noio(r, 0);
+ } else {
+ scsi_write_complete(r, 0);
+ }
diff --git a/qemu.spec b/qemu.spec
index 6d9caed..fdd04c3 100644
--- a/qemu.spec
+++ b/qemu.spec
@@ -131,7 +131,7 @@
Summary: QEMU is a FAST! processor emulator
Name: qemu
Version: 1.4.2
-Release: 7%{?dist}
+Release: 8%{?dist}
# Epoch because we pushed a qemu-1.0 package. AIUI this can't ever be dropped
Epoch: 2
License: GPLv2+ and LGPLv2+ and BSD
@@ -237,24 +237,17 @@ Patch0146: 0146-migration-eliminate-s-migration_file.patch
Patch0147: 0147-migration-inline-migrate_fd_close.patch
Patch0148: 0148-Revert-migration-don-t-account-sleep-time-for-calcul.patch
-# qemu-kvm migration compat (posted upstream)
+# 917860 libcacard and qemu/hw/ccid windows 7 smartcard support.
Patch0201: 0201-configure-Add-enable-migration-from-qemu-kvm.patch
Patch0202: 0202-acpi_piix4-Drop-minimum_version_id-to-handle-qemu-kv.patch
Patch0203: 0203-i8254-Fix-migration-from-qemu-kvm-1.1.patch
Patch0204: 0204-pc_piix-Add-compat-handling-for-qemu-kvm-VGA-mem-siz.patch
Patch0205: 0205-qxl-Add-rom_size-compat-property-fix-migration-from-.patch
-# Fix rtl8139 + windows 7 + large transfers (bz #970240)
Patch0206: 0206-rtl8139-flush-queued-packets-when-RxBufPtr-is-writte.patch
-# Fix crash on large drag and drop file transfer w/ spice (bz #969109)
Patch0207: 0207-spice-qemu-char-vmc_write-Don-t-write-more-bytes-the.patch
-# Fix build with latest libfdt
Patch0208: 0208-configure-dtc-Probe-for-libfdt_env.h.patch
-# Fix usb_handle_packet assertions (bz #981459)
Patch0209: 0209-Fix-usage-of-USB_DEV_FLAG_IS_HOST-flag.patch
-# Fix crash when adding spice vdagent channel in the guest (bz #969084)
Patch0210: 0210-qxl-Fix-QXLRam-initialisation.patch
-
-# 917860 related libcacard and qemu/hw/ccid windows 7 smartcard support.
Patch0211: 0211-qemu-socket-Make-socket_optslist-public.patch
Patch0212: 0212-libcacard-correct-T0-historical-bytes-size.patch
Patch0213: 0213-ccid-card-emul-do-not-crash-if-backend-is-not-provid.patch
@@ -276,16 +269,32 @@ Patch0228: 0228-dev-smartcard-reader-support-windows-guest.patch
Patch0229: 0229-dev-smartcard-reader-reuse-usb.h-definitions.patch
Patch0230: 0230-libcacard-change-default-ATR.patch
Patch0231: 0231-ccid-card-passthru-add-atr-check.patch
-Patch0232: 0232-ccid-card-passthru-dev-smartcard-reader-add-debug-en.patch
-Patch0233: 0233-dev-smartcard-reader-define-structs-for-CCID_Paramet.patch
-Patch0234: 0234-dev-smartcard-reader-change-default-protocol-to-T-0.patch
-Patch0235: 0235-dev-smartcard-reader-copy-atr-protocol-to-ccid-param.patch
-Patch0236: 0236-libcacard-vreader-add-debugging-messages-for-apdu.patch
-Patch0237: 0237-libcacard-move-atr-setting-from-macro-to-function.patch
-Patch0238: 0238-dev-smartcard-reader-empty-implementation-for-Mechan.patch
-Patch0239: 0239-libcacard-cac-change-big-switch-functions-to-single-.patch
-Patch0240: 0240-libcacard-vscclient-fix-leakage-of-socket-on-error-p.patch
-Patch0241: 0241-libcacard-Fix-cppcheck-warning-and-remove-unneeded-c.patch
+
+# qemu-kvm migration compat (posted upstream)
+Patch0301: 0301-ccid-card-passthru-dev-smartcard-reader-add-debug-en.patch
+Patch0302: 0302-dev-smartcard-reader-define-structs-for-CCID_Paramet.patch
+Patch0303: 0303-dev-smartcard-reader-change-default-protocol-to-T-0.patch
+Patch0304: 0304-dev-smartcard-reader-copy-atr-protocol-to-ccid-param.patch
+Patch0305: 0305-libcacard-vreader-add-debugging-messages-for-apdu.patch
+# Fix rtl8139 + windows 7 + large transfers (bz #970240)
+Patch0306: 0306-libcacard-move-atr-setting-from-macro-to-function.patch
+# Fix crash on large drag and drop file transfer w/ spice (bz #969109)
+Patch0307: 0307-dev-smartcard-reader-empty-implementation-for-Mechan.patch
+# Fix build with latest libfdt
+Patch0308: 0308-libcacard-cac-change-big-switch-functions-to-single-.patch
+# Fix usb_handle_packet assertions (bz #981459)
+Patch0309: 0309-libcacard-vscclient-fix-leakage-of-socket-on-error-p.patch
+# Fix crash when adding spice vdagent channel in the guest (bz #969084)
+Patch0310: 0310-libcacard-Fix-cppcheck-warning-and-remove-unneeded-c.patch
+# Fix crash with -M isapc -cpu Haswell (bz #986790)
+Patch0311: 0311-isapc-disable-kvmvapic.patch
+# Fix crash in lsi_soft_reset (bz #1000947)
+# Patches posted upstream
+Patch0312: 0312-pci-do-not-export-pci_bus_reset.patch
+Patch0313: 0313-qdev-allow-both-pre-and-post-order-vists-in-qdev-wal.patch
+Patch0314: 0314-qdev-switch-reset-to-post-order.patch
+# Fix crash in scsi_dma_complete (bz #1001617)
+Patch0315: 0315-scsi-avoid-assertion-failure-on-VERIFY-command.patch
BuildRequires: SDL-devel
BuildRequires: zlib-devel
@@ -812,24 +821,17 @@ CAC emulation development files.
%patch0147 -p1
%patch0148 -p1
-# qemu-kvm migration compat (posted upstream)
+# 917860 libcacard and qemu/hw/ccid windows 7 smartcard support.
%patch0201 -p1
%patch0202 -p1
%patch0203 -p1
%patch0204 -p1
%patch0205 -p1
-# Fix rtl8139 + windows 7 + large transfers (bz #970240)
%patch0206 -p1
-# Fix crash on large drag and drop file transfer w/ spice (bz #969109)
%patch0207 -p1
-# Fix build with latest libfdt
%patch0208 -p1
-# Fix usb_handle_packet assertions (bz #981459)
%patch0209 -p1
-# Fix crash when adding spice vdagent channel in the guest (bz #969084)
%patch0210 -p1
-
-# 917860 libcacard and qemu/hw/ccid windows 7 smartcard support.
%patch0211 -p1
%patch0212 -p1
%patch0213 -p1
@@ -851,16 +853,32 @@ CAC emulation development files.
%patch0229 -p1
%patch0230 -p1
%patch0231 -p1
-%patch0232 -p1
-%patch0233 -p1
-%patch0234 -p1
-%patch0235 -p1
-%patch0236 -p1
-%patch0237 -p1
-%patch0238 -p1
-%patch0239 -p1
-%patch0240 -p1
-%patch0241 -p1
+
+# qemu-kvm migration compat (posted upstream)
+%patch0301 -p1
+%patch0302 -p1
+%patch0303 -p1
+%patch0304 -p1
+%patch0305 -p1
+# Fix rtl8139 + windows 7 + large transfers (bz #970240)
+%patch0306 -p1
+# Fix crash on large drag and drop file transfer w/ spice (bz #969109)
+%patch0307 -p1
+# Fix build with latest libfdt
+%patch0308 -p1
+# Fix usb_handle_packet assertions (bz #981459)
+%patch0309 -p1
+# Fix crash when adding spice vdagent channel in the guest (bz #969084)
+%patch0310 -p1
+# Fix crash with -M isapc -cpu Haswell (bz #986790)
+%patch0311 -p1
+# Fix crash in lsi_soft_reset (bz #1000947)
+# Patches posted upstream
+%patch0312 -p1
+%patch0313 -p1
+%patch0314 -p1
+# Fix crash in scsi_dma_complete (bz #1001617)
+%patch0315 -p1
%build
%if %{with kvmonly}
@@ -1140,6 +1158,7 @@ make check
# load kvm modules now, so we can make sure no reboot is needed.
# If there's already a kvm module installed, we don't mess with it
sh %{_sysconfdir}/sysconfig/modules/kvm.modules &> /dev/null || :
+setfacl --remove-all /dev/kvm &> /dev/null || :
udevadm trigger --subsystem-match=misc --sysname-match=kvm --action=add || :
%endif
@@ -1507,6 +1526,12 @@ getent passwd qemu >/dev/null || \
%endif
%changelog
+* Tue Sep 03 2013 Cole Robinson <crobinso at redhat.com> - 2:1.4.2-8
+- Fix crash with -M isapc -cpu Haswell (bz #986790)
+- Fix crash in lsi_soft_reset (bz #1000947)
+- Fix crash in scsi_dma_complete (bz #1001617)
+- Fix initial /dev/kvm permissions (bz #993491)
+
* Sun Aug 18 2013 Alon Levy <alevy at redhat.com> - 2:1.4.2-7
- Support windows 7 smartcard using guests and clients - (bz #917860 rhel 6.5)
More information about the scm-commits
mailing list